@chainlink/ccip-sdk 0.90.2 → 0.91.0

package/dist/solana/cleanup.js

@@ -1,26 +1,26 @@
-import { Program } from '@coral-xyz/anchor';
-import { AddressLookupTableProgram, PublicKey, SystemProgram } from '@solana/web3.js';
+import { Buffer } from 'buffer';
+import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { AddressLookupTableProgram, PublicKey, SystemProgram, } from '@solana/web3.js';
 import { dataSlice, hexlify } from 'ethers';
-import moize from 'moize';
+import { memoize } from 'micro-memoize';
 import { sleep } from "../utils.js";
 import { IDL as CCIP_OFFRAMP_IDL } from "./idl/1.6.0/CCIP_OFFRAMP.js";
-import { simulateAndSendTxs } from "./send.js";
+import { simulateAndSendTxs } from "./utils.js";
 /**
- * Clean up and recycle buffers and address lookup tables owned by wallet
- * CAUTION: this will close ANY lookup table owned by this wallet
- * @param provider - AnchorProvider with connection and wallet
- * @param getLogs - SolanaChain-compatible getLogs function (to scan for Buffers and ALTs)
- * @param opts.dontWait - Whether to skip waiting for lookup table deactivation cool down period
- *   (513 slots) to pass before closing; by default, we deactivate (if needed) and wait to close
- *   before returning from this method
+ * Clean up and recycle buffers and Address Lookup Tables owned by wallet.
+ * @param ctx - Context object containing the Solana connection instance and logger.
+ * @param wallet - Wallet instance to sign txs.
+ * @param getLogs - SolanaChain-compatible getLogs function (to scan for Buffers and ALTs).
+ * @param opts - Optional parameters. Set `waitDeactivation` to wait for lookup table deactivation
+ *   cool down period (513 slots) to pass before closing; by default, we deactivate (if needed)
+ *   and leave close to be done in the future.
  */
