@chainlink/ccip-sdk 0.0.0 → 0.90.0

package/dist/utils.js

@@ -0,0 +1,336 @@
+import util from 'util';
+import bs58 from 'bs58';
+import { decodeBase64, getBytes, isBytesLike, toBeHex, toBigInt, } from 'ethers';
+import moize from 'moize';
+import { ChainFamily } from "./chain.js";
+import SELECTORS from "./selectors.js";
+import { supportedChains } from "./supported-chains.js";
+/**
+ * Returns *some* block number with timestamp prior to `timestamp`
+ *
+ * @param getBlockTimestamp - function to get block timestamp
+ * @param recentBlockNumber - a block guaranteed to be after `timestamp` (e.g. latest)
+ * @param timestamp - target timestamp
+ * @param precision - returned blockNumber should be within this many blocks before timestamp
+ * @returns blockNumber of a block at provider which is close but before target timestamp
+ **/
+export async function getSomeBlockNumberBefore(getBlockTimestamp, recentBlockNumber, timestamp, precision = 10) {
+    let beforeBlockNumber = Math.max(1, recentBlockNumber - precision * 1000);
+    let beforeTimestamp = await getBlockTimestamp(beforeBlockNumber);
+    const now = Math.trunc(Date.now() / 1000);
+    let estimatedBlockTime = (now - beforeTimestamp) / (recentBlockNumber - beforeBlockNumber), afterBlockNumber = recentBlockNumber, afterTimestamp = now;
+    // first, go back looking for a block prior to our target timestamp
+    for (let iter = 0; beforeBlockNumber > 1 && beforeTimestamp > timestamp; iter++) {
+        afterBlockNumber = beforeBlockNumber;
+        afterTimestamp = beforeTimestamp;
+        beforeBlockNumber = Math.max(1, Math.trunc(beforeBlockNumber - (beforeTimestamp - timestamp) / estimatedBlockTime) -
+            10 ** iter);
+        beforeTimestamp = await getBlockTimestamp(beforeBlockNumber);
+        estimatedBlockTime = (now - beforeTimestamp) / (recentBlockNumber - beforeBlockNumber);
+    }
+    if (beforeTimestamp > timestamp) {
+        throw new Error(`Could not find a block prior to timestamp=${timestamp}`);
+    }
+    // now, bin-search based on timestamp proportions, looking for
+    // a block at most N estimated blockTimes from our target timestamp
+    while (timestamp - beforeTimestamp >= 1 && afterBlockNumber - beforeBlockNumber > precision) {
+        const prop = (timestamp - beforeTimestamp) / (afterTimestamp - beforeTimestamp);
+        const delta = prop > 0.5
+            ? Math.floor(prop * (afterBlockNumber - beforeBlockNumber))
+            : Math.ceil(prop * (afterBlockNumber - beforeBlockNumber));
+        let pivot = beforeBlockNumber + delta;
+        if (pivot === afterBlockNumber) {
+            pivot--;
+        }
+        const pivotTimestamp = await getBlockTimestamp(pivot);
+        if (pivotTimestamp > timestamp) {
+            afterBlockNumber = pivot;
+            afterTimestamp = pivotTimestamp;
+        }
+        else {
+            beforeBlockNumber = pivot;
+            beforeTimestamp = pivotTimestamp;
+        }
+        console.debug('getSomeBlockNumberBefore: searching block before', {
+            beforeBlockNumber,
+            beforeTimestamp,
+            pivot,
+            pivotTimestamp,
+            afterBlockNumber,
+            afterTimestamp,
+            estimatedBlockTime,
+            timestamp,
+            diffNumber: afterBlockNumber - beforeBlockNumber,
+        });
+    }
+    return beforeBlockNumber;
+}
+// memoized so we always output the same object for a given chainId
+const networkInfoFromChainId = moize.default((chainId) => {
+    const sel = SELECTORS[chainId];
+    if (!sel?.name)
+        throw new Error(`Chain not found: ${chainId}`);
+    return {
+        chainId: isNaN(+chainId) ? chainId : +chainId,
+        chainSelector: sel.selector,
+        name: sel.name,
+        family: sel.family,
+        isTestnet: !sel.name.includes('-mainnet'),
+    };
+});
+/**
+ * Converts a chain selector, chain ID, or chain name to complete network information
+ *
+ * @param selectorOrIdOrName - Can be:
+ *   - Chain selector as bigint or numeric string
+ *   - Chain ID as number, bigint or string (EVM: "1", Aptos: "aptos:1", Solana: genesisHash)
+ *   - Chain name as string ("ethereum-mainnet")
+ * @returns Complete NetworkInfo object
+ */
+export const networkInfo = moize.default(function networkInfo_(selectorOrIdOrName) {
+    let chainId;
+    if (typeof selectorOrIdOrName === 'number') {
+        chainId = selectorOrIdOrName;
+    }
+    else if (typeof selectorOrIdOrName === 'string' && selectorOrIdOrName.match(/^\d+$/)) {
+        selectorOrIdOrName = BigInt(selectorOrIdOrName);
+    }
+    if (typeof selectorOrIdOrName === 'bigint') {
+        // maybe we got a number deserialized as bigint
+        if (selectorOrIdOrName.toString() in SELECTORS) {
+            chainId = Number(selectorOrIdOrName);
+        }
+        else {
+            for (const id in SELECTORS) {
+                if (SELECTORS[id].selector === selectorOrIdOrName) {
+                    chainId = id;
+                    break;
+                }
+            }
+            if (!chainId)
+                throw new Error(`Selector not found: ${selectorOrIdOrName}`);
+        }
+    }
+    else if (typeof selectorOrIdOrName === 'string') {
+        if (selectorOrIdOrName.includes('-')) {
+            for (const id in SELECTORS) {
+                if (SELECTORS[id].name === selectorOrIdOrName) {
+                    chainId = id;
+                    break;
+                }
+            }
+        }
+        chainId ??= selectorOrIdOrName;
+    }
+    return networkInfoFromChainId(chainId);
+});
+const BLOCK_RANGE = 10_000;
+/**
+ * Generates exclusive block ranges [fromBlock, toBlock]
+ * If startBlock is given, moves forward from there (up to latestBlock),
+ * Otherwise, moves backwards down to genesis (you probably want to break/return before that)
+ **/
+export function* blockRangeGenerator(params) {
+    const stepSize = params.page ?? BLOCK_RANGE;
+    if ('singleBlock' in params) {
+        yield { fromBlock: params.singleBlock, toBlock: params.singleBlock };
+    }
+    else if ('startBlock' in params && params.startBlock) {
+        for (let fromBlock = params.startBlock; fromBlock < params.endBlock; fromBlock += stepSize) {
+            yield {
+                fromBlock,
+                toBlock: Math.min(params.endBlock, fromBlock + stepSize - 1),
+                progress: `${Math.trunc(((fromBlock - params.startBlock) / (params.endBlock - params.startBlock)) * 10000) / 100}%`,
+            };
+        }
+    }
+    else {
+        for (let toBlock = params.endBlock; toBlock > 1; toBlock -= stepSize) {
+            yield {
+                fromBlock: Math.max(1, toBlock - stepSize + 1),
+                toBlock,
+            };
+        }
+    }
+}
+export function bigIntReplacer(_key, value) {
+    if (typeof value === 'bigint') {
+        return value.toString();
+    }
+    return value;
+}
+export function bigIntReviver(_key, value) {
+    if (typeof value === 'string' && /^\d+$/.test(value)) {
+        return BigInt(value);
+    }
+    return value;
+}
+/**
+ * Decode address from a 32-byte hex string
+ **/
+export function decodeAddress(address, family = ChainFamily.EVM) {
+    const chain = supportedChains[family];
+    if (!chain)
+        throw new Error(`Unsupported chain family: ${family}`);
+    return chain.getAddress(getAddressBytes(address));
+}
+/**
+ * Version of decodeAddress which is aware of custom cross-chain OnRamp formats
+ **/
+export function decodeOnRampAddress(address, family = ChainFamily.EVM) {
+    let decoded = decodeAddress(address, family);
+    if (family === ChainFamily.Aptos)
+        decoded += '::onramp';
+    return decoded;
+}
+export function leToBigInt(data) {
+    if (Array.isArray(data))
+        data = new Uint8Array(data);
+    return toBigInt(getBytes(data).reverse());
+}
+export function toLeArray(value, width) {
+    return getBytes(toBeHex(value, width)).reverse();
+}
+export function isBase64(data) {
+    return (typeof data === 'string' &&
+        /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/.test(data));
+}
+export function getDataBytes(data) {
+    if (Array.isArray(data)) {
+        return new Uint8Array(data);
+    }
+    if (isBytesLike(data)) {
+        return getBytes(data);
+    }
+    else if (isBase64(data)) {
+        return decodeBase64(data);
+    }
+    else {
+        throw new Error(`Unsupported data format: ${util.inspect(data)}`);
+    }
+}
+export function getAddressBytes(address) {
+    let bytes;
+    if (isBytesLike(address)) {
+        bytes = getBytes(address);
+    }
+    else {
+        bytes = bs58.decode(address);
+    }
+    if (bytes.length > 20) {
+        if (bytes.slice(0, bytes.length - 20).every((b) => b === 0) &&
+            bytes.slice(-20).some((b) => b !== 0)) {
+            bytes = bytes.slice(-20);
+        }
+    }
+    return bytes;
+}
+/**
+ * Converts snake_case strings to camelCase
+ */
+export function snakeToCamel(str) {
+    return str.replace(/_([a-zA-Z])/g, (_, letter) => letter.toUpperCase());
+}
+/**
+ * Recursively converts all snake_case keys in an object to camelCase
+ * Only converts keys that actually have snake_case format
+ */
+export function convertKeysToCamelCase(obj, mapValues, key) {
+    if (Array.isArray(obj)) {
+        return obj.map((v) => convertKeysToCamelCase(v, mapValues, key));
+    }
+    if (obj == null || typeof obj !== 'object')
+        return mapValues ? mapValues(obj, key) : obj;
+    const record = obj;
+    const converted = {};
+    for (const [name, value] of Object.entries(record)) {
+        const camelKey = snakeToCamel(name);
+        converted[camelKey] = convertKeysToCamelCase(value, mapValues, camelKey);
+    }
+    return converted;
+}
+export const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+export function parseTypeAndVersion(typeAndVersion) {
+    const match = typeAndVersion.match(/^(\w.+\S)\s+v?(\d+\.\d+(?:\.\d+)?)([^\d.].*)?$/);
+    if (!match)
+        throw new Error(`Invalid typeAndVersion: "${typeAndVersion}", len=${typeAndVersion.length}, hex=0x${Buffer.from(typeAndVersion).toString('hex')}`);
+    const [_, typeRaw, version] = match;
+    // some string normalization
+    const type = typeRaw
+        .replaceAll(/-(\w)/g, (_, w) => w.toUpperCase()) // kebabToPascal
+        .replace(/ccip/gi, 'CCIP')
+        .replace(/(o)(n|ff)(ramp)\b/gi, (_, o, n, ramp) => `${o.toUpperCase()}${n.toLowerCase()}${ramp.charAt(0).toUpperCase()}${ramp.slice(1).toLowerCase()}`); // ccipOfframp -> CCIPOffRamp
+    if (!match[3])
+        return [type, version, typeAndVersion];
+    else
+        return [type, version, typeAndVersion, match[3]];
+}
+export function createRateLimitedFetch({ maxRequests = Number(process.env['RL_MAX_REQUESTS'] || 2), windowMs = Number(process.env['RL_WINDOW_MS'] || 10000), maxRetries = Number(process.env['RL_MAX_RETRIES'] || 5), } = {}) {
+    // Custom fetch implementation with retry logic and rate limiting
+    // Per-instance state
+    const requestQueue = [];
+    const isRateLimited = () => {
+        const now = Date.now();
+        // Remove old requests outside the window
+        while (requestQueue.length > 0 && now - requestQueue[0].timestamp > windowMs) {
+            requestQueue.shift();
+        }
+        return requestQueue.length >= maxRequests;
+    };
+    const waitForRateLimit = async () => {
+        while (isRateLimited()) {
+            const oldestRequest = requestQueue[0];
+            const waitTime = windowMs - (Date.now() - oldestRequest.timestamp);
+            if (waitTime > 0) {
+                await sleep(waitTime + 100); // Add small buffer
+            }
+        }
+    };
+    const recordRequest = () => {
+        requestQueue.push({ timestamp: Date.now() });
+    };
+    const isRateLimitError = (error) => {
+        if (error instanceof Error) {
+            return !!error.message.match(/\b(429\b|rate.?limit)/i);
+        }
+        return false;
+    };
+    return async (input, init) => {
+        let lastError = null;
+        for (let attempt = 0; attempt <= maxRetries; attempt++) {
+            try {
+                // Wait for rate limit before making request
+                await waitForRateLimit();
+                recordRequest();
+                // console.debug('__fetching', input, init?.body)
+                const response = await fetch(input, init);
+                // If response is successful, return it
+                if (response.ok) {
+                    console.debug('fetched', input, response.status, init?.body);
+                    return response;
+                }
+                // For 429 responses, throw an error to trigger retry
+                if (response.status === 429) {
+                    throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+                }
+                // For other non-2xx responses, don't retry
+                console.debug('fetch non-retryable error', input, response.status, init?.body);
+                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+            }
+            catch (error) {
+                console.debug('fetch errored', attempt, error, input, init?.body);
+                lastError = error instanceof Error ? error : new Error(String(error));
+                // Only retry on rate limit errors
+                if (!isRateLimitError(lastError)) {
+                    throw lastError;
+                }
+                // Don't retry on the last attempt
+                if (attempt >= maxRetries) {
+                    break;
+                }
+            }
+        }
+        throw lastError || new Error('Request failed after all retries');
+    };
+}
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,67 @@
 {
-            "name": "@chainlink/ccip-sdk",
-            "version": "0.0.0",
-            "main": "",
-            "author": "",
-            "license": "ISC",
-            "repository": "git://github.com/smartcontractkit/ccip-tools-ts.git",
-            "description": ""
-            }
+  "name": "@chainlink/ccip-sdk",
+  "version": "0.90.0",
+  "description": "SDK/Library to interact with CCIP",
+  "author": "Chainlink devs",
+  "license": "MIT",
+  "repository": "git://github.com/smartcontractkit/ccip-tools-ts.git",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./src/*": "./src/*"
+  },
+  "scripts": {
+    "test": "node --test",
+    "lint": "prettier --check ./src && eslint ./src",
+    "lint:fix": "prettier --write ./src && eslint --fix ./src",
+    "typecheck": "tsc --noEmit",
+    "check": "npm run lint && npm run typecheck",
+    "build": "npm run clean && tsc -p ./tsconfig.build.json",
+    "clean": "rm -rfv ./dist",
+    "prepare": "npm run build"
+  },
+  "files": [
+    "dist",
+    "src",
+    "tsconfig.json",
+    "!**/*.test.*",
+    "!**/__tests__",
+    "!**/__mocks__"
+  ],
+  "devDependencies": {
+    "@eslint/js": "^9.39.1",
+    "@types/bn.js": "^5.2.0",
+    "@types/node": "24.10.1",
+    "@types/yargs": "17.0.35",
+    "eslint": "^9.39.1",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-import-resolver-typescript": "4.4.4",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-prettier": "^5.5.4",
+    "ethers-abitype": "1.0.3",
+    "prettier": "^3.7.1",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.47.0"
+  },
+  "dependencies": {
+    "@aptos-labs/ts-sdk": "^5.1.5",
+    "@coral-xyz/anchor": "^0.29.0",
+    "@mysten/bcs": "^1.9.2",
+    "@mysten/sui": "^1.45.0",
+    "@solana/spl-token": "0.4.14",
+    "@solana/web3.js": "^1.98.4",
+    "abitype": "1.2.0",
+    "bn.js": "^5.2.2",
+    "borsh": "^2.0.0",
+    "bs58": "^6.0.0",
+    "ethers": "6.15.0",
+    "moize": "^6.1.6",
+    "yaml": "2.8.1"
+  },
+  "overrides": {
+    "axios": "^1.13.2"
+  }
+}

