solana: add timeout for tx retry

solana/ts/auction-participant/utils/config.ts

@@ -34,7 +34,7 @@ export type SolanaConnectionConfig = {
     rpc: string;
     ws?: string;
     commitment: Commitment;
-    nonceAccount: PublicKeyInitData;
+    nonceAccount?: PublicKeyInitData;
     addressLookupTable: PublicKeyInitData;
 };
 
@@ -147,6 +147,10 @@ export class AppConfig {
     }
 
     solanaNonceAccount(): PublicKey {
+        if (this._cfg.connection.nonceAccount === undefined) {
+            throw new Error("nonceAccount is not configured");
+        }
+
         return new PublicKey(this._cfg.connection.nonceAccount);
     }
 
@@ -277,7 +281,9 @@ function validateEnvironmentConfig(cfg: any): EnvironmentConfig {
     }
 
     // check nonce account pubkey
-    new PublicKey(cfg.connection.nonceAccount);
+    if (cfg.connection.nonceAccount !== undefined) {
+        new PublicKey(cfg.connection.nonceAccount);
+    }
 
     // check address lookup table pubkey
     new PublicKey(cfg.connection.addressLookupTable);

solana/ts/auction-participant/utils/placeInitialOffer.ts

@@ -149,7 +149,6 @@ export async function handlePlaceInitialOffer(
         {
             computeUnits: cfg.initiateAuctionComputeUnits(),
             feeMicroLamports: 10,
-            nonceAccount: cfg.solanaNonceAccount(),
         },
         {
             commitment: cfg.solanaCommitment(),

solana/ts/auction-participant/utils/preparePostVaaTx.ts

@@ -50,15 +50,14 @@ export async function preparePostVaaTxs(
         const sigVerifyIx = vaaVerifySignaturesIxs.pop()!;
         // This is a spicy meatball. Advance nonce ix + two compute budget ixs precede the
         // sig verify ix.
-        unsafeFixSigVerifyIx(sigVerifyIx, 3);
+        unsafeFixSigVerifyIx(sigVerifyIx, 2);
         const verifySigsIx = vaaVerifySignaturesIxs.pop()!;
 
         const preparedVerify: PreparedTransaction = {
             ixs: [sigVerifyIx, verifySigsIx],
             signers: [payer, vaaSignatureSet],
             computeUnits: cfg.verifySignaturesComputeUnits(),
             feeMicroLamports: 10,
-            nonceAccount: cfg.solanaNonceAccount(),
             txName: "verifySignatures",
             confirmOptions,
         };
@@ -68,7 +67,6 @@ export async function preparePostVaaTxs(
             signers: [payer],
             computeUnits: cfg.postVaaComputeUnits(),
             feeMicroLamports: 10,
-            nonceAccount: cfg.solanaNonceAccount(),
             txName: "postVAA",
             confirmOptions,
         };

solana/ts/auction-participant/utils/sendTx.ts

@@ -37,15 +37,16 @@ export async function sendTxBatch(
     preparedTransactions: PreparedTransaction[],
     logger?: winston.Logger,
     retryCount?: number,
+    cachedBlockhash?: BlockhashWithExpiryBlockHeight,
 ): Promise<void> {
     for (const preparedTransaction of preparedTransactions) {
         const skipPreFlight = preparedTransaction.confirmOptions?.skipPreflight ?? false;
 
         // If skipPreFlight is false, we will retry the transaction if it fails.
         let success = false;
         let counter = 0;
-        while (!success && counter < (retryCount ?? 3)) {
-            const response = await sendTx(connection, preparedTransaction, logger);
+        while (!success && counter < (retryCount ?? 5)) {
+            const response = await sendTx(connection, preparedTransaction, logger, cachedBlockhash);
 
             if (skipPreFlight) {
                 break;
@@ -55,8 +56,15 @@ export async function sendTxBatch(
             counter++;
 
             if (logger !== undefined && !success) {
-                logger.warn(`Transaction failed, retrying, attempt=${counter}`);
+                logger.error(`Retrying failed transaction, attempt=${counter}`);
             }
+
+            // Wait half a slot before trying again.
+            await new Promise((resolve) => setTimeout(resolve, 200));
+        }
+
+        if (!success) {
+            return;
         }
     }
 }
@@ -145,7 +153,7 @@ export async function sendTx(
                 }
             } else {
                 if (logger !== undefined) {
-                    logger.error("Txn failed with unknown error");
+                    logger.error(err);
                 }
             }
         });

solana/ts/auction-participant/utils/settleAuction.ts

@@ -132,6 +132,17 @@ export async function handleSettleAuction(
         return [];
     }
 
+    // Check to see if the auction is complete.
+    if (auctionData.status.completed === undefined) {
+        logicLogger.error(`Auction is not completed, sequence=${fastVaaParsed.sequence}`);
+        return [];
+    }
+
+    if (auctionData.status.settled !== undefined) {
+        logicLogger.info(`Auction has already been settled, sequence=${fastVaaParsed.sequence}`);
+        return [];
+    }
+
     // Fetch the CCTP message and attestation.
     const cctpArgs = await fetchCctpArgs(
         cfg,
@@ -177,15 +188,16 @@ export async function handleSettleAuction(
             auction,
             bestOfferToken: auctionData.info!.bestOfferToken,
         },
-        auctionData.status,
         cctpArgs,
         [payer],
         matchingEngine,
         cfg,
     );
 
     if (settleAuctionTx === undefined) {
-        logicLogger.debug(`Auction is not completed, sequence=${fastVaaParsed.sequence}`);
+        logicLogger.debug(
+            `Failed to create settle auction instruction, sequence=${fastVaaParsed.sequence}`,
+        );
         return [];
     } else {
         unproccessedTxns.push(settleAuctionTx!);
@@ -202,7 +214,6 @@ async function createSettleTx(
         auction: PublicKey;
         bestOfferToken: PublicKey;
     },
-    status: AuctionStatus,
     cctpArgs: { encodedCctpMessage: Buffer; cctpAttestation: Buffer },
     signers: Signer[],
     matchingEngine: MatchingEngineProgram,
@@ -218,18 +229,13 @@ async function createSettleTx(
     const preparedTransactionOptions = {
         computeUnits: cfg.settleAuctionCompleteComputeUnits(),
         feeMicroLamports: 10,
-        nonceAccount: cfg.solanaNonceAccount(),
         addressLookupTableAccounts: [lookupTableAccount!],
     };
     const confirmOptions = {
         commitment: cfg.solanaCommitment(),
         skipPreflight: false,
     };
 
-    if (status.completed === undefined) {
-        return undefined;
-    }
-
     // Prepare the settle auction transaction.
     const settleAuctionTx = await matchingEngine.settleAuctionCompleteTx(
         {

solana/ts/auction-participant/vaaAuctionRelayer/app.ts

@@ -6,6 +6,7 @@ import { PreparedTransaction } from "../../src";
 import * as utils from "../utils";
 import * as winston from "winston";
 import { VaaSpy } from "../../src/wormhole/spy";
+import { CachedBlockhash } from "../containers";
 
 const MATCHING_ENGINE_PROGRAM_ID = "mPydpGUWxzERTNpyvTKdvS7v8kvw5sgwfiP8WQFrXVS";
 const USDC_MINT = new PublicKey("4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU");
@@ -43,6 +44,13 @@ async function main(argv: string[]) {
 
     spawnTransactionProcessor(connection, transactionBatchQueue, logicLogger);
 
+    const cachedBlockhash = await CachedBlockhash.initialize(
+        connection,
+        32, // slots
+        "finalized",
+        logicLogger,
+    );
+
     // Connect to spy.
     const spy = new VaaSpy({
         spyHost: SPY_HOST,