From 9848878f31f1628a0e1ef7b57b293b9f5af3a63e Mon Sep 17 00:00:00 2001 From: Roberto Cantu Date: Wed, 6 Dec 2023 11:30:18 -0600 Subject: [PATCH] deploy step - mumbai --- .../staking/slashing/SlashingController.sol | 1 + releases/1.2.10/index.yml | 2 +- releases/1.2.10/mumbai/config/upgrade.json | 91 +--------------- .../mumbai/output/prepared-upgrades.json | 103 ------------------ 4 files changed, 4 insertions(+), 193 deletions(-) diff --git a/contracts/components/staking/slashing/SlashingController.sol b/contracts/components/staking/slashing/SlashingController.sol index 9a3c9579..7285f43f 100644 --- a/contracts/components/staking/slashing/SlashingController.sol +++ b/contracts/components/staking/slashing/SlashingController.sol @@ -50,6 +50,7 @@ contract SlashingController is BaseComponentUpgradeable, StateMachineController, mapping(uint256 => uint256) public deposits; // proposalId --> tokenAmount mapping(bytes32 => SlashPenalty) public penalties; // penaltyId --> SlashPenalty ISlashingExecutor public slashingExecutor; + /// @custom:oz-renamed-from _scanners StakeSubjectGateway public subjectGateway; // Should be immutable, but it's already deployed. uint256 public depositAmount; uint256 public slashPercentToProposer; diff --git a/releases/1.2.10/index.yml b/releases/1.2.10/index.yml index 76ddf6a6..eedb536e 100644 --- a/releases/1.2.10/index.yml +++ b/releases/1.2.10/index.yml @@ -1,5 +1,5 @@ title: Release -network: polygon +network: mumbai deploy: prepare-upgrade 1.2.10 verify: verify-deployed finish: propose-admin diff --git a/releases/1.2.10/mumbai/config/upgrade.json b/releases/1.2.10/mumbai/config/upgrade.json index 1799a7ae..0337cde5 100644 --- a/releases/1.2.10/mumbai/config/upgrade.json +++ b/releases/1.2.10/mumbai/config/upgrade.json @@ -1,99 +1,12 @@ { - "AccessManager": { + "SlashingController": { "impl": { "opts": { "unsafe-allow": [ "delegatecall" ], "constructor-args": [ - "deployment.forwarder" - ] - } - } - }, - "AgentRegistry": { - "impl": { - "opts": { - "unsafe-allow": [ - "delegatecall" - ], - "constructor-args": [ - "deployment.forwarder" - ] - } - } - }, - "ScannerPoolRegistry": { - "impl": { - "opts": { - "unsafe-allow": [ - "delegatecall" - ], - "constructor-args": [ - "deployment.forwarder", "deployment.stake-allocator" - ] - } - - } - }, - "Dispatch": { - "impl": { - "opts": { - "unsafe-allow": [ - "delegatecall" - ], - "constructor-args": [ - "deployment.forwarder" - ] - } - } - }, - "StakeAllocator": { - "impl": { - "opts": { - "unsafe-allow": [ - "delegatecall" - ], - "constructor-args": [ - "deployment.forwarder", "deployment.stake-subject-gateway", "deployment.rewards-distributor" - ] - } - - } - }, - "RewardsDistributor": { - "impl": { - "opts": { - "unsafe-allow": [ - "delegatecall" - ], - "constructor-args": [ - "deployment.forwarder", "deployment.forta", "deployment.stake-subject-gateway" - ] - } - - } - }, - "StakeSubjectGateway": { - "impl": { - "opts": { - "unsafe-allow": [ - "delegatecall" - ], - "constructor-args": [ - "deployment.forwarder" - ] - } - } - }, - "FortaStaking": { - "impl": { - "opts": { - "unsafe-allow": [ - "delegatecall" - ], - "constructor-args": [ - "deployment.forwarder" + "deployment.forwarder", "deployment.forta" ] } } diff --git a/releases/1.2.10/mumbai/output/prepared-upgrades.json b/releases/1.2.10/mumbai/output/prepared-upgrades.json index db8dbdc3..e69de29b 100644 --- a/releases/1.2.10/mumbai/output/prepared-upgrades.json +++ b/releases/1.2.10/mumbai/output/prepared-upgrades.json @@ -1,103 +0,0 @@ -{ - "access-manager": { - "impl": { - "address": "0x5Da21607E9e2bCA241E0EA46e27cea3bB8404505", - "constructor-args": [ - "0x4E29Cea6D64be860f5eAba110686DcB585f393D6" - ], - "init-args": [], - "name": "AccessManager", - "timeout": 1200000, - "version": "0.1.0" - } - }, - "agent-registry": { - "impl": { - "address": "0xD25Fd5B722606d08A5DdCD00e969513d06d98d89", - "constructor-args": [ - "0x4E29Cea6D64be860f5eAba110686DcB585f393D6" - ], - "init-args": [], - "name": "AgentRegistry", - "timeout": 1200000, - "version": "0.1.6" - } - }, - "scanner-pool-registry": { - "impl": { - "address": "0x72eaaBB3f5908D5Ac4Fce00285B5af120BA3EcAC", - "constructor-args": [ - "0x4E29Cea6D64be860f5eAba110686DcB585f393D6", - "0x698A6400dE3865fC9E8A6dB22302AAb3372Cebd9" - ], - "init-args": [], - "name": "ScannerPoolRegistry", - "timeout": 1200000, - "version": "0.1.0" - } - }, - "dispatch": { - "impl": { - "address": "0x0ed550214869C3c3D5C05b97A8Bb9388125C4919", - "constructor-args": [ - "0x4E29Cea6D64be860f5eAba110686DcB585f393D6" - ], - "init-args": [], - "name": "Dispatch", - "timeout": 1200000, - "version": "0.1.5" - } - }, - "stake-allocator": { - "impl": { - "address": "0x70FBC65e20DFe5ACDA5665f98A6CdA98800cC637", - "constructor-args": [ - "0x4E29Cea6D64be860f5eAba110686DcB585f393D6", - "0x02304eC24ba2996a83F595D7cf80e5571a406EFA", - "0x404afc59Cacd74A28d0D5651460Cc950b42FAf08" - ], - "init-args": [], - "name": "StakeAllocator", - "timeout": 1200000, - "version": "0.1.0" - } - }, - "rewards-distributor": { - "impl": { - "address": "0x09803F257AB3D8a390837640ED9D9F4Eb22c1453", - "constructor-args": [ - "0x4E29Cea6D64be860f5eAba110686DcB585f393D6", - "0x107Ac13567b1b5D84691f890A5bA07EdaE1a11c3", - "0x02304eC24ba2996a83F595D7cf80e5571a406EFA" - ], - "init-args": [], - "name": "RewardsDistributor", - "timeout": 1200000, - "version": "0.1.0" - } - }, - "stake-subject-gateway": { - "impl": { - "address": "0x40998890c1ad5B22CBe2deB9671E9df91b79dd16", - "constructor-args": [ - "0x4E29Cea6D64be860f5eAba110686DcB585f393D6" - ], - "init-args": [], - "name": "StakeSubjectGateway", - "timeout": 1200000, - "version": "0.1.1" - } - }, - "forta-staking": { - "impl": { - "address": "0x8fd9d47e80f1d711aA97C4926e5E7CB3462455E8", - "constructor-args": [ - "0x4E29Cea6D64be860f5eAba110686DcB585f393D6" - ], - "init-args": [], - "name": "FortaStaking", - "timeout": 1200000, - "version": "0.1.2" - } - } -} \ No newline at end of file