@venusprotocol/isolated-pools 3.8.0-dev.3 → 3.8.0-dev.4

package/deployments/zksyncmainnet.json

@@ -9659,6 +9659,358 @@
         }
       ]
     },
+    "TwoKinks_base0bps_slope1500bps_kink8000bps_slope29000bps_base20bps_kink29000bps_jump30000bps": {
+      "address": "0x61E98E6a1F37649543156DC995E0dfe466B31a2e",
+      "abi": [
+        {
+          "inputs": [
+            {
+              "internalType": "int256",
+              "name": "baseRatePerYear_",
+              "type": "int256"
+            },
+            {
+              "internalType": "int256",
+              "name": "multiplierPerYear_",
+              "type": "int256"
+            },
+            {
+              "internalType": "int256",
+              "name": "kink1_",
+              "type": "int256"
+            },
+            {
+              "internalType": "int256",
+              "name": "multiplier2PerYear_",
+              "type": "int256"
+            },
+            {
+              "internalType": "int256",
+              "name": "baseRate2PerYear_",
+              "type": "int256"
+            },
+            {
+              "internalType": "int256",
+              "name": "kink2_",
+              "type": "int256"
+            },
+            {
+              "internalType": "int256",
+              "name": "jumpMultiplierPerYear_",
+              "type": "int256"
+            },
+            {
+              "internalType": "bool",
+              "name": "timeBased_",
+              "type": "bool"
+            },
+            {
+              "internalType": "uint256",
+              "name": "blocksPerYear_",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "nonpayable",
+          "type": "constructor"
+        },
+        {
+          "inputs": [],
+          "name": "InvalidBlocksPerYear",
+          "type": "error"
+        },
+        {
+          "inputs": [],
+          "name": "InvalidKink",
+          "type": "error"
+        },
+        {
+          "inputs": [],
+          "name": "InvalidTimeBasedConfiguration",
+          "type": "error"
+        },
+        {
+          "inputs": [],
+          "name": "NegativeValueNotAllowed",
+          "type": "error"
+        },
+        {
+          "inputs": [],
+          "name": "BASE_RATE_2_PER_BLOCK_OR_SECOND",
+          "outputs": [
+            {
+              "internalType": "int256",
+              "name": "",
+              "type": "int256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "BASE_RATE_PER_BLOCK_OR_SECOND",
+          "outputs": [
+            {
+              "internalType": "int256",
+              "name": "",
+              "type": "int256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "JUMP_MULTIPLIER_PER_BLOCK_OR_SECOND",
+          "outputs": [
+            {
+              "internalType": "int256",
+              "name": "",
+              "type": "int256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "KINK_1",
+          "outputs": [
+            {
+              "internalType": "int256",
+              "name": "",
+              "type": "int256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "KINK_2",
+          "outputs": [
+            {
+              "internalType": "int256",
+              "name": "",
+              "type": "int256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "MULTIPLIER_2_PER_BLOCK_OR_SECOND",
+          "outputs": [
+            {
+              "internalType": "int256",
+              "name": "",
+              "type": "int256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "MULTIPLIER_PER_BLOCK_OR_SECOND",
+          "outputs": [
+            {
+              "internalType": "int256",
+              "name": "",
+              "type": "int256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "RATE_1",
+          "outputs": [
+            {
+              "internalType": "int256",
+              "name": "",
+              "type": "int256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "RATE_2",
+          "outputs": [
+            {
+              "internalType": "int256",
+              "name": "",
+              "type": "int256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "blocksOrSecondsPerYear",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "getBlockNumberOrTimestamp",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint256",
+              "name": "cash",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "borrows",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "reserves",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "badDebt",
+              "type": "uint256"
+            }
+          ],
+          "name": "getBorrowRate",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint256",
+              "name": "cash",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "borrows",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "reserves",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "reserveFactorMantissa",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "badDebt",
+              "type": "uint256"
+            }
+          ],
+          "name": "getSupplyRate",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "isInterestRateModel",
+          "outputs": [
+            {
+              "internalType": "bool",
+              "name": "",
+              "type": "bool"
+            }
+          ],
+          "stateMutability": "pure",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "isTimeBased",
+          "outputs": [
+            {
+              "internalType": "bool",
+              "name": "",
+              "type": "bool"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint256",
+              "name": "cash",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "borrows",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "reserves",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "badDebt",
+              "type": "uint256"
+            }
+          ],
+          "name": "utilizationRate",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "pure",
+          "type": "function"
+        }
+      ]
+    },
     "VTokenBeacon": {
       "address": "0x53523537aa330640B80400EB8B309fF5896E7eb5",
       "abi": [

package/deployments/zksyncmainnet_addresses.json

@@ -18,6 +18,7 @@
     "RewardsDistributorImpl": "0x1A363085a85a21361c97ee9eeF07a8e61cc0D8e2",
     "RewardsDistributor_Core_0": "0x7C7846A74AB38A8d554Bc5f7652eCf8Efb58c894",
     "RewardsDistributor_Core_0_Proxy": "0x7C7846A74AB38A8d554Bc5f7652eCf8Efb58c894",
+    "TwoKinks_base0bps_slope1500bps_kink8000bps_slope29000bps_base20bps_kink29000bps_jump30000bps": "0x61E98E6a1F37649543156DC995E0dfe466B31a2e",
     "VTokenBeacon": "0x53523537aa330640B80400EB8B309fF5896E7eb5",
     "VTokenImpl": "0x6829fF2937F780eD01A4CE3FDa3d0bA63B1BD771",
     "VToken_vUSDC.e_Core": "0x1aF23bD57c62A99C59aD48236553D0Dd11e49D2D",

package/dist/deploy/009-deploy-vtokens.js

@@ -47,7 +47,7 @@ const func = async function (hre) {
         const comptrollerProxy = await hardhat_1.ethers.getContract(`Comptroller_${pool.id}`);
         // Deploy Markets
         for (const vtoken of pool.vtokens) {
-            const { name, asset, symbol, rateModel, baseRatePerYear, multiplierPerYear, jumpMultiplierPerYear, kink_, reserveFactor, } = vtoken;
+            const { name, asset, symbol, rateModel, baseRatePerYear, multiplierPerYear, jumpMultiplierPerYear, kink_, reserveFactor, multiplierPerYear2, baseRatePerYear2, kink2_, } = vtoken;
             const token = (0, deploymentConfig_1.getTokenConfig)(asset, tokensConfig);
             let tokenContract;
             if (token.isMock) {
@@ -78,7 +78,7 @@ const func = async function (hre) {
                 });
                 rateModelAddress = result.address;
             }
-            else {
+            else if (rateModel === deploymentConfig_2.InterestRateModels.WhitePaper.toString()) {
                 const [b, m] = [baseRatePerYear, multiplierPerYear].map(mantissaToBps);
                 const rateModelName = `WhitePaperInterestRateModel_base${b}bps_slope${m}bps`;
                 const result = await deploy(rateModelName, {
@@ -91,6 +91,41 @@ const func = async function (hre) {
                 });
                 rateModelAddress = result.address;
             }
+            else {
+                if (!multiplierPerYear2 || !baseRatePerYear2 || !kink2_) {
+                    throw new Error(`Invalid IR model parameters for ${rateModel}`);
+                }
+                const [b, m, k, m2, b2, k2, j] = [
+                    baseRatePerYear,
+                    multiplierPerYear,
+                    kink_,
+                    multiplierPerYear2,
+                    baseRatePerYear2,
+                    kink2_,
+                    jumpMultiplierPerYear,
+                ].map(mantissaToBps);
+                const rateModelName = `TwoKinks_base${b}bps_slope${m}bps_kink${k}bps_slope2${m2}bps_base2${b2}bps_kink2${k2}bps_jump${j}bps`;
+                console.log(`Deploying interest rate model ${rateModelName}`);
+                const result = await deploy(rateModelName, {
+                    from: deployer,
+                    contract: "TwoKinksInterestRateModel",
+                    args: [
+                        baseRatePerYear,
+                        multiplierPerYear,
+                        kink_,
+                        multiplierPerYear2,
+                        baseRatePerYear2,
+                        kink2_,
+                        jumpMultiplierPerYear,
+                        isTimeBased,
+                        blocksPerYear,
+                    ],
+                    log: true,
+                    autoMine: true,
+                    skipIfAlreadyDeployed: true,
+                });
+                rateModelAddress = result.address;
+            }
             const VToken = await hardhat_1.ethers.getContractFactory("VToken");
             const underlyingDecimals = Number(await tokenContract.decimals());
             const vTokenDecimals = 8;

package/dist/deploy/019-deploy-ir-models.js

@@ -18,7 +18,7 @@ const func = async function (hre) {
     for (const pool of poolConfig) {
         // Deploy IR Models
         for (const vtoken of pool.vtokens) {
-            const { rateModel, baseRatePerYear, multiplierPerYear, jumpMultiplierPerYear, kink_ } = vtoken;
+            const { rateModel, baseRatePerYear, multiplierPerYear, jumpMultiplierPerYear, kink_, kink2_, multiplierPerYear2, baseRatePerYear2, } = vtoken;
             if (rateModel === deploymentConfig_2.InterestRateModels.JumpRate.toString()) {
                 const [b, m, j, k] = [baseRatePerYear, multiplierPerYear, jumpMultiplierPerYear, kink_].map(mantissaToBps);
                 const rateModelName = `JumpRateModelV2_base${b}bps_slope${m}bps_jump${j}bps_kink${k}bps`;
@@ -39,7 +39,7 @@ const func = async function (hre) {
                     skipIfAlreadyDeployed: true,
                 });
             }
-            else {
+            else if (rateModel === deploymentConfig_2.InterestRateModels.WhitePaper.toString()) {
                 const [b, m] = [baseRatePerYear, multiplierPerYear].map(mantissaToBps);
                 const rateModelName = `WhitePaperInterestRateModel_base${b}bps_slope${m}bps`;
                 await deploy(rateModelName, {
@@ -51,6 +51,40 @@ const func = async function (hre) {
                     skipIfAlreadyDeployed: true,
                 });
             }
+            else {
+                if (!multiplierPerYear2 || !baseRatePerYear2 || !kink2_) {
+                    throw new Error(`Invalid IR model parameters for ${rateModel}`);
+                }
+                const [b, m, k, m2, b2, k2, j] = [
+                    baseRatePerYear,
+                    multiplierPerYear,
+                    kink_,
+                    multiplierPerYear2,
+                    baseRatePerYear2,
+                    kink2_,
+                    jumpMultiplierPerYear,
+                ].map(mantissaToBps);
+                const rateModelName = `TwoKinks_base${b}bps_slope${m}bps_kink${k}bps_slope2${m2}bps_base2${b2}bps_kink2${k2}bps_jump${j}bps`;
+                console.log(`Deploying interest rate model ${rateModelName}`);
+                await deploy(rateModelName, {
+                    from: deployer,
+                    contract: "TwoKinksInterestRateModel",
+                    args: [
+                        baseRatePerYear,
+                        multiplierPerYear,
+                        kink_,
+                        multiplierPerYear2,
+                        baseRatePerYear2,
+                        kink2_,
+                        jumpMultiplierPerYear,
+                        isTimeBased,
+                        blocksPerYear,
+                    ],
+                    log: true,
+                    autoMine: true,
+                    skipIfAlreadyDeployed: true,
+                });
+            }
             console.log(`-----------------------------------------`);
         }
     }