chore(deps): update chain id deps (#917)

sentioxyz · Jul 31, 2024 · 9a9e91e · 9a9e91e
1 parent 9e80787
commit 9a9e91e
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 39 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@aptos-labs/ts-sdk": "~1.26.0",
     "@mysten/sui.js": "~0.54.1",
-    "@sentio/chain": "^2.0.3",
+    "@sentio/chain": "^2.1.0",
     "@sentio/graph-cli": "^0.75.0",
     "@types/node": "^20.14.8",
     "chalk": "^5.3.0",

diff --git a/packages/cli/src/abi.ts b/packages/cli/src/abi.ts
@@ -25,10 +25,10 @@ export async function getABI(
     case AptosChainId.APTOS_TESTNET:
       aptosClient = new Aptos(new AptosConfig({ fullnode: 'https://testnet.aptoslabs.com/v1' }))
       break
-    case AptosChainId.APTOS_M2_TESTNET:
+    case AptosChainId.APTOS_MOVEMENT_TESTNET:
       aptosClient = new Aptos(
         new AptosConfig({
-          fullnode: process.env.APTOS_M2_TESTNET_URL || 'https://aptos.testnet.suzuka.movementlabs.xyz/v1'
+          fullnode: 'https://aptos.testnet.suzuka.movementlabs.xyz/v1'
         })
       )
       break
@@ -143,12 +143,12 @@ export function getABIFilePath(chain: string, name: string, address?: string): s
     case AptosChainId.APTOS_TESTNET:
       subpath = 'aptos/testnet'
       break
-    case AptosChainId.APTOS_M2_TESTNET:
-      subpath = 'aptos/m2-testnet'
-      break
-    case AptosChainId.APTOS_M2_MAINNET:
+    case AptosChainId.APTOS_MOVEMENT_MAINNET:
       subpath = 'aptos/m2-mainnet'
       break
+    case AptosChainId.APTOS_MOVEMENT_TESTNET:
+      subpath = 'aptos/m2-testnet'
+      break
     case SuiChainId.SUI_MAINNET:
       subpath = 'sui'
       break

diff --git a/packages/cli/src/commands/run-add.ts b/packages/cli/src/commands/run-add.ts
@@ -12,7 +12,7 @@ import { AptosChainId, ChainId, getChainName, SuiChainId, EthChainInfo, Explorer
 const supportedChain: string[] = [
   AptosChainId.APTOS_MAINNET,
   AptosChainId.APTOS_TESTNET,
-  AptosChainId.APTOS_M2_TESTNET,
+  AptosChainId.APTOS_MOVEMENT_TESTNET,
   SuiChainId.SUI_TESTNET,
   SuiChainId.SUI_MAINNET
 ]

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -78,7 +78,7 @@
     "@project-serum/anchor": "^0.26.0",
     "@sentio/abi-wan-kanabi": "2.2.2-1",
     "@sentio/bigdecimal": "9.1.1-patch.3",
-    "@sentio/chain": "^2.0.3",
+    "@sentio/chain": "^2.1.0",
     "@sentio/ethers-v6": "^1.0.29",
     "@sentio/protos": "workspace:*",
     "@sentio/runtime": "workspace:^",

diff --git a/packages/sdk/src/aptos/codegen/codegen.ts b/packages/sdk/src/aptos/codegen/codegen.ts
@@ -6,7 +6,6 @@ import { InternalMoveModule, InternalMoveStruct } from '@typemove/move'
 import { AptosNetwork, getRpcEndpoint } from '../network.js'
 import { Event, MoveModuleBytecode, MoveResource } from '@aptos-labs/ts-sdk'
 import { SharedNetworkCodegen } from '../../move/shared-network-codegen.js'
-import { AptosChainId } from '@sentio/chain'
 
 export async function codegen(
   abisDir: string,
@@ -41,10 +40,10 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
         switch (network) {
           case AptosNetwork.MAIN_NET:
             return 'MAIN_NET'
-          case AptosChainId.APTOS_M2_MAINNET:
-            return 'M2_MAIN_NET'
-          case AptosChainId.APTOS_M2_TESTNET:
-            return 'M2_TEST_NET'
+          case AptosNetwork.MOVEMENT_MAIN_NET:
+            return 'MOVEMENT_MAIN_NET'
+          case AptosNetwork.MOVEMENT_TEST_NET:
+            return 'MOVEMENT_TEST_NET'
           default:
             return 'TEST_NET'
         }
@@ -68,8 +67,8 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
 
 const MAINNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MAIN_NET)
 const TESTNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.TEST_NET)
-const M2_MAINNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.M2_MAIN_NET)
-const M2_TESTNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.M2_TEST_NET)
+const M2_MAINNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MOVEMENT_MAIN_NET)
+const M2_TESTNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MOVEMENT_TEST_NET)
 
 class AptosCodegen {
   async generate(srcDir: string, outputDir: string, builtin = false): Promise<number> {

diff --git a/packages/sdk/src/aptos/network.ts b/packages/sdk/src/aptos/network.ts
@@ -2,15 +2,14 @@ import { AptosChainId } from '@sentio/chain'
 import { Aptos, AptosConfig } from '@aptos-labs/ts-sdk'
 import { Labels } from '../core/index.js'
 import { Endpoints } from '@sentio/runtime'
-import process from 'process'
 
 export type AptosNetwork = AptosChainId
 export const AptosNetwork = <const>{
   MAIN_NET: AptosChainId.APTOS_MAINNET,
   TEST_NET: AptosChainId.APTOS_TESTNET,
-  DEV_NET: AptosChainId.APTOS_DEVNET,
-  M2_TEST_NET: AptosChainId.APTOS_M2_TESTNET,
-  M2_MAIN_NET: AptosChainId.APTOS_M2_MAINNET
+  // DEV_NET: AptosChainId.APTOS_DEVNET,
+  MOVEMENT_MAIN_NET: AptosChainId.APTOS_MOVEMENT_MAINNET,
+  MOVEMENT_TEST_NET: AptosChainId.APTOS_MOVEMENT_TESTNET
 }
 
 export class AptosBindOptions {
@@ -25,9 +24,9 @@ export function getRpcEndpoint(network: AptosNetwork): string {
   switch (network) {
     case AptosNetwork.TEST_NET:
       return 'https://testnet.aptoslabs.com/v1'
-    case AptosNetwork.M2_TEST_NET:
-      return process.env.APTOS_M2_TESTNET_URL || 'https://aptos.testnet.suzuka.movementlabs.xyz/v1'
-    case AptosNetwork.M2_MAIN_NET:
+    case AptosNetwork.MOVEMENT_TEST_NET:
+      return 'https://aptos.testnet.suzuka.movementlabs.xyz/v1'
+    case AptosNetwork.MOVEMENT_MAIN_NET:
       return 'https://mainnet.m1.movementlabs.xyz/v1'
   }
   return 'https://mainnet.aptoslabs.com/v1'

diff --git a/packages/sdk/src/move/shared-network-codegen.ts b/packages/sdk/src/move/shared-network-codegen.ts
@@ -132,8 +132,8 @@ onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(struct.nam
       source = `
       loadAllTypes(defaultMoveCoder(${this.PREFIX}Network.MAIN_NET))
       loadAllTypes(defaultMoveCoder(${this.PREFIX}Network.TEST_NET))
-      loadAllTypes(defaultMoveCoder(${this.PREFIX}Network.M2_TEST_NET))
-      loadAllTypes(defaultMoveCoder(${this.PREFIX}Network.M2_MAIN_NET))
+      loadAllTypes(defaultMoveCoder(${this.PREFIX}Network.MOVEMENT_TEST_NET))
+      loadAllTypes(defaultMoveCoder(${this.PREFIX}Network.MOVEMENT_MAIN_NET))
       `
     }
     return source

diff --git a/packages/sdk/src/sui/codegen/codegen.ts b/packages/sdk/src/sui/codegen/codegen.ts
@@ -41,10 +41,10 @@ class SuiNetworkCodegen extends BaseSuiCodegen {
         switch (network) {
           case SuiNetwork.MAIN_NET:
             return 'MAIN_NET'
-          case SuiNetwork.M2_MAIN_NET:
-            return 'M2_MAIN_NET'
-          case SuiNetwork.M2_TEST_NET:
-            return 'M2_TEST_NET'
+          case SuiNetwork.MOVEMENT_MAIN_NET:
+            return 'MOVEMENT_MAIN_NET'
+          case SuiNetwork.MOVEMENT_TEST_NET:
+            return 'MOVEMENT_TEST_NET'
           default:
             return 'TEST_NET'
         }

diff --git a/packages/sdk/src/sui/network.ts b/packages/sdk/src/sui/network.ts
@@ -7,9 +7,9 @@ export type SuiNetwork = SuiChainId
 export const SuiNetwork = <const>{
   MAIN_NET: SuiChainId.SUI_MAINNET,
   TEST_NET: SuiChainId.SUI_TESTNET,
-  DEV_NET: SuiChainId.SUI_DEVNET,
-  M2_TEST_NET: SuiChainId.SUI_M2_TESTNET,
-  M2_MAIN_NET: SuiChainId.SUI_M2_MAINNET
+  // DEV_NET: SuiChainId.SUI_DEVNET,
+  MOVEMENT_MAIN_NET: SuiChainId.SUI_MOVEMENT_MAINNET,
+  MOVEMENT_TEST_NET: SuiChainId.SUI_MOVEMENT_TESTNET
 }
 
 export function getClient(network: SuiNetwork): SuiClient {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml