@across-protocol/contracts 4.0.11 → 4.0.13

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

@@ -734,13 +734,12 @@ export type SvmSpoke = {
                 "### Required Accounts:",
                 "- signer (Signer): The account that authorizes the deposit.",
                 "- state (Writable): Spoke state PDA. Seed: [\"state\",state.seed] where seed is 0 on mainnet.",
-                "- route (Account): The route PDA for the particular bridged route in question. Validates a route is enabled.",
-                "Seed: [\"route\",input_token,state.seed,destination_chain_id].",
                 "- depositor_token_account (Writable): The depositor's ATA for the input token.",
                 "- vault (Writable): Programs ATA for the associated input token. This is where the depositor's assets are sent.",
                 "Authority must be the state.",
                 "- mint (Account): The mint account for the input token.",
                 "- token_program (Interface): The token program.",
+                "- delegate (Account): The account used to delegate the input amount of the input token.",
                 "",
                 "### Parameters",
                 "- depositor: The account credited with the deposit. Can be different from the signer.",
@@ -752,8 +751,7 @@ export type SvmSpoke = {
                 "amount will be sent to the relayer on their repayment chain of choice as a refund following an optimistic",
                 "challenge window in the HubPool, less a system fee.",
                 "- output_amount: The amount of output tokens that the relayer will send to the recipient on the destination.",
-                "- destination_chain_id: The destination chain identifier. Must be enabled along with the input token as a valid",
-                "deposit route from this spoke pool or this transaction will revert.",
+                "- destination_chain_id: The destination chain identifier where the fill should be made.",
                 "- exclusive_relayer: The relayer that will be exclusively allowed to fill this deposit before the exclusivity",
                 "deadline timestamp. This must be a valid, non-zero address if the exclusivity deadline is greater than the",
                 "current block timestamp.",
@@ -808,34 +806,7 @@ export type SvmSpoke = {
                     };
                 },
                 {
-                    "name": "route";
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const";
-                                "value": [
-                                    114,
-                                    111,
-                                    117,
-                                    116,
-                                    101
-                                ];
-                            },
-                            {
-                                "kind": "arg";
-                                "path": "inputToken";
-                            },
-                            {
-                                "kind": "account";
-                                "path": "state.seed";
-                                "account": "state";
-                            },
-                            {
-                                "kind": "arg";
-                                "path": "destinationChainId";
-                            }
-                        ];
-                    };
+                    "name": "delegate";
                 },
                 {
                     "name": "depositorTokenAccount";
@@ -957,6 +928,14 @@ export type SvmSpoke = {
                 {
                     "name": "tokenProgram";
                 },
+                {
+                    "name": "associatedTokenProgram";
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+                },
+                {
+                    "name": "systemProgram";
+                    "address": "11111111111111111111111111111111";
+                },
                 {
                     "name": "eventAuthority";
                     "pda": {
@@ -1087,34 +1066,7 @@ export type SvmSpoke = {
                     };
                 },
                 {
-                    "name": "route";
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const";
-                                "value": [
-                                    114,
-                                    111,
-                                    117,
-                                    116,
-                                    101
-                                ];
-                            },
-                            {
-                                "kind": "arg";
-                                "path": "inputToken";
-                            },
-                            {
-                                "kind": "account";
-                                "path": "state.seed";
-                                "account": "state";
-                            },
-                            {
-                                "kind": "arg";
-                                "path": "destinationChainId";
-                            }
-                        ];
-                    };
+                    "name": "delegate";
                 },
                 {
                     "name": "depositorTokenAccount";
@@ -1236,6 +1188,14 @@ export type SvmSpoke = {
                 {
                     "name": "tokenProgram";
                 },
+                {
+                    "name": "associatedTokenProgram";
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+                },
+                {
+                    "name": "systemProgram";
+                    "address": "11111111111111111111111111111111";
+                },
                 {
                     "name": "eventAuthority";
                     "pda": {
@@ -2120,7 +2080,7 @@ export type SvmSpoke = {
                             },
                             {
                                 "kind": "arg";
-                                "path": "root_bundle_id.unwrap_or_else(| |\ninstruction_params";
+                                "path": "_root_bundle_id.unwrap_or_else(| |\ninstruction_params";
                             }
                         ];
                     };
@@ -2363,9 +2323,6 @@ export type SvmSpoke = {
                 "instruction data due to message size constraints. Pass this program ID to represent None. When Some, this must",
                 "be derived from the signer's public key with seed [\"instruction_params\",signer].",
                 "- state (Writable): Spoke state PDA. Seed: [\"state\",state.seed] where seed is 0 on mainnet.",
-                "- route (Account): The route PDA for the particular bridged route in question. Validates a route is enabled.",
-                "Seed: [\"route\",input_token,state.seed,destination_chain_id].",
-                "- vault (Writable): The ATA for refunded mint. Authority must be the state.",
                 "- mint (Account): The mint of the output token, sent from the relayer to the recipient.",
                 "- relayer_token_account (Writable): The relayer's ATA for the input token.",
                 "- recipient_token_account (Writable): The recipient's ATA for the output token.",
@@ -2374,9 +2331,10 @@ export type SvmSpoke = {
                 "- token_program (Interface): The token program.",
                 "- associated_token_program (Interface): The associated token program.",
                 "- system_program (Interface): The system program.",
+                "- delegate (Account): The account used to delegate the output amount of the output token.",
                 "",
                 "### Parameters:",
-                "- _relay_hash: The hash identifying the deposit to be filled. Caller must pass this in. Computed as hash of",
+                "- relay_hash: The hash identifying the deposit to be filled. Caller must pass this in. Computed as hash of",
                 "the flattened relay_data & destination_chain_id.",
                 "- relay_data: Struct containing all the data needed to identify the deposit to be filled. Should match",
                 "all the same-named parameters emitted in the origin chain FundsDeposited event.",
@@ -2476,6 +2434,9 @@ export type SvmSpoke = {
                         ];
                     };
                 },
+                {
+                    "name": "delegate";
+                },
                 {
                     "name": "mint";
                 },
@@ -3815,221 +3776,6 @@ export type SvmSpoke = {
                 }
             ];
         },
