Merge branch 'develop' into test/zksync-fork-test

VenusProtocol · Sep 20, 2024 · a052e1b · a052e1b
2 parents 9110f0c + 7998e56
commit a052e1b
Show file tree

Hide file tree

Showing 84 changed files with 73,184 additions and 1,870 deletions.
diff --git a/.env.example b/.env.example
@@ -5,16 +5,19 @@ FORKED_NETWORK=bscmainnet
 # Replace with your deployer's private key
 DEPLOYER_PRIVATE_KEY=
 
-## Archive nodes - Replace <YOUR_KEY_HERE> with your actual keys and uncomment the line you need
-## ARCHIVE_NODE_bsctestnet=https://bsc-testnet.nodereal.io/v1/<YOUR_KEY_HERE>
-## ARCHIVE_NODE_bscmainnet=https://bsc-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
-## ARCHIVE_NODE_sepolia=https://ethereum-sepolia.blockpi.network/v1/rpc/public
-## ARCHIVE_NODE_ethereum=https://eth-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
+#Archive nodes - Replace <YOUR_KEY_HERE> with your actual keys and uncomment the line you need
+#ARCHIVE_NODE_bsctestnet=https://bsc-testnet.nodereal.io/v1/<YOUR_KEY_HERE>
+#ARCHIVE_NODE_bscmainnet=https://bsc-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
+#ARCHIVE_NODE_sepolia=https://ethereum-sepolia.blockpi.network/v1/rpc/public
+#ARCHIVE_NODE_ethereum=https://eth-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
 #ARCHIVE_NODE_opbnbtestnet=https://opbnb-testnet.nodereal.io/v1/<YOUR_KEY_HERE>
 #ARCHIVE_NODE_opbnbmainnet=https://opbnb-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
 #ARCHIVE_NODE_arbitrumsepolia=https://sepolia-rollup.arbitrum.io/rpc
 #ARCHIVE_NODE_arbitrumone=https://open-platform.nodereal.io/<YOUR_KEY_HERE>/arbitrum-nitro/
 #ARCHIVE_NODE_zksyncsepolia=https://zksync-sepolia.g.alchemy.com/v2/<YOUR_KEY_HERE>
+#ARCHIVE_NODE_zksyncmainnet=https://open-platform.nodereal.io/<YOUR_KEY_HERE>/zksync
+#ARCHIVE_NODE_opsepolia=https://sepolia.optimism.io
+#ARCHIVE_NODE_opmainnet=https://opt-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
 
 # Uncomment the lines below if you want to deploy on mainnet using Frame Wallet
 #ARCHIVE_NODE_ethereum=http://127.0.0.1:1248

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -114,11 +114,11 @@ jobs:
 
       - name: Export deployments
         run: |
-          for NETWORK in bsctestnet bscmainnet ethereum sepolia opbnbtestnet opbnbmainnet arbitrumsepolia arbitrumone; do
+          for NETWORK in bsctestnet bscmainnet ethereum sepolia opbnbtestnet opbnbmainnet arbitrumsepolia arbitrumone opsepolia opmainnet; do
             EXPORT=true yarn hardhat export --network ${NETWORK} --export ./deployments/${NETWORK}.json
             jq -M '{name, chainId, addresses: .contracts | map_values(.address)}' ./deployments/${NETWORK}.json > ./deployments/${NETWORK}_addresses.json
           done
-          for NETWORK in zksyncsepolia; do
+          for NETWORK in zksyncsepolia zksyncmainnet; do
             EXPORT=true yarn hardhat export --network ${NETWORK} --export ./deployments/${NETWORK}.json --config hardhat.config.zksync.ts
             jq -M '{name, chainId, addresses: .contracts | map_values(.address)}' ./deployments/${NETWORK}.json > ./deployments/${NETWORK}_addresses.json
           done

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/deploy/018-native-token-gateway.ts b/deploy/018-native-token-gateway.ts
@@ -9,7 +9,9 @@ import { contracts as ilBscTestnet } from "../deployments/bsctestnet.json";
 import { contracts as ilEthereum } from "../deployments/ethereum.json";
 import { contracts as ilOpbnbMainnet } from "../deployments/opbnbmainnet.json";
 import { contracts as ilOpbnbTestnet } from "../deployments/opbnbtestnet.json";
+import { contracts as ilOpSepolia } from "../deployments/opsepolia.json";
 import { contracts as ilSepolia } from "../deployments/sepolia.json";
+import { contracts as ilZkMainnet } from "../deployments/zksyncmainnet.json";
 import { contracts as ilZkSepolia } from "../deployments/zksyncsepolia.json";
 import { getConfig } from "../helpers/deploymentConfig";
 
@@ -68,19 +70,39 @@ const VWNativeInfo: { [key: string]: VTokenConfig[] } = {
       name: "vWETH_Core",
       address: ilArbSepolia.VToken_vWETH_Core.address,
     },
+    {
+      name: "vWETH_LiquidStakedETH",
+      address: ilArbSepolia.VToken_vWETH_LiquidStakedETH.address,
+    },
   ],
   arbitrumone: [
     {
       name: "vWETH_Core",
       address: ilArbOne.VToken_vWETH_Core.address,
     },
+    {
+      name: "vWETH_LiquidStakedETH",
+      address: ilArbOne.VToken_vWETH_LiquidStakedETH.address,
+    },
   ],
   zksyncsepolia: [
     {
       name: "vWETH_Core",
       address: ilZkSepolia.VToken_vWETH_Core.address,
     },
   ],
+  zksyncmainnet: [
+    {
+      name: "vWETH_Core",
+      address: ilZkMainnet.VToken_vWETH_Core.address,
+    },
+  ],
+  opsepolia: [
+    {
+      name: "vWETH_Core",
+      address: ilOpSepolia.VToken_vWETH_Core.address,
+    },
+  ],
 };
 
 const getVWNativeTokens = (networkName: string): VTokenConfig[] => {