Merge branch 'feat/ven-2843' of github.com:VenusProtocol/isolated-poo…

…ls into feat/ven-2843
VenusProtocol · Oct 1, 2024 · 67a628a · 67a628a
2 parents 33cd49a + c9d88f3
commit 67a628a
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 12 deletions.
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"
             }
           ],

diff --git a/deployments/bsctestnet_addresses.json b/deployments/bsctestnet_addresses.json
@@ -103,7 +103,7 @@
     "SwapRouter_StableCoins": "0x8Ff3c0a74b4CBD4dFA3A35Cca756490bE351F936",
     "SwapRouter_Tron": "0x1D8cA5AFB88F07489786A3d2E0FF50F3F9314d97",
     "VTokenBeacon": "0xBF85A90673E61956f8c79b9150BAB7893b791bDd",
-    "VTokenImpl": "0xa60b28FDDaAB87240C3AF319892e7A4ad6FbF41F",
+    "VTokenImpl": "0xD594F41965881A859a147624c9F03fEb32ad2d33",
     "VToken_vALPACA_DeFi": "0xb7caC5Ef82cb7f9197ee184779bdc52c5490C02a",
     "VToken_vANKR_DeFi": "0xb677e080148368EeeE70fA3865d07E92c6500174",
     "VToken_vBNBx_LiquidStakedBNB": "0x644A149853E5507AdF3e682218b8AC86cdD62951",

diff --git a/deployments/opbnbtestnet.json b/deployments/opbnbtestnet.json
@@ -8296,10 +8296,26 @@
       ]
     },
     "VTokenImpl": {
-      "address": "0xd63c59d954A8888e7631ebc2CCc860FDB8Ae85Ad",
+      "address": "0xbd3AAd064295dcA0f45fab4C6A5adFb0D23a19D2",
       "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"
         },
@@ -8339,6 +8355,16 @@
           "name": "HealBorrowUnauthorized",
           "type": "error"
         },
+        {
+          "inputs": [],
+          "name": "InvalidBlocksPerYear",
+          "type": "error"
+        },
+        {
+          "inputs": [],
+          "name": "InvalidTimeBasedConfiguration",
+          "type": "error"
+        },
         {
           "inputs": [
             {
@@ -8810,13 +8836,13 @@
             {
               "indexed": false,
               "internalType": "uint256",
-              "name": "oldReduceReservesBlockDelta",
+              "name": "oldReduceReservesBlockOrTimestampDelta",
               "type": "uint256"
             },
             {
               "indexed": false,
               "internalType": "uint256",
-              "name": "newReduceReservesBlockDelta",
+              "name": "newReduceReservesBlockOrTimestampDelta",
               "type": "uint256"
             }
           ],
@@ -9264,6 +9290,19 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "blocksOrSecondsPerYear",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [
             {
@@ -9514,6 +9553,19 @@
           "stateMutability": "view",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "getBlockNumberOrTimestamp",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [],
           "name": "getCash",
@@ -9662,6 +9714,19 @@
           "stateMutability": "view",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "isTimeBased",
+          "outputs": [
+            {
+              "internalType": "bool",
+              "name": "",
+              "type": "bool"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [],
           "name": "isVToken",
@@ -10079,7 +10144,7 @@
           "inputs": [
             {
               "internalType": "uint256",
-              "name": "_newReduceReservesBlockDelta",
+              "name": "_newReduceReservesBlockOrTimestampDelta",
               "type": "uint256"
             }
           ],

diff --git a/deployments/opbnbtestnet_addresses.json b/deployments/opbnbtestnet_addresses.json
@@ -20,7 +20,7 @@
     "PoolRegistry_Implementation": "0x90CC662C722190BeD60061e291e064B157c90065",
     "PoolRegistry_Proxy": "0x560eA4e1cC42591E9f5F5D83Ad2fd65F30128951",
     "VTokenBeacon": "0xcc633492097078Ae590C0d11924e82A23f3Ab3E2",
-    "VTokenImpl": "0xd63c59d954A8888e7631ebc2CCc860FDB8Ae85Ad",
+    "VTokenImpl": "0xbd3AAd064295dcA0f45fab4C6A5adFb0D23a19D2",
     "VToken_vBTCB_Core": "0x86F82bca79774fc04859966917D2291A68b870A9",
     "VToken_vETH_Core": "0x034Cc5097379B13d3Ed5F6c85c8FAf20F48aE480",
     "VToken_vUSDT_Core": "0xe3923805f6E117E51f5387421240a86EF1570abC",