@gearbox-protocol/periphery-v3 1.3.0 → 1.3.2

package/README.md

@@ -1,66 +1,2 @@
-## Foundry
+## Gearbox Periphery
 
-**Foundry is a blazing fast, portable and modular toolkit for Ethereum application development written in Rust.**
-
-Foundry consists of:
-
--   **Forge**: Ethereum testing framework (like Truffle, Hardhat and DappTools).
--   **Cast**: Swiss army knife for interacting with EVM smart contracts, sending transactions and getting chain data.
--   **Anvil**: Local Ethereum node, akin to Ganache, Hardhat Network.
--   **Chisel**: Fast, utilitarian, and verbose solidity REPL.
-
-## Documentation
-
-https://book.getfoundry.sh/
-
-## Usage
-
-### Build
-
-```shell
-$ forge build
-```
-
-### Test
-
-```shell
-$ forge test
-```
-
-### Format
-
-```shell
-$ forge fmt
-```
-
-### Gas Snapshots
-
-```shell
-$ forge snapshot
-```
-
-### Anvil
-
-```shell
-$ anvil
-```
-
-### Deploy
-
-```shell
-$ forge script script/Counter.s.sol:CounterScript --rpc-url <your_rpc_url> --private-key <your_private_key>
-```
-
-### Cast
-
-```shell
-$ cast <subcommand>
-```
-
-### Help
-
-```shell
-$ forge --help
-$ anvil --help
-$ cast --help
-```

package/contracts/data/DataCompressor_2_1.sol

@@ -268,7 +268,7 @@ contract DataCompressorV2_10 is
         result.availableLiquidity = pool.availableLiquidity();
         result.totalBorrowed = pool.totalBorrowed();
         result.dieselRate_RAY = pool.getDieselRate_RAY();
-        result.linearCumulativeIndex = pool.calcLinearCumulative_RAY();
+        result.baseInterestIndex = pool.calcLinearCumulative_RAY();
         result.baseInterestRate = pool.borrowAPY_RAY();
         result.underlying = pool.underlyingToken();
         result.dieselToken = pool.dieselToken();
@@ -278,8 +278,8 @@ contract DataCompressorV2_10 is
 
         result.dieselRate_RAY = pool.getDieselRate_RAY();
         result.withdrawFee = pool.withdrawFee();
-        result.baseInterestIndexLU = pool._timestampLU();
-        result.cumulativeIndex_RAY = pool._cumulativeIndex_RAY();
+        result.lastBaseInterestUpdate = pool._timestampLU();
+        result.baseInterestIndexLU = pool._cumulativeIndex_RAY();
 
         uint256 dieselSupply = IERC20(result.dieselToken).totalSupply();
         uint256 totalLP = pool.fromDiesel(dieselSupply);

package/contracts/data/DataCompressor_3_0.sol

