@sentio/sdk 2.23.0-rc.1 → 2.24.0-rc.1

package/src/aptos/codegen/codegen.ts

@@ -1,10 +1,11 @@
 import * as fs from 'fs'
-import { Event, MoveModuleBytecode, MoveResource } from '../move-types.js'
 import chalk from 'chalk'
-import { AptosNetwork } from '../network.js'
-import { join } from 'path'
-import { AptosChainAdapter } from '../aptos-chain-adapter.js'
-import { AbstractCodegen } from '../../move/abstract-codegen.js'
+import path, { join } from 'path'
+import { AptosCodegen as BaseAptosCodegen } from '@typemove/aptos/codegen'
+import { InternalMoveModule, InternalMoveStruct } from '@typemove/move'
+import { AptosNetwork, getRpcEndpoint } from '../network.js'
+import { MoveModuleBytecode, MoveResource } from '@typemove/aptos'
+import { SharedNetworkCodegen } from '../../move/shared-network-codegen.js'
 
 export async function codegen(
   abisDir: string,
@@ -20,12 +21,50 @@ export async function codegen(
   console.log(chalk.green(`Generated ${numFiles} for Aptos`))
 }
 
-class AptosCodegen extends AbstractCodegen<AptosNetwork, MoveModuleBytecode, Event | MoveResource> {
-  MAIN_NET = AptosNetwork.MAIN_NET
-  TEST_NET = AptosNetwork.TEST_NET
-  PREFIX = 'Aptos'
+class AptosNetworkCodegen extends BaseAptosCodegen {
+  moduleGenerator: SharedNetworkCodegen<AptosNetwork, MoveModuleBytecode, Event | MoveResource>
 
-  constructor() {
-    super(AptosChainAdapter.INSTANCE)
+  constructor(network: AptosNetwork) {
+    const endpoint = getRpcEndpoint(network)
+    super(endpoint)
+    this.moduleGenerator = new (class extends SharedNetworkCodegen<
+      AptosNetwork,
+      MoveModuleBytecode,
+      Event | MoveResource
+    > {
+      ADDRESS_TYPE = 'Address'
+      PREFIX = 'Aptos'
+      SYSTEM_PACKAGE = '@typemove/aptos'
+
+      generateNetworkOption(network: AptosNetwork): string {
+        switch (network) {
+          case AptosNetwork.MAIN_NET:
+            return 'MAIN_NET'
+          default:
+            return 'TEST_NET'
+        }
+      }
+    })(network, this.chainAdapter)
+  }
+
+  generateModule(module: InternalMoveModule, allEventStructs: Map<string, InternalMoveStruct>) {
+    return this.moduleGenerator.generateModule(module, allEventStructs)
+  }
+  generateImports() {
+    return this.moduleGenerator.generateImports()
+  }
+  generateLoadAll(isSystem: boolean): string {
+    return this.moduleGenerator.generateLoadAll(isSystem)
+  }
+}
+
+const MAINNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MAIN_NET)
+const TESTNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.TEST_NET)
+
+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)
+    return num1 + num2
   }
 }

package/src/aptos/context.ts

@@ -1,8 +1,8 @@
 import { RecordMetaData } from '@sentio/protos'
 import { type Labels, normalizeLabels } from '@sentio/sdk'
-import { Event, MoveModuleBytecode, MoveResource, Transaction_UserTransaction } from './move-types.js'
+import { Event, MoveModuleBytecode, MoveResource, Transaction_UserTransaction, MoveCoder } from '@sentio/sdk/aptos'
+import { defaultMoveCoder } from './move-coder.js'
 import { AptosNetwork } from './network.js'
-import { defaultMoveCoder, MoveCoder } from './move-coder.js'
 import { Endpoints } from '@sentio/runtime'
 import { ServerError, Status } from 'nice-grpc'
 import { AptosClient } from 'aptos-sdk'
@@ -54,7 +54,7 @@ export class AptosContext extends MoveContext<AptosNetwork, MoveModuleBytecode,
       logIndex: this.eventIndex,
       chainId: this.getChainId(),
       name: name,
-      labels: normalizeLabels(labels),
+      labels: normalizeLabels(labels)
     }
   }
 
@@ -99,7 +99,7 @@ export class AptosResourcesContext extends MoveAccountContext<AptosNetwork, Move
       logIndex: 0,
       chainId: this.getChainId(),
       name: name,
-      labels: normalizeLabels(labels),
+      labels: normalizeLabels(labels)
     }
   }
 

package/src/aptos/ext/coin-event.ts

@@ -1,5 +1,5 @@
 import { Event, Transaction_UserTransaction } from '@sentio/sdk/aptos'
-import { Types } from 'aptos-sdk'
+import { Types } from 'aptos-sdk' // TODO just use aptos without break test
 import { coin } from '../builtin/0x1.js'
 import { parseMoveType } from '../../move/index.js'
 
@@ -23,7 +23,7 @@ export function findNewCoinBalances(
       continue
     }
     return {
-      value: BigInt((writeResource.data.data as any).coin.value),
+      value: BigInt((writeResource.data.data as any).coin.value)
     }
   }
   return undefined