chore(sui): handle the case of package upgrade (#68)

sentioxyz · Jan 20, 2024 · 83a37b4 · 83a37b4
1 parent 81fb8f7
commit 83a37b4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/packages/aptos/src/move-coder.ts b/packages/aptos/src/move-coder.ts
@@ -16,7 +16,7 @@ export class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | Mov
     super(new AptosChainAdapter(client))
   }
 
-  load(module: MoveModuleBytecode): InternalMoveModule {
+  load(module: MoveModuleBytecode, address: string): InternalMoveModule {
     if (!module.abi) {
       throw Error('Module without abi')
     }
@@ -28,7 +28,7 @@ export class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | Mov
       return m
     }
     m = toInternalModule(module)
-    this.loadInternal(m)
+    this.loadInternal(m, address)
     return m
   }
 

diff --git a/packages/move/src/abstract-codegen.ts b/packages/move/src/abstract-codegen.ts
@@ -486,7 +486,7 @@ export class AccountCodegen<ModuleType, StructType> {
     export function loadAllTypes(coder: MoveCoder) {
       ${dependedAccounts.map((a) => `_${a}.loadAllTypes(coder)`).join('\n')}
       for (const m of Object.values(MODULES)) {
-        coder.load(m as any)
+        coder.load(m as any, '${address}')
       }
     }
     

diff --git a/packages/move/src/abstract-move-coder.ts b/packages/move/src/abstract-move-coder.ts
@@ -19,15 +19,23 @@ export abstract class AbstractMoveCoder<ModuleType, StructType> {
     return this.moduleMapping.has(moduleQname({ address: account, name }))
   }
 
-  abstract load(module: ModuleType): InternalMoveModule
+  abstract load(module: ModuleType, address: string): InternalMoveModule
 
-  protected loadInternal(module: InternalMoveModule) {
+  protected loadInternal(module: InternalMoveModule, address: string) {
     const account = accountAddressString(module.address)
+    const declareAccount = accountAddressString(address)
+
+    this._loadInternal(module, account)
+    if (account !== declareAccount) {
+      this._loadInternal(module, declareAccount)
+    }
+  }
+
+  private _loadInternal(module: InternalMoveModule, account: string) {
     if (this.contains(account, module.name)) {
       return
     }
     this.moduleMapping.set(moduleQname({ address: account, name: module.name }), module)
-
     for (const struct of module.structs) {
       // TODO move to util
       const key = [account, module.name, struct.name].join(SPLITTER)
@@ -69,7 +77,7 @@ export abstract class AbstractMoveCoder<ModuleType, StructType> {
     if (!resp) {
       resp = this.adapter.fetchModules(account).then((modules) => {
         for (const m of modules) {
-          this.load(m)
+          this.load(m, account)
         }
       })
       this.requestMap.set(account, resp)
@@ -97,7 +105,7 @@ export abstract class AbstractMoveCoder<ModuleType, StructType> {
         .fetchModules(account)
         .then((modules) => {
           for (const m of modules) {
-            this.load(m)
+            this.load(m, account)
           }
         })
         .catch((e) => {

diff --git a/packages/sui/src/move-coder.ts b/packages/sui/src/move-coder.ts
@@ -38,13 +38,13 @@ export class MoveCoder extends AbstractMoveCoder<
     super(new SuiChainAdapter(client))
   }
 
-  load(module: SuiMoveNormalizedModule): InternalMoveModule {
+  load(module: SuiMoveNormalizedModule, address: string): InternalMoveModule {
     let m = this.moduleMapping.get(module.address + '::' + module.name)
     if (m) {
       return m
     }
     m = toInternalModule(module)
-    this.loadInternal(m)
+    this.loadInternal(m, address)
     return m
   }