From 176af41e6401846fe13687bc3585d5d56de513d0 Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Sat, 29 Jun 2024 16:05:19 +0530 Subject: [PATCH 01/10] feat: script to deploy contracts --- scripts/deploy/em-migration/migrate-em.ts | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/deploy/em-migration/migrate-em.ts b/scripts/deploy/em-migration/migrate-em.ts index 0016f32e..85dffafa 100644 --- a/scripts/deploy/em-migration/migrate-em.ts +++ b/scripts/deploy/em-migration/migrate-em.ts @@ -9,7 +9,6 @@ import { TestnetIds, getAllAddresses, } from "../../../src"; -import { configureRoles } from "../scripts/configureRoles"; import { deployForChains } from "../scripts/deploySocketFor"; import prompts from "prompts"; import { checkAndUpdateRoles } from "../scripts/roles"; @@ -73,9 +72,6 @@ const deleteOldContracts = async (chains: ChainSlug[]) => { await Promise.all( Object.keys(addresses).map(async (chain) => { if (chains.includes(parseInt(chain) as ChainSlug)) { - addresses[chain].SocketSimulator = ""; - addresses[chain].SimulatorUtils = ""; - addresses[chain].SwitchboardSimulator = ""; addresses[chain].Counter = ""; addresses[chain].SocketBatcher = ""; } @@ -88,6 +84,14 @@ const deleteOldContracts = async (chains: ChainSlug[]) => { } }; +const deploySimulators = async (chains: ChainSlug[]) => { + try { + await deployForChains(chains, emVersion); + } catch (error) { + console.log("Error:", error); + } +}; + const deploy = async (chains: ChainSlug[]) => { try { const addresses: DeploymentAddresses = await deployForChains( @@ -161,6 +165,10 @@ const main = async () => { title: "Delete", value: "delete", }, + { + title: "DeploySimulators", + value: "DeploySimulators", + }, ], }, { @@ -208,6 +216,9 @@ const main = async () => { case "delete": await deleteOldContracts(chains); break; + case "DeploySimulators": + await deploySimulators(chains); + break; case "exit": process.exit(0); } From 2f1a98f855043ab81d67b71713ea9ffb3fd01265 Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Sat, 29 Jun 2024 16:05:58 +0530 Subject: [PATCH 02/10] feat: clean and deploy simulators --- deployments/prod_addresses.json | 85 ++------ deployments/prod_verification.json | 320 +++++++++++++++++++++++++++++ 2 files changed, 341 insertions(+), 64 deletions(-) diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index 951e228e..9164b1ac 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -248,10 +248,6 @@ }, "SocketBatcher": "0xCFf802cCA1D506b3C4ac1eeb61233062a1B9f568", "startBlock": 19398570, - "SocketSimulator": "0xCA16185A1072E84D74931e605fCE0A843445C31e", - "SimulatorUtils": "0x63c10c00B47b9b418EC0F651b3763B6a692a0416", - "SwitchboardSimulator": "0xfB6daF96202Bd3815b2e602464Adc10317634066", - "CapacitorSimulator": "0x792AA5719F1f9A1e4C2dB3A09f582F296B649E81", "Counter": "0xb40FdECfCa4EF29CACc37222Ce4dB1fd0f561a00" }, "5": { @@ -584,10 +580,6 @@ "FastSwitchboard": "0x09A6e77912a6bcFc3abfDfb841A85380Bb2A8B97", "SocketBatcher": "0x208cB87549740B4eb32043D0471A153ED1c54408", "startBlock": 117144798, - "SocketSimulator": "0xE8bfE5106aa542c4Fe3158c8E789B1697fa6c70c", - "SimulatorUtils": "0xBA9C93014648Fc64A0beaC857B95C0fF22DA4F97", - "SwitchboardSimulator": "0xBd69f42D91c57Fe6aC84D1e57fc5c84428b86056", - "CapacitorSimulator": "0xdCfC6c9f8E0779dFd66df22Bd67186EC4C1f52dF", "Counter": "0xc2588658629b897D61B45c87D67F1f823de46527" }, "56": { @@ -698,10 +690,6 @@ "OptimisticSwitchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25", "FastSwitchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C", "SocketBatcher": "0x929625aCcE321770c747C38CC989B689EE823d90", - "SocketSimulator": "0x15F629625cf18adB1214ca7F7E451B265AA28a8C", - "SimulatorUtils": "0xda6421c91fd656ed37C89329975FbD63077f60CF", - "SwitchboardSimulator": "0x4c6D87EFF6FE77C565092194eF2eaE285F2d81Af", - "CapacitorSimulator": "0xb5eDDA0aBB44c4bacE39D5E9BC0545c241736A79", "startBlock": 39779127, "Counter": "0x67CF51A4665c28ba1921ad8D269BC474F84208d5" }, @@ -894,10 +882,6 @@ "FastSwitchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445", "SocketBatcher": "0x69Adf49285c25d9f840c577A0e3cb134caF944D3", "startBlock": 54457209, - "SocketSimulator": "0xB15F962BBAd0015f5a9A51e9ef39aeDa45bb83fc", - "SimulatorUtils": "0x61Ce6673B00b2F0281E8b95C6B68c8275865FF34", - "SwitchboardSimulator": "0xDEf0bfBdf7530C75AB3C73f8d2F64d9eaA7aA98e", - "CapacitorSimulator": "0xB69E0B5aDDcA4d71CEaAF03eB39D419010a418B1", "Counter": "0xAe96e8Bd18D1652154306B55b56c20aE545C054b" }, "404": { @@ -911,10 +895,6 @@ "OptimisticSwitchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF", "SocketBatcher": "0xb3314456567986e657d4C65Ec9e8cB736B92d11D", "Counter": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21", - "SocketSimulator": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", - "SimulatorUtils": "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8", - "SwitchboardSimulator": "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", - "CapacitorSimulator": "0xD7B34Db1477797FA2Dff890afBa88a00eb89b9eE", "startBlock": 60, "integrations": { "1": { @@ -1253,7 +1233,12 @@ } } }, - "SocketBatcher": "0x5D3F469BEA637c5017Df408fF25AA8B9BC6e6400" + "SocketBatcher": "0x5D3F469BEA637c5017Df408fF25AA8B9BC6e6400", + "SocketSimulator": "0xD9C057b412D6b5385E7f30975Fe719Df90Fd885F", + "SimulatorUtils": "0x86a8d161403B9867961677D36104830859BAB796", + "SwitchboardSimulator": "0x891345026ec93C0a2fa48F53EC5dA1d7AaB8305b", + "CapacitorSimulator": "0xd1756F11d8dc847b93BBc60755875942Bd203ceb", + "startBlock": 35809742 }, "901": { "SignatureVerifier": "0x19791877C020f7Cd5Ca1c97bdd5D268a52dbB0ff", @@ -1380,7 +1365,12 @@ "FastSwitchboard": "0xB39Cb89dfD708115616fdA1a2735613931B14181", "OptimisticSwitchboard": "0x1d6E46fd4DFdfe063f9096Dc2C0862D36A25b1aD", "Counter": "0xfCa282147D5E9b14c208D09dbEbC7Eb5C3814dC5", - "SocketBatcher": "0x1D6811553Aff8231aDd04A84F300b89E15D99EA4" + "SocketBatcher": "0x1D6811553Aff8231aDd04A84F300b89E15D99EA4", + "SocketSimulator": "0x87a27a367cA286C4307b08FDFd596065E7690E82", + "SimulatorUtils": "0x768a3D30473B0f02797e736A7d2b213Adc697Fa5", + "SwitchboardSimulator": "0x9fBf8BA818E1Daa033fFBAc0dd90B281FB011913", + "CapacitorSimulator": "0x2dcf0850A1B1e140FdDc52a84Ac7e611ad472335", + "startBlock": 14276402 }, "919": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", @@ -1547,10 +1537,6 @@ }, "SocketBatcher": "0x852C5DE08b9beB014caD171C16B12a8D7456ea3f", "Counter": "0x040993fbF458b95871Cd2D73Ee2E09F4AF6d56bB", - "SocketSimulator": "0xD23678c7D554cb09CA7892d6521d40BFb02a05C8", - "SimulatorUtils": "0x0645095Dc03B9546DFDB2fC8e7a52959ec37efA1", - "SwitchboardSimulator": "0xb7A6DBA1D9035Cc7Fe20A2e40e5B2FB2E8F5Ddf9", - "CapacitorSimulator": "0x2382660cB9f416b14a17578B78C64b9e090Ba14D", "startBlock": 8525340 }, "1024": { @@ -1615,10 +1601,10 @@ } } }, - "SocketSimulator": "0x320Cd79c54927Fe130427bD4492b6c6068D075E3", - "SimulatorUtils": "0xb515E9E6E6aBA44bBEC72FBF6B1a18DDB6bec68e", - "SwitchboardSimulator": "0x5bA62006442bC42e28E3E5147A5221Be723ca1DE", - "CapacitorSimulator": "0xF5d4f34c8d68111D1211B6A907135dEb75F22421" + "SocketSimulator": "0x98bBfbdDA0f32c411b1cE821B495aAb1bD43C680", + "SimulatorUtils": "0x337bD38dA8833ee5B7202e53315293A1776BB7e6", + "SwitchboardSimulator": "0xd0580065858313f0300eBb6e7970cD3699323985", + "CapacitorSimulator": "0x45d899798Fe32A791b78E68437f7D2DBd6910261" }, "2999": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", @@ -1910,10 +1896,6 @@ "OptimisticSwitchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF", "SocketBatcher": "0xb3314456567986e657d4C65Ec9e8cB736B92d11D", "Counter": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21", - "SocketSimulator": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", - "SimulatorUtils": "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8", - "SwitchboardSimulator": "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", - "CapacitorSimulator": "0xD7B34Db1477797FA2Dff890afBa88a00eb89b9eE", "startBlock": 119805, "integrations": { "1": { @@ -2171,10 +2153,6 @@ } } }, - "SocketSimulator": "0xeCFad5D71026979aF7B04E8C1D64D3fBda7aCC9e", - "SimulatorUtils": "0xF64010ACE8f7333dF61F6D0ae3d08C5d4704D69A", - "SwitchboardSimulator": "0x0e276315EB155d28C7Aebd78AC118F967277a265", - "CapacitorSimulator": "0xe3f2eC324dEE261a663f11b53d84c59fd4B799d2", "Counter": "0x1DE4928f1305704d069e23efc6EB1Fb446cf1135" }, "34443": { @@ -2274,11 +2252,7 @@ "switchboard": "0xaa3d9fA3aB930aE635b001d00C612aa5b14d750e" } } - }, - "SocketSimulator": "0x11695Ff9EE5E600b90BcbD651D1758A9B240A2d8", - "SimulatorUtils": "0x64107EB9DC50E79Fb3977b9D6C927f9B9C5Bd218", - "SwitchboardSimulator": "0xdf4Dc41c54482B5077572723828d1AfA2266D697", - "CapacitorSimulator": "0x4Fc41F98c92574F81CAF1bB172a2E7d4fb51D27b" + } }, "42161": { "SignatureVerifier": "0x9879a2b15722374243843DDdb79e5E6872aA74B8", @@ -2514,11 +2488,10 @@ "FastSwitchboard": "0xd5e829827F665c42326EAF68Da3360bd59b42f2f", "SocketBatcher": "0x107e182815C5e164E05F0C2CF478acE44FD468A8", "startBlock": 188278733, - "SocketSimulator": "0x3f8F21Dd6Efe362Ef49ECB636824a7a2aFc3a26d", - "SimulatorUtils": "0xfc63Fa6d0F1dc6E3b36b19Bc3424d349037a5562", - "SwitchboardSimulator": "0xd4FD62Ab60794d1Bdcb3EcF302FB3c0aF9D0fB34", - "CapacitorSimulator": "0x307E90b6e4260e95B7B1872CA688E6f6CCB76E18", - "Counter": "0x52B143D34eE40E744358E3735b8fCA7785F182ED" + "Counter": "0x52B143D34eE40E744358E3735b8fCA7785F182ED", + "SocketSimulator": "0x5E5677D808795844662681c3A6CEd9855cf4B476", + "SimulatorUtils": "0x04a6f5bc61Fe5e7908955F60e80779730c4069B1", + "SwitchboardSimulator": "0x8e89587020D99D92f4AE987A5D168d6DFDb54011" }, "60808": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", @@ -2531,10 +2504,6 @@ "OptimisticSwitchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65", "SocketBatcher": "0xaa3d9fA3aB930aE635b001d00C612aa5b14d750e", "Counter": "0xd286595d2e3D879596FAB51f83A702D10a6db27b", - "SocketSimulator": "0xA7649aa944b7Dce781859C18913c2Dc8A97f03e4", - "SimulatorUtils": "0x852C5DE08b9beB014caD171C16B12a8D7456ea3f", - "SwitchboardSimulator": "0x040993fbF458b95871Cd2D73Ee2E09F4AF6d56bB", - "CapacitorSimulator": "0x75c69B183351FE95890a6c200e0e667E18dEE4B6", "startBlock": 164925, "integrations": { "10": { @@ -2574,10 +2543,6 @@ "OptimisticSwitchboard": "0xaa3d9fA3aB930aE635b001d00C612aa5b14d750e", "SocketBatcher": "0x3f367Bf9F7dcC55d97cF311b71Fb9F41e415531A", "Counter": "0x7cC3552823b12B1128124c97a7c205c18325E6ef", - "SocketSimulator": "0x663dc7E91157c58079f55C1BF5ee1BdB6401Ca7a", - "SimulatorUtils": "0x54CAA0946dA179425e1abB169C020004284d64D3", - "SwitchboardSimulator": "0xd7627d03dEA4006cBe8E701F6932dBF75d3269B3", - "CapacitorSimulator": "0x2f098abd69774d831a2d922AFc69A4b3fa23ae66", "startBlock": 897368, "integrations": { "421614": { @@ -2630,10 +2595,6 @@ "OptimisticSwitchboard": "0x09217a4A727418A7A9fc60aE07E31c2Dfd13Bf2f", "SocketBatcher": "0x23ddd3beC944cdB16Cacf3039e389324Df598B89", "Counter": "0xeb03440702bB6de23C63ad1c5A24598433F59F86", - "SocketSimulator": "0xB9A7f821396DafF8b07b846ac46e561C00F870E5", - "SimulatorUtils": "0x0fd9F11B9C54a9F100234EeEf9ee7873d73C2204", - "SwitchboardSimulator": "0xE0361B2b4B1511e4a805086216011D0786747cCD", - "CapacitorSimulator": "0xA780c09C92698891dE57b3208d4AF1B087fb070B", "startBlock": 4132483, "integrations": { "1": { @@ -3118,10 +3079,6 @@ "OptimisticSwitchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65", "SocketBatcher": "0xaa3d9fA3aB930aE635b001d00C612aa5b14d750e", "Counter": "0xd286595d2e3D879596FAB51f83A702D10a6db27b", - "SocketSimulator": "0xA7649aa944b7Dce781859C18913c2Dc8A97f03e4", - "SimulatorUtils": "0x852C5DE08b9beB014caD171C16B12a8D7456ea3f", - "SwitchboardSimulator": "0x040993fbF458b95871Cd2D73Ee2E09F4AF6d56bB", - "CapacitorSimulator": "0x75c69B183351FE95890a6c200e0e667E18dEE4B6", "startBlock": 8347, "integrations": { "1": { diff --git a/deployments/prod_verification.json b/deployments/prod_verification.json index 8c8059c5..db2bc43c 100644 --- a/deployments/prod_verification.json +++ b/deployments/prod_verification.json @@ -190,6 +190,17 @@ ] ], "10": [ + [ + "0x2a754670Ed76F892568EE6Ff690fc56ee38a2DC9", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 10, + "0x301bD265F0b3C16A58CbDb886Ad87842E3A1c0a4", + "0xbb1f202095BE99000038D8d207C7E6f0F85a3925" + ] + ], [ "0xE8bfE5106aa542c4Fe3158c8E789B1697fa6c70c", "SocketSimulator", @@ -309,6 +320,131 @@ ["0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34", 10] ] ], + "97": [ + [ + "0x9a0E5dddc09634819e9Cc53030eaAd3203f63061", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + "0x80335566E2B110f8E4dFbD5A181D83953dF39Bfa", + 97, + 1000, + "0x9f95Bb664Ab3e6e8F0A9e206B746b2debEf6baD5" + ] + ], + [ + "0x7e2F01352b97Abf0f8f82a560DC66967E5fE78ac", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x80335566E2B110f8E4dFbD5A181D83953dF39Bfa", + "0x9f95Bb664Ab3e6e8F0A9e206B746b2debEf6baD5", + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 97 + ] + ], + [ + "0x80335566E2B110f8E4dFbD5A181D83953dF39Bfa", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 97, + 97, + "0xb4bD7c052B9761d01F8384F2F01401E1b5fA4b36", + "0x9f95Bb664Ab3e6e8F0A9e206B746b2debEf6baD5", + "IMLI" + ] + ], + [ + "0x5cA2D66b969F7f2C1c5533e67b2F58543502B77A", + "Counter", + "contracts/examples/Counter.sol", + ["0x91f0DD89505FB08bEBF64bfc4aaDe5a7F4830fB5"] + ], + [ + "0xd813052709761739d6730e6BDd3CA25301B645F7", + "SocketBatcher", + "contracts/socket/SocketBatcher.sol", + ["0xdE7f7a699F8504641eceF544B0fbc0740C37E69B"] + ], + [ + "0x8D0142796105040C1375EB66fAc744c2e6155cE3", + "OptimisticSwitchboard", + "contracts/switchboard/default-switchboards/OptimisticSwitchboard.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + "0x91f0DD89505FB08bEBF64bfc4aaDe5a7F4830fB5", + 97, + 7200, + "0x9f95Bb664Ab3e6e8F0A9e206B746b2debEf6baD5" + ] + ], + [ + "0xAe144F6Ae910131fd110E37c2f5106cd57279953", + "FastSwitchboard", + "contracts/switchboard/default-switchboards/FastSwitchboard.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + "0x91f0DD89505FB08bEBF64bfc4aaDe5a7F4830fB5", + 97, + 7200, + "0x9f95Bb664Ab3e6e8F0A9e206B746b2debEf6baD5" + ] + ], + [ + "0x6aDC7ce32eE9D336CCF32695b339cAb7931404a4", + "TransmitManager", + "contracts/TransmitManager.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 97, + "0x91f0DD89505FB08bEBF64bfc4aaDe5a7F4830fB5", + "0x9f95Bb664Ab3e6e8F0A9e206B746b2debEf6baD5" + ] + ], + [ + "0xDD1Cf1093cd639C3355a82A03ADFdc809F2372c4", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 97, + "0x91f0DD89505FB08bEBF64bfc4aaDe5a7F4830fB5", + "0x9f95Bb664Ab3e6e8F0A9e206B746b2debEf6baD5" + ] + ], + [ + "0x91f0DD89505FB08bEBF64bfc4aaDe5a7F4830fB5", + "Socket", + "contracts/socket/Socket.sol", + [ + 97, + "0xb4bD7c052B9761d01F8384F2F01401E1b5fA4b36", + "0xBDba52328DCedeECfe0d174493ba24c39119C9E5", + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + "IMLI" + ] + ], + [ + "0xBDba52328DCedeECfe0d174493ba24c39119C9E5", + "CapacitorFactory", + "contracts/CapacitorFactory.sol", + ["0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", 10] + ], + [ + "0xb4bD7c052B9761d01F8384F2F01401E1b5fA4b36", + "Hasher", + "contracts/utils/Hasher.sol", + ["0xdE7f7a699F8504641eceF544B0fbc0740C37E69B"] + ], + [ + "0x9f95Bb664Ab3e6e8F0A9e206B746b2debEf6baD5", + "SignatureVerifier", + "contracts/utils/SignatureVerifier.sol", + ["0xdE7f7a699F8504641eceF544B0fbc0740C37E69B"] + ] + ], "137": [ [ "0xB15F962BBAd0015f5a9A51e9ef39aeDa45bb83fc", @@ -774,6 +910,52 @@ ] ], "647": [ + [ + "0x891345026ec93C0a2fa48F53EC5dA1d7AaB8305b", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + "0xD9C057b412D6b5385E7f30975Fe719Df90Fd885F", + 647, + 1000, + "0x47140353947Bc127c9cf36fabd61112C8Fb8db2A" + ] + ], + [ + "0x86a8d161403B9867961677D36104830859BAB796", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0xD9C057b412D6b5385E7f30975Fe719Df90Fd885F", + "0x47140353947Bc127c9cf36fabd61112C8Fb8db2A", + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 647 + ] + ], + [ + "0xD9C057b412D6b5385E7f30975Fe719Df90Fd885F", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 647, + 647, + "0x9814d1E6751ADAE2D60fF16f987ae02a25C87224", + "0x47140353947Bc127c9cf36fabd61112C8Fb8db2A", + "IMLI" + ] + ], + [ + "0x3b5a7468532A403612E3F4908c4100E55B5563BE", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 647, + "0x834Ee253f0B926DCc1d03EbAeAfEc3a3D1eE4a86", + "0x47140353947Bc127c9cf36fabd61112C8Fb8db2A" + ] + ], [ "0x5D3F469BEA637c5017Df408fF25AA8B9BC6e6400", "SocketBatcher", @@ -782,6 +964,52 @@ ] ], "901": [ + [ + "0x9fBf8BA818E1Daa033fFBAc0dd90B281FB011913", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + "0x87a27a367cA286C4307b08FDFd596065E7690E82", + 901, + 1000, + "0x19791877C020f7Cd5Ca1c97bdd5D268a52dbB0ff" + ] + ], + [ + "0x768a3D30473B0f02797e736A7d2b213Adc697Fa5", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x87a27a367cA286C4307b08FDFd596065E7690E82", + "0x19791877C020f7Cd5Ca1c97bdd5D268a52dbB0ff", + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 901 + ] + ], + [ + "0x87a27a367cA286C4307b08FDFd596065E7690E82", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 901, + 901, + "0xfc2140e9A83693CBd8b54C42AFf83ecb627c2Ec7", + "0x19791877C020f7Cd5Ca1c97bdd5D268a52dbB0ff", + "IMLI" + ] + ], + [ + "0xDA36728642A0cbe4A020342F208CA6A6aCc87b49", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 901, + "0xFDC28fA368c33DEC7853d63B65FC5Cfe01B212fc", + "0x19791877C020f7Cd5Ca1c97bdd5D268a52dbB0ff" + ] + ], [ "0x5d2A7185F0f03ED88067b9Fa02252946fccaA0B8", "OptimismSwitchboard", @@ -1182,6 +1410,52 @@ ] ], "1024": [ + [ + "0xd0580065858313f0300eBb6e7970cD3699323985", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + "0x98bBfbdDA0f32c411b1cE821B495aAb1bD43C680", + 1024, + 1000, + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf" + ] + ], + [ + "0x337bD38dA8833ee5B7202e53315293A1776BB7e6", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x98bBfbdDA0f32c411b1cE821B495aAb1bD43C680", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 1024 + ] + ], + [ + "0x98bBfbdDA0f32c411b1cE821B495aAb1bD43C680", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 1024, + 1024, + "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", + "IMLI" + ] + ], + [ + "0x3cD9C9Aa2f262339Cc994466a12F9A4c7A267827", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 1024, + "0x565810cbfa3Cf1390963E5aFa2fB953795686339", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf" + ] + ], [ "0x5bA62006442bC42e28E3E5147A5221Be723ca1DE", "SwitchboardSimulator", @@ -2134,6 +2408,52 @@ ] ], "42161": [ + [ + "0x8e89587020D99D92f4AE987A5D168d6DFDb54011", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + "0x5E5677D808795844662681c3A6CEd9855cf4B476", + 42161, + 1000, + "0x9879a2b15722374243843DDdb79e5E6872aA74B8" + ] + ], + [ + "0x04a6f5bc61Fe5e7908955F60e80779730c4069B1", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x5E5677D808795844662681c3A6CEd9855cf4B476", + "0x9879a2b15722374243843DDdb79e5E6872aA74B8", + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 42161 + ] + ], + [ + "0x5E5677D808795844662681c3A6CEd9855cf4B476", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 42161, + 42161, + "0xcDA819182c2BBE351644eD5D429280ab98004B4e", + "0x9879a2b15722374243843DDdb79e5E6872aA74B8", + "IMLI" + ] + ], + [ + "0x83A52B74e06d1A705e35BB939Be95fcEF7b14CAb", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + 42161, + "0x37cc674582049b579571E2fFd890a4d99355f6Ba", + "0x9879a2b15722374243843DDdb79e5E6872aA74B8" + ] + ], [ "0x52B143D34eE40E744358E3735b8fCA7785F182ED", "Counter", From 68ee04d11f4b74469d2855247f3e87a3d5fe1d38 Mon Sep 17 00:00:00 2001 From: arthcp Date: Sat, 29 Jun 2024 16:39:35 +0530 Subject: [PATCH 03/10] feat: deploy simulators --- deployments/prod_addresses.json | 72 ++- deployments/prod_verification.json | 574 ++++++++++++++++++++++ scripts/deploy/em-migration/migrate-em.ts | 2 +- 3 files changed, 635 insertions(+), 13 deletions(-) diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index 9164b1ac..c021774e 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -248,7 +248,11 @@ }, "SocketBatcher": "0xCFf802cCA1D506b3C4ac1eeb61233062a1B9f568", "startBlock": 19398570, - "Counter": "0xb40FdECfCa4EF29CACc37222Ce4dB1fd0f561a00" + "Counter": "0xb40FdECfCa4EF29CACc37222Ce4dB1fd0f561a00", + "SocketSimulator": "0x4ac0dD10eE6F29A897fDE3007c6239A6C654D5B3", + "SimulatorUtils": "0xbf2492A42cc0078A46A4cDfb372858574912CD2F", + "SwitchboardSimulator": "0x687C51d273f8378d71Aa825D5d09d0D4578EC5ee", + "CapacitorSimulator": "0xB5A9A6d08a4D7c3b1e328CFDd3AD89E376330c03" }, "5": { "SignatureVerifier": "0x0b59efeE594469Ae31954940eFFfF2192bCD8422", @@ -580,7 +584,11 @@ "FastSwitchboard": "0x09A6e77912a6bcFc3abfDfb841A85380Bb2A8B97", "SocketBatcher": "0x208cB87549740B4eb32043D0471A153ED1c54408", "startBlock": 117144798, - "Counter": "0xc2588658629b897D61B45c87D67F1f823de46527" + "Counter": "0xc2588658629b897D61B45c87D67F1f823de46527", + "SocketSimulator": "0x5A4518bC61088EB0154D715dC61D0Bf801a744e9", + "SimulatorUtils": "0x043bcF7aaE818a6E9f509d9D7304e5c7D039FE5d", + "SwitchboardSimulator": "0x032dd149Cb081FAd716334D9F0bd81fa3F002F11", + "CapacitorSimulator": "0x0e166c230ff51435BeD6b73c921B32663268E3Db" }, "56": { "SignatureVerifier": "0x12E1dbCA1EC056421365bBdbC9e4Bd124c8F6760", @@ -691,7 +699,11 @@ "FastSwitchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C", "SocketBatcher": "0x929625aCcE321770c747C38CC989B689EE823d90", "startBlock": 39779127, - "Counter": "0x67CF51A4665c28ba1921ad8D269BC474F84208d5" + "Counter": "0x67CF51A4665c28ba1921ad8D269BC474F84208d5", + "SocketSimulator": "0x0EE2cBeb853142E6d1BF46338A73999fD4023332", + "SimulatorUtils": "0xAe96e8Bd18D1652154306B55b56c20aE545C054b", + "SwitchboardSimulator": "0x1945b1D31386178cc112F1C507E6bC39A29Ed6B3", + "CapacitorSimulator": "0x7E43fBc67B214a7cfF73888AA56268258D90c691" }, "89": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", @@ -882,7 +894,11 @@ "FastSwitchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445", "SocketBatcher": "0x69Adf49285c25d9f840c577A0e3cb134caF944D3", "startBlock": 54457209, - "Counter": "0xAe96e8Bd18D1652154306B55b56c20aE545C054b" + "Counter": "0xAe96e8Bd18D1652154306B55b56c20aE545C054b", + "SocketSimulator": "0x1DE4928f1305704d069e23efc6EB1Fb446cf1135", + "SimulatorUtils": "0xc57Da85262313DABc7A080110EEd436010101aeF", + "SwitchboardSimulator": "0x1D79F3af314CA93F7d8B608c97336f41524D44ed", + "CapacitorSimulator": "0xCace14D19d19b7050A8Bbd82b2661b9D6132ea5f" }, "404": { "SignatureVerifier": "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", @@ -969,7 +985,11 @@ "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" } } - } + }, + "SocketSimulator": "0x4c6D87EFF6FE77C565092194eF2eaE285F2d81Af", + "SimulatorUtils": "0xbBbe9bb6A6AD0eFDe58fC67FF47e87c58ec153Db", + "SwitchboardSimulator": "0x67CF51A4665c28ba1921ad8D269BC474F84208d5", + "CapacitorSimulator": "0x1403563827de2BDF70f438c6F63b973946d98f31" }, "416": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", @@ -1690,7 +1710,12 @@ "OptimisticSwitchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65", "Counter": "0xd286595d2e3D879596FAB51f83A702D10a6db27b", "FastSwitchboard": "0x768A2A53e4318dA7714a0aA65a96D9A241603562", - "SocketBatcher": "0xffC2D8f660a5CC41273f1Db714EaEcd19D28d147" + "SocketBatcher": "0xffC2D8f660a5CC41273f1Db714EaEcd19D28d147", + "SocketSimulator": "0x5175B4fC72A33d1f9Fb48A0B955B6C24e9C30331", + "SimulatorUtils": "0x806536Cff37a08Ab82674a6e697daB4DD710FdF1", + "SwitchboardSimulator": "0x15F629625cf18adB1214ca7F7E451B265AA28a8C", + "CapacitorSimulator": "0x9a74F1e7ee1bB419802E9FD24683613a3d33f6f9", + "startBlock": 4046505 }, "4665": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", @@ -1816,7 +1841,10 @@ "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" } } - } + }, + "SocketSimulator": "0xf4B9Cddc9d326F6e01A1A61b8eF3Df44F1E08449", + "SimulatorUtils": "0xb07F38FD7e8703100294c257f0A403cEb569bBdD", + "SwitchboardSimulator": "0x8145cDEf14Eb07613BC0e6f689A093B41d34FEEf" }, "7887": { "SignatureVerifier": "0x56Ac0e336f0c3620dCaF8d361E8E14eA73C31f5d", @@ -1946,7 +1974,11 @@ "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" } } - } + }, + "SocketSimulator": "0x15F629625cf18adB1214ca7F7E451B265AA28a8C", + "SimulatorUtils": "0xda6421c91fd656ed37C89329975FbD63077f60CF", + "SwitchboardSimulator": "0x4c6D87EFF6FE77C565092194eF2eaE285F2d81Af", + "CapacitorSimulator": "0xb5eDDA0aBB44c4bacE39D5E9BC0545c241736A79" }, "8453": { "SignatureVerifier": "0xA7f7e4fE8E4cdDCD9969Bd3fbcFF67000CD7DE47", @@ -2153,7 +2185,11 @@ } } }, - "Counter": "0x1DE4928f1305704d069e23efc6EB1Fb446cf1135" + "Counter": "0x1DE4928f1305704d069e23efc6EB1Fb446cf1135", + "SocketSimulator": "0x4c2BAB5A7Df134519368ab78364ea220db1bdA26", + "SimulatorUtils": "0xC7f534aA1443B947b7B9A09B497B49FFA1B30dA9", + "SwitchboardSimulator": "0x10C700641F48DA53434439BF2dA21A4C27091221", + "CapacitorSimulator": "0xBB7fDDB1c8C87aF3c46f784f15792b2721ec7117" }, "34443": { "SignatureVerifier": "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3", @@ -2252,7 +2288,11 @@ "switchboard": "0xaa3d9fA3aB930aE635b001d00C612aa5b14d750e" } } - } + }, + "SocketSimulator": "0x210Dc92f453A2620FcF09BDa76e45bb7138111D9", + "SimulatorUtils": "0xb4f28c1aeed8f9B5871dcE0134b16fAf8aC67A2D", + "SwitchboardSimulator": "0x68Ce3Fe82f9a2e94d062a7bEF110ceFD69936C8f", + "CapacitorSimulator": "0x9C530c48D1FD6282c2b2d8c9fE91B041fff7Ca5b" }, "42161": { "SignatureVerifier": "0x9879a2b15722374243843DDdb79e5E6872aA74B8", @@ -2693,7 +2733,11 @@ "switchboard": "0x09217a4A727418A7A9fc60aE07E31c2Dfd13Bf2f" } } - } + }, + "SocketSimulator": "0xfB9dF8073bD6Fea7Ba2e6E17f3b457c24C060Df1", + "SimulatorUtils": "0xc82a8F36BEb1F513328E51a072A4Ac5f55674CBa", + "SwitchboardSimulator": "0x933544D1916D8ABC93B1055050A74B174b4DFdc3", + "CapacitorSimulator": "0xc07Ab0bf50f2B219E0F73AF9fDB79C0a8D0c0301" }, "412346": { "SignatureVerifier": "0xbd0C1774D07a0468E09FDd68b4363dd83a5E2C83", @@ -3129,7 +3173,11 @@ "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" } } - } + }, + "SocketSimulator": "0xf5BDA9694F6f155348144faA6A1961D1a22C2Db4", + "SimulatorUtils": "0x507d63C5325773ebA03c4652f3568356F6Fc0a3F", + "SwitchboardSimulator": "0x1ae5a864f708d5118fC5a8dC54CafeDFCf20e00d", + "CapacitorSimulator": "0xf6baBA76Df4E8995Aa1218bEB2375e5911cEc48C" }, "3397901": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", diff --git a/deployments/prod_verification.json b/deployments/prod_verification.json index db2bc43c..003c5b21 100644 --- a/deployments/prod_verification.json +++ b/deployments/prod_verification.json @@ -1,5 +1,51 @@ { "1": [ + [ + "0x687C51d273f8378d71Aa825D5d09d0D4578EC5ee", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x4ac0dD10eE6F29A897fDE3007c6239A6C654D5B3", + 1, + 1000, + "0xf1ABF110d1B6ff0E2e8C05dd64FBF9eBA4d8af98" + ] + ], + [ + "0xbf2492A42cc0078A46A4cDfb372858574912CD2F", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x4ac0dD10eE6F29A897fDE3007c6239A6C654D5B3", + "0xf1ABF110d1B6ff0E2e8C05dd64FBF9eBA4d8af98", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 1 + ] + ], + [ + "0x4ac0dD10eE6F29A897fDE3007c6239A6C654D5B3", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 1, + 1, + "0x5C71beE4a6b0D617D8c3d107D331292741789E27", + "0xf1ABF110d1B6ff0E2e8C05dd64FBF9eBA4d8af98", + "IMLI" + ] + ], + [ + "0x0C2944DD1860325b08270a71BC24Ad45DE956E41", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 1, + "0x943AC2775928318653e91d350574436A1b9b16f9", + "0xf1ABF110d1B6ff0E2e8C05dd64FBF9eBA4d8af98" + ] + ], [ "0xCA16185A1072E84D74931e605fCE0A843445C31e", "SocketSimulator", @@ -190,6 +236,52 @@ ] ], "10": [ + [ + "0x032dd149Cb081FAd716334D9F0bd81fa3F002F11", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x5A4518bC61088EB0154D715dC61D0Bf801a744e9", + 10, + 1000, + "0xbb1f202095BE99000038D8d207C7E6f0F85a3925" + ] + ], + [ + "0x043bcF7aaE818a6E9f509d9D7304e5c7D039FE5d", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x5A4518bC61088EB0154D715dC61D0Bf801a744e9", + "0xbb1f202095BE99000038D8d207C7E6f0F85a3925", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 10 + ] + ], + [ + "0x5A4518bC61088EB0154D715dC61D0Bf801a744e9", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 10, + 10, + "0x3e89c061BF570B0678C7792BBfFC6bAA9d580Dc5", + "0xbb1f202095BE99000038D8d207C7E6f0F85a3925", + "IMLI" + ] + ], + [ + "0xb40FdECfCa4EF29CACc37222Ce4dB1fd0f561a00", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 10, + "0x301bD265F0b3C16A58CbDb886Ad87842E3A1c0a4", + "0xbb1f202095BE99000038D8d207C7E6f0F85a3925" + ] + ], [ "0x2a754670Ed76F892568EE6Ff690fc56ee38a2DC9", "ExecutionManagerDF", @@ -261,6 +353,41 @@ ] ], "56": [ + [ + "0x1945b1D31386178cc112F1C507E6bC39A29Ed6B3", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x0EE2cBeb853142E6d1BF46338A73999fD4023332", + 56, + 1000, + "0x12E1dbCA1EC056421365bBdbC9e4Bd124c8F6760" + ] + ], + [ + "0xAe96e8Bd18D1652154306B55b56c20aE545C054b", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x0EE2cBeb853142E6d1BF46338A73999fD4023332", + "0x12E1dbCA1EC056421365bBdbC9e4Bd124c8F6760", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 56 + ] + ], + [ + "0x0EE2cBeb853142E6d1BF46338A73999fD4023332", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 56, + 56, + "0x47508Dd0a0bA2E4bf404Cb19A954d302b6f75d00", + "0x12E1dbCA1EC056421365bBdbC9e4Bd124c8F6760", + "IMLI" + ] + ], [ "0x15F629625cf18adB1214ca7F7E451B265AA28a8C", "SocketSimulator", @@ -446,6 +573,52 @@ ] ], "137": [ + [ + "0x1D79F3af314CA93F7d8B608c97336f41524D44ed", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x1DE4928f1305704d069e23efc6EB1Fb446cf1135", + 137, + 1000, + "0x2F04a8f11691Db9e0EE08BF44a7712aF8273720D" + ] + ], + [ + "0xc57Da85262313DABc7A080110EEd436010101aeF", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x1DE4928f1305704d069e23efc6EB1Fb446cf1135", + "0x2F04a8f11691Db9e0EE08BF44a7712aF8273720D", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 137 + ] + ], + [ + "0x1DE4928f1305704d069e23efc6EB1Fb446cf1135", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 137, + 137, + "0x8AFacb9b98d01cd8D1FD45ae1d9A8e4F12C7673e", + "0x2F04a8f11691Db9e0EE08BF44a7712aF8273720D", + "IMLI" + ] + ], + [ + "0xFE5909B5EB66Aea11AEDdc034Ae148A21b816908", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 137, + "0xc20687f8dc0ad51d01003013d1c5b02d10DED001", + "0x2F04a8f11691Db9e0EE08BF44a7712aF8273720D" + ] + ], [ "0xB15F962BBAd0015f5a9A51e9ef39aeDa45bb83fc", "SocketSimulator", @@ -657,6 +830,52 @@ ] ], "404": [ + [ + "0x67CF51A4665c28ba1921ad8D269BC474F84208d5", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x4c6D87EFF6FE77C565092194eF2eaE285F2d81Af", + 404, + 1000, + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0xbBbe9bb6A6AD0eFDe58fC67FF47e87c58ec153Db", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x4c6D87EFF6FE77C565092194eF2eaE285F2d81Af", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 404 + ] + ], + [ + "0x4c6D87EFF6FE77C565092194eF2eaE285F2d81Af", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 404, + 404, + "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "IMLI" + ] + ], + [ + "0xda6421c91fd656ed37C89329975FbD63077f60CF", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 404, + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], [ "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", "SocketSimulator", @@ -1675,6 +1894,52 @@ ] ], "2999": [ + [ + "0x15F629625cf18adB1214ca7F7E451B265AA28a8C", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x5175B4fC72A33d1f9Fb48A0B955B6C24e9C30331", + 2999, + 1000, + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf" + ] + ], + [ + "0x806536Cff37a08Ab82674a6e697daB4DD710FdF1", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x5175B4fC72A33d1f9Fb48A0B955B6C24e9C30331", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 2999 + ] + ], + [ + "0x5175B4fC72A33d1f9Fb48A0B955B6C24e9C30331", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 2999, + 2999, + "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", + "IMLI" + ] + ], + [ + "0xBAA3892a58ACc49d026cd590b5452Ba1F849D65b", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 2999, + "0x565810cbfa3Cf1390963E5aFa2fB953795686339", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf" + ] + ], [ "0xffC2D8f660a5CC41273f1Db714EaEcd19D28d147", "SocketBatcher", @@ -1873,6 +2138,52 @@ ] ], "5000": [ + [ + "0x8145cDEf14Eb07613BC0e6f689A093B41d34FEEf", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0xf4B9Cddc9d326F6e01A1A61b8eF3Df44F1E08449", + 5000, + 1000, + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf" + ] + ], + [ + "0xb07F38FD7e8703100294c257f0A403cEb569bBdD", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0xf4B9Cddc9d326F6e01A1A61b8eF3Df44F1E08449", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 5000 + ] + ], + [ + "0xf4B9Cddc9d326F6e01A1A61b8eF3Df44F1E08449", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 5000, + 5000, + "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", + "IMLI" + ] + ], + [ + "0x8Bc50b98B55F42DD3966e9b428AF3581386B7Fa6", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 5000, + "0x565810cbfa3Cf1390963E5aFa2fB953795686339", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf" + ] + ], [ "0xd286595d2e3D879596FAB51f83A702D10a6db27b", "Counter", @@ -1963,6 +2274,52 @@ ] ], "8008": [ + [ + "0x4c6D87EFF6FE77C565092194eF2eaE285F2d81Af", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x15F629625cf18adB1214ca7F7E451B265AA28a8C", + 8008, + 1000, + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0xda6421c91fd656ed37C89329975FbD63077f60CF", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x15F629625cf18adB1214ca7F7E451B265AA28a8C", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 8008 + ] + ], + [ + "0x15F629625cf18adB1214ca7F7E451B265AA28a8C", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 8008, + 8008, + "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "IMLI" + ] + ], + [ + "0x806536Cff37a08Ab82674a6e697daB4DD710FdF1", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 8008, + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], [ "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", "SwitchboardSimulator", @@ -2092,6 +2449,52 @@ ] ], "8453": [ + [ + "0x10C700641F48DA53434439BF2dA21A4C27091221", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x4c2BAB5A7Df134519368ab78364ea220db1bdA26", + 8453, + 1000, + "0xA7f7e4fE8E4cdDCD9969Bd3fbcFF67000CD7DE47" + ] + ], + [ + "0xC7f534aA1443B947b7B9A09B497B49FFA1B30dA9", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x4c2BAB5A7Df134519368ab78364ea220db1bdA26", + "0xA7f7e4fE8E4cdDCD9969Bd3fbcFF67000CD7DE47", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 8453 + ] + ], + [ + "0x4c2BAB5A7Df134519368ab78364ea220db1bdA26", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 8453, + 8453, + "0xAC313d7491910516E06FBfC2A0b5BB49bb072D91", + "0xA7f7e4fE8E4cdDCD9969Bd3fbcFF67000CD7DE47", + "IMLI" + ] + ], + [ + "0x52B143D34eE40E744358E3735b8fCA7785F182ED", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 8453, + "0x12E6e58864cE4402cF2B4B8a8E9c75eAD7280156", + "0xA7f7e4fE8E4cdDCD9969Bd3fbcFF67000CD7DE47" + ] + ], [ "0x1DE4928f1305704d069e23efc6EB1Fb446cf1135", "Counter", @@ -2279,6 +2682,52 @@ ] ], "34443": [ + [ + "0x68Ce3Fe82f9a2e94d062a7bEF110ceFD69936C8f", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x210Dc92f453A2620FcF09BDa76e45bb7138111D9", + 34443, + 1000, + "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3" + ] + ], + [ + "0xb4f28c1aeed8f9B5871dcE0134b16fAf8aC67A2D", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x210Dc92f453A2620FcF09BDa76e45bb7138111D9", + "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 34443 + ] + ], + [ + "0x210Dc92f453A2620FcF09BDa76e45bb7138111D9", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 34443, + 34443, + "0x8537307810fC40F4073A12a38554D4Ff78EfFf41", + "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3", + "IMLI" + ] + ], + [ + "0x9eabdB3e4D3Bdf23e4b8a22963A4Da4dE151bA9f", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 34443, + "0xc317144DE60E6bC9455363bB09852C00bd14CD61", + "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3" + ] + ], [ "0xA7649aa944b7Dce781859C18913c2Dc8A97f03e4", "Counter", @@ -2408,6 +2857,28 @@ ] ], "42161": [ + [ + "0x3431fCFB44597f18E38744a3156a916A388BA4D0", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 42161, + "0x37cc674582049b579571E2fFd890a4d99355f6Ba", + "0x9879a2b15722374243843DDdb79e5E6872aA74B8" + ] + ], + [ + "0xb1b93173FecaDBd89cb94F446a1E6bCEF50e8344", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 42161, + "0x37cc674582049b579571E2fFd890a4d99355f6Ba", + "0x9879a2b15722374243843DDdb79e5E6872aA74B8" + ] + ], [ "0x8e89587020D99D92f4AE987A5D168d6DFDb54011", "SwitchboardSimulator", @@ -3090,6 +3561,52 @@ ] ], "81457": [ + [ + "0x933544D1916D8ABC93B1055050A74B174b4DFdc3", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0xfB9dF8073bD6Fea7Ba2e6E17f3b457c24C060Df1", + 81457, + 1000, + "0x23307E24D936b785FBa3Bc49c41B9AD5b4d261b3" + ] + ], + [ + "0xc82a8F36BEb1F513328E51a072A4Ac5f55674CBa", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0xfB9dF8073bD6Fea7Ba2e6E17f3b457c24C060Df1", + "0x23307E24D936b785FBa3Bc49c41B9AD5b4d261b3", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 81457 + ] + ], + [ + "0xfB9dF8073bD6Fea7Ba2e6E17f3b457c24C060Df1", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 81457, + 81457, + "0x0Aa26a14C2559319F9dEf7304E93db5aE6b32fb9", + "0x23307E24D936b785FBa3Bc49c41B9AD5b4d261b3", + "IMLI" + ] + ], + [ + "0xDA27f00E7E35D9f396427457926D5420CA5FB948", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 81457, + "0xB6fb3062405985F700fa23758A3053162ddBeFb9", + "0x23307E24D936b785FBa3Bc49c41B9AD5b4d261b3" + ] + ], [ "0xE0361B2b4B1511e4a805086216011D0786747cCD", "SwitchboardSimulator", @@ -3868,6 +4385,52 @@ ] ], "777777": [ + [ + "0x1ae5a864f708d5118fC5a8dC54CafeDFCf20e00d", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0xf5BDA9694F6f155348144faA6A1961D1a22C2Db4", + 777777, + 1000, + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf" + ] + ], + [ + "0x507d63C5325773ebA03c4652f3568356F6Fc0a3F", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0xf5BDA9694F6f155348144faA6A1961D1a22C2Db4", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 777777 + ] + ], + [ + "0xf5BDA9694F6f155348144faA6A1961D1a22C2Db4", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 777777, + 777777, + "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", + "IMLI" + ] + ], + [ + "0x4F1505f9615D94651FD3Ca5aD8910875E9aA2854", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 777777, + "0x565810cbfa3Cf1390963E5aFa2fB953795686339", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf" + ] + ], [ "0x040993fbF458b95871Cd2D73Ee2E09F4AF6d56bB", "SwitchboardSimulator", @@ -5477,6 +6040,17 @@ ] ], "1324967486": [ + [ + "0xf200705d32fD1ED4A840610B756F12570c0ddE39", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 1324967486, + "0x565810cbfa3Cf1390963E5aFa2fB953795686339", + "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf" + ] + ], [ "0x47E136cf4A96e1afa72e19022f9699Bbaa1BE60e", "SwitchboardSimulator", diff --git a/scripts/deploy/em-migration/migrate-em.ts b/scripts/deploy/em-migration/migrate-em.ts index 85dffafa..ecc5a57d 100644 --- a/scripts/deploy/em-migration/migrate-em.ts +++ b/scripts/deploy/em-migration/migrate-em.ts @@ -27,7 +27,7 @@ import { getProviderFromChainSlug } from "../../constants"; import { storeAllAddresses } from "../utils"; import { getSiblingsFromAddresses } from "../../common"; -const emVersion = CORE_CONTRACTS.ExecutionManagerDF; +const emVersion = CORE_CONTRACTS.ExecutionManager; export const configureExecutionManagers = async ( chains: ChainSlug[], From b9159cbe80deedbb27071adf93c31e2cc343f657 Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Sat, 29 Jun 2024 16:46:44 +0530 Subject: [PATCH 04/10] fix: arbitrum simulator setup --- deployments/prod_addresses.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index c021774e..3542b11b 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -2531,7 +2531,8 @@ "Counter": "0x52B143D34eE40E744358E3735b8fCA7785F182ED", "SocketSimulator": "0x5E5677D808795844662681c3A6CEd9855cf4B476", "SimulatorUtils": "0x04a6f5bc61Fe5e7908955F60e80779730c4069B1", - "SwitchboardSimulator": "0x8e89587020D99D92f4AE987A5D168d6DFDb54011" + "SwitchboardSimulator": "0x8e89587020D99D92f4AE987A5D168d6DFDb54011", + "CapacitorSimulator": "0x0d22Ce1F499c6146715dB7001626Eb9Bab3Ab139" }, "60808": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", From 60f362fc14dd6690270b23af222fa0306bded096 Mon Sep 17 00:00:00 2001 From: arthcp Date: Sat, 29 Jun 2024 17:03:14 +0530 Subject: [PATCH 05/10] fix: mantle simulators --- deployments/prod_addresses.json | 3 ++- scripts/deploy/config/config.ts | 20 +++++++++++++------- scripts/deploy/scripts/deploySocket.ts | 6 ++++-- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index c021774e..2d6e13b3 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -1844,7 +1844,8 @@ }, "SocketSimulator": "0xf4B9Cddc9d326F6e01A1A61b8eF3Df44F1E08449", "SimulatorUtils": "0xb07F38FD7e8703100294c257f0A403cEb569bBdD", - "SwitchboardSimulator": "0x8145cDEf14Eb07613BC0e6f689A093B41d34FEEf" + "SwitchboardSimulator": "0x8145cDEf14Eb07613BC0e6f689A093B41d34FEEf", + "CapacitorSimulator": "0x7a7F0B8B738FaA8f0630a92a3652DEbB0eB457E7" }, "7887": { "SignatureVerifier": "0x56Ac0e336f0c3620dCaF8d361E8E14eA73C31f5d", diff --git a/scripts/deploy/config/config.ts b/scripts/deploy/config/config.ts index 1804a4a3..1cd70195 100644 --- a/scripts/deploy/config/config.ts +++ b/scripts/deploy/config/config.ts @@ -138,9 +138,9 @@ export const overrides = ( }; } else if (chain == ChainSlug.ARBITRUM_SEPOLIA) { return { - // type: 1, - // gasLimit: 50_000_000, - // gasPrice: 1_867_830_000, + type: 1, + gasLimit: 50_000_000, + gasPrice: 200_000_000, }; } else if (chain == ChainSlug.OPTIMISM) { return { @@ -163,14 +163,14 @@ export const overrides = ( } else if (chain == ChainSlug.BSC) { return { type, - gasLimit: 3000000, + gasLimit: 6_000_000, gasPrice, }; } else if (chain == ChainSlug.MAINNET) { return { // type: 1, - gasLimit: 4_000_000, - gasPrice: 30_000_000_000, + gasLimit: 6_000_000, + gasPrice: 5_000_000_000, }; } else if (chain == ChainSlug.POLYGON_MAINNET) { return { @@ -235,7 +235,7 @@ export const overrides = ( } else if (chain == ChainSlug.HOOK) { return { // type: 1, - gasLimit: 3_000_000, + gasLimit: 7_000_000, // gasPrice: 100000000, }; } else if (chain == ChainSlug.REYA_CRONOS) { @@ -292,6 +292,12 @@ export const overrides = ( // gasLimit, // gasPrice, }; + } else if (chain == ChainSlug.MANTLE) { + return { + type: 1, + gasLimit: 10_000_000_000, + gasPrice: 30_000_000, + }; } else if (chainConfig[chain] && chainConfig[chain].overrides) { return chainConfig[chain].overrides!; } else return { type, gasLimit, gasPrice }; diff --git a/scripts/deploy/scripts/deploySocket.ts b/scripts/deploy/scripts/deploySocket.ts index a9bc442a..2d457d3e 100644 --- a/scripts/deploy/scripts/deploySocket.ts +++ b/scripts/deploy/scripts/deploySocket.ts @@ -171,7 +171,9 @@ export const deploySocket = async ( const simulatorContract = ( await getInstance("SocketSimulator", socketSimulator.address) ).connect(deployUtils.signer); - let capacitor = await simulatorContract.capacitor(); + let capacitor = await simulatorContract.capacitor({ + ...overrides(chainSlug), + }); if (capacitor == constants.AddressZero) { const tx = await simulatorContract.setup( switchboardSimulator.address, @@ -185,7 +187,7 @@ export const deploySocket = async ( } deployUtils.addresses["CapacitorSimulator"] = - await simulatorContract.capacitor(); + await simulatorContract.capacitor({ ...overrides(chainSlug) }); deployUtils.addresses.startBlock = deployUtils.addresses.startBlock ? deployUtils.addresses.startBlock : await socketSigner.provider?.getBlockNumber(); From 79c6ec73e55798dd212d5d272b99d849220ebe2b Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Sat, 29 Jun 2024 17:07:23 +0530 Subject: [PATCH 06/10] fix: version --- scripts/deploy/em-migration/migrate-em.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy/em-migration/migrate-em.ts b/scripts/deploy/em-migration/migrate-em.ts index ecc5a57d..85dffafa 100644 --- a/scripts/deploy/em-migration/migrate-em.ts +++ b/scripts/deploy/em-migration/migrate-em.ts @@ -27,7 +27,7 @@ import { getProviderFromChainSlug } from "../../constants"; import { storeAllAddresses } from "../utils"; import { getSiblingsFromAddresses } from "../../common"; -const emVersion = CORE_CONTRACTS.ExecutionManager; +const emVersion = CORE_CONTRACTS.ExecutionManagerDF; export const configureExecutionManagers = async ( chains: ChainSlug[], From 50d4658d2f52292a7a6ac23b0538aea50eb913dd Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Sat, 29 Jun 2024 17:09:36 +0530 Subject: [PATCH 07/10] fix: remove temp code --- scripts/deploy/em-migration/migrate-em.ts | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/scripts/deploy/em-migration/migrate-em.ts b/scripts/deploy/em-migration/migrate-em.ts index 85dffafa..53eebb86 100644 --- a/scripts/deploy/em-migration/migrate-em.ts +++ b/scripts/deploy/em-migration/migrate-em.ts @@ -84,14 +84,6 @@ const deleteOldContracts = async (chains: ChainSlug[]) => { } }; -const deploySimulators = async (chains: ChainSlug[]) => { - try { - await deployForChains(chains, emVersion); - } catch (error) { - console.log("Error:", error); - } -}; - const deploy = async (chains: ChainSlug[]) => { try { const addresses: DeploymentAddresses = await deployForChains( @@ -165,10 +157,6 @@ const main = async () => { title: "Delete", value: "delete", }, - { - title: "DeploySimulators", - value: "DeploySimulators", - }, ], }, { @@ -216,9 +204,6 @@ const main = async () => { case "delete": await deleteOldContracts(chains); break; - case "DeploySimulators": - await deploySimulators(chains); - break; case "exit": process.exit(0); } From 18d15b4865b7d75fecc96fad104f8407b8b53598 Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Sat, 29 Jun 2024 17:18:32 +0530 Subject: [PATCH 08/10] fix: missing contracts --- deployments/prod_addresses.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index 5aaa8545..787e27eb 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -1557,6 +1557,10 @@ }, "SocketBatcher": "0x852C5DE08b9beB014caD171C16B12a8D7456ea3f", "Counter": "0x040993fbF458b95871Cd2D73Ee2E09F4AF6d56bB", + "SocketSimulator": "0xD23678c7D554cb09CA7892d6521d40BFb02a05C8", + "SimulatorUtils": "0x0645095Dc03B9546DFDB2fC8e7a52959ec37efA1", + "SwitchboardSimulator": "0xb7A6DBA1D9035Cc7Fe20A2e40e5B2FB2E8F5Ddf9", + "CapacitorSimulator": "0x2382660cB9f416b14a17578B78C64b9e090Ba14D", "startBlock": 8525340 }, "1024": { @@ -2546,6 +2550,10 @@ "OptimisticSwitchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65", "SocketBatcher": "0xaa3d9fA3aB930aE635b001d00C612aa5b14d750e", "Counter": "0xd286595d2e3D879596FAB51f83A702D10a6db27b", + "SocketSimulator": "0xA7649aa944b7Dce781859C18913c2Dc8A97f03e4", + "SimulatorUtils": "0x852C5DE08b9beB014caD171C16B12a8D7456ea3f", + "SwitchboardSimulator": "0x040993fbF458b95871Cd2D73Ee2E09F4AF6d56bB", + "CapacitorSimulator": "0x75c69B183351FE95890a6c200e0e667E18dEE4B6", "startBlock": 164925, "integrations": { "10": { @@ -2585,6 +2593,10 @@ "OptimisticSwitchboard": "0xaa3d9fA3aB930aE635b001d00C612aa5b14d750e", "SocketBatcher": "0x3f367Bf9F7dcC55d97cF311b71Fb9F41e415531A", "Counter": "0x7cC3552823b12B1128124c97a7c205c18325E6ef", + "SocketSimulator": "0x663dc7E91157c58079f55C1BF5ee1BdB6401Ca7a", + "SimulatorUtils": "0x54CAA0946dA179425e1abB169C020004284d64D3", + "SwitchboardSimulator": "0xd7627d03dEA4006cBe8E701F6932dBF75d3269B3", + "CapacitorSimulator": "0x2f098abd69774d831a2d922AFc69A4b3fa23ae66", "startBlock": 897368, "integrations": { "421614": { From 092fb025208da8d20c2a35648aed2e14c0a6525c Mon Sep 17 00:00:00 2001 From: arthcp Date: Sat, 29 Jun 2024 17:24:35 +0530 Subject: [PATCH 09/10] chore: s3 version --- scripts/rpcConfig/constants/version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rpcConfig/constants/version.ts b/scripts/rpcConfig/constants/version.ts index f0cb8e63..9db8de2a 100644 --- a/scripts/rpcConfig/constants/version.ts +++ b/scripts/rpcConfig/constants/version.ts @@ -2,5 +2,5 @@ import { DeploymentMode } from "../../../src"; export const version = { [DeploymentMode.DEV]: "1.0.5", - [DeploymentMode.PROD]: "1.0.28", + [DeploymentMode.PROD]: "1.0.29", }; From ca06859eaf8f600db38c3f5a6fd1eec53997deb1 Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Wed, 3 Jul 2024 20:54:04 +0530 Subject: [PATCH 10/10] fix: add old addresses --- deployments/prod_addresses.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index 787e27eb..50520a6a 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -2762,11 +2762,11 @@ "TransmitManager": "0x956b0c4d2f3f050bDB6A5b6B6a95050af9fA3A62", "FastSwitchboard": "0x38cACa8a8b5579Cb2d2870A73DbfAa54B6Ee490D", "OptimisticSwitchboard": "0xC94De3804d3c67620E7a70547bCB4a77b53952EC", - "SocketBatcher": "", - "Counter": "", - "SocketSimulator": "", - "SimulatorUtils": "", - "SwitchboardSimulator": "", + "SocketBatcher": "0x1d1ef33231689d6057565f99d8B1864E6bE5eb94", + "Counter": "0x785Cda4f70413E4020B2ec2fd0ACCEd6DF2b30D2", + "SocketSimulator": "0xbfd616DA87ebea4513aB633C9298218dd4a698dc", + "SimulatorUtils": "0x93f73A15272D4D46720234C32BC1eE7290Eb5F18", + "SwitchboardSimulator": "0x108eE40304fB1C3560eFF91f8E15B52ea4E2a257", "CapacitorSimulator": "0x1390e33B8F1D6D92e27fcEF2c6E5641Be951A2bb", "startBlock": 149, "integrations": { @@ -3583,7 +3583,7 @@ }, "FastSwitchboard": "0x61438D1E9C9127F4996E2f74bb7BF62CC7f9B32F", "OptimisticSwitchboard": "0xFCd8ebA25c0e0973Fd131b6bF77fd8dAEcCaC75B", - "Counter": "", + "Counter": "0x21abD53f1150b6DFA1111E4F2b7536F6eaA48538", "SocketBatcher": "0x602029526b76C5116957aa360472B1141314AB7f", "SocketSimulator": "", "SimulatorUtils": "", @@ -3819,8 +3819,6 @@ "TransmitManager": "0xbDf50eAe568ECef74796ed6022a0d453e8432410", "FastSwitchboard": "0x8f9EaEe5c5df888aBA3c1Ab19689a0660d042c6d", "OptimisticSwitchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65", - "SocketBatcher": "", - "Counter": "", "startBlock": 277, "integrations": { "421614": { @@ -3860,6 +3858,8 @@ } } }, + "SocketBatcher": "0xaa3d9fA3aB930aE635b001d00C612aa5b14d750e", + "Counter": "0xd286595d2e3D879596FAB51f83A702D10a6db27b", "SocketSimulator": "", "SimulatorUtils": "", "SwitchboardSimulator": ""