From 63ba863dcf322b2cf04d7dcaf6d8905bf28de6bc Mon Sep 17 00:00:00 2001 From: Daniel Wang <99078276+dantaik@users.noreply.github.com> Date: Thu, 24 Oct 2024 15:47:33 +0800 Subject: [PATCH] chore(protoco): remove unused delegate owner deployment (#18290) Co-authored-by: David --- .../protocol/deployments/mainnet-contract-logs-L2.md | 12 +----------- .../script/layer1/SendMessageToDelegateOwner.s.sol | 5 ++--- .../protocol/script/layer2/DeployDelegateOwner.s.sol | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/packages/protocol/deployments/mainnet-contract-logs-L2.md b/packages/protocol/deployments/mainnet-contract-logs-L2.md index 153a3ca187..ecfb81db0b 100644 --- a/packages/protocol/deployments/mainnet-contract-logs-L2.md +++ b/packages/protocol/deployments/mainnet-contract-logs-L2.md @@ -41,7 +41,7 @@ - set erc1155_vault@1 to `0xaf145913EA4a56BE22E120ED9C24589659881702` @tx`0x4a16a8a7d02f696b753208bbf8e7e3501d6b70b9a764fa2b4e115add46c13cb3` - changed owner to `0xCa5b76Cc7A38b86Db11E5aE5B1fc9740c3bA3DE8` @tx`0xf68861171c602e3e75ca69e950957fcb908c7949c6df9a9ea3026c238ebb1e9c` - register `taiko_token` to `0xA9d23408b9bA935c230493c40C73824Df71A0975` @tx`0xc77434f4e37959cdc0eac125303b78dd192d8727173373cc7a6158ca7d829dad` - - register `bridged_erc20` to `0x98161D67f762A9E589E502348579FA38B1Ac47A8` @tx`` + - register `bridged_erc20` to `0x98161D67f762A9E589E502348579FA38B1Ac47A8` @tx`0xf377885a94467d520bd765a186d3c3524099fe28e936d05656d0da2509628e65` #### bridge @@ -116,16 +116,6 @@ - todo: - change owner to DelegateOwner -#### delegate_owner - -- proxy: `0x5995941Df88F30Ac140515AA39832db963E2f863` -- impl: `0x1f0511cDae2fbfD93563469dA02b82dEd320C8Bd` -- admin: `0x3c181965C5cFAE61a9010A283e5e0C1445649810` // owned by Daniel W -- remoteOwner: `0x3c181965C5cFAE61a9010A283e5e0C1445649810` // owned by Daniel W -- todo: - - test various use cases - - transfer remote owner to `admin.taiko.eth` - ## Rollup Specific #### rollup_address_manager (ram) diff --git a/packages/protocol/script/layer1/SendMessageToDelegateOwner.s.sol b/packages/protocol/script/layer1/SendMessageToDelegateOwner.s.sol index c5989001fe..65f6421c02 100644 --- a/packages/protocol/script/layer1/SendMessageToDelegateOwner.s.sol +++ b/packages/protocol/script/layer1/SendMessageToDelegateOwner.s.sol @@ -11,7 +11,7 @@ contract SendMessageToDelegateOwner is Script { address public delegateOwnerImpl = 0x1f0511cDae2fbfD93563469dA02b82dEd320C8Bd; address public multicall3 = 0xcA11bde05977b3631167028862bE2a173976CA11; address public l1Bridge = 0xd60247c6848B7Ca29eDdF63AA924E53dB6Ddd8EC; - address public testAccount1 = 0x3c181965C5cFAE61a9010A283e5e0C1445649810; // owned by Daniel W + address public testAccount1 = vm.envAddress("TEST_ACCOUNT1"); modifier broadcast() { vm.startBroadcast(); @@ -23,8 +23,7 @@ contract SendMessageToDelegateOwner is Script { Multicall3.Call3[] memory calls = new Multicall3.Call3[](2); calls[0].target = delegateOwner; calls[0].allowFailure = false; - calls[0].callData = - abi.encodeCall(DelegateOwner.setAdmin, (0x4757D97449acA795510b9f3152C6a9019A3545c3)); + calls[0].callData = abi.encodeCall(DelegateOwner.setAdmin, (testAccount1)); calls[1].target = delegateOwner; calls[1].allowFailure = false; diff --git a/packages/protocol/script/layer2/DeployDelegateOwner.s.sol b/packages/protocol/script/layer2/DeployDelegateOwner.s.sol index 79da323364..97b325f90e 100644 --- a/packages/protocol/script/layer2/DeployDelegateOwner.s.sol +++ b/packages/protocol/script/layer2/DeployDelegateOwner.s.sol @@ -7,7 +7,7 @@ import "src/layer2/DelegateOwner.sol"; // forge script --rpc-url https://rpc.mainnet.taiko.xyz script/DeployDelegateOwner.s.sol contract DeployDelegateOwner is DeployCapability { address public l2Sam = 0x1670000000000000000000000000000000000006; - address public testAccount2 = 0x3c181965C5cFAE61a9010A283e5e0C1445649810; // owned by Daniel W + address public testAccount2 = vm.envAddress("TEST_ACCOUNT2"); address public l1Owner = testAccount2; address public l2Admin = testAccount2;