From ccb8f70c9d3edea83e34e12c34a98257c98503fc Mon Sep 17 00:00:00 2001 From: James Prestwich <10149425+prestwich@users.noreply.github.com> Date: Tue, 17 Aug 2021 11:59:30 -0700 Subject: [PATCH] feature: print env and updater, add env to config output (#585) * feature: print env and updater, add env to config output * deploy: aug-17 staging 1629224985839 * deploy: aug-17 1629226112796 dev --- .../1629224985839/alfajores_config.json | 40 ++++++++ .../1629224985839/alfajores_contracts.json | 22 +++++ .../1629224985839/alfajores_verification.json | 80 +++++++++++++++ .../1629225192047/alfajores_contracts.json | 12 +++ .../1629225192047/alfajores_verification.json | 46 +++++++++ .../bridge/1629225192047/kovan_contracts.json | 13 +++ .../1629225192047/kovan_verification.json | 54 ++++++++++ rust/config/1629224985839/kathy-partial.json | 8 ++ rust/config/1629224985839/kovan_config.json | 40 ++++++++ .../config/1629224985839/kovan_contracts.json | 22 +++++ .../1629224985839/kovan_verification.json | 80 +++++++++++++++ .../1629224985839/processor-partial.json | 3 + .../config/1629224985839/relayer-partial.json | 3 + .../config/1629224985839/updater-partial.json | 8 ++ .../config/1629224985839/watcher-partial.json | 33 +++++++ .../1629226112796/alfajores_config.json | 40 ++++++++ .../1629226112796/alfajores_contracts.json | 22 +++++ .../1629226112796/alfajores_verification.json | 80 +++++++++++++++ .../1629226303243/alfajores_contracts.json | 12 +++ .../1629226303243/alfajores_verification.json | 46 +++++++++ .../bridge/1629226303243/kovan_contracts.json | 13 +++ .../1629226303243/kovan_verification.json | 54 ++++++++++ rust/config/1629226112796/kathy-partial.json | 8 ++ rust/config/1629226112796/kovan_config.json | 40 ++++++++ .../config/1629226112796/kovan_contracts.json | 22 +++++ .../1629226112796/kovan_verification.json | 80 +++++++++++++++ .../1629226112796/processor-partial.json | 3 + .../config/1629226112796/relayer-partial.json | 3 + .../config/1629226112796/updater-partial.json | 8 ++ .../config/1629226112796/watcher-partial.json | 33 +++++++ typescript/optics-deploy/src/chain.ts | 1 + .../optics-deploy/src/core/CoreDeploy.ts | 1 + typescript/optics-deploy/src/core/index.ts | 27 +++-- .../typechain/optics-xapps/UpgradeBeacon.d.ts | 86 ---------------- .../factories/UpgradeBeacon__factory.ts | 98 ------------------- 35 files changed, 951 insertions(+), 190 deletions(-) create mode 100644 rust/config/1629224985839/alfajores_config.json create mode 100644 rust/config/1629224985839/alfajores_contracts.json create mode 100644 rust/config/1629224985839/alfajores_verification.json create mode 100644 rust/config/1629224985839/bridge/1629225192047/alfajores_contracts.json create mode 100644 rust/config/1629224985839/bridge/1629225192047/alfajores_verification.json create mode 100644 rust/config/1629224985839/bridge/1629225192047/kovan_contracts.json create mode 100644 rust/config/1629224985839/bridge/1629225192047/kovan_verification.json create mode 100644 rust/config/1629224985839/kathy-partial.json create mode 100644 rust/config/1629224985839/kovan_config.json create mode 100644 rust/config/1629224985839/kovan_contracts.json create mode 100644 rust/config/1629224985839/kovan_verification.json create mode 100644 rust/config/1629224985839/processor-partial.json create mode 100644 rust/config/1629224985839/relayer-partial.json create mode 100644 rust/config/1629224985839/updater-partial.json create mode 100644 rust/config/1629224985839/watcher-partial.json create mode 100644 rust/config/1629226112796/alfajores_config.json create mode 100644 rust/config/1629226112796/alfajores_contracts.json create mode 100644 rust/config/1629226112796/alfajores_verification.json create mode 100644 rust/config/1629226112796/bridge/1629226303243/alfajores_contracts.json create mode 100644 rust/config/1629226112796/bridge/1629226303243/alfajores_verification.json create mode 100644 rust/config/1629226112796/bridge/1629226303243/kovan_contracts.json create mode 100644 rust/config/1629226112796/bridge/1629226303243/kovan_verification.json create mode 100644 rust/config/1629226112796/kathy-partial.json create mode 100644 rust/config/1629226112796/kovan_config.json create mode 100644 rust/config/1629226112796/kovan_contracts.json create mode 100644 rust/config/1629226112796/kovan_verification.json create mode 100644 rust/config/1629226112796/processor-partial.json create mode 100644 rust/config/1629226112796/relayer-partial.json create mode 100644 rust/config/1629226112796/updater-partial.json create mode 100644 rust/config/1629226112796/watcher-partial.json delete mode 100644 typescript/typechain/optics-xapps/UpgradeBeacon.d.ts delete mode 100644 typescript/typechain/optics-xapps/factories/UpgradeBeacon__factory.ts diff --git a/rust/config/1629224985839/alfajores_config.json b/rust/config/1629224985839/alfajores_config.json new file mode 100644 index 000000000..f27cae035 --- /dev/null +++ b/rust/config/1629224985839/alfajores_config.json @@ -0,0 +1,40 @@ +{ + "environment": "staging", + "signers": { + "alfajores": { + "key": "", + "type": "hexKey" + }, + "kovan": { + "key": "", + "type": "hexKey" + } + }, + "replicas": { + "kovan": { + "address": "0x8dfc7c297D7c741fBf56c6eCB7411bE845496a44", + "domain": "3000", + "name": "kovan", + "rpcStyle": "ethereum", + "connection": { + "type": "http", + "url": "https://kovan.infura.io/v3/5c456d7844fa40a683e934df60534c60" + } + } + }, + "home": { + "address": "0x5318c7E6990B5a6C736A38005b6F6A47E792BEdA", + "domain": "1000", + "name": "alfajores", + "rpcStyle": "ethereum", + "connection": { + "type": "http", + "url": "https://alfajores-forno.celo-testnet.org" + } + }, + "tracing": { + "level": "debug", + "style": "json" + }, + "db": "db_path" +} \ No newline at end of file diff --git a/rust/config/1629224985839/alfajores_contracts.json b/rust/config/1629224985839/alfajores_contracts.json new file mode 100644 index 000000000..9d02c371f --- /dev/null +++ b/rust/config/1629224985839/alfajores_contracts.json @@ -0,0 +1,22 @@ +{ + "upgradeBeaconController": "0x60F1Ce14A1B3E22b34F465eA1C959ac68a1986a0", + "xAppConnectionManager": "0xc918FC29922a9f0Bc7747e2cE419BfB552b596e3", + "updaterManager": "0xB58483C5d5f37b1df9EcaF38Fc34Bd17304cDE65", + "governance": { + "implementation": "0xFF3Ab40F691175F5B03dECb4127b7a8f34Bd27e4", + "proxy": "0xF68c3693dfBADB770F37C97ecC4050454781E46f", + "beacon": "0xEe0d4Ed70b12474cd716DC06B525d7E91b6Ea5c2" + }, + "home": { + "implementation": "0xc68c453bC6680E7cf8d9aA643f12Ba480f70E50F", + "proxy": "0x5318c7E6990B5a6C736A38005b6F6A47E792BEdA", + "beacon": "0x82b044Ebc3a3c8565AbC4c52F15E9bC5f468Bd76" + }, + "replicas": { + "3000": { + "implementation": "0xB5A350Af966411E47C70632b8aEFEf0ebbe453a3", + "proxy": "0x87CCE757D064955df9bEf5e6b39C354C4013CbcE", + "beacon": "0x06f5E5d6Fe549F67C361AB4E56385ac6199d358E" + } + } +} \ No newline at end of file diff --git a/rust/config/1629224985839/alfajores_verification.json b/rust/config/1629224985839/alfajores_verification.json new file mode 100644 index 000000000..f5ad0b4c6 --- /dev/null +++ b/rust/config/1629224985839/alfajores_verification.json @@ -0,0 +1,80 @@ +[ + { + "name": "UpgradeBeaconController", + "address": "0x60F1Ce14A1B3E22b34F465eA1C959ac68a1986a0", + "constructorArguments": [] + }, + { + "name": "Contract Implementation", + "address": "0xc68c453bC6680E7cf8d9aA643f12Ba480f70E50F", + "constructorArguments": [ + 1000 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x82b044Ebc3a3c8565AbC4c52F15E9bC5f468Bd76", + "constructorArguments": [ + "0xc68c453bC6680E7cf8d9aA643f12Ba480f70E50F", + "0x60F1Ce14A1B3E22b34F465eA1C959ac68a1986a0" + ] + }, + { + "name": "Contract Proxy", + "address": "0x5318c7E6990B5a6C736A38005b6F6A47E792BEdA", + "constructorArguments": [ + "0x82b044Ebc3a3c8565AbC4c52F15E9bC5f468Bd76", + "0xc4d66de8000000000000000000000000b58483c5d5f37b1df9ecaf38fc34bd17304cde65" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0xFF3Ab40F691175F5B03dECb4127b7a8f34Bd27e4", + "constructorArguments": [ + 1000, + 1 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0xEe0d4Ed70b12474cd716DC06B525d7E91b6Ea5c2", + "constructorArguments": [ + "0xFF3Ab40F691175F5B03dECb4127b7a8f34Bd27e4", + "0x60F1Ce14A1B3E22b34F465eA1C959ac68a1986a0" + ] + }, + { + "name": "Contract Proxy", + "address": "0xF68c3693dfBADB770F37C97ecC4050454781E46f", + "constructorArguments": [ + "0xEe0d4Ed70b12474cd716DC06B525d7E91b6Ea5c2", + "0x485cc955000000000000000000000000c918fc29922a9f0bc7747e2ce419bfb552b596e300000000000000000000000024f6c874f56533d9a1422e85e5c7a806ed11c036" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0xB5A350Af966411E47C70632b8aEFEf0ebbe453a3", + "constructorArguments": [ + 1000 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x06f5E5d6Fe549F67C361AB4E56385ac6199d358E", + "constructorArguments": [ + "0xB5A350Af966411E47C70632b8aEFEf0ebbe453a3", + "0x60F1Ce14A1B3E22b34F465eA1C959ac68a1986a0" + ] + }, + { + "name": "Contract Proxy", + "address": "0x87CCE757D064955df9bEf5e6b39C354C4013CbcE", + "constructorArguments": [ + "0x06f5E5d6Fe549F67C361AB4E56385ac6199d358E", + "0xbf30a55d0000000000000000000000000000000000000000000000000000000000000bb8000000000000000000000000201dd86063dc251ca5a576d1b7365c38e5fb4cd50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000" + ], + "isProxy": true + } +] \ No newline at end of file diff --git a/rust/config/1629224985839/bridge/1629225192047/alfajores_contracts.json b/rust/config/1629224985839/bridge/1629225192047/alfajores_contracts.json new file mode 100644 index 000000000..18a2d718a --- /dev/null +++ b/rust/config/1629224985839/bridge/1629225192047/alfajores_contracts.json @@ -0,0 +1,12 @@ +{ + "bridgeRouter": { + "implementation": "0x6B22549490795d3531AA96bB0Dac7707b2B3C39B", + "proxy": "0xB5E9403494810E7eDB5bBc0c25d3f8E1C55C65A3", + "beacon": "0x25e5906f28c58c164E87B68021b36347397e4B47" + }, + "bridgeToken": { + "implementation": "0xdffdd22c6521f526FE2B18b29228A01EE60c5726", + "proxy": "0x1EBffCC38Cc0BE63Bde4fD6bbA8A67009f47619d", + "beacon": "0x9c8720172Ac3A34c6BC64667AD4942f36C32cd35" + } +} \ No newline at end of file diff --git a/rust/config/1629224985839/bridge/1629225192047/alfajores_verification.json b/rust/config/1629224985839/bridge/1629225192047/alfajores_verification.json new file mode 100644 index 000000000..4c0252fab --- /dev/null +++ b/rust/config/1629224985839/bridge/1629225192047/alfajores_verification.json @@ -0,0 +1,46 @@ +[ + { + "name": "Contract Implementation", + "address": "0xdffdd22c6521f526FE2B18b29228A01EE60c5726", + "constructorArguments": [] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x9c8720172Ac3A34c6BC64667AD4942f36C32cd35", + "constructorArguments": [ + "0xdffdd22c6521f526FE2B18b29228A01EE60c5726", + "0x60F1Ce14A1B3E22b34F465eA1C959ac68a1986a0" + ] + }, + { + "name": "Contract Proxy", + "address": "0x1EBffCC38Cc0BE63Bde4fD6bbA8A67009f47619d", + "constructorArguments": [ + "0x9c8720172Ac3A34c6BC64667AD4942f36C32cd35", + "0x" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0x6B22549490795d3531AA96bB0Dac7707b2B3C39B", + "constructorArguments": [] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x25e5906f28c58c164E87B68021b36347397e4B47", + "constructorArguments": [ + "0x6B22549490795d3531AA96bB0Dac7707b2B3C39B", + "0x60F1Ce14A1B3E22b34F465eA1C959ac68a1986a0" + ] + }, + { + "name": "Contract Proxy", + "address": "0xB5E9403494810E7eDB5bBc0c25d3f8E1C55C65A3", + "constructorArguments": [ + "0x25e5906f28c58c164E87B68021b36347397e4B47", + "0x485cc9550000000000000000000000009c8720172ac3a34c6bc64667ad4942f36c32cd35000000000000000000000000c918fc29922a9f0bc7747e2ce419bfb552b596e3" + ], + "isProxy": true + } +] \ No newline at end of file diff --git a/rust/config/1629224985839/bridge/1629225192047/kovan_contracts.json b/rust/config/1629224985839/bridge/1629225192047/kovan_contracts.json new file mode 100644 index 000000000..2340036c9 --- /dev/null +++ b/rust/config/1629224985839/bridge/1629225192047/kovan_contracts.json @@ -0,0 +1,13 @@ +{ + "bridgeRouter": { + "implementation": "0x244e128BbABCbF9936915C9d69F582e3DeFD4A96", + "proxy": "0xac77f65BBAd8C55E589fBEBFF68bE29A2BDec3D1", + "beacon": "0x4b9b8A389475146A62a6bE669408B7E45F75c13E" + }, + "bridgeToken": { + "implementation": "0xA85971b0d20F771dADD86bAe26F1C4b8D8Cb7663", + "proxy": "0xe25E0a9dBf89E3278f06cA573e252270cdbB78fC", + "beacon": "0x19653A25D654547b1c57E19c17e2FbD0B636f986" + }, + "ethHelper": "0x6290856456A9AC5196CA96adcB9615dd1a8a7eFD" +} \ No newline at end of file diff --git a/rust/config/1629224985839/bridge/1629225192047/kovan_verification.json b/rust/config/1629224985839/bridge/1629225192047/kovan_verification.json new file mode 100644 index 000000000..1af9552ca --- /dev/null +++ b/rust/config/1629224985839/bridge/1629225192047/kovan_verification.json @@ -0,0 +1,54 @@ +[ + { + "name": "Contract Implementation", + "address": "0xA85971b0d20F771dADD86bAe26F1C4b8D8Cb7663", + "constructorArguments": [] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x19653A25D654547b1c57E19c17e2FbD0B636f986", + "constructorArguments": [ + "0xA85971b0d20F771dADD86bAe26F1C4b8D8Cb7663", + "0x646C628334ffAffdaA60200010D3425fbE289295" + ] + }, + { + "name": "Contract Proxy", + "address": "0xe25E0a9dBf89E3278f06cA573e252270cdbB78fC", + "constructorArguments": [ + "0x19653A25D654547b1c57E19c17e2FbD0B636f986", + "0x" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0x244e128BbABCbF9936915C9d69F582e3DeFD4A96", + "constructorArguments": [] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x4b9b8A389475146A62a6bE669408B7E45F75c13E", + "constructorArguments": [ + "0x244e128BbABCbF9936915C9d69F582e3DeFD4A96", + "0x646C628334ffAffdaA60200010D3425fbE289295" + ] + }, + { + "name": "Contract Proxy", + "address": "0xac77f65BBAd8C55E589fBEBFF68bE29A2BDec3D1", + "constructorArguments": [ + "0x4b9b8A389475146A62a6bE669408B7E45F75c13E", + "0x485cc95500000000000000000000000019653a25d654547b1c57e19c17e2fbd0b636f9860000000000000000000000000977a93022b364f3aa075c1d8565d77945b89512" + ], + "isProxy": true + }, + { + "name": "ETH Helper", + "address": "0x6290856456A9AC5196CA96adcB9615dd1a8a7eFD", + "constructorArguments": [ + "0xd0a1e359811322d97991e03f863a0c30c2cf029c", + "0xac77f65BBAd8C55E589fBEBFF68bE29A2BDec3D1" + ] + } +] \ No newline at end of file diff --git a/rust/config/1629224985839/kathy-partial.json b/rust/config/1629224985839/kathy-partial.json new file mode 100644 index 000000000..46988a832 --- /dev/null +++ b/rust/config/1629224985839/kathy-partial.json @@ -0,0 +1,8 @@ +{ + "messageInterval": "100", + "chat": { + "message": "static message", + "recipient": "0xabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd", + "type": "static" + } +} diff --git a/rust/config/1629224985839/kovan_config.json b/rust/config/1629224985839/kovan_config.json new file mode 100644 index 000000000..a6c0a961e --- /dev/null +++ b/rust/config/1629224985839/kovan_config.json @@ -0,0 +1,40 @@ +{ + "environment": "staging", + "signers": { + "kovan": { + "key": "", + "type": "hexKey" + }, + "alfajores": { + "key": "", + "type": "hexKey" + } + }, + "replicas": { + "alfajores": { + "address": "0x87CCE757D064955df9bEf5e6b39C354C4013CbcE", + "domain": "1000", + "name": "alfajores", + "rpcStyle": "ethereum", + "connection": { + "type": "http", + "url": "https://alfajores-forno.celo-testnet.org" + } + } + }, + "home": { + "address": "0x6A4a9519e26B1147bd1e0a75c4fbb8B98A203F5F", + "domain": "3000", + "name": "kovan", + "rpcStyle": "ethereum", + "connection": { + "type": "http", + "url": "https://kovan.infura.io/v3/5c456d7844fa40a683e934df60534c60" + } + }, + "tracing": { + "level": "debug", + "style": "json" + }, + "db": "db_path" +} \ No newline at end of file diff --git a/rust/config/1629224985839/kovan_contracts.json b/rust/config/1629224985839/kovan_contracts.json new file mode 100644 index 000000000..7ff939bd7 --- /dev/null +++ b/rust/config/1629224985839/kovan_contracts.json @@ -0,0 +1,22 @@ +{ + "upgradeBeaconController": "0x646C628334ffAffdaA60200010D3425fbE289295", + "xAppConnectionManager": "0x0977a93022B364f3aa075c1D8565D77945B89512", + "updaterManager": "0x07C40b25A449eBc8bccB5514314f10e76fD3C423", + "governance": { + "implementation": "0x081BD4235407b25E58C56AE36A922B74A6b178E7", + "proxy": "0x4218F6fAEb1c88786a2023929bB61C46D8a5D6B6", + "beacon": "0x21F52b14E27fe77b001D505838dDbA2275473689" + }, + "home": { + "implementation": "0xB5c65cC3058997d3e2E29195c4386E7DB2774237", + "proxy": "0x6A4a9519e26B1147bd1e0a75c4fbb8B98A203F5F", + "beacon": "0x9b3774125fe37aD434D0931D766B3886d4D91463" + }, + "replicas": { + "1000": { + "implementation": "0xBf7E62b1C0FCDb5E8c2E99EEA268F1832CB0B864", + "proxy": "0x8dfc7c297D7c741fBf56c6eCB7411bE845496a44", + "beacon": "0xa078AeD7fF29c125F42d65ADB26d6A47F4919a80" + } + } +} \ No newline at end of file diff --git a/rust/config/1629224985839/kovan_verification.json b/rust/config/1629224985839/kovan_verification.json new file mode 100644 index 000000000..ae2871266 --- /dev/null +++ b/rust/config/1629224985839/kovan_verification.json @@ -0,0 +1,80 @@ +[ + { + "name": "UpgradeBeaconController", + "address": "0x646C628334ffAffdaA60200010D3425fbE289295", + "constructorArguments": [] + }, + { + "name": "Contract Implementation", + "address": "0xB5c65cC3058997d3e2E29195c4386E7DB2774237", + "constructorArguments": [ + 3000 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x9b3774125fe37aD434D0931D766B3886d4D91463", + "constructorArguments": [ + "0xB5c65cC3058997d3e2E29195c4386E7DB2774237", + "0x646C628334ffAffdaA60200010D3425fbE289295" + ] + }, + { + "name": "Contract Proxy", + "address": "0x6A4a9519e26B1147bd1e0a75c4fbb8B98A203F5F", + "constructorArguments": [ + "0x9b3774125fe37aD434D0931D766B3886d4D91463", + "0xc4d66de800000000000000000000000007c40b25a449ebc8bccb5514314f10e76fd3c423" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0x081BD4235407b25E58C56AE36A922B74A6b178E7", + "constructorArguments": [ + 3000, + 1 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x21F52b14E27fe77b001D505838dDbA2275473689", + "constructorArguments": [ + "0x081BD4235407b25E58C56AE36A922B74A6b178E7", + "0x646C628334ffAffdaA60200010D3425fbE289295" + ] + }, + { + "name": "Contract Proxy", + "address": "0x4218F6fAEb1c88786a2023929bB61C46D8a5D6B6", + "constructorArguments": [ + "0x21F52b14E27fe77b001D505838dDbA2275473689", + "0x485cc9550000000000000000000000000977a93022b364f3aa075c1d8565d77945b8951200000000000000000000000024f6c874f56533d9a1422e85e5c7a806ed11c036" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0xBf7E62b1C0FCDb5E8c2E99EEA268F1832CB0B864", + "constructorArguments": [ + 3000 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0xa078AeD7fF29c125F42d65ADB26d6A47F4919a80", + "constructorArguments": [ + "0xBf7E62b1C0FCDb5E8c2E99EEA268F1832CB0B864", + "0x646C628334ffAffdaA60200010D3425fbE289295" + ] + }, + { + "name": "Contract Proxy", + "address": "0x8dfc7c297D7c741fBf56c6eCB7411bE845496a44", + "constructorArguments": [ + "0xa078AeD7fF29c125F42d65ADB26d6A47F4919a80", + "0xbf30a55d00000000000000000000000000000000000000000000000000000000000003e8000000000000000000000000201dd86063dc251ca5a576d1b7365c38e5fb4cd50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000" + ], + "isProxy": true + } +] \ No newline at end of file diff --git a/rust/config/1629224985839/processor-partial.json b/rust/config/1629224985839/processor-partial.json new file mode 100644 index 000000000..3cbe62b80 --- /dev/null +++ b/rust/config/1629224985839/processor-partial.json @@ -0,0 +1,3 @@ +{ + "pollingInterval": "10" +} diff --git a/rust/config/1629224985839/relayer-partial.json b/rust/config/1629224985839/relayer-partial.json new file mode 100644 index 000000000..3cbe62b80 --- /dev/null +++ b/rust/config/1629224985839/relayer-partial.json @@ -0,0 +1,3 @@ +{ + "pollingInterval": "10" +} diff --git a/rust/config/1629224985839/updater-partial.json b/rust/config/1629224985839/updater-partial.json new file mode 100644 index 000000000..a9d6f75a7 --- /dev/null +++ b/rust/config/1629224985839/updater-partial.json @@ -0,0 +1,8 @@ +{ + "pollingInterval": "5", + "updatePause": "15", + "updater": { + "key": "", + "type": "hexKey" + } +} diff --git a/rust/config/1629224985839/watcher-partial.json b/rust/config/1629224985839/watcher-partial.json new file mode 100644 index 000000000..b24e3d361 --- /dev/null +++ b/rust/config/1629224985839/watcher-partial.json @@ -0,0 +1,33 @@ +{ + "pollingInterval": "100", + "watcher": { + "key": "", + "type": "hexKey" + }, + "connectionManagers": [ + { + "address": "0x0000000000000000000000000000000000000000", + "domain": "60", + "name": "ethereum", + "rpcStyle": "ethereum", + "config": { + "connection": { + "type": "ws", + "url": "ws://localhost:8545" + } + } + }, + { + "address": "0x0000000000000000000000000000000000000000", + "domain": "61", + "name": "eth-classic", + "rpcStyle": "ethereum", + "config": { + "connection": { + "type": "ws", + "url": "ws://localhost:8545" + } + } + } + ] +} diff --git a/rust/config/1629226112796/alfajores_config.json b/rust/config/1629226112796/alfajores_config.json new file mode 100644 index 000000000..45ec50d68 --- /dev/null +++ b/rust/config/1629226112796/alfajores_config.json @@ -0,0 +1,40 @@ +{ + "environment": "dev", + "signers": { + "alfajores": { + "key": "", + "type": "hexKey" + }, + "kovan": { + "key": "", + "type": "hexKey" + } + }, + "replicas": { + "kovan": { + "address": "0xc60F9577Bb163Be3771CfE186f82b317361DD799", + "domain": "3000", + "name": "kovan", + "rpcStyle": "ethereum", + "connection": { + "type": "http", + "url": "https://kovan.infura.io/v3/5c456d7844fa40a683e934df60534c60" + } + } + }, + "home": { + "address": "0xB5E30e87E0FF301e425af93f935395c23Fb36feC", + "domain": "1000", + "name": "alfajores", + "rpcStyle": "ethereum", + "connection": { + "type": "http", + "url": "https://alfajores-forno.celo-testnet.org" + } + }, + "tracing": { + "level": "debug", + "style": "json" + }, + "db": "db_path" +} \ No newline at end of file diff --git a/rust/config/1629226112796/alfajores_contracts.json b/rust/config/1629226112796/alfajores_contracts.json new file mode 100644 index 000000000..b450915a1 --- /dev/null +++ b/rust/config/1629226112796/alfajores_contracts.json @@ -0,0 +1,22 @@ +{ + "upgradeBeaconController": "0xe198b172Bb9808Cc1F7Ce826C74FD1569b098AE5", + "xAppConnectionManager": "0x9E99cEAD24E55521679Ef2395FfaA2e89a455428", + "updaterManager": "0xA08891b115F9671dd2F8719648e16850ce6f0027", + "governance": { + "implementation": "0xd4a44afA30daD6f8216a7666e294a056b281654a", + "proxy": "0xa20241671EdCbFe8257a92A076d5a8e571e3d0F3", + "beacon": "0x8c6805450a9E37FB081285C3D3fC4daF0F7ED182" + }, + "home": { + "implementation": "0xb389fb3F838D16316Cc9928e79ede19c80cA6aB1", + "proxy": "0xB5E30e87E0FF301e425af93f935395c23Fb36feC", + "beacon": "0x77956661f8350b17A1b75A18788377db4d710e5d" + }, + "replicas": { + "3000": { + "implementation": "0xc27c49088C3564d8C9455821f527102107D7f1D7", + "proxy": "0x0DB2666B2D68fE0F34882838f7Fd7fcD28AbC59d", + "beacon": "0xbee30c1A4CA2C80a8A519912e2b4e3940D268800" + } + } +} \ No newline at end of file diff --git a/rust/config/1629226112796/alfajores_verification.json b/rust/config/1629226112796/alfajores_verification.json new file mode 100644 index 000000000..c5719a398 --- /dev/null +++ b/rust/config/1629226112796/alfajores_verification.json @@ -0,0 +1,80 @@ +[ + { + "name": "UpgradeBeaconController", + "address": "0xe198b172Bb9808Cc1F7Ce826C74FD1569b098AE5", + "constructorArguments": [] + }, + { + "name": "Contract Implementation", + "address": "0xb389fb3F838D16316Cc9928e79ede19c80cA6aB1", + "constructorArguments": [ + 1000 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x77956661f8350b17A1b75A18788377db4d710e5d", + "constructorArguments": [ + "0xb389fb3F838D16316Cc9928e79ede19c80cA6aB1", + "0xe198b172Bb9808Cc1F7Ce826C74FD1569b098AE5" + ] + }, + { + "name": "Contract Proxy", + "address": "0xB5E30e87E0FF301e425af93f935395c23Fb36feC", + "constructorArguments": [ + "0x77956661f8350b17A1b75A18788377db4d710e5d", + "0xc4d66de8000000000000000000000000a08891b115f9671dd2f8719648e16850ce6f0027" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0xd4a44afA30daD6f8216a7666e294a056b281654a", + "constructorArguments": [ + 1000, + 1 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x8c6805450a9E37FB081285C3D3fC4daF0F7ED182", + "constructorArguments": [ + "0xd4a44afA30daD6f8216a7666e294a056b281654a", + "0xe198b172Bb9808Cc1F7Ce826C74FD1569b098AE5" + ] + }, + { + "name": "Contract Proxy", + "address": "0xa20241671EdCbFe8257a92A076d5a8e571e3d0F3", + "constructorArguments": [ + "0x8c6805450a9E37FB081285C3D3fC4daF0F7ED182", + "0x485cc9550000000000000000000000009e99cead24e55521679ef2395ffaa2e89a45542800000000000000000000000024f6c874f56533d9a1422e85e5c7a806ed11c036" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0xc27c49088C3564d8C9455821f527102107D7f1D7", + "constructorArguments": [ + 1000 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0xbee30c1A4CA2C80a8A519912e2b4e3940D268800", + "constructorArguments": [ + "0xc27c49088C3564d8C9455821f527102107D7f1D7", + "0xe198b172Bb9808Cc1F7Ce826C74FD1569b098AE5" + ] + }, + { + "name": "Contract Proxy", + "address": "0x0DB2666B2D68fE0F34882838f7Fd7fcD28AbC59d", + "constructorArguments": [ + "0xbee30c1A4CA2C80a8A519912e2b4e3940D268800", + "0xbf30a55d0000000000000000000000000000000000000000000000000000000000000bb80000000000000000000000004177372fd9581ceb2367e0ce84adc5dad9df8d550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000" + ], + "isProxy": true + } +] \ No newline at end of file diff --git a/rust/config/1629226112796/bridge/1629226303243/alfajores_contracts.json b/rust/config/1629226112796/bridge/1629226303243/alfajores_contracts.json new file mode 100644 index 000000000..291296099 --- /dev/null +++ b/rust/config/1629226112796/bridge/1629226303243/alfajores_contracts.json @@ -0,0 +1,12 @@ +{ + "bridgeRouter": { + "implementation": "0xE37d1AeE95ab0B9CC7a977595c8D78fcFFC2b491", + "proxy": "0x66469b28B0D281474Bb83CE008BD8161d819CB14", + "beacon": "0x7eC1bE74432dca936c78A24d1F7052aE11b84a1D" + }, + "bridgeToken": { + "implementation": "0x12B41677a50779C8b494051dd7F3022Fd234D549", + "proxy": "0x8D5F3DFE6Cdc0e2a4662A8d84785DD14912a262D", + "beacon": "0x272E101c87F33ea39aD36cfC6c83Ecd57D3715Bc" + } +} \ No newline at end of file diff --git a/rust/config/1629226112796/bridge/1629226303243/alfajores_verification.json b/rust/config/1629226112796/bridge/1629226303243/alfajores_verification.json new file mode 100644 index 000000000..4323e3c72 --- /dev/null +++ b/rust/config/1629226112796/bridge/1629226303243/alfajores_verification.json @@ -0,0 +1,46 @@ +[ + { + "name": "Contract Implementation", + "address": "0x12B41677a50779C8b494051dd7F3022Fd234D549", + "constructorArguments": [] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x272E101c87F33ea39aD36cfC6c83Ecd57D3715Bc", + "constructorArguments": [ + "0x12B41677a50779C8b494051dd7F3022Fd234D549", + "0xe198b172Bb9808Cc1F7Ce826C74FD1569b098AE5" + ] + }, + { + "name": "Contract Proxy", + "address": "0x8D5F3DFE6Cdc0e2a4662A8d84785DD14912a262D", + "constructorArguments": [ + "0x272E101c87F33ea39aD36cfC6c83Ecd57D3715Bc", + "0x" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0xE37d1AeE95ab0B9CC7a977595c8D78fcFFC2b491", + "constructorArguments": [] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x7eC1bE74432dca936c78A24d1F7052aE11b84a1D", + "constructorArguments": [ + "0xE37d1AeE95ab0B9CC7a977595c8D78fcFFC2b491", + "0xe198b172Bb9808Cc1F7Ce826C74FD1569b098AE5" + ] + }, + { + "name": "Contract Proxy", + "address": "0x66469b28B0D281474Bb83CE008BD8161d819CB14", + "constructorArguments": [ + "0x7eC1bE74432dca936c78A24d1F7052aE11b84a1D", + "0x485cc955000000000000000000000000272e101c87f33ea39ad36cfc6c83ecd57d3715bc0000000000000000000000009e99cead24e55521679ef2395ffaa2e89a455428" + ], + "isProxy": true + } +] \ No newline at end of file diff --git a/rust/config/1629226112796/bridge/1629226303243/kovan_contracts.json b/rust/config/1629226112796/bridge/1629226303243/kovan_contracts.json new file mode 100644 index 000000000..bbd42bd36 --- /dev/null +++ b/rust/config/1629226112796/bridge/1629226303243/kovan_contracts.json @@ -0,0 +1,13 @@ +{ + "bridgeRouter": { + "implementation": "0x100095E6355665367D08542cAB8Ca9d7A38F23e1", + "proxy": "0x722fa0b52980D53abBB232eAaE603DdD7459a730", + "beacon": "0x1beeB003006b6Da59c757Cf7c155Bd30cBA68f92" + }, + "bridgeToken": { + "implementation": "0xBaB58A8abE7bD937da2567e61d0bC08fD72b4208", + "proxy": "0x8042214873d7f697200cc9BdA8054Cf8e7fCf28F", + "beacon": "0xc63e0e2Db5A568Fa86416eF1573815f7d644FDE3" + }, + "ethHelper": "0x47fBbAF6A46a3408207c2B959682b36075B00eF9" +} \ No newline at end of file diff --git a/rust/config/1629226112796/bridge/1629226303243/kovan_verification.json b/rust/config/1629226112796/bridge/1629226303243/kovan_verification.json new file mode 100644 index 000000000..51ecb80d3 --- /dev/null +++ b/rust/config/1629226112796/bridge/1629226303243/kovan_verification.json @@ -0,0 +1,54 @@ +[ + { + "name": "Contract Implementation", + "address": "0xBaB58A8abE7bD937da2567e61d0bC08fD72b4208", + "constructorArguments": [] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0xc63e0e2Db5A568Fa86416eF1573815f7d644FDE3", + "constructorArguments": [ + "0xBaB58A8abE7bD937da2567e61d0bC08fD72b4208", + "0x75fc38B7C761fD7739B36726F52E386D4859277A" + ] + }, + { + "name": "Contract Proxy", + "address": "0x8042214873d7f697200cc9BdA8054Cf8e7fCf28F", + "constructorArguments": [ + "0xc63e0e2Db5A568Fa86416eF1573815f7d644FDE3", + "0x" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0x100095E6355665367D08542cAB8Ca9d7A38F23e1", + "constructorArguments": [] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x1beeB003006b6Da59c757Cf7c155Bd30cBA68f92", + "constructorArguments": [ + "0x100095E6355665367D08542cAB8Ca9d7A38F23e1", + "0x75fc38B7C761fD7739B36726F52E386D4859277A" + ] + }, + { + "name": "Contract Proxy", + "address": "0x722fa0b52980D53abBB232eAaE603DdD7459a730", + "constructorArguments": [ + "0x1beeB003006b6Da59c757Cf7c155Bd30cBA68f92", + "0x485cc955000000000000000000000000c63e0e2db5a568fa86416ef1573815f7d644fde30000000000000000000000004581650881ced1a0837d5233a4724af432be9232" + ], + "isProxy": true + }, + { + "name": "ETH Helper", + "address": "0x47fBbAF6A46a3408207c2B959682b36075B00eF9", + "constructorArguments": [ + "0xd0a1e359811322d97991e03f863a0c30c2cf029c", + "0x722fa0b52980D53abBB232eAaE603DdD7459a730" + ] + } +] \ No newline at end of file diff --git a/rust/config/1629226112796/kathy-partial.json b/rust/config/1629226112796/kathy-partial.json new file mode 100644 index 000000000..46988a832 --- /dev/null +++ b/rust/config/1629226112796/kathy-partial.json @@ -0,0 +1,8 @@ +{ + "messageInterval": "100", + "chat": { + "message": "static message", + "recipient": "0xabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd", + "type": "static" + } +} diff --git a/rust/config/1629226112796/kovan_config.json b/rust/config/1629226112796/kovan_config.json new file mode 100644 index 000000000..7b346cf0d --- /dev/null +++ b/rust/config/1629226112796/kovan_config.json @@ -0,0 +1,40 @@ +{ + "environment": "dev", + "signers": { + "kovan": { + "key": "", + "type": "hexKey" + }, + "alfajores": { + "key": "", + "type": "hexKey" + } + }, + "replicas": { + "alfajores": { + "address": "0x0DB2666B2D68fE0F34882838f7Fd7fcD28AbC59d", + "domain": "1000", + "name": "alfajores", + "rpcStyle": "ethereum", + "connection": { + "type": "http", + "url": "https://alfajores-forno.celo-testnet.org" + } + } + }, + "home": { + "address": "0x205267D4DA25ef1c6079A2B9B20ce45C5Ae357D7", + "domain": "3000", + "name": "kovan", + "rpcStyle": "ethereum", + "connection": { + "type": "http", + "url": "https://kovan.infura.io/v3/5c456d7844fa40a683e934df60534c60" + } + }, + "tracing": { + "level": "debug", + "style": "json" + }, + "db": "db_path" +} \ No newline at end of file diff --git a/rust/config/1629226112796/kovan_contracts.json b/rust/config/1629226112796/kovan_contracts.json new file mode 100644 index 000000000..67ebbe0d3 --- /dev/null +++ b/rust/config/1629226112796/kovan_contracts.json @@ -0,0 +1,22 @@ +{ + "upgradeBeaconController": "0x75fc38B7C761fD7739B36726F52E386D4859277A", + "xAppConnectionManager": "0x4581650881CeD1A0837d5233a4724Af432bE9232", + "updaterManager": "0x98d8ed1014698e3366a43Ae3Bb9A1d062f3a2Ba2", + "governance": { + "implementation": "0x6a35A97983Ab7649a636DC3a028707EDad165Bd2", + "proxy": "0x6C6cDd8D8Aa29b9213d7f9A93D7cB533Cf02C8cE", + "beacon": "0xDb919fFB32E538e539d42E9f7a19837478BFaF23" + }, + "home": { + "implementation": "0x845479edF9D00fF9BAbCB750e7952f08Ec9d0604", + "proxy": "0x205267D4DA25ef1c6079A2B9B20ce45C5Ae357D7", + "beacon": "0x3A5b2661a6b1a77c7480b93Bd3df952d073e7e1b" + }, + "replicas": { + "1000": { + "implementation": "0xf698959Ec6a1881521F6F8e732444C4E3Bf05d19", + "proxy": "0xc60F9577Bb163Be3771CfE186f82b317361DD799", + "beacon": "0x610Fd513c9cFC6d0780eDA33901441aCe0Fc83BB" + } + } +} \ No newline at end of file diff --git a/rust/config/1629226112796/kovan_verification.json b/rust/config/1629226112796/kovan_verification.json new file mode 100644 index 000000000..493d5af56 --- /dev/null +++ b/rust/config/1629226112796/kovan_verification.json @@ -0,0 +1,80 @@ +[ + { + "name": "UpgradeBeaconController", + "address": "0x75fc38B7C761fD7739B36726F52E386D4859277A", + "constructorArguments": [] + }, + { + "name": "Contract Implementation", + "address": "0x845479edF9D00fF9BAbCB750e7952f08Ec9d0604", + "constructorArguments": [ + 3000 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x3A5b2661a6b1a77c7480b93Bd3df952d073e7e1b", + "constructorArguments": [ + "0x845479edF9D00fF9BAbCB750e7952f08Ec9d0604", + "0x75fc38B7C761fD7739B36726F52E386D4859277A" + ] + }, + { + "name": "Contract Proxy", + "address": "0x205267D4DA25ef1c6079A2B9B20ce45C5Ae357D7", + "constructorArguments": [ + "0x3A5b2661a6b1a77c7480b93Bd3df952d073e7e1b", + "0xc4d66de800000000000000000000000098d8ed1014698e3366a43ae3bb9a1d062f3a2ba2" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0x6a35A97983Ab7649a636DC3a028707EDad165Bd2", + "constructorArguments": [ + 3000, + 1 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0xDb919fFB32E538e539d42E9f7a19837478BFaF23", + "constructorArguments": [ + "0x6a35A97983Ab7649a636DC3a028707EDad165Bd2", + "0x75fc38B7C761fD7739B36726F52E386D4859277A" + ] + }, + { + "name": "Contract Proxy", + "address": "0x6C6cDd8D8Aa29b9213d7f9A93D7cB533Cf02C8cE", + "constructorArguments": [ + "0xDb919fFB32E538e539d42E9f7a19837478BFaF23", + "0x485cc9550000000000000000000000004581650881ced1a0837d5233a4724af432be923200000000000000000000000024f6c874f56533d9a1422e85e5c7a806ed11c036" + ], + "isProxy": true + }, + { + "name": "Contract Implementation", + "address": "0xf698959Ec6a1881521F6F8e732444C4E3Bf05d19", + "constructorArguments": [ + 3000 + ] + }, + { + "name": "Contract UpgradeBeacon", + "address": "0x610Fd513c9cFC6d0780eDA33901441aCe0Fc83BB", + "constructorArguments": [ + "0xf698959Ec6a1881521F6F8e732444C4E3Bf05d19", + "0x75fc38B7C761fD7739B36726F52E386D4859277A" + ] + }, + { + "name": "Contract Proxy", + "address": "0xc60F9577Bb163Be3771CfE186f82b317361DD799", + "constructorArguments": [ + "0x610Fd513c9cFC6d0780eDA33901441aCe0Fc83BB", + "0xbf30a55d00000000000000000000000000000000000000000000000000000000000003e80000000000000000000000004177372fd9581ceb2367e0ce84adc5dad9df8d550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000" + ], + "isProxy": true + } +] \ No newline at end of file diff --git a/rust/config/1629226112796/processor-partial.json b/rust/config/1629226112796/processor-partial.json new file mode 100644 index 000000000..3cbe62b80 --- /dev/null +++ b/rust/config/1629226112796/processor-partial.json @@ -0,0 +1,3 @@ +{ + "pollingInterval": "10" +} diff --git a/rust/config/1629226112796/relayer-partial.json b/rust/config/1629226112796/relayer-partial.json new file mode 100644 index 000000000..3cbe62b80 --- /dev/null +++ b/rust/config/1629226112796/relayer-partial.json @@ -0,0 +1,3 @@ +{ + "pollingInterval": "10" +} diff --git a/rust/config/1629226112796/updater-partial.json b/rust/config/1629226112796/updater-partial.json new file mode 100644 index 000000000..a9d6f75a7 --- /dev/null +++ b/rust/config/1629226112796/updater-partial.json @@ -0,0 +1,8 @@ +{ + "pollingInterval": "5", + "updatePause": "15", + "updater": { + "key": "", + "type": "hexKey" + } +} diff --git a/rust/config/1629226112796/watcher-partial.json b/rust/config/1629226112796/watcher-partial.json new file mode 100644 index 000000000..b24e3d361 --- /dev/null +++ b/rust/config/1629226112796/watcher-partial.json @@ -0,0 +1,33 @@ +{ + "pollingInterval": "100", + "watcher": { + "key": "", + "type": "hexKey" + }, + "connectionManagers": [ + { + "address": "0x0000000000000000000000000000000000000000", + "domain": "60", + "name": "ethereum", + "rpcStyle": "ethereum", + "config": { + "connection": { + "type": "ws", + "url": "ws://localhost:8545" + } + } + }, + { + "address": "0x0000000000000000000000000000000000000000", + "domain": "61", + "name": "eth-classic", + "rpcStyle": "ethereum", + "config": { + "connection": { + "type": "ws", + "url": "ws://localhost:8545" + } + } + } + ] +} diff --git a/typescript/optics-deploy/src/chain.ts b/typescript/optics-deploy/src/chain.ts index d72e4b3f0..94a4d9dc9 100644 --- a/typescript/optics-deploy/src/chain.ts +++ b/typescript/optics-deploy/src/chain.ts @@ -79,6 +79,7 @@ export type RustContractBlock = { }; export type RustConfig = { + environment: string; signers: Record; replicas: Record; home: RustContractBlock; diff --git a/typescript/optics-deploy/src/core/CoreDeploy.ts b/typescript/optics-deploy/src/core/CoreDeploy.ts index 63bc98f4e..de924f12f 100644 --- a/typescript/optics-deploy/src/core/CoreDeploy.ts +++ b/typescript/optics-deploy/src/core/CoreDeploy.ts @@ -73,6 +73,7 @@ export class CoreDeploy extends Deploy { }; const rustConfig: RustConfig = { + environment: local.config.environment, signers: { [home.name]: { key: '', type: 'hexKey' }, }, diff --git a/typescript/optics-deploy/src/core/index.ts b/typescript/optics-deploy/src/core/index.ts index 4b0823f77..1da34168a 100644 --- a/typescript/optics-deploy/src/core/index.ts +++ b/typescript/optics-deploy/src/core/index.ts @@ -469,6 +469,12 @@ export async function transferGovernorship(gov: CoreDeploy, non: CoreDeploy) { * @param non - The non-governor chain deploy instance */ export async function deployTwoChains(gov: CoreDeploy, non: CoreDeploy) { + console.log('Beginning Two Chain deploy process'); + console.log(`Deploy env is ${gov.config.environment}`); + console.log(`${gov.chain.name} is governing`); + console.log(`Updater for ${gov.chain.name} Home is ${gov.config.updater}`); + console.log(`Updater for ${gov.chain.name} Home is ${non.config.updater}`); + const isTestDeploy: boolean = gov.test || non.test; await Promise.all([deployOptics(gov), deployOptics(non)]); @@ -537,14 +543,23 @@ export async function deployHubAndSpokes( * * @dev The first chain in the sequence will be the governing chain * - * @param chains - An array of chain deploys + * @param deploys - An array of chain deploys */ -export async function deployNChains(chains: CoreDeploy[]) { +export async function deployNChains(deploys: CoreDeploy[]) { + console.log(`Beginning ${deploys.length} Chain deploy process`); + console.log(`Deploy env is ${deploys[0].config.environment}`); + console.log(`${deploys[0].chain.name} is governing`); + deploys.forEach((deploy) => { + console.log( + `Updater for ${deploy.chain.name} Home is ${deploy.config.updater}`, + ); + }); + // there exists any chain marked test - const isTestDeploy: boolean = chains.filter((c) => c.test).length > 0; + const isTestDeploy: boolean = deploys.filter((c) => c.test).length > 0; + const govChain = deploys[0]; + const nonGovChains = deploys.slice(1); - const govChain = chains[0]; - const nonGovChains = chains.slice(1); await deployHubAndSpokes(govChain, nonGovChains); for (let local of nonGovChains) { for (let remote of nonGovChains) { @@ -559,7 +574,7 @@ export async function deployNChains(chains: CoreDeploy[]) { } if (!isTestDeploy) { - writeDeployOutput(chains); + writeDeployOutput(deploys); } } diff --git a/typescript/typechain/optics-xapps/UpgradeBeacon.d.ts b/typescript/typechain/optics-xapps/UpgradeBeacon.d.ts deleted file mode 100644 index bf3f2fb03..000000000 --- a/typescript/typechain/optics-xapps/UpgradeBeacon.d.ts +++ /dev/null @@ -1,86 +0,0 @@ -/* Autogenerated file. Do not edit manually. */ -/* tslint:disable */ -/* eslint-disable */ - -import { - ethers, - EventFilter, - Signer, - BigNumber, - BigNumberish, - PopulatedTransaction, - BaseContract, - ContractTransaction, -} from "ethers"; -import { BytesLike } from "@ethersproject/bytes"; -import { Listener, Provider } from "@ethersproject/providers"; -import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi"; -import { TypedEventFilter, TypedEvent, TypedListener } from "./commons"; - -interface UpgradeBeaconInterface extends ethers.utils.Interface { - functions: {}; - - events: { - "Upgrade(address)": EventFragment; - }; - - getEvent(nameOrSignatureOrTopic: "Upgrade"): EventFragment; -} - -export class UpgradeBeacon extends BaseContract { - connect(signerOrProvider: Signer | Provider | string): this; - attach(addressOrName: string): this; - deployed(): Promise; - - listeners, EventArgsObject>( - eventFilter?: TypedEventFilter - ): Array>; - off, EventArgsObject>( - eventFilter: TypedEventFilter, - listener: TypedListener - ): this; - on, EventArgsObject>( - eventFilter: TypedEventFilter, - listener: TypedListener - ): this; - once, EventArgsObject>( - eventFilter: TypedEventFilter, - listener: TypedListener - ): this; - removeListener, EventArgsObject>( - eventFilter: TypedEventFilter, - listener: TypedListener - ): this; - removeAllListeners, EventArgsObject>( - eventFilter: TypedEventFilter - ): this; - - listeners(eventName?: string): Array; - off(eventName: string, listener: Listener): this; - on(eventName: string, listener: Listener): this; - once(eventName: string, listener: Listener): this; - removeListener(eventName: string, listener: Listener): this; - removeAllListeners(eventName?: string): this; - - queryFilter, EventArgsObject>( - event: TypedEventFilter, - fromBlockOrBlockhash?: string | number | undefined, - toBlock?: string | number | undefined - ): Promise>>; - - interface: UpgradeBeaconInterface; - - functions: {}; - - callStatic: {}; - - filters: { - Upgrade( - implementation?: string | null - ): TypedEventFilter<[string], { implementation: string }>; - }; - - estimateGas: {}; - - populateTransaction: {}; -} diff --git a/typescript/typechain/optics-xapps/factories/UpgradeBeacon__factory.ts b/typescript/typechain/optics-xapps/factories/UpgradeBeacon__factory.ts deleted file mode 100644 index 04b7d9f31..000000000 --- a/typescript/typechain/optics-xapps/factories/UpgradeBeacon__factory.ts +++ /dev/null @@ -1,98 +0,0 @@ -/* Autogenerated file. Do not edit manually. */ -/* tslint:disable */ -/* eslint-disable */ - -import { - Signer, - utils, - Contract, - ContractFactory, - PayableOverrides, -} from "ethers"; -import { Provider, TransactionRequest } from "@ethersproject/providers"; -import type { UpgradeBeacon, UpgradeBeaconInterface } from "../UpgradeBeacon"; - -const _abi = [ - { - inputs: [ - { - internalType: "address", - name: "_initialImplementation", - type: "address", - }, - { - internalType: "address", - name: "_controller", - type: "address", - }, - ], - stateMutability: "payable", - type: "constructor", - }, - { - anonymous: false, - inputs: [ - { - indexed: true, - internalType: "address", - name: "implementation", - type: "address", - }, - ], - name: "Upgrade", - type: "event", - }, - { - stateMutability: "payable", - type: "fallback", - }, -]; - -const _bytecode = - "0x60a060405260405161036d38038061036d8339818101604052604081101561002657600080fd5b5080516020909101516100388261004e565b60601b6001600160601b0319166080525061014e565b6000546001600160a01b038281169116141561009c576040805162461bcd60e51b8152602060048201526008602482015267217570677261646560c01b604482015290519081900360640190fd5b6100af8161014860201b6101c71760201c565b610100576040805162461bcd60e51b815260206004820152601860248201527f696d706c656d656e746174696f6e2021636f6e74726163740000000000000000604482015290519081900360640190fd5b600080546001600160a01b0319166001600160a01b038316908117825560405190917ff78721226efe9a1bb678189a16d1554928b9f2192e2cb93eeda83b79fa40007d91a250565b3b151590565b60805160601c61020361016a60003980601c52506102036000f3fe60806040523373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000161461004d5760005460005260206000f35b6000356100598161005c565b50005b60005473ffffffffffffffffffffffffffffffffffffffff828116911614156100e657604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600860248201527f2175706772616465000000000000000000000000000000000000000000000000604482015290519081900360640190fd5b6100ef816101c7565b61015a57604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f696d706c656d656e746174696f6e2021636f6e74726163740000000000000000604482015290519081900360640190fd5b600080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff8316908117825560405190917ff78721226efe9a1bb678189a16d1554928b9f2192e2cb93eeda83b79fa40007d91a250565b3b15159056fea2646970667358221220e0a57d825761a534d61d13fc23801755431b79a5d7dfc87c6e2c94da32d2726c64736f6c63430007060033"; - -export class UpgradeBeacon__factory extends ContractFactory { - constructor(signer?: Signer) { - super(_abi, _bytecode, signer); - } - - deploy( - _initialImplementation: string, - _controller: string, - overrides?: PayableOverrides & { from?: string | Promise } - ): Promise { - return super.deploy( - _initialImplementation, - _controller, - overrides || {} - ) as Promise; - } - getDeployTransaction( - _initialImplementation: string, - _controller: string, - overrides?: PayableOverrides & { from?: string | Promise } - ): TransactionRequest { - return super.getDeployTransaction( - _initialImplementation, - _controller, - overrides || {} - ); - } - attach(address: string): UpgradeBeacon { - return super.attach(address) as UpgradeBeacon; - } - connect(signer: Signer): UpgradeBeacon__factory { - return super.connect(signer) as UpgradeBeacon__factory; - } - static readonly bytecode = _bytecode; - static readonly abi = _abi; - static createInterface(): UpgradeBeaconInterface { - return new utils.Interface(_abi) as UpgradeBeaconInterface; - } - static connect( - address: string, - signerOrProvider: Signer | Provider - ): UpgradeBeacon { - return new Contract(address, _abi, signerOrProvider) as UpgradeBeacon; - } -}