@across-protocol/contracts 3.0.17 → 3.0.19

package/dist/target/types/svm_spoke.d.ts

@@ -808,11 +808,7 @@ export type SvmSpoke = {
                 "### Required Accounts:",
                 "- signer (Signer): The account that authorizes the closure. Must be the relayer in the fill_status PDA.",
                 "- state (Writable): Spoke state PDA. Seed: [\"state\",state.seed] where seed is 0 on mainnet.",
-                "- fill_status (Writable): The FillStatusAccount PDA to be closed. Seed: [\"fills\",relay_hash].",
-                "",
-                "### Parameters:",
-                "- _relay_hash: The hash identifying the relay for which the fill status account is being closed.",
-                "- relay_data: The data structure containing information about the relay."
+                "- fill_status (Writable): The FillStatusAccount PDA to be closed."
             ];
             "discriminator": [
                 224,
@@ -855,45 +851,9 @@ export type SvmSpoke = {
                 {
                     "name": "fillStatus";
                     "writable": true;
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const";
-                                "value": [
-                                    102,
-                                    105,
-                                    108,
-                                    108,
-                                    115
-                                ];
-                            },
-                            {
-                                "kind": "arg";
-                                "path": "relayHash";
-                            }
-                        ];
-                    };
-                }
-            ];
-            "args": [
-                {
-                    "name": "relayHash";
-                    "type": {
-                        "array": [
-                            "u8",
-                            32
-                        ];
-                    };
-                },
-                {
-                    "name": "relayData";
-                    "type": {
-                        "defined": {
-                            "name": "v3RelayData";
-                        };
-                    };
                 }
             ];
+            "args": [];
         },
         {
             "name": "closeInstructionParams";
@@ -5041,6 +5001,19 @@ export type SvmSpoke = {
                 66
             ];
         },
+        {
+            "name": "tokensBridged";
+            "discriminator": [
+                200,
+                201,
+                199,
+                39,
+                5,
+                238,
+                214,
+                196
+            ];
+        },
         {
             "name": "v3FundsDeposited";
             "discriminator": [
@@ -5375,6 +5348,10 @@ export type SvmSpoke = {
                     {
                         "name": "relayer";
                         "type": "pubkey";
+                    },
+                    {
+                        "name": "fillDeadline";
+                        "type": "u32";
                     }
                 ];
             };
@@ -5808,6 +5785,34 @@ export type SvmSpoke = {
                 ];
             };
         },
