Fix TBRv3 library issues

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"
   },
   "devDependencies": {
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.3.0",
+    "@wormhole-foundation/sdk-definitions": "^1.3.0",
     "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"
   },
   "devDependencies": {
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.3.0",
+    "@wormhole-foundation/sdk-definitions": "^1.3.0",
+    "@wormhole-foundation/sdk-evm": "^1.3.0",
     "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

@@ -132,7 +132,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

@@ -33,20 +33,25 @@
   "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/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.3.0",
+    "@wormhole-foundation/sdk-definitions": "^1.3.0",
+    "@wormhole-foundation/sdk-solana": "^1.3.0",
     "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

@@ -50,6 +50,7 @@ const NATIVE_MINT_UNIVERSAL = new SolanaAddress(
 
 const KLAM_PER_SOL = 1_000_000n;
 const MWEI_PER_MICRO_ETH = 1_000_000n;
+const MICROTOKENS_PER_TOKEN = 1_000_000n;
 const MWEI_PER_ETH = 1_000_000_000_000n;
 
 export class AutomaticTokenBridgeV3Solana<N extends Network, C extends SolanaChains>
@@ -91,7 +92,8 @@ export class AutomaticTokenBridgeV3Solana<N extends Network, C extends SolanaCha
     provider: Connection,
     config: ChainsConfig<N, SolanaPlatformType>,
   ): Promise<AutomaticTokenBridgeV3Solana<N, SolanaChains>> {
-    const [network, chain] = await SolanaPlatform.chainFromRpc(provider);
+    // TODO: Update @solana/web3.js to the latest version
+    const [network, chain] = await SolanaPlatform.chainFromRpc(provider as any);
     const conf = config[chain]!;
 
     if (conf.network !== network)
@@ -165,7 +167,7 @@ export class AutomaticTokenBridgeV3Solana<N extends Network, C extends SolanaCha
     }
 
     const senderPk = new PublicKey(params.sender.toNative('Solana').toString());
-    const gasDropoffAmount = Number(sdkAmount.display(params.gasDropOff));
+    const gasDropoffAmountMicro = Number(sdkAmount.display(params.gasDropOff)) * Number(MICROTOKENS_PER_TOKEN);
 
     transaction.add(
       await this.client.transferTokens(senderPk, {
@@ -175,9 +177,10 @@ export class AutomaticTokenBridgeV3Solana<N extends Network, C extends SolanaCha
         },
         userTokenAccount: ata,
         transferredAmount: BigInt(params.amount.toString()),
-        gasDropoffAmount,
+        gasDropoffAmount: gasDropoffAmountMicro,
         maxFeeLamports: BigInt(params.fee.toString() || 0),
         unwrapIntent: params.unwrapIntent,
+        mintAddress: mint,
       }),
     );
 
@@ -187,7 +190,8 @@ export class AutomaticTokenBridgeV3Solana<N extends Network, C extends SolanaCha
     // create a versioned transaction to avoid errors down the line due to
     // different Transaction constructors from different @solana/web3.js package versions
     yield new SolanaUnsignedTransaction(
-      { transaction: new VersionedTransaction(transaction.compileMessage()) },
+      // TODO: Update @solana/web3.js to the latest version
+      { transaction: new VersionedTransaction(transaction.compileMessage()) } as any,
       this.network,
       this.chainName,
       'TokenBridgeRelayerV3.transfer',
@@ -223,7 +227,8 @@ export class AutomaticTokenBridgeV3Solana<N extends Network, C extends SolanaCha
     // create a versioned transaction to avoid errors down the line due to
     // different Transaction constructors from different @solana/web3.js package versions
     yield new SolanaUnsignedTransaction(
-      { transaction: new VersionedTransaction(transaction.compileMessage()) },
+      // TODO: Update @solana/web3.js to the latest version
+      { transaction: new VersionedTransaction(transaction.compileMessage()) } as any,
       this.network,
       this.chainName,
       'TokenBridgeRelayerV3.redeem',
@@ -265,7 +270,7 @@ export class AutomaticTokenBridgeV3Solana<N extends Network, C extends SolanaCha
     const config = await this.client.account.chainConfig(chain).fetch();
 
     return {
-      maxGasDropoff: config.maxGasDropoffMicroToken,
+      maxGasDropoff: config.maxGasDropoffMicroToken / Number(MICROTOKENS_PER_TOKEN),
       baseFee: config.relayerFeeMicroUsd,
       paused: config.pausedOutboundTransfers,
       canonicalPeer: new UniversalAddress(new Uint8Array(config.canonicalPeer)),

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"
   },
   "devDependencies": {
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.3.0",
+    "@wormhole-foundation/sdk-connect": "^1.3.0",
+    "@wormhole-foundation/sdk-definitions": "^1.3.0",
     "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/helpers/solana.ts

@@ -94,11 +94,13 @@ export async function getSigner(): Promise<SolanaSigner> {
       console.log("Creating wallet signer");
       const pk = Uint8Array.from(JSON.parse(privateKey));
       const keypair = Keypair.fromSecretKey(pk);
+      // @ts-expect-error TODO: Update @coral-xyz/anchor to fix this type issue
       const wallet = new NodeWallet(keypair);
 
       signer = {
         getAddress: () => Promise.resolve(wallet.publicKey.toBuffer()),
         raw: () => wallet,
+        // @ts-expect-error TODO: Update @coral-xyz/anchor to fix this type issue
         signTransaction: async (transaction) => (await wallet.signTransaction(transaction)).compileMessage().serialize(),
         type: "wallet"
       } 
@@ -155,6 +157,7 @@ async function addSignature(tx: Transaction, signer: SolanaSigner, signerPk: Pub
     tx.addSignature(signerPk, signedByPayer);
     return tx;
   } else {
+    // @ts-expect-error TODO: Update @coral-xyz/anchor to fix this type issue
     return await (signer.raw() as NodeWallet).signTransaction(tx);
   }
 }

deployment/package.json

@@ -21,14 +21,14 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
     "@solana/spl-token": "^0.4.8",
-    "@solana/web3.js": "^1.95.3",
+    "@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.3.0",
+    "@wormhole-foundation/sdk-definitions": "^1.3.0",
+    "@wormhole-foundation/sdk-evm": "^1.3.0",
+    "@wormhole-foundation/sdk-evm-tokenbridge": "^1.3.0",
+    "@wormhole-foundation/sdk-solana": "^1.3.0",
+    "@wormhole-foundation/sdk-solana-tokenbridge": "^1.3.0",
     "@xlabs-xyz/evm-arbitrary-token-transfers": "workspace:*",
     "@xlabs-xyz/ledger-signer": "^0.0.4",
     "@xlabs-xyz/ledger-signer-ethers-v6": "^0.0.1",

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);

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.3.0",
+    "@wormhole-foundation/sdk-definitions": "^1.3.0",
     "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"
   },
   "devDependencies": {
     "@types/chai": "^4.3.19",
     "@types/mocha": "^10",
     "@types/node": "20.17.5",
+    "@wormhole-foundation/sdk-base": "^1.3.0",
+    "@wormhole-foundation/sdk-definitions": "^1.3.0",
+    "@wormhole-foundation/sdk-evm": "^1.3.0",
     "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"