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 8, 2024 · eadc869 · eadc869
1 parent 7bc1464
commit eadc869
Show file tree

Hide file tree

Showing 8 changed files with 565 additions and 3,187 deletions.
diff --git a/indexer/package-lock.json b/indexer/package-lock.json
diff --git a/indexer/package.json b/indexer/package.json
@@ -19,8 +19,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@akashnetwork/akash-api": "^1.0.3",
-    "@akashnetwork/akashjs": "^0.6.1",
+    "@akashnetwork/akash-api": "^1.3.0",
     "@connectrpc/connect": "^1.3.0",
     "@connectrpc/connect-node": "^1.3.0",
     "@cosmjs/crypto": "^0.31.1",
@@ -54,7 +53,7 @@
   "devDependencies": {
     "@types/async": "^3.2.15",
     "@types/express": "^4.17.13",
-    "@types/lodash": "^4.17.0",
+    "@types/lodash": "^4.17.1",
     "@types/node": "^16.11.68",
     "@types/node-fetch": "^2.6.2",
     "@types/node-gzip": "^1.1.0",

diff --git a/indexer/src/indexers/akashStatsIndexer.ts b/indexer/src/indexers/akashStatsIndexer.ts
@@ -1,8 +1,8 @@
 import * as benchmark from "../shared/utils/benchmark";
-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";
 import * as uuid from "uuid";
 import { uint8arrayToString } from "@src/shared/utils/protobuf";
 import { accountSettle } from "@src/shared/utils/akashPaymentSettle";

diff --git a/indexer/src/proto/akash/v1beta1.ts b/indexer/src/proto/akash/v1beta1.ts
diff --git a/indexer/src/proto/akash/v1beta2.ts b/indexer/src/proto/akash/v1beta2.ts
diff --git a/indexer/src/proto/akash/v1beta3.ts b/indexer/src/proto/akash/v1beta3.ts
diff --git a/indexer/src/proto/akash/v1beta4.ts b/indexer/src/proto/akash/v1beta4.ts
diff --git a/indexer/src/shared/utils/protobuf.ts b/indexer/src/shared/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(v1beta3, 'DepositDeploymentAuthorization')),
   ...Object.values(v1beta4)
 ].map((x) => ["/" + x.$type, x]);
 const missingTypes: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.slashing.v1beta1.MsgUnjail", MsgUnjail]];