Skip to content

Commit d9a414f

Browse files
authored
fix: reduces what is stored in deployment stored state (#15)
1 parent 7ef9f15 commit d9a414f

File tree

3 files changed

+11
-33
lines changed

3 files changed

+11
-33
lines changed

packages/deploy/src/deployment.test.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,6 @@ describe(updateDeploymentManifest.name, () => {
599599
oseq: 1,
600600
provider: providerAddress,
601601
},
602-
state: "active",
603-
price: { amount: "1000", denom: "uakt" },
604602
},
605603
};
606604

@@ -689,8 +687,6 @@ describe(getExistingDeploymentDetails.name, () => {
689687
oseq: 1,
690688
provider: "akash1provider",
691689
},
692-
state: "active",
693-
price: { amount: "1000", denom: "uakt" },
694690
},
695691
};
696692

@@ -726,10 +722,6 @@ describe(getExistingDeploymentDetails.name, () => {
726722
["lease.id.gseq not a number", { ...validDetails, lease: { ...validDetails.lease, id: { ...validDetails.lease.id, gseq: "1" } } }],
727723
["lease.id.oseq not a number", { ...validDetails, lease: { ...validDetails.lease, id: { ...validDetails.lease.id, oseq: "1" } } }],
728724
["missing lease.id.provider", { ...validDetails, lease: { ...validDetails.lease, id: { ...validDetails.lease.id, provider: "" } } }],
729-
["missing lease.state", { ...validDetails, lease: { ...validDetails.lease, state: "" } }],
730-
["missing lease.price", { ...validDetails, lease: { ...validDetails.lease, price: undefined } }],
731-
["lease.price.amount not a string", { ...validDetails, lease: { ...validDetails.lease, price: { amount: 1000, denom: "uakt" } } }],
732-
["lease.price.denom not a string", { ...validDetails, lease: { ...validDetails.lease, price: { amount: "1000", denom: 42 } } }],
733725
])("throws for invalid shape: %s", (_label, invalid) => {
734726
const filePath = path.join(tmpDir, "deployment.json");
735727
fs.writeFileSync(filePath, JSON.stringify(invalid));

packages/deploy/src/deployment.ts

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ export interface StoredDeploymentDetails {
3535
oseq: number;
3636
provider: string;
3737
};
38-
state: string;
39-
price: {
40-
amount: string;
41-
denom: string;
42-
};
4338
};
4439
}
4540

@@ -225,7 +220,7 @@ export async function updateDeploymentManifest(
225220
await sdk.akash.deployment.v1beta4.updateDeployment(updateMessage, buildTxOptions(inputs, "Deployment updated via GitHub Action"));
226221
logger.info("✅ Deployment updated on-chain successfully!");
227222

228-
const fakeBid = { id: { ...lease.id, bseq: 0 }, price: lease.price } as JsonResponse<Bid>;
223+
const fakeBid = { id: { ...lease.id, bseq: 0 } } as JsonResponse<Bid>;
229224
const token = await tokenGenerator(wallet, fakeBid, manifest.groups.map(g => g.services.map(s => s.name)).flat());
230225
const provider = await sdk.akash.provider.v1beta4.getProvider({ owner: lease.id.provider }) as unknown as JsonResponse<QueryProviderResponse>;
231226

@@ -416,22 +411,5 @@ function validateStoredDeploymentDetails(data: unknown): StoredDeploymentDetails
416411
throw new Error("'lease.id.provider' must be a non-empty string");
417412
}
418413

419-
if (typeof lease.state !== "string" || !lease.state) {
420-
throw new Error("'lease.state' must be a non-empty string");
421-
}
422-
423-
if (typeof lease.price !== "object" || lease.price === null) {
424-
throw new Error("'lease.price' must be an object");
425-
}
426-
427-
const price = lease.price as Record<string, unknown>;
428-
429-
if (typeof price.amount !== "string") {
430-
throw new Error("'lease.price.amount' must be a string");
431-
}
432-
if (typeof price.denom !== "string") {
433-
throw new Error("'lease.price.denom' must be a string");
434-
}
435-
436414
return data as StoredDeploymentDetails;
437415
}

packages/deploy/src/index.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,16 @@ async function run(): Promise<void> {
8484
if (result.isNew && inputs.deploymentDetailsPath && result.lease) {
8585
const outPath = path.resolve(process.cwd(), inputs.deploymentDetailsPath);
8686
const details: StoredDeploymentDetails = {
87-
dseq: result.deploymentId.dseq,
88-
lease: result.lease,
87+
dseq: result.deploymentId.dseq.toString(),
88+
lease: {
89+
id: {
90+
owner: result.lease.id.owner,
91+
dseq: result.lease.id.dseq.toString(),
92+
gseq: Number(result.lease.id.gseq),
93+
oseq: Number(result.lease.id.oseq),
94+
provider: result.lease.id.provider,
95+
},
96+
},
8997
};
9098
fs.mkdirSync(path.dirname(outPath), { recursive: true });
9199
fs.writeFileSync(outPath, JSON.stringify(details, null, 2), "utf-8");

0 commit comments

Comments
 (0)