Fix TBRv3 library issues

.github/workflows/ci_test.yaml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17.0"
+          node-version: "20.18.1"
           registry-url: "https://npm.pkg.github.com"
           cache: "yarn"
           cache-dependency-path: |

.yarnrc.yml

@@ -1,26 +1,27 @@
 # yarn zero install's "binary" can't describe references relative to the global cache reliably, so we disable it
 enableGlobalCache: false
 
-yarnPath: .yarn/releases/yarn-4.4.1.cjs
+npmPublishRegistry: "https://npm.pkg.github.com"
 
-npmPublishRegistry: 'https://npm.pkg.github.com'
 npmScopes:
   xlabs:
-    npmRegistryServer: 'https://npm.pkg.github.com'
+    npmRegistryServer: "https://npm.pkg.github.com"
   xlabs-xyz:
-    npmPublishRegistry: 'https://registry.npmjs.org'
-    npmRegistryServer: 'https://registry.npmjs.org'
+    npmPublishRegistry: "https://registry.npmjs.org"
+    npmRegistryServer: "https://registry.npmjs.org"
 
 supportedArchitectures:
   cpu:
     - current
     - x64
     - arm64
-  os:
-    - current
-    - darwin
-    - linux
   libc:
     - current
     - glibc
     - musl
+  os:
+    - current
+    - darwin
+    - linux
+
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

connect/definitions/package.json

@@ -31,17 +31,21 @@
   "author": "",
   "license": "Apache 2",
   "dependencies": {
-    "@wormhole-foundation/sdk-base": "^1.1.1",
-    "@wormhole-foundation/sdk-definitions": "^1.1.1",
-    "ethers": "^6.13.3"
+    "ethers": "^6.13.5"
   },
   "devDependencies": {
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.4.5",
+    "@wormhole-foundation/sdk-definitions": "^1.4.5",
     "prettier": "^3.3.3",
     "tsup": "^8.3.5",
     "tsx": "4.19.2",
     "typescript": "5.6.3"
   },