+        {
+            "name": "tokensBridged";
+            "type": {
+                "kind": "struct";
+                "fields": [
+                    {
+                        "name": "amountToReturn";
+                        "type": "u64";
+                    },
+                    {
+                        "name": "chainId";
+                        "type": "u64";
+                    },
+                    {
+                        "name": "leafId";
+                        "type": "u32";
+                    },
+                    {
+                        "name": "l2TokenAddress";
+                        "type": "pubkey";
+                    },
+                    {
+                        "name": "caller";
+                        "type": "pubkey";
+                    }
+                ];
+            };
+        },
         {
             "name": "transferLiability";
             "type": {

package/dist/tasks/enableL1TokenAcrossEcosystem.js

@@ -5,38 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("hardhat/config");
 const assert_1 = __importDefault(require("assert"));
-const utils_1 = require("./utils");
 const constants_1 = require("../utils/constants");
-/**
- * Given a token symbol, determine whether it is a valid key for the TOKEN_SYMBOLS_MAP object.
- */
-function isTokenSymbol(symbol) {
-    return constants_1.TOKEN_SYMBOLS_MAP[symbol] !== undefined;
-}
-/**
- * Given a token symbol from the HubPool chain and a remote chain ID, resolve the relevant token symbol and address.
- */
-function resolveTokenOnChain(mainnetSymbol, chainId) {
-    (0, assert_1.default)(isTokenSymbol(mainnetSymbol), `Unrecognised token symbol (${mainnetSymbol})`);
-    let symbol = mainnetSymbol;
-    // Handle USDC special case where L1 USDC is mapped to different token symbols on L2s.
-    if (mainnetSymbol === "USDC") {
-        const symbols = ["USDC", "USDC.e", "USDbC", "USDzC"];
-        const tokenSymbol = symbols.find((symbol) => constants_1.TOKEN_SYMBOLS_MAP[symbol]?.addresses[chainId]);
-        if (!isTokenSymbol(tokenSymbol)) {
-            return;
-        }
-        symbol = tokenSymbol;
-    }
-    else if (symbol === "DAI" && chainId === constants_1.CHAIN_IDs.BLAST) {
-        symbol = "USDB";
-    }
-    const address = constants_1.TOKEN_SYMBOLS_MAP[symbol].addresses[chainId];
-    if (!address) {
-        return;
-    }
-    return { symbol, address };
-}
+const utils_1 = require("./utils");
 const { ARBITRUM, OPTIMISM } = constants_1.CHAIN_IDs;
 const NO_SYMBOL = "----";
 const NO_ADDRESS = "------------------------------------------";
@@ -65,7 +35,7 @@ const getChainsFromList = (taskArgInput) => taskArgInput
         throw new Error(`Defaulted to network \`hardhat\`; specify \`--network mainnet\` or \`--network sepolia\``);
     }
     const _matchedSymbol = Object.keys(constants_1.TOKEN_SYMBOLS_MAP).find((_symbol) => _symbol === symbol);
-    (0, assert_1.default)(isTokenSymbol(_matchedSymbol));
+    (0, assert_1.default)((0, utils_1.isTokenSymbol)(_matchedSymbol));
     const matchedSymbol = _matchedSymbol;
     const l1Token = constants_1.TOKEN_SYMBOLS_MAP[matchedSymbol].addresses[hubChainId];
     (0, assert_1.default)(l1Token !== undefined, `Could not find ${symbol} in TOKEN_SYMBOLS_MAP`);
@@ -98,7 +68,7 @@ const getChainsFromList = (taskArgInput) => taskArgInput
     const chainIds = enabledChainIds.filter((chainId) => inputChains.includes(chainId));
     console.log("\nLoading L2 companion token address for provided L1 token.");
     const tokens = Object.fromEntries(chainIds.map((chainId) => {
-        const token = resolveTokenOnChain(matchedSymbol, chainId);
+        const token = (0, utils_1.resolveTokenOnChain)(matchedSymbol, chainId);
         if (token === undefined) {
             return [chainId, { symbol: NO_SYMBOL, address: NO_ADDRESS }];
         }

package/dist/tasks/types.d.ts

@@ -0,0 +1,2 @@
+import { TOKEN_SYMBOLS_MAP } from "../utils/constants";
+export type TokenSymbol = keyof typeof TOKEN_SYMBOLS_MAP;

package/dist/tasks/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/tasks/utils.d.ts

@@ -1,3 +1,4 @@
+import { TokenSymbol } from "./types";
 export declare const zeroAddress = "0x0000000000000000000000000000000000000000";
 export declare const minimalSpokePoolInterface: ({
     inputs: ({
@@ -46,3 +47,14 @@ export declare const minimalAdapterInterface: {
     type: string;
 }[];
 export declare function askYesNoQuestion(query: string): Promise<boolean>;
+/**
+ * Given a token symbol from the HubPool chain and a remote chain ID, resolve the relevant token symbol and address.
+ */
+export declare function resolveTokenOnChain(mainnetSymbol: string, chainId: number): {
+    symbol: TokenSymbol;
+    address: string;
+} | undefined;
+/**
+ * Given a token symbol, determine whether it is a valid key for the TOKEN_SYMBOLS_MAP object.
+ */
+export declare function isTokenSymbol(symbol: unknown): symbol is TokenSymbol;

package/dist/tasks/utils.js

@@ -5,8 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.minimalAdapterInterface = exports.minimalSpokePoolInterface = exports.zeroAddress = void 0;
 exports.askYesNoQuestion = askYesNoQuestion;
+exports.resolveTokenOnChain = resolveTokenOnChain;
+exports.isTokenSymbol = isTokenSymbol;
+const assert_1 = __importDefault(require("assert"));
 const ethers_1 = require("ethers");
 const readline_1 = __importDefault(require("readline"));
+const constants_1 = require("../utils/constants");
 exports.zeroAddress = ethers_1.ethers.constants.AddressZero;
 exports.minimalSpokePoolInterface = [
     {
@@ -162,3 +166,33 @@ async function askYesNoQuestion(query) {
         return false;
     return askYesNoQuestion(query);
 }
+/**
+ * Given a token symbol from the HubPool chain and a remote chain ID, resolve the relevant token symbol and address.
+ */
+function resolveTokenOnChain(mainnetSymbol, chainId) {
+    (0, assert_1.default)(isTokenSymbol(mainnetSymbol), `Unrecognised token symbol (${mainnetSymbol})`);
+    let symbol = mainnetSymbol;
+    // Handle USDC special case where L1 USDC is mapped to different token symbols on L2s.
+    if (mainnetSymbol === "USDC") {
+        const symbols = ["USDC", "USDC.e", "USDbC", "USDzC"];
+        const tokenSymbol = symbols.find((symbol) => constants_1.TOKEN_SYMBOLS_MAP[symbol]?.addresses[chainId]);
+        if (!isTokenSymbol(tokenSymbol)) {
+            return;
+        }
+        symbol = tokenSymbol;
+    }
+    else if (symbol === "DAI" && chainId === constants_1.CHAIN_IDs.BLAST) {
+        symbol = "USDB";
+    }
+    const address = constants_1.TOKEN_SYMBOLS_MAP[symbol].addresses[chainId];
+    if (!address) {
+        return;
+    }
+    return { symbol, address };
+}
+/**
+ * Given a token symbol, determine whether it is a valid key for the TOKEN_SYMBOLS_MAP object.
+ */
+function isTokenSymbol(symbol) {
+    return constants_1.TOKEN_SYMBOLS_MAP[symbol] !== undefined;
+}

package/dist/test/svm/MulticallHandler.js

@@ -27,7 +27,7 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
-const SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
 const { provider, owner, connection, assertSE } = SvmSpoke_common_1.common;
 describe("multicall_handler", () => {
@@ -47,7 +47,7 @@ describe("multicall_handler", () => {
         const recipient = web3_js_1.Keypair.generate().publicKey;
         const recipientATA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, mint, recipient)).address;
         const transferIx = (0, spl_token_1.createTransferCheckedInstruction)(handlerATA, mint, recipientATA, handlerSigner, tokenAmount, mintDecimals);
-        const multicallHandlerCoder = new SvmUtils_1.MulticallHandlerCoder([transferIx]);
+        const multicallHandlerCoder = new svm_1.MulticallHandlerCoder([transferIx]);
         const handlerMessage = multicallHandlerCoder.encode();
         await program.methods
             .handleV3AcrossMessage(handlerMessage)