@across-protocol/contracts 4.0.1 → 4.0.3

package/dist/deploy/consts.d.ts

@@ -59,5 +59,5 @@ export declare const POLYGON_CHAIN_IDS: {
  * @link https://developers.circle.com/stablecoins/docs/supported-domains
  */
 export declare const CIRCLE_DOMAIN_IDs: {
-    [chainId: number]: number;
+    [k: string]: number;
 };

package/dist/deploy/consts.js

@@ -143,6 +143,10 @@ exports.OP_STACK_ADDRESS_MAP = {
             L1CrossDomainMessenger: "0x58Cc85b8D04EA49cC6DBd3CbFFd00B4B8D6cb3ef",
             L1StandardBridge: "0xFBb0621E0B23b5478B630BD55a5f21f67730B0F1",
         },
+        [utils_1.CHAIN_IDs.UNICHAIN_SEPOLIA]: {
+            L1CrossDomainMessenger: "0x448A37330A60494E666F6DD60aD48d930AEbA381",
+            L1StandardBridge: "0xea58fcA6849d79EAd1f26608855c2D6407d54Ce2",
+        },
     },
 };
 exports.L2_ADDRESS_MAP = {
@@ -226,6 +230,10 @@ exports.L2_ADDRESS_MAP = {
         cctpTokenMessenger: "0x4e744b28E787c3aD0e810eD65A24461D4ac5a762",
         cctpMessageTransmitter: "0x353bE9E2E38AB1D19104534e4edC21c643Df86f4",
     },
+    [utils_1.CHAIN_IDs.UNICHAIN_SEPOLIA]: {
+        cctpTokenMessenger: "0x8ed94B8dAd2Dc5453862ea5e316A8e71AAed9782",
+        cctpMessageTransmitter: "0xbc498c326533d675cf571B90A2Ced265ACb7d086",
+    },
 };
 exports.POLYGON_CHAIN_IDS = {
     [utils_1.CHAIN_IDs.MAINNET]: utils_1.CHAIN_IDs.POLYGON,
@@ -236,16 +244,4 @@ exports.POLYGON_CHAIN_IDS = {
  * and is an internal mappinng maintained by Circle.
  * @link https://developers.circle.com/stablecoins/docs/supported-domains
  */
-exports.CIRCLE_DOMAIN_IDs = {
-    [utils_1.CHAIN_IDs.MAINNET]: 0,
-    [utils_1.CHAIN_IDs.OPTIMISM]: 2,
-    [utils_1.CHAIN_IDs.ARBITRUM]: 3,
-    [utils_1.CHAIN_IDs.BASE]: 6,
-    [utils_1.CHAIN_IDs.POLYGON]: 7,
-    // Testnet
-    [utils_1.CHAIN_IDs.SEPOLIA]: 0,
-    [utils_1.CHAIN_IDs.OPTIMISM_SEPOLIA]: 2,
-    [utils_1.CHAIN_IDs.ARBITRUM_SEPOLIA]: 3,
-    [utils_1.CHAIN_IDs.BASE_SEPOLIA]: 6,
-    [utils_1.CHAIN_IDs.POLYGON_AMOY]: 7,
-};
+exports.CIRCLE_DOMAIN_IDs = Object.fromEntries(Object.entries(utils_1.PUBLIC_NETWORKS).map(([chainId, { cctpDomain }]) => [Number(chainId), cctpDomain]));

package/dist/deployments/deployments.json

@@ -156,7 +156,8 @@
         "Polygon_Adapter": { "address": "0x540029039E493b1B843653f93C3064A956931747", "blockNumber": 5984591 },
         "Lisk_Adapter": { "address": "0x13a8B1D6443016424e2b8Bac40dD884Ee679AFc4", "blockNumber": 6226289 },
         "Lens_Adapter": { "address": "0x8fac6F764ae0b4F632FE2E6c938ED5637E629ff2", "blockNumber": 7448085 },
-        "Blast_Adapter": { "address": "0x09500Ffd743e01B4146a4BA795231Ca7Ca37819f", "blockNumber": 6233857 }
+        "Blast_Adapter": { "address": "0x09500Ffd743e01B4146a4BA795231Ca7Ca37819f", "blockNumber": 6233857 },
+        "DoctorWho_Adapter": { "address": "0x2b482aFb675e1F231521d5E56770ce4aac592246", "blockNumber": 7698546 }
     },
     "37111": {
         "SpokePool": { "address": "0x6A0a7f39530923911832Dd60667CE5da5449967B", "blockNumber": 156275 },
@@ -178,5 +179,27 @@
     "130": {
         "SpokePool": { "address": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64", "blockNumber": 7915488 },
         "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 7930191 }
+    },
+    "1301": {
+        "SpokePool": { "address": "0x6999526e507Cc3b03b180BbE05E1Ff938259A874", "blockNumber": 12593713 },
+        "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 12594561 }
+    },
+    "133268194659241": {
+        "SvmSpoke": {
+            "address": "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq",
+            "blockNumber": 356313770
+        },
+        "MulticallHandler": {
+            "address": "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h",
+            "blockNumber": 356321050
+        },
+        "MessageTransmitter": {
+            "address": "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd",
+            "blockNumber": 339604856
+        },
+        "TokenMessengerMinter": {
+            "address": "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3",
+            "blockNumber": 277864039
+        }
     }
 }

package/dist/hardhat.config.js

@@ -344,6 +344,13 @@ const config = {
             accounts: { mnemonic },
             companionNetworks: { l1: "mainnet" },
         },
+        "unichain-sepolia": {
+            chainId: constants_1.CHAIN_IDs.UNICHAIN_SEPOLIA,
+            url: "https://sepolia.unichain.org",
+            saveDeployments: true,
+            accounts: { mnemonic },
+            companionNetworks: { l1: "sepolia" },
+        },
     },
     gasReporter: { enabled: process.env.REPORT_GAS !== undefined, currency: "USD" },
     etherscan: {
@@ -375,7 +382,8 @@ const config = {
             alephzero: "blockscout",
             ink: "blockscout",
             soneium: "blockscout",
-            unichain: process.env.UNISCAN_API_KEY,
+            unichain: process.env.UNICHAIN_ETHERSCAN_API_KEY,
+            "unichain-sepolia": process.env.UNICHAIN_ETHERSCAN_API_KEY,
         },
         customChains: [
             {
@@ -570,6 +578,14 @@ const config = {
                     browserURL: "https://uniscan.xyz",
                 },
             },
+            {
+                network: "unichain-sepolia",
+                chainId: constants_1.CHAIN_IDs.UNICHAIN_SEPOLIA,
+                urls: {
+                    apiURL: "https://api-sepolia.uniscan.xyz/api",
+                    browserURL: "https://sepolia.uniscan.xyz",
+                },
+            },
         ],
     },
     namedAccounts: { deployer: 0 },

package/dist/scripts/svm/fakeFillWithRandomDistribution.js

@@ -153,7 +153,7 @@ async function fillV3RelayToRandom() {
     // Prepare fill instruction as we will need to use Address Lookup Table (ALT).
     const fillV3RelayValues = [relayHash, relayData, repaymentChain, repaymentAddress];
     if (bufferParams) {
-        await (0, web3_v1_1.loadFillV3RelayParams)(program, signer, fillV3RelayValues[1], fillV3RelayValues[2], fillV3RelayValues[3]);
+        await (0, web3_v1_1.loadFillRelayParams)(program, signer, fillV3RelayValues[1], fillV3RelayValues[2], fillV3RelayValues[3]);
     }
     const fillV3RelayParams = bufferParams ? [fillV3RelayValues[0], null, null, null] : fillV3RelayValues;
     const [instructionParams] = bufferParams
@@ -177,7 +177,7 @@ async function fillV3RelayToRandom() {
         ...multicallHandlerCoder.compiledKeyMetas,
     ];
     const fillInstruction = await program.methods
-        .fillV3Relay(...fillV3RelayParams)
+        .fillRelay(...fillV3RelayParams)
         .accounts(fillAccounts)
         .remainingAccounts(remainingAccounts)
         .instruction();

package/dist/scripts/svm/queryEvents.js

@@ -55,7 +55,7 @@ const argvPromise = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).o
         "pausedFills",
         "setXDomainAdmin",
         "emergencyDeletedRootBundle",
-        "requestedV3SlowFill",
+        "RequestedSlowFill",
         "claimedRelayerRefund",
         "tokensBridged",
     ],

