diff --git a/README.md b/README.md index f4b7e46..370c43c 100644 --- a/README.md +++ b/README.md @@ -1 +1,11 @@ # DIP-7 + +## Deployments +```sh + Multisig: 0x040f331774Ed6BB161412B4cEDb1358B382aF3A5 + Depoist: 0x53E294d1B6ec28B251A81aa337212D7a48E6B642 + Timelock: 0x849eC3ba6AD79934666Bb98eCd74cF94F5dA3835 + gRING: 0xD358c5c694A12857C3A44b53943fB5ca6b042764 + RingDAO: 0x2E05EE9032a28d894545708C56BE7bccd2e47826 + Hub: 0xC5d919D01DB0f225AAf2Bb45Fd4f65dC0d173D75 +``` diff --git a/foundry.toml b/foundry.toml index e52fd43..37701ca 100644 --- a/foundry.toml +++ b/foundry.toml @@ -2,7 +2,7 @@ src = "src" out = "out" libs = ["lib"] -sender = "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec" +sender = "0x94655E3Af9AbCe0806254574903f174b91305Aa1" force = true ffi = true ast = true diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol index 6bfcba1..56b520a 100644 --- a/script/Deploy.s.sol +++ b/script/Deploy.s.sol @@ -2,6 +2,7 @@ pragma solidity ^0.8.0; import {Script} from "forge-std/Script.sol"; +import {safeconsole} from "forge-std/safeconsole.sol"; import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol"; import {Options} from "openzeppelin-foundry-upgrades/Options.sol"; @@ -19,10 +20,12 @@ contract DeployScript is Script { // RingDAO-multisig address multisig = 0x040f331774Ed6BB161412B4cEDb1358B382aF3A5; + safeconsole.log("Multisig: ", multisig); address deposit = Upgrades.deployTransparentProxy( "Deposit.sol:Deposit", multisig, abi.encodeCall(Deposit.initialize, ("RING Deposit NFT", "RDPS")) ); + safeconsole.log("Depoist: ", deposit); uint256 minDelay = 3 days; address timelock = Upgrades.deployTransparentProxy( @@ -30,12 +33,14 @@ contract DeployScript is Script { multisig, abi.encodeCall(RingTimelockController.initialize, (minDelay, new address[](0), new address[](0), multisig)) ); + safeconsole.log("Timelock: ", timelock); address gRING = Upgrades.deployTransparentProxy( "GovernanceRing.sol:GovernanceRing", timelock, abi.encodeCall(GovernanceRing.initialize, (multisig, deposit, "Governance RING", "gRING")) ); + safeconsole.log("gRING: ", gRING); address ringDAO = Upgrades.deployTransparentProxy( "RingDAO.sol:RingDAO", @@ -44,12 +49,14 @@ contract DeployScript is Script { RingDAO.initialize, (IVotes(gRING), TimelockControllerUpgradeable(payable(timelock)), "RingDAO") ) ); + safeconsole.log("RingDAO: ", ringDAO); address hub = Upgrades.deployTransparentProxy( "CollatorStakingHub.sol:CollatorStakingHub", timelock, abi.encodeCall(CollatorStakingHub.initialize, (gRING, deposit)) ); + safeconsole.log("Hub: ", hub); // RingTimelockController(timelock).grantRole(RingTimelockController(timelock).PROPOSER_ROLE(), ringDAO); // RingTimelockController(gRING).grantRole(GovernanceRing(gRING).MINTER_ROLE(), hub);