diff --git a/simulations/vip-405/abi/ACMCommandsAggregator.json b/simulations/vip-403/abi/ACMCommandsAggregator.json similarity index 100% rename from simulations/vip-405/abi/ACMCommandsAggregator.json rename to simulations/vip-403/abi/ACMCommandsAggregator.json diff --git a/simulations/vip-405/abi/AccessControlManager.json b/simulations/vip-403/abi/AccessControlManager.json similarity index 100% rename from simulations/vip-405/abi/AccessControlManager.json rename to simulations/vip-403/abi/AccessControlManager.json diff --git a/simulations/vip-405/abi/OmnichainProposalSender.json b/simulations/vip-403/abi/OmnichainProposalSender.json similarity index 100% rename from simulations/vip-405/abi/OmnichainProposalSender.json rename to simulations/vip-403/abi/OmnichainProposalSender.json diff --git a/simulations/vip-405/arbitrumone.ts b/simulations/vip-403/arbitrumone.ts similarity index 88% rename from simulations/vip-405/arbitrumone.ts rename to simulations/vip-403/arbitrumone.ts index f4ff12cd0..5fca5ca8a 100644 --- a/simulations/vip-405/arbitrumone.ts +++ b/simulations/vip-403/arbitrumone.ts @@ -4,14 +4,14 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { ARBITRUM_ACM, ARBITRUM_ACM_AGGREGATOR, DEFAULT_ADMIN_ROLE } from "../../vips/vip-405/bscmainnet"; +import vip403, { ARBITRUM_ACM, ARBITRUM_ACM_AGGREGATOR, DEFAULT_ADMIN_ROLE } from "../../vips/vip-403/bscmainnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; const { arbitrumone } = NETWORK_ADDRESSES; forking(280572842, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionGranted"], [2]); await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [4]); diff --git a/simulations/vip-405/arbitrumsepolia.ts b/simulations/vip-403/arbitrumsepolia.ts similarity index 91% rename from simulations/vip-405/arbitrumsepolia.ts rename to simulations/vip-403/arbitrumsepolia.ts index 13afeb5af..f9dfbe3dd 100644 --- a/simulations/vip-405/arbitrumsepolia.ts +++ b/simulations/vip-403/arbitrumsepolia.ts @@ -4,18 +4,18 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { +import vip403, { ARBITRUMSEPOLIA_ACM_AGGREGATOR, ARBITRUM_SEPOLIA_ACM, DEFAULT_ADMIN_ROLE, -} from "../../vips/vip-405/bsctestnet"; +} from "../../vips/vip-403/bsctestnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; const { arbitrumsepolia } = NETWORK_ADDRESSES; forking(101407909, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionGranted"], [2]); await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [4]); diff --git a/simulations/vip-405/bscmainnet.ts b/simulations/vip-403/bscmainnet.ts similarity index 90% rename from simulations/vip-405/bscmainnet.ts rename to simulations/vip-403/bscmainnet.ts index b102b7061..22256c590 100644 --- a/simulations/vip-405/bscmainnet.ts +++ b/simulations/vip-403/bscmainnet.ts @@ -4,7 +4,7 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "../../src/utils"; import { forking, testVip } from "../../src/vip-framework"; -import vip405, { BSC_ACM, BSC_ACM_AGGREGATOR, DEFAULT_ADMIN_ROLE } from "../../vips/vip-405/bscmainnet"; +import vip403, { BSC_ACM, BSC_ACM_AGGREGATOR, DEFAULT_ADMIN_ROLE } from "../../vips/vip-403/bscmainnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; import OMNICHAIN_PROPOSAL_SENDER_ABI from "./abi/OmnichainProposalSender.json"; @@ -13,7 +13,7 @@ const { bscmainnet } = NETWORK_ADDRESSES; const GUARDIAN3 = "0x3a3284dc0faffb0b5f0d074c4c704d14326c98cf"; forking(44521298, async () => { - testVip("VIP 405 Multichain Governance - Permissions", await vip405(), { + testVip("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents( txResponse, diff --git a/simulations/vip-405/bsctestnet.ts b/simulations/vip-403/bsctestnet.ts similarity index 86% rename from simulations/vip-405/bsctestnet.ts rename to simulations/vip-403/bsctestnet.ts index 82f5a832a..939c4bf82 100644 --- a/simulations/vip-405/bsctestnet.ts +++ b/simulations/vip-403/bsctestnet.ts @@ -1,12 +1,12 @@ import { expectEvents } from "../../src/utils"; import { forking, testVip } from "../../src/vip-framework"; -import vip405 from "../../vips/vip-405/bsctestnet"; +import vip403 from "../../vips/vip-403/bsctestnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; import OMNICHAIN_PROPOSAL_SENDER_ABI from "./abi/OmnichainProposalSender.json"; forking(46024012, async () => { - testVip("VIP 405 Multichain Governance - Permissions", await vip405(), { + testVip("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents( txResponse, diff --git a/simulations/vip-405/ethereum.ts b/simulations/vip-403/ethereum.ts similarity index 88% rename from simulations/vip-405/ethereum.ts rename to simulations/vip-403/ethereum.ts index f4200fcf4..b128cc165 100644 --- a/simulations/vip-405/ethereum.ts +++ b/simulations/vip-403/ethereum.ts @@ -4,14 +4,14 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { DEFAULT_ADMIN_ROLE, ETHEREUM_ACM, ETHEREUM_ACM_AGGREGATOR } from "../../vips/vip-405/bscmainnet"; +import vip403, { DEFAULT_ADMIN_ROLE, ETHEREUM_ACM, ETHEREUM_ACM_AGGREGATOR } from "../../vips/vip-403/bscmainnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; const { ethereum } = NETWORK_ADDRESSES; forking(21327971, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionGranted"], [2]); await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [4]); diff --git a/simulations/vip-405/opbnbmainnet.ts b/simulations/vip-403/opbnbmainnet.ts similarity index 87% rename from simulations/vip-405/opbnbmainnet.ts rename to simulations/vip-403/opbnbmainnet.ts index 6b7ea2638..9a8cf8b6e 100644 --- a/simulations/vip-405/opbnbmainnet.ts +++ b/simulations/vip-403/opbnbmainnet.ts @@ -4,14 +4,14 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { DEFAULT_ADMIN_ROLE, OPBNB_ACM, OPBNB_ACM_AGGREGATOR } from "../../vips/vip-405/bscmainnet"; +import vip403, { DEFAULT_ADMIN_ROLE, OPBNB_ACM, OPBNB_ACM_AGGREGATOR } from "../../vips/vip-403/bscmainnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; const { opbnbmainnet } = NETWORK_ADDRESSES; forking(41392857, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [4]); await expectEvents(txResponse, [ACM_COMMANDS_AGGREGATOR_ABI], ["RevokePermissionsExecuted"], [1]); diff --git a/simulations/vip-405/opbnbtestnet.ts b/simulations/vip-403/opbnbtestnet.ts similarity index 90% rename from simulations/vip-405/opbnbtestnet.ts rename to simulations/vip-403/opbnbtestnet.ts index 3d7f1ee8e..98cd47944 100644 --- a/simulations/vip-405/opbnbtestnet.ts +++ b/simulations/vip-403/opbnbtestnet.ts @@ -4,18 +4,18 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { +import vip403, { DEFAULT_ADMIN_ROLE, OPBNBTESTNET_ACM, OPBNBTESTNET_ACM_AGGREGATOR, -} from "../../vips/vip-405/bsctestnet"; +} from "../../vips/vip-403/bsctestnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; const { opbnbtestnet } = NETWORK_ADDRESSES; forking(45916044, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [4]); await expectEvents(txResponse, [ACM_COMMANDS_AGGREGATOR_ABI], ["RevokePermissionsExecuted"], [1]); diff --git a/simulations/vip-405/opmainnet.ts b/simulations/vip-403/opmainnet.ts similarity index 92% rename from simulations/vip-405/opmainnet.ts rename to simulations/vip-403/opmainnet.ts index 51643a3e5..f4c84c17d 100644 --- a/simulations/vip-405/opmainnet.ts +++ b/simulations/vip-403/opmainnet.ts @@ -4,7 +4,7 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { DEFAULT_ADMIN_ROLE, OPMAINNET_ACM, OPMAINNET_ACM_AGGREGATOR } from "../../vips/vip-405/bscmainnet"; +import vip403, { DEFAULT_ADMIN_ROLE, OPMAINNET_ACM, OPMAINNET_ACM_AGGREGATOR } from "../../vips/vip-403/bscmainnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; @@ -13,7 +13,7 @@ const FAST_TRACK_TIMELOCK = "0x508bD9C31E8d6760De04c70fe6c2b24B3cDea7E7"; const CRITICAL_TIMELOCK = "0xB82479bc345CAA7326D7d21306972033226fC185"; forking(128771016, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionGranted"], [190]); await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [50]); diff --git a/simulations/vip-405/opsepolia.ts b/simulations/vip-403/opsepolia.ts similarity index 89% rename from simulations/vip-405/opsepolia.ts rename to simulations/vip-403/opsepolia.ts index 42854c97e..3ea5e8a41 100644 --- a/simulations/vip-405/opsepolia.ts +++ b/simulations/vip-403/opsepolia.ts @@ -4,14 +4,14 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { DEFAULT_ADMIN_ROLE, OPSEPOLIA_ACM, OPSEPOLIA_ACM_AGGREGATOR } from "../../vips/vip-405/bsctestnet"; +import vip403, { DEFAULT_ADMIN_ROLE, OPSEPOLIA_ACM, OPSEPOLIA_ACM_AGGREGATOR } from "../../vips/vip-403/bsctestnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; const { opsepolia } = NETWORK_ADDRESSES; forking(20483821, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionGranted"], [184]); await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [50]); diff --git a/simulations/vip-405/sepolia.ts b/simulations/vip-403/sepolia.ts similarity index 88% rename from simulations/vip-405/sepolia.ts rename to simulations/vip-403/sepolia.ts index b07a541b6..53e4bf461 100644 --- a/simulations/vip-405/sepolia.ts +++ b/simulations/vip-403/sepolia.ts @@ -4,14 +4,14 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { DEFAULT_ADMIN_ROLE, SEPOLIA_ACM, SEPOLIA_ACM_AGGREGATOR } from "../../vips/vip-405/bsctestnet"; +import vip403, { DEFAULT_ADMIN_ROLE, SEPOLIA_ACM, SEPOLIA_ACM_AGGREGATOR } from "../../vips/vip-403/bsctestnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; const { sepolia } = NETWORK_ADDRESSES; forking(7169767, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionGranted"], [2]); await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [4]); diff --git a/simulations/vip-405/zksyncmainnet.ts b/simulations/vip-403/zksyncmainnet.ts similarity index 92% rename from simulations/vip-405/zksyncmainnet.ts rename to simulations/vip-403/zksyncmainnet.ts index 9cb123bd6..c21a25251 100644 --- a/simulations/vip-405/zksyncmainnet.ts +++ b/simulations/vip-403/zksyncmainnet.ts @@ -4,7 +4,7 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { DEFAULT_ADMIN_ROLE, ZKSYNC_ACM, ZKSYNC_ACM_AGGREGATOR } from "../../vips/vip-405/bscmainnet"; +import vip403, { DEFAULT_ADMIN_ROLE, ZKSYNC_ACM, ZKSYNC_ACM_AGGREGATOR } from "../../vips/vip-403/bscmainnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; @@ -13,7 +13,7 @@ const FAST_TRACK_TIMELOCK = "0x32f71c95BC8F9d996f89c642f1a84d06B2484AE9"; const CRITICAL_TIMELOCK = "0xbfbc79D4198963e4a66270F3EfB1fdA0F382E49c"; forking(50316022, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionGranted"], [190]); await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [54]); diff --git a/simulations/vip-405/zksyncsepolia.ts b/simulations/vip-403/zksyncsepolia.ts similarity index 92% rename from simulations/vip-405/zksyncsepolia.ts rename to simulations/vip-403/zksyncsepolia.ts index ccc94cf72..9dcadb953 100644 --- a/simulations/vip-405/zksyncsepolia.ts +++ b/simulations/vip-403/zksyncsepolia.ts @@ -4,18 +4,18 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses"; import { expectEvents } from "src/utils"; import { forking, testForkedNetworkVipCommands } from "src/vip-framework"; -import vip405, { +import vip403, { DEFAULT_ADMIN_ROLE, ZKSYNCSEPOLIA_ACM, ZKSYNCSEPOLIA_ACM_AGGREGATOR, -} from "../../vips/vip-405/bsctestnet"; +} from "../../vips/vip-403/bsctestnet"; import ACM_COMMANDS_AGGREGATOR_ABI from "./abi/ACMCommandsAggregator.json"; import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json"; const { zksyncsepolia } = NETWORK_ADDRESSES; forking(4236122, async () => { - testForkedNetworkVipCommands("VIP 405 Multichain Governance - Permissions", await vip405(), { + testForkedNetworkVipCommands("VIP 403 Multichain Governance - Permissions", await vip403(), { callbackAfterExecution: async txResponse => { await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionGranted"], [190]); await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["PermissionRevoked"], [54]); diff --git a/vips/vip-405/bscmainnet.ts b/vips/vip-403/bscmainnet.ts similarity index 99% rename from vips/vip-405/bscmainnet.ts rename to vips/vip-403/bscmainnet.ts index 169702244..da636bc76 100644 --- a/vips/vip-405/bscmainnet.ts +++ b/vips/vip-403/bscmainnet.ts @@ -17,7 +17,7 @@ export const BSC_ACM_AGGREGATOR = "0x8b443Ea6726E56DF4C4F62f80F0556bB9B2a7c64"; export const DEFAULT_ADMIN_ROLE = "0x0000000000000000000000000000000000000000000000000000000000000000"; -const vip405 = () => { +const vip403 = () => { const meta = { version: "v2", title: "VIP-405 Multichain Governance - Permissions on Optimism and Zksync", @@ -167,4 +167,4 @@ const vip405 = () => { ProposalType.REGULAR, ); }; -export default vip405; +export default vip403; diff --git a/vips/vip-405/bsctestnet.ts b/vips/vip-403/bsctestnet.ts similarity index 98% rename from vips/vip-405/bsctestnet.ts rename to vips/vip-403/bsctestnet.ts index 26f639d5d..32ee712f5 100644 --- a/vips/vip-405/bsctestnet.ts +++ b/vips/vip-403/bsctestnet.ts @@ -17,10 +17,10 @@ export const BSCTESTNET_ACM_AGGREGATOR = "0xB59523628D92f914ec6624Be4281397E8aFD export const DEFAULT_ADMIN_ROLE = "0x0000000000000000000000000000000000000000000000000000000000000000"; -const vip405 = () => { +const vip403 = () => { const meta = { version: "v2", - title: "VIP-405 Multichain Governance", + title: "VIP-403 Multichain Governance", description: `#### Summary`, forDescription: "I agree that Venus Protocol should proceed with this proposal", @@ -167,4 +167,4 @@ const vip405 = () => { ProposalType.REGULAR, ); }; -export default vip405; +export default vip403;