@raac/rpc 1.0.2-beta.3 → 1.0.2-beta.4

package/pools/lendingPool/{getPositionsScaledDebt.ts → getPositionsScaledDebt.js}

@@ -1,8 +1,6 @@
-import { ethers, Provider } from "ethers";
-import { getContractAddress } from "../../contracts/getContractAddress";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { LendingPool } from "../../typechain-types";
 
 /**
  * @description Get the sum of all the scaled debts of a user over all NFTs
@@ -12,9 +10,9 @@ import { LendingPool } from "../../typechain-types";
  * @returns The  debt of the user
  */
 async function getPositionsScaledDebt(
-	chainId: ChainId,
-	address: string,
-	provider: Provider
+	chainId,
+	address,
+	provider
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -23,14 +21,14 @@ async function getPositionsScaledDebt(
 			lendingPoolAddress,
 			lendingPoolABI,
 			provider
-		) as any as LendingPool;
+		);
 
 		const reward = await lendingPoolContract.getPositionsScaledDebt(address);
 
 		console.log(`getPositionsScaledDebt result: ${ethers.formatEther(reward)}`);
 
 		return reward;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in getPositionsScaledDebt:", error);
 		throw error;
 	}

package/pools/lendingPool/{getRawUserDepositsInLendingPool.ts → getRawUserDepositsInLendingPool.js}

@@ -1,14 +1,12 @@
-import { ethers, Provider } from "ethers";
-import { getContractAddress } from "../../contracts/getContractAddress";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { LendingPool } from "../../typechain-types";
 
 // Get the amount of RToken RAW deposit in the lending pool, without the accured interest
 async function getRawUserDepositsInLendingPool(
-	chainId: ChainId,
-	address: string,
-	provider: Provider
+	chainId,
+	address,
+	provider
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -17,14 +15,14 @@ async function getRawUserDepositsInLendingPool(
 			lendingPoolAddress,
 			lendingPoolABI,
 			provider
-		) as any as LendingPool;
+		);
 
 		const value = await lendingPoolContract.getUserDeposits(address);
 
 		console.log(`User deposits in lending pool: ${ethers.formatEther(value)}`);
 
 		return value;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in getRawUserDepositsInLendingPool:", error);
 		throw error;
 	}

package/pools/lendingPool/{getUserCollateralValue.ts → getUserCollateralValue.js}

@@ -1,8 +1,6 @@
-import { ethers, Provider } from "ethers";
-import { getContractAddress } from "../../contracts/getContractAddress";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { LendingPool } from "../../typechain-types";
 
 /**
  * @description Sum of the prices of all the NFTS
@@ -12,9 +10,9 @@ import { LendingPool } from "../../typechain-types";
  * @returns The total value of the collateral
  */
 async function getUserCollateralValue(
-	chainId: ChainId,
-	address: string,
-	provider: Provider
+	chainId,
+	address,
+	provider
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -23,14 +21,14 @@ async function getUserCollateralValue(
 			lendingPoolAddress,
 			lendingPoolABI,
 			provider
-		) as any as LendingPool;
+		);
 
 		const reward = await lendingPoolContract.getUserCollateralValue(address);
 
 		console.log(`getUserCollateralValue result: ${ethers.formatEther(reward)}`);
 
 		return reward;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in getUserCollateralValue:", error);
 		throw error;
 	}

package/pools/lendingPool/{initializeLiquidation.ts → initializeLiquidation.js}