package/src/aptos/exec.ts

@@ -0,0 +1,69 @@
+import type { Aptos } from '@aptos-labs/ts-sdk'
+
+import type { ExecutionReport } from '../types.ts'
+import { type AptosAsyncAccount, serializeExecutionReport } from './types.ts'
+import type { CCIPMessage_V1_6_EVM } from '../evm/messages.ts'
+
+/**
+ * Executes as single message report in offramp
+ *
+ * @param provider - Aptos provider instance
+ * @param account - async Account
+ * @param offRamp - Offramp contract address (with or without `::offramp` suffix)
+ * @param execReport - Aptos uses EVMExtraArgsV2, so same message as EVM v1.6
+ * @param opts - options like gasLimit override
+ * @returns exec txHash
+ */
+export async function executeReport(
+  provider: Aptos,
+  account: AptosAsyncAccount,
+  offRamp: string,
+  execReport: ExecutionReport<CCIPMessage_V1_6_EVM>,
+  opts?: { gasLimit?: number },
+) {
+  // Prepare proofs as byte arrays
+  const serialized = serializeExecutionReport(execReport)
+
+  // Build the transaction to call manually_execute
+  // The function signature should be something like:
+  // public entry fun manually_execute(
+  //     caller: &signer,
+  //     merkle_root: vector<u8>,
+  //     proofs: vector<vector<u8>>,
+  //     proof_flag_bits: u256,
+  //     message_id: vector<u8>,
+  //     source_chain_selector: u64,
+  //     dest_chain_selector: u64,
+  //     sequence_number: u64,
+  //     nonce: u64,
+  //     sender: vector<u8>,
+  //     receiver: vector<u8>,
+  //     data: vector<u8>,
+  //     token_addresses: vector<address>,
+  //     token_amounts: vector<u256>,
+  //     offchain_token_data: vector<vector<u8>>,
+  //     gas_limit: u256
+  // )
+  const transaction = await provider.transaction.build.simple({
+    sender: account.accountAddress,
+    data: {
+      function:
+        `${offRamp.includes('::') ? offRamp : offRamp + '::offramp'}::manually_execute` as `${string}::${string}::${string}`,
+      functionArguments: [serialized],
+    },
+    options: { maxGasAmount: opts?.gasLimit },
+  })
+
+  // Sign and submit the transaction
+  const signed = await account.signTransactionWithAuthenticator(transaction)
+  const pendingTxn = await provider.transaction.submit.simple({
+    transaction,
+    senderAuthenticator: signed,
+  })
+
+  // Wait for the transaction to be confirmed
+  const { hash } = await provider.waitForTransaction({
+    transactionHash: pendingTxn.hash,
+  })
+  return hash
+}

