diff --git a/hardhat.config.ts b/hardhat.config.ts index a2688ae9a..2351f5c96 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -28,7 +28,6 @@ const BLOCK_GAS_LIMIT_PER_NETWORK = { opbnbmainnet: 100000000, arbitrumsepolia: 30000000, arbitrumone: 30000000, - xlayertestnet: 30000000, opsepolia: 30000000, opmainnet: 30000000, }; @@ -151,16 +150,6 @@ const config: HardhatUserConfig = { chainId: 42161, accounts: DEPLOYER_PRIVATE_KEY ? [`0x${DEPLOYER_PRIVATE_KEY}`] : [], }, - xlayertestnet: { - url: process.env.ARCHIVE_NODE_xlayertestnet || "https://testrpc.xlayer.tech/", - chainId: 195, - accounts: DEPLOYER_PRIVATE_KEY ? [`0x${DEPLOYER_PRIVATE_KEY}`] : [], - }, - xlayermainnet: { - url: process.env.ARCHIVE_NODE_xlayermainnet || "https://rpc.xlayer.tech/", - chainId: 196, - accounts: DEPLOYER_PRIVATE_KEY ? [`0x${DEPLOYER_PRIVATE_KEY}`] : [], - }, opsepolia: { url: process.env.ARCHIVE_NODE_opsepolia || "https://sepolia.optimism.io", chainId: 11155420, diff --git a/multisig/proposals/xlayertestnet/vip-000/index.ts b/multisig/proposals/xlayertestnet/vip-000/index.ts deleted file mode 100644 index 9b11431c2..000000000 --- a/multisig/proposals/xlayertestnet/vip-000/index.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { makeProposal } from "src/utils"; - -const TREASURY = "0x740aF73D4AB6300dc4c8D707a424EFC5f1bd04DA"; - -const vip000 = () => { - return makeProposal([ - { - target: TREASURY, - signature: "acceptOwnership()", - params: [], - }, - ]); -}; - -export default vip000; diff --git a/multisig/simulations/xlayertestnet/index.ts b/multisig/simulations/xlayertestnet/index.ts deleted file mode 100644 index bddb6e5cb..000000000 --- a/multisig/simulations/xlayertestnet/index.ts +++ /dev/null @@ -1 +0,0 @@ -import "./vip-000"; diff --git a/multisig/simulations/xlayertestnet/vip-000/abi/treasury.json b/multisig/simulations/xlayertestnet/vip-000/abi/treasury.json deleted file mode 100644 index 18aabb61a..000000000 --- a/multisig/simulations/xlayertestnet/vip-000/abi/treasury.json +++ /dev/null @@ -1,86 +0,0 @@ -[ - { "inputs": [], "name": "ZeroAddressNotAllowed", "type": "error" }, - { - "anonymous": false, - "inputs": [ - { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" }, - { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" } - ], - "name": "OwnershipTransferStarted", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" }, - { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" } - ], - "name": "OwnershipTransferred", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { "indexed": false, "internalType": "uint256", "name": "withdrawAmount", "type": "uint256" }, - { "indexed": true, "internalType": "address", "name": "withdrawAddress", "type": "address" } - ], - "name": "WithdrawTreasuryNative", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { "indexed": true, "internalType": "address", "name": "tokenAddress", "type": "address" }, - { "indexed": false, "internalType": "uint256", "name": "withdrawAmount", "type": "uint256" }, - { "indexed": true, "internalType": "address", "name": "withdrawAddress", "type": "address" } - ], - "name": "WithdrawTreasuryToken", - "type": "event" - }, - { "stateMutability": "payable", "type": "fallback" }, - { "inputs": [], "name": "acceptOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, - { - "inputs": [], - "name": "owner", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "pendingOwner", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], - "stateMutability": "view", - "type": "function" - }, - { "inputs": [], "name": "renounceOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, - { - "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { "internalType": "uint256", "name": "withdrawAmount", "type": "uint256" }, - { "internalType": "address payable", "name": "withdrawAddress", "type": "address" } - ], - "name": "withdrawTreasuryNative", - "outputs": [], - "stateMutability": "payable", - "type": "function" - }, - { - "inputs": [ - { "internalType": "address", "name": "tokenAddress", "type": "address" }, - { "internalType": "uint256", "name": "withdrawAmount", "type": "uint256" }, - { "internalType": "address", "name": "withdrawAddress", "type": "address" } - ], - "name": "withdrawTreasuryToken", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { "stateMutability": "payable", "type": "receive" } -] diff --git a/multisig/simulations/xlayertestnet/vip-000/index.ts b/multisig/simulations/xlayertestnet/vip-000/index.ts deleted file mode 100644 index 02db3aee1..000000000 --- a/multisig/simulations/xlayertestnet/vip-000/index.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { expect } from "chai"; -import { Contract } from "ethers"; -import { ethers } from "hardhat"; -import { NETWORK_ADDRESSES } from "src/networkAddresses"; -import { forking, pretendExecutingVip } from "src/vip-framework"; - -import vip000 from "../../../proposals/xlayertestnet/vip-000"; -import TREASURY_ABI from "./abi/treasury.json"; - -const TREASURY = "0x740aF73D4AB6300dc4c8D707a424EFC5f1bd04DA"; - -forking(14403492, async () => { - let treasury: Contract; - - before(async () => { - treasury = await ethers.getContractAt(TREASURY_ABI, TREASURY); - await pretendExecutingVip(await vip000()); - }); - - describe("Post tx checks", () => { - it("Should set owner to multisig", async () => { - const owner = await treasury.owner(); - expect(owner).equals(NETWORK_ADDRESSES.xlayertestnet.NORMAL_TIMELOCK); - }); - }); -}); diff --git a/src/multisig/utils.ts b/src/multisig/utils.ts index 6f858262f..f997e260b 100644 --- a/src/multisig/utils.ts +++ b/src/multisig/utils.ts @@ -86,18 +86,6 @@ export const getContractNetworks = (chainId: number): ContractNetworksConfig => simulateTxAccessorAddress: "0xd55A98150e0F9f5e3F6280FC25617A5C93d96007", }, }, - xlayertestnet: { - [chainId]: { - safeMasterCopyAddress: "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", - safeProxyFactoryAddress: "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", - multiSendAddress: "0x998739BFdAAdde7C933B942a68053933098f9EDa", - multiSendCallOnlyAddress: "0xA1dabEF33b3B82c7814B6D82A79e50F4AC44102B", - fallbackHandlerAddress: "0x017062a1dE2FE6b99BE3d9d37841FeD19F573804", - signMessageLibAddress: "0x98FFBBF51bb33A056B08ddf711f289936AafF717", - createCallAddress: "0xB19D6FFc2182150F8Eb585b79D4ABcd7C5640A9d", - simulateTxAccessorAddress: "0x727a77a074D1E6c4530e814F89E618a3298FC044", - }, - }, zksyncsepolia: { [chainId]: { safeMasterCopyAddress: "0x3844DF536332845c0df8E9DD99dD7f21c9B6A271", diff --git a/src/networkAddresses.ts b/src/networkAddresses.ts index 9d0548028..761c7cbdb 100644 --- a/src/networkAddresses.ts +++ b/src/networkAddresses.ts @@ -162,10 +162,6 @@ export const NETWORK_ADDRESSES = { LZ_LIBRARY: "0x4D73AdB72bC3DD368966edD0f0b2148401A178E2", OMNICHAIN_GOVERNANCE_EXECUTOR: "0xc1858cCE6c28295Efd3eE742795bDa316D7c7526", }, - xlayertestnet: { - NORMAL_TIMELOCK: "0x5961449d63149035aCfC0714D5155f24C9819004", // xlayer testnet Multisig - GUARDIAN: "0x5961449d63149035aCfC0714D5155f24C9819004", - }, zksyncsepolia: { NORMAL_TIMELOCK: "", // To be deployed GUARDIAN: "0xa2f83de95E9F28eD443132C331B6a9C9B7a9F866", diff --git a/src/networkConfig.ts b/src/networkConfig.ts index 5d9944838..de796316e 100644 --- a/src/networkConfig.ts +++ b/src/networkConfig.ts @@ -65,14 +65,6 @@ export const NETWORK_CONFIG = { }, XVS_VAULT_POOL_ID: 0, }, - xlayertestnet: { - DELAY_BLOCKS: { - [ProposalType.REGULAR]: 200, - [ProposalType.FAST_TRACK]: 100, - [ProposalType.CRITICAL]: 34, - }, - XVS_VAULT_POOL_ID: 0, - }, zksyncsepolia: { DELAY_BLOCKS: { [ProposalType.REGULAR]: 200, diff --git a/src/types.ts b/src/types.ts index bcc60a571..578cf789b 100644 --- a/src/types.ts +++ b/src/types.ts @@ -7,7 +7,6 @@ export type SUPPORTED_NETWORKS = | "ethereum" | "opbnbtestnet" | "opbnbmainnet" - | "xlayertestnet" | "zksyncsepolia"; export type REMOTE_NETWORKS =