-export async function cleanUpBuffers(provider, getLogs, opts) {
-    const connection = provider.connection;
-    const wallet = provider.wallet;
-    console.debug('Starting cleaning up buffers and lookup tables for account', wallet.publicKey.toString());
+export async function cleanUpBuffers(ctx, wallet, getLogs, opts) {
+    const { connection, logger = console } = ctx;
+    logger.debug('Starting cleaning up buffers and lookup tables for account', wallet.publicKey.toString());
     const seenAccs = new Set();
     const pendingPromises = [];
-    const getCurrentSlot = moize.default(async () => {
+    const getCurrentSlot = memoize(async () => {
         let lastErr;
         for (let i = 0; i < 10; i++) {
             try {
@@ -28,23 +28,23 @@ export async function cleanUpBuffers(provider, getLogs, opts) {
             }
             catch (err) {
                 lastErr = err;
-                console.warn('Failed to get current slot', i, err);
+                logger.warn('Failed to get current slot', i, err);
                 await sleep(500);
             }
         }
         throw lastErr;
-    }, { maxAge: 1000, isPromise: true });
+    }, { maxAge: 1000, async: true });
     const closeAlt = async (lookupTable, deactivationSlot) => {
         const altAddr = lookupTable.toBase58();
         let sig;
         while (!sig) {
             const delta = deactivationSlot + 513 - (await getCurrentSlot());
             if (delta > 0) {
-                if (opts?.dontWait) {
-                    console.warn('Skipping: lookup table', altAddr, 'not yet ready for close until', 0.4 * delta, 'seconds');
+                if (!opts?.waitDeactivation) {
+                    logger.warn('Skipping: lookup table', altAddr, 'not yet ready for close until', 0.4 * delta, 'seconds');
                     return;
                 }
-                console.debug('Waiting for slot', deactivationSlot + 513, 'to be reached in', 0.4 * delta, 'seconds before closing lookup table', altAddr);
+                logger.debug('Waiting for slot', deactivationSlot + 513, 'to be reached in', 0.4 * delta, 'seconds before closing lookup table', altAddr);
                 await sleep(400 * delta);
             }
             const closeIx = AddressLookupTableProgram.closeLookupTable({
@@ -53,8 +53,8 @@ export async function cleanUpBuffers(provider, getLogs, opts) {
                 lookupTable,
             });
             try {
-                sig = await simulateAndSendTxs(connection, wallet, [closeIx]);
-                console.info('🗑️  Closed lookup table', altAddr, ': tx =>', sig);
+                sig = await simulateAndSendTxs(ctx, wallet, { instructions: [closeIx] });
+                logger.info('🗑️  Closed lookup table', altAddr, ': tx =>', sig);
             }
             catch (err) {
                 const info = await connection.getAddressLookupTable(lookupTable);
@@ -62,7 +62,7 @@ export async function cleanUpBuffers(provider, getLogs, opts) {
                     break;
                 else if (info.value.state.deactivationSlot < 2n ** 63n)
                     deactivationSlot = Number(info.value.state.deactivationSlot);
-                console.warn('Failed to close lookup table', altAddr, err);
+                logger.warn('Failed to close lookup table', altAddr, err);
             }
         }
     };
@@ -85,14 +85,14 @@ export async function cleanUpBuffers(provider, getLogs, opts) {
                 ({ data }) => dataSlice(data, 0, 8 + 4) === '0x23cafcdc0252bd1720000000')
                     .map(({ data }) => Buffer.from(data.subarray(8 + 4, 8 + 4 + 32)));
                 for (const bufferId of bufferIds) {
-                    const offrampProgram = new Program(CCIP_OFFRAMP_IDL, new PublicKey(log.address), provider);
+                    const offrampProgram = new Program(CCIP_OFFRAMP_IDL, new PublicKey(log.address), new AnchorProvider(connection, wallet, { commitment: 'confirmed' }));
                     const [executionReportBuffer] = PublicKey.findProgramAddressSync([Buffer.from('execution_report_buffer'), bufferId, wallet.publicKey.toBuffer()], offrampProgram.programId);
                     if (seenAccs.has(executionReportBuffer.toBase58()))
                         continue;
                     seenAccs.add(executionReportBuffer.toBase58());
                     const accInfo = await connection.getAccountInfo(executionReportBuffer);
                     if (!accInfo) {
-                        console.debug('Buffer with bufferId', hexlify(bufferId), 'at', executionReportBuffer.toBase58(), 'already closed');
+                        logger.debug('Buffer with bufferId', hexlify(bufferId), 'at', executionReportBuffer.toBase58(), 'already closed');
                         continue;
                     }
                     const bufferingAccounts = {
@@ -106,10 +106,10 @@ export async function cleanUpBuffers(provider, getLogs, opts) {
                             .closeExecutionReportBuffer(bufferId)
                             .accounts(bufferingAccounts)
                             .rpc();
-                        console.info('🗑️  Closed bufferId', hexlify(bufferId), 'at', executionReportBuffer.toBase58(), ': tx =>', sig);
+                        logger.info('🗑️  Closed bufferId', hexlify(bufferId), 'at', executionReportBuffer.toBase58(), ': tx =>', sig);
                     }
                     catch (err) {
-                        console.warn('Failed to close bufferId', hexlify(bufferId), 'at', executionReportBuffer.toBase58(), err);
+                        logger.warn('Failed to close bufferId', hexlify(bufferId), 'at', executionReportBuffer.toBase58(), err);
                     }
                 }
                 break;
@@ -123,10 +123,10 @@ export async function cleanUpBuffers(provider, getLogs, opts) {
                 const info = await connection.getAddressLookupTable(lookupTable);
                 if (!info?.value) {
                     alreadyClosed++; // assume we're done when we hit Nth closed ALT; maybe add an option to keep going?
-                    console.debug('Lookup table', lookupTable.toBase58(), 'already closed');
+                    logger.debug('Lookup table', lookupTable.toBase58(), 'already closed');
                 }
                 else if (info.value.state.authority?.toBase58() !== wallet.publicKey.toBase58()) {
-                    console.debug('Lookup table', lookupTable.toBase58(), 'not owned by us, but by', info.value.state.authority?.toBase58());
+                    logger.debug('Lookup table', lookupTable.toBase58(), 'not owned by us, but by', info.value.state.authority?.toBase58());
                 }
                 else if (info.value.state.deactivationSlot < 2n ** 63n) {
                     // non-deactivated have deactivationSlot=MAX_UINT64
@@ -140,12 +140,14 @@ export async function cleanUpBuffers(provider, getLogs, opts) {
                         lookupTable: lookupTable,
                     });
                     try {
-                        const sig = await simulateAndSendTxs(connection, wallet, [deactivateIx]);
-                        console.info('⤵️  Deactivated lookup table', lookupTable.toBase58(), ': tx =>', sig);
+                        const sig = await simulateAndSendTxs(ctx, wallet, {
+                            instructions: [deactivateIx],
+                        });
+                        logger.info('⤵️  Deactivated lookup table', lookupTable.toBase58(), ': tx =>', sig);
                         pendingPromises.push(closeAlt(lookupTable, await getCurrentSlot()));
                     }
                     catch (err) {
-                        console.warn('Failed to deactivate lookup table', lookupTable.toBase58(), err);
+                        logger.warn('Failed to deactivate lookup table', lookupTable.toBase58(), err);
                     }
                 }
                 break; // case

package/dist/solana/cleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/solana/cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACrF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAC3C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,GAAG,IAAI,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAErE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE9C;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,QAAwB,EACxB,OAA+B,EAC/B,IAA6B;IAE7B,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;IACtC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;IAC9B,OAAO,CAAC,KAAK,CACX,4DAA4D,EAC5D,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAC5B,CAAA;IAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAA;IAClC,MAAM,eAAe,GAAG,EAAE,CAAA;IAC1B,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAClC,KAAK,IAAI,EAAE;QACT,IAAI,OAAO,CAAA;QACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,OAAO,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YACnC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,GAAG,GAAG,CAAA;gBACb,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;gBAClD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,CAAC;QACH,CAAC;QACD,MAAM,OAAO,CAAA;IACf,CAAC,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAClC,CAAA;IAED,MAAM,QAAQ,GAAG,KAAK,EAAE,WAAsB,EAAE,gBAAwB,EAAE,EAAE;QAC1E,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAA;QACtC,IAAI,GAAG,CAAA;QACP,OAAO,CAAC,GAAG,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,gBAAgB,GAAG,GAAG,GAAG,CAAC,MAAM,cAAc,EAAE,CAAC,CAAA;YAC/D,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACd,IAAI,IAAI,EAAE,QAAQ,EAAE,CAAC;oBACnB,OAAO,CAAC,IAAI,CACV,wBAAwB,EACxB,OAAO,EACP,+BAA+B,EAC/B,GAAG,GAAG,KAAK,EACX,SAAS,CACV,CAAA;oBACD,OAAM;gBACR,CAAC;gBACD,OAAO,CAAC,KAAK,CACX,kBAAkB,EAClB,gBAAgB,GAAG,GAAG,EACtB,kBAAkB,EAClB,GAAG,GAAG,KAAK,EACX,qCAAqC,EACrC,OAAO,CACR,CAAA;gBACD,MAAM,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC,CAAA;YAC1B,CAAC;YAED,MAAM,OAAO,GAAG,yBAAyB,CAAC,gBAAgB,CAAC;gBACzD,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,WAAW;aACZ,CAAC,CAAA;YACF,IAAI,CAAC;gBACH,GAAG,GAAG,MAAM,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;gBAC7D,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;YACnE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;gBAChE,IAAI,CAAC,IAAI,EAAE,KAAK;oBAAE,MAAK;qBAClB,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,IAAI,GAAG;oBACpD,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;gBAC9D,OAAO,CAAC,IAAI,CAAC,8BAA8B,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;YAC5D,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IAED,IAAI,aAAa,GAAG,CAAC,CAAA;IACrB,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,OAAO,CAAC;QAC9B,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;QACpC,MAAM,EAAE;YACN,oCAAoC;YACpC,gCAAgC;YAChC,oCAAoC;SACrC;QACD,QAAQ,EAAE,IAAI;KACf,CAAC,EAAE,CAAC;QACH,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAA;QACjB,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,oCAAoC,CAAC,CAAC,CAAC;gBAC1C,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,oBAAoB;qBAC7D,MAAM;gBACL,kFAAkF;gBAClF,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,4BAA4B,CACzE;qBACA,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;gBAEnE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;oBACjC,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,gBAAgB,EAAE,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAA;oBAE1F,MAAM,CAAC,qBAAqB,CAAC,GAAG,SAAS,CAAC,sBAAsB,CAC9D,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAC/E,cAAc,CAAC,SAAS,CACzB,CAAA;oBACD,IAAI,QAAQ,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC;wBAAE,SAAQ;oBAC5D,QAAQ,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAA;oBAE9C,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAA;oBACtE,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,OAAO,CAAC,KAAK,CACX,sBAAsB,EACtB,OAAO,CAAC,QAAQ,CAAC,EACjB,IAAI,EACJ,qBAAqB,CAAC,QAAQ,EAAE,EAChC,gBAAgB,CACjB,CAAA;wBACD,SAAQ;oBACV,CAAC;oBACD,MAAM,iBAAiB,GAAG;wBACxB,qBAAqB;wBACrB,MAAM,EAAE,SAAS,CAAC,sBAAsB,CACtC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EACvB,cAAc,CAAC,SAAS,CACzB,CAAC,CAAC,CAAC;wBACJ,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,aAAa,EAAE,aAAa,CAAC,SAAS;qBACvC,CAAA;oBACD,IAAI,CAAC;wBACH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,OAAO;6BACrC,0BAA0B,CAAC,QAAQ,CAAC;6BACpC,QAAQ,CAAC,iBAAiB,CAAC;6BAC3B,GAAG,EAAE,CAAA;wBACR,OAAO,CAAC,IAAI,CACV,sBAAsB,EACtB,OAAO,CAAC,QAAQ,CAAC,EACjB,IAAI,EACJ,qBAAqB,CAAC,QAAQ,EAAE,EAChC,SAAS,EACT,GAAG,CACJ,CAAA;oBACH,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,OAAO,CAAC,IAAI,CACV,0BAA0B,EAC1B,OAAO,CAAC,QAAQ,CAAC,EACjB,IAAI,EACJ,qBAAqB,CAAC,QAAQ,EAAE,EAChC,GAAG,CACJ,CAAA;oBACH,CAAC;gBACH,CAAC;gBACD,MAAK;YACP,CAAC;YACD,KAAK,oCAAoC,CAAC;YAC1C,KAAK,gCAAgC,CAAC,CAAC,CAAC;gBACtC,MAAM,WAAW,GAAG,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBAClE,IAAI,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;oBAAE,SAAQ;gBAClD,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAA;gBAEpC,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;gBAChE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;oBACjB,aAAa,EAAE,CAAA,CAAC,mFAAmF;oBACnG,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAA;gBACzE,CAAC;qBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC;oBAClF,OAAO,CAAC,KAAK,CACX,cAAc,EACd,WAAW,CAAC,QAAQ,EAAE,EACtB,yBAAyB,EACzB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE,CACvC,CAAA;gBACH,CAAC;qBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC;oBACzD,mDAAmD;oBACnD,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAA;gBACxF,CAAC;qBAAM,IACL,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,IAAI,EAAE;oBACvC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EACtD,CAAC;oBACD,kEAAkE;oBAClE,MAAM,YAAY,GAAG,yBAAyB,CAAC,qBAAqB,CAAC;wBACnE,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,WAAW;qBACzB,CAAC,CAAA;oBAEF,IAAI,CAAC;wBACH,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;wBACxE,OAAO,CAAC,IAAI,CAAC,8BAA8B,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;wBACpF,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,cAAc,EAAE,CAAC,CAAC,CAAA;oBACrE,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAA;oBAChF,CAAC;gBACH,CAAC;gBACD,MAAK,CAAC,OAAO;YACf,CAAC;QACH,CAAC;QACD,IAAI,aAAa,IAAI,CAAC;YAAE,MAAK,CAAC,OAAO;IACvC,CAAC;IAED,MAAM,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;AAC3C,CAAC"}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/solana/cleanup.ts"],"names":[],"mappings":"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"}

package/dist/solana/exec.d.ts

@@ -1,15 +1,23 @@
-import { Program } from '@coral-xyz/anchor';
-import type { ExecutionReport } from '../types.ts';
-import { IDL as CCIP_OFFRAMP_IDL } from './idl/1.6.0/CCIP_OFFRAMP.ts';
-import type { CCIPMessage_V1_6_Solana } from './types.ts';
-import type { ChainTransaction } from '../chain.ts';
-import './patchBorsh.ts';
-export declare function executeReport({ offrampProgram, execReport, ...opts }: {
-    offrampProgram: Program<typeof CCIP_OFFRAMP_IDL>;
-    execReport: ExecutionReport<CCIPMessage_V1_6_Solana>;
-    gasLimit?: number;
+import { type Connection, PublicKey } from '@solana/web3.js';
+import { type ExecutionReport, type WithLogger } from '../types.ts';
+import type { CCIPMessage_V1_6_Solana, UnsignedSolanaTx } from './types.ts';
+/**
+ * Generate unsigned tx to execute a CCIP report on Solana.
+ * @param ctx - Context containing connection and logger
+ * @param payer - Payer of the transaction.
+ * @param offramp - Address of the OffRamp contract.
+ * @param execReport - Execution report.
+ * @param opts - Options for txs to be generated
+ *   - forceBuffer - Sends report in chunks for buffering in offRamp before execution
+ *   - forceLookupTable - Creates lookup table for execution transaction, and deactivates in the end
+ *   - clearLeftoverAccounts - Resets buffer before filling it in
+ * @returns Transaction hash of the execution.
+ */
+export declare function generateUnsignedExecuteReport(ctx: {
+    connection: Connection;
+} & WithLogger, payer: PublicKey, offramp: PublicKey, execReport: ExecutionReport<CCIPMessage_V1_6_Solana>, opts?: {
     forceLookupTable?: boolean;
     forceBuffer?: boolean;
     clearLeftoverAccounts?: boolean;
-}): Promise<Pick<ChainTransaction, 'hash'>>;
+}): Promise<UnsignedSolanaTx>;
 //# sourceMappingURL=exec.d.ts.map

package/dist/solana/exec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/solana/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAkB/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,GAAG,IAAI,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAErE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAGnD,OAAO,iBAAiB,CAAA;AAUxB,wBAAsB,aAAa,CAAC,EAClC,cAAc,EACd,UAAU,EACV,GAAG,IAAI,EACR,EAAE;IACD,cAAc,EAAE,OAAO,CAAC,OAAO,gBAAgB,CAAC,CAAA;IAChD,UAAU,EAAE,eAAe,CAAC,uBAAuB,CAAC,CAAA;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,GAAG,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CA2D1C"}
+{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/solana/exec.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,UAAU,EAIf,SAAS,EAEV,MAAM,iBAAiB,CAAA;AAIxB,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,UAAU,EAAe,MAAM,aAAa,CAAA;AAGhF,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAU3E;;;;;;;;;;;GAWG;AACH,wBAAsB,6BAA6B,CACjD,GAAG,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG,UAAU,EAC5C,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,EAClB,UAAU,EAAE,eAAe,CAAC,uBAAuB,CAAC,EACpD,IAAI,CAAC,EAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5F,OAAO,CAAC,gBAAgB,CAAC,CA8F3B"}

package/dist/solana/exec.js

@@ -1,97 +1,64 @@
+import { Buffer } from 'buffer';
 import { Program } from '@coral-xyz/anchor';
-import { AddressLookupTableAccount, AddressLookupTableProgram, ComputeBudgetProgram, PublicKey, SendTransactionError, SystemProgram, TransactionExpiredBlockheightExceededError, TransactionMessage, VersionedTransaction, } from '@solana/web3.js';
+import { AddressLookupTableAccount, AddressLookupTableProgram, PublicKey, SystemProgram, } from '@solana/web3.js';
 import BN from 'bn.js';
 import { hexlify } from 'ethers';
+import { ChainFamily } from "../types.js";
 import { IDL as CCIP_OFFRAMP_IDL } from "./idl/1.6.0/CCIP_OFFRAMP.js";
 import { encodeSolanaOffchainTokenData } from "./offchain.js";
-import { getDataBytes, sleep, toLeArray } from "../utils.js";
-import { bytesToBuffer, simulateTransaction, simulationProvider } from "./utils.js";
-import "./patchBorsh.js";
-export async function executeReport({ offrampProgram, execReport, ...opts }) {
-    const provider = offrampProgram.provider;
-    const wallet = provider.wallet;
-    const connection = provider.connection;
-    const execTxs = await buildExecTxToSolana(offrampProgram, execReport, opts?.gasLimit, opts);
-    let execTxSignature, signature;
-    for (const [i, [reason, transaction]] of execTxs.entries()) {
-        // Refresh the blockhash for each transaction, as the blockhash is only valid for a short time
-        // and we spend a lot of time waiting for finalization of the previous transactions.
-        transaction.message.recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
-        const signed = await wallet.signTransaction(transaction);
-        try {
-            signature = await connection.sendTransaction(signed);
-            if (reason === 'exec')
-                execTxSignature = signature;
-        }
-        catch (e) {
-            if (e instanceof SendTransactionError &&
-                e.logs?.some((log) => log.includes('Error Code: ExecutionReportBufferAlreadyContainsChunk.'))) {
-                console.warn(`Skipping tx ${i + 1} of ${execTxs.length} because a chunk is already in the buffer.`);
-                continue;
-            }
-            else {
-                throw e;
-            }
-        }
-        console.debug(`Confirming tx #${i + 1} of ${execTxs.length}: ${signature} (${reason})...`);
-        for (let currentAttempt = 0;; currentAttempt++) {
-            try {
-                const latestBlockhash = await connection.getLatestBlockhash();
-                await connection.confirmTransaction({
-                    signature,
-                    blockhash: latestBlockhash.blockhash,
-                    lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
-                }, 'confirmed');
-                break;
-            }
-            catch (e) {
-                if (currentAttempt < 5 && e instanceof TransactionExpiredBlockheightExceededError) {
-                    await sleep(1000);
-                }
-                else {
-                    throw e;
-                }
-            }
-        }
-    }
-    return { hash: execTxSignature };
-}
-async function buildExecTxToSolana(offrampProgram, execReport, computeUnitsOverride, opts) {
-    const provider = offrampProgram.provider;
-    offrampProgram = new Program(CCIP_OFFRAMP_IDL, offrampProgram.programId, provider);
-    const payerAddress = provider.wallet.publicKey;
+import { getDataBytes, toLeArray } from "../utils.js";
+import { bytesToBuffer } from "./utils.js";
+/**
+ * Generate unsigned tx to execute a CCIP report on Solana.
+ * @param ctx - Context containing connection and logger
+ * @param payer - Payer of the transaction.
+ * @param offramp - Address of the OffRamp contract.
+ * @param execReport - Execution report.
+ * @param opts - Options for txs to be generated
+ *   - forceBuffer - Sends report in chunks for buffering in offRamp before execution
+ *   - forceLookupTable - Creates lookup table for execution transaction, and deactivates in the end
+ *   - clearLeftoverAccounts - Resets buffer before filling it in
+ * @returns Transaction hash of the execution.
+ */
+export async function generateUnsignedExecuteReport(ctx, payer, offramp, execReport, opts) {
+    const { connection, logger = console } = ctx;
+    const program = new Program(CCIP_OFFRAMP_IDL, offramp, ctx);
     let bufferId;
     if (opts?.forceBuffer) {
         // Use messageId for bufferId. This is arbitrary, but easy to track.
         bufferId = bytesToBuffer(execReport.message.header.messageId);
     }
     const { executionReport: preparedReport, tokenIndexes, accounts, addressLookupTables, } = await getManuallyExecuteInputs({
+        payer,
+        offramp: program,
         execReport,
-        offrampProgram,
-        transmitter: payerAddress.toBase58(),
         bufferId,
+        logger,
     });
     const addressLookupTableAccounts = await Promise.all(addressLookupTables.map(async (acc) => {
-        const lookupTableAccountInfo = await provider.connection.getAddressLookupTable(acc);
+        const lookupTableAccountInfo = await connection.getAddressLookupTable(acc);
         if (!lookupTableAccountInfo.value) {
             throw new Error(`Lookup table account not found: ${acc.toBase58()}`);
         }
         return lookupTableAccountInfo.value;
     }));
-    let serializedReport = offrampProgram.coder.types.encode('ExecutionReportSingleChain', preparedReport);
-    const { blockhash: recentBlockhash } = await provider.connection.getLatestBlockhash();
+    let serializedReport = program.coder.types.encode('ExecutionReportSingleChain', preparedReport);
     let alt;
     if (opts?.forceLookupTable) {
-        alt = await buildLookupTableTxs(provider, accounts);
-        addressLookupTableAccounts.push(alt.addressLookupTableAccount);
+        alt = await buildLookupTableIxs(ctx, payer, accounts.map((acc) => acc.pubkey));
+        addressLookupTableAccounts.push(alt.lookupTable);
     }
-    const transactions = [];
+    const instructions = [];
     if (bufferId) {
-        console.log(`Execute report will be pre-buffered through the offramp. This may take some time.`);
-        transactions.push(...(await bufferedTransactionData(offrampProgram, serializedReport, recentBlockhash, bufferId, opts)));
+        logger.info(`Execute report will be pre-buffered through the offramp. This may take some time.`);
+        const bufferingIxs = await bufferedTransactionData(payer, program, serializedReport, bufferId, {
+            logger,
+            ...opts,
+        });
+        instructions.push(...bufferingIxs);
         serializedReport = Buffer.from([]); // clear 1st param to manuallyExecute method if buffered
     }
-    const execTx = await offrampProgram.methods
+    const execIx = await program.methods
         .manuallyExecute(serializedReport, tokenIndexes)
         .accounts({
         config: accounts[0].pubkey,
@@ -108,39 +75,31 @@ async function buildExecTxToSolana(offrampProgram, execReport, computeUnitsOverr
         rmnRemoteConfig: accounts[11].pubkey,
     })
         .remainingAccounts(accounts.slice(12))
-        .transaction();
-    computeUnitsOverride ||= Math.ceil(1.1 *
-        ((await simulateTransaction({
-            instructions: execTx.instructions,
-            connection: provider.connection,
-            payerKey: provider.wallet.publicKey,
-            addressLookupTableAccounts,
-            computeUnitsOverride,
-        })).unitsConsumed || 0));
-    // Add compute budget instruction at the beginning of instructions
-    execTx.instructions.unshift(ComputeBudgetProgram.setComputeUnitLimit({
-        units: computeUnitsOverride,
-    }));
+        .instruction();
     // actual exec tx
-    transactions.push([
-        'exec',
-        toVersionedTransaction(execTx.instructions, provider.wallet.publicKey, recentBlockhash, addressLookupTableAccounts),
-    ]);
+    let execIndex = instructions.length;
+    instructions.push(execIx);
+    // "sandwich" instructions with ALT create+extend, then deactivate
     if (alt) {
-        transactions.unshift(...alt.initialTxs);
-        transactions.push(...alt.finalTxs);
+        instructions.unshift(...alt.initialIxs);
+        execIndex += alt.initialIxs.length;
+        instructions.push(...alt.finalIxs);
     }
-    return transactions;
+    return {
+        family: ChainFamily.Solana,
+        instructions,
+        lookupTables: addressLookupTableAccounts,
+        mainIndex: execIndex,
+    };
 }
-async function buildLookupTableTxs(provider, accounts) {
-    const recentSlot = await provider.connection.getSlot('finalized');
+async function buildLookupTableIxs({ connection, logger = console }, authority, addresses) {
+    const recentSlot = await connection.getSlot('confirmed');
     const [createIx, altAddr] = AddressLookupTableProgram.createLookupTable({
-        authority: provider.wallet.publicKey,
-        payer: provider.wallet.publicKey,
+        authority,
+        payer: authority,
         recentSlot,
     });
-    console.log('Using Address Lookup Table', altAddr.toBase58());
-    const addresses = accounts.map((a) => a.pubkey);
+    logger.info('Using Address Lookup Table', altAddr.toBase58());
     if (addresses.length > 256) {
         throw new Error(`The number of addresses (${addresses.length}) exceeds the maximum limit imposed by Solana of 256 for Address Lookup Tables`);
     }
@@ -149,21 +108,19 @@ async function buildLookupTableTxs(provider, accounts) {
     const firstChunkLength = 28;
     const maxAddressesPerTx = 35;
     const extendIxs = [];
-    const ranges = [];
     for (let [start, end] = [0, firstChunkLength]; start < addresses.length; [start, end] = [end, end + maxAddressesPerTx]) {
         const addressesChunk = addresses.slice(start, end);
         const extendIx = AddressLookupTableProgram.extendLookupTable({
-            payer: provider.wallet.publicKey,
-            authority: provider.wallet.publicKey,
+            authority,
+            payer: authority,
             lookupTable: altAddr,
             addresses: addressesChunk,
         });
         extendIxs.push(extendIx);
-        ranges.push([start, start + addressesChunk.length - 1]);
     }
     const deactivateIx = AddressLookupTableProgram.deactivateLookupTable({
         lookupTable: altAddr,
-        authority: provider.wallet.publicKey,
+        authority,
     });
     // disable closeTx, to be cleaned in SolanaChain.cleanUpBuffers
     // const closeIx = AddressLookupTableProgram.closeLookupTable({
@@ -171,82 +128,50 @@ async function buildLookupTableTxs(provider, accounts) {
     //   recipient: provider.wallet.publicKey,
     //   lookupTable: altAddr,
     // })
-    const { blockhash: recentBlockhash } = await provider.connection.getLatestBlockhash();
     return {
-        addressLookupTableAccount: new AddressLookupTableAccount({
+        lookupTable: new AddressLookupTableAccount({
             key: altAddr,
             state: {
-                deactivationSlot: BigInt(0),
+                deactivationSlot: 2n ** 64n - 1n,
                 lastExtendedSlot: recentSlot,
                 lastExtendedSlotStartIndex: 0,
                 addresses,
             },
         }),
-        initialTxs: [
-            // first extendIx fits in create tx
-            [
-                `lookup[create + 0..${ranges[0][1]}]`,
-                toVersionedTransaction([createIx, extendIxs[0]], provider.wallet.publicKey, recentBlockhash),
-            ],
-            ...extendIxs
-                .slice(1)
-                .map((ix, i) => [
-                `lookup[${ranges[i + 1][0]}..${ranges[i + 1][1]}]`,
-                toVersionedTransaction([ix], provider.wallet.publicKey, recentBlockhash),
-            ]),
-        ],
-        finalTxs: [
-            [
-                `lookup[deactivate]`,
-                toVersionedTransaction([deactivateIx], provider.wallet.publicKey, recentBlockhash),
-            ],
-        ],
+        initialIxs: [createIx, ...extendIxs],
+        finalIxs: [deactivateIx],
     };
 }
-async function bufferedTransactionData(offrampProgram, serializedReport, recentBlockhash, bufferId, opts) {
-    const provider = offrampProgram.provider;
-    const [bufferAddress] = PublicKey.findProgramAddressSync([Buffer.from('execution_report_buffer'), bufferId, provider.wallet.publicKey.toBuffer()], offrampProgram.programId);
-    const [configPDA] = PublicKey.findProgramAddressSync([Buffer.from('config')], offrampProgram.programId);
-    console.log(`The bufferID is ${hexlify(bufferId)}, and the PDA address for the buffer is ${bufferAddress.toString()}\nIf this buffering process is aborted, remember to cleanUp the account to recover locked rent.`);
+async function bufferedTransactionData(payer, offramp, serializedReport, bufferId, { logger = console, clearLeftoverAccounts, } = {}) {
+    const [bufferAddress] = PublicKey.findProgramAddressSync([Buffer.from('execution_report_buffer'), bufferId, payer.toBuffer()], offramp.programId);
+    const [configPDA] = PublicKey.findProgramAddressSync([Buffer.from('config')], offramp.programId);
+    logger.info(`The bufferID is ${hexlify(bufferId)}, and the PDA address for the buffer is ${bufferAddress.toString()}\nIf this buffering process is aborted, remember to cleanUp the account to recover locked rent.`);
     const chunkSize = 800;
-    const bufferedExecTxs = [];
+    const bufferedExecIxs = [];
     const bufferingAccounts = {
         executionReportBuffer: bufferAddress,
         config: configPDA,
-        authority: provider.wallet.publicKey,
+        authority: payer,
         systemProgram: SystemProgram.programId,
     };
-    if (opts?.clearLeftoverAccounts) {
-        const clearTx = await offrampProgram.methods
+    if (clearLeftoverAccounts) {
+        bufferedExecIxs.push(await offramp.methods
             .closeExecutionReportBuffer(bufferId)
             .accounts(bufferingAccounts)
-            .transaction();
-        bufferedExecTxs.push([
-            'buffering[clear]',
-            toVersionedTransaction(clearTx, provider.wallet.publicKey, recentBlockhash),
-        ]);
+            .instruction());
     }
     const numChunks = Math.ceil(serializedReport.length / chunkSize);
     for (let i = 0; i < serializedReport.length; i += chunkSize) {
         const end = Math.min(i + chunkSize, serializedReport.length);
         const chunk = serializedReport.subarray(i, end);
-        const appendTx = await offrampProgram.methods
+        bufferedExecIxs.push(await offramp.methods
             .bufferExecutionReport(bufferId, serializedReport.length, chunk, i / chunkSize, numChunks)
             .accounts(bufferingAccounts)
-            .transaction();
-        bufferedExecTxs.push([
-            `buffering[${i / chunkSize}=${end - i}B]`,
-            toVersionedTransaction(appendTx, provider.wallet.publicKey, recentBlockhash),
-        ]);
+            .instruction());
     }
-    return bufferedExecTxs;
-}
-function toVersionedTransaction(input, payerKey, recentBlockhash, addressLookupTableAccounts) {
-    const instructions = Array.isArray(input) ? input : input.instructions;
-    const message = new TransactionMessage({ payerKey, recentBlockhash, instructions });
-    return new VersionedTransaction(message.compileToV0Message(addressLookupTableAccounts));
+    return bufferedExecIxs;
 }
-async function getManuallyExecuteInputs({ execReport, offrampProgram, transmitter, bufferId, }) {
+async function getManuallyExecuteInputs({ payer, offramp, execReport, bufferId, ...ctx }) {
     const executionReport = prepareExecutionReport(execReport);
     const messageAccountMetas = execReport.message.accounts.map((acc, index) => {
         const bitmap = BigInt(execReport.message.accountIsWritableBitmap);
@@ -263,7 +188,6 @@ async function getManuallyExecuteInputs({ execReport, offrampProgram, transmitte
         isSigner: false,
         isWritable: false,
     };
-    console.debug('Message receiver:', execReport.message.receiver);
     // Prepend receiver to messaging accounts
     const messagingAccounts = execReport.message.receiver !== PublicKey.default.toBase58()
         ? [receiverAccountMeta, ...messageAccountMetas]
@@ -281,15 +205,16 @@ async function getManuallyExecuteInputs({ execReport, offrampProgram, transmitte
         },
     }));
     const { accounts, addressLookupTableAccounts: addressLookupTables, tokenIndexes, } = await autoDeriveExecutionAccounts({
-        offrampProgram,
+        offramp,
         originalSender: bytesToBuffer(execReport.message.sender),
-        transmitter: new PublicKey(transmitter),
+        payer,
         messagingAccounts,
         sourceChainSelector: execReport.message.header.sourceChainSelector,
         tokenTransferAndOffchainData,
         merkleRoot: bytesToBuffer(execReport.merkleRoot),
         bufferId,
         tokenReceiver: new PublicKey(execReport.message.tokenReceiver),
+        ...ctx,
     });
     return {
         executionReport,
@@ -330,17 +255,17 @@ function prepareExecutionReport({ message, offchainTokenData, proofs, }) {
         proofs: proofs.map((p) => Array.from(getDataBytes(p))),
     };
 }
-async function autoDeriveExecutionAccounts({ offrampProgram, originalSender, transmitter, messagingAccounts, sourceChainSelector, tokenTransferAndOffchainData, merkleRoot, tokenReceiver, bufferId, }) {
+async function autoDeriveExecutionAccounts({ offramp, originalSender, payer, messagingAccounts, sourceChainSelector, tokenTransferAndOffchainData, merkleRoot, tokenReceiver, bufferId, logger = console, }) {
     const derivedAccounts = [];
     const lookupTables = [];
     const tokenIndices = [];
     let askWith = [];
     let stage = 'Start';
     let tokenIndex = 0;
-    const [configPDA] = PublicKey.findProgramAddressSync([Buffer.from('config')], offrampProgram.programId);
+    const [configPDA] = PublicKey.findProgramAddressSync([Buffer.from('config')], offramp.programId);
     while (true) {
         const params = {
-            executeCaller: transmitter,
+            executeCaller: payer,
             messageAccounts: messagingAccounts,
             sourceChainSelector: new BN(sourceChainSelector.toString()),
             originalSender: originalSender,
@@ -359,10 +284,8 @@ async function autoDeriveExecutionAccounts({ offrampProgram, originalSender, tra
                 data: Buffer.from([]), // omit offchain token data
             }));
         }
-        // copy of Program which avoids signing every simulation
-        const readOnlyProgram = new Program(offrampProgram.idl, offrampProgram.programId, simulationProvider(offrampProgram.provider.connection, transmitter));
         // Execute as a view call to get the response
-        const response = (await readOnlyProgram.methods
+        const response = (await offramp.methods
             .deriveAccountsExecute(params, stage)
             .accounts({
             config: configPDA,
@@ -370,8 +293,8 @@ async function autoDeriveExecutionAccounts({ offrampProgram, originalSender, tra
             .remainingAccounts(askWith)
             .view()
             .catch((error) => {
-            console.error('Error deriving accounts:', error);
-            console.error('Params:', params);
+            logger.error('Error deriving accounts:', error);
+            logger.error('Params:', params);
             throw error;
         }));
         // Check if we're at the start of a token transfer
@@ -382,7 +305,7 @@ async function autoDeriveExecutionAccounts({ offrampProgram, originalSender, tra
         }
         // Update token index
         tokenIndex += response.accountsToSave.length;
-        console.debug('After stage', stage, 'tokenIndices', tokenIndices, 'nextTokenIndex', tokenIndex);
+        logger.debug('After stage', stage, 'tokenIndices', tokenIndices, 'nextTokenIndex', tokenIndex);
         // Collect the derived accounts
         for (const meta of response.accountsToSave) {
             derivedAccounts.push({
@@ -405,9 +328,9 @@ async function autoDeriveExecutionAccounts({ offrampProgram, originalSender, tra
         }
         stage = response.nextStage;
     }
-    console.debug('Resulting derived accounts:', derivedAccounts);
-    console.debug('Resulting derived address lookup tables:', lookupTables);
-    console.debug('Resulting derived token indexes:', tokenIndices);
+    logger.debug('Resulting derived accounts:', derivedAccounts);
+    logger.debug('Resulting derived address lookup tables:', lookupTables);
+    logger.debug('Resulting derived token indexes:', tokenIndices);
     return {
         accounts: derivedAccounts,
         addressLookupTableAccounts: lookupTables,