add fee transfer ix to message example

Author: barnjamin

platforms/solana/protocols/core/src/core.ts

@@ -36,8 +36,10 @@ import {
   createPostVaaInstruction,
   createReadOnlyWormholeProgramInterface,
   createVerifySignaturesInstructions,
+  createBridgeFeeTransferInstruction,
   derivePostedVaaKey,
   getWormholeBridgeData,
+  BridgeData,
 } from './utils';
 
 const SOLANA_SEQ_LOG = 'Program log: Sequence: ';
@@ -82,6 +84,7 @@ export class SolanaWormholeCore<N extends Network, C extends SolanaChains>
       throw new Error(
         `Network mismatch for chain ${chain}: ${conf.network} != ${network}`,
       );
+
     return new SolanaWormholeCore(
       network as N,
       chain,

platforms/solana/protocols/tokenBridge/src/tokenBridge.ts

@@ -217,11 +217,12 @@ export class SolanaTokenBridge<N extends Network, C extends SolanaChains>
     const nonce = 0;
 
     const msgFee = await this.coreBridge.getMessageFee();
-    const transferIx = await coreUtils.createBridgeFeeTransferInstruction(
+    const transferIx = coreUtils.createBridgeFeeTransferInstruction(
       this.coreBridge.address,
       senderAddress,
       msgFee,
     );
+
     const messageKey = Keypair.generate();
     const attestIx = createAttestTokenInstruction(
       this.connection,

platforms/solana/src/platform.ts

@@ -166,18 +166,17 @@ export class SolanaPlatform<N extends Network> extends PlatformContext<
   // recoverable. Currently handles:
   // - Blockhash not found (blockhash too new for the node we submitted to)
   // - Not enough bytes (storage account not seen yet)
-
   private static async sendWithRetry(
     rpc: Connection,
-    stxns: SignedTx,
+    stxn: SignedTx,
     opts: SendOptions,
     retries: number = 3,
   ): Promise<string> {
     // Shouldnt get hit but just in case
     if (!retries) throw new Error('Too many retries');
 
     try {
-      const txid = await rpc.sendRawTransaction(stxns.tx, opts);
+      const txid = await rpc.sendRawTransaction(stxn, opts);
       return txid;
     } catch (e) {
       retries -= 1;
@@ -195,7 +194,7 @@ export class SolanaPlatform<N extends Network> extends PlatformContext<
 
       // Blockhash not found _yet_
       if (emsg.includes('Blockhash not found'))
-        return this.sendWithRetry(rpc, stxns, opts, retries);
+        return this.sendWithRetry(rpc, stxn, opts, retries);
 
       // Find the log message with the error details
       const loggedErr = e.logs.find((log) =>
@@ -204,7 +203,9 @@ export class SolanaPlatform<N extends Network> extends PlatformContext<
 
       // Probably caused by storage account not seen yet
       if (loggedErr && loggedErr.includes('Not enough bytes'))
-        return this.sendWithRetry(rpc, stxns, opts, retries);
+        return this.sendWithRetry(rpc, stxn, opts, retries);
+
+      throw e;
     }
   }