+  "peerDependencies": {
+    "@wormhole-foundation/sdk-base": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-definitions": ">= 1.3.0 < 2"
+  },
   "tsup": {
     "entry": [
       "src/index.ts"

connect/platforms/evm/package.json

@@ -31,20 +31,25 @@
   "author": "",
   "license": "Apache 2",
   "dependencies": {
-    "@wormhole-foundation/sdk-base": "^1.1.1",
-    "@wormhole-foundation/sdk-definitions": "^1.1.1",
-    "@wormhole-foundation/sdk-evm": "^1.1.1",
     "@xlabs-xyz/arbitrary-token-transfers-definitions": "workspace:*",
     "@xlabs-xyz/evm-arbitrary-token-transfers": "workspace:*",
-    "ethers": "^6.13.3"
+    "ethers": "^6.13.5"
   },
   "devDependencies": {
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.4.5",
+    "@wormhole-foundation/sdk-definitions": "^1.4.5",
+    "@wormhole-foundation/sdk-evm": "^1.4.5",
     "prettier": "^3.3.3",
     "tsup": "^8.3.5",
     "tsx": "4.19.2",
     "typescript": "5.6.3"
   },
+  "peerDependencies": {
+    "@wormhole-foundation/sdk-base": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-definitions": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-evm": ">= 1.3.0 < 2"
+  },
   "tsup": {
     "entry": [
       "src/index.ts"

connect/platforms/evm/src/automatic.ts

@@ -10,8 +10,6 @@ import {
   ChainsConfig,
   Contracts,
   isNative,
-  resolveWrappedToken,
-  toNative,
   VAA,
 } from '@wormhole-foundation/sdk-definitions';
 import '@wormhole-foundation/sdk-evm';
@@ -132,7 +130,7 @@ export class AutomaticTokenBridgeV3EVM<N extends Network, C extends EvmChains>
           address: params.recipient.address.toUniversalAddress(),
           chain: recipientChain,
         },
-        unwrapIntent: true, // TODO: receive as option/param? would require UI work
+        unwrapIntent: params.unwrapIntent,
       },
       feeEstimation: {
         fee,

connect/platforms/solana/package.json

@@ -32,21 +32,26 @@
   "license": "Apache 2",
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
-    "@solana/spl-token": "0.3.9",
-    "@solana/web3.js": "^1.95.3",
-    "@wormhole-foundation/sdk-base": "^1.1.1",
-    "@wormhole-foundation/sdk-definitions": "^1.1.1",
-    "@wormhole-foundation/sdk-solana": "^1.1.1",
+    "@solana/spl-token": "0.4.9",
+    "@solana/web3.js": "^1.98.0",
     "@xlabs-xyz/arbitrary-token-transfers-definitions": "workspace:*",
     "@xlabs-xyz/solana-arbitrary-token-transfers": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.4.5",
+    "@wormhole-foundation/sdk-definitions": "^1.4.5",
+    "@wormhole-foundation/sdk-solana": "^1.4.5",
     "prettier": "^3.3.3",
     "tsup": "^8.3.5",
     "tsx": "4.19.2",
     "typescript": "5.6.3"
   },
+  "peerDependencies": {
+    "@wormhole-foundation/sdk-base": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-definitions": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-solana": ">= 1.3.0 < 2"
+  },
   "tsup": {
     "entry": [
       "src/index.ts"

connect/platforms/solana/src/automatic.ts

@@ -178,6 +178,7 @@ export class AutomaticTokenBridgeV3Solana<N extends Network, C extends SolanaCha
         gasDropoffAmount,
         maxFeeLamports: BigInt(params.fee.toString() || 0),
         unwrapIntent: params.unwrapIntent,
+        mintAddress: mint,
       }),
     );
 
@@ -262,14 +263,7 @@ export class AutomaticTokenBridgeV3Solana<N extends Network, C extends SolanaCha
   }
 
   async baseRelayingParams(chain: SupportedChains): Promise<BaseRelayingParams> {
-    const config = await this.client.account.chainConfig(chain).fetch();
-
-    return {
-      maxGasDropoff: config.maxGasDropoffMicroToken,
-      baseFee: config.relayerFeeMicroUsd,
-      paused: config.pausedOutboundTransfers,
-      canonicalPeer: new UniversalAddress(new Uint8Array(config.canonicalPeer)),
-    };
+    return this.client.baseRelayingParams(chain);
   }
 
   private mintAddress(token: TokenAddress<Chain>): PublicKey {

connect/route/package.json

@@ -31,21 +31,26 @@
   "author": "",
   "license": "Apache 2",
   "dependencies": {
-    "@wormhole-foundation/sdk-base": "^1.1.1",
-    "@wormhole-foundation/sdk-connect": "^1.1.1",
-    "@wormhole-foundation/sdk-definitions": "^1.1.1",
     "@xlabs-xyz/arbitrary-token-transfer-evm-route": "workspace:*",
     "@xlabs-xyz/arbitrary-token-transfer-solana-route": "workspace:*",
     "@xlabs-xyz/arbitrary-token-transfers-definitions": "workspace:*",
-    "ethers": "^6.13.3"
+    "ethers": "^6.13.5"
   },
   "devDependencies": {
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.4.5",
+    "@wormhole-foundation/sdk-connect": "^1.4.5",
+    "@wormhole-foundation/sdk-definitions": "^1.4.5",
     "prettier": "^3.3.3",
     "tsup": "^8.3.5",
     "tsx": "4.19.2",
     "typescript": "5.6.3"
   },
+  "peerDependencies": {
+    "@wormhole-foundation/sdk-base": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-connect": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-definitions": ">= 1.3.0 < 2"
+  },
   "tsup": {
     "entry": [
       "src/index.ts"

connect/route/src/route.ts

@@ -22,16 +22,15 @@ import {
 } from '@wormhole-foundation/sdk-connect';
 import {
   isNative,
-  TokenAddress,
   toNative,
-  UniversalAddress,
   UniversalOrNative,
 } from '@wormhole-foundation/sdk-definitions';
 import {
   SupportedChains,
   tokenBridgeRelayerV3Chains,
 } from '@xlabs-xyz/arbitrary-token-transfers-definitions';
-import '@xlabs-xyz/arbitrary-token-transfers-definitions';
+import '@xlabs-xyz/arbitrary-token-transfer-evm-route';
+import '@xlabs-xyz/arbitrary-token-transfer-solana-route';
 
 interface TransferOptions {
   nativeGas: number; // this is a percentage
@@ -48,6 +47,10 @@ interface QuotedTransferOptions extends ValidatedTransferOptions {
 
 type Receipt = TransferReceipt<AttestationReceipt<'AutomaticTokenBridgeV3'>>;
 
+export interface AutomaticTokenBridgeRouteV3Config {
+  allowedTokenAddresses?: TokenId<Chain>[];
+}
+
 export class AutomaticTokenBridgeRouteV3<N extends Network>
   extends routes.AutomaticRoute<N, any, any, any>
   implements routes.StaticRouteMethods<typeof AutomaticTokenBridgeRouteV3>
@@ -68,10 +71,18 @@ export class AutomaticTokenBridgeRouteV3<N extends Network>
     return [...(chains || [])];
   }
 
+  static config: AutomaticTokenBridgeRouteV3Config | undefined = undefined;
+
   static async supportedSourceTokens(fromChain: ChainContext<Network>): Promise<TokenId[]> {
+    const allowedTokenAddresses = this.config?.allowedTokenAddresses || [];
+    const isWhitelistConfigAvailable = this.config && allowedTokenAddresses.length > 0;
     return Object.values(fromChain.config.tokenMap!).map((td) =>
       Wormhole.tokenId(td.chain, td.address),
-    );
+    ).filter((token) => !(isWhitelistConfigAvailable && !allowedTokenAddresses.some(
+      (whitelistedToken) =>
+        whitelistedToken.chain === token.chain &&
+        whitelistedToken.address.toString() === token.address.toString()
+    )))
   }
 
   static async supportedDestinationTokens<N extends Network>(

deployment/package.json

@@ -20,23 +20,23 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
-    "@solana/spl-token": "^0.4.8",
-    "@solana/web3.js": "^1.95.3",
+    "@solana/spl-token": "^0.4.9",
+    "@solana/web3.js": "^1.98.0",
     "@typechain/ethers-v6": "^0.5.1",
-    "@wormhole-foundation/sdk-base": "^1.1.1",
-    "@wormhole-foundation/sdk-definitions": "^1.1.1",
-    "@wormhole-foundation/sdk-evm": "^1.1.1",
-    "@wormhole-foundation/sdk-evm-tokenbridge": "^1.1.1",
-    "@wormhole-foundation/sdk-solana": "^1.1.1",
-    "@wormhole-foundation/sdk-solana-tokenbridge": "^1.1.1",
+    "@wormhole-foundation/sdk-base": "^1.4.5",
+    "@wormhole-foundation/sdk-definitions": "^1.4.5",
+    "@wormhole-foundation/sdk-evm": "^1.4.5",
+    "@wormhole-foundation/sdk-evm-tokenbridge": "^1.4.5",
+    "@wormhole-foundation/sdk-solana": "^1.4.5",
+    "@wormhole-foundation/sdk-solana-tokenbridge": "^1.4.5",
     "@xlabs-xyz/evm-arbitrary-token-transfers": "workspace:*",
     "@xlabs-xyz/ledger-signer": "^0.0.4",
     "@xlabs-xyz/ledger-signer-ethers-v6": "^0.0.1",
     "@xlabs-xyz/ledger-signer-solana": "^0.0.1",
     "@xlabs-xyz/solana-arbitrary-token-transfers": "workspace:*",
     "chalk": "^5.3.0",
     "dotenv": "^16.4.5",
-    "ethers": "^6.13.4",
+    "ethers": "^6.13.5",
     "typechain": "^8.3.2"
   }
 }

deployment/test/test-transfer.ts

@@ -320,6 +320,7 @@ async function sendSolanaTestTransaction(
         gasDropoffAmount,
         maxFeeLamports,
         unwrapIntent,
+        mintAddress: mint,
       } satisfies TransferParameters;
 
       transferIx = await tbr.transferTokens(signerKey, params);

package.json

@@ -52,5 +52,5 @@
     "connect/platforms/*",
     "connect/route"
   ],
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.6.0"
 }

