@raac/rpc 1.1.0-beta.3 → 1.1.0-beta.5

package/dist/assets/getSupply.js

@@ -7,6 +7,9 @@ async function getSupply(chainId, assetId, provider) {
         const SUPPLY_ABI = ["function totalSupply() view returns (uint256)"];
         const contractAddress = (0, contracts_1.getContractAddress)(chainId, assetId);
         const contract = new ethers_1.ethers.Contract(contractAddress, SUPPLY_ABI, provider);
+        if (contract?.totalSupply === undefined) {
+            return 0;
+        }
         const supply = await contract.totalSupply();
         return ethers_1.ethers.formatEther(supply);
     }

package/dist/methods/approveToken.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../contracts/getContractAddress");
-const estimateGasPrice_1 = __importDefault(require("./commons/estimateGasPrice"));
 const approveToken = async (chainId, tokenSymbol, spender, amount, signer) => {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -17,11 +13,7 @@ const approveToken = async (chainId, tokenSymbol, spender, amount, signer) => {
     const tokenContract = new ethers_1.ethers.Contract(tokenAddress, tokenABI, signer);
     try {
         const amountInWei = ethers_1.ethers.parseEther(amount);
-        const { maxFeePerGas } = await (0, estimateGasPrice_1.default)(signer);
-        const tx = await tokenContract.approve(spender, amountInWei, {
-            maxFeePerGas,
-            // maxPriorityFeePerGas
-        });
+        const tx = await tokenContract.approve(spender, amountInWei);
         console.log(`Approval transaction sent:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Approved ${amount} ${tokenSymbol} for ${spender} successfully:`, receipt.transactionHash);

package/dist/minter/tick.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
-const estimateGasPrice_1 = __importDefault(require("../methods/commons/estimateGasPrice"));
 async function tick(chainId, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -15,10 +11,10 @@ async function tick(chainId, signer) {
         const raacMinterAddress = (0, contracts_1.getContractAddress)(chainId, "raacminter");
         const raacMinterABI = (0, artifacts_1.getABI)("raacminter");
         const raacMinterContract = new ethers_1.ethers.Contract(raacMinterAddress, raacMinterABI, signer);
-        const { maxFeePerGas } = await (0, estimateGasPrice_1.default)(signer);
-        console.log({ maxFeePerGas });
+        // const { maxFeePerGas } = await estimateGasPrice(signer);
+        // console.log({ maxFeePerGas });
         const tick = await raacMinterContract.tick({
-            maxFeePerGas,
+            // maxFeePerGas,
             nonce: await signer.getNonce(),
         });
         if (tick.wait) {

package/dist/pools/lendingPool/borrowFromLendingPool.js

@@ -12,7 +12,7 @@ async function borrowFromLendingPool(chainId, tokenId, amount, signer) {
         console.log("Borrowing amount in wei:", amountInWei.toString());
         const tx = await lendingPoolContract.borrow(tokenId, amountInWei.toString());
         const receipt = await tx.wait();
-        console.log(`Borrowed ${ethers_1.ethers.formatEther(amount)} from lending pool`);
+        console.log(`Borrowed ${amount} from lending pool`);
         console.log(`Transaction hash: ${receipt?.hash}`);
         return receipt;
     }

package/dist/pools/lendingPool/depositNFTToLendingPool.js

@@ -27,14 +27,14 @@ async function depositNFTToLendingPool(chainId, tokenId, signer) {
         }
         // Approve the lending pool to transfer the NFT
         const approveTx = await nftContract.approve(lendingPoolAddress, tokenId, {
-            maxFeePerGas,
+            // maxFeePerGas,
             nonce: await signer.getNonce(),
         });
         await approveTx.wait();
         console.log(`Approved lending pool to transfer NFT #${tokenId}`);
         // Deposit (stake) the NFT
         const depositTx = await lendingPoolContract.depositNFT(tokenId, {
-            maxFeePerGas,
+            // maxFeePerGas,
             nonce: await signer.getNonce(),
         });
         console.log(`Deposit transaction sent for NFT #${tokenId}:`, depositTx.hash);

package/dist/pools/lendingPool/depositToLendingPool.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../../utils/contracts");
 const artifacts_1 = require("../../utils/artifacts");
-const estimateGasPrice_1 = __importDefault(require("../../methods/commons/estimateGasPrice"));
 // checked
 async function depositToLendingPool(chainId, amount, signer) {
     if (!signer) {
@@ -17,9 +13,9 @@ async function depositToLendingPool(chainId, amount, signer) {
         const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
         const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, signer);
         const amountInWei = ethers_1.ethers.parseEther(amount);
-        const { maxFeePerGas } = await (0, estimateGasPrice_1.default)(signer);
+        // const { maxFeePerGas } = await estimateGasPrice(signer);
         const depositTx = await lendingPoolContract.deposit(amountInWei.toString(), {
-            maxFeePerGas,
+            // maxFeePerGas,
             nonce: await signer.getNonce(),
         });
         console.log(`Deposit transaction sent for rToken:`, depositTx.hash);

package/dist/pools/lendingPool/getPositionView.js

@@ -12,6 +12,7 @@ function transformPositionView(positionView) {
         isUnderLiquidation: positionView?.[3] || false,
         liquidationStartTime: (positionView?.[4] || 0n).toString(),
         positionIndex: (positionView?.[5] || 0n).toString(),
+        isInsured: positionView?.[6] || false,
     };
 }
 /**

package/dist/pools/lendingPool/getUserOfDepositedNFT.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const artifacts_1 = require("../../utils/artifacts");
+/**
+ * @description Get the sum of all the scaled debts of a user over all NFTs
+ * @param chainId
+ * @param tokenId
+ * @param provider
+ * @returns The  debt of the user
+ */
+async function getUserOfDepositedNFT(chainId, tokenId, provider) {
+    try {
+        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
+        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
+        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
+        const reward = await lendingPoolContract.getUserOfDepositedNFT(tokenId);
+        console.log(`getUserOfDepositedNFT result: ${ethers_1.ethers.formatEther(reward)}`);
+        return reward;
+    }
+    catch (error) {
+        console.error("Error in getUserOfDepositedNFT:", error);
+        throw error;
+    }
+}
+exports.default = getUserOfDepositedNFT;

package/dist/pools/lendingPool/withdrawFromLendingPool.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../../contracts/getContractAddress");
 const artifacts_1 = require("../../utils/artifacts");
-const estimateGasPrice_1 = __importDefault(require("../../methods/commons/estimateGasPrice"));
 async function withdrawFromLendingPool(chainId, amount, signer) {
     try {
         const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
@@ -16,7 +12,7 @@ async function withdrawFromLendingPool(chainId, amount, signer) {
         const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, signer);
         const rTokenContract = new ethers_1.ethers.Contract(rtokenAddress, assetABI, signer);
         const amountInWei = ethers_1.ethers.parseEther(amount.toString());
-        const { maxFeePerGas } = await (0, estimateGasPrice_1.default)(signer);
+        // const { maxFeePerGas } = await estimateGasPrice(signer);
         const userBalance = await rTokenContract.balanceOf(await signer.getAddress());
         if (userBalance < parseFloat(amount)) {
             throw new Error(`Insufficient rToken balance. Available: ${ethers_1.ethers.formatEther(userBalance)}, Requested: ${ethers_1.ethers.formatEther(amount)}`);

package/dist/pools/stabilityPool/depositToStabilityPool.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../../utils/contracts");
 const artifacts_1 = require("../../utils/artifacts");
-const estimateGasPrice_1 = __importDefault(require("../../methods/commons/estimateGasPrice"));
 async function depositToStabilityPool(chainId, amount, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -16,9 +12,7 @@ async function depositToStabilityPool(chainId, amount, signer) {
         const abi = (0, artifacts_1.getABI)("stabilitypool");
         const stabilityPoolContract = new ethers_1.ethers.Contract(stabilityPoolAddress, abi, signer);
         const amountInWei = ethers_1.ethers.parseEther(amount);
-        const { maxFeePerGas } = await (0, estimateGasPrice_1.default)(signer);
         const tx = await stabilityPoolContract.deposit(amountInWei.toString(), {
-            maxFeePerGas,
             nonce: await signer.getNonce(),
         });
         console.log(`Deposit transaction sent to Stability Pool:`, tx.hash);

package/dist/pools/stabilityPool/withdrawFromStabilityPool.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../../utils/contracts");
 const artifacts_1 = require("../../utils/artifacts");
-const estimateGasPrice_1 = __importDefault(require("../../methods/commons/estimateGasPrice"));
 async function withdrawFromStabilityPool(chainId, amount, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -16,9 +12,7 @@ async function withdrawFromStabilityPool(chainId, amount, signer) {
         const abi = (0, artifacts_1.getABI)("stabilitypool");
         const stabilityPoolContract = new ethers_1.ethers.Contract(stabilityPoolAddress, abi, signer);
         const amountInWei = ethers_1.ethers.parseEther(amount);
-        const { maxFeePerGas } = await (0, estimateGasPrice_1.default)(signer);
         const tx = await stabilityPoolContract.withdraw(amountInWei.toString(), {
-            maxFeePerGas,
             nonce: await signer.getNonce(),
         });
         console.log(`Withdrawal transaction sent to Stability Pool:`, tx.hash);

package/dist/scripts/index.js

@@ -9,7 +9,7 @@ const chains_1 = __importDefault(require("../configs/chains"));
 const RPCLibrary_1 = __importDefault(require("../RPCLibrary"));
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
-const chainId = 11155111;
+const chainId = 8453;
 const config = chains_1.default[chainId];
 const TEST_MNEMONIC = process.env.TEST_MNEMONIC;
 const TEST_PRIVATE_KEY = process.env.TEST_PRIVATE_KEY;
@@ -17,14 +17,16 @@ async function getProvider() {
     return new ethers_1.ethers.JsonRpcProvider(config.rpcs[0]);
 }
 async function createWallet(mnemonic, provider) {
-    // const wallet = ethers.Wallet.fromPhrase(mnemonic, provider);
-    // console.info(`[${chainId}]: Loaded wallet from mnemonic: ${wallet.address}`);
-    // // the signer is the wallet
-    // return wallet;
-    // load from private key
-    const wallet = new ethers_1.ethers.Wallet(TEST_PRIVATE_KEY, provider);
-    console.info(`[${chainId}]: Loaded wallet from private key: ${wallet.address}`);
+    const wallet = ethers_1.ethers.Wallet.fromPhrase(mnemonic, provider);
+    console.info(`[${chainId}]: Loaded wallet from mnemonic: ${wallet.address}`);
+    // the signer is the wallet
     return wallet;
+    // load from private key
+    // const wallet = new ethers.Wallet(TEST_PRIVATE_KEY, provider);
+    // console.info(
+    // 	`[${chainId}]: Loaded wallet from private key: ${wallet.address}`
+    // );
+    // return wallet;
 }
 async function setup() {
     const provider = await getProvider();
@@ -144,7 +146,7 @@ const fulfillRequest = async () => {
     const redemptionToken = await rpc.contracts.indexToken.getNextRandomNFT(chainId, provider);
     console.log("Redemption token", redemptionToken);
 };
-execute();
+// execute();
 // setup();
 // fulfillRequest();
-// updateNFTPrice("7", "1650000");
+updateNFTPrice("1", "200000");

package/dist/types/RPCLibrary.d.ts

@@ -69,6 +69,7 @@ import redeemNFT from "./contracts/indexToken/redeemNFT";
 import getNextRandomNFT from "./contracts/indexToken/getNextRandomNFT";
 import calculateInsuranceFee from "./pools/lendingPool/calculateInsuranceFee";
 import getTotalPropertiesCount from "./nfts/getTotalPropertiesCount";
+import getUserOfDepositedNFT from "./pools/lendingPool/getUserOfDepositedNFT";
 declare class RPCLibrary {
     signer: Signer | null;
     isConnected: boolean;
@@ -157,6 +158,7 @@ declare class RPCLibrary {
             closeLiquidation: typeof closeLiquidation;
             borrowFromLendingPoolWithInsurance: typeof borrowFromLendingPoolWithInsurance;
             calculateInsuranceFee: typeof calculateInsuranceFee;
+            getUserOfDepositedNFT: typeof getUserOfDepositedNFT;
         };
         depositToLendingPool: typeof depositToLendingPool;
         withdrawFromLendingPool: typeof withdrawFromLendingPool;

package/dist/types/pools/lendingPool/getAllUserData.d.ts

@@ -11,6 +11,7 @@ declare function getAllUserData(chainId: ChainId, address: string, provider: Pro
         isUnderLiquidation: boolean;
         liquidationStartTime: string;
         positionIndex: string;
+        isInsured: boolean;
     }[];
 }>;
 export default getAllUserData;

package/dist/types/pools/lendingPool/getPositionView.d.ts

@@ -8,6 +8,7 @@ export declare function transformPositionView(positionView: ILendingPool.NFTPosi
     isUnderLiquidation: boolean;
     liquidationStartTime: string;
     positionIndex: string;
+    isInsured: boolean;
 };
 /**
  * @description Return all the information about a NFT position
@@ -23,5 +24,6 @@ declare function getPositionView(chainId: ChainId, address: string, tokenId: str
     isUnderLiquidation: boolean;
     liquidationStartTime: string;
     positionIndex: string;
+    isInsured: boolean;
 }>;
 export default getPositionView;

package/dist/types/pools/lendingPool/getUserOfDepositedNFT.d.ts

@@ -0,0 +1,11 @@
+import { Provider } from "ethers";
+import { ChainId } from "../../configs/chains/index";
+/**
+ * @description Get the sum of all the scaled debts of a user over all NFTs
+ * @param chainId
+ * @param tokenId
+ * @param provider
+ * @returns The  debt of the user
+ */
+declare function getUserOfDepositedNFT(chainId: ChainId, tokenId: string, provider: Provider): Promise<string>;
+export default getUserOfDepositedNFT;

package/dist/types/typechain-types/@openzeppelin/contracts/token/ERC721/extensions/index.d.ts

@@ -1,4 +1,3 @@
 export type { ERC721Enumerable } from "./ERC721Enumerable";
-export type { ERC721Wrapper } from "./ERC721Wrapper";
 export type { IERC721Enumerable } from "./IERC721Enumerable";
 export type { IERC721Metadata } from "./IERC721Metadata";

package/dist/types/typechain-types/contracts/core/pools/LendingPool/LendingPool.d.ts

@@ -129,8 +129,8 @@ export declare namespace ReserveLibrary {
     };
 }
 export interface LendingPoolInterface extends Interface {
-    getFunction(nameOrSignature: "BASE_HEALTH_FACTOR_LIQUIDATION_THRESHOLD" | "BASE_LIQUIDATION_GRACE_PERIOD" | "BASE_LIQUIDATION_THRESHOLD" | "borrow" | "borrowWithInsurance" | "calculateHealthFactor" | "calculateInsuranceFee" | "canPaybackDebt" | "claimCollectorRewards" | "claimReward" | "closeLiquidation" | "debtToken" | "deposit" | "depositFee" | "depositNFT" | "depositRewardTokens" | "feeCollector" | "finalizeLiquidation" | "getAllUserData" | "getEligibleUserDeposits" | "getNFTPrice" | "getNormalizedDebt" | "getNormalizedIncome" | "getPendingReward" | "getPosition" | "getPositionData" | "getPositionDebt" | "getPositionScaledDebt" | "getPositionView" | "getPositionsScaledDebt" | "getPrimeRate" | "getRAACNFTAddress" | "getReserveRateData" | "getReserveState" | "getUnclaimedVaultRewards" | "getUninsuredBalance" | "getUserCollateralValue" | "getUserDebt" | "getUserDeposits" | "getUserDepositsInStabilityPool" | "getUserOfDepositedNFT" | "healthFactorLiquidationThreshold" | "initiateLiquidation" | "insuranceFee" | "liquidationGracePeriod" | "liquidationThreshold" | "liquidityBufferRatio" | "onERC721Received" | "owner" | "pause" | "paused" | "positions" | "priceOracle" | "primeRateOracle" | "rToken" | "raacNFT" | "rateData" | "renounceOwnership" | "repay" | "repayOnBehalf" | "rescueToken" | "reserve" | "reserveAssetToken" | "rewardData" | "setFeeCollector" | "setParameter" | "setPrimeRate" | "setPrimeRateOracle" | "setRewardToken" | "setStabilityPool" | "setVault" | "stabilityPool" | "transferAccruedDust" | "transferOwnership" | "unpause" | "updateState" | "updateUserReward" | "userData" | "vault" | "vaultRewards" | "withdraw" | "withdrawNFT" | "withdrawalFee" | "withdrawalsPaused"): FunctionFragment;
-    getEvent(nameOrSignatureOrTopic: "Borrow" | "CanPaybackDebtChanged" | "Deposit(address,uint256,uint256)" | "Deposit(address,uint256,uint256)" | "DepositFeeUpdated" | "FeeCollectorUpdated" | "InsufficientFees" | "InsuranceFeeUpdated" | "InsuredNFT" | "InterestRatesUpdated" | "Liquidation" | "LiquidationClosed" | "LiquidationFinalized" | "LiquidationInitiated" | "LiquidationParametersUpdated" | "LiquidityBufferRatioUpdated" | "LiquidityRebalanced" | "NFTDeposited" | "NFTWithdrawn" | "NotFeeCollector" | "OwnershipTransferred" | "Paused" | "PrimeRateUpdated" | "ProtocolFeeRateUpdated" | "ProtocolFeesCollected" | "ProtocolFeesWithdrawn" | "Repay" | "ReserveInterestsUpdated" | "RewardClaimed" | "RewardDistributed" | "RewardParametersUpdated" | "RewardTokenAdded" | "RewardTokensDeposited" | "StabilityPoolUpdated" | "Unpaused" | "VaultRewardsClaimed" | "VaultUpdated" | "VaultWithdrawalFailed" | "Withdraw(address,uint256)" | "Withdraw(address,uint256,uint256)" | "WithdrawFeeUpdated" | "WithdrawalsPauseStatusChanged"): EventFragment;
+    getFunction(nameOrSignature: "BASE_HEALTH_FACTOR_LIQUIDATION_THRESHOLD" | "BASE_LIQUIDATION_GRACE_PERIOD" | "BASE_LIQUIDATION_THRESHOLD" | "borrow" | "borrowWithInsurance" | "calculateHealthFactor" | "calculateInsuranceFee" | "canPaybackDebt" | "claimCollectorRewards" | "claimReward" | "closeLiquidation" | "debtToken" | "deposit" | "depositNFT" | "depositRewardTokens" | "feeCollector" | "finalizeLiquidation" | "getAllUserData" | "getEligibleUserDeposits" | "getNFTPrice" | "getNormalizedDebt" | "getNormalizedIncome" | "getPendingReward" | "getPosition" | "getPositionData" | "getPositionDebt" | "getPositionScaledDebt" | "getPositionView" | "getPositionsScaledDebt" | "getPrimeRate" | "getRAACNFTAddress" | "getReserveRateData" | "getReserveState" | "getUnclaimedVaultRewards" | "getUninsuredBalance" | "getUserCollateralValue" | "getUserDebt" | "getUserDeposits" | "getUserDepositsInStabilityPool" | "getUserOfDepositedNFT" | "healthFactorLiquidationThreshold" | "initiateLiquidation" | "insuranceFee" | "liquidationGracePeriod" | "liquidationThreshold" | "liquidityBufferRatio" | "onERC721Received" | "owner" | "pause" | "paused" | "positions" | "priceOracle" | "primeRateOracle" | "rToken" | "raacNFT" | "rateData" | "renounceOwnership" | "repay" | "repayOnBehalf" | "rescueToken" | "reserve" | "reserveAssetToken" | "rewardData" | "setFeeCollector" | "setParameter" | "setPrimeRate" | "setPrimeRateOracle" | "setRewardToken" | "setStabilityPool" | "setVault" | "stabilityPool" | "transferAccruedDust" | "transferOwnership" | "unpause" | "updateState" | "updateUserReward" | "userData" | "vault" | "vaultRewards" | "withdraw" | "withdrawNFT" | "withdrawalsPaused"): FunctionFragment;
+    getEvent(nameOrSignatureOrTopic: "Borrow" | "CanPaybackDebtChanged" | "Deposit(address,uint256,uint256)" | "Deposit(address,uint256,uint256)" | "FeeCollectorUpdated" | "InsufficientFees" | "InsuranceFeeUpdated" | "InsuredNFT" | "InterestRatesUpdated" | "Liquidation" | "LiquidationClosed" | "LiquidationFinalized" | "LiquidationInitiated" | "LiquidationParametersUpdated" | "LiquidityBufferRatioUpdated" | "LiquidityRebalanced" | "NFTDeposited" | "NFTWithdrawn" | "NotFeeCollector" | "OwnershipTransferred" | "Paused" | "PrimeRateUpdated" | "ProtocolFeeRateUpdated" | "ProtocolFeesCollected" | "ProtocolFeesWithdrawn" | "Repay" | "ReserveInterestsUpdated" | "RewardClaimed" | "RewardDistributed" | "RewardParametersUpdated" | "RewardTokenAdded" | "RewardTokensDeposited" | "StabilityPoolUpdated" | "Unpaused" | "VaultRewardsClaimed" | "VaultUpdated" | "VaultWithdrawalFailed" | "Withdraw(address,uint256)" | "Withdraw(address,uint256,uint256)" | "WithdrawalsPauseStatusChanged"): EventFragment;
     encodeFunctionData(functionFragment: "BASE_HEALTH_FACTOR_LIQUIDATION_THRESHOLD", values?: undefined): string;
     encodeFunctionData(functionFragment: "BASE_LIQUIDATION_GRACE_PERIOD", values?: undefined): string;
     encodeFunctionData(functionFragment: "BASE_LIQUIDATION_THRESHOLD", values?: undefined): string;
@@ -144,7 +144,6 @@ export interface LendingPoolInterface extends Interface {
     encodeFunctionData(functionFragment: "closeLiquidation", values: [BigNumberish]): string;
     encodeFunctionData(functionFragment: "debtToken", values?: undefined): string;
     encodeFunctionData(functionFragment: "deposit", values: [BigNumberish]): string;
-    encodeFunctionData(functionFragment: "depositFee", values?: undefined): string;
     encodeFunctionData(functionFragment: "depositNFT", values: [BigNumberish]): string;
     encodeFunctionData(functionFragment: "depositRewardTokens", values: [BigNumberish]): string;
     encodeFunctionData(functionFragment: "feeCollector", values?: undefined): string;
@@ -213,7 +212,6 @@ export interface LendingPoolInterface extends Interface {
     encodeFunctionData(functionFragment: "vaultRewards", values?: undefined): string;
     encodeFunctionData(functionFragment: "withdraw", values: [BigNumberish]): string;
     encodeFunctionData(functionFragment: "withdrawNFT", values: [BigNumberish]): string;
-    encodeFunctionData(functionFragment: "withdrawalFee", values?: undefined): string;
     encodeFunctionData(functionFragment: "withdrawalsPaused", values?: undefined): string;
     decodeFunctionResult(functionFragment: "BASE_HEALTH_FACTOR_LIQUIDATION_THRESHOLD", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "BASE_LIQUIDATION_GRACE_PERIOD", data: BytesLike): Result;
@@ -228,7 +226,6 @@ export interface LendingPoolInterface extends Interface {
     decodeFunctionResult(functionFragment: "closeLiquidation", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "debtToken", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "depositFee", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "depositNFT", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "depositRewardTokens", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "feeCollector", data: BytesLike): Result;
@@ -297,7 +294,6 @@ export interface LendingPoolInterface extends Interface {
     decodeFunctionResult(functionFragment: "vaultRewards", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "withdrawNFT", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "withdrawalFee", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "withdrawalsPaused", data: BytesLike): Result;
 }
 export declare namespace BorrowEvent {
@@ -365,21 +361,6 @@ export declare namespace Deposit_address_uint256_uint256_Event {
     type Log = TypedEventLog<Event>;
     type LogDescription = TypedLogDescription<Event>;
 }
-export declare namespace DepositFeeUpdatedEvent {
-    type InputTuple = [
-        oldDepositFee: BigNumberish,
-        newDepositFee: BigNumberish
-    ];
-    type OutputTuple = [oldDepositFee: bigint, newDepositFee: bigint];
-    interface OutputObject {
-        oldDepositFee: bigint;
-        newDepositFee: bigint;
-    }
-    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
-    type Filter = TypedDeferredTopicFilter<Event>;
-    type Log = TypedEventLog<Event>;
-    type LogDescription = TypedLogDescription<Event>;
-}
 export declare namespace FeeCollectorUpdatedEvent {
     type InputTuple = [
         oldFeeCollector: AddressLike,
@@ -900,24 +881,6 @@ export declare namespace Withdraw_address_uint256_uint256_Event {
     type Log = TypedEventLog<Event>;
     type LogDescription = TypedLogDescription<Event>;
 }
-export declare namespace WithdrawFeeUpdatedEvent {
-    type InputTuple = [
-        oldWithdrawalFee: BigNumberish,
-        newWithdrawalFee: BigNumberish
-    ];
-    type OutputTuple = [
-        oldWithdrawalFee: bigint,
-        newWithdrawalFee: bigint
-    ];
-    interface OutputObject {
-        oldWithdrawalFee: bigint;
-        newWithdrawalFee: bigint;
-    }
-    type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
-    type Filter = TypedDeferredTopicFilter<Event>;
-    type Log = TypedEventLog<Event>;
-    type LogDescription = TypedLogDescription<Event>;
-}
 export declare namespace WithdrawalsPauseStatusChangedEvent {
     type InputTuple = [isPaused: boolean];
     type OutputTuple = [isPaused: boolean];
@@ -983,7 +946,6 @@ export interface LendingPool extends BaseContract {
     ], "nonpayable">;
     debtToken: TypedContractMethod<[], [string], "view">;
     deposit: TypedContractMethod<[amount: BigNumberish], [void], "nonpayable">;
-    depositFee: TypedContractMethod<[], [bigint], "view">;
     depositNFT: TypedContractMethod<[
         tokenId: BigNumberish
     ], [
@@ -1289,7 +1251,6 @@ export interface LendingPool extends BaseContract {
     ], [
         void
     ], "nonpayable">;
-    withdrawalFee: TypedContractMethod<[], [bigint], "view">;
     withdrawalsPaused: TypedContractMethod<[], [boolean], "view">;
     getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
     getFunction(nameOrSignature: "BASE_HEALTH_FACTOR_LIQUIDATION_THRESHOLD"): TypedContractMethod<[], [bigint], "view">;
@@ -1326,7 +1287,6 @@ export interface LendingPool extends BaseContract {
     getFunction(nameOrSignature: "closeLiquidation"): TypedContractMethod<[tokenId: BigNumberish], [void], "nonpayable">;
     getFunction(nameOrSignature: "debtToken"): TypedContractMethod<[], [string], "view">;
     getFunction(nameOrSignature: "deposit"): TypedContractMethod<[amount: BigNumberish], [void], "nonpayable">;
-    getFunction(nameOrSignature: "depositFee"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "depositNFT"): TypedContractMethod<[tokenId: BigNumberish], [void], "nonpayable">;
     getFunction(nameOrSignature: "depositRewardTokens"): TypedContractMethod<[amount: BigNumberish], [void], "nonpayable">;
     getFunction(nameOrSignature: "feeCollector"): TypedContractMethod<[], [string], "view">;
@@ -1565,13 +1525,11 @@ export interface LendingPool extends BaseContract {
     ], "view">;
     getFunction(nameOrSignature: "withdraw"): TypedContractMethod<[amount: BigNumberish], [void], "nonpayable">;
     getFunction(nameOrSignature: "withdrawNFT"): TypedContractMethod<[tokenId: BigNumberish], [void], "nonpayable">;
-    getFunction(nameOrSignature: "withdrawalFee"): TypedContractMethod<[], [bigint], "view">;
     getFunction(nameOrSignature: "withdrawalsPaused"): TypedContractMethod<[], [boolean], "view">;
     getEvent(key: "Borrow"): TypedContractEvent<BorrowEvent.InputTuple, BorrowEvent.OutputTuple, BorrowEvent.OutputObject>;
     getEvent(key: "CanPaybackDebtChanged"): TypedContractEvent<CanPaybackDebtChangedEvent.InputTuple, CanPaybackDebtChangedEvent.OutputTuple, CanPaybackDebtChangedEvent.OutputObject>;
     getEvent(key: "Deposit(address,uint256,uint256)"): TypedContractEvent<Deposit_address_uint256_uint256_Event.InputTuple, Deposit_address_uint256_uint256_Event.OutputTuple, Deposit_address_uint256_uint256_Event.OutputObject>;
     getEvent(key: "Deposit(address,uint256,uint256)"): TypedContractEvent<Deposit_address_uint256_uint256_Event.InputTuple, Deposit_address_uint256_uint256_Event.OutputTuple, Deposit_address_uint256_uint256_Event.OutputObject>;
-    getEvent(key: "DepositFeeUpdated"): TypedContractEvent<DepositFeeUpdatedEvent.InputTuple, DepositFeeUpdatedEvent.OutputTuple, DepositFeeUpdatedEvent.OutputObject>;
     getEvent(key: "FeeCollectorUpdated"): TypedContractEvent<FeeCollectorUpdatedEvent.InputTuple, FeeCollectorUpdatedEvent.OutputTuple, FeeCollectorUpdatedEvent.OutputObject>;
     getEvent(key: "InsufficientFees"): TypedContractEvent<InsufficientFeesEvent.InputTuple, InsufficientFeesEvent.OutputTuple, InsufficientFeesEvent.OutputObject>;
     getEvent(key: "InsuranceFeeUpdated"): TypedContractEvent<InsuranceFeeUpdatedEvent.InputTuple, InsuranceFeeUpdatedEvent.OutputTuple, InsuranceFeeUpdatedEvent.OutputObject>;
@@ -1607,7 +1565,6 @@ export interface LendingPool extends BaseContract {
     getEvent(key: "VaultWithdrawalFailed"): TypedContractEvent<VaultWithdrawalFailedEvent.InputTuple, VaultWithdrawalFailedEvent.OutputTuple, VaultWithdrawalFailedEvent.OutputObject>;
     getEvent(key: "Withdraw(address,uint256)"): TypedContractEvent<Withdraw_address_uint256_Event.InputTuple, Withdraw_address_uint256_Event.OutputTuple, Withdraw_address_uint256_Event.OutputObject>;
     getEvent(key: "Withdraw(address,uint256,uint256)"): TypedContractEvent<Withdraw_address_uint256_uint256_Event.InputTuple, Withdraw_address_uint256_uint256_Event.OutputTuple, Withdraw_address_uint256_uint256_Event.OutputObject>;
-    getEvent(key: "WithdrawFeeUpdated"): TypedContractEvent<WithdrawFeeUpdatedEvent.InputTuple, WithdrawFeeUpdatedEvent.OutputTuple, WithdrawFeeUpdatedEvent.OutputObject>;
     getEvent(key: "WithdrawalsPauseStatusChanged"): TypedContractEvent<WithdrawalsPauseStatusChangedEvent.InputTuple, WithdrawalsPauseStatusChangedEvent.OutputTuple, WithdrawalsPauseStatusChangedEvent.OutputObject>;
     filters: {
         "Borrow(address,uint256)": TypedContractEvent<BorrowEvent.InputTuple, BorrowEvent.OutputTuple, BorrowEvent.OutputObject>;
@@ -1616,8 +1573,6 @@ export interface LendingPool extends BaseContract {
         CanPaybackDebtChanged: TypedContractEvent<CanPaybackDebtChangedEvent.InputTuple, CanPaybackDebtChangedEvent.OutputTuple, CanPaybackDebtChangedEvent.OutputObject>;
         "Deposit(address,uint256,uint256)": TypedContractEvent<Deposit_address_uint256_uint256_Event.InputTuple, Deposit_address_uint256_uint256_Event.OutputTuple, Deposit_address_uint256_uint256_Event.OutputObject>;
         "Deposit(address,uint256,uint256)": TypedContractEvent<Deposit_address_uint256_uint256_Event.InputTuple, Deposit_address_uint256_uint256_Event.OutputTuple, Deposit_address_uint256_uint256_Event.OutputObject>;
-        "DepositFeeUpdated(uint256,uint256)": TypedContractEvent<DepositFeeUpdatedEvent.InputTuple, DepositFeeUpdatedEvent.OutputTuple, DepositFeeUpdatedEvent.OutputObject>;
-        DepositFeeUpdated: TypedContractEvent<DepositFeeUpdatedEvent.InputTuple, DepositFeeUpdatedEvent.OutputTuple, DepositFeeUpdatedEvent.OutputObject>;
         "FeeCollectorUpdated(address,address)": TypedContractEvent<FeeCollectorUpdatedEvent.InputTuple, FeeCollectorUpdatedEvent.OutputTuple, FeeCollectorUpdatedEvent.OutputObject>;
         FeeCollectorUpdated: TypedContractEvent<FeeCollectorUpdatedEvent.InputTuple, FeeCollectorUpdatedEvent.OutputTuple, FeeCollectorUpdatedEvent.OutputObject>;
         "InsufficientFees()": TypedContractEvent<InsufficientFeesEvent.InputTuple, InsufficientFeesEvent.OutputTuple, InsufficientFeesEvent.OutputObject>;
@@ -1686,8 +1641,6 @@ export interface LendingPool extends BaseContract {
         VaultWithdrawalFailed: TypedContractEvent<VaultWithdrawalFailedEvent.InputTuple, VaultWithdrawalFailedEvent.OutputTuple, VaultWithdrawalFailedEvent.OutputObject>;
         "Withdraw(address,uint256)": TypedContractEvent<Withdraw_address_uint256_Event.InputTuple, Withdraw_address_uint256_Event.OutputTuple, Withdraw_address_uint256_Event.OutputObject>;
         "Withdraw(address,uint256,uint256)": TypedContractEvent<Withdraw_address_uint256_uint256_Event.InputTuple, Withdraw_address_uint256_uint256_Event.OutputTuple, Withdraw_address_uint256_uint256_Event.OutputObject>;
-        "WithdrawFeeUpdated(uint256,uint256)": TypedContractEvent<WithdrawFeeUpdatedEvent.InputTuple, WithdrawFeeUpdatedEvent.OutputTuple, WithdrawFeeUpdatedEvent.OutputObject>;
-        WithdrawFeeUpdated: TypedContractEvent<WithdrawFeeUpdatedEvent.InputTuple, WithdrawFeeUpdatedEvent.OutputTuple, WithdrawFeeUpdatedEvent.OutputObject>;
         "WithdrawalsPauseStatusChanged(bool)": TypedContractEvent<WithdrawalsPauseStatusChangedEvent.InputTuple, WithdrawalsPauseStatusChangedEvent.OutputTuple, WithdrawalsPauseStatusChangedEvent.OutputObject>;
         WithdrawalsPauseStatusChanged: TypedContractEvent<WithdrawalsPauseStatusChangedEvent.InputTuple, WithdrawalsPauseStatusChangedEvent.OutputTuple, WithdrawalsPauseStatusChangedEvent.OutputObject>;
     };

package/dist/types/typechain-types/contracts/core/tokens/DebtToken.d.ts

@@ -12,7 +12,14 @@ export interface DebtTokenInterface extends Interface {
     encodeFunctionData(functionFragment: "eip712Domain", values?: undefined): string;
     encodeFunctionData(functionFragment: "getLendingPool", values?: undefined): string;
     encodeFunctionData(functionFragment: "getUsageIndex", values?: undefined): string;
-    encodeFunctionData(functionFragment: "mint", values: [AddressLike, AddressLike, BigNumberish, BigNumberish, BigNumberish]): string;
+    encodeFunctionData(functionFragment: "mint", values: [
+        AddressLike,
+        AddressLike,
+        BigNumberish,
+        BigNumberish,
+        BigNumberish,
+        BigNumberish
+    ]): string;
     encodeFunctionData(functionFragment: "name", values?: undefined): string;
     encodeFunctionData(functionFragment: "nonces", values: [AddressLike]): string;
     encodeFunctionData(functionFragment: "owner", values?: undefined): string;
@@ -258,8 +265,9 @@ export interface DebtToken extends BaseContract {
         caller: AddressLike,
         onBehalfOf: AddressLike,
         amount: BigNumberish,
-        index: BigNumberish,
-        positionIndex: BigNumberish
+        poolUsageIndex: BigNumberish,
+        positionIndex: BigNumberish,
+        tokenId: BigNumberish
     ], [
         [boolean, bigint, bigint]
     ], "nonpayable">;
@@ -360,8 +368,9 @@ export interface DebtToken extends BaseContract {
         caller: AddressLike,
         onBehalfOf: AddressLike,
         amount: BigNumberish,
-        index: BigNumberish,
-        positionIndex: BigNumberish
+        poolUsageIndex: BigNumberish,
+        positionIndex: BigNumberish,
+        tokenId: BigNumberish
     ], [
         [boolean, bigint, bigint]
     ], "nonpayable">;