cleanup

Author: kev1n-peters

platforms/aptos/package.json

@@ -99,4 +99,4 @@
       }
     }
   }
-}
+}

platforms/evm/package.json

@@ -130,4 +130,4 @@
       }
     }
   }
-}
+}

platforms/evm/protocols/tbtc/src/bridge.ts

@@ -34,6 +34,8 @@ export class EvmTBTCBridge<N extends Network, C extends EvmChains = EvmChains>
   gatewayAddress: string;
   gateway: Contract;
 
+  tbtcTokenAddr: string;
+
   constructor(
     readonly network: N,
     readonly chain: C,
@@ -48,6 +50,11 @@ export class EvmTBTCBridge<N extends Network, C extends EvmChains = EvmChains>
       throw new Error('TBTC contract address is required');
     }
 
+    const tbtcToken = TBTCBridge.getNativeTbtcToken(this.chain);
+    if (!tbtcToken) {
+      throw new Error('Native tbtc token not found');
+    }
+
     this.chainId = nativeChainIds.networkChainToNativeChainId.get(
       network,
       chain,
@@ -65,6 +72,8 @@ export class EvmTBTCBridge<N extends Network, C extends EvmChains = EvmChains>
       ],
       provider,
     );
+
+    this.tbtcTokenAddr = canonicalAddress(tbtcToken);
   }
 
   static async fromRpc<N extends Network>(
@@ -87,11 +96,6 @@ export class EvmTBTCBridge<N extends Network, C extends EvmChains = EvmChains>
   ): AsyncGenerator<EvmUnsignedTransaction<N, C>> {
     const senderAddress = new EvmAddress(sender).toString();
 
-    const tbtcToken = TBTCBridge.getNativeTbtcToken(this.chain);
-    if (!tbtcToken) {
-      throw new Error('Native tbtc token not found');
-    }
-
     const tx = await this.gateway.sendTbtc!.populateTransaction(
       amount,
       toChainId(recipient.chain),
@@ -101,12 +105,7 @@ export class EvmTBTCBridge<N extends Network, C extends EvmChains = EvmChains>
     );
     tx.value = await this.core.getMessageFee();
 
-    yield* this.approve(
-      canonicalAddress(tbtcToken),
-      senderAddress,
-      amount,
-      this.gatewayAddress,
-    );
+    yield* this.approve(senderAddress, amount, this.gatewayAddress);
 
     yield this.createUnsignedTransaction(
       addFrom(tx, senderAddress),
@@ -118,6 +117,10 @@ export class EvmTBTCBridge<N extends Network, C extends EvmChains = EvmChains>
     sender: AccountAddress<C>,
     vaa: TBTCBridge.VAA,
   ): AsyncGenerator<EvmUnsignedTransaction<N, C>> {
+    if (vaa.payloadName !== 'GatewayTransfer') {
+      throw new Error('Invalid VAA payload');
+    }
+
     const address = new EvmAddress(sender).toString();
 
     const tx = await this.gateway.receiveTbtc!.populateTransaction(
@@ -131,14 +134,13 @@ export class EvmTBTCBridge<N extends Network, C extends EvmChains = EvmChains>
   }
 
   private async *approve(
-    token: string,
     senderAddr: string,
     amount: bigint,
     contract: string,
   ): AsyncGenerator<EvmUnsignedTransaction<N, C>> {
     const tokenContract = EvmPlatform.getTokenImplementation(
       this.provider,
-      token,
+      this.tbtcTokenAddr,
     );
     const allowance = await tokenContract.allowance(senderAddr, contract);
     if (allowance < amount) {

platforms/solana/protocols/tbtc/src/bridge.ts

@@ -135,15 +135,15 @@ export class SolanaTBTCBridge<N extends Network, C extends SolanaChains>
 
     const coreFeeCollector = coreUtils.deriveFeeCollectorKey(this.coreBridgeId);
 
+    // NOTE: There is a race condition where the sequence changes
+    // while the transaction is in flight. This would cause the
+    // transaction to fail and the user would have to retry.
     const { sequence } = await coreUtils.getProgramSequenceTracker(
       this.connection,
       this.tokenBridgeId,
       this.coreBridgeId,
     );
 
-    // NOTE: There is a race condition where the sequence changes
-    // before the transaction is confirmed. This would cause the
-    // transaction to fail.
     const coreMessage = getCoreMessagePda(this.gateway.programId, sequence);
 
     const coreBridgeData = coreUtils.deriveWormholeBridgeDataKey(

sdk/package.json

@@ -413,4 +413,4 @@
     "@wormhole-foundation/sdk-algorand-tokenbridge": "1.0.3"
   },
   "type": "module"
-}
+}