fix: merge conflict

VenusProtocol · Nov 8, 2024 · f96817f · f96817f
2 parents 448ce1b + 66a90c7
commit f96817f
Show file tree

Hide file tree

Showing 21 changed files with 5,120 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## [3.7.0-dev.2](https://github.com/VenusProtocol/isolated-pools/compare/v3.7.0-dev.1...v3.7.0-dev.2) (2024-11-07)
+
+
+### Features
+
+* updating deployment files ([5a30371](https://github.com/VenusProtocol/isolated-pools/commit/5a30371b786a40d35280c4a08a5ddc5a48f2ec03))
+* updating deployment files ([f4b5a2d](https://github.com/VenusProtocol/isolated-pools/commit/f4b5a2da84de27f33406d05aa3fc31bfc8857937))
+
+
+### Bug Fixes
+
+* deployed eigen mock and vtoken ([d72cb6b](https://github.com/VenusProtocol/isolated-pools/commit/d72cb6b31495936d85db09cb55eef0266914036a))
+* deployed vEIGEN on ethereum ([e4bcee9](https://github.com/VenusProtocol/isolated-pools/commit/e4bcee9f611acbef5964b09c68c70b94f902a246))
+
+## [3.7.0-dev.1](https://github.com/VenusProtocol/isolated-pools/compare/v3.6.0...v3.7.0-dev.1) (2024-11-06)
+
+
+### Features
+
+* add USDC market deployment on zksync mainnet ([5d55389](https://github.com/VenusProtocol/isolated-pools/commit/5d5538985f310c3380624fc03580d306fd1bf61f))
+* add USDC market deployments on zksync sepolia ([f698c78](https://github.com/VenusProtocol/isolated-pools/commit/f698c78476049ff34b373e47397da9dc97b70ef7))
+* updating deployment files ([5f1c239](https://github.com/VenusProtocol/isolated-pools/commit/5f1c2398f6e7ca5e3da4b2d05eabd6dd529471b5))
+* updating deployment files ([bc3500a](https://github.com/VenusProtocol/isolated-pools/commit/bc3500a894c92ada8ea4f9c16307b6568e092982))
+
 ## [3.6.0](https://github.com/VenusProtocol/isolated-pools/compare/v3.5.0...v3.6.0) (2024-10-10)
 
 

diff --git a/deployments/ethereum.json b/deployments/ethereum.json
@@ -29102,6 +29102,80 @@
         }
       ]
     },
+    "VToken_vEIGEN": {
+      "address": "0x256AdDBe0a387c98f487e44b85c29eb983413c5e",
+      "abi": [
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "beacon",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "stateMutability": "payable",
+          "type": "constructor"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "previousAdmin",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "newAdmin",
+              "type": "address"
+            }
+          ],
+          "name": "AdminChanged",
+          "type": "event"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "beacon",
+              "type": "address"
+            }
+          ],
+          "name": "BeaconUpgraded",
+          "type": "event"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "implementation",
+              "type": "address"
+            }
+          ],
+          "name": "Upgraded",
+          "type": "event"
+        },
+        {
+          "stateMutability": "payable",
+          "type": "fallback"
+        },
+        {
+          "stateMutability": "payable",
+          "type": "receive"
+        }
+      ]
+    },
     "VToken_vFRAX_Core": {
       "address": "0x4fAfbDc4F2a9876Bd1764827b26fb8dc4FD1dB95",
       "abi": [

diff --git a/deployments/ethereum/VToken_vEIGEN.json b/deployments/ethereum/VToken_vEIGEN.json
diff --git a/deployments/ethereum_addresses.json b/deployments/ethereum_addresses.json
@@ -58,6 +58,7 @@
     "VTokenImpl": "0xefdf5CcC12d8cff4a7ed4e421b95F8f69Cf2F766",
     "VToken_vCRV_Curve": "0x30aD10Bd5Be62CAb37863C2BfcC6E8fb4fD85BDa",
     "VToken_vDAI_Core": "0xd8AdD9B41D4E1cd64Edad8722AB0bA8D35536657",
+    "VToken_vEIGEN": "0x256AdDBe0a387c98f487e44b85c29eb983413c5e",
     "VToken_vFRAX_Core": "0x4fAfbDc4F2a9876Bd1764827b26fb8dc4FD1dB95",
     "VToken_vPT-weETH-26DEC2024_LiquidStakedETH": "0x76697f8eaeA4bE01C678376aAb97498Ee8f80D5C",
     "VToken_vTUSD_Core": "0x13eB80FDBe5C5f4a7039728E258A6f05fb3B912b",