@across-protocol/sdk 4.3.153 → 4.3.155

package/src/gasPriceOracle/adapters/solana.ts

@@ -1,14 +1,18 @@
 import { SVMProvider } from "../../arch/svm";
-import { toBN, dedupArray } from "../../utils";
+import { BN, toBN, dedupArray } from "../../utils";
 import { SvmGasPriceEstimate } from "../types";
 import { GasPriceEstimateOptions } from "../oracle";
+import { SvmGasPriceUnavailableError } from "../errors";
 import {
   TransactionMessage,
   TransactionMessageBytesBase64,
   TransactionMessageWithFeePayer,
   compileTransaction,
+  setTransactionMessageLifetimeUsingBlockhash,
 } from "@solana/kit";
 
+const MAX_BASE_FEE_ATTEMPTS = 2;
+
 /**
  * @notice Returns result of getFeeForMessage and getRecentPrioritizationFees RPC calls.
  * @returns GasPriceEstimate
@@ -18,13 +22,8 @@ export async function messageFee(provider: SVMProvider, opts: GasPriceEstimateOp
 
   // Cast the opaque unsignedTx type to a solana-kit TransactionMessage with fee payer.
   const unsignedTx = _unsignedTx as TransactionMessage & TransactionMessageWithFeePayer;
-  const compiledTransaction = compileTransaction(unsignedTx);
 
-  // Get this base fee. This should result in LAMPORTS_PER_SIGNATURE * nSignatures.
-  const encodedTransactionMessage = Buffer.from(compiledTransaction.messageBytes).toString(
-    "base64"
-  ) as TransactionMessageBytesBase64;
-  const baseFeeResponse = await provider.getFeeForMessage(encodedTransactionMessage).send();
+  const baseFee = await getBaseFee(provider, unsignedTx);
 
   // Get the priority fee by calling `getRecentPrioritzationFees` on all the addresses in the transaction's instruction array.
   const instructionAddresses = dedupArray(unsignedTx.instructions.map((instruction) => instruction.programAddress));
@@ -40,8 +39,29 @@ export async function messageFee(provider: SVMProvider, opts: GasPriceEstimateOp
   const microLamportsPerComputeUnit = toBN(
     totalPrioritizationFees / BigInt(Math.max(nonzeroPrioritizationFees.length, 1))
   );
-  return {
-    baseFee: toBN(baseFeeResponse!.value!),
-    microLamportsPerComputeUnit,
-  };
+
+  return { baseFee, microLamportsPerComputeUnit };
+}
+
+// `getFeeForMessage` returns `{ value: null }` when the cluster has not yet recognised
+// the blockhash referenced by the message. With a load-balanced RPC pool, this happens
+// when the request lands on a node that hasn't seen the blockhash from an earlier
+// `getLatestBlockhash` call. We side-step the race by always refreshing to a `confirmed`
+// blockhash before each attempt — by definition propagated to all healthy nodes — and
+// retrying once if a fee call still comes back null. Fee estimation is never sent
+// on-chain, so blockhash freshness doesn't matter.
+async function getBaseFee(provider: SVMProvider, tx: TransactionMessage & TransactionMessageWithFeePayer): Promise<BN> {
+  for (let attempt = 0; attempt < MAX_BASE_FEE_ATTEMPTS; attempt++) {
+    const { value: confirmedBlockhash } = await provider.getLatestBlockhash({ commitment: "confirmed" }).send();
+    const refreshedTx = setTransactionMessageLifetimeUsingBlockhash(confirmedBlockhash, tx);
+    const compiled = compileTransaction(refreshedTx);
+    const encoded = Buffer.from(compiled.messageBytes).toString("base64") as TransactionMessageBytesBase64;
+    const { value } = await provider.getFeeForMessage(encoded).send();
+    if (value !== null && value !== undefined) {
+      return toBN(value);
+    }
+  }
+  throw new SvmGasPriceUnavailableError(
+    "Solana getFeeForMessage returned null even after retrying with a confirmed blockhash"
+  );
 }

package/src/gasPriceOracle/errors.ts

@@ -0,0 +1,14 @@
+/**
+ * Thrown when the SVM gas-price oracle cannot determine a base fee for the
+ * supplied message — most commonly because Solana's `getFeeForMessage` RPC
+ * returned `{ value: null }` even after retrying with a confirmed blockhash.
+ *
+ * Callers can use `instanceof` to map this to a transient upstream-RPC error
+ * (e.g. HTTP 502 / 503) rather than treating it as an unhandled exception.
+ */
+export class SvmGasPriceUnavailableError extends Error {
+  constructor(message: string, opts?: { cause?: unknown }) {
+    super(message, opts?.cause !== undefined ? { cause: opts.cause } : undefined);
+    this.name = "SvmGasPriceUnavailableError";
+  }
+}

package/src/gasPriceOracle/index.ts

@@ -1,2 +1,3 @@
 export { getGasPriceEstimate, GasPriceEstimateOptions } from "./oracle";
 export { GasPriceEstimate, EvmGasPriceEstimate, SvmGasPriceEstimate } from "./types";
+export { SvmGasPriceUnavailableError } from "./errors";

package/src/utils/abi/contracts/Arbitrum_SpokePool.json

@@ -3156,6 +3156,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",

package/src/utils/abi/contracts/BaseModuleHandler.json