sdk/common/index.ts

@@ -1,9 +1,9 @@
 import {
   CustomConversion,
+  deserializeLayout,
   Layout,
-  layout,
-  LayoutItem,
   LayoutToType,
+  serializeLayout,
 } from '@wormhole-foundation/sdk-base';
 import { layoutItems, UniversalAddress, VAA } from '@wormhole-foundation/sdk-definitions';
 
@@ -27,11 +27,11 @@ export function throwError(message: string): never {
 
 /** Deserialize the inner payload aka the message: `vaa.payload.payload`. */
 export function deserializeTbrV3Message(payload: Uint8Array): TbrV3Payload {
-  return layout.deserializeLayout(TBRv3MessageLayout, payload);
+  return deserializeLayout(TBRv3MessageLayout, payload);
 }
 
 export function serializeTbrV3Message(message: TbrV3Payload): Uint8Array {
-  return layout.serializeLayout(TBRv3MessageLayout, message);
+  return serializeLayout(TBRv3MessageLayout, message);
 }
 
 export function toVaaWithTbrV3Message(vaa: VaaMessage): VaaMessageWithTbrV3Payload {
@@ -64,7 +64,7 @@ const gasDropoffItem = {
   binary: 'uint',
   size: 4,
   custom: decimalDownShift(6),
-} as const satisfies LayoutItem;
+} as const;
 
 export const TBRv3MessageLayout = [
   //we can turn this into a switch layout if we ever get a version 1

sdk/common/package.json

@@ -22,17 +22,21 @@
     "prettier": "prettier --write ."
   },
   "dependencies": {
-    "@wormhole-foundation/sdk-base": "^1.1.1",
-    "@wormhole-foundation/sdk-definitions": "^1.1.1",
     "bn.js": "^5.2.1"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.5",
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.4.5",
+    "@wormhole-foundation/sdk-definitions": "^1.4.5",
     "tsup": "^8.3.5",
     "tsx": "4.19.2",
     "typescript": "5.6.3"
   },
+  "peerDependencies": {
+    "@wormhole-foundation/sdk-base": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-definitions": ">= 1.3.0 < 2"
+  },
   "tsup": {
     "entry": [
       "index.ts"

sdk/evm/package.json

@@ -32,21 +32,26 @@
   "author": "",
   "license": "Apache 2",
   "dependencies": {
-    "@wormhole-foundation/sdk-base": "^1.1.1",
-    "@wormhole-foundation/sdk-definitions": "^1.1.1",
-    "@wormhole-foundation/sdk-evm": "^1.1.1",
-    "ethers": "^6.13.4"
+    "ethers": "^6.13.5"
   },
   "devDependencies": {
     "@types/chai": "^4.3.19",
     "@types/mocha": "^10",
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.4.5",
+    "@wormhole-foundation/sdk-definitions": "^1.4.5",
+    "@wormhole-foundation/sdk-evm": "^1.4.5",
     "chai": "^5.1.1",
     "mocha": "^10.7.3",
     "tsup": "^8.3.5",
     "tsx": "4.19.2",
     "typescript": "5.6.3"
   },
+  "peerDependencies": {
+    "@wormhole-foundation/sdk-base": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-definitions": ">= 1.3.0 < 2",
+    "@wormhole-foundation/sdk-evm": ">= 1.3.0 < 2"
+  },
   "tsup": {
     "entry": [
       "tbrv3/index.ts"