Merge pull request #7287 from BitGo/derek/SC-3567-add-recent-blockhash-to-versioned-tx-flow

feat(sdk-coin-sol): add recentBlockhash to custom versioned solana tx flow

Author: derekchen745

modules/sdk-coin-sol/src/lib/iface.ts

@@ -261,6 +261,7 @@ export interface VersionedTransactionData {
     numReadonlySignedAccounts: number;
     numReadonlyUnsignedAccounts: number;
   };
+  recentBlockhash?: string;
 }
 
 export interface AddressLookupTable {

modules/sdk-coin-sol/src/lib/transactionBuilder.ts

@@ -258,8 +258,10 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
       data: Buffer.from(base58.decode(instruction.data)),
     }));
 
-    if (!this._recentBlockhash) {
-      throw new BuildTransactionError('Missing nonce (recentBlockhash) for VersionedTransaction');
+    const recentBlockhash = data.recentBlockhash || this._recentBlockhash;
+
+    if (!recentBlockhash) {
+      throw new BuildTransactionError('Missing recent blockhash for VersionedTransaction');
     }
 
     if (!this._sender) {
@@ -269,7 +271,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
     const messageV0 = new MessageV0({
       header: data.messageHeader,
       staticAccountKeys,
-      recentBlockhash: this._recentBlockhash,
+      recentBlockhash: recentBlockhash,
       compiledInstructions,
       addressTableLookups,
     });

modules/sdk-coin-sol/test/unit/versionedTransaction.ts

@@ -37,6 +37,7 @@ describe('Sol Jupiter Swap Transaction', () => {
       addressLookupTables,
       staticAccountKeys,
       messageHeader: originalDeserialized.message.header,
+      recentBlockhash: originalDeserialized.message.recentBlockhash,
     };
 
     const factory = getBuilderFactory('tsol');
@@ -197,7 +198,7 @@ describe('Sol Jupiter Swap Transaction', () => {
     );
   });
 
-  it('should not inject nonce advance when using regular nonce (no durableNonceParams)', async function () {
+  it('should not inject nonce advance when using recentBlockhash (no durableNonceParams)', async function () {
     const versionedTransactionData = {
       versionedInstructions: [
         {
@@ -213,6 +214,7 @@ describe('Sol Jupiter Swap Transaction', () => {
         numReadonlySignedAccounts: 0,
         numReadonlyUnsignedAccounts: 0,
       },
+      recentBlockhash: testData.blockHashes.validBlockHashes[0],
     };
 
     const factory = getBuilderFactory('tsol');

modules/sdk-core/src/bitgo/utils/tss/baseTypes.ts

@@ -68,6 +68,7 @@ export interface SolVersionedTransactionData {
     numReadonlySignedAccounts: number;
     numReadonlyUnsignedAccounts: number;
   };
+  recentBlockhash?: string;
 }
 
 export interface aptosCustomTransactionParams {

modules/sdk-core/src/bitgo/wallet/iWallet.ts

@@ -202,6 +202,7 @@ export interface PrebuildTransactionOptions {
       numReadonlySignedAccounts: number;
       numReadonlyUnsignedAccounts: number;
     };
+    recentBlockhash?: string;
   };
   /**
    * Custom transaction parameters for Aptos entry function calls.