From 40480a1162dd2b9f6cb80e6cf7802001bc52fc13 Mon Sep 17 00:00:00 2001 From: Daniel <77058885+0xDEnYO@users.noreply.github.com> Date: Tue, 25 Feb 2025 15:56:30 +0700 Subject: [PATCH] Deploy all contracts to ink (#1016) * deployment prepared * deployed all contracts to ink * formatting change * deployed Permit2Proxy * revert changes in foundry.toml * diamond logs updated * minor fixes --- .env.example | 1 + .github/workflows/diamondEmergencyPause.yml | 1 + config/across.json | 6 + config/dexs.json | 18 +- config/gaszip.json | 1 + config/global.json | 1 + config/networks.json | 18 + config/permit2Proxy.json | 1 + config/relay.json | 122 +++---- config/stargate.json | 4 + config/tokenwrapper.json | 1 + deployments/_deployments_log_file.json | 364 ++++++++++++++++++++ deployments/ink.diamond.json | 84 +++++ deployments/ink.json | 28 ++ foundry.toml | 2 + networks | 1 + script/deploy/healthCheck.ts | 1 - script/tasks/diamondUpdateFacet.sh | 5 +- 18 files changed, 592 insertions(+), 67 deletions(-) create mode 100644 deployments/ink.diamond.json create mode 100644 deployments/ink.json diff --git a/.env.example b/.env.example index f23e3a709..81c450507 100644 --- a/.env.example +++ b/.env.example @@ -18,6 +18,7 @@ ETH_NODE_URI_FUSE=https://rpc.fuse.io #[pre-commit-checker: not a secret] ETH_NODE_URI_GNOSIS=https://rpc.ankr.com/gnosis #[pre-commit-checker: not a secret] ETH_NODE_URI_GRAVITY=https://rpc.gravity.xyz #[pre-commit-checker: not a secret] ETH_NODE_URI_IMMUTABLEZKEVM=https://rpc.immutable.com #[pre-commit-checker: not a secret] +ETH_NODE_URI_INK=https://rpc-gel.inkonchain.com #[pre-commit-checker: not a secret] ETH_NODE_URI_KAIA=https://klaytn.drpc.org #[pre-commit-checker: not a secret] ETH_NODE_URI_LINEA=https://rpc.linea.build #[pre-commit-checker: not a secret] ETH_NODE_URI_LISK=https://rpc.api.lisk.com #[pre-commit-checker: not a secret] diff --git a/.github/workflows/diamondEmergencyPause.yml b/.github/workflows/diamondEmergencyPause.yml index 431b462b6..b34fefef3 100644 --- a/.github/workflows/diamondEmergencyPause.yml +++ b/.github/workflows/diamondEmergencyPause.yml @@ -66,6 +66,7 @@ jobs: ETH_NODE_URI_GNOSIS: ${{ secrets.ETH_NODE_URI_GNOSIS }} ETH_NODE_URI_GRAVITY: ${{ secrets.ETH_NODE_URI_GRAVITY }} ETH_NODE_URI_IMMUTABLEZKEVM: ${{ secrets.ETH_NODE_URI_IMMUTABLEZKEVM }} + ETH_NODE_URI_INK: ${{ secrets.ETH_NODE_URI_INK }} ETH_NODE_URI_KAIA: ${{ secrets.ETH_NODE_URI_KAIA }} ETH_NODE_URI_LINEA: ${{ secrets.ETH_NODE_URI_LINEA }} ETH_NODE_URI_LISK: ${{ secrets.ETH_NODE_URI_LISK }} diff --git a/config/across.json b/config/across.json index 666be7381..b1c0787b8 100644 --- a/config/across.json +++ b/config/across.json @@ -101,6 +101,12 @@ "0xd693Ec944A85eeca4247eC1c3b130DCa9B0C3b22" ] }, + "ink": { + "chainId": 57073, + "acrossSpokePool": "0xeF684C38F94F48775959ECf2012D7E864ffb9dd4", + "weth": "0x4200000000000000000000000000000000000006", + "tokensToApprove": [] + }, "linea": { "chainId": 59144, "acrossSpokePool": "0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75", diff --git a/config/dexs.json b/config/dexs.json index e594bba68..0840e0d96 100644 --- a/config/dexs.json +++ b/config/dexs.json @@ -470,6 +470,12 @@ "0x677Fa29FFe6c8f03D6bbE789090Dceb498b7aaA4", "0x1a4E99aB56BBac95810C0A957F173054f6FA8fDc" ], + "ink": [ + "0x8295805320853d6B28778fC8f5199327e62e3d87", + "0x86E5a407385364B86B3e502644EfFee1a43C9a7b", + "0x9679d1f7D955C81827c6842b3119B911943958eE", + "0xf89901c677c9fb8D04BdE96e8aa6c6eAB5cA5Fd4" + ], "fraxtal": [ "0x7956280Ec4B4d651C4083Ca737a1fa808b5319D8", "0x9870F0C91D722B3393383722968269496d919bD8", @@ -825,6 +831,12 @@ "0x57df6092665eb6058DE53939612413ff4B09114E", "0x85CD07Ea01423b1E937929B44E4Ad8c40BbB5E71" ], + "soneium": [ + "0x8295805320853d6B28778fC8f5199327e62e3d87", + "0x86E5a407385364B86B3e502644EfFee1a43C9a7b", + "0x9679d1f7D955C81827c6842b3119B911943958eE", + "0xf89901c677c9fb8D04BdE96e8aa6c6eAB5cA5Fd4" + ], "sonic": [ "0xaFb8cC8fCd71cd768Ce117C11eB723119FCDb1f8", "0x51f5A9675A0663C3EC2b46121eB1504687922911", @@ -917,11 +929,5 @@ "0xfD0af5274aA16C72B7c463B22a435C06DEBbe894", "0xf471d32cb40837bf24529fcf17418fc1a4807626", "0x427bFc2E0aa683ec43fbF7861d5F4A74147938d8" - ], - "soneium": [ - "0x8295805320853d6B28778fC8f5199327e62e3d87", - "0x86E5a407385364B86B3e502644EfFee1a43C9a7b", - "0x9679d1f7D955C81827c6842b3119B911943958eE", - "0xf89901c677c9fb8D04BdE96e8aa6c6eAB5cA5Fd4" ] } diff --git a/config/gaszip.json b/config/gaszip.json index 9e70dd779..602bc5a7f 100644 --- a/config/gaszip.json +++ b/config/gaszip.json @@ -13,6 +13,7 @@ "fantom": "0xA60768b03eB14d940F6c9a8553329B7F9037C91b", "gnosis": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762", "gravity": "0x6Efc6Ead40786bD87A884382b6EA4BcA3C985e99", + "ink": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762", "linea": "0xA60768b03eB14d940F6c9a8553329B7F9037C91b", "lisk": "0xA60768b03eB14d940F6c9a8553329B7F9037C91b", "mantle": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762", diff --git a/config/global.json b/config/global.json index d9b4afa9b..415a8992d 100644 --- a/config/global.json +++ b/config/global.json @@ -2,6 +2,7 @@ "create3Factory": { "default": "0x93FEC2C00BfE902F733B57c5a6CeeD7CD1384AE1", "berachain": "0x5f63A2d7850776465b84Bc0fe6284BBC8188dbC7", + "ink": "0xeBbbaC35500713C4AD49929e1bE4225c7efF6510", "kaia": "0xC3C73FEE9Cef413880696e6C39365BDf8cD564f9", "linea": "0x8437A5fE47A4Df14700c96DF1870824e72FA8499", "metis": "0x763f212f355433C59d734C71247d16fCE74D8785", diff --git a/config/networks.json b/config/networks.json index 521e1d50f..ea55963ab 100644 --- a/config/networks.json +++ b/config/networks.json @@ -341,6 +341,24 @@ "safeWebUrl": "https://safe.immutable.com/transactions/queue?safe=imx:0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772", "gasZipChainId": 95 }, + "ink": { + "name": "ink", + "chainId": 57073, + "nativeAddress": "0x0000000000000000000000000000000000000000", + "nativeCurrency": "ETH", + "wrappedNativeAddress": "0x4200000000000000000000000000000000000006", + "status": "active", + "type": "mainnet", + "rpcUrl": "https://rpc-gel.inkonchain.com", + "verificationType": "blockscout", + "explorerUrl": "https://explorer.inkonchain.com", + "explorerApiUrl": "https://explorer.inkonchain.com/api/", + "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11", + "safeApiUrl": "https://safe-transaction-ink.safe.global/api", + "safeAddress": "0xaf6051D0268c1bFCb69b3121ea21fD54B25C6cbc", + "safeWebUrl": "https://app.safe.global/transactions/queue?safe=ink:0xaf6051D0268c1bFCb69b3121ea21fD54B25C6cbc", + "gasZipChainId": 392 + }, "kaia": { "name": "kaia", "chainId": 8217, diff --git a/config/permit2Proxy.json b/config/permit2Proxy.json index 8af8d352c..61731b2ac 100644 --- a/config/permit2Proxy.json +++ b/config/permit2Proxy.json @@ -16,6 +16,7 @@ "gnosis": "", "gravity": "", "immutablezkevm": "", + "ink": "0x000000000022D473030F116dDEE9F6B43aC78BA3", "linea": "", "mantle": "", "metis": "", diff --git a/config/relay.json b/config/relay.json index 402df7d8a..a0d4b2fc3 100644 --- a/config/relay.json +++ b/config/relay.json @@ -1,5 +1,4 @@ { - "comment": "Note: this file is generated by a backend script, do not change it manually!", "mainnet": { "chainId": 1, "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", @@ -9,28 +8,38 @@ "relayReceiver": "0x634e831ce6d460c2cd5067af98d6452eb280e374", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "optimism": { - "chainId": 10, + "arbitrum": { + "chainId": 42161, "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "berachain": { - "chainId": 80094, - "relayReceiver": "0x7f4babd2c7d35221e72ab67ea72cba99573a0089", + "arbitrumnova": { + "chainId": 42170, + "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "bsc": { - "chainId": 56, + "avalanche": { + "chainId": 43114, "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "gnosis": { - "chainId": 100, + "apechain": { + "chainId": 33139, "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "polygon": { - "chainId": 137, + "berachain": { + "chainId": 80094, + "relayReceiver": "0x7f4babd2c7d35221e72ab67ea72cba99573a0089", + "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" + }, + "base": { + "chainId": 8453, + "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", + "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" + }, + "blast": { + "chainId": 81457, "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, @@ -39,19 +48,24 @@ "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "zksync": { - "chainId": 324, - "relayReceiver": "0xebd1e414ebb98522cfd932104ba41fac10a4ef35", + "bsc": { + "chainId": 56, + "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "worldchain": { - "chainId": 480, - "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109", + "gnosis": { + "chainId": 100, + "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "polygonzkevm": { - "chainId": 1101, - "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109", + "gravity": { + "chainId": 1625, + "relayReceiver": "0x7f4babd2c7d35221e72ab67ea72cba99573a0089", + "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" + }, + "ink": { + "chainId": 13371, + "relayReceiver": "0x7f4babd2c7d35221e72ab67ea72cba99573a0089", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, "lisk": { @@ -59,14 +73,9 @@ "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "sei": { - "chainId": 1329, - "relayReceiver": "0x7f4babd2c7d35221e72ab67ea72cba99573a0089", - "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" - }, - "gravity": { - "chainId": 1625, - "relayReceiver": "0x7f4babd2c7d35221e72ab67ea72cba99573a0089", + "linea": { + "chainId": 59144, + "relayReceiver": "0x00000000aa467eba42a3d604b3d74d63b2b6c6cb", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, "mantle": { @@ -74,44 +83,39 @@ "relayReceiver": "0xf366da269047a06a7275a933c6d653409bd6de5e", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "base": { - "chainId": 8453, - "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", - "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" - }, "mode": { "chainId": 34443, "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "apechain": { - "chainId": 33139, + "optimism": { + "chainId": 10, "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "arbitrum": { - "chainId": 42161, + "polygon": { + "chainId": 137, "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "arbitrumnova": { - "chainId": 42170, - "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", + "polygonzkevm": { + "chainId": 1101, + "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "avalanche": { - "chainId": 43114, - "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", + "scroll": { + "chainId": 534352, + "relayReceiver": "0x00000000aa467eba42a3d604b3d74d63b2b6c6cb", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "linea": { - "chainId": 59144, - "relayReceiver": "0x00000000aa467eba42a3d604b3d74d63b2b6c6cb", + "sei": { + "chainId": 1329, + "relayReceiver": "0x7f4babd2c7d35221e72ab67ea72cba99573a0089", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "blast": { - "chainId": 81457, - "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", + "soneium": { + "chainId": 1868, + "relayReceiver": "0x7f4babd2c7d35221e72ab67ea72cba99573a0089", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, "taiko": { @@ -119,19 +123,19 @@ "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "scroll": { - "chainId": 534352, - "relayReceiver": "0x00000000aa467eba42a3d604b3d74d63b2b6c6cb", + "unichain": { + "chainId": 130, + "relayReceiver": "0x47eb64e17a6d2fd559b608695e6d308cced918dd", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "soneium": { - "chainId": 1868, - "relayReceiver": "0x7f4babd2c7d35221e72ab67ea72cba99573a0089", + "worldchain": { + "chainId": 480, + "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, - "unichain": { - "chainId": 130, - "relayReceiver": "0x47eb64e17a6d2fd559b608695e6d308cced918dd", + "zksync": { + "chainId": 324, + "relayReceiver": "0xebd1e414ebb98522cfd932104ba41fac10a4ef35", "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" }, "zora": { diff --git a/config/stargate.json b/config/stargate.json index 4e7aafe4c..b9aca9028 100644 --- a/config/stargate.json +++ b/config/stargate.json @@ -21,6 +21,7 @@ "heco": "0x0000000000000000000000000000000000000000", "gnosis": "0x1a44076050125825900e736c501f859c50fE728c", "gravity": "0x1a44076050125825900e736c501f859c50fE728c", + "ink": "0xca29f3A6f966Cb2fc0dE625F8f325c0C46dbE958", "moonbeam": "0x1a44076050125825900e736c501f859c50fE728c", "moonriver": "0x1a44076050125825900e736c501f859c50fE728c", "nova": "0x1a44076050125825900e736c501f859c50fE728c", @@ -61,6 +62,7 @@ "fuse": "0x45a01e4e04f14f7a4a6702c74187c5f6222033cd", "gnosis": "0xAf368c91793CB22739386DFCbBb2F1A9e4bCBeBf", "gravity": "0x9c2dc7377717603eB92b2655c5f2E7997a4945BD", + "ink": "0x45f1A95A4D3f3836523F5c83673c797f4d4d263B", "kaia": "0x16F3F98D82d965988E6853681fD578F4d719A1c0", "linea": "0x5f688f563dc16590e570f97b542fa87931af2fed", "mantle": "0x41b491285a4f888f9f636cec8a363ab9770a0aef", @@ -230,6 +232,7 @@ "gnosis": "0x0000000000000000000000000000000000000000", "gravity": "0x0000000000000000000000000000000000000000", "immutablezkevm": "0x0000000000000000000000000000000000000000", + "ink": "0x0000000000000000000000000000000000000000", "moonbeam": "0x0000000000000000000000000000000000000000", "moonriver": "0x0000000000000000000000000000000000000000", "nova": "0x0000000000000000000000000000000000000000", @@ -278,6 +281,7 @@ "harmony": "0x0000000000000000000000000000000000000000", "heco": "0x0000000000000000000000000000000000000000", "gnosis": "0x0000000000000000000000000000000000000000", + "ink": "0x0000000000000000000000000000000000000000", "moonbeam": "0x0000000000000000000000000000000000000000", "moonriver": "0x0000000000000000000000000000000000000000", "nova": "0x0000000000000000000000000000000000000000", diff --git a/config/tokenwrapper.json b/config/tokenwrapper.json index ad10e7465..f6e9c0a71 100644 --- a/config/tokenwrapper.json +++ b/config/tokenwrapper.json @@ -27,6 +27,7 @@ "base": "0x4200000000000000000000000000000000000006", "evmos": "0xd4949664cd82660aae99bedc034a0dea8a0bd517", "immutablezkevm": "0x3a0c2ba54d6cbd3121f01b96dfd20e99d1696c9d", + "ink": "0x4200000000000000000000000000000000000006", "mode": "0x4200000000000000000000000000000000000006", "arbitrum": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1", "celo": "0x471ece3750da237f93b8e339c536989b8978a438", diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json index 71f1966d4..44f97894e 100644 --- a/deployments/_deployments_log_file.json +++ b/deployments/_deployments_log_file.json @@ -802,6 +802,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x2407c1598650f8CD4Aaa0c1a4BCcd12D4999a6E9", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:37:55", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "DiamondLoupeFacet": { @@ -1594,6 +1608,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x1E007BB710D4330109B4Cf4f3D4D8e25a8b54BEB", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:38:04", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "OwnershipFacet": { @@ -2385,6 +2413,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x42e4Ef53e8d905A5D02CC12b8C60D27800F76121", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:40:11", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "DexManagerFacet": { @@ -3478,6 +3520,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.1": [ + { + "ADDRESS": "0x668442675e54Af64E6cD551CB1C061EF5f26C237", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:37:44", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "AccessManagerFacet": { @@ -4270,6 +4326,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0xcdEC3efD307BaC9dD88c7EdD962F7681C79eD90E", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:37:24", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "WithdrawFacet": { @@ -5048,6 +5118,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0xC20773bbD1c8Fb749E7DaE5236800A5Dd5F39ed8", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:49:42", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "PeripheryRegistryFacet": { @@ -5839,6 +5923,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6adB9BBCaAbf760f401bdA7730Aa4F6C1eF65456", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:48:29", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "LiFiDiamond": { @@ -6605,6 +6703,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x864b314D4C5a0399368609581d3E8933a63b9232", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:50:32", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000011f1022ca6adef6400e5677528a80d49a069c00c0000000000000000000000002407c1598650f8cd4aaa0c1a4bccd12d4999a6e9", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "LiFiDiamondImmutable": { @@ -8442,6 +8554,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x85a52070bf96f96B6bD4e06Ec536991879058BDF", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:38:58", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "HopFacetOptimized": { @@ -11960,6 +12086,20 @@ } ] } + }, + "ink": { + "production": { + "1.1.0": [ + { + "ADDRESS": "0xE16150617A4560925ef8e68E8efa3D68Bec3Bb7F", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:19:42", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000011f1022ca6adef6400e5677528a80d49a069c00c", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "Executor": { @@ -12926,6 +13066,20 @@ } ] } + }, + "ink": { + "production": { + "2.1.0": [ + { + "ADDRESS": "0xCA847a739BA26238488cb85A2a28A4ad677716e1", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:20:47", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000e16150617a4560925ef8e68e8efa3d68bec3bb7f000000000000000000000000156cebba59deb2cb23742f70dcb0a11cc775591f", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "FeeCollector": { @@ -13693,6 +13847,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.1": [ + { + "ADDRESS": "0x8295805320853d6B28778fC8f5199327e62e3d87", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:21:23", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000008647cc950813966142a416d40c382e2c5db73bb", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "Receiver": { @@ -21515,6 +21683,20 @@ } ] } + }, + "ink": { + "production": { + "1.2.0": [ + { + "ADDRESS": "0x091EBD75fCD19286b082Ce27b955F01816Af16d2", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:37:33", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "LiFuelFeeCollector": { @@ -24000,6 +24182,20 @@ } ] } + }, + "ink": { + "production": { + "1.1.0": [ + { + "ADDRESS": "0x86E5a407385364B86B3e502644EfFee1a43C9a7b", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:22:44", + "CONSTRUCTOR_ARGS": "0x0000000000000000000000004200000000000000000000000000000000000006000000000000000000000000156cebba59deb2cb23742f70dcb0a11cc775591f", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "GasRebateDistributor": { @@ -24780,6 +24976,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.1": [ + { + "ADDRESS": "0x09d0AD68C55F44ea64A8B758c457ED63a3177b11", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:39:35", + "CONSTRUCTOR_ARGS": "0x0000000000000000000000000000000000000000000000000000000000000000", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "StargateFacetV2": { @@ -25254,6 +25464,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.1": [ + { + "ADDRESS": "0x2f257730442765d7A489FaCaEA1bbC905eCBB701", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:18:34", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000045f1a95a4d3f3836523f5c83673c797f4d4d263b", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "ReceiverStargateV2": { @@ -25576,6 +25800,20 @@ } ] } + }, + "ink": { + "production": { + "1.1.0": [ + { + "ADDRESS": "0x65B6093ff981113AC6efb5b77B2D74D96edF4593", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:30:04", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000156cebba59deb2cb23742f70dcb0a11cc775591f000000000000000000000000ca847a739ba26238488cb85a2a28a4ad677716e100000000000000000000000045f1a95a4d3f3836523f5c83673c797f4d4d263b000000000000000000000000ca29f3a6f966cb2fc0de625f8f325c0c46dbe95800000000000000000000000000000000000000000000000000000000000186a0", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "LiFiDEXAggregator": { @@ -26196,6 +26434,20 @@ } ] } + }, + "ink": { + "production": { + "1.6.0": [ + { + "ADDRESS": "0x9679d1f7D955C81827c6842b3119B911943958eE", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:22:04", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000156cebba59deb2cb23742f70dcb0a11cc775591f0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d38743b48d26743c0ec6898d699394fbc94657ee", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "EmergencyPauseFacet": { @@ -26820,6 +27072,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.1": [ + { + "ADDRESS": "0xE48CA2A762503bc317C62f56B46D4270bA41835E", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 08:38:21", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000d38743b48d26743c0ec6898d699394fbc94657ee", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "AcrossFacetV3": { @@ -27194,6 +27460,20 @@ } ] } + }, + "ink": { + "production": { + "1.1.0": [ + { + "ADDRESS": "0xE6b06df46a7bde3973DBa0876d9fB319177abAe6", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:14:59", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000ef684c38f94f48775959ecf2012d7e864ffb9dd40000000000000000000000004200000000000000000000000000000000000006", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "ReceiverAcrossV3": { @@ -27549,6 +27829,20 @@ } ] } + }, + "ink": { + "production": { + "1.1.0": [ + { + "ADDRESS": "0x03C0d38939752A266991f887d45c93e5a0181c9A", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:28:48", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000156cebba59deb2cb23742f70dcb0a11cc775591f000000000000000000000000ca847a739ba26238488cb85a2a28a4ad677716e1000000000000000000000000ef684c38f94f48775959ecf2012d7e864ffb9dd400000000000000000000000000000000000000000000000000000000000186a0", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "AcrossFacetPackedV3": { @@ -27893,6 +28187,20 @@ } ] } + }, + "ink": { + "production": { + "1.2.0": [ + { + "ADDRESS": "0xd28932aB46626CdB224Ff95BaA42ed1dc75712f0", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:13:48", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000ef684c38f94f48775959ecf2012d7e864ffb9dd4000000000000000000000000420000000000000000000000000000000000000600000000000000000000000011f1022ca6adef6400e5677528a80d49a069c00c", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "Permit2Proxy": { @@ -28115,6 +28423,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.2": [ + { + "ADDRESS": "0x4BDB8cb372AeF4047626869dD5580536DBA9b053", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 14:20:44", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000864b314d4c5a0399368609581d3e8933a63b9232000000000000000000000000000000000022d473030f116ddee9f6b43ac78ba3000000000000000000000000af6051d0268c1bfcb69b3121ea21fd54b25c6cbc", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "GasZipFacet": { @@ -28517,6 +28839,20 @@ } ] } + }, + "ink": { + "production": { + "2.0.2": [ + { + "ADDRESS": "0xBfc367eedaC8Ad5Bc80869760ce7a777cd8FE11C", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:16:15", + "CONSTRUCTOR_ARGS": "0x0000000000000000000000002a37d63eadfe4b4682a3c28c1c2cd4f109cc2762", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "GasZipPeriphery": { @@ -28909,6 +29245,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.1": [ + { + "ADDRESS": "0xf89901c677c9fb8D04BdE96e8aa6c6eAB5cA5Fd4", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:26:43", + "CONSTRUCTOR_ARGS": "0x0000000000000000000000002a37d63eadfe4b4682a3c28c1c2cd4f109cc27620000000000000000000000009679d1f7d955c81827c6842b3119b911943958ee000000000000000000000000af6051d0268c1bfcb69b3121ea21fd54b25c6cbc", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "RelayFacet": { @@ -29311,6 +29661,20 @@ } ] } + }, + "ink": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x2010a7848E26D3B83038269953305075D65F7141", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2025-02-20 09:17:23", + "CONSTRUCTOR_ARGS": "0x0000000000000000000000007f4babd2c7d35221e72ab67ea72cba99573a0089000000000000000000000000f70da97812cb96acdf810712aa562db8dfa3dbef", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "GetGasFacet": { diff --git a/deployments/ink.diamond.json b/deployments/ink.diamond.json new file mode 100644 index 000000000..6f151e685 --- /dev/null +++ b/deployments/ink.diamond.json @@ -0,0 +1,84 @@ +{ + "LiFiDiamond": { + "Facets": { + "0x2407c1598650f8CD4Aaa0c1a4BCcd12D4999a6E9": { + "Name": "DiamondCutFacet", + "Version": "1.0.0" + }, + "0x1E007BB710D4330109B4Cf4f3D4D8e25a8b54BEB": { + "Name": "DiamondLoupeFacet", + "Version": "1.0.0" + }, + "0x42e4Ef53e8d905A5D02CC12b8C60D27800F76121": { + "Name": "OwnershipFacet", + "Version": "1.0.0" + }, + "0xC20773bbD1c8Fb749E7DaE5236800A5Dd5F39ed8": { + "Name": "WithdrawFacet", + "Version": "1.0.0" + }, + "0x668442675e54Af64E6cD551CB1C061EF5f26C237": { + "Name": "DexManagerFacet", + "Version": "1.0.1" + }, + "0xcdEC3efD307BaC9dD88c7EdD962F7681C79eD90E": { + "Name": "AccessManagerFacet", + "Version": "1.0.0" + }, + "0x6adB9BBCaAbf760f401bdA7730Aa4F6C1eF65456": { + "Name": "PeripheryRegistryFacet", + "Version": "1.0.0" + }, + "0x85a52070bf96f96B6bD4e06Ec536991879058BDF": { + "Name": "GenericSwapFacet", + "Version": "1.0.0" + }, + "0x09d0AD68C55F44ea64A8B758c457ED63a3177b11": { + "Name": "GenericSwapFacetV3", + "Version": "1.0.1" + }, + "0x091EBD75fCD19286b082Ce27b955F01816Af16d2": { + "Name": "CalldataVerificationFacet", + "Version": "1.2.0" + }, + "0xE48CA2A762503bc317C62f56B46D4270bA41835E": { + "Name": "EmergencyPauseFacet", + "Version": "1.0.1" + }, + "0xd28932aB46626CdB224Ff95BaA42ed1dc75712f0": { + "Name": "AcrossFacetPackedV3", + "Version": "1.2.0" + }, + "0xE6b06df46a7bde3973DBa0876d9fB319177abAe6": { + "Name": "AcrossFacetV3", + "Version": "1.1.0" + }, + "0xBfc367eedaC8Ad5Bc80869760ce7a777cd8FE11C": { + "Name": "GasZipFacet", + "Version": "2.0.2" + }, + "0x2010a7848E26D3B83038269953305075D65F7141": { + "Name": "RelayFacet", + "Version": "1.0.0" + }, + "0x2f257730442765d7A489FaCaEA1bbC905eCBB701": { + "Name": "StargateFacetV2", + "Version": "1.0.1" + } + }, + "Periphery": { + "ERC20Proxy": "0xE16150617A4560925ef8e68E8efa3D68Bec3Bb7F", + "Executor": "0xCA847a739BA26238488cb85A2a28A4ad677716e1", + "FeeCollector": "0x8295805320853d6B28778fC8f5199327e62e3d87", + "GasZipPeriphery": "0xf89901c677c9fb8D04BdE96e8aa6c6eAB5cA5Fd4", + "LiFiDEXAggregator": "0x9679d1f7D955C81827c6842b3119B911943958eE", + "LiFuelFeeCollector": "", + "Permit2Proxy": "0x4BDB8cb372AeF4047626869dD5580536DBA9b053", + "Receiver": "", + "ReceiverAcrossV3": "0x03C0d38939752A266991f887d45c93e5a0181c9A", + "ReceiverStargateV2": "0x65B6093ff981113AC6efb5b77B2D74D96edF4593", + "RelayerCelerIM": "", + "TokenWrapper": "0x86E5a407385364B86B3e502644EfFee1a43C9a7b" + } + } +} \ No newline at end of file diff --git a/deployments/ink.json b/deployments/ink.json new file mode 100644 index 000000000..4dcd9ff90 --- /dev/null +++ b/deployments/ink.json @@ -0,0 +1,28 @@ +{ + "DiamondCutFacet": "0x2407c1598650f8CD4Aaa0c1a4BCcd12D4999a6E9", + "AccessManagerFacet": "0xcdEC3efD307BaC9dD88c7EdD962F7681C79eD90E", + "CalldataVerificationFacet": "0x091EBD75fCD19286b082Ce27b955F01816Af16d2", + "DexManagerFacet": "0x668442675e54Af64E6cD551CB1C061EF5f26C237", + "DiamondLoupeFacet": "0x1E007BB710D4330109B4Cf4f3D4D8e25a8b54BEB", + "EmergencyPauseFacet": "0xE48CA2A762503bc317C62f56B46D4270bA41835E", + "GenericSwapFacet": "0x85a52070bf96f96B6bD4e06Ec536991879058BDF", + "GenericSwapFacetV3": "0x09d0AD68C55F44ea64A8B758c457ED63a3177b11", + "OwnershipFacet": "0x42e4Ef53e8d905A5D02CC12b8C60D27800F76121", + "PeripheryRegistryFacet": "0x6adB9BBCaAbf760f401bdA7730Aa4F6C1eF65456", + "WithdrawFacet": "0xC20773bbD1c8Fb749E7DaE5236800A5Dd5F39ed8", + "LiFiDiamond": "0x864b314D4C5a0399368609581d3E8933a63b9232", + "AcrossFacetPackedV3": "0xd28932aB46626CdB224Ff95BaA42ed1dc75712f0", + "AcrossFacetV3": "0xE6b06df46a7bde3973DBa0876d9fB319177abAe6", + "GasZipFacet": "0xBfc367eedaC8Ad5Bc80869760ce7a777cd8FE11C", + "RelayFacet": "0x2010a7848E26D3B83038269953305075D65F7141", + "StargateFacetV2": "0x2f257730442765d7A489FaCaEA1bbC905eCBB701", + "ERC20Proxy": "0xE16150617A4560925ef8e68E8efa3D68Bec3Bb7F", + "Executor": "0xCA847a739BA26238488cb85A2a28A4ad677716e1", + "FeeCollector": "0x8295805320853d6B28778fC8f5199327e62e3d87", + "LiFiDEXAggregator": "0x9679d1f7D955C81827c6842b3119B911943958eE", + "TokenWrapper": "0x86E5a407385364B86B3e502644EfFee1a43C9a7b", + "GasZipPeriphery": "0xf89901c677c9fb8D04BdE96e8aa6c6eAB5cA5Fd4", + "ReceiverAcrossV3": "0x03C0d38939752A266991f887d45c93e5a0181c9A", + "ReceiverStargateV2": "0x65B6093ff981113AC6efb5b77B2D74D96edF4593", + "Permit2Proxy": "0x4BDB8cb372AeF4047626869dD5580536DBA9b053" +} \ No newline at end of file diff --git a/foundry.toml b/foundry.toml index c25ae2378..dcaa907d1 100644 --- a/foundry.toml +++ b/foundry.toml @@ -44,6 +44,7 @@ harmony = "${ETH_NODE_URI_HARMONY}" gnosis = "${ETH_NODE_URI_GNOSIS}" gravity = "${ETH_NODE_URI_GRAVITY}" immutablezkevm = "${ETH_NODE_URI_IMMUTABLEZKEVM}" +ink = "${ETH_NODE_URI_INK}" kaia = "${ETH_NODE_URI_KAIA}" linea = "${ETH_NODE_URI_LINEA}" lisk = "${ETH_NODE_URI_LISK}" @@ -93,6 +94,7 @@ fraxtal = { key = "${MAINNET_ETHERSCAN_API_KEY}", url = "https://api.etherscan.i fuse = { key = "${FUSE_ETHERSCAN_API_KEY}", url = "https://explorer.fuse.io/api", chain = "122" } gnosis = { key = "${MAINNET_ETHERSCAN_API_KEY}", url = "https://api.etherscan.io/v2/api?chainid=100", chain = "100" } gravity = { key = "${GRAVITY_ETHERSCAN_API_KEY}", url = "https://www.oklink.com/api/v5/explorer/contract/verify-source-code-plugin/GRAVITY", chain = "1625", verifier = "oklink" } +ink = { key = "${INK_ETHERSCAN_API_KEY}", url = "https://explorer.inkonchain.com/api", verifier = "blockscout", chain = "57073"} immutablezkevm = { key = "${IMMUTABLEZKEVM_ETHERSCAN_API_KEY}", url = "https://explorer.immutable.com/api", chain = "13371", verifier = "blockscout" } kaia = { key = "${KAIA_ETHERSCAN_API_KEY}", url = "https://api-cypress.klaytnscope.com/api", chain = "8217", verifier = "blockscout" } linea = { key = "${MAINNET_ETHERSCAN_API_KEY}", url = "https://api.etherscan.io/v2/api?chainid=59144", chain = "59144" } diff --git a/networks b/networks index 4850f358c..a3153f1d2 100644 --- a/networks +++ b/networks @@ -17,6 +17,7 @@ fuse gnosis gravity immutablezkevm +ink kaia linea lisk diff --git a/script/deploy/healthCheck.ts b/script/deploy/healthCheck.ts index 583b1c01f..6fa7f7540 100644 --- a/script/deploy/healthCheck.ts +++ b/script/deploy/healthCheck.ts @@ -31,7 +31,6 @@ const corePeriphery = [ 'Executor', 'FeeCollector', 'LiFiDEXAggregator', - 'Receiver', 'TokenWrapper', ] diff --git a/script/tasks/diamondUpdateFacet.sh b/script/tasks/diamondUpdateFacet.sh index 31b1ae0e1..d12dad693 100755 --- a/script/tasks/diamondUpdateFacet.sh +++ b/script/tasks/diamondUpdateFacet.sh @@ -118,8 +118,11 @@ diamondUpdateFacet() { else RAW_RETURN_DATA=$(NO_BROADCAST=true NETWORK=$NETWORK FILE_SUFFIX=$FILE_SUFFIX USE_DEF_DIAMOND=$USE_MUTABLE_DIAMOND PRIVATE_KEY=$PRIVATE_KEY forge script "$UPDATE_SCRIPT" -f $NETWORK -vvvvv --json --skip-simulation --legacy) fi - CLEAN_RETURN_DATA=$(echo $RAW_RETURN_DATA | sed 's/^.*{\"logs/{\"logs/') + CLEAN_RETURN_DATA=$(echo "$RAW_RETURN_DATA" | grep -o '{\"logs.*}') # new version that removes non-JSON log output both before and after the JSON (old version removed only before) FACET_CUT=$(echo $CLEAN_RETURN_DATA | jq -r '.returns.cutData.value') + echo "" + echo "DiamondCut calldata: $FACET_CUT" + echo "" if [ "$FACET_CUT" == "0x" ] || [ -z "$FACET_CUT" ]; then error "Unable to extract facet cut data from RPC response at logs.returns.cutData.value"