feat(api): use generated code by version from akash-api

Also remove relevant local barrel index files. refs akash-network/support#184
akash-network · May 6, 2024 · 49bd4d0 · 49bd4d0
1 parent 47935e7
commit 49bd4d0
Show file tree

Hide file tree

Showing 9 changed files with 4,178 additions and 17,177 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -24,8 +24,7 @@
     "url": "git+https://github.com/akash-network/cloudmos"
   },
   "dependencies": {
-    "@akashnetwork/akash-api": "^1.0.3",
-    "@akashnetwork/akashjs": "^0.6.1",
+    "@akashnetwork/akash-api": "^1.3.0",
     "@chain-registry/assets": "^0.7.1",
     "@cosmjs/crypto": "^0.28.11",
     "@cosmjs/encoding": "^0.28.11",

diff --git a/api/src/proto/akash/v1beta1.ts b/api/src/proto/akash/v1beta1.ts
diff --git a/api/src/proto/akash/v1beta2.ts b/api/src/proto/akash/v1beta2.ts
diff --git a/api/src/proto/akash/v1beta3.ts b/api/src/proto/akash/v1beta3.ts
diff --git a/api/src/proto/akash/v1beta4.ts b/api/src/proto/akash/v1beta4.ts
diff --git a/api/src/routes/internal/gpuPrices.ts b/api/src/routes/internal/gpuPrices.ts
@@ -4,7 +4,7 @@ import { AkashMessage, Deployment, DeploymentGroup, DeploymentGroupResource } fr
 import { Day, Transaction } from "@shared/dbSchemas/base";
 import { cacheResponse } from "@src/caching/helpers";
 import { chainDb } from "@src/db/dbConnection";
-import { MsgCreateBid } from "@src/proto/akash/v1beta4";
+import { MsgCreateBid } from "@akashnetwork/akash-api/akash/market/v1beta4";
 import { toUTC } from "@src/utils";
 import { averageBlockCountInAMonth, averageBlockCountInAnHour } from "@src/utils/constants";
 import { env } from "@src/utils/env";

diff --git a/api/src/services/db/deploymentService.ts b/api/src/services/db/deploymentService.ts
@@ -1,5 +1,5 @@
-import * as v1 from "@src/proto/akash/v1beta1";
-import * as v2 from "@src/proto/akash/v1beta2";
+import { MsgCreateBid as MsgCreateBidV1, MsgCreateLease as MsgCreateLeaseV1 } from "@akashnetwork/akash-api/deprecated/akash/market/v1beta1";
+import { MsgCreateBid as MsgCreateBidV2, MsgCreateLease as MsgCreateLeaseV2 } from "@akashnetwork/akash-api/akash/market/v1beta2";
 import { decodeMsg } from "@src/utils/protobuf";
 import { Transaction } from "@shared/dbSchemas/base";
 import { Deployment, Lease } from "@shared/dbSchemas/akash";
@@ -41,13 +41,13 @@ export async function getDeploymentRelatedMessages(owner: string, dseq: string)
   const createBidMsgs = relatedMessages
     .filter((msg) => msg.type.endsWith("MsgCreateBid"))
     .map((msg) => ({
-      decoded: decodeMsg(msg.type, msg.data) as v1.MsgCreateBid | v2.MsgCreateBid,
+      decoded: decodeMsg(msg.type, msg.data) as MsgCreateBidV1 | MsgCreateBidV2,
       msg: msg
     }));
 
   const createLeaseMsgs = relatedMessages
     .filter((x) => x.type.endsWith("MsgCreateLease"))
-    .map((msg) => decodeMsg(msg.type, msg.data) as v1.MsgCreateLease | v2.MsgCreateLease);
+    .map((msg) => decodeMsg(msg.type, msg.data) as MsgCreateLeaseV1 | MsgCreateLeaseV2);
 
   const acceptedBids = createBidMsgs.filter((createBidMsg) =>
     createLeaseMsgs.some(

diff --git a/api/src/utils/protobuf.ts b/api/src/utils/protobuf.ts
@@ -1,16 +1,17 @@
 import { Registry, isTsProtoGeneratedType, GeneratedType } from "@cosmjs/proto-signing";
 import { defaultRegistryTypes } from "@cosmjs/stargate";
 import { MsgUnjail } from "cosmjs-types/cosmos/slashing/v1beta1/tx";
+import omit from "lodash/omit";
 
-import * as v1beta1 from "../proto/akash/v1beta1";
-import * as v1beta2 from "../proto/akash/v1beta2";
-import * as v1beta3 from "../proto/akash/v1beta3";
-import * as v1beta4 from "../proto/akash/v1beta4";
+import * as v1beta1 from "@akashnetwork/akash-api/v1beta1";
+import * as v1beta2 from "@akashnetwork/akash-api/v1beta2";
+import * as v1beta3 from "@akashnetwork/akash-api/v1beta3";
+import * as v1beta4 from "@akashnetwork/akash-api/v1beta4";
 
 const akashTypes: ReadonlyArray<[string, GeneratedType]> = [
   ...Object.values(v1beta1),
-  ...Object.values(v1beta2),
-  ...Object.values(v1beta3),
+  ...Object.values(omit(v1beta2, "Storage")),
+  ...Object.values(omit(v1beta3, ["DepositDeploymentAuthorization", "GPU"])),
   ...Object.values(v1beta4)
 ].map((x) => ["/" + x.$type, x]);
 const missingTypes: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.slashing.v1beta1.MsgUnjail", MsgUnjail]];