package/dist/scripts/svm/simpleDeposit.js

@@ -49,7 +49,7 @@ const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .option("inputAmount", { type: "number", demandOption: true, describe: "Input amount" })
     .option("outputAmount", { type: "number", demandOption: true, describe: "Output amount" })
     .option("destinationChainId", { type: "string", demandOption: true, describe: "Destination chain ID" }).argv;
-async function depositV3() {
+async function deposit() {
     const resolvedArgv = await argv;
     const seed = new anchor_1.BN(resolvedArgv.seed);
     const recipient = new web3_js_1.PublicKey(resolvedArgv.recipient);
@@ -98,7 +98,7 @@ async function depositV3() {
     const tokenDecimals = (await (0, spl_token_1.getMint)(provider.connection, inputToken, undefined, spl_token_1.TOKEN_PROGRAM_ID)).decimals;
     // Delegate state PDA to pull depositor tokens.
     const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(userTokenAccount, inputToken, statePda, signer.publicKey, BigInt(inputAmount.toString()), tokenDecimals, undefined, spl_token_1.TOKEN_PROGRAM_ID);
-    const depositIx = await program.methods.depositV3(signer.publicKey, recipient, inputToken, outputToken, inputAmount, outputAmount, destinationChainId, exclusiveRelayer, quoteTimestamp, fillDeadline, exclusivityDeadline, message)
+    const depositIx = await program.methods.deposit(signer.publicKey, recipient, inputToken, outputToken, inputAmount, outputAmount, destinationChainId, exclusiveRelayer, quoteTimestamp, fillDeadline, exclusivityDeadline, message)
         .accounts({
         state: statePda,
         route: routePda,
@@ -114,4 +114,4 @@ async function depositV3() {
     console.log("Transaction signature:", tx);
 }
 // Run the depositV3 function
-depositV3();
+deposit();

package/dist/scripts/svm/simpleFakeRelayerRepayment.js

@@ -76,7 +76,7 @@ async function testBundleLogic() {
     // Delegate state PDA to pull depositor tokens.
     const inputAmount = amounts.reduce((acc, amount) => acc.add(amount), new anchor_1.BN(0));
     const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(userTokenAccount, inputToken, statePda, signer.publicKey, BigInt(inputAmount.toString()), tokenDecimals, undefined, spl_token_1.TOKEN_PROGRAM_ID);
-    const depositIx = await program.methods.depositV3(signer.publicKey, signer.publicKey, // recipient is the signer for this example
+    const depositIx = await program.methods.deposit(signer.publicKey, signer.publicKey, // recipient is the signer for this example
     inputToken, inputToken, // Re-use inputToken as outputToken. does not matter for this deposit.
     inputAmount, new anchor_1.BN(0), new anchor_1.BN(11155111), // destinationChainId. assumed to be enabled, as with routePDA
     web3_js_1.PublicKey.default, // exclusiveRelayer

package/dist/scripts/svm/simpleFill.js

@@ -54,7 +54,7 @@ const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .option("depositId", { type: "string", demandOption: true, describe: "Deposit ID" })
     .option("fillDeadline", { type: "number", demandOption: false, describe: "Fill deadline" })
     .option("exclusivityDeadline", { type: "number", demandOption: false, describe: "Exclusivity deadline" }).argv;
-async function fillV3Relay() {
+async function fillRelay() {
     const resolvedArgv = await argv;
     const depositor = new web3_js_1.PublicKey(resolvedArgv.depositor);
     const recipient = new web3_js_1.PublicKey(resolvedArgv.recipient);
@@ -114,10 +114,19 @@ async function fillV3Relay() {
         value: value.toString(),
     })));
     const tokenDecimals = (await (0, spl_token_1.getMint)(provider.connection, outputToken, undefined, spl_token_1.TOKEN_PROGRAM_ID)).decimals;
+    // Create the ATA using the create_token_accounts method
+    const createTokenAccountsIx = await program.methods
+        .createTokenAccounts()
+        .accounts({ signer: signer.publicKey, mint: outputToken, tokenProgram: spl_token_1.TOKEN_PROGRAM_ID })
+        .remainingAccounts([
+        { pubkey: recipient, isWritable: false, isSigner: false },
+        { pubkey: recipientTokenAccount, isWritable: true, isSigner: false },
+    ])
+        .instruction();
     // Delegate state PDA to pull relayer tokens.
     const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(relayerTokenAccount, outputToken, statePda, signer.publicKey, BigInt(relayData.outputAmount.toString()), tokenDecimals, undefined, spl_token_1.TOKEN_PROGRAM_ID);
-    const fillIx = await program.methods.fillV3Relay(Array.from(relayHashUint8Array), relayData, chainId, signer.publicKey)
-        .accounts({
+    const fillDataValues = [Array.from(relayHashUint8Array), relayData, chainId, signer.publicKey];
+    const fillAccounts = {
         state: statePda,
         signer: signer.publicKey,
         instructionParams: program.programId,
@@ -129,11 +138,15 @@ async function fillV3Relay() {
         associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
         systemProgram: web3_js_1.SystemProgram.programId,
         programId: programId,
-    })
+        program: program.programId,
+    };
+    const fillIx = await program.methods
+        .fillRelay(...fillDataValues)
+        .accounts(fillAccounts)
         .instruction();
-    const fillTx = new web3_js_1.Transaction().add(approveIx, fillIx);
+    const fillTx = new web3_js_1.Transaction().add(createTokenAccountsIx, approveIx, fillIx);
     const tx = await (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, fillTx, [signer]);
     console.log("Transaction signature:", tx);
 }
 // Run the fillV3Relay function
-fillV3Relay();
+fillRelay();