fix(aptos): fix porto related stuff (#1017)

sentioxyz · Nov 5, 2024 · 99bb044 · 99bb044
1 parent 63e6733
commit 99bb044
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 29 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@aptos-labs/ts-sdk": "~1.31.0",
     "@mysten/sui": "~1.14.0",
-    "@sentio/chain": "^2.1.10",
+    "@sentio/chain": "^2.1.12",
     "@sentio/graph-cli": "^0.80.0-patch.1",
     "@types/node": "^22.8.6",
     "chalk": "^5.3.0",

diff --git a/packages/cli/src/abi.ts b/packages/cli/src/abi.ts
@@ -32,6 +32,13 @@ export async function getABI(
         })
       )
       break
+    case AptosChainId.APTOS_MOVEMENT_PORTO:
+      aptosClient = new Aptos(
+        new AptosConfig({
+          fullnode: 'https://aptos.testnet.porto.movementlabs.xyz/v1'
+        })
+      )
+      break
     case SuiChainId.SUI_MAINNET:
       suiClient = new SuiClient({ url: 'https://fullnode.mainnet.sui.io/' })
       break
@@ -144,7 +151,10 @@ export function getABIFilePath(chain: string, name: string, address?: string): s
       subpath = 'aptos/testnet'
       break
     case AptosChainId.APTOS_MOVEMENT_MAINNET:
-      subpath = 'aptos/m2-mainnet'
+      subpath = 'aptos/movement-mainnet'
+      break
+    case AptosChainId.APTOS_MOVEMENT_PORTO:
+      subpath = 'aptos/movement-porto'
       break
     case AptosChainId.APTOS_MOVEMENT_TESTNET:
       subpath = 'aptos/m2-testnet'

diff --git a/packages/cli/src/commands/run-add.ts b/packages/cli/src/commands/run-add.ts
@@ -14,6 +14,7 @@ const supportedChain: string[] = [
   AptosChainId.APTOS_MAINNET,
   AptosChainId.APTOS_TESTNET,
   AptosChainId.APTOS_MOVEMENT_TESTNET,
+  AptosChainId.APTOS_MOVEMENT_PORTO,
   SuiChainId.SUI_TESTNET,
   SuiChainId.SUI_MAINNET
 ]

diff --git a/packages/cli/src/commands/run-create.ts b/packages/cli/src/commands/run-create.ts
@@ -7,9 +7,7 @@ import latestVersion from 'latest-version'
 import process from 'process'
 import { execPackageManager } from '../execution.js'
 import { errorOnUnknownOption, getPackageRoot } from '../utils.js'
-import { EthChainInfo, EthChainId } from '@sentio/chain'
-
-const supportedChain: EthChainId[] = Object.values(EthChainInfo).map((chain) => chain.chainId)
+import { EthChainInfo } from '@sentio/chain'
 
 export const supportedChainMessage = [
   ',  <Chain ID> (<Chain Name>)',

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -82,7 +82,7 @@
     "@sentio/abi-wan-kanabi": "2.2.2-1",
     "@sentio/api": "1.0.2-rc.11",
     "@sentio/bigdecimal": "9.1.1-patch.3",
-    "@sentio/chain": "^2.1.11",
+    "@sentio/chain": "^2.1.12",
     "@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
@@ -55,23 +55,29 @@ 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.MOVEMENT_MAIN_NET)
+const MOVEMENT_MAINNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MOVEMENT_MAIN_NET)
 const M2_TESTNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MOVEMENT_TEST_NET)
+const MOVEMENT_PROTO_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MOVEMENT_PORTO)
 
 class AptosCodegen {
   async generate(srcDir: string, outputDir: string, builtin = false): Promise<number> {
     const num1 = await MAINNET_CODEGEN.generate(srcDir, outputDir, builtin)
     const num2 = await TESTNET_CODEGEN.generate(path.join(srcDir, 'testnet'), path.join(outputDir, 'testnet'), builtin)
-    const num3 = await M2_MAINNET_CODEGEN.generate(
-      path.join(srcDir, 'm2-mainnet'),
-      path.join(outputDir, 'm2-mainnet'),
+    const num3 = await MOVEMENT_MAINNET_CODEGEN.generate(
+      path.join(srcDir, 'movement-mainnet'),
+      path.join(outputDir, 'movement-mainnet'),
       builtin
     )
     const num4 = await M2_TESTNET_CODEGEN.generate(
       path.join(srcDir, 'm2-testnet'),
       path.join(outputDir, 'm2-testnet'),
       builtin
     )
-    return num1 + num2 + num3 + num4
+    const num5 = await MOVEMENT_PROTO_CODEGEN.generate(
+      path.join(srcDir, 'movement-porto'),
+      path.join(outputDir, 'movement-porto'),
+      builtin
+    )
+    return num1 + num2 + num3 + num4 + num5
   }
 }
diff --git a/packages/sdk/src/aptos/network.ts b/packages/sdk/src/aptos/network.ts
@@ -23,14 +23,17 @@ export class AptosBindOptions {
 
 export function getRpcEndpoint(network: AptosNetwork): string {
   switch (network) {
+    case AptosNetwork.MAIN_NET:
+      return 'https://mainnet.aptoslabs.com/v1'
     case AptosNetwork.TEST_NET:
       return 'https://testnet.aptoslabs.com/v1'
     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://aptos.mainnet.movementlabs.xyz/v1'
+    case AptosNetwork.MOVEMENT_PORTO:
+      return 'https://aptos.testnet.porto.movementlabs.xyz/v1'
   }
-  return 'https://mainnet.aptoslabs.com/v1'
 }
 
 export function getClient(network: AptosNetwork): Aptos {

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