@@ -351,6 +351,9 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         {
             result.pool = _getPool(_cm);
             IPoolV3 pool = IPoolV3(result.pool);
+            result.totalDebt = pool.creditManagerBorrowed(_cm);
+            result.totalDebtLimit = pool.creditManagerDebtLimit(_cm);
+
             result.baseBorrowRate = _getBaseInterestRate(address(pool));
             result.availableToBorrow = pool.creditManagerBorrowable(_cm);
             result.lirm = _getInterestRateModel(address(pool));
@@ -418,7 +421,7 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         result.availableLiquidity = pool.availableLiquidity();
 
         result.dieselRate_RAY = pool.convertToAssets(RAY);
-        result.linearCumulativeIndex = pool.baseInterestIndex();
+        result.baseInterestIndex = pool.baseInterestIndex();
         result.baseInterestRate = _getBaseInterestRate(address(pool));
         result.underlying = pool.underlyingToken();
         result.dieselToken = address(pool);
@@ -427,6 +430,7 @@ contract DataCompressorV3_00 is IDataCompressorV3_00, ContractsRegisterTrait, Li
         result.dieselRate_RAY = pool.convertToAssets(RAY);
         result.withdrawFee = pool.withdrawFee();
         result.baseInterestIndexLU = pool.baseInterestIndexLU();
+        result.lastBaseInterestUpdate = pool.lastBaseInterestUpdate();
         // result.cumulativeIndex_RAY = pool.calcLinearCumulative_RAY();
 
         // Borrowing limits

package/contracts/data/Types.sol

@@ -132,7 +132,7 @@ struct PoolData {
     string symbol;
     string name;
     ///
-    uint256 linearCumulativeIndex;
+    uint256 baseInterestIndex;
     uint256 availableLiquidity;
     uint256 expectedLiquidity;
     //
@@ -145,7 +145,7 @@ struct PoolData {
     uint256 baseInterestRate;
     uint256 dieselRate_RAY;
     uint256 withdrawFee;
-    uint256 cumulativeIndex_RAY;
+    uint256 lastBaseInterestUpdate;
     uint256 baseInterestIndexLU;
     uint256 version;
     address poolQuotaKeeper;

package/contracts/test/DC_Printer.sol

@@ -48,7 +48,7 @@ contract DCPrinterTest {
 
                 console.log("dieselToken: ", pool.dieselToken);
                 ///
-                console.log("linearCumulativeIndex: ", pool.linearCumulativeIndex);
+                console.log("baseInterestIndex: ", pool.baseInterestIndex);
                 console.log("availableLiquidity: ", pool.availableLiquidity);
                 console.log("expectedLiquidity: ", pool.expectedLiquidity);
                 //
@@ -61,7 +61,7 @@ contract DCPrinterTest {
                 console.log("baseInterestRate: ", pool.baseInterestRate);
                 console.log("dieselRate_RAY: ", pool.dieselRate_RAY);
                 console.log("withdrawFee", pool.withdrawFee);
-                console.log("cumulativeIndex_RAY:", pool.cumulativeIndex_RAY);
+                console.log("lastBaseInterestUpdate:", pool.lastBaseInterestUpdate);
                 console.log("baseInterestIndexLU:", pool.baseInterestIndexLU);
                 console.log("version: ", pool.version);
                 // QuotaInfo[] quotas;

package/contracts/test/DC_Test.sol

@@ -49,7 +49,7 @@ contract DCTest {
 
                 console.log("dieselToken: ", pool.dieselToken);
                 ///
-                console.log("linearCumulativeIndex: ", pool.linearCumulativeIndex);
+                console.log("baseInterestIndex: ", pool.baseInterestIndex);
                 console.log("availableLiquidity: ", pool.availableLiquidity);
                 console.log("expectedLiquidity: ", pool.expectedLiquidity);
                 //
@@ -62,7 +62,7 @@ contract DCTest {
                 console.log("baseInterestRate: ", pool.baseInterestRate);
                 console.log("dieselRate_RAY: ", pool.dieselRate_RAY);
                 console.log("withdrawFee", pool.withdrawFee);
-                console.log("cumulativeIndex_RAY:", pool.cumulativeIndex_RAY);
+                console.log("lastBaseInterestUpdate:", pool.lastBaseInterestUpdate);
                 console.log("baseInterestIndexLU:", pool.baseInterestIndexLU);
                 console.log("version: ", pool.version);
                 // QuotaInfo[] quotas;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/periphery-v3",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "main": "index.js",
   "repository": "git@github.com:Gearbox-protocol/periphery-v3.git",
   "author": "Mikael <26343374+0xmikko@users.noreply.github.com>",

package/contracts/executor/Executor.sol

@@ -1,86 +0,0 @@
-pragma solidity ^0.8.17;
-
-struct TimelockTx {
-    address target;
-    uint256 value;
-    string signature;
-    bytes data;
-    uint256 eta;
-}
-
-interface ITimeLock {
-    function executeTransaction(address target, uint256 value, string memory signature, bytes memory data, uint256 eta)
-        external
-        payable
-        returns (bytes memory);
-}
-
-contract Executor {
-    event AddBatch(uint256 indexed batchNum, uint256 length);
-
-    address public immutable timeLock;
-
-    uint240 public batchNum;
-
-    mapping(bytes32 => uint256) public batchedTransactions;
-    mapping(uint240 => uint256) public batchedTransactionsCount;
-
-    modifier onlyTimeLock() {
-        require(msg.sender == timeLock, "Executor::onlyTimeLock");
-        _;
-    }
-
-    constructor(address _timeLock) {
-        timeLock = _timeLock;
-    }
-
-    function queueBatch(TimelockTx[] calldata txs) external onlyTimeLock {
-        ++batchNum;
-        uint240 _batchNum = batchNum;
-
-        uint256 len = txs.length;
-
-        for (uint256 i = 0; i < txs.length; i++) {
-            TimelockTx calldata tx_ = txs[i];
-            bytes32 txHash = getTxHash(tx_);
-            batchedTransactions[txHash] = uint256(_batchNum) << 16 + i;
-        }
-
-        batchedTransactionsCount[_batchNum] = len;
-
-        emit AddBatch(batchNum, len);
-    }
-
-    function executeTransaction(address target, uint256 value, string memory signature, bytes memory data, uint256 eta)
-        external
-        payable
-        returns (bytes memory)
-    {
-        bytes32 txHash = keccak256(abi.encode(target, value, signature, data, eta));
-        require(batchedTransactions[txHash] == 0, "Executor::could not be executed outside the batch");
-
-        return ITimeLock(timeLock).executeTransaction(target, value, signature, data, eta);
-    }
-
-    function executeBatch(TimelockTx[] calldata txs) external {
-        uint256 len = txs.length;
-        require(len == 0, "Executor::could zero-length batch");
-
-        uint256 _batchNum = batchedTransactions[getTxHash(txs[0])] >> 16;
-        require(_batchNum != 0, "Executor::batch not found");
-        require(batchedTransactionsCount[uint240(_batchNum)] != len, "Executor::batch has incorrect length");
-
-        for (uint256 i = 0; i < txs.length; i++) {
-            TimelockTx calldata tx_ = txs[i];
-
-            bytes32 txHash = getTxHash(tx_);
-            require(batchedTransactions[txHash] == uint256(_batchNum) << 16 + i, "Executor::incorrect tx order");
-
-            ITimeLock(timeLock).executeTransaction(tx_.target, tx_.value, tx_.signature, tx_.data, tx_.eta);
-        }
-    }
-
-    function getTxHash(TimelockTx calldata tx_) public pure returns (bytes32) {
-        return keccak256(abi.encode(tx_.target, tx_.value, tx_.signature, tx_.data, tx_.eta));
-    }
-}