diff --git a/addresses/1.json b/addresses/1.json index 1d12275..a0aeaef 100644 --- a/addresses/1.json +++ b/addresses/1.json @@ -69,11 +69,6 @@ "name": "C_ETHER", "isContract": true }, - { - "addr": "0xCe90BA68BbcdCCe9aed1fCDDcb114d1DCdBc68C9", - "isContract": true, - "name": "TIMELOCK_FACTORY" - }, { "addr": "0x56b6d03b995022A612aF6a212C74902f233F52Cc", "isContract": true, @@ -85,18 +80,23 @@ "name": "GUARD" }, { - "addr": "0xE138136bFF8c6A9337805DE19177E3b29fef2783", + "addr": "0x146dfd96Da039FDE3B58D5964feF8E8357df2028", "isContract": true, - "name": "INSTANCE_DEPLOYER" + "name": "BYTES_HELPER" }, { - "addr": "0xd1db2c4A9d2BEBd56d42E59F2d90F4136164faD6", + "addr": "0x7bf01931C555149AF6ec49b80C60c0078909403d", "isContract": true, - "name": "ADDRESS_CALCULATION" + "name": "TIMELOCK_FACTORY" }, { - "addr": "0x146dfd96Da039FDE3B58D5964feF8E8357df2028", + "addr": "0x420268db92Ba7e60E6a4b39eC436d4163600e78b", "isContract": true, - "name": "BYTES_HELPER" + "name": "INSTANCE_DEPLOYER" + }, + { + "addr": "0x12B70ceCc7793E7fD97bE4786c371CFe4203fBFA", + "isContract": true, + "name": "ADDRESS_CALCULATION" } ] \ No newline at end of file diff --git a/addresses/10.json b/addresses/10.json index f9cf9ea..a3c8017 100644 --- a/addresses/10.json +++ b/addresses/10.json @@ -24,11 +24,6 @@ "name": "BYTES_HELPER", "isContract": true }, - { - "addr": "0xCe90BA68BbcdCCe9aed1fCDDcb114d1DCdBc68C9", - "isContract": true, - "name": "TIMELOCK_FACTORY" - }, { "addr": "0x56b6d03b995022A612aF6a212C74902f233F52Cc", "isContract": true, @@ -40,12 +35,17 @@ "name": "GUARD" }, { - "addr": "0xE138136bFF8c6A9337805DE19177E3b29fef2783", + "addr": "0x7bf01931C555149AF6ec49b80C60c0078909403d", + "isContract": true, + "name": "TIMELOCK_FACTORY" + }, + { + "addr": "0x420268db92Ba7e60E6a4b39eC436d4163600e78b", "isContract": true, "name": "INSTANCE_DEPLOYER" }, { - "addr": "0xd1db2c4A9d2BEBd56d42E59F2d90F4136164faD6", + "addr": "0x12B70ceCc7793E7fD97bE4786c371CFe4203fBFA", "isContract": true, "name": "ADDRESS_CALCULATION" } diff --git a/addresses/8453.json b/addresses/8453.json index 3e952ab..dde7258 100644 --- a/addresses/8453.json +++ b/addresses/8453.json @@ -25,29 +25,29 @@ "isContract": true }, { - "addr": "0xE138136bFF8c6A9337805DE19177E3b29fef2783", + "addr": "0x56b6d03b995022A612aF6a212C74902f233F52Cc", "isContract": true, - "name": "INSTANCE_DEPLOYER" + "name": "RECOVERY_SPELL_FACTORY" }, { - "addr": "0xd1db2c4A9d2BEBd56d42E59F2d90F4136164faD6", + "addr": "0xFE49DD6d0CD41C4EC8F151C79f2d4019f5C5AD18", "isContract": true, - "name": "ADDRESS_CALCULATION" + "name": "GUARD" }, { - "addr": "0xCe90BA68BbcdCCe9aed1fCDDcb114d1DCdBc68C9", + "addr": "0x7bf01931C555149AF6ec49b80C60c0078909403d", "isContract": true, "name": "TIMELOCK_FACTORY" }, { - "addr": "0x56b6d03b995022A612aF6a212C74902f233F52Cc", + "addr": "0x420268db92Ba7e60E6a4b39eC436d4163600e78b", "isContract": true, - "name": "RECOVERY_SPELL_FACTORY" + "name": "INSTANCE_DEPLOYER" }, { - "addr": "0xFE49DD6d0CD41C4EC8F151C79f2d4019f5C5AD18", + "addr": "0x12B70ceCc7793E7fD97bE4786c371CFe4203fBFA", "isContract": true, - "name": "GUARD" + "name": "ADDRESS_CALCULATION" }, { "addr": "0x146dfd96Da039FDE3B58D5964feF8E8357df2028", diff --git a/src/deploy/SystemDeploy.s.sol b/src/deploy/SystemDeploy.s.sol index 0430f72..8d205ce 100644 --- a/src/deploy/SystemDeploy.s.sol +++ b/src/deploy/SystemDeploy.s.sol @@ -41,7 +41,7 @@ contract SystemDeploy is MultisigProposal { using BytesHelper for bytes; bytes32 public salt = - 0x0000000000000000000000000000000000000000000000000000000000003afe; + 0xe3e3000000000000000000000000000000000000000000000000000000003afe; bytes4 public pattern = 0xa2646970; constructor() { diff --git a/src/utils/Constants.sol b/src/utils/Constants.sol index fa2ddfa..60525b4 100644 --- a/src/utils/Constants.sol +++ b/src/utils/Constants.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.25; uint256 constant _DONE_TIMESTAMP = uint256(1); /// @dev minimum delay for timelocked operations -uint256 constant MIN_DELAY = 1 days; +uint256 constant MIN_DELAY = 10 seconds; /// @dev maximum delay for timelocked operations uint256 constant MAX_DELAY = 30 days;