Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(protocol): remove more timelock related code #17018

Merged
merged 2 commits into from
May 7, 2024
Merged

refactor(protocol): remove more timelock related code #17018

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d63aab
feat(protocol): remove more timelock related code
davidtaikocha May 7, 2024
b901e7e
feat: update
davidtaikocha May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 5 additions & 35 deletions packages/protocol/script/SetRemoteBridgeSuites.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import "../test/DeployCapability.sol";
contract SetRemoteBridgeSuites is DeployCapability {
uint256 public privateKey = vm.envUint("PRIVATE_KEY");
uint256 public securityCouncilPrivateKey = vm.envUint("SECURITY_COUNCIL_PRIVATE_KEY");
address public timelockAddress = vm.envAddress("TIMELOCK_ADDRESS");
address public addressManagerAddress = vm.envAddress("ADDRESS_MANAGER_ADDRESS");
uint256[] public remoteChainIDs = vm.envUint("REMOTE_CHAIN_IDS", ",");
address[] public remoteSignalServices = vm.envAddress("REMOTE_SIGNAL_SERVICES", ",");
Expand Down Expand Up @@ -40,42 +39,13 @@ contract SetRemoteBridgeSuites is DeployCapability {

for (uint256 i; i < remoteChainIDs.length; ++i) {
uint64 chainid = uint64(remoteChainIDs[i]);

if (securityCouncilPrivateKey == 0) {
register(addressManagerAddress, "signal_service", remoteSignalServices[i], chainid);
register(addressManagerAddress, "bridge", remoteBridges[i], chainid);
register(addressManagerAddress, "erc20_vault", remoteERC20Vaults[i], chainid);
register(addressManagerAddress, "erc721_vault", remoteERC721Vaults[i], chainid);
register(addressManagerAddress, "erc1155_vault", remoteERC1155Vaults[i], chainid);
continue;
}

registerByTimelock(
addressManagerAddress, "signal_service", remoteSignalServices[i], chainid
);
registerByTimelock(addressManagerAddress, "bridge", remoteBridges[i], chainid);
registerByTimelock(addressManagerAddress, "erc20_vault", remoteERC20Vaults[i], chainid);
registerByTimelock(
addressManagerAddress, "erc721_vault", remoteERC721Vaults[i], chainid
);
registerByTimelock(
addressManagerAddress, "erc1155_vault", remoteERC1155Vaults[i], chainid
);
register(addressManagerAddress, "signal_service", remoteSignalServices[i], chainid);
register(addressManagerAddress, "bridge", remoteBridges[i], chainid);
register(addressManagerAddress, "erc20_vault", remoteERC20Vaults[i], chainid);
register(addressManagerAddress, "erc721_vault", remoteERC721Vaults[i], chainid);
register(addressManagerAddress, "erc1155_vault", remoteERC1155Vaults[i], chainid);
}

vm.stopBroadcast();
}

function registerByTimelock(
address registerTo,
string memory name,
address addr,
uint64 chainId
)
internal
{
AddressManager(registerTo).setAddress(chainId, bytes32(bytes(name)), addr);
console2.log("> ", name, "@", registerTo);
console2.log("\t addr : ", addr);
}
}