feat: set description and ID for the VIP 407

VenusProtocol · Dec 14, 2024 · a65b8b3 · a65b8b3
1 parent fefcc63
commit a65b8b3
Show file tree

Hide file tree

Showing 25 changed files with 236 additions and 162 deletions.
diff --git a/hardhat.config.zksync.ts b/hardhat.config.zksync.ts
@@ -162,7 +162,7 @@ const config: HardhatUserConfig = {
     },
     zksynctestnode: {
       url: process.env.ZKSYNC_ERA_LOCAL_TEST_NODE || "http://localhost:8011",
-      chainId: 300, // change it to 324 for zksyncmainnet
+      chainId: 324, // change it to 324 for zksyncmainnet
       accounts: DEPLOYER_PRIVATE_KEY ? [`0x${DEPLOYER_PRIVATE_KEY}`] : [],
       blockGasLimit: BLOCK_GAS_LIMIT_PER_NETWORK.zksyncsepolia,
       timeout: 2000000000,

diff --git a/.../vip-500/abi/OmnichainProposalSender.json → .../vip-407/abi/OmnichainProposalSender.json b/.../vip-500/abi/OmnichainProposalSender.json → .../vip-407/abi/OmnichainProposalSender.json
diff --git a/simulations/vip-500/abi/XVS.json → simulations/vip-407/abi/XVS.json b/simulations/vip-500/abi/XVS.json → simulations/vip-407/abi/XVS.json
diff --git a/simulations/vip-500/abi/XVSBridgeAdmin.json → simulations/vip-407/abi/XVSBridgeAdmin.json b/simulations/vip-500/abi/XVSBridgeAdmin.json → simulations/vip-407/abi/XVSBridgeAdmin.json
diff --git a/simulations/vip-500/abi/XVSProxyOFTSrc.json → simulations/vip-407/abi/XVSProxyOFTSrc.json b/simulations/vip-500/abi/XVSProxyOFTSrc.json → simulations/vip-407/abi/XVSProxyOFTSrc.json
diff --git a/simulations/vip-500/abi/aggregator.json → simulations/vip-407/abi/aggregator.json b/simulations/vip-500/abi/aggregator.json → simulations/vip-407/abi/aggregator.json
diff --git a/simulations/vip-500/abi/redstoneOracle.json → simulations/vip-407/abi/redstoneOracle.json b/simulations/vip-500/abi/redstoneOracle.json → simulations/vip-407/abi/redstoneOracle.json
diff --git a/simulations/vip-500/abi/resilientOracle.json → simulations/vip-407/abi/resilientOracle.json b/simulations/vip-500/abi/resilientOracle.json → simulations/vip-407/abi/resilientOracle.json
diff --git a/simulations/vip-500/arbitrumone.ts → simulations/vip-407/arbitrumone.ts b/simulations/vip-500/arbitrumone.ts → simulations/vip-407/arbitrumone.ts
@@ -2,15 +2,15 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses";
 import { LzChainId } from "src/types";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bscmainnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bscmainnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(281666164, async () => {
   await checkXVSBridge(
     LzChainId.basemainnet,
     NETWORK_ADDRESSES.arbitrumone,
-    vip500,
+    vip407,
     BASE_MAINNET_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.arbitrumone) as RemoteBridgeEntry,
     MIN_DST_GAS,

diff --git a/simulations/vip-500/arbitrumsepolia.ts → simulations/vip-407/arbitrumsepolia.ts b/simulations/vip-500/arbitrumsepolia.ts → simulations/vip-407/arbitrumsepolia.ts
@@ -2,15 +2,15 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses";
 import { LzChainId } from "src/types";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bsctestnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bsctestnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(99339753, async () => {
   await checkXVSBridge(
     LzChainId.basesepolia,
     NETWORK_ADDRESSES.arbitrumsepolia,
-    vip500,
+    vip407,
     BASE_SEPOLIA_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.arbitrumsepolia) as RemoteBridgeEntry,
     MIN_DST_GAS,

diff --git a/simulations/vip-500/bscmainnet.ts → simulations/vip-407/bscmainnet.ts b/simulations/vip-500/bscmainnet.ts → simulations/vip-407/bscmainnet.ts
@@ -9,8 +9,8 @@ import { LzChainId } from "src/types";
 import { expectEvents, initMainnetUser, setMaxStalePeriod } from "src/utils";
 import { forking, testVip } from "src/vip-framework";
 
-import vip500, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bscmainnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bscmainnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import OMNICHAIN_PROPOSAL_SENDER_ABI from "./abi/OmnichainProposalSender.json";
 import XVS_ABI from "./abi/XVS.json";
 import XVS_BRIDGE_ADMIN_ABI from "./abi/XVSBridgeAdmin.json";
@@ -42,7 +42,7 @@ forking(44612269, async () => {
     resilientOracle = new ethers.Contract(bscmainnet.RESILIENT_ORACLE, RESILIENT_ORACLE_ABI, provider);
   });
 
-  testVip("vip-500 testnet", await vip500(), {
+  testVip("vip-407 testnet", await vip407(), {
     callbackAfterExecution: async (txResponse: TransactionResponse) => {
       await expectEvents(
         txResponse,

diff --git a/simulations/vip-500/bsctestnet.ts → simulations/vip-407/bsctestnet.ts b/simulations/vip-500/bsctestnet.ts → simulations/vip-407/bsctestnet.ts
@@ -9,8 +9,8 @@ import { LzChainId } from "src/types";
 import { expectEvents, initMainnetUser } from "src/utils";
 import { forking, testVip } from "src/vip-framework";
 
-import vip500, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bsctestnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bsctestnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import OMNICHAIN_PROPOSAL_SENDER_ABI from "./abi/OmnichainProposalSender.json";
 import XVS_ABI from "./abi/XVS.json";
 import XVS_BRIDGE_ADMIN_ABI from "./abi/XVSBridgeAdmin.json";
@@ -39,7 +39,7 @@ forking(45828866, async () => {
     defaultAdapterParams = ethers.utils.solidityPack(["uint16", "uint256"], [1, 300000]);
   });
 
-  testVip("vip-500 testnet", await vip500(), {
+  testVip("vip-407 testnet", await vip407(), {
     callbackAfterExecution: async (txResponse: TransactionResponse) => {
       await expectEvents(
         txResponse,

diff --git a/simulations/vip-500/checkXVSBridge.ts → simulations/vip-407/checkXVSBridge.ts b/simulations/vip-500/checkXVSBridge.ts → simulations/vip-407/checkXVSBridge.ts
@@ -7,7 +7,7 @@ import { Proposal } from "src/types";
 import { expectEvents, initMainnetUser, setMaxStalePeriod } from "src/utils";
 import { testForkedNetworkVipCommands } from "src/vip-framework";
 
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import XVS_ABI from "./abi/XVS.json";
 import XVS_BRIDGE_ADMIN_ABI from "./abi/XVSBridgeAdmin.json";
 import XVS_BRIDGE_SRC_ABI from "./abi/XVSProxyOFTSrc.json";

diff --git a/simulations/vip-500/ethereum.ts → simulations/vip-407/ethereum.ts b/simulations/vip-500/ethereum.ts → simulations/vip-407/ethereum.ts
@@ -2,15 +2,15 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses";
 import { LzChainId } from "src/types";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bscmainnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bscmainnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(21337633, async () => {
   await checkXVSBridge(
     LzChainId.basemainnet,
     NETWORK_ADDRESSES.ethereum,
-    vip500,
+    vip407,
     BASE_MAINNET_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.ethereum) as RemoteBridgeEntry,
     MIN_DST_GAS,

diff --git a/simulations/vip-500/opbnbmainnet.ts → simulations/vip-407/opbnbmainnet.ts b/simulations/vip-500/opbnbmainnet.ts → simulations/vip-407/opbnbmainnet.ts
@@ -2,15 +2,15 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses";
 import { LzChainId } from "src/types";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bscmainnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bscmainnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(41664108, async () => {
   await checkXVSBridge(
     LzChainId.basemainnet,
     NETWORK_ADDRESSES.opbnbmainnet,
-    vip500,
+    vip407,
     BASE_MAINNET_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.opbnbmainnet) as RemoteBridgeEntry,
     MIN_DST_GAS,

diff --git a/simulations/vip-500/opbnbtestnet.ts → simulations/vip-407/opbnbtestnet.ts b/simulations/vip-500/opbnbtestnet.ts → simulations/vip-407/opbnbtestnet.ts
@@ -2,15 +2,15 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses";
 import { LzChainId } from "src/types";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bsctestnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bsctestnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(45337620, async () => {
   await checkXVSBridge(
     LzChainId.basesepolia,
     NETWORK_ADDRESSES.opbnbtestnet,
-    vip500,
+    vip407,
     BASE_SEPOLIA_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.opbnbtestnet) as RemoteBridgeEntry,
     MIN_DST_GAS,

diff --git a/simulations/vip-500/opmainnet.ts → simulations/vip-407/opmainnet.ts b/simulations/vip-500/opmainnet.ts → simulations/vip-407/opmainnet.ts
@@ -3,8 +3,8 @@ import { LzChainId } from "src/types";
 import { setRedstonePrice } from "src/utils";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bscmainnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bscmainnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(129222970, async () => {
@@ -24,7 +24,7 @@ forking(129222970, async () => {
   await checkXVSBridge(
     LzChainId.basemainnet,
     NETWORK_ADDRESSES.opmainnet,
-    vip500,
+    vip407,
     BASE_MAINNET_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.opmainnet) as RemoteBridgeEntry,
     MIN_DST_GAS,

diff --git a/simulations/vip-500/opsepolia.ts → simulations/vip-407/opsepolia.ts b/simulations/vip-500/opsepolia.ts → simulations/vip-407/opsepolia.ts
@@ -2,15 +2,15 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses";
 import { LzChainId } from "src/types";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bsctestnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bsctestnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(20553060, async () => {
   await checkXVSBridge(
     LzChainId.basesepolia,
     NETWORK_ADDRESSES.opsepolia,
-    vip500,
+    vip407,
     BASE_SEPOLIA_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.opsepolia) as RemoteBridgeEntry,
     MIN_DST_GAS,

diff --git a/simulations/vip-500/sepolia.ts → simulations/vip-407/sepolia.ts b/simulations/vip-500/sepolia.ts → simulations/vip-407/sepolia.ts
@@ -2,15 +2,15 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses";
 import { LzChainId } from "src/types";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bsctestnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bsctestnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(7124205, async () => {
   await checkXVSBridge(
     LzChainId.basesepolia,
     NETWORK_ADDRESSES.sepolia,
-    vip500,
+    vip407,
     BASE_SEPOLIA_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.sepolia) as RemoteBridgeEntry,
     MIN_DST_GAS,

diff --git a/simulations/vip-500/zksyncmainnet.ts → simulations/vip-407/zksyncmainnet.ts b/simulations/vip-500/zksyncmainnet.ts → simulations/vip-407/zksyncmainnet.ts
@@ -3,8 +3,8 @@ import { LzChainId } from "src/types";
 import { setRedstonePrice } from "src/utils";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bscmainnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_MAINNET_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bscmainnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(51152831, async () => {
@@ -24,7 +24,7 @@ forking(51152831, async () => {
   await checkXVSBridge(
     LzChainId.basemainnet,
     NETWORK_ADDRESSES.zksyncmainnet,
-    vip500,
+    vip407,
     BASE_MAINNET_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.zksyncmainnet) as RemoteBridgeEntry,
     MIN_DST_GAS,

diff --git a/simulations/vip-500/zksyncsepolia.ts → simulations/vip-407/zksyncsepolia.ts b/simulations/vip-500/zksyncsepolia.ts → simulations/vip-407/zksyncsepolia.ts
@@ -2,15 +2,15 @@ import { NETWORK_ADDRESSES } from "src/networkAddresses";
 import { LzChainId } from "src/types";
 import { forking } from "src/vip-framework";
 
-import vip500, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-500/bsctestnet";
-import { RemoteBridgeEntry } from "../../vips/vip-500/types";
+import vip407, { BASE_SEPOLIA_TRUSTED_REMOTE, MIN_DST_GAS, remoteBridgeEntries } from "../../vips/vip-407/bsctestnet";
+import { RemoteBridgeEntry } from "../../vips/vip-407/types";
 import { checkXVSBridge } from "./checkXVSBridge";
 
 forking(4245630, async () => {
   await checkXVSBridge(
     LzChainId.basesepolia,
     NETWORK_ADDRESSES.zksyncsepolia,
-    vip500,
+    vip407,
     BASE_SEPOLIA_TRUSTED_REMOTE,
     remoteBridgeEntries.find(entry => entry.dstChainId === LzChainId.zksyncsepolia) as RemoteBridgeEntry,
     MIN_DST_GAS,