-        {
-            "name": "setEnableRoute";
-            "docs": [
-                "Enables or disables a route for deposits from origin token to destination chain ID. Callable only by the owner.",
-                "",
-                "### Required Accounts:",
-                "- signer (Signer): The account that must be the owner to authorize the route change.",
-                "- payer (Signer): The account responsible for paying the transaction fees.",
-                "- state (Writable): The Spoke state PDA. Seed: [\"state\",state.seed] where `seed` is 0 on mainnet.",
-                "- route (Writable): PDA to store route information. Created on the first call, updated subsequently.",
-                "Seed: [\"route\",origin_token,state.seed,destination_chain_id].",
-                "- vault (Writable): ATA to hold the origin token for the associated route. Created on the first call.",
-                "Authority must be set as the state, and mint must be the origin_token_mint.",
-                "- origin_token_mint: The mint account for the origin token.",
-                "- token_program: The token program.",
-                "- associated_token_program: The associated token program.",
-                "- system_program: The system program required for account creation.",
-                "",
-                "### Parameters:",
-                "- origin_token: The public key of the origin token.",
-                "- destination_chain_id: The chain ID of the destination.",
-                "- enabled: Boolean indicating whether the route is enabled or disabled."
-            ];
-            "discriminator": [
-                166,
-                66,
-                33,
-                156,
-                122,
-                251,
-                223,
-                34
-            ];
-            "accounts": [
-                {
-                    "name": "signer";
-                    "signer": true;
-                },
-                {
-                    "name": "payer";
-                    "writable": true;
-                    "signer": true;
-                },
-                {
-                    "name": "state";
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const";
-                                "value": [
-                                    115,
-                                    116,
-                                    97,
-                                    116,
-                                    101
-                                ];
-                            },
-                            {
-                                "kind": "account";
-                                "path": "state.seed";
-                                "account": "state";
-                            }
-                        ];
-                    };
-                },
-                {
-                    "name": "route";
-                    "writable": true;
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const";
-                                "value": [
-                                    114,
-                                    111,
-                                    117,
-                                    116,
-                                    101
-                                ];
-                            },
-                            {
-                                "kind": "arg";
-                                "path": "originToken";
-                            },
-                            {
-                                "kind": "account";
-                                "path": "state.seed";
-                                "account": "state";
-                            },
-                            {
-                                "kind": "arg";
-                                "path": "destinationChainId";
-                            }
-                        ];
-                    };
-                },
-                {
-                    "name": "vault";
-                    "writable": true;
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "account";
-                                "path": "state";
-                            },
-                            {
-                                "kind": "account";
-                                "path": "tokenProgram";
-                            },
-                            {
-                                "kind": "account";
-                                "path": "originTokenMint";
-                            }
-                        ];
-                        "program": {
-                            "kind": "const";
-                            "value": [
-                                140,
-                                151,
-                                37,
-                                143,
-                                78,
-                                36,
-                                137,
-                                241,
-                                187,
-                                61,
-                                16,
-                                41,
-                                20,
-                                142,
-                                13,
-                                131,
-                                11,
-                                90,
-                                19,
-                                153,
-                                218,
-                                255,
-                                16,
-                                132,
-                                4,
-                                142,
-                                123,
-                                216,
-                                219,
-                                233,
-                                248,
-                                89
-                            ];
-                        };
-                    };
-                },
-                {
-                    "name": "originTokenMint";
-                },
-                {
-                    "name": "tokenProgram";
-                },
-                {
-                    "name": "associatedTokenProgram";
-                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
-                },
-                {
-                    "name": "systemProgram";
-                    "address": "11111111111111111111111111111111";
-                },
-                {
-                    "name": "eventAuthority";
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const";
-                                "value": [
-                                    95,
-                                    95,
-                                    101,
-                                    118,
-                                    101,
-                                    110,
-                                    116,
-                                    95,
-                                    97,
-                                    117,
-                                    116,
-                                    104,
-                                    111,
-                                    114,
-                                    105,
-                                    116,
-                                    121
-                                ];
-                            }
-                        ];
-                    };
-                },
-                {
-                    "name": "program";
-                }
-            ];
-            "args": [
-                {
-                    "name": "originToken";
-                    "type": "pubkey";
-                },
-                {
-                    "name": "destinationChainId";
-                    "type": "u64";
-                },
-                {
-                    "name": "enabled";
-                    "type": "bool";
-                }
-            ];
-        },
         {
             "name": "transferOwnership";
             "docs": [
@@ -4170,34 +3916,7 @@ export type SvmSpoke = {
                     };
                 },
                 {
-                    "name": "route";
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const";
-                                "value": [
-                                    114,
-                                    111,
-                                    117,
-                                    116,
-                                    101
-                                ];
-                            },
-                            {
-                                "kind": "arg";
-                                "path": "inputToken";
-                            },
-                            {
-                                "kind": "account";
-                                "path": "state.seed";
-                                "account": "state";
-                            },
-                            {
-                                "kind": "arg";
-                                "path": "destinationChainId";
-                            }
-                        ];
-                    };
+                    "name": "delegate";
                 },
                 {
                     "name": "depositorTokenAccount";
@@ -4319,6 +4038,14 @@ export type SvmSpoke = {
                 {
                     "name": "tokenProgram";
                 },
+                {
+                    "name": "associatedTokenProgram";
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+                },
+                {
+                    "name": "systemProgram";
+                    "address": "11111111111111111111111111111111";
+                },
                 {
                     "name": "eventAuthority";
                     "pda": {
@@ -4583,19 +4310,6 @@ export type SvmSpoke = {
                 219
             ];
         },
-        {
-            "name": "route";
-            "discriminator": [
-                80,
-                179,
-                58,
-                115,
-                52,
-                19,
-                146,
-                134
-            ];
-        },
         {
             "name": "state";
             "discriminator": [
@@ -4663,19 +4377,6 @@ export type SvmSpoke = {
                 114
             ];
         },
-        {
-            "name": "enabledDepositRoute";
-            "discriminator": [
-                37,
-                128,
-                171,
-                126,
-                10,
-                179,
-                154,
-                241
-            ];
-        },
         {
             "name": "executedRelayerRefundRoot";
             "discriminator": [
@@ -4810,88 +4511,78 @@ export type SvmSpoke = {
     "errors": [
         {
             "code": 6000;
-            "name": "notOwner";
-            "msg": "Only the owner can call this function!";
+            "name": "invalidQuoteTimestamp";
+            "msg": "Invalid quote timestamp!";
         },
         {
             "code": 6001;
-            "name": "invalidRelayHash";
-            "msg": "Invalid relay hash!";
+            "name": "invalidFillDeadline";
+            "msg": "Invalid fill deadline!";
         },
         {
             "code": 6002;
-            "name": "canOnlyCloseFillStatusPdaIfFillDeadlinePassed";
-            "msg": "The fill deadline has not passed!";
+            "name": "notExclusiveRelayer";
+            "msg": "Caller is not the exclusive relayer and exclusivity deadline has not passed!";
         },
         {
             "code": 6003;
-            "name": "notRelayer";
-            "msg": "The caller is not the relayer!";
+            "name": "noSlowFillsInExclusivityWindow";
+            "msg": "The Deposit is still within the exclusivity window!";
         },
         {
             "code": 6004;
-            "name": "cannotSetCurrentTime";
-            "msg": "Cannot set time if not in test mode!";
+            "name": "relayFilled";
+            "msg": "The relay has already been filled!";
         },
         {
             "code": 6005;
-            "name": "invalidRemoteDomain";
-            "msg": "Invalid remote domain!";
+            "name": "invalidSlowFillRequest";
+            "msg": "Slow fill requires status of Unfilled!";
         },
         {
             "code": 6006;
-            "name": "invalidRemoteSender";
-            "msg": "Invalid remote sender!";
+            "name": "expiredFillDeadline";
+            "msg": "The fill deadline has passed!";
         },
         {
             "code": 6007;
-            "name": "invalidMint";
-            "msg": "Invalid mint!";
+            "name": "invalidMerkleProof";
+            "msg": "Invalid Merkle proof!";
         },
         {
             "code": 6008;
-            "name": "exceededPendingBridgeAmount";
-            "msg": "Exceeded pending bridge amount to HubPool!";
+            "name": "invalidChainId";
+            "msg": "Invalid chain id!";
         },
         {
             "code": 6009;
-            "name": "paramsWriteOverflow";
-            "msg": "Overflow writing to parameters account!";
+            "name": "invalidMerkleLeaf";
+            "msg": "Invalid Merkle leaf!";
         },
         {
             "code": 6010;
-            "name": "invalidRefund";
-            "msg": "Invalid refund address!";
+            "name": "claimedMerkleLeaf";
+            "msg": "Leaf already claimed!";
         },
         {
             "code": 6011;
-            "name": "zeroRefundClaim";
-            "msg": "Zero relayer refund claim!";
+            "name": "depositsArePaused";
+            "msg": "Deposits are currently paused!";
         },
         {
             "code": 6012;
-            "name": "nonZeroRefundClaim";
-            "msg": "Cannot close non-zero relayer refund claim!";
+            "name": "fillsArePaused";
+            "msg": "Fills are currently paused!";
         },
         {
             "code": 6013;
-            "name": "invalidClaimInitializer";
-            "msg": "Invalid claim initializer!";
+            "name": "insufficientSpokePoolBalanceToExecuteLeaf";
+            "msg": "Insufficient spoke pool balance to execute leaf";
         },
         {
             "code": 6014;
-            "name": "invalidRefundTokenAccount";
-            "msg": "Invalid refund token account!";
-        },
-        {
-            "code": 6015;
-            "name": "invalidProductionSeed";
-            "msg": "Seed must be 0 in production!";
-        },
-        {
-            "code": 6016;
-            "name": "invalidAtaCreationAccounts";
-            "msg": "Invalid remaining accounts for ATA creation!";
+            "name": "invalidExclusiveRelayer";
+            "msg": "Invalid exclusive relayer!";
         }
     ];
     "types": [
@@ -4959,26 +4650,6 @@ export type SvmSpoke = {
                 ];
             };
         },
-        {
-            "name": "enabledDepositRoute";
-            "type": {
-                "kind": "struct";
-                "fields": [
-                    {
-                        "name": "originToken";
-                        "type": "pubkey";
-                    },
-                    {
-                        "name": "destinationChainId";
-                        "type": "u64";
-                    },
-                    {
-                        "name": "enabled";
-                        "type": "bool";
-                    }
-                ];
-            };
-        },
         {
             "name": "executeRelayerRefundLeafParams";
             "type": {
@@ -5638,18 +5309,6 @@ export type SvmSpoke = {
                 ];
             };
         },
-        {
-            "name": "route";
-            "type": {
-                "kind": "struct";
-                "fields": [
-                    {
-                        "name": "enabled";
-                        "type": "bool";
-                    }
-                ];
-            };
-        },
         {
             "name": "setXDomainAdmin";
             "type": {

package/dist/tasks/enableL1TokenAcrossEcosystem.js

@@ -10,8 +10,8 @@ const utils_1 = require("./utils");
 const { ARBITRUM, OPTIMISM } = constants_1.CHAIN_IDs;
 const NO_SYMBOL = "----";
 const NO_ADDRESS = "------------------------------------------";
-const IGNORED_CHAINS = [constants_1.CHAIN_IDs.BOBA, constants_1.CHAIN_IDs.BSC, constants_1.CHAIN_IDs.SOLANA];
-const V4_CHAINS = [constants_1.CHAIN_IDs.BSC, constants_1.CHAIN_IDs.LISK, constants_1.CHAIN_IDs.LINEA];
+const IGNORED_CHAINS = [constants_1.CHAIN_IDs.BOBA, constants_1.CHAIN_IDs.SOLANA];
+const V4_CHAINS = [constants_1.CHAIN_IDs.BSC, constants_1.CHAIN_IDs.LISK, constants_1.CHAIN_IDs.LINEA, constants_1.CHAIN_IDs.WORLD_CHAIN];
 // Supported mainnet chain IDs.
 const enabledChainIds = (hubChainId) => {
     const chainIds = hubChainId === constants_1.CHAIN_IDs.MAINNET ? constants_1.MAINNET_CHAIN_IDs : constants_1.TESTNET_CHAIN_IDs;
@@ -26,7 +26,7 @@ const getChainsFromList = (taskArgInput) => taskArgInput
     ?.map((chainId) => Number(chainId)) || [];
 (0, config_1.task)("enableToken", "Enable a provided token across the entire ecosystem of supported chains")
     .addFlag("execute", "Provide this flag if you would like to actually execute the transaction from the EOA")
-    .addFlag("disableRoutes", "Set to disable deposit routes for the specified chains")
+    .addFlag("disable", "Set to disable deposit routes for the specified chains")
     .addParam("token", "Symbol of token to enable")
     .addOptionalParam("chains", "Comma-delimited list of chains to enable the token on. Defaults to all supported chains")
     .addOptionalParam("burn", "Amount of LP token to burn when enabling a new token", 1, config_1.types.int)
@@ -35,7 +35,7 @@ const getChainsFromList = (taskArgInput) => taskArgInput
     .setAction(async function (taskArguments, hre_) {
     const hre = hre_;
     const { burn, chains, execute, token: symbol } = taskArguments;
-    const enableRoute = !taskArguments.disableRoutes;
+    const enableRoute = !taskArguments.disable;
     const hubChainId = parseInt(await hre.getChainId());
     if (hubChainId === 31337) {
         throw new Error(`Defaulted to network \`hardhat\`; specify \`--network mainnet\` or \`--network sepolia\``);