Merge pull request #444 from VenusProtocol/feat/ven-2843

[VEN-2843] Upgrade implementation of vToken contracts
VenusProtocol · Oct 2, 2024 · f3e9d6d · f3e9d6d
2 parents 42f9d2a + 6fe7fe8
commit f3e9d6d
Show file tree

Hide file tree

Showing 18 changed files with 1,602 additions and 468 deletions.
diff --git a/deployments/bscmainnet.json b/deployments/bscmainnet.json
@@ -52204,10 +52204,26 @@
       ]
     },
     "VTokenImpl": {
-      "address": "0x1EC822383805FfDb9dC2Ae456DF8C0Ca2Bf14d7d",
+      "address": "0xB0c4227FA3b7b2a5C298dCa960aB0631763D2839",
       "abi": [
         {
-          "inputs": [],
+          "inputs": [
+            {
+              "internalType": "bool",
+              "name": "timeBased_",
+              "type": "bool"
+            },
+            {
+              "internalType": "uint256",
+              "name": "blocksPerYear_",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "maxBorrowRateMantissa_",
+              "type": "uint256"
+            }
+          ],
           "stateMutability": "nonpayable",
           "type": "constructor"
         },
@@ -52247,6 +52263,16 @@
           "name": "HealBorrowUnauthorized",
           "type": "error"
         },
+        {
+          "inputs": [],
+          "name": "InvalidBlocksPerYear",
+          "type": "error"
+        },
+        {
+          "inputs": [],
+          "name": "InvalidTimeBasedConfiguration",
+          "type": "error"
+        },
         {
           "inputs": [
             {
@@ -52718,13 +52744,13 @@
             {
               "indexed": false,
               "internalType": "uint256",
-              "name": "oldReduceReservesBlockDelta",
+              "name": "oldReduceReservesBlockOrTimestampDelta",
               "type": "uint256"
             },
             {
               "indexed": false,
               "internalType": "uint256",
-              "name": "newReduceReservesBlockDelta",
+              "name": "newReduceReservesBlockOrTimestampDelta",
               "type": "uint256"
             }
           ],
@@ -53172,6 +53198,19 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "blocksOrSecondsPerYear",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [
             {
@@ -53422,6 +53461,19 @@
           "stateMutability": "view",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "getBlockNumberOrTimestamp",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [],
           "name": "getCash",
@@ -53570,6 +53622,19 @@
           "stateMutability": "view",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "isTimeBased",
+          "outputs": [
+            {
+              "internalType": "bool",
+              "name": "",
+              "type": "bool"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [],
           "name": "isVToken",
@@ -53987,7 +54052,7 @@
           "inputs": [
             {
               "internalType": "uint256",
-              "name": "_newReduceReservesBlockDelta",
+              "name": "_newReduceReservesBlockOrTimestampDelta",
               "type": "uint256"
             }
           ],

diff --git a/deployments/bscmainnet/VTokenImpl.json b/deployments/bscmainnet/VTokenImpl.json
diff --git a/deployments/bscmainnet_addresses.json b/deployments/bscmainnet_addresses.json
@@ -84,7 +84,7 @@
     "SwapRouter_Stablecoins": "0xBBd8E2b5d69fcE9Aaa599c50F0f0960AA58B32aA",
     "SwapRouter_Tron": "0xacD270Ed7DFd4466Bd931d84fe5B904080E28Bfc",
     "VTokenBeacon": "0x2b8A1C539ABaC89CbF7E2Bc6987A0A38A5e660D4",
-    "VTokenImpl": "0x1EC822383805FfDb9dC2Ae456DF8C0Ca2Bf14d7d",
+    "VTokenImpl": "0xB0c4227FA3b7b2a5C298dCa960aB0631763D2839",
     "VToken_vALPACA_DeFi": "0x02c5Fb0F26761093D297165e902e96D08576D344",
     "VToken_vANKR_DeFi": "0x19CE11C8817a1828D1d357DFBF62dCf5b0B2A362",
     "VToken_vBNBx_LiquidStakedBNB": "0x5E21bF67a6af41c74C1773E4b473ca5ce8fd3791",

diff --git a/deployments/bsctestnet.json b/deployments/bsctestnet.json
@@ -57882,10 +57882,26 @@
       ]
     },
     "VTokenImpl": {
-      "address": "0xa60b28FDDaAB87240C3AF319892e7A4ad6FbF41F",
+      "address": "0xD594F41965881A859a147624c9F03fEb32ad2d33",
       "abi": [
         {
-          "inputs": [],
+          "inputs": [
+            {
+              "internalType": "bool",
+              "name": "timeBased_",
+              "type": "bool"
+            },
+            {
+              "internalType": "uint256",
+              "name": "blocksPerYear_",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "maxBorrowRateMantissa_",
+              "type": "uint256"
+            }
+          ],
           "stateMutability": "nonpayable",
           "type": "constructor"
         },
@@ -57925,6 +57941,16 @@
           "name": "HealBorrowUnauthorized",
           "type": "error"
         },
+        {
+          "inputs": [],
+          "name": "InvalidBlocksPerYear",
+          "type": "error"
+        },
+        {
+          "inputs": [],
+          "name": "InvalidTimeBasedConfiguration",
+          "type": "error"
+        },
         {
           "inputs": [
             {
@@ -58396,13 +58422,13 @@
             {
               "indexed": false,
               "internalType": "uint256",
-              "name": "oldReduceReservesBlockDelta",
+              "name": "oldReduceReservesBlockOrTimestampDelta",
               "type": "uint256"
             },
             {
               "indexed": false,
               "internalType": "uint256",
-              "name": "newReduceReservesBlockDelta",
+              "name": "newReduceReservesBlockOrTimestampDelta",
               "type": "uint256"
             }
           ],
@@ -58850,6 +58876,19 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "blocksOrSecondsPerYear",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [
             {
@@ -59100,6 +59139,19 @@
           "stateMutability": "view",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "getBlockNumberOrTimestamp",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [],
           "name": "getCash",
@@ -59248,6 +59300,19 @@
           "stateMutability": "view",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "isTimeBased",
+          "outputs": [
+            {
+              "internalType": "bool",
+              "name": "",
+              "type": "bool"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [],
           "name": "isVToken",
@@ -59665,7 +59730,7 @@
           "inputs": [
             {
               "internalType": "uint256",
-              "name": "_newReduceReservesBlockDelta",
+              "name": "_newReduceReservesBlockOrTimestampDelta",
               "type": "uint256"
             }
           ],