sdk: Handle transceiver init edge cases

wormhole-foundation · Oct 18, 2024 · ded3294 · ded3294
1 parent 086f117
commit ded3294
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/cli/src/index.ts b/cli/src/index.ts
@@ -1798,7 +1798,7 @@ async function nttFromManager<N extends Network, C extends Chain>(
         ntt: {
             manager: nativeManagerAddress,
             token: null,
-            transceiver: { wormhole: null },
+            transceiver: {},
         }
     });
     const diff = await onlyManager.verifyAddresses();

diff --git a/evm/ts/src/ntt.ts b/evm/ts/src/ntt.ts
@@ -193,7 +193,10 @@ export class EvmNtt<N extends Network, C extends EvmChains>
     );
 
     this.xcvrs = [];
-    if (contracts.ntt.transceiver["wormhole"]) {
+    if (
+      "wormhole" in contracts.ntt.transceiver &&
+      contracts.ntt.transceiver["wormhole"]
+    ) {
       const transceiverTypes = [
         "wormhole", // wormhole xcvr should be ix 0
         ...Object.keys(contracts.ntt.transceiver).filter((transceiverType) => {
@@ -577,7 +580,7 @@ export class EvmNtt<N extends Network, C extends EvmChains>
       manager: this.managerAddress,
       token: this.tokenAddress,
       transceiver: {
-        wormhole: this.xcvrs[0]!.address,
+        ...(this.xcvrs.length > 0 && { wormhole: this.xcvrs[0]!.address }),
       },
       // TODO: what about the quoter?
     };
@@ -586,7 +589,9 @@ export class EvmNtt<N extends Network, C extends EvmChains>
       manager: this.managerAddress,
       token: await this.manager.token(),
       transceiver: {
-        wormhole: (await this.manager.getTransceivers())[0]!, // TODO: make this more generic
+        ...(this.xcvrs.length > 0 && {
+          wormhole: (await this.manager.getTransceivers())[0]!,
+        }), // TODO: make this more generic
       },
     };
 

diff --git a/solana/ts/sdk/ntt.ts b/solana/ts/sdk/ntt.ts
@@ -300,7 +300,10 @@ export class SolanaNtt<N extends Network, C extends SolanaChains>
     );
 
     this.transceivers = [];
-    if (contracts.ntt.transceiver["wormhole"]) {
+    if (
+      "wormhole" in contracts.ntt.transceiver &&
+      contracts.ntt.transceiver["wormhole"]
+    ) {
       const transceiverTypes = [
         "wormhole", // wormhole xcvr should be ix 0
         ...Object.keys(contracts.ntt.transceiver).filter((transceiverType) => {