redeploy (#15)

Makefile

@@ -3,7 +3,7 @@ clean  :; @forge clean
 test   :; @forge test
 fmt    :; @forge fmt
 
-dry-run:; @forge script script/DeployKoi.s.sol:DeployKoiScript --rpc-url "https://crab-rpc.darwinia.network"
+dry-run:; @forge script script/DeployKoi.s.sol:DeployKoiScript --rpc-url "https://koi-rpc.darwinia.network"
 deploy :; @forge script script/DeployKoi.s.sol:DeployKoiScript --rpc-url "https://koi-rpc.darwinia.network"  --broadcast
 
 .PHONY: all flat clean test salt deploy

README.md

@@ -6,7 +6,7 @@
 |  KTONStakingRewards  | 0x000000000419683a1a03AbC21FC9da25fd2B4dD7 |
 |  RewardsDistribution | 0x000000000Ae5DB7BDAf8D071e680452e33d91Dd5 |
 |  modlda/trsry        | 0x6d6f646c64612f74727372790000000000000000 |
-|  gKTON               | 0x01840055063E8d56C957b79C964D7fc50a825752 |
-|  KtonDAO             | 0x34D4519c574047c9D7F9E79b2bc718aef159129B |
-|  Timelock            | 0xCA435c493Ee55AB27e8C8b1b1a89706c5a2761b5 |
-|  KtonDAOVault        | 0x0DBFbb1Ab6e42F89661B4f98d5d0acdBE21d1ffC |
+|  gKTON               | 0x6FB1cE2dc2043FEc15d4d8A58cAF06a47A8f025F |
+|  KtonDAO             | 0xfe024E36B116bBFCb337BfD71a8C9e32330dA128 |
+|  Timelock            | 0x80dEE0851313a46b2a8604209B1f3225E1721c9a |
+|  KtonDAOVault        | 0xf1b4f3D438eE2B363C5ba1641A498709ff5780bA |

foundry.toml

@@ -2,7 +2,7 @@
 src = "src"
 out = "out"
 libs = ["lib"]
-sender = "0x39b974E540B5EBE88579AC2D2668233C39C964D2"
+sender = "0xb32832E2dBFa8f818db83Ec38FdBa4c08e46293f"
 force = true
 ffi = true
 ast = true

script/Deploy.s.sol

@@ -12,10 +12,10 @@ import {KtonTimelockController} from "../src/governance/KtonTimelockController.s
 import {KtonDAOVault} from "../src/staking/KtonDAOVault.sol";
 
 contract DeployScript is Script {
-    address gKTON = 0x01840055063E8d56C957b79C964D7fc50a825752;
-    address ktonDAO = 0x34D4519c574047c9D7F9E79b2bc718aef159129B;
-    address timelock = 0xCA435c493Ee55AB27e8C8b1b1a89706c5a2761b5;
-    address vault = 0x0DBFbb1Ab6e42F89661B4f98d5d0acdBE21d1ffC;
+    address gKTON = 0x6FB1cE2dc2043FEc15d4d8A58cAF06a47A8f025F;
+    address ktonDAO = 0xfe024E36B116bBFCb337BfD71a8C9e32330dA128;
+    address timelock = 0x80dEE0851313a46b2a8604209B1f3225E1721c9a;
+    address vault = 0xf1b4f3D438eE2B363C5ba1641A498709ff5780bA;
 
     function setUp() public {}
 

script/DeployKoi.s.sol

@@ -12,10 +12,10 @@ import {KtonTimelockController} from "../src/governance/KtonTimelockController.s
 import {KtonDAOVault} from "../src/staking/KtonDAOVault.sol";
 
 contract DeployKoiScript is Script {
-    address gKTON = 0x01840055063E8d56C957b79C964D7fc50a825752;
-    address ktonDAO = 0x34D4519c574047c9D7F9E79b2bc718aef159129B;
-    address timelock = 0xCA435c493Ee55AB27e8C8b1b1a89706c5a2761b5;
-    address vault = 0x0DBFbb1Ab6e42F89661B4f98d5d0acdBE21d1ffC;
+    address gKTON = 0x6FB1cE2dc2043FEc15d4d8A58cAF06a47A8f025F;
+    address ktonDAO = 0xfe024E36B116bBFCb337BfD71a8C9e32330dA128;
+    address timelock = 0x80dEE0851313a46b2a8604209B1f3225E1721c9a;
+    address vault = 0xf1b4f3D438eE2B363C5ba1641A498709ff5780bA;
 
     function setUp() public {}
 
@@ -44,10 +44,10 @@ contract DeployKoiScript is Script {
         safeconsole.log("KtonDAO_Logic: ", Upgrades.getImplementationAddress(ktonDAO_PROXY));
 
         uint256 minDelay = 0;
-        address[] memory proposers = new address[](1);
-        proposers[0] = ktonDAO;
+        address[] memory roles = new address[](1);
+        roles[0] = ktonDAO;
         KtonTimelockController timelockController =
-            new KtonTimelockController(minDelay, proposers, new address[](0), address(0));
+            new KtonTimelockController(minDelay, roles, roles, address(0));
         safeconsole.log("Timelock: ", address(timelockController));
 
         address KtonDAOVault_PROXY = Upgrades.deployTransparentProxy(