chore: Bump @solana/kit 2.3 -> 5.4 (#1243)

Kit has moved from 2.2 to 5.4 in the past few months, so we're playing
catch-up. I worked progressively through the major releases and found
there weren't many changes required, so the jump from 2.3 -> 5.4 has 
been squashed into a single upgrade.

Change mostly facilitated by Claude.

Author: pxrl

.github/actions/cache-svm-artifacts/action.yml

@@ -26,7 +26,7 @@ runs:
         # The job that generates the artifacts is responsible for archiving them to the cache tarball. This avoids any
         # conflicts with other caching actions that might have cleaned some of cached contents.
         path: svm-${{ inputs.type }}.tar
-        key: svm-${{ inputs.type }}-${{ runner.os }}-node-${{ steps.resolved-node.outputs.version }}-${{ hashFiles('Cargo.lock', 'programs/**/Cargo.toml', 'programs/**/Xargo.toml', 'programs/**/*.rs') }}
+        key: svm-${{ inputs.type }}-${{ runner.os }}-node-${{ steps.resolved-node.outputs.version }}-${{ hashFiles('yarn.lock', 'Cargo.lock', 'programs/**/Cargo.toml', 'programs/**/Xargo.toml', 'programs/**/*.rs') }}
     - name: Unpack restored SVM artifacts
       if: steps.svm-artifacts-cache.outputs.cache-hit == 'true'
       shell: bash

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@across-protocol/contracts",
-  "version": "4.1.22",
+  "version": "4.1.23",
   "author": "UMA Team",
   "license": "AGPL-3.0-only",
   "repository": {
@@ -65,10 +65,10 @@
     "@openzeppelin/foundry-upgrades": "^0.4.0",
     "@safe-global/protocol-kit": "^6.1.1",
     "@scroll-tech/contracts": "^0.1.0",
-    "@solana-program/address-lookup-table": "^0.7.0",
-    "@solana-program/token": "^0.5.1",
-    "@solana/kit": "^2.3.0",
-    "@solana/spl-token": "^0.4.6",
+    "@solana-program/address-lookup-table": "0.10.0",
+    "@solana-program/token": "0.9.0",
+    "@solana/kit": "^5.4.0",
+    "@solana/spl-token": "0.4.14",
     "@solana/web3.js": "1.98.2",
     "@types/yargs": "^17.0.33",
     "@uma/common": "^2.37.3",
@@ -78,8 +78,8 @@
     "zksync-web3": "^0.14.3"
   },
   "devDependencies": {
-    "@codama/nodes-from-anchor": "^1.2.0",
-    "@codama/renderers-js": "^1.2.14",
+    "@codama/nodes-from-anchor": "1.2.2",
+    "@codama/renderers-js": "1.3.0",
     "@defi-wonderland/smock": "^2.3.4",
     "@ethersproject/abstract-provider": "5.7.0",
     "@ethersproject/abstract-signer": "5.7.0",

src/svm/web3-v2/transactionUtils.ts

@@ -3,19 +3,22 @@ import {
   AddressesByLookupTableAddress,
   appendTransactionMessageInstruction,
   appendTransactionMessageInstructions,
+  assertIsTransactionWithBlockhashLifetime,
+  assertIsTransactionWithinSizeLimit,
+  BaseTransactionMessage,
   Commitment,
-  CompilableTransactionMessage,
   compressTransactionMessageUsingAddressLookupTables as compressTxWithAlt,
   createTransactionMessage,
   getSignatureFromTransaction,
-  IInstruction,
+  Instruction,
   KeyPairSigner,
   pipe,
   sendAndConfirmTransactionFactory,
   setTransactionMessageFeePayerSigner,
   setTransactionMessageLifetimeUsingBlockhash,
   signTransactionMessageWithSigners,
   TransactionMessageWithBlockhashLifetime,
+  TransactionMessageWithFeePayer,
   TransactionSigner,
 } from "@solana/kit";
 
@@ -32,10 +35,12 @@ import { RpcClient } from "./types";
  */
 export const signAndSendTransaction = async (
   rpcClient: RpcClient,
-  transactionMessage: CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime,
+  transactionMessage: BaseTransactionMessage & TransactionMessageWithFeePayer & TransactionMessageWithBlockhashLifetime,
   commitment: Commitment = "confirmed"
 ) => {
   const signedTransaction = await signTransactionMessageWithSigners(transactionMessage);
+  assertIsTransactionWithBlockhashLifetime(signedTransaction);
+  assertIsTransactionWithinSizeLimit(signedTransaction);
   const signature = getSignatureFromTransaction(signedTransaction);
   await sendAndConfirmTransactionFactory(rpcClient)(signedTransaction, {
     commitment,
@@ -58,7 +63,7 @@ export const createDefaultTransaction = async (rpcClient: RpcClient, signer: Tra
 export async function sendTransactionWithLookupTable(
   client: RpcClient,
   payer: KeyPairSigner,
-  instructions: IInstruction[],
+  instructions: Instruction[],
   addressesByLookupTableAddress: AddressesByLookupTableAddress
 ) {
   return pipe(
@@ -68,6 +73,8 @@ export async function sendTransactionWithLookupTable(
     (tx) => signTransactionMessageWithSigners(tx),
     async (tx) => {
       const signedTx = await tx;
+      assertIsTransactionWithBlockhashLifetime(signedTx);
+      assertIsTransactionWithinSizeLimit(signedTx);
       await sendAndConfirmTransactionFactory(client)(signedTx, {
         commitment: "confirmed",
         skipPreflight: false,

test/svm/SvmSpoke.Fill.AcrossPlus.ts

@@ -8,7 +8,6 @@ import {
   createKeyPairFromBytes,
   createSignerFromKeyPair,
   getProgramDerivedAddress,
-  IAccountMeta,
   pipe,
 } from "@solana/kit";
 import {
@@ -511,11 +510,11 @@ describe("svm_spoke.fill.across_plus", () => {
         { pubkey: handlerProgram.programId, isSigner: false, isWritable: false },
         ...multicallHandlerCoder.compiledKeyMetas,
       ];
-      const remainingAccounts: IAccountMeta<string>[] = _remainingAccounts.map((account) => ({
+      const remainingAccounts = _remainingAccounts.map((account) => ({
         address: address(account.pubkey.toString()),
         role: account.isWritable ? AccountRole.WRITABLE : AccountRole.READONLY,
       }));
-      (fillRelayIx.accounts as IAccountMeta<string>[]).push(...remainingAccounts);
+      fillRelayIx.accounts.push(...remainingAccounts);
 
       await pipe(
         await createDefaultTransaction(rpcClient, signer),

test/svm/SvmSpoke.Fill.ts

@@ -10,7 +10,6 @@ import {
   createKeyPairFromBytes,
   createSignerFromKeyPair,
   getProgramDerivedAddress,
-  IAccountMeta,
   pipe,
 } from "@solana/kit";
 import {
@@ -782,11 +781,11 @@ describe("svm_spoke.fill", () => {
           account.address === program.programId.toString() ? { ...account, role: AccountRole.READONLY } : account
         ),
       };
-      const remainingAccounts: IAccountMeta<string>[] = fillRemainingAccounts.map((account) => ({
+      const remainingAccounts = fillRemainingAccounts.map((account) => ({
         address: address(account.pubkey.toString()),
         role: AccountRole.WRITABLE,
       }));
-      (fillRelayIx.accounts as IAccountMeta<string>[]).push(...remainingAccounts);
+      fillRelayIx.accounts.push(...remainingAccounts);
 
       const tx = await pipe(
         await createDefaultTransaction(rpcClient, signer),
@@ -887,11 +886,11 @@ describe("svm_spoke.fill", () => {
           account.address === program.programId.toString() ? { ...account, role: AccountRole.READONLY } : account
         ),
       };
-      const remainingAccounts: IAccountMeta<string>[] = fillRemainingAccounts.map((account) => ({
+      const remainingAccounts = fillRemainingAccounts.map((account) => ({
         address: address(account.pubkey.toString()),
         role: AccountRole.WRITABLE,
       }));
-      (fillRelayIx.accounts as IAccountMeta<string>[]).push(...remainingAccounts);
+      fillRelayIx.accounts.push(...remainingAccounts);
 
       const alt = await createLookupTable(rpcClient, signer);