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

package/methods/commons/{checkAllowance.ts → checkAllowance.js}

@@ -1,17 +1,15 @@
 import { Provider } from "ethers";
-import { getContract, getContractAddress } from "../../utils/contracts";
-import { ContractType } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { ERC20 } from "../../typechain-types";
+import getContract from "../../contracts/getContract";
+import getContractAddress from "../../contracts/getContractAddress";
 
 const checkAllowance = async (
-	chainId: ChainId,
-	tokenId: ContractType,
-	address: string,
-	spenderAddress: string,
-	provider: Provider
+	chainId,
+	tokenId,
+	address,
+	spenderAddress,
+	provider
 ) => {
-	let tokenAddress = getContractAddress(chainId, tokenId as string);
+	let tokenAddress = getContractAddress(chainId, tokenId);
 	console.log(
 		`[commons/checkAllowance] Checking allowance for ${address} to ${spenderAddress} on ${chainId} ${tokenId}:${tokenAddress}`
 	);
@@ -21,10 +19,10 @@ const checkAllowance = async (
 			chainId,
 			tokenId,
 			provider
-		) as any as ERC20;
+		);
 		const allowance = await tokenContract.allowance(address, spenderAddress);
 		return allowance;
-	} catch (error: any) {
+	} catch (error) {
 		console.error(`Error calling allowance: ${error}`);
 		throw new Error(
 			`[commons/checkAllowance] ${chainId} ${tokenId}:${tokenAddress} ${address} ${spenderAddress} ${error}`

package/methods/commons/{estimateGasPrice.ts → estimateGasPrice.js}

@@ -1,7 +1,5 @@
-import { Provider, Signer } from "ethers";
-
-export const estimateGasPrice = async (signer: Signer) => {
-	const provider = signer.provider as Provider;
+export const estimateGasPrice = async (signer) => {
+	const provider = signer.provider;
 	try {
 		const feeData = await provider.getFeeData();
 		const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas;
@@ -13,10 +11,10 @@ export const estimateGasPrice = async (signer: Signer) => {
 			maxFeePerGas,
 			maxPriorityFeePerGas,
 		};
-	} catch (error: any) {
+	} catch (error) {
 		console.log("Error getting gas price", error);
-		if ((provider as any)?.getGasPrice) {
-			const gasPrice = await (provider as any).getGasPrice();
+		if (provider?.getGasPrice) {
+			const gasPrice = await provider.getGasPrice();
 			return { gasPrice };
 		}
 		return { gasPrice: 0 };

package/minter/{get.ts → get.js}

@@ -1,11 +1,9 @@
-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 estimateGasPrice from "../methods/commons/estimateGasPrice";
-import { ChainId } from "../configs/chains/index";
-import { RAACMinter } from "../typechain-types";
 
-async function get(chainId: ChainId, signer: Signer) {
+async function get(chainId, signer) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
 	}
@@ -20,9 +18,9 @@ async function get(chainId: ChainId, signer: Signer) {
 			raacMinterAddress,
 			raacMinterABI,
 			signer
-		) as any as RAACMinter;
+		);
 
-		const handleError = (operation: string) => (error: any) => {
+		const handleError = (operation) => (error) => {
 			if (error.code === "BAD_DATA") {
 				console.log(`BAD_DATA from getMinter - ${operation}:`, error.message);
 				return BigInt(0);
@@ -142,7 +140,7 @@ async function get(chainId: ChainId, signer: Signer) {
 
 		// console.log(tick);
 		return result;
-	} catch (error: any) {
+	} catch (error) {
 		throw new Error(`Error calculating RAAC rewards: ${error.message}`);
 	}
 }

package/minter/{getApy.ts → getApy.js}

@@ -1,10 +1,8 @@
-import { ethers, Provider, 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 { RAACMinter } from "../typechain-types";
 
-async function getApy(chainId: ChainId, provider: Provider) {
+async function getApy(chainId, provider) {
 	if (!provider) {
 		throw new Error("Wallet not connected");
 	}
@@ -16,7 +14,7 @@ async function getApy(chainId: ChainId, provider: Provider) {
 			raacMinterAddress,
 			raacMinterABI,
 			provider
-		) as any as RAACMinter;
+		);
 
 		const result = { emissionRate: 0n, BLOCKS_PER_DAY: 0n };
 		result.emissionRate = await raacMinterContract.emissionRate();
@@ -29,7 +27,7 @@ async function getApy(chainId: ChainId, provider: Provider) {
 
 		const apy = (emissionRatePerYear * 10000n) / totalSupply;
 		return apy;
-	} catch (error: any) {
+	} catch (error) {
 		throw new Error(`Error calculating RAAC rewards: ${error.message}`);
 	}
 }

package/minter/{tick.ts → tick.js}

@@ -1,11 +1,9 @@
-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 estimateGasPrice from "../methods/commons/estimateGasPrice";
-import { ChainId } from "../configs/chains/index";
-import { RAACMinter } from "../typechain-types";
 
-async function tick(chainId: ChainId, signer: Signer) {
+async function tick(chainId, signer) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
 	}
@@ -18,7 +16,7 @@ async function tick(chainId: ChainId, signer: Signer) {
 			raacMinterAddress,
 			raacMinterABI,
 			signer
-		) as any as RAACMinter;
+		);
 
 		const { maxFeePerGas } = await estimateGasPrice(signer);
 
@@ -32,7 +30,7 @@ async function tick(chainId: ChainId, signer: Signer) {
 			await tick.wait();
 		}
 		return tick;
-	} catch (error: any) {
+	} catch (error) {
 		throw new Error(`Error calculating RAAC rewards: ${error.message}`);
 	}
 }

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

@@ -1,13 +1,11 @@
 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 getAllTokens(
-	chainId: ChainId,
-	provider: Provider,
-	pagination?: { offset: number; limit: number }
+	chainId,
+	provider,
+	pagination
 ) {
 	try {
 		const raacNFTAddress = getContractAddress(chainId, "raacnft");
@@ -17,14 +15,14 @@ async function getAllTokens(
 			raacNFTAddress,
 			raacNFTABI,
 			provider
-		) as any as RAACNFT;
+		);
 
 		const totalSupply = await raacNFTContract.totalSupply();
 		if (totalSupply === 0n) {
 			return [];
 		}
 
-		let tokens: bigint[] = [];
+		let tokens = [];
 		if (pagination) {
 			const offset = pagination?.offset || 0;
 			const limit = pagination?.limit || 10;
@@ -42,7 +40,7 @@ async function getAllTokens(
 		}
 
 		return tokens;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error getting all tokens:", error);
 		throw new Error(`Failed to get all tokens: ${error.message}`);
 	}

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

@@ -1,10 +1,8 @@
-import { ethers, Provider, 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 { RAACNFT } from "../typechain-types";
 
-async function getBaseUri(chainId: ChainId, provider: Provider) {
+async function getBaseUri(chainId, provider) {
 	if (!provider) {
 		throw new Error("Wallet not connected");
 	}
@@ -17,13 +15,13 @@ async function getBaseUri(chainId: ChainId, provider: Provider) {
 			raacNFTAddress,
 			raacNFTABI,
 			provider
-		) as any as RAACNFT;
+		);
 
 		const uri = await raacNFTContract.baseURI();
 
 		console.log(`Retrieved base uri: ${uri}`);
 		return uri;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error adding new batch:", error);
 		throw new Error(`Failed to add new batch: ${error.message}`);
 	}

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

@@ -1,13 +1,11 @@
 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 getHousePrice(
-	chainId: ChainId,
-	tokenId: number,
-	provider: Provider
+	chainId,
+	tokenId,
+	provider
 ) {
 	try {
 		const raacNFTAddress = getContractAddress(chainId, "raacnft");
@@ -17,11 +15,11 @@ async function getHousePrice(
 			raacNFTAddress,
 			raacNFTABI,
 			provider
-		) as any as RAACNFT;
+		);
 
 		const price = await raacNFTContract.getHousePrice(tokenId);
 		return ethers.formatEther(price);
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error getting house price:", error);
 		throw new Error(`Failed to get house price: ${error.message}`);
 	}

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

@@ -1,10 +1,8 @@
 import { Contract, ethers, Provider, 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 getMintFeePercentage(chainId: ChainId, provider: Provider) {
+async function getMintFeePercentage(chainId, provider) {
 	if (!provider) {
 		throw new Error("Wallet not connected");
 	}
@@ -17,14 +15,14 @@ async function getMintFeePercentage(chainId: ChainId, provider: Provider) {
 			raacNFTAddress,
 			raacNFTABI,
 			provider
-		) as any as RAACNFT;
+		);
 
 		const percentage =
 			(await raacNFTContract.MINT_FEE_PERCENTAGE()) / BigInt(10e5);
 
 		console.log(`Retrieved mint fee percentage: ${percentage}`);
 		return percentage;
-	} catch (error: any) {
+	} catch (error) {
 		console.log("Error retrieving mint fee percentage", error);
 		throw new Error(`Failed to retrieve mint fee percentage: ${error.message}`);
 	}

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.4",
 	"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;
 	}