@@ -29,6 +29,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "DIRECT_CALLER_ROLE",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "FUNDS_SWEEPER_ROLE",

package/src/utils/abi/contracts/Blast_SpokePool.json

@@ -3395,6 +3395,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",

package/src/utils/abi/contracts/Boba_SpokePool.json

@@ -3251,6 +3251,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",

package/src/utils/abi/contracts/Cher_SpokePool.json

@@ -3261,6 +3261,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",

package/src/utils/abi/contracts/CounterfactualDepositSpokePoolTr.json

@@ -0,0 +1,281 @@
+[
+  {
+    "type": "constructor",
+    "inputs": [
+      {
+        "name": "_spokePool",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "_signer",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "_wrappedNativeToken",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "nonpayable"
+  },
+  {
+    "type": "function",
+    "name": "EXECUTE_DEPOSIT_TYPEHASH",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      }
+    ],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "eip712Domain",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "fields",
+        "type": "bytes1",
+        "internalType": "bytes1"
+      },
+      {
+        "name": "name",
+        "type": "string",
+        "internalType": "string"
+      },
+      {
+        "name": "version",
+        "type": "string",
+        "internalType": "string"
+      },
+      {
+        "name": "chainId",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "verifyingContract",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "salt",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      },
+      {
+        "name": "extensions",
+        "type": "uint256[]",
+        "internalType": "uint256[]"
+      }
+    ],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "execute",
+    "inputs": [
+      {
+        "name": "params",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "submitterData",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "payable"
+  },
+  {
+    "type": "function",
+    "name": "signer",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "spokePool",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "wrappedNativeToken",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
+  {
+    "type": "event",
+    "name": "EIP712DomainChanged",
+    "inputs": [],
+    "anonymous": false
+  },
+  {
+    "type": "event",
+    "name": "SpokePoolDepositExecuted",
+    "inputs": [
+      {
+        "name": "inputAmount",
+        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256"
+      },
+      {
+        "name": "outputAmount",
+        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256"
+      },
+      {
+        "name": "exclusiveRelayer",
+        "type": "bytes32",
+        "indexed": true,
+        "internalType": "bytes32"
+      },
+      {
+        "name": "exclusivityDeadline",
+        "type": "uint32",
+        "indexed": false,
+        "internalType": "uint32"
+      },
+      {
+        "name": "executionFeeRecipient",
+        "type": "address",
+        "indexed": true,
+        "internalType": "address"
+      },
+      {
+        "name": "quoteTimestamp",
+        "type": "uint32",
+        "indexed": false,
+        "internalType": "uint32"
+      },
+      {
+        "name": "fillDeadline",
+        "type": "uint32",
+        "indexed": false,
+        "internalType": "uint32"
+      },
+      {
+        "name": "signatureDeadline",
+        "type": "uint32",
+        "indexed": false,
+        "internalType": "uint32"
+      }
+    ],
+    "anonymous": false
+  },
+  {
+    "type": "error",
+    "name": "ECDSAInvalidSignature",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "ECDSAInvalidSignatureLength",
+    "inputs": [
+      {
+        "name": "length",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "ECDSAInvalidSignatureS",
+    "inputs": [
+      {
+        "name": "s",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "InvalidShortString",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "InvalidSignature",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "MaxFee",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "NativeTransferFailed",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "SignatureExpired",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "StringTooLong",
+    "inputs": [
+      {
+        "name": "str",
+        "type": "string",
+        "internalType": "string"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "TronTransferBalanceMismatch",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "TronTransferCallReverted",
+    "inputs": []
+  }
+]

package/src/utils/abi/contracts/DstOFTHandler.json

@@ -64,6 +64,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "DIRECT_CALLER_ROLE",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "FUNDS_SWEEPER_ROLE",
@@ -161,6 +174,29 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "executeDirect",
+    "inputs": [
+      {
+        "name": "tokenSent",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "amountLD",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "composeMsg",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
   {
     "type": "function",
     "name": "getRoleAdmin",
@@ -580,6 +616,11 @@
     "name": "InvalidComposeMsgFormat",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "InvalidDirectToken",
+    "inputs": []
+  },
   {
     "type": "error",
     "name": "InvalidInitialization",

package/src/utils/abi/contracts/Ethereum_SpokePool.json

@@ -3031,6 +3031,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",

package/src/utils/abi/contracts/HyperCoreFlowExecutor.json

@@ -41,6 +41,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "DIRECT_CALLER_ROLE",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "FUNDS_SWEEPER_ROLE",

package/src/utils/abi/contracts/HyperCoreFlowRoles.json

@@ -1,4 +1,17 @@
 [
+  {
+    "type": "function",
+    "name": "DIRECT_CALLER_ROLE",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "FUNDS_SWEEPER_ROLE",

package/src/utils/abi/contracts/Ink_SpokePool.json

@@ -3261,6 +3261,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",

package/src/utils/abi/contracts/Lens_SpokePool.json

@@ -3176,6 +3176,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",

package/src/utils/abi/contracts/Linea_SpokePool.json

@@ -3159,6 +3159,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",

package/src/utils/abi/contracts/Lisk_SpokePool.json

@@ -3274,6 +3274,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",

package/src/utils/abi/contracts/OP_SpokePool.json

@@ -3261,6 +3261,17 @@
     "name": "RemovedFunction",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeERC20FailedOperation",
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "WrongERC7683OrderId",