diff --git a/arapp.json b/arapp.json index cc55079a1..8dc75a4ce 100644 --- a/arapp.json +++ b/arapp.json @@ -19,11 +19,6 @@ "registry": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e", "appName": "dao.lido.eth", "network": "mainnet" - }, - "kiln": { - "registry": "0xD3A23B83902066baC61e82bCe449fE1d3154Ab5D", - "appName": "dao.lido.eth", - "network": "kiln" } }, "appName": "dao.lido.eth" diff --git a/dao-local-deploy.sh b/dao-local-deploy.sh index 9b4f57004..ff939b6ce 100755 --- a/dao-local-deploy.sh +++ b/dao-local-deploy.sh @@ -4,7 +4,6 @@ set -o pipefail # first local account by default DEPLOYER=${DEPLOYER:=0xb4124cEB3451635DAcedd11767f004d8a28c6eE7} -# NETWORK=kintsugi NETWORK=${NETWORK:=local} VOTE_ID=0 diff --git a/deployed-kiln.json b/deployed-kiln.json deleted file mode 100644 index 22ff5638c..000000000 --- a/deployed-kiln.json +++ /dev/null @@ -1,255 +0,0 @@ -{ - "networkId": 1337802, - "ipfsAPI": "https://ipfs.infura.io:5001/api/v0", - "multisigAddress": "0x8c84909DE05702e1bA637fe05fddebA0FB3e3b21", - "lidoApmEnsName": "lidopm.eth", - "lidoApmEnsRegDurationSec": 94608000, - "daoAragonId": "lido-dao", - "daoInitialSettings": { - "voting": { - "minSupportRequired": "500000000000000000", - "minAcceptanceQuorum": "50000000000000000", - "voteDuration": 14400 - }, - "beaconSpec": { - "depositContractAddress": "0x4242424242424242424242424242424242424242", - "epochsPerFrame": 225, - "slotsPerEpoch": 32, - "secondsPerSlot": 12, - "genesisTime": 1647007200 - }, - "fee": { - "totalPercent": 10, - "treasuryPercent": 0, - "insurancePercent": 50, - "nodeOperatorsPercent": 50 - }, - "token": { - "name": "TEST Lido DAO Token", - "symbol": "TLDO" - } - }, - "vestingParams": { - "unvestedTokensAmount": "230000000000000000000000", - "holders": { - "0xa5F1d7D49F581136Cf6e58B32cBE9a2039C48bA1": "530000000000000000000000", - "0x00444797Ba158A7BdB8302e72da98dCbCCef0Fbc": "15000000000000000000000", - "0x9F188809b2ba2e29653693C4069c212a95C1B8c4": "15000000000000000000000", - "0xeC2d2E81721A477798e938924266f92c4E5Fc54e": "15000000000000000000000", - "0x401FD888B5E41113B7c0C47725A742bbc3A083EF": "15000000000000000000000", - "0x36c648351274bb4455ba6aAabF3F976824a93aF4": "15000000000000000000000", - "0xB6d0A3120c0e13749c211F48fccD9458Dfc99BD0": "15000000000000000000000", - "0x75936b355942D89d9B59798dacD70d70Ded93B78": "15000000000000000000000", - "0x39ceC2b3ba293CC15f15a3876dB8D356a1670789": "15000000000000000000000", - "0xC37F899BB002D93fdcbD9D91d42889AC0e29B704": "15000000000000000000000", - "0xc69f1606e0615F788Cb99982848528f39f188486": "15000000000000000000000", - "0xd355521db7f30F74059dFa7aE0A5C6543dFA8215": "15000000000000000000000", - "0xAA566f0eB53F26db5E15aC5B42685361B4e0d9F4": "15000000000000000000000", - "0xCd3975FC68Aa71eDebfef7442cF8e91ce407DEEE": "15000000000000000000000", - "0xfd0dd5c3b72528e8f581a8544309706d1c2d9206": "15000000000000000000000", - "0x161EE6a03D52ee176a514C88Cf07dcAcF248155f": "15000000000000000000000", - "0x11D7D72876cfC3d7CFC3d1a2C9c35EA4591694a7": "15000000000000000000000" - }, - "start": 1648627400, - "cliff": 1648628400, - "end": 1648628400, - "revokable": false - }, - "owner": "0x8c84909DE05702e1bA637fe05fddebA0FB3e3b21", - "aragonEnsLabelName": "aragonpm", - "ensAddress": "0xD3A23B83902066baC61e82bCe449fE1d3154Ab5D", - "ensFactoryAddress": "0x66Ca44dDb0B9Ba49C7a153A4108F46C95E4693dD", - "ensFactoryConstructorArgs": [], - "kernelBaseAddress": "0xf76235B924b6749cB62129b45c69771996D078B1", - "kernelBaseConstructorArgs": [ - true - ], - "aclBaseAddress": "0x31BbA6CCf72aA04f725602474614068fff2B3330", - "aclBaseConstructorArgs": [], - "evmScriptRegistryFactoryAddress": "0x19b424c26b36f2E7A9C6bA6d99243a2ECae7919F", - "evmScriptRegistryFactoryConstructorArgs": [], - "daoFactoryAddress": "0xF19b955B1aC41238eBc7411f3b75a157fe250df0", - "daoFactoryConstructorArgs": [ - "0xf76235B924b6749cB62129b45c69771996D078B1", - "0x31BbA6CCf72aA04f725602474614068fff2B3330", - "0x19b424c26b36f2E7A9C6bA6d99243a2ECae7919F" - ], - "apmRegistryBaseAddress": "0xfdac8a612d078c2F77b75992905275f2a06F0814", - "apmRepoBaseAddress": "0xD37598A90c531E5D35faa69D3706ECB6CE589E3A", - "ensSubdomainRegistrarBaseAddress": "0x79A5dcf2eC088639726aa3960B7Ea540466d4A42", - "apmRegistryFactoryAddress": "0xA160e5529Aa3cA0dE313B77C88671DD91D1C6B84", - "apmRegistryFactoryConstructorArgs": [ - "0xF19b955B1aC41238eBc7411f3b75a157fe250df0", - "0xfdac8a612d078c2F77b75992905275f2a06F0814", - "0xD37598A90c531E5D35faa69D3706ECB6CE589E3A", - "0x79A5dcf2eC088639726aa3960B7Ea540466d4A42", - "0xD3A23B83902066baC61e82bCe449fE1d3154Ab5D", - "0x0000000000000000000000000000000000000000" - ], - "aragonApmRegistryAddress": "0x1618d119c028f418Ab96D8096172aa8848DDBe36", - "aragonEnsNodeName": "aragonpm.eth", - "aragonEnsNode": "0x9065c3e7f7b7ef1ef4e53d2d0b8e0cef02874ab020c1ece79d5f0d3d0111c0ba", - "miniMeTokenFactoryAddress": "0x7DcaFCB80fDB46faEb501A5c5695771F938F47DC", - "miniMeTokenFactoryConstructorArgs": [], - "aragonIDAddress": "0x5B1510775E7186177b3f1fB3d36161276FE52C55", - "aragonIDConstructorArgs": [ - "0xD3A23B83902066baC61e82bCe449fE1d3154Ab5D", - "0xfa6574301a64d05838FE48A32bB415D5D35caF09", - "0x7e74a86b6e146964fb965db04dc2590516da77f720bb6759337bf5632415fd86" - ], - "aragonIDEnsNodeName": "aragonid.eth", - "aragonIDEnsNode": "0x7e74a86b6e146964fb965db04dc2590516da77f720bb6759337bf5632415fd86", - "app:agent": { - "fullName": "agent.aragonpm.eth", - "name": "agent", - "id": "0x9ac98dc5f995bf0211ed589ef022719d1487e5cb2bab505676f0d084c07cf89a", - "baseAddress": "0xa6b2449ef19191e06fde16bbd9a6A780820BBe01", - "ipfsCid": "Qmd32Lx4BbyfWKAvs9QprTDjWDnroWwwm9uRfRdwXTgS7T" - }, - "app:finance": { - "fullName": "finance.aragonpm.eth", - "name": "finance", - "id": "0xbf8491150dafc5dcaee5b861414dca922de09ccffa344964ae167212e8c673ae", - "baseAddress": "0x8E33218b90fD89c291882A3F26547Ecb76Fa6DFe", - "ipfsCid": "QmVWUzVwUV8gQFEdpw4Y5tAsN1zmPFqHtUUbNAD9upADsF" - }, - "app:token-manager": { - "fullName": "token-manager.aragonpm.eth", - "name": "token-manager", - "id": "0x6b20a3010614eeebf2138ccec99f028a61c811b3b1a3343b6ff635985c75c91f", - "baseAddress": "0x3F3A9f7E807C5CdFDeD57322907f8CD8D26C3Ab1", - "ipfsCid": "QmVA6TDcrEVHathVXLvYmRP944YLZpXsXUEoWqD9UwCVET" - }, - "app:vault": { - "fullName": "vault.aragonpm.eth", - "name": "vault", - "id": "0x7e852e0fcfce6551c13800f1e7476f982525c2b5277ba14b24339c68416336d1", - "baseAddress": "0x6b054aa056a381eFA094b4e96e39bb3F1856F108", - "ipfsCid": "QmQb95FxdzDZPX5rEnmdKzK2JLcntQWf2k7qvsPdmqr3Do" - }, - "app:voting": { - "fullName": "voting.aragonpm.eth", - "name": "voting", - "id": "0x9fa3927f639745e587912d4b0fea7ef9013bf93fb907d29faeab57417ba6e1d4", - "baseAddress": "0x48787380A54BDD6F058E4CFF3c35c1D546aa018B", - "ipfsCid": "QmZF7TCstYWRTr9QUV6CJ8bM2Zo5YMXqzagtf5VqY9teLe" - }, - "depositorParams": { - "maxDepositsPerBlock": 100, - "minDepositBlockDistance": 14, - "pauseIntentValidityPeriodBlocks": 10, - "guardians": [ - "0x3dc4cf780f2599b528f37dedb34449fb65ef7d4a", - "0x401fd888b5e41113b7c0c47725a742bbc3a083ef", - "0x3db460f33838fdc91e804d7fce2adf9e61e9d654", - "0x96fd3d127abd0d77724d49b7bddecdc89f684bb6", - "0xda1a296f9df18d04e0aefcff658b80b3ef824ec9", - "0xc34d33b95d7d6df2255d6051ddb12f8bd7aef64c", - "0xad5eecc863d88d5d848b89aa8517388a3ee432c8", - "0x6c83f70ed019fdcafe6c6f78cb33ce15943e4cb9", - "0x43464fe06c18848a2e2e913194d64c1970f4326a", - "0xf060ab3d5dcfdc6a0dfd5ca0645ac569b8f105ca", - "0x79a132be0c25ced09e745629d47cf05e531bb2bb" - ], - "quorum": 1 - }, - "depositContractAddress": "0x4242424242424242424242424242424242424242", - "daoTemplateConstructorArgs": [ - "0x8c84909DE05702e1bA637fe05fddebA0FB3e3b21", - "0xF19b955B1aC41238eBc7411f3b75a157fe250df0", - "0xD3A23B83902066baC61e82bCe449fE1d3154Ab5D", - "0x7DcaFCB80fDB46faEb501A5c5695771F938F47DC", - "0x5B1510775E7186177b3f1fB3d36161276FE52C55", - "0xA160e5529Aa3cA0dE313B77C88671DD91D1C6B84" - ], - "daoTemplateDeployTx": "0x4437237c1b23538d48416ce38043e1030d71aa15a51e4e7af2205e7e08e64e33", - "lidoBaseDeployTx": "0xb4e8f57da1346150bb298961103a34353c0e2f7b12b48d48ad0965ddf103476b", - "oracleBaseDeployTx": "0x4345275cf82ad3c7ab25b17064db8c814428d2447144f4d2f0c9b5f7b8ae8031", - "nodeOperatorsRegistryBaseDeployTx": "0x0fec5ea48709c43b7b6acf5927c89734ce1a5b3ded934b286ea710a67e9183fe", - "executionLayerRewardsVaultDeployTx": "0x4bef4161eaa7f510b866a2cb457f850f73e0fd84f932a6e6b9720ef2b6919011", - "compositePostRebaseBeaconReceiverDeployTx": "0xc39755ed64c124044ec96fa80d2fa473e5fca18d531124917a3fc53a32f3472c", - "selfOwnedStETHBurnerDeployTx": "0xafdf2298a90750410b897aca275fa049feaaef3084e2dc5112e39bfcb62c01a4", - "daoTemplateAddress": "0xaD07B585F279A6b4F693fB5c81be3920b76a45EC", - "daoTemplateDeployBlock": 161005, - "app:lido": { - "baseAddress": "0x51230C4D9539F62037Af867d81F0f592AC10fA0e", - "fullName": "lido.lidopm.eth", - "name": "lido", - "id": "0x3ca7c3e38968823ccb4c78ea688df41356f182ae1d159e4ee608d30d68cef320", - "ipfsCid": "QmTtpuoZdv3i72DDfcHxoYywVNATVJEsBv6iipaEKDSi5d", - "contentURI": "0x697066733a516d547470756f5a6476336937324444666348786f597977564e4154564a457342763669697061454b4453693564", - "proxyAddress": "0x3E50180cf438e185ec52Ade55855718584541476" - }, - "app:oracle": { - "baseAddress": "0x777e00871e6614639C479D91978DF48Edd181112", - "fullName": "oracle.lidopm.eth", - "name": "oracle", - "id": "0x8b47ba2a8454ec799cd91646e7ec47168e91fd139b23f017455f3e5898aaba93", - "ipfsCid": "QmYJVQW83CGmYpRtZNREz7mioXddzXxdd1z6g62oRtxWB8", - "contentURI": "0x697066733a516d594a565157383343476d597052745a4e52457a376d696f5864647a58786464317a366736326f527478574238", - "proxyAddress": "0x9633df55696561C4Cf8A260316A6e08113FA2164" - }, - "app:node-operators-registry": { - "baseAddress": "0xC724596a59b83Df98cEc0df188e730e41b8a58FF", - "fullName": "node-operators-registry.lidopm.eth", - "name": "node-operators-registry", - "id": "0x7071f283424072341f856ac9e947e7ec0eb68719f757a7e785979b6b8717579d", - "ipfsCid": "QmdS4HqNbRumzR1g5aebPzTf5K7A8MrA6Y4CV8ZuGfcUFq", - "contentURI": "0x697066733a516d64533448714e6252756d7a52316735616562507a5466354b3741384d72413659344356385a75476663554671", - "proxyAddress": "0xb849C5b35DC45277Bad5c6F2c6C77183d842367c" - }, - "lidoApmDeployArguments": [ - "0x93cdeb708b7545dc668eb9280176169d1c33cfd8ed6f04690a0bcc88a93fc4ae", - "0x90a9580abeb24937fc658e497221c81ce8553b560304f9525821f32b17dbdaec" - ], - "lidoApmDeployTx": "0x26af347abc33a16678a9f45b55cdfa8241f0d48de9862ece61da3e06158616c6", - "lidoApmAddress": "0xaC1719341a8b0AC8fbd058Ccf40e0e2eA20Cc06e", - "createAppReposTx": "0x056ea8c943ada1fbf8dd27f3322d5fc9dfa3b6e9de206f2128b58a1865712e9b", - "newDaoTx": "0x257d02e1cc52e4cf1d66da79ab23b0a256f3180950389174e5aa4c29dfc4f1af", - "daoAddress": "0x1c7E1226D5D7f276b80c1e42cf53F753a431ea9e", - "daoTokenAddress": "0xA463D98281b5126D501d22F0719a13BfE092688d", - "app:aragon-agent": { - "name": "aragon-agent", - "fullName": "aragon-agent.lidopm.eth", - "id": "0x701a4fd1f5174d12a0f1d9ad2c88d0ad11ab6aad0ac72b7d9ce621815f8016a9", - "proxyAddress": "0xb98B21f9725F1deF45500c5D2D4D48eC5DF4B6AF" - }, - "app:aragon-finance": { - "name": "aragon-finance", - "fullName": "aragon-finance.lidopm.eth", - "id": "0x5c9918c99c4081ca9459c178381be71d9da40e49e151687da55099c49a4237f1", - "proxyAddress": "0xA9024A812da051D4c947dcbBB745FD8051edF6e5" - }, - "app:aragon-token-manager": { - "name": "aragon-token-manager", - "fullName": "aragon-token-manager.lidopm.eth", - "id": "0xcd567bdf93dd0f6acc3bc7f2155f83244d56a65abbfbefb763e015420102c67b", - "proxyAddress": "0x6AB36E8B1c6Cb572F910A7e50204F41f98D5de74" - }, - "app:aragon-voting": { - "name": "aragon-voting", - "fullName": "aragon-voting.lidopm.eth", - "id": "0x0abcd104777321a82b010357f20887d61247493d89d2e987ff57bcecbde00e1e", - "proxyAddress": "0x84633bf8e3AE2508a81F09F46a47774F5aFD16B9" - }, - "executionLayerRewardsVaultAddress": "0x99F98fc958E775c69EFBA92f0ADD71123f1EDbCD", - "compositePostRebaseBeaconReceiverConstructorArgs": [ - "0x84633bf8e3AE2508a81F09F46a47774F5aFD16B9", - "0x9633df55696561C4Cf8A260316A6e08113FA2164" - ], - "compositePostRebaseBeaconReceiverAddress": "0x7E34B3C2A4976053D2967F8fA8C2c31d69766E46", - "selfOwnedStETHBurnerParams": { - "totalCoverSharesBurnt": 0, - "totalNonCoverSharesBurnt": 0, - "maxBurnAmountPerRunBasisPoints": 4 - }, - "selfOwnedStETHBurnerConstructorArgs": [ - "0xb98B21f9725F1deF45500c5D2D4D48eC5DF4B6AF", - "0x3E50180cf438e185ec52Ade55855718584541476", - "0x84633bf8e3AE2508a81F09F46a47774F5aFD16B9", - 0, - 0, - 4 - ], - "selfOwnedStETHBurnerAddress": "0x1f2abB4e2c54C010f7e4E539B9E043C5ae3aCAa5" -} diff --git a/deployed-kintsugi.json b/deployed-kintsugi.json deleted file mode 100644 index 07328eccf..000000000 --- a/deployed-kintsugi.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "networkId": 1337702, - "ipfsAPI": "https://ipfs.infura.io:5001/api/v0", - "lidoApmEnsName": "lidopm.eth", - "lidoApmEnsRegDurationSec": 94608000, - "daoAragonId": "lido-dao", - "daoInitialSettings": { - "voting": { - "minSupportRequired": "500000000000000000", - "minAcceptanceQuorum": "50000000000000000", - "voteDuration": 14400 - }, - "beaconSpec": { - "depositContractAddress": "0x4242424242424242424242424242424242424242", - "epochsPerFrame": 225, - "slotsPerEpoch": 32, - "secondsPerSlot": 12, - "genesisTime": 1639659600 - }, - "fee": { - "totalPercent": 1000, - "treasuryPercent": 0, - "insurancePercent": 5000, - "nodeOperatorsPercent": 5000 - }, - "token": { - "name": "TEST Lido DAO Token", - "symbol": "TLDO" - } - }, - "vestingParams": { - "unvestedTokensAmount": "230000000000000000000000", - "holders": { - "0xa5F1d7D49F581136Cf6e58B32cBE9a2039C48bA1": "530000000000000000000000", - "0x00444797Ba158A7BdB8302e72da98dCbCCef0Fbc": "15000000000000000000000", - "0x9F188809b2ba2e29653693C4069c212a95C1B8c4": "15000000000000000000000", - "0xeC2d2E81721A477798e938924266f92c4E5Fc54e": "15000000000000000000000", - "0x401FD888B5E41113B7c0C47725A742bbc3A083EF": "15000000000000000000000", - "0x36c648351274bb4455ba6aAabF3F976824a93aF4": "15000000000000000000000", - "0xB6d0A3120c0e13749c211F48fccD9458Dfc99BD0": "15000000000000000000000", - "0x75936b355942D89d9B59798dacD70d70Ded93B78": "15000000000000000000000", - "0x39ceC2b3ba293CC15f15a3876dB8D356a1670789": "15000000000000000000000", - "0xC37F899BB002D93fdcbD9D91d42889AC0e29B704": "15000000000000000000000", - "0xc69f1606e0615F788Cb99982848528f39f188486": "15000000000000000000000", - "0xd355521db7f30F74059dFa7aE0A5C6543dFA8215": "15000000000000000000000", - "0xAA566f0eB53F26db5E15aC5B42685361B4e0d9F4": "15000000000000000000000", - "0xCd3975FC68Aa71eDebfef7442cF8e91ce407DEEE": "15000000000000000000000", - "0xfd0dd5c3b72528e8f581a8544309706d1c2d9206": "15000000000000000000000", - "0x161EE6a03D52ee176a514C88Cf07dcAcF248155f": "15000000000000000000000", - "0x11D7D72876cfC3d7CFC3d1a2C9c35EA4591694a7": "15000000000000000000000" - }, - "start": 1639659600, - "cliff": 1639660100, - "end": 1639660100, - "revokable": false - }, - "owner": "0x401FD888B5E41113B7c0C47725A742bbc3A083EF", - "multisigAddress": "0x401FD888B5E41113B7c0C47725A742bbc3A083EF", - "aragonEnsLabelName": "aragonpm", - "ensAddress": "0x46fF67E6f5d419aB203A25e6A1AB8FaFDE137d68", - "ensFactoryAddress": "0x06A47bB689cd3e05196328D5109Ba965462101c8", - "ensFactoryConstructorArgs": [], - "kernelBaseAddress": "0x77Dd1289C47c7849fbAA27397982a4d77c660d8F", - "kernelBaseConstructorArgs": [ - true - ], - "aclBaseAddress": "0xDD025dfB273ED0184a3deC6f2e3E43786e919D40", - "aclBaseConstructorArgs": [], - "evmScriptRegistryFactoryAddress": "0x4C069c659C22a8BF07322B402D375451A7C6dD7e", - "evmScriptRegistryFactoryConstructorArgs": [], - "daoFactoryAddress": "0x1d2641BfCa2ebA756eCD712f65C5000E5700C345", - "daoFactoryConstructorArgs": [ - "0x77Dd1289C47c7849fbAA27397982a4d77c660d8F", - "0xDD025dfB273ED0184a3deC6f2e3E43786e919D40", - "0x4C069c659C22a8BF07322B402D375451A7C6dD7e" - ], - "apmRegistryBaseAddress": "0x9CD4125c8f27804803B3a52B1CAD5E4fcC53F184", - "apmRepoBaseAddress": "0x5100b212C10ce37B9Ad3A00257F1d759a7E0cf93", - "ensSubdomainRegistrarBaseAddress": "0x37C9E48D4697f0CF1653f92567a16127E844aBA1", - "apmRegistryFactoryAddress": "0xFbb09ACb9E5502F17857f96C42cC9A35d356420F", - "apmRegistryFactoryConstructorArgs": [ - "0x1d2641BfCa2ebA756eCD712f65C5000E5700C345", - "0x9CD4125c8f27804803B3a52B1CAD5E4fcC53F184", - "0x5100b212C10ce37B9Ad3A00257F1d759a7E0cf93", - "0x37C9E48D4697f0CF1653f92567a16127E844aBA1", - "0x46fF67E6f5d419aB203A25e6A1AB8FaFDE137d68", - "0x0000000000000000000000000000000000000000" - ], - "aragonApmRegistryAddress": "0xB03435b62c70f70406a256d4E5fE22e739671DaB", - "aragonEnsNodeName": "aragonpm.eth", - "aragonEnsNode": "0x9065c3e7f7b7ef1ef4e53d2d0b8e0cef02874ab020c1ece79d5f0d3d0111c0ba", - "miniMeTokenFactoryAddress": "0x59681599B96beA92518C88db3d8fEA70224eCd55", - "miniMeTokenFactoryConstructorArgs": [], - "aragonIDAddress": "0x232edBA39C8c51Fd1314a1dA17dC1FB91e3427D1", - "aragonIDConstructorArgs": [ - "0x46fF67E6f5d419aB203A25e6A1AB8FaFDE137d68", - "0x304e8dF18Ca954b28eBf87589a759D55b4634F3b", - "0x7e74a86b6e146964fb965db04dc2590516da77f720bb6759337bf5632415fd86" - ], - "aragonIDEnsNodeName": "aragonid.eth", - "aragonIDEnsNode": "0x7e74a86b6e146964fb965db04dc2590516da77f720bb6759337bf5632415fd86", - "app:agent": { - "name": "agent", - "fullName": "agent.aragonpm.eth", - "id": "0x9ac98dc5f995bf0211ed589ef022719d1487e5cb2bab505676f0d084c07cf89a", - "baseAddress": "0x846b996EBDB12a944617Df6e0CABE750EBe3C164", - "proxyAddress": "0x6871d1B0a2014969D58BE5ce776596C4663Da64B" - }, - "app:finance": { - "name": "finance", - "fullName": "finance.aragonpm.eth", - "id": "0xbf8491150dafc5dcaee5b861414dca922de09ccffa344964ae167212e8c673ae", - "baseAddress": "0xFFfd9EBDFfaFB6F2E3D47E570092726c8a3940d0", - "proxyAddress": "0x883B323AF9B58ca0ab8c44d66Bef97e496e9a13a" - }, - "app:token-manager": { - "name": "token-manager", - "fullName": "token-manager.aragonpm.eth", - "id": "0x6b20a3010614eeebf2138ccec99f028a61c811b3b1a3343b6ff635985c75c91f", - "baseAddress": "0x871Df9aefa32656fda02A657A7eb77BC4C578485", - "proxyAddress": "0x3843165069955FfB49ce888Fe4AB75335B769BCf" - }, - "app:vault": { - "name": "vault", - "fullName": "vault.aragonpm.eth", - "id": "0x7e852e0fcfce6551c13800f1e7476f982525c2b5277ba14b24339c68416336d1", - "baseAddress": "0x8322C44eF834E12cDa8042fa4b8482E19b686a6A" - }, - "app:voting": { - "name": "voting", - "fullName": "voting.aragonpm.eth", - "id": "0x9fa3927f639745e587912d4b0fea7ef9013bf93fb907d29faeab57417ba6e1d4", - "baseAddress": "0x37FfAb526ec8A023B6E2966877547E990e3dA56E", - "proxyAddress": "0x199D849955E05ABf1733DB943c75233298025343" - }, - "lidoEnsLabelName": "lidopm", - "daoTemplateEnsLabel": "template2", - "lidoApmAddress": "0x21176ac9c7e252d009257445b9cc13bFfe3fd223", - "lidoEnsNodeName": "lidopm.eth", - "lidoEnsNode": "0xbfc3884a938047d1e93d1dbd85bfcfb929a63a4ed292efc654596c10e96a88c9", - "app:lido": { - "name": "lido", - "fullName": "lido.lidopm.eth", - "id": "0x3ca7c3e38968823ccb4c78ea688df41356f182ae1d159e4ee608d30d68cef320", - "baseAddress": "0x06da6681A0735db5D7720aF2C37100Dc1a01A2a3", - "proxyAddress": "0x3a6a994AC0CC96b6DDbaA99F10769384Fa14227B" - }, - "app:oracle": { - "name": "oracle", - "fullName": "oracle.lidopm.eth", - "id": "0x8b47ba2a8454ec799cd91646e7ec47168e91fd139b23f017455f3e5898aaba93", - "baseAddress": "0x041619226Bf494543Cdf763Da184DB12CB8F3A2d", - "proxyAddress": "0xc85e5d5D34fFb68d48FC138b0dbA0b05629E2e7c" - }, - "app:node-operators-registry": { - "name": "node-operators-registry", - "fullName": "node-operators-registry.lidopm.eth", - "id": "0x7071f283424072341f856ac9e947e7ec0eb68719f757a7e785979b6b8717579d", - "baseAddress": "0x735B20352772E2815fc584f40ff0a1475B0a5659", - "proxyAddress": "0xeb7D01f713F59EFfB350D05b7AF66720373D4F41" - }, - "daoTemplateAddress": "0xf143e53A50D602caeB4684f8726db88b7148ac99", - "daoTemplateConstructorArgs": [ - "0x401FD888B5E41113B7c0C47725A742bbc3A083EF", - "0x1d2641BfCa2ebA756eCD712f65C5000E5700C345", - "0x46fF67E6f5d419aB203A25e6A1AB8FaFDE137d68", - "0x59681599B96beA92518C88db3d8fEA70224eCd55", - "0x232edBA39C8c51Fd1314a1dA17dC1FB91e3427D1" - ], - "daoTemplateNodeName": "template2.lidopm.eth", - "daoTemplateNode": "0x06a20cfedbeab3d234d362b2f6f58f812bf09684e795dbd38bf71f17f06da5c0", - "depositContractAddress": "0x4242424242424242424242424242424242424242", - "daoAddress": "0x79064315626EA8972dc79712B94262cCbC1690bE", - "tokenAddress": "0xb264bDd5e9813A17D0fb7e26A64370675807Ba89", - "knownApps": { - "app:agent": { - "name": "agent", - "fullName": "agent.aragonpm.eth", - "id": "0x9ac98dc5f995bf0211ed589ef022719d1487e5cb2bab505676f0d084c07cf89a", - "baseAddress": "0x846b996EBDB12a944617Df6e0CABE750EBe3C164", - "proxyAddress": "0x6871d1B0a2014969D58BE5ce776596C4663Da64B" - }, - "app:finance": { - "name": "finance", - "fullName": "finance.aragonpm.eth", - "id": "0xbf8491150dafc5dcaee5b861414dca922de09ccffa344964ae167212e8c673ae", - "baseAddress": "0xFFfd9EBDFfaFB6F2E3D47E570092726c8a3940d0", - "proxyAddress": "0x883B323AF9B58ca0ab8c44d66Bef97e496e9a13a" - }, - "app:token-manager": { - "name": "token-manager", - "fullName": "token-manager.aragonpm.eth", - "id": "0x6b20a3010614eeebf2138ccec99f028a61c811b3b1a3343b6ff635985c75c91f", - "baseAddress": "0x871Df9aefa32656fda02A657A7eb77BC4C578485", - "proxyAddress": "0x3843165069955FfB49ce888Fe4AB75335B769BCf" - }, - "app:vault": { - "name": "vault", - "fullName": "vault.aragonpm.eth", - "id": "0x7e852e0fcfce6551c13800f1e7476f982525c2b5277ba14b24339c68416336d1", - "baseAddress": "0x8322C44eF834E12cDa8042fa4b8482E19b686a6A" - }, - "app:voting": { - "name": "voting", - "fullName": "voting.aragonpm.eth", - "id": "0x9fa3927f639745e587912d4b0fea7ef9013bf93fb907d29faeab57417ba6e1d4", - "baseAddress": "0x37FfAb526ec8A023B6E2966877547E990e3dA56E", - "proxyAddress": "0x199D849955E05ABf1733DB943c75233298025343" - }, - "app:lido": { - "name": "lido", - "fullName": "lido.lidopm.eth", - "id": "0x3ca7c3e38968823ccb4c78ea688df41356f182ae1d159e4ee608d30d68cef320", - "baseAddress": "0xca0810d80d00f9B7eB873860d23Dc5487065Da37", - "proxyAddress": "0x3a6a994AC0CC96b6DDbaA99F10769384Fa14227B" - }, - "app:oracle": { - "name": "oracle", - "fullName": "oracle.lidopm.eth", - "id": "0x8b47ba2a8454ec799cd91646e7ec47168e91fd139b23f017455f3e5898aaba93", - "baseAddress": "0xA9Ee059559ED28837e1af943d5f5559b5233aBeB", - "proxyAddress": "0xc85e5d5D34fFb68d48FC138b0dbA0b05629E2e7c" - }, - "app:node-operators-registry": { - "name": "node-operators-registry", - "fullName": "node-operators-registry.lidopm.eth", - "id": "0x7071f283424072341f856ac9e947e7ec0eb68719f757a7e785979b6b8717579d", - "baseAddress": "0x735B20352772E2815fc584f40ff0a1475B0a5659", - "proxyAddress": "0xeb7D01f713F59EFfB350D05b7AF66720373D4F41" - } - }, - "depositorParams": { - "maxDepositsPerBlock": 100, - "minDepositBlockDistance": 14, - "pauseIntentValidityPeriodBlocks": 10, - "guardians": [ - "0x3dc4cf780f2599b528f37dedb34449fb65ef7d4a", - "0x401fd888b5e41113b7c0c47725a742bbc3a083ef", - "0x3db460f33838fdc91e804d7fce2adf9e61e9d654", - "0x96fd3d127abd0d77724d49b7bddecdc89f684bb6", - "0xda1a296f9df18d04e0aefcff658b80b3ef824ec9", - "0xc34d33b95d7d6df2255d6051ddb12f8bd7aef64c", - "0xad5eecc863d88d5d848b89aa8517388a3ee432c8", - "0x6c83f70ed019fdcafe6c6f78cb33ce15943e4cb9", - "0x43464fe06c18848a2e2e913194d64c1970f4326a", - "0xf060ab3d5dcfdc6a0dfd5ca0645ac569b8f105ca", - "0x79a132be0c25ced09e745629d47cf05e531bb2bb" - ], - "quorum": 1 - }, - "lidoBaseDeployTx": "0x99f814a256ddedc706bb4b699fee8106ee3d12d2fa78da6d79544efd398aeac4", - "oracleBaseDeployTx": "0x195866659be58414ac4a8095c5f6c1b1edc8f24baa48384bc4baa4c77c555af3", - "nodeOperatorsRegistryBaseDeployTx": "0x8e16572b1b3fe7ea5b8d67d2af9176566169b706f470d4cbd4fd1d256e339a25" -} diff --git a/docker-compose.kiln.yml b/docker-compose.kiln.yml deleted file mode 100644 index e6c181a49..000000000 --- a/docker-compose.kiln.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '3.7' -services: - aragon: - build: - context: ./docker/aragon/ - args: - - ARAGON_IPFS_GATEWAY=https://ipfs.infura.io/ipfs - - ARAGON_DEFAULT_ETH_NODE=ws://34.159.167.0:8546 - - ARAGON_APP_LOCATOR=ipfs - - ARAGON_ETH_NETWORK_TYPE=local - - ARAGON_ENS_REGISTRY_ADDRESS=0xD3A23B83902066baC61e82bCe449fE1d3154Ab5D - container_name: aragon - ports: - - 3000:8080 diff --git a/hardhat.config.js b/hardhat.config.js index a2999340e..b722b821b 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -45,25 +45,6 @@ const getNetConfig = (networkName, ethAccountName) => { } const byNetName = { localhost, - kintsugi: { - ...base, - accounts: accounts.eth.kintsugi, - // url: ' https://rpc.kintsugi.themerge.dev', - // url: 'http://kintsugi.testnet.fi/eth1rpc', - // url: 'http://108.61.179.232:8545', - url: 'http://kintsugi.testnet.fi:8545', - chainId: 1337702, - // gas: 10000000, - gasPrice: 2000000000 - }, - kiln: { - ...base, - accounts: accounts.eth.kiln, - url: 'http://34.159.167.0:8545', - chainId: 1337802, - // gas: 10000000, - gasPrice: 2000000000 - }, // local local: { ...base, diff --git a/package.json b/package.json index 75f453740..553ceae5b 100644 --- a/package.json +++ b/package.json @@ -43,18 +43,6 @@ "deploy:app-staking-providers-registry": "APPS=staking-providers-registry yarn deploy:apps", "deploy:dao": "hardhat run --no-compile ./scripts/deploy-lido-dao.js", "deploy:e2e:dao": "NETWORK_NAME=e2e NETWORK_STATE_FILE=deployed-e2e.json hardhat run --no-compile ./scripts/deploy-lido-dao.js", - "deploy:kintsugi:aragon-env": "NETWORK_NAME=kintsugi NETWORK_STATE_FILE=deployed-kintsugi.json hardhat run --no-compile ./scripts/deploy-aragon-env.js", - "deploy:kintsugi:aragon-std-apps": "NETWORK_NAME=kintsugi NETWORK_STATE_FILE=deployed-kintsugi.json IPFS_API_URL=https://ipfs.infura.io:5001/api/v0 IPFS_GATEWAY_URL=https://ipfs.io RELEASE_TYPE=major hardhat run --no-compile ./scripts/deploy-aragon-std-apps.js --config ./hardhat.config.aragon-apps.js", - "deploy:kintsugi:apm-and-template": "NETWORK_NAME=kintsugi NETWORK_STATE_FILE=deployed-kintsugi.json hardhat run --no-compile ./scripts/deploy-lido-apm-and-template.js", - "deploy:kintsugi:apps": "NETWORK_NAME=kintsugi NETWORK_STATE_FILE=deployed-kintsugi.json IPFS_API_URL=https://ipfs.infura.io:5001/api/v0 IPFS_GATEWAY_URL=https://ipfs.io hardhat run --no-compile ./scripts/deploy-lido-apps.js", - "deploy:kintsugi:perm": "NETWORK_NAME=kintsugi NETWORK_STATE_FILE=deployed-kintsugi.json hardhat run --no-compile ./scripts/deploy-repo-permissions.js", - "deploy:kintsugi:dao": "NETWORK_NAME=kintsugi NETWORK_STATE_FILE=deployed-kintsugi.json hardhat run --no-compile ./scripts/deploy-lido-dao.js", - "deploy:kiln:aragon-env": "NETWORK_NAME=kiln NETWORK_STATE_FILE=deployed-kiln.json hardhat run --no-compile ./scripts/deploy-aragon-env.js", - "deploy:kiln:aragon-std-apps": "NETWORK_NAME=kiln NETWORK_STATE_FILE=deployed-kiln.json IPFS_API_URL=https://ipfs.infura.io:5001/api/v0 IPFS_GATEWAY_URL=https://ipfs.io RELEASE_TYPE=major hardhat run --no-compile ./scripts/deploy-aragon-std-apps.js --config ./hardhat.config.aragon-apps.js", - "deploy:kiln:apm-and-template": "NETWORK_NAME=kiln NETWORK_STATE_FILE=deployed-kiln.json hardhat run --no-compile ./scripts/deploy-lido-apm-and-template.js", - "deploy:kiln:apps": "NETWORK_NAME=kiln NETWORK_STATE_FILE=deployed-kiln.json IPFS_API_URL=https://ipfs.infura.io:5001/api/v0 IPFS_GATEWAY_URL=https://ipfs.io hardhat run --no-compile ./scripts/deploy-lido-apps.js", - "deploy:kiln:perm": "NETWORK_NAME=kiln NETWORK_STATE_FILE=deployed-kiln.json hardhat run --no-compile ./scripts/deploy-repo-permissions.js", - "deploy:kiln:dao": "NETWORK_NAME=kiln NETWORK_STATE_FILE=deployed-kiln.json hardhat run --no-compile ./scripts/deploy-lido-dao.js", "deploy:local:all": "yarn compile && yarn deploy:local:aragon-env && yarn deploy:local:aragon-std-apps && yarn deploy:local:apm-and-template && yarn deploy:local:apps && yarn deploy:local:dao", "deploy:local:aragon-env": "NETWORK_NAME=local NETWORK_STATE_FILE=deployed-local.json hardhat run --no-compile ./scripts/deploy-aragon-env.js", "deploy:local:aragon-std-apps": "NETWORK_NAME=local NETWORK_STATE_FILE=deployed-local.json IPFS_API_URL=http://127.0.0.1:5001/api/v0 IPFS_GATEWAY_URL=http://127.0.0.1:8080 RELEASE_TYPE=major hardhat run --no-compile ./scripts/deploy-aragon-std-apps.js --config ./hardhat.config.aragon-apps.js",