fix(move): return type should be registered (#119)

sentioxyz · Nov 12, 2024 · 0def7f3 · 0def7f3
1 parent 5e3c019
commit 0def7f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/packages/aptos/src/codegen/codegen.ts b/packages/aptos/src/codegen/codegen.ts
@@ -48,7 +48,7 @@ export class AptosCodegen extends AbstractCodegen<MoveModuleBytecode, Event | Mo
       import { Aptos, Account as AptosAccount, MoveAddressType, PendingTransactionResponse, InputGenerateTransactionOptions, MoveStructId, InputViewFunctionData } from '@aptos-labs/ts-sdk'
     `
   }
-  protected generateExtra(address: string, module: InternalMoveModule) {
+  protected generateExtra(address: string | undefined, module: InternalMoveModule) {
     const funcs = module.exposedFunctions.map((f) => this.generateEntryForFunction(module, f))
 
     const viewFuncs = module.exposedFunctions.map((f) => this.generateViewFunction(module, f))

diff --git a/packages/move/src/account.ts b/packages/move/src/account.ts
@@ -30,18 +30,12 @@ export class AccountRegister {
   accountImports = new Map<string, AccountModulesImportInfo>()
   pendingAccounts = new Set<string>()
 
-  register(
-    module: InternalMoveModule,
-    tsModuleName: string
-  ): AccountModulesImportInfo {
+  register(module: InternalMoveModule, tsModuleName: string): AccountModulesImportInfo {
     const currentModuleFqn = moduleQname(module)
 
     let accountModuleImports = this.accountImports.get(module.address)
     if (!accountModuleImports) {
-      accountModuleImports = new AccountModulesImportInfo(
-        module.address,
-        tsModuleName
-      )
+      accountModuleImports = new AccountModulesImportInfo(module.address, tsModuleName)
       this.accountImports.set(module.address, accountModuleImports)
       // the account has already be processed, delete pending task
       this.pendingAccounts.delete(module.address)
@@ -54,15 +48,12 @@ export class AccountRegister {
     return accountModuleImports
   }
 
-  private registerFunctions(
-    module: InternalMoveModule,
-    accountModuleImports: AccountModulesImportInfo
-  ): void {
+  private registerFunctions(module: InternalMoveModule, accountModuleImports: AccountModulesImportInfo): void {
     for (const func of module.exposedFunctions) {
       if (!func.isEntry) {
         continue
       }
-      for (const param of func.params) {
+      for (const param of func.params.concat(func.return)) {
         for (const type of param.dependedTypes()) {
           const [account, module] = moduleQnameForType(type)
           accountModuleImports.addImport(account, module)
@@ -74,10 +65,7 @@ export class AccountRegister {
     }
   }
 
-  private registerStruct(
-    module: InternalMoveModule,
-    accountModuleImports: AccountModulesImportInfo
-  ): void {
+  private registerStruct(module: InternalMoveModule, accountModuleImports: AccountModulesImportInfo): void {
     for (const struct of module.structs) {
       for (const field of struct.fields) {
         for (const type of field.type.dependedTypes()) {