@raac/rpc 1.1.0-beta.11 → 1.1.0-beta.13

package/dist/pools/lendingPool/_helpers.js

@@ -33,9 +33,8 @@ function getLendingPoolAdapterByAddress(chainId, address) {
         throw new Error("Adapter not found in config.");
     return adaptersConfig[matchKey];
 }
-async function getLendingPoolContract(chainId) {
+async function getLendingPoolContract(chainId, providerOrProvider) {
     const lendingPoolAddress = (0, getContractAddress_1.default)(chainId, "lendingpool");
     const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-    const provider = new ethers_1.ethers.JsonRpcProvider();
-    return new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
+    return new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, providerOrProvider);
 }

package/dist/pools/lendingPool/borrowFromLendingPool.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
-async function borrowFromLendingPool(chainId, adapterName, amount, data) {
+async function borrowFromLendingPool(chainId, adapterName, amount, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/borrowFromLendingPoolWithInsurance.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
 // TODO: interface changed
-async function borrowFromLendingPoolWithInsurance(chainId, adapterName, amount, data) {
+async function borrowFromLendingPoolWithInsurance(chainId, adapterName, amount, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/calculateInsuranceFee.js

@@ -10,7 +10,7 @@ async function calculateInsuranceFee(chainId, adapterName, userAddress, data, am
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found`);
         }
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const amountInWei = ethers_1.ethers.parseEther(amount);
         const fee = await lendingPoolContract.calculateInsuranceFee(adapterAddress, userAddress, data, amountInWei.toString());
         console.log(`Insurance fee: ${ethers_1.ethers.formatEther(fee)}`);

package/dist/pools/lendingPool/closeLiquidation.js

@@ -11,9 +11,9 @@ const _helpers_1 = require("./_helpers");
  * @param data
  * @returns
  */
-async function closeLiquidation(chainId, adapterName, data) {
+async function closeLiquidation(chainId, adapterName, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/depositAssetToLendingPool.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
 // TODO: interface changed
-async function depositAssetToLendingPool(chainId, adapterName, data) {
+async function depositAssetToLendingPool(chainId, adapterName, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/depositToLendingPool.js

@@ -8,7 +8,7 @@ async function depositToLendingPool(chainId, amount, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const amountInWei = ethers_1.ethers.parseEther(amount);
         // const { maxFeePerGas } = await estimateGasPrice(signer);
         const depositTx = await lendingPoolContract.deposit(amountInWei.toString(), {

package/dist/pools/lendingPool/getAdapters.js

@@ -4,7 +4,7 @@ const index_1 = require("../../configs/chains/index");
 const _helpers_1 = require("./_helpers");
 async function getAdapters(chainId, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapters = await lendingPoolContract.getAdapters();
         const adapterConfig = index_1.configs[chainId].adapters;
         return {

package/dist/pools/lendingPool/getEligibleUserDeposits.js

@@ -11,7 +11,7 @@ const _helpers_1 = require("./_helpers");
  */
 async function getEligibleUserDeposits(chainId, address, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const value = await lendingPoolContract.getEligibleUserDeposits(address);
         console.log(`Eligible user deposits: ${ethers_1.ethers.formatEther(value)}`);
         return value;

package/dist/pools/lendingPool/getHealthFactor.js

@@ -12,9 +12,9 @@ const _helpers_1 = require("./_helpers");
  * @param provider
  * @returns The health factor of a position (0, inf)
  */
-async function getHealthFactor(chainId, adapterName, userAddress, data) {
+async function getHealthFactor(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/getLendingPoolInfo.js

@@ -5,7 +5,7 @@ const _helpers_1 = require("./_helpers");
 const artifacts_1 = require("../../utils/artifacts");
 async function getLendingPoolInfo(chainId, userAddress, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const handleError = (operation, returnType) => (error) => {
             if (error.code === "BAD_DATA") {
                 console.log(`BAD_DATA from ${operation} - Pool empty?`, error.messag);
@@ -71,17 +71,17 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
             utilization: (Number(utilization.toString()) / 1e27).toFixed(6), // Utilization as a decimal value between 0 and 1
             liquidityIndex: (Number(liquidityIndex.toString()) / 1e27).toFixed(6),
             usageIndex: (Number(usageIndex.toString()) / 1e27).toFixed(6),
-            currentLiquidityRate: (Number(currentLiquidityRate.toString()) / 1e25).toFixed(2) + "%",
-            currentUsageRate: (Number(currentUsageRate.toString()) / 1e25).toFixed(2) + "%",
-            primeRate: (Number(primeRate.toString()) / 1e25).toFixed(2) + "%",
-            baseRate: (Number(baseRate.toString()) / 1e25).toFixed(2) + "%",
-            optimalRate: (Number(optimalRate.toString()) / 1e25).toFixed(2) + "%",
-            maxRate: (Number(maxRate.toString()) / 1e25).toFixed(2) + "%",
+            currentLiquidityRate: (Number(currentLiquidityRate.toString()) / 1e25).toFixed(2),
+            currentUsageRate: (Number(currentUsageRate.toString()) / 1e25).toFixed(2),
+            primeRate: (Number(primeRate.toString()) / 1e25).toFixed(2),
+            baseRate: (Number(baseRate.toString()) / 1e25).toFixed(2),
+            optimalRate: (Number(optimalRate.toString()) / 1e25).toFixed(2),
+            maxRate: (Number(maxRate.toString()) / 1e25).toFixed(2),
             optimalUtilizationRate: (Number(optimalUtilizationRate.toString()) / 1e27).toFixed(6),
-            protocolFeeRate: (Number(protocolFeeRate.toString()) / 1e25).toFixed(2) + "%",
+            protocolFeeRate: (Number(protocolFeeRate.toString()) / 1e25).toFixed(2),
             normalizedIncome: (Number(normalizedIncome.toString()) / 1e27).toFixed(6),
             normalizedDebt: (Number(normalizedDebt.toString()) / 1e27).toFixed(6),
-            apy: (Number(apy.toString()) / 1e25).toFixed(2) + "%",
+            apy: (Number(apy.toString()) / 1e25).toFixed(2),
             userRedeemable: ethers_1.ethers.formatEther(userRedeemable ?? 0n),
         };
         return result;

package/dist/pools/lendingPool/getLendingPoolTotalLiquidity.js

@@ -5,7 +5,7 @@ const _helpers_1 = require("./_helpers");
 // @deprecated
 async function getLendingPoolTotalLiquidity(chainId, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const reserve = (await lendingPoolContract.reserve());
         const totalLiquidity = reserve.totalLiquidity;
         return totalLiquidity;

package/dist/pools/lendingPool/getParameters.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
 async function getParameters(chainId, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const [canPaybackDebt, withdrawalsPaused, liquidationThreshold, healthFactorLiquidationThreshold, liquidationGracePeriod, insuranceFee, depositFee, liquidityBufferRatio, supplyCap, borrowCap, withdrawTimelockDuration, vaultOpeningFee,] = await lendingPoolContract.parameters();
         const parameters = {
             canPaybackDebt,

package/dist/pools/lendingPool/getPositionDebt.js

@@ -10,9 +10,9 @@ const _helpers_1 = require("./_helpers");
  * @param provider
  * @returns The raw debt of the user on a NFT
  */
-async function getPositionDebt(chainId, adapterName, userAddress, data) {
+async function getPositionDebt(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/getPositionScaledDebt.js

@@ -12,9 +12,9 @@ const _helpers_1 = require("./_helpers");
  * @param data
  * @returns The  debt of the user on a NFT with the accured interest
  */
-async function getPositionScaledDebt(chainId, adapterName, userAddress, data) {
+async function getPositionScaledDebt(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/getPositionView.js

@@ -33,7 +33,7 @@ async function getPositionView(chainId, adapterName, userAddress, data, provider
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found`);
         }
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const position = await lendingPoolContract.getPositionView(adapterAddress, userAddress, data);
         return transformPositionView(position);
     }

package/dist/pools/lendingPool/getPositionsScaledDebt.js

@@ -12,7 +12,7 @@ const _helpers_1 = require("./_helpers");
  */
 async function getPositionsScaledDebt(chainId, address, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const reward = await lendingPoolContract.getPositionsScaledDebt(address);
         console.log(`getPositionsScaledDebt result: ${ethers_1.ethers.formatEther(reward)}`);
         return reward;

package/dist/pools/lendingPool/getRawUserDepositsInLendingPool.js

@@ -5,7 +5,7 @@ const _helpers_1 = require("./_helpers");
 // Get the amount of RToken RAW deposit in the lending pool, without the accured interest
 async function getRawUserDepositsInLendingPool(chainId, address, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const value = await lendingPoolContract.getUserDeposits(address);
         console.log(`User deposits in lending pool: ${ethers_1.ethers.formatEther(value)}`);
         return value;

package/dist/pools/lendingPool/getUserCollateralValue.js

@@ -12,7 +12,7 @@ const _helpers_1 = require("./_helpers");
  */
 async function getUserCollateralValue(chainId, address, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const reward = await lendingPoolContract.getUserCollateralValue(address);
         console.log(`getUserCollateralValue result: ${ethers_1.ethers.formatEther(reward)}`);
         return reward;

package/dist/pools/lendingPool/getWithdrawRequestInfo.js

@@ -8,7 +8,7 @@ async function getWithdrawRequestInfo(chainId, userAddress, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const request = await lendingPoolContract.withdrawTimelock(userAddress);
         if (request[0] === 0n) {
             return null;

package/dist/pools/lendingPool/initializeLiquidation.js

@@ -9,9 +9,9 @@ const _helpers_1 = require("./_helpers");
  * @param provider
  * @returns The  debt of the user
  */
-async function initializeLiquidation(chainId, adapterName, userAddress, data) {
+async function initializeLiquidation(chainId, adapterName, userAddress, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/openVaultPosition.js

@@ -12,7 +12,7 @@ async function openVaultPosition(chainId, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         // Get parameters to check vault opening fee
         const parameters = await lendingPoolContract.parameters();
         const vaultOpeningFee = parameters.vaultOpeningFee;

package/dist/pools/lendingPool/repayToLendingPool.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
-async function repayToLendingPool(chainId, adapterName, amount, data) {
+async function repayToLendingPool(chainId, adapterName, amount, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/requestWithdraw.js

@@ -8,7 +8,7 @@ async function requestWithdraw(chainId, amount, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const amountInWei = ethers_1.ethers.parseEther(amount);
         // Check if withdrawals are paused
         const parameters = await lendingPoolContract.parameters();

package/dist/pools/lendingPool/withdrawAssetFromLendingPool.js

@@ -4,9 +4,9 @@ exports.withdrawAssetFromLendingPool = withdrawAssetFromLendingPool;
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
 exports.default = withdrawAssetFromLendingPool;
-async function withdrawAssetFromLendingPool(chainId, adapterName, data) {
+async function withdrawAssetFromLendingPool(chainId, adapterName, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/withdrawFromLendingPool.js

@@ -6,7 +6,7 @@ const artifacts_1 = require("../../utils/artifacts");
 const _helpers_1 = require("./_helpers");
 async function withdrawFromLendingPool(chainId, amount, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const rtokenAddress = (0, getContractAddress_1.getContractAddress)(chainId, "rtoken");
         const assetABI = (0, artifacts_1.getABI)("rtoken");
         const rTokenContract = new ethers_1.ethers.Contract(rtokenAddress, assetABI, signer);

package/dist/scripts/index.js

@@ -36,79 +36,57 @@ async function setup() {
     rpc.provider = provider;
     rpc.chainId = chainId;
     // // send myself some CRVUSD
-    // await rpc.wallet.assets.mintAsset(
-    // 	chainId,
-    // 	"crvusd",
-    // 	10000000n,
-    // 	signer.address,
-    // 	signer
-    // );
-    // // // set the base uri to instruxi data gateway
-    // await rpc.nfts.setBaseUri(
-    // 	chainId,
-    // 	"https://gateway-staging.instruxi.dev/api/v1/vnft/metadata/public/1/0x0000000000000000000000000000",
-    // 	signer
-    // );
+    await rpc.wallet.assets.mintAsset(chainId, "crvusd", 10000000n, signer.address, signer);
+    // // set the base uri to instruxi data gateway
+    await rpc.nfts.setBaseUri(chainId, "http://44.211.155.244:3000/v1/properties/", signer);
     console.log(await rpc.pools.lendingPool.getLendingPoolInfo(chainId, signer.address, provider));
-    // // // // set the oracle address of the RAACHousePrice. TEmporarily simulating that I AM THE ORACLE
-    // await rpc.contracts.housePrices.setOracle(chainId, signer.address, signer);
-    // // // // // set price for 3 houses
-    // const housePriceAddress = getContractAddress(chainId, "raachouseprices");
-    // const housePriceABI = getABI("raachouseprices");
-    // const housePriceContract = new ethers.Contract(
-    // 	housePriceAddress,
-    // 	housePriceABI,
-    // 	signer
-    // ) as any as RAACHousePrices;
-    // const raacNFTAddress = getContractAddress(chainId, "raacnft");
-    // const raacNFTABI = getABI("raacnft");
-    // const raacNFTContract = new ethers.Contract(
-    // 	raacNFTAddress,
-    // 	raacNFTABI,
-    // 	signer
-    // ) as any as RAACNFT;
-    // const countTokens = 3;
-    // // // // Generate 10 house prices between 100K and 2M
-    // const housePrices = [];
-    // for (let i = 1; i <= countTokens; i++) {
-    // 	const price = Math.floor(Math.random() * (2000000 - 100000) + 100000);
-    // 	housePrices.push(price);
-    // }
-    // // // // Mint the new properties
-    // for (let i = 1; i <= countTokens; i++) {
-    // 	const tx = await raacNFTContract.minterMint(signer.address, i);
-    // 	await tx.wait();
-    // 	console.log("Minted NFT", i);
-    // }
-    // // // set house prices
-    // for (let i = 1; i <= countTokens; i++) {
-    // 	const tx = await housePriceContract.setHousePrice(
-    // 		i,
-    // 		parseEther(housePrices[i - 1].toString())
-    // 	);
-    // 	await tx.wait();
-    // 	console.log("Price set for house", i);
-    // }
-    // // // confirm the house prices are set
-    // for (let i = 1; i <= countTokens; i++) {
-    // 	const price = await rpc.nfts.getHousePrice(chainId, i, provider);
-    // 	console.log("Price for house", i, price);
-    // 	if (price !== housePrices[i - 1].toString() + ".0") {
-    // 		throw new Error("Price not set correctly");
-    // 	}
-    // }
-    // // Generate some random NFT and set price only: not purchased yet
-    // let nftIdStart = countTokens + 1;
-    // let nftIdEnd = countTokens + 10;
-    // for (let i = nftIdStart; i <= nftIdEnd; i++) {
-    // 	const price = Math.floor(Math.random() * (2000000 - 100000) + 100000);
-    // 	const tx = await housePriceContract.setHousePrice(
-    // 		i,
-    // 		parseEther(price.toString())
-    // 	);
-    // 	await tx.wait();
-    // 	console.log("Price set for house", i);
-    // }
+    console.log(await rpc.wallet.assets.getBalance(chainId, "rtoken", signer.address, provider));
+    console.log(await rpc.nfts.getTokensByOwner(chainId, signer.address, provider));
+    // // // set the oracle address of the RAACHousePrice. TEmporarily simulating that I AM THE ORACLE
+    await rpc.contracts.housePrices.setOracle(chainId, signer.address, signer);
+    // // // // set price for 3 houses
+    const housePriceAddress = (0, contracts_1.getContractAddress)(chainId, "raachouseprices");
+    const housePriceABI = (0, artifacts_1.getABI)("raachouseprices");
+    const housePriceContract = new ethers_1.ethers.Contract(housePriceAddress, housePriceABI, signer);
+    const raacNFTAddress = (0, contracts_1.getContractAddress)(chainId, "raacnft");
+    const raacNFTABI = (0, artifacts_1.getABI)("raacnft");
+    const raacNFTContract = new ethers_1.ethers.Contract(raacNFTAddress, raacNFTABI, signer);
+    const countTokens = 3;
+    // // // Generate 10 house prices between 100K and 2M
+    const housePrices = [];
+    for (let i = 1; i <= countTokens; i++) {
+        const price = Math.floor(Math.random() * (2000000 - 100000) + 100000);
+        housePrices.push(price);
+    }
+    // // // Mint the new properties
+    for (let i = 1; i <= countTokens; i++) {
+        const tx = await raacNFTContract.minterMint(signer.address, i);
+        await tx.wait();
+        console.log("Minted NFT", i);
+    }
+    // // set house prices
+    for (let i = 1; i <= countTokens; i++) {
+        const tx = await housePriceContract.setHousePrice(i, (0, ethers_1.parseEther)(housePrices[i - 1].toString()));
+        await tx.wait();
+        console.log("Price set for house", i);
+    }
+    // // confirm the house prices are set
+    for (let i = 1; i <= countTokens; i++) {
+        const price = await rpc.nfts.getHousePrice(chainId, i, provider);
+        console.log("Price for house", i, price);
+        if (price !== housePrices[i - 1].toString() + ".0") {
+            throw new Error("Price not set correctly");
+        }
+    }
+    // Generate some random NFT and set price only: not purchased yet
+    let nftIdStart = countTokens + 1;
+    let nftIdEnd = countTokens + 10;
+    for (let i = nftIdStart; i <= nftIdEnd; i++) {
+        const price = Math.floor(Math.random() * (2000000 - 100000) + 100000);
+        const tx = await housePriceContract.setHousePrice(i, (0, ethers_1.parseEther)(price.toString()));
+        await tx.wait();
+        console.log("Price set for house", i);
+    }
 }
 const execute = async () => {
     const provider = await getProvider();

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

@@ -1,4 +1,4 @@
-import { BytesLike, ethers } from "ethers";
+import { BytesLike, ethers, Provider, Signer } from "ethers";
 import { ChainId } from "../../configs/chains";
 import { Adapter } from "../../configs/chains/chain";
 import { LendingPool } from "../../typechain-types";
@@ -7,4 +7,4 @@ export declare function decodeERC721(data: BytesLike): ethers.Result;
 export declare function encodeERC20(amount: string): string;
 export declare function decodeERC20(data: BytesLike): bigint;
 export declare function getLendingPoolAdapterByAddress(chainId: ChainId, address: string): Adapter;
-export declare function getLendingPoolContract(chainId: ChainId): Promise<LendingPool>;
+export declare function getLendingPoolContract(chainId: ChainId, providerOrProvider?: Provider | Signer): Promise<LendingPool>;

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

@@ -1,5 +1,5 @@
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-import { BigNumberish, BytesLike } from "ethers";
-declare function borrowFromLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: BigNumberish, data: BytesLike): Promise<boolean>;
+import { BigNumberish, BytesLike, Signer } from "ethers";
+declare function borrowFromLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: BigNumberish, data: BytesLike, signer: Signer): Promise<boolean>;
 export default borrowFromLendingPool;

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

@@ -1,5 +1,5 @@
-import { BigNumberish, BytesLike } from "ethers";
+import { BigNumberish, BytesLike, Signer } from "ethers";
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-declare function borrowFromLendingPoolWithInsurance(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: BigNumberish, data: BytesLike): Promise<boolean>;
+declare function borrowFromLendingPoolWithInsurance(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: BigNumberish, data: BytesLike, signer: Signer): Promise<boolean>;
 export default borrowFromLendingPoolWithInsurance;

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

@@ -1,6 +1,6 @@
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-import { BytesLike } from "ethers";
+import { BytesLike, Signer } from "ethers";
 /**
  * @description Close the liqudation after the debt has been paid
  * @param chainId
@@ -9,5 +9,5 @@ import { BytesLike } from "ethers";
  * @param data
  * @returns
  */
-declare function closeLiquidation(chainId: ChainId, adapterName: LendingPoolAdapterId, data: BytesLike): Promise<boolean>;
+declare function closeLiquidation(chainId: ChainId, adapterName: LendingPoolAdapterId, data: BytesLike, signer: Signer): Promise<boolean>;
 export default closeLiquidation;

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

@@ -1,5 +1,5 @@
-import { BytesLike } from "ethers";
+import { BytesLike, Signer } from "ethers";
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-declare function depositAssetToLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, data: BytesLike): Promise<boolean>;
+declare function depositAssetToLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, data: BytesLike, signer: Signer): Promise<boolean>;
 export default depositAssetToLendingPool;

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

@@ -1,4 +1,4 @@
-import { BytesLike } from "ethers";
+import { BytesLike, Provider } from "ethers";
 import { ChainId } from "../../configs/chains/index";
 import { LendingPoolAdapterId } from "./types";
 /**
@@ -10,4 +10,4 @@ import { LendingPoolAdapterId } from "./types";
  * @param provider
  * @returns The health factor of a position (0, inf)
  */
-export default function getHealthFactor(chainId: ChainId, adapterName: LendingPoolAdapterId, userAddress: string, data: BytesLike): Promise<bigint>;
+export default function getHealthFactor(chainId: ChainId, adapterName: LendingPoolAdapterId, userAddress: string, data: BytesLike, provider: Provider): Promise<bigint>;

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

@@ -1,6 +1,6 @@
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-import { BytesLike } from "ethers";
+import { BytesLike, Provider } from "ethers";
 /**
  * @description Get the raw debt of the user on a NFT. Equivant to the original amount borrowed on NFT.
  * @param chainId
@@ -8,5 +8,5 @@ import { BytesLike } from "ethers";
  * @param provider
  * @returns The raw debt of the user on a NFT
  */
-declare function getPositionDebt(chainId: ChainId, adapterName: LendingPoolAdapterId, userAddress: string, data: BytesLike): Promise<bigint>;
+declare function getPositionDebt(chainId: ChainId, adapterName: LendingPoolAdapterId, userAddress: string, data: BytesLike, provider: Provider): Promise<bigint>;
 export default getPositionDebt;

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

@@ -1,6 +1,6 @@
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-import { BytesLike } from "ethers";
+import { BytesLike, Provider } from "ethers";
 /**
  * @description Get the scaled debt of the user on a NFT (contains the accured interest)
  * @param chainId
@@ -10,5 +10,5 @@ import { BytesLike } from "ethers";
  * @param data
  * @returns The  debt of the user on a NFT with the accured interest
  */
-declare function getPositionScaledDebt(chainId: ChainId, adapterName: LendingPoolAdapterId, userAddress: string, data: BytesLike): Promise<bigint>;
+declare function getPositionScaledDebt(chainId: ChainId, adapterName: LendingPoolAdapterId, userAddress: string, data: BytesLike, provider: Provider): Promise<bigint>;
 export default getPositionScaledDebt;

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

@@ -1,6 +1,6 @@
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-import { BytesLike } from "ethers";
+import { BytesLike, Signer } from "ethers";
 /**
  * @description Get the sum of all the scaled debts of a user over all NFTs
  * @param chainId
@@ -8,5 +8,5 @@ import { BytesLike } from "ethers";
  * @param provider
  * @returns The  debt of the user
  */
-declare function initializeLiquidation(chainId: ChainId, adapterName: LendingPoolAdapterId, userAddress: string, data: BytesLike): Promise<boolean>;
+declare function initializeLiquidation(chainId: ChainId, adapterName: LendingPoolAdapterId, userAddress: string, data: BytesLike, signer: Signer): Promise<boolean>;
 export default initializeLiquidation;

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

@@ -1,5 +1,5 @@
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-import { BytesLike } from "ethers";
-declare function repayToLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: bigint, data: BytesLike): Promise<boolean>;
+import { BytesLike, Signer } from "ethers";
+declare function repayToLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: bigint, data: BytesLike, signer: Signer): Promise<boolean>;
 export default repayToLendingPool;

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

@@ -1,5 +1,5 @@
-import { BytesLike } from "ethers";
+import { BytesLike, Signer } from "ethers";
 import { ChainId } from "../../configs/chains/index";
 import { LendingPoolAdapterId } from "./types";
 export default withdrawAssetFromLendingPool;
-export declare function withdrawAssetFromLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, data: BytesLike): Promise<boolean>;
+export declare function withdrawAssetFromLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, data: BytesLike, signer: Signer): Promise<boolean>;

package/dist/types/wallet/assets/getAllowance.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from "ethers";
 import { AssetType } from "../../utils/artifacts";
 import { ChainId } from "../../configs/chains/index";
-declare function getAllowance(chainId: ChainId, assetId: AssetType, owner: string, spender: string, provider: Provider): Promise<string | 0>;
+declare function getAllowance(chainId: ChainId, assetId: AssetType, owner: string, spender: string, provider: Provider): Promise<bigint>;
 export default getAllowance;

package/dist/wallet/assets/getAllowance.js

@@ -6,7 +6,7 @@ async function getAllowance(chainId, assetId, owner, spender, provider) {
     try {
         if (assetId === "eth") {
             // ETH doesn't have an allowance concept, return max uint256 value ?
-            return ethers_1.ethers.formatEther(ethers_1.ethers.MaxUint256);
+            return ethers_1.ethers.MaxUint256;
         }
         const ALLOWANCE_ABI = [
             "function allowance(address,address) view returns (uint256)",
@@ -14,13 +14,13 @@ async function getAllowance(chainId, assetId, owner, spender, provider) {
         const contractAddress = (0, contracts_1.getContractAddress)(chainId, assetId);
         const contract = new ethers_1.ethers.Contract(contractAddress, ALLOWANCE_ABI, provider);
         const allowance = await contract.allowance(owner, spender);
-        return ethers_1.ethers.formatEther(allowance);
+        return allowance;
     }
     catch (error) {
         console.error(`Error getting allowance for asset ${assetId}:`, error);
         console.log({ assetId, owner, spender });
         console.log(error);
-        return 0;
+        return 0n;
     }
 }
 exports.default = getAllowance;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@raac/rpc",
-	"version": "1.1.0-beta.11",
+	"version": "1.1.0-beta.13",
 	"description": "RPC Library for RAAC ",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",