@@ -1,8 +1,6 @@
-import { ethers, Provider, Signer } from "ethers";
-import { getContractAddress } from "../../contracts/getContractAddress";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { LendingPool } from "../../typechain-types";
 
 /**
  * @description Get the sum of all the scaled debts of a user over all NFTs
@@ -12,10 +10,10 @@ import { LendingPool } from "../../typechain-types";
  * @returns The  debt of the user
  */
 async function initializeLiquidation(
-	chainId: ChainId,
-	address: string,
-	tokenId: string,
-	signer: Signer
+	chainId,
+	address,
+	tokenId,
+	signer
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -24,7 +22,7 @@ async function initializeLiquidation(
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 
 		const tx = await lendingPoolContract.initiateLiquidation(address, tokenId);
 		await tx.wait();
@@ -32,7 +30,7 @@ async function initializeLiquidation(
 		console.log(`initializeLiquidation result: ${tx.hash}`);
 
 		return tx;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in initializeLiquidation:", error);
 		throw error;
 	}

package/pools/lendingPool/{repayToLendingPool.ts → repayToLendingPool.js}

@@ -1,14 +1,12 @@
-import { ethers, Provider, Signer } from "ethers";
-import { getContractAddress } from "../../contracts/getContractAddress";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { LendingPool } from "../../typechain-types";
 
 async function repayToLendingPool(
-	chainId: ChainId,
-	tokenId: string,
-	amount: string,
-	signer: Signer
+	chainId,
+	tokenId,
+	amount,
+	signer
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -17,7 +15,7 @@ async function repayToLendingPool(
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 
 		const amountInWei = ethers.parseEther(amount.toString());
 		console.log("Repaying amount in wei:", amountInWei.toString());
@@ -29,7 +27,7 @@ async function repayToLendingPool(
 		console.log(`Transaction hash: ${receipt?.hash}`);
 
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in repayToLendingPool:", error);
 		throw error;
 	}

package/pools/lendingPool/{withdrawFromLendingPool.ts → withdrawFromLendingPool.js}

@@ -1,13 +1,12 @@
-import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../contracts/getContractAddress";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
 import estimateGasPrice from "../../methods/commons/estimateGasPrice";
-import { ChainId } from "../../configs/chains";
-import { ERC20, LendingPool } from "../../typechain-types";
+
 async function withdrawFromLendingPool(
-	chainId: ChainId,
-	amount: bigint,
-	signer: Signer
+	chainId,
+	amount,
+	signer
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -19,12 +18,12 @@ async function withdrawFromLendingPool(
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 		const rTokenContract = new ethers.Contract(
 			rtokenAddress,
 			assetABI,
 			signer
-		) as any as ERC20;
+		);
 
 		const amountInWei = ethers.parseEther(amount.toString());
 		const { maxFeePerGas } = await estimateGasPrice(signer);
@@ -59,7 +58,7 @@ async function withdrawFromLendingPool(
 		console.log(`Transaction hash: ${receipt?.hash}`);
 
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in withdrawFromLendingPool:", error);
 		throw error;
 	}

package/pools/lendingPool/{withdrawNFTFromLendingPool.ts → withdrawNFTFromLendingPool.js}

@@ -1,13 +1,11 @@
-import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { LendingPool } from "../../typechain-types";
 
 async function withdrawNFTFromLendingPool(
-	chainId: ChainId,
-	tokenId: string,
-	signer: Signer
+	chainId,
+	tokenId,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -21,14 +19,14 @@ async function withdrawNFTFromLendingPool(
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 
 		const tx = await lendingPoolContract.withdrawNFT(tokenId);
 		await tx.wait();
 
 		console.log(`Withdrawn NFT with token ID ${tokenId} from lending pool`);
 		return tx;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error withdrawing NFT from lending pool:", error);
 		throw new Error(
 			`Failed to withdraw NFT from lending pool: ${error.message}`

package/pools/stabilityPool/{calculateRAACRewards.ts → calculateRAACRewards.js}

@@ -1,14 +1,11 @@
 import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import estimateGasPrice from "../../methods/commons/estimateGasPrice";
-import { ChainId } from "../../configs/chains/index";
-import { StabilityPool } from "../../typechain-types";
 
 async function calculateRAACRewards(
-	chainId: ChainId,
-	address: string,
-	signer: Signer
+	chainId,
+	address,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -22,13 +19,13 @@ async function calculateRAACRewards(
 			stabilityPoolAddress,
 			stabilityPoolABI,
 			signer
-		) as any as StabilityPool;
+		);
 
 		const calculateRAACRewards =
 			await stabilityPoolContract.calculateRaacRewards(address);
 
 		return ethers.formatEther(calculateRAACRewards);
-	} catch (error: any) {
+	} catch (error) {
 		throw new Error(`Error calculating RAAC rewards: ${error.message}`);
 	}
 }

package/pools/stabilityPool/configs/chains/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.configs = void 0;
+// @ts-ignore
+const _8453_json_1 = __importDefault(require("./8453.json")); // assert { type: "json" };
+const _17000_json_1 = __importDefault(require("./17000.json")); // assert { type: "json" };
+const _11155111_json_1 = __importDefault(require("./11155111.json")); // assert { type: "json" };
+const chains = {
+    8453: _8453_json_1.default,
+    17000: _17000_json_1.default, // the interface is the same for all the chains, so taking this
+    11155111: _11155111_json_1.default,
+};
+exports.default = chains;
+exports.configs = chains;

package/pools/stabilityPool/configs/index.js

@@ -0,0 +1,43 @@
+"use strict";
+// let fs;
+// let path;
+// let fileURLToPath;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getChainsConfig = getChainsConfig;
+exports.getChainConfig = getChainConfig;
+exports.setChainConfig = setChainConfig;
+const index_1 = __importDefault(require("./chains/index"));
+function getChainsConfig() {
+    //   if (typeof window === 'undefined') {
+    //     // Server-side logic
+    //     const __filename = fileURLToPath(import.meta.url);
+    //     const __dirname = path.dirname(__filename);
+    //     const chainsDir = `${__dirname}/chains`;
+    //     const chainsFiles = fs.readdirSync(chainsDir).filter(file => file.endsWith('.json'));
+    //     const chains = {};
+    //     for(const chainFileName of chainsFiles) {
+    //       const chainId = chainFileName.split('.')[0];
+    //       const chainConfig = fs.readFileSync(`${chainsDir}/${chainFileName}`, 'utf8');
+    //       chains[chainId] = JSON.parse(chainConfig);
+    //     }
+    //     return chains;
+    //   } else {
+    //     const chainConfigs = {
+    //         8453: chain8453,
+    //     };
+    //     // Client-side logic via API ?
+    //     return chainConfigs;
+    //   }
+    return index_1.default;
+}
+function setChainConfig(chainId, config) {
+    index_1.default[chainId] = config;
+}
+function getChainConfig(chainId) {
+    const chains = getChainsConfig();
+    return chains[chainId];
+}
+exports.default = { getChainsConfig, getChainConfig, setChainConfig };

package/pools/stabilityPool/{depositNFTToStabilityPool.ts → depositNFTToStabilityPool.js}

@@ -1,14 +1,11 @@
 import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import estimateGasPrice from "../../methods/commons/estimateGasPrice";
-import { ChainId } from "../../configs/chains/index";
-import { StabilityPool } from "../../typechain-types";
 
 async function depositNFTToStabilityPool(
-	chainId: ChainId,
-	tokenId: string,
-	signer: Signer
+	chainId,
+	tokenId,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -21,7 +18,7 @@ async function depositNFTToStabilityPool(
 			stabilityPoolAddress,
 			abi,
 			signer
-		) as any as StabilityPool;
+		);
 
 		const RAACNFTAddress = getContractAddress(chainId, "raacnft");
 		const raacNFTABI = getABI("raacnft");
@@ -58,7 +55,7 @@ async function depositNFTToStabilityPool(
 			receipt?.hash
 		);
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error(`Error depositing NFT to Stability Pool:`, error);
 		throw new Error(`NFT Deposit to Stability Pool failed: ${error.message}`);
 	}

package/pools/stabilityPool/{depositToStabilityPool.ts → depositToStabilityPool.js}

@@ -1,14 +1,12 @@
 import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
 import estimateGasPrice from "../../methods/commons/estimateGasPrice";
-import { ChainId } from "../../configs/chains/index";
-import { StabilityPool } from "../../typechain-types";
 
 async function depositToStabilityPool(
-	chainId: ChainId,
-	amount: string,
-	signer: Signer
+	chainId,
+	amount,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -21,7 +19,7 @@ async function depositToStabilityPool(
 			stabilityPoolAddress,
 			abi,
 			signer
-		) as any as StabilityPool;
+		);
 
 		const amountInWei = ethers.parseEther(amount);
 		const { maxFeePerGas } = await estimateGasPrice(signer);
@@ -38,7 +36,7 @@ async function depositToStabilityPool(
 			receipt?.hash
 		);
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error(`Error depositing to Stability Pool:`, error);
 		throw new Error(`Deposit to Stability Pool failed: ${error.message}`);
 	}

package/pools/stabilityPool/{getRawUserDepositsInStabilityPool.ts → getRawUserDepositsInStabilityPool.js}

@@ -1,14 +1,12 @@
-import { ethers, Provider } from "ethers";
-import { getContractAddress } from "../../contracts/getContractAddress";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { StabilityPool } from "../../typechain-types";
 
 // Get the amount of RToken RAW deposit in the lending pool, without the accured interest
 async function getRawUserDepositInStabilityPool(
-	chainId: ChainId,
-	address: string,
-	provider: Provider
+	chainId,
+	address,
+	provider
 ) {
 	try {
 		const stabilityPoolAddress = getContractAddress(chainId, "stabilitypool");
@@ -17,7 +15,7 @@ async function getRawUserDepositInStabilityPool(
 			stabilityPoolAddress,
 			stabilityPoolABI,
 			provider
-		) as any as StabilityPool;
+		);
 
 		const value = await stabilityPoolContract.getUserDeposit(address);
 
@@ -26,7 +24,7 @@ async function getRawUserDepositInStabilityPool(
 		);
 
 		return value;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in getRawUserDepositInStabilityPool:", error);
 		throw error;
 	}

package/pools/stabilityPool/{getStabilityPoolInfo.ts → getStabilityPoolInfo.js}

@@ -1,13 +1,11 @@
-import { ethers, Provider } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { StabilityPool } from "../../typechain-types";
 
 async function getStabilityPoolInfo(
-	chainId: ChainId,
-	address: string,
-	provider: Provider
+	chainId,
+	address,
+	provider
 ) {
 	try {
 		const stabilityPoolAddress = getContractAddress(chainId, "stabilitypool");
@@ -16,9 +14,9 @@ async function getStabilityPoolInfo(
 			stabilityPoolAddress,
 			abi,
 			provider
-		) as any as StabilityPool;
+		);
 
-		const handleError = (operation: string) => (error: any) => {
+		const handleError = (operation) => (error) => {
 			if (error.code === "BAD_DATA") {
 				console.log(
 					`BAD_DATA from getStabilityPoolInfo - ${operation}:`,
@@ -68,12 +66,12 @@ async function getStabilityPoolInfo(
 
 		// Fetch RAAC Minter information if needed for APY calculation
 		const raacMinterAddress = getContractAddress(chainId, "raacminter");
-		let apy: bigint = 0n;
+		let apy = 0n;
 
 		if (raacMinterAddress && raacMinterAddress !== ethers.ZeroAddress) {
 			const raacMinterABI = getABI("raacminter");
 			const raacMinterContract = new ethers.Contract(
-				raacMinterAddress as string,
+				raacMinterAddress,
 				raacMinterABI,
 				provider
 			);
@@ -102,7 +100,7 @@ async function getStabilityPoolInfo(
 		};
 
 		return result;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error fetching stability pool info:", error);
 		throw error;
 	}

package/pools/stabilityPool/{getStabilityPoolTotalDeposits.ts → getStabilityPoolTotalDeposits.js}

@@ -1,12 +1,10 @@
-import { BrowserProvider, ethers, Provider } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import { ethers } from "ethers";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { StabilityPool } from "../../typechain-types";
 
 async function getStabilityPoolTotalDeposits(
-	chainId: ChainId,
-	provider: Provider
+	chainId,
+	provider
 ) {
 	try {
 		const stabilityPoolAddress = getContractAddress(chainId, "stabilitypool");
@@ -15,10 +13,10 @@ async function getStabilityPoolTotalDeposits(
 			stabilityPoolAddress,
 			abi,
 			provider
-		) as any as StabilityPool;
+		);
 		const totalDeposits = await stabilityPoolContract.getTotalDeposits();
 		return totalDeposits;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error fetching total deposits:", error);
 		throw error;
 	}

package/pools/stabilityPool/methods/commons/estimateGasPrice.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.estimateGasPrice = void 0;
+const estimateGasPrice = async (signer) => {
+    const provider = signer.provider;
+    try {
+        const feeData = await provider.getFeeData();
+        const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas;
+        // Fix for maxFeePerGas cannot be less than maxPriorityFeePerGas (The total must be the larger of the two
+        const maxFeePerGas = maxPriorityFeePerGas && feeData.maxFeePerGas &&
+            feeData.maxFeePerGas < maxPriorityFeePerGas ?
+            maxPriorityFeePerGas : feeData.maxFeePerGas;
+        return {
+            maxFeePerGas,
+            maxPriorityFeePerGas,
+        };
+    }
+    catch (error) {
+        console.log("Error getting gas price", error);
+        if (provider === null || provider === void 0 ? void 0 : provider.getGasPrice) {
+            const gasPrice = await provider.getGasPrice();
+            return { gasPrice };
+        }
+        return { gasPrice: 0 };
+    }
+};
+exports.estimateGasPrice = estimateGasPrice;
+exports.default = exports.estimateGasPrice;

package/pools/stabilityPool/pools/stabilityPool/withdrawFromStabilityPool.js

@@ -0,0 +1,34 @@
+"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");
+    }
+    try {
+        const stabilityPoolAddress = (0, contracts_1.getContractAddress)(chainId, "stabilitypool");
+        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);
+        const receipt = await tx.wait();
+        console.log(`Withdrawn ${amount} from Stability Pool successfully:`, receipt === null || receipt === void 0 ? void 0 : receipt.hash);
+        return receipt;
+    }
+    catch (error) {
+        console.error(`Error withdrawing from Stability Pool:`, error);
+        throw new Error(`Withdrawal from Stability Pool failed: ${error.message}`);
+    }
+}
+exports.default = withdrawFromStabilityPool;