package/src/aptos/hasher.ts

@@ -0,0 +1,92 @@
+import { concat, id, keccak256, zeroPadValue } from 'ethers'
+
+import { decodeExtraArgs } from '../extra-args.ts'
+import { type LeafHasher, LEAF_DOMAIN_SEPARATOR } from '../hasher/common.ts'
+import { type CCIPMessage, type CCIPMessage_V1_6, CCIPVersion } from '../types.ts'
+import { getAddressBytes, networkInfo } from '../utils.ts'
+import { encodeNumber, encodeRawBytes } from './utils.ts'
+
+export function getAptosLeafHasher<V extends CCIPVersion = CCIPVersion>({
+  sourceChainSelector,
+  destChainSelector,
+  onRamp,
+  version,
+}: {
+  sourceChainSelector: bigint
+  destChainSelector: bigint
+  onRamp: string
+  version: V
+}): LeafHasher<V> {
+  let metadataHash: string
+  switch (version) {
+    case CCIPVersion.V1_6:
+      metadataHash = hashAptosMetadata(sourceChainSelector, destChainSelector, onRamp)
+      return ((message: CCIPMessage<typeof CCIPVersion.V1_6>): string =>
+        hashV16AptosMessage(message, metadataHash)) as LeafHasher<V>
+    default:
+      throw new Error(`Unsupported hasher version for Aptos: ${version as string}`)
+  }
+}
+
+export function hashV16AptosMessage(
+  message: CCIPMessage_V1_6 | CCIPMessage<typeof CCIPVersion.V1_6>,
+  metadataHash: string,
+): string {
+  let gasLimit
+  if (!('gasLimit' in message)) {
+    const parsedArgs = decodeExtraArgs(
+      message.extraArgs,
+      networkInfo(message.header.sourceChainSelector).family,
+    )
+    if (!parsedArgs || !('gasLimit' in parsedArgs))
+      throw new Error('Invalid extraArgs, not EVMExtraArgsV1|2')
+    gasLimit = parsedArgs.gasLimit
+  } else {
+    gasLimit = message.gasLimit
+  }
+
+  const innerHash = concat([
+    message.header.messageId,
+    zeroPadValue(message.receiver, 32),
+    encodeNumber(message.header.sequenceNumber),
+    encodeNumber(gasLimit), // Aptos as dest uses EVMExtraArgs
+    encodeNumber(message.header.nonce),
+  ])
+
+  const tokenHash = concat([
+    encodeNumber(message.tokenAmounts.length),
+    ...message.tokenAmounts.map((token) =>
+      concat([
+        encodeRawBytes(getAddressBytes(token.sourcePoolAddress)),
+        zeroPadValue(token.destTokenAddress, 32),
+        encodeNumber(token.destGasAmount),
+        encodeRawBytes(token.extraData),
+        encodeNumber(token.amount),
+      ]),
+    ),
+  ])
+
+  const outerHash = concat([
+    zeroPadValue(LEAF_DOMAIN_SEPARATOR, 32),
+    metadataHash,
+    keccak256(innerHash),
+    keccak256(getAddressBytes(message.sender)),
+    keccak256(message.data),
+    keccak256(tokenHash),
+  ])
+
+  return keccak256(outerHash)
+}
+
+export const hashAptosMetadata = (
+  sourceChainSelector: bigint,
+  destChainSelector: bigint,
+  onRamp: string,
+): string => {
+  const versionHash = id('Any2AptosMessageHashV1')
+  const encodedSource = encodeNumber(sourceChainSelector)
+  const encodedDest = encodeNumber(destChainSelector)
+  const onrampHash = keccak256(onRamp)
+
+  return keccak256(concat([versionHash, encodedSource, encodedDest, onrampHash]))
+}