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

package/nfts/{getMintPrice.ts → getMintPrice.js}

@@ -1,14 +1,12 @@
-import { Contract, ethers, Provider, Signer } from "ethers";
-import { getContractAddress } from "../utils/contracts";
+import { Contract, ethers, Provider } from "ethers";
+import getContractAddress from "../contracts/getContractAddress";
 import { getABI } from "../utils/artifacts";
-import { ChainId } from "../configs/chains/index";
-import { RAACNFT } from "../typechain-types";
 
 // This is the total price: includes the mint price and the mint fee
 async function getMintPrice(
-	chainId: ChainId,
-	tokenId: string | number,
-	provider: Provider
+	chainId,
+	tokenId,
+	provider
 ) {
 	if (!provider) {
 		throw new Error("Wallet not connected");
@@ -22,7 +20,7 @@ async function getMintPrice(
 			raacNFTAddress,
 			raacNFTABI,
 			provider
-		) as any as RAACNFT;
+		);
 
 		const price = await raacNFTContract.getMintPrice(tokenId);
 		const token = await raacNFTContract.token();
@@ -37,7 +35,7 @@ async function getMintPrice(
 
 		console.log(`Retrieved house price for ${tokenId}: ${formattedValue}`);
 		return { price, decimals };
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error retrieving mint price for " + tokenId, error);
 		throw new Error(`Failed retrieve mint price: ${error.message}`);
 	}

package/nfts/{getTokenURI.ts → getTokenURI.js}

@@ -1,13 +1,11 @@
-import { ethers, Provider, Signer } from "ethers";
-import { getContractAddress } from "../utils/contracts";
+import { ethers, Provider } from "ethers";
+import getContractAddress from "../contracts/getContractAddress";
 import { getABI } from "../utils/artifacts";
-import { ChainId } from "../configs/chains/index";
-import { RAACNFT } from "../typechain-types";
 
 async function getTokenURI(
-	chainId: ChainId,
-	tokenId: string | number,
-	provider: Provider
+	chainId,
+	tokenId,
+	provider
 ) {
 	if (!provider) {
 		throw new Error("Wallet not connected");
@@ -21,12 +19,12 @@ async function getTokenURI(
 			raacNFTAddress,
 			raacNFTABI,
 			provider
-		) as any as RAACNFT;
+		);
 
 		const uri = await raacNFTContract.tokenURI(tokenId);
 		console.log(`Retrieved token URI: ${uri}`);
 		return uri;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error getting token URI:", error);
 		throw new Error(`Failed to get token URI: ${error.message}`);
 	}

package/nfts/{getTokensByOwner.ts → getTokensByOwner.js}

@@ -1,14 +1,12 @@
 import { ethers, Provider } from "ethers";
-import { getContractAddress } from "../utils/contracts";
+import getContractAddress from "../contracts/getContractAddress";
 import { getABI } from "../utils/artifacts";
-import { ChainId } from "../configs/chains/index";
-import { RAACNFT } from "../typechain-types";
 
 async function getTokensByOwner(
-	chainId: ChainId,
-	address: string,
-	provider: Provider,
-	pagination?: { offset: number; limit: number }
+	chainId,
+	address,
+	provider,
+	pagination
 ) {
 	try {
 		const raacNFTAddress = getContractAddress(chainId, "raacnft");
@@ -18,14 +16,14 @@ async function getTokensByOwner(
 			raacNFTAddress,
 			raacNFTABI,
 			provider
-		) as any as RAACNFT;
+		);
 		const balance = await raacNFTContract.balanceOf(address);
 
 		if (balance === 0n) {
 			return { address, tokens: [] };
 		}
 
-		let tokens: bigint[] = [];
+		let tokens = [];
 		if (pagination) {
 			const offset = pagination?.offset || 0;
 			const limit = pagination?.limit || 10;
@@ -42,7 +40,7 @@ async function getTokensByOwner(
 
 		// toString()
 		return { address, tokens: tokens.map((token) => token.toString()) };
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error getting owned NFTs:", error);
 		throw new Error(`Failed to get owned NFTs: ${error.message}`);
 	}

package/nfts/{getTotalPropertiesCount.ts → getTotalPropertiesCount.js}

@@ -1,10 +1,8 @@
-import { ethers, Provider, Signer } from "ethers";
-import { getContractAddress } from "../utils/contracts";
+import { ethers, Provider } from "ethers";
+import getContractAddress from "../contracts/getContractAddress";
 import { getABI } from "../utils/artifacts";
-import { ChainId } from "../configs/chains/index";
-import { RAACHousePrices, RAACNFT } from "../typechain-types";
 
-async function getTotalPropertiesCount(chainId: ChainId, provider: Provider) {
+async function getTotalPropertiesCount(chainId, provider) {
 	if (!provider) {
 		throw new Error("Wallet not connected");
 	}
@@ -16,13 +14,13 @@ async function getTotalPropertiesCount(chainId: ChainId, provider: Provider) {
 			raacHousePrices,
 			raacHousePricesABI,
 			provider
-		) as any as RAACHousePrices;
+		);
 
 		const count = await raacHousePricesContract.count();
 
 		console.log(`Retrieved total properties count: ${count}`);
 		return count;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error retrieving total houses count:", error);
 		throw new Error(
 			`Failed to retrieve the number of houses: ${error.message}`

package/nfts/{mint.ts → mint.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 { ChainId } from "../configs/chains/index";
-import { RAACNFT } from "../typechain-types";
 
 async function mint(
-	chainId: ChainId,
-	tokenId: string,
-	amount: bigint,
-	signer: Signer
+	chainId,
+	tokenId,
+	amount,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -22,7 +20,7 @@ async function mint(
 			raacNFTAddress,
 			raacNFTABI,
 			signer
-		) as any as RAACNFT;
+		);
 		const tx = await raacNFTContract.mint(
 			tokenId,
 			ethers.parseEther(amount.toString())
@@ -33,7 +31,7 @@ async function mint(
 			`Minted RAAC NFT with token ID ${tokenId} for ${amount} tokens`
 		);
 		return tx;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error minting RAAC NFT:", error);
 		throw new Error(`Failed to mint RAAC NFT: ${error.message}`);
 	}

package/nfts/{setBaseUri.ts → setBaseUri.js}

@@ -1,10 +1,8 @@
 import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../utils/contracts";
+import getContractAddress from "../contracts/getContractAddress";
 import { getABI } from "../utils/artifacts";
-import { ChainId } from "../configs/chains/index";
-import { RAACNFT } from "../typechain-types";
 
-async function setBaseUri(chainId: ChainId, newUri: string, signer: Signer) {
+async function setBaseUri(chainId, newUri, signer) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
 	}
@@ -17,14 +15,14 @@ async function setBaseUri(chainId: ChainId, newUri: string, signer: Signer) {
 			raacNFTAddress,
 			raacNFTABI,
 			signer
-		) as any as RAACNFT;
+		);
 
 		const tx = await raacNFTContract.setBaseUri(newUri);
 		await tx.wait();
 
 		console.log(`Set new base URI: ${newUri}`);
 		return tx;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error setting base URI:", error);
 		throw new Error(`Failed to set base URI: ${error.message}`);
 	}

package/nfts/{totalNFTSupply.ts → totalNFTSupply.js}

@@ -1,10 +1,8 @@
 import { ethers, Provider } from "ethers";
-import { getContractAddress } from "../utils/contracts";
+import getContractAddress from "../contracts/getContractAddress";
 import { getABI } from "../utils/artifacts";
-import { ChainId } from "../configs/chains/index";
-import { RAACNFT } from "../typechain-types";
 
-async function totalNFTSupply(chainId: ChainId, provider: Provider) {
+async function totalNFTSupply(chainId, provider) {
 	try {
 		const raacNFTAddress = getContractAddress(chainId, "raacnft");
 		const raacNFTABI = getABI("raacnft");
@@ -13,11 +11,11 @@ async function totalNFTSupply(chainId: ChainId, provider: Provider) {
 			raacNFTAddress,
 			raacNFTABI,
 			provider
-		) as any as RAACNFT;
+		);
 
 		const batchSize = await raacNFTContract.totalSupply();
 		return batchSize.toString();
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error getting current batch size:", error);
 		throw new Error(`Failed to get current batch size: ${error.message}`);
 	}

package/package.json

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

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

@@ -1,14 +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 { ChainId } from "../../configs/chains/index";
-import { LendingPool } from "../../typechain-types";
 
 async function borrowFromLendingPool(
-	chainId: ChainId,
-	tokenId: string,
-	amount: string,
-	signer: Signer
+	chainId,
+	tokenId,
+	amount,
+	signer
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -17,7 +15,7 @@ async function borrowFromLendingPool(
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 
 		const amountInWei = ethers.parseEther(amount);
 		console.log("Borrowing amount in wei:", amountInWei.toString());
@@ -32,7 +30,7 @@ async function borrowFromLendingPool(
 		console.log(`Transaction hash: ${receipt?.hash}`);
 
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in borrowFromLendingPool:", error);
 		throw error;
 	}

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

@@ -1,16 +1,14 @@
-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 { ChainId } from "../../configs/chains/index";
-import { LendingPool } from "../../typechain-types";
 import checkAllowance from "../../methods/commons/checkAllowance";
 import approveAsset from "../../wallet/assets/approveAsset";
 
 async function borrowFromLendingPoolWithInsurance(
-	chainId: ChainId,
-	tokenId: string,
-	amount: string,
-	signer: Signer
+	chainId,
+	tokenId,
+	amount,
+	signer
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -19,7 +17,7 @@ async function borrowFromLendingPoolWithInsurance(
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 
 		const feeCollectorAddress = getContractAddress(chainId, "feecollector");
 		const userAddress = await signer.getAddress();
@@ -71,7 +69,7 @@ async function borrowFromLendingPoolWithInsurance(
 		console.log(`Transaction hash: ${receipt?.hash}`);
 
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in borrowFromLendingPoolWithInsurance:", error);
 		throw error;
 	}

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

@@ -1,15 +1,13 @@
-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";
 
 async function calculateInsuranceFee(
-	chainId: ChainId,
-	address: string,
-	tokenId: string,
-	amount: string,
-	provider: Provider
+	chainId,
+	address,
+	tokenId,
+	amount,
+	provider
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -18,7 +16,7 @@ async function calculateInsuranceFee(
 			lendingPoolAddress,
 			lendingPoolABI,
 			provider
-		) as any as LendingPool;
+		);
 
 		const amountInWei = ethers.parseEther(amount);
 
@@ -29,7 +27,7 @@ async function calculateInsuranceFee(
 		);
 
 		return ethers.formatEther(insuranceFee);
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in calculateInsuranceFee:", error);
 		throw error;
 	}

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

@@ -1,10 +1,8 @@
-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 { ChainId } from "../../configs/chains/index";
-import { LendingPool } from "../../typechain-types";
 
-async function claimReward(chainId: ChainId, signer: Signer) {
+async function claimReward(chainId, signer) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
 		const lendingPoolABI = getABI("lendingpool");
@@ -12,7 +10,7 @@ async function claimReward(chainId: ChainId, signer: Signer) {
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 
 		const tx = await lendingPoolContract.claimReward();
 		const receipt = await tx.wait();
@@ -21,7 +19,7 @@ async function claimReward(chainId: ChainId, signer: Signer) {
 		console.log(`Transaction hash: ${receipt?.hash}`);
 
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in claimReward:", error);
 		throw error;
 	}

package/pools/lendingPool/{closeLiquidation.ts → closeLiquidation.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 Close the liqudation after the debt has been paid
@@ -12,9 +10,9 @@ import { LendingPool } from "../../typechain-types";
  * @returns
  */
 async function closeLiquidation(
-	chainId: ChainId,
-	tokenId: string,
-	signer: Signer
+	chainId,
+	tokenId,
+	signer
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -23,7 +21,7 @@ async function closeLiquidation(
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 
 		const tx = await lendingPoolContract.closeLiquidation(tokenId);
 		await tx.wait();
@@ -31,7 +29,7 @@ async function closeLiquidation(
 		console.log(`closeLiquidation result: ${tx.hash}`);
 
 		return tx;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in closeLiquidation:", error);
 		throw error;
 	}

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

@@ -1,15 +1,13 @@
 import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../contracts/getContractAddress";
+import getContractAddress from "../../contracts/getContractAddress";
 import { getABI } from "../../utils/artifacts";
 import estimateGasPrice from "../../methods/commons/estimateGasPrice";
-import { ChainId } from "../../configs/chains";
-import { LendingPool } from "../../typechain-types";
 
 //checked
 async function depositNFTToLendingPool(
-	chainId: ChainId,
-	tokenId: number | string,
-	signer: Signer
+	chainId,
+	tokenId,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -25,7 +23,7 @@ async function depositNFTToLendingPool(
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 		const nftContract = new ethers.Contract(nftAddress, nftABI, signer);
 
 		const { maxFeePerGas } = await estimateGasPrice(signer);
@@ -60,7 +58,7 @@ async function depositNFTToLendingPool(
 			receipt?.hash
 		);
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error(`NFT Deposit to Lending Pool error:`, error);
 		throw new Error(`NFT Deposit to Lending Pool failed: ${error.message}`);
 	}

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

@@ -1,15 +1,13 @@
 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";
-import { LendingPool } from "../../typechain-types";
 
 // checked
 async function depositToLendingPool(
-	chainId: ChainId,
-	amount: string,
-	signer: Signer
+	chainId,
+	amount,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -23,7 +21,7 @@ async function depositToLendingPool(
 			lendingPoolAddress,
 			lendingPoolABI,
 			signer
-		) as any as LendingPool;
+		);
 
 		const amountInWei = ethers.parseEther(amount);
 		const { maxFeePerGas } = await estimateGasPrice(signer);
@@ -43,7 +41,7 @@ async function depositToLendingPool(
 			receipt?.hash
 		);
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error(`Lending Pool Deposit error:`, error);
 		throw new Error(`Lending Pool Deposit failed: ${error.message}`);
 	}

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

@@ -1,20 +1,13 @@
 import { ethers, Provider } from "ethers";
 import { getContractAddress } from "../../utils/contracts";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains";
-import {
-	ILendingPool,
-	LendingPool,
-	ReserveLibrary,
-} from "../../typechain-types";
-import { RawData, Reserve } from "../../custom-types";
 import { transformPositionView } from "./getPositionView";
 
 // checked
 async function getAllUserData(
-	chainId: ChainId,
-	address: string,
-	provider: Provider
+	chainId,
+	address,
+	provider
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -23,22 +16,22 @@ async function getAllUserData(
 			lendingPoolAddress,
 			abi,
 			provider
-		) as any as LendingPool;
+		);
 
 		const data = await lendingPoolContract.getAllUserData(address);
 
 		// ILendingPool.UserDataView
 		const formattedData = {
-			nftTokenIds: (data[0] || []).map((id: any) => id.toString()) as string[],
+			nftTokenIds: (data[0] || []).map((id) => id.toString()),
 			scaledDebtBalance: ethers.formatEther(data[1] || 0n),
 			userCollateralValue: ethers.formatEther(data[2] || 0n),
 			positions: (
-				(data[3] || []) as ILendingPool.NFTPositionViewStructOutput[]
+				(data[3] || [])
 			).map((e) => transformPositionView(e)),
 		};
 
 		return formattedData;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error fetching lending pool info:", error);
 		throw error;
 	}

package/pools/lendingPool/{getEligibleUserDeposits.ts → getEligibleUserDeposits.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 Total amount of RToken + DEToken = total crvUSD they put in the system so far. How much they have contributed to the system.
@@ -12,9 +10,9 @@ import { LendingPool } from "../../typechain-types";
  * @returns
  */
 async function getEligibleUserDeposits(
-	chainId: ChainId,
-	address: string,
-	provider: Provider
+	chainId,
+	address,
+	provider
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -23,14 +21,14 @@ async function getEligibleUserDeposits(
 			lendingPoolAddress,
 			lendingPoolABI,
 			provider
-		) as any as LendingPool;
+		);
 
 		const value = await lendingPoolContract.getEligibleUserDeposits(address);
 
 		console.log(`Eligible user deposits: ${ethers.formatEther(value)}`);
 
 		return value;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in getEligibleUserDeposits:", error);
 		throw error;
 	}

package/pools/lendingPool/{getHealthFactor.ts → getHealthFactor.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 health factor of a NFT position -> factor < 1 : undercollateralized.
@@ -12,10 +10,10 @@ import { LendingPool } from "../../typechain-types";
  * @returns The health factor of a position (0, inf)
  */
 async function getHealthFactor(
-	chainId: ChainId,
-	address: string,
-	tokenId: string,
-	provider: Provider
+	chainId,
+	address,
+	tokenId,
+	provider
 ) {
 	try {
 		const lendingPoolAddress = getContractAddress(chainId, "lendingpool");
@@ -24,7 +22,7 @@ async function getHealthFactor(
 			lendingPoolAddress,
 			lendingPoolABI,
 			provider
-		) as any as LendingPool;
+		);
 
 		const value = await lendingPoolContract.calculateHealthFactor(
 			address,
@@ -34,7 +32,7 @@ async function getHealthFactor(
 		console.log(`getHealthFactor result: ${value}`);
 
 		return value;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in getHealthFactor:", error);
 		throw error;
 	}