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

package/{RPCLibrary.ts → RPCLibrary.js}

@@ -109,121 +109,7 @@ import calculateInsuranceFee from "./pools/lendingPool/calculateInsuranceFee";
 import getTotalPropertiesCount from "./nfts/getTotalPropertiesCount";
 
 class RPCLibrary {
-	signer: Signer | null;
-	isConnected: boolean;
-	address: JsonRpcSigner | string;
-	chainId: ChainId | bigint | null;
-	privateKey: any;
-
-	// valid
-	assets: {
-		getAsset: typeof getAsset;
-		getAssets: typeof getAssets;
-		getSupply: typeof getSupply;
-	};
-	// valid
-	wallet: {
-		assets: {
-			getBalance: typeof getWalletBalance;
-			getAllowance: typeof getWalletAllowance;
-			getAsset: typeof getWalletAsset;
-			getAssets: typeof getWalletAssets;
-			transferAsset: typeof transferAsset;
-			approveAsset: typeof approveAsset;
-			mintAsset: typeof mintAsset;
-			burnAsset: typeof burnAsset;
-		};
-	};
-	nfts: {
-		getBaseUri: typeof getBaseUri;
-		mint: typeof mintNFT;
-		getHousePrice: typeof getNFTHousePrice;
-		getTokensByOwner: typeof getTokensByOwner;
-		setBaseUri: typeof setNFTBaseUri;
-		totalSupply: typeof totalNFTSupply;
-		getMintPrice: typeof getMintPrice;
-		getMintFeePercentage: typeof getMintFeePercentage;
-		getAllTokens: typeof getAllTokens;
-		getTokenURI: typeof getTokenURI;
-		getTotalPropertiesCount: typeof getTotalPropertiesCount;
-	};
-	contracts: {
-		housePrices: {
-			getLatestPrice: typeof getLatestPrice;
-			setOracle: typeof setOracle;
-		};
-		minter: { tick: typeof tick; get: typeof get; getApy: typeof getApy };
-		getContractAddress: typeof getContractAddress;
-		getContract: typeof getContract;
-		feeCollector: {
-			claimRewardFromPool: typeof claimRewardFromPool;
-		};
-		indexToken: {
-			getNextRandomNFT: typeof getNextRandomNFT;
-			redeemNFT: typeof redeemNFT;
-		};
-	};
-	pools: {
-		stabilityPool: {
-			getStabilityPoolInfo: typeof getStabilityPoolInfo;
-			depositToStabilityPool: typeof depositToStabilityPool;
-			withdrawFromStabilityPool: typeof withdrawFromStabilityPool;
-			calculateRAACRewards: typeof calculateRAACRewards;
-			getRawUserDepositInStabilityPool: typeof getRawUserDepositInStabilityPool;
-			depositNFTToStabilityPool: typeof depositNFTToStabilityPool;
-		};
-		// LendingPool
-		lendingPool: {
-			repayToLendingPool: typeof repayToLendingPool;
-			borrowFromLendingPool: typeof borrowFromLendingPool;
-			getHousePrice: typeof getHousePrice;
-			depositNFTToLendingPool: typeof depositNFTToLendingPool;
-			withdrawNFTFromLendingPool: typeof withdrawNFTFromLendingPool;
-			getLendingPoolInfo: typeof getLendingPoolInfo;
-			getAllUserData: typeof getAllUserData;
-			claimReward: typeof claimReward;
-			getPendingReward: typeof getPendingReward;
-			getRawUserDepositsInLendingPool: typeof getRawUserDepositsInLendingPool;
-			getEligibleUserDeposits: typeof getEligibleUserDeposits;
-			getHealthFactor: typeof getHealthFactor;
-			getPositionDebt: typeof getPositionDebt;
-			getPositionScaledDebt: typeof getPositionScaledDebt;
-			getPositionsScaledDebt: typeof getPositionsScaledDebt;
-			getPositionView: typeof getPositionView;
-			getUserCollateralValue: typeof getUserCollateralValue;
-			depositToLendingPool: typeof depositToLendingPool;
-			initializeLiquidation: typeof initializeLiquidation;
-			closeLiquidation: typeof closeLiquidation;
-			borrowFromLendingPoolWithInsurance: typeof borrowFromLendingPoolWithInsurance;
-			calculateInsuranceFee: typeof calculateInsuranceFee;
-		};
-		depositToLendingPool: typeof depositToLendingPool;
-		withdrawFromLendingPool: typeof withdrawFromLendingPool;
-		getLendingPoolTotalLiquidity: typeof getLendingPoolTotalLiquidity;
-		calculateRAACRewards: typeof calculateRAACRewards;
-		repayToLendingPool: typeof repayToLendingPool;
-		borrowFromLendingPool: typeof borrowFromLendingPool;
-		getHousePrice: typeof getHousePrice;
-		// StabilityPool
-		getStabilityPoolTotalDeposits: typeof getStabilityPoolTotalDeposits;
-		getStabilityPoolInfo: typeof getStabilityPoolInfo;
-		depositToStabilityPool: typeof depositToStabilityPool;
-		withdrawFromStabilityPool: typeof withdrawFromStabilityPool;
-	};
-	zeno: {
-		createAuction: typeof createAuction;
-		getAuctions: typeof getAuctions;
-		createZeno: typeof createZeno;
-		getZenos: typeof getZenos;
-	};
-	provider: any;
-
-	estimateGasPrice: any;
-	checkAllowance!: typeof checkAllowance;
-	getChainsConfig!: typeof getChainsConfig;
-	setChainsConfig!: typeof setChainConfig;
-
-	constructor(privateKey?: string) {
+	constructor(privateKey) {
 		this.signer = null;
 		this.isConnected = false;
 		this.address = "";
@@ -338,7 +224,7 @@ class RPCLibrary {
 		};
 	}
 
-	async getWallet(privateKey: string, provider: Provider) {
+	async getWallet(privateKey, provider) {
 		// @ts-ignore
 		if (typeof window !== "undefined" && window.ethereum) {
 			// Browser environment with MetaMask
@@ -354,7 +240,7 @@ class RPCLibrary {
 		}
 	}
 
-	async getProvider(chainId: ChainId) {
+	async getProvider(chainId) {
 		if (
 			typeof globalThis !== "undefined" &&
 			globalThis.window && // @ts-ignore
@@ -371,7 +257,7 @@ class RPCLibrary {
 		return provider;
 	}
 
-	async getSigner(chainId: ChainId, address: string) {
+	async getSigner(chainId, address) {
 		const provider = await this.getProvider(chainId);
 		const signer = await provider.getSigner(address);
 		return signer;
@@ -396,7 +282,7 @@ class RPCLibrary {
 				this.signer = await provider.getSigner();
 				this.address = await this.signer.getAddress();
 				this.isConnected = true;
-			} catch (error: any) {
+			} catch (error) {
 				console.error("Failed to connect wallet:", error);
 				throw new Error(`Failed to connect wallet: ${error.message}`);
 			}
@@ -408,7 +294,7 @@ class RPCLibrary {
 				this.signer = new ethers.Wallet(this.privateKey, this.provider);
 				this.address = await this.signer.getAddress();
 				this.isConnected = true;
-			} catch (error: any) {
+			} catch (error) {
 				console.error("Failed to connect wallet:", error);
 				throw new Error(`Failed to connect wallet: ${error.message}`);
 			}
@@ -434,7 +320,7 @@ class RPCLibrary {
 	}
 
 	// Mine a block
-	async mineBlock(wallet: Eip1193Provider) {
+	async mineBlock(wallet) {
 		const provider = new ethers.BrowserProvider(wallet);
 		await provider.send("evm_mine", []);
 		// await provider.send('evm_mine', []);

package/assets/{getAsset.ts → getAsset.js}

@@ -5,21 +5,21 @@ import { AssetType } from "../utils/artifacts";
 import { Provider } from "ethers";
 
 async function getAsset(
-	chainId: ChainId,
-	assetId: AssetType,
-	provider: Provider
+	chainId,
+	assetId,
+	provider
 ) {
 	try {
 		const { assets } = getConfig(chainId);
-		const asset: any = Object.values(assets).find(
-			(asset: any) => asset.id === assetId
+		const asset = Object.values(assets).find(
+			(asset) => asset.id === assetId
 		);
 		if (!asset) {
 			throw new Error(`Asset ${assetId} not found on chain ${chainId}`);
 		}
 		asset.supply = await getSupply(chainId, assetId, provider);
 		return asset;
-	} catch (error: any) {
+	} catch (error) {
 		console.error(`Error getting asset ${assetId}:`, error);
 		return 0;
 	}

package/assets/{getAssets.ts → getAssets.js}

@@ -2,16 +2,15 @@ import { Provider } from "ethers";
 import { ChainId } from "../configs/chains";
 import { getConfig } from "../utils/contracts";
 
-async function getAssets(chainId: ChainId, provider: Provider) {
+async function getAssets(chainId, provider) {
 	const { assets } = getConfig(chainId);
-	const responses: any = {};
+	const responses = {};
 
 	const assetIds = Object.keys(assets);
 	const assetPromises = assetIds.map(async (assetId) => {
 		// @ts-ignore
 		const asset = await this.getAsset(chainId, assetId, provider);
 		responses[assetId] = {
-			// @ts-ignore
 			...assets[assetId],
 			...asset,
 		};

package/assets/{getSupply.ts → getSupply.js}

@@ -1,12 +1,10 @@
-import { ethers, Provider } from "ethers";
+import { ethers } from "ethers";
 import { getContractAddress } from "../utils/contracts";
-import { ChainId } from "../configs/chains";
-import { AssetType } from "../utils/artifacts";
 
 async function getSupply(
-	chainId: ChainId,
-	assetId: AssetType,
-	provider: Provider
+	chainId,
+	assetId,
+	provider
 ) {
 	try {
 		const SUPPLY_ABI = ["function totalSupply() view returns (uint256)"];
@@ -14,7 +12,7 @@ async function getSupply(
 		const contract = new ethers.Contract(contractAddress, SUPPLY_ABI, provider);
 		const supply = await contract.totalSupply();
 		return ethers.formatEther(supply);
-	} catch (error: any) {
+	} catch (error) {
 		console.error(`Error getting supply for asset ${assetId}:`, error);
 		return 0;
 	}

package/configs/chains/index.js

@@ -0,0 +1,13 @@
+// @ts-ignore
+import chain8453 from "./8453.json"; // assert { type: "json" };
+import chain17000 from "./17000.json"; // assert { type: "json" };
+import chain11155111 from "./11155111.json"; // assert { type: "json" };
+
+const chains = {
+	8453: chain8453,
+	17000: chain17000, // the interface is the same for all the chains, so taking this
+	11155111: chain11155111,
+};
+
+export default chains;
+export const configs = chains;

package/configs/index.js

@@ -0,0 +1,17 @@
+import chains from "./chains/index";
+
+function getChainsConfig() {
+	return chains;
+}
+
+function setChainConfig(chainId, config) {
+	chains[chainId] = config;
+}
+
+function getChainConfig(chainId) {
+	const chains = getChainsConfig();
+	return chains[chainId];
+}
+
+export default { getChainsConfig, getChainConfig, setChainConfig };
+export { getChainsConfig, getChainConfig, setChainConfig };

package/contracts/feeCollector/{claimRewardFromPool.ts → claimRewardFromPool.js}

@@ -1,13 +1,7 @@
-import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
-import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { AuctionFactory, FeeCollector } from "../../typechain-types";
-
 async function claimRewardFromPool(
-	chainId: ChainId,
-	poolAddress: string,
-	signer: Signer
+	chainId,
+	poolAddress,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -24,7 +18,7 @@ async function claimRewardFromPool(
 		// const tx = await feeCollector.claimRewardFromPool(poolAddress);
 		// await tx.wait();
 		// console.log(`Claimed reward from pool: ${poolAddress}`);
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error FEECOLLECTOR claiming reward from pool:", error);
 		throw new Error(`Failed to claim reward from pool: ${error.message}`);
 	}

package/contracts/{getContract.ts → getContract.js}

@@ -1,12 +1,11 @@
-import { ethers, Signer } from "ethers";
+import { ethers } from "ethers";
 import getContractAddress from "./getContractAddress";
-import { ChainId } from "../configs/chains/index";
 import { ContractType } from "../utils/artifacts";
 
 export default async function getContract(
-	chainId: ChainId,
-	contractName: ContractType,
-	signer: Signer
+	chainId,
+	contractName,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Signer is required");
@@ -14,7 +13,7 @@ export default async function getContract(
 	const contractAddress = getContractAddress(chainId, contractName);
 
 	// You'll need to import the ABI for the contract. This is just a placeholder.
-	const abi: any[] = []; // Replace with actual ABI
+	const abi = []; // Replace with actual ABI
 
 	const contract = new ethers.Contract(contractAddress, abi, signer);
 	return contract;

package/contracts/{getContractAddress.ts → getContractAddress.js}

@@ -1,6 +1,4 @@
-import { Chain } from "../configs/chains/chain";
-import configs, { ChainId } from "../configs/chains";
-import { ContractType } from "../utils/artifacts";
+import configs from "../configs/chains";
 
 /**
  * Get the contract address for a given asset on a specific chain
@@ -9,8 +7,8 @@ import { ContractType } from "../utils/artifacts";
  * @returns {string}
  */
 export const getContractAddress = (
-	chainId: ChainId,
-	contractName: ContractType
+	chainId,
+	contractName
 ) => {
 	const normalizedContractName = contractName.toLowerCase();
 
@@ -29,7 +27,7 @@ export const getContractAddress = (
 		"assets",
 		"pools",
 		"nfts",
-	] as (keyof Chain)[];
+	];
 
 	let address = null;
 	for (const key of lookupKeys) {

package/contracts/housePrices/{getLatestPrice.ts → getLatestPrice.js}

@@ -1,13 +1,11 @@
-import { ethers, Provider } from "ethers";
+import { ethers } from "ethers";
 import { getContractAddress } from "../../utils/contracts";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { RAACHousePrices } from "../../typechain-types";
 
 async function getLatestPrice(
-	chainId: ChainId,
-	tokenId: string,
-	provider: Provider
+	chainId,
+	tokenId,
+	provider
 ) {
 	try {
 		const raacHousePricesAddress = getContractAddress(
@@ -20,14 +18,14 @@ async function getLatestPrice(
 			raacHousePricesAddress,
 			raacHousePricesABI,
 			provider
-		) as any as RAACHousePrices;
+		);
 
 		const [price, timestamp] = await raacHousePricesContract.getLatestPrice(
 			tokenId
 		);
 
 		return { price, timestamp };
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error getting latest price:", error);
 		return { price: -1n, timestamp: -1 };
 		// console.error('Error getting latest price:', error);

package/contracts/housePrices/{setOracle.ts → setOracle.js}

@@ -1,13 +1,11 @@
-import { ethers, Signer } from "ethers";
+import { ethers } from "ethers";
 import { getContractAddress } from "../../utils/contracts";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { RAACHousePrices } from "../../typechain-types";
 
 async function setOracle(
-	chainId: ChainId,
-	newOracleAddress: string,
-	signer: Signer
+	chainId,
+	newOracleAddress,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -24,14 +22,14 @@ async function setOracle(
 			raacHousePricesAddress,
 			raacHousePricesABI,
 			signer
-		) as any as RAACHousePrices;
+		);
 
 		const tx = await raacHousePricesContract.setOracle(newOracleAddress);
 		await tx.wait();
 
 		console.log(`Oracle address updated to: ${newOracleAddress}`);
 		return tx;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error setting oracle:", error);
 		throw new Error(`Failed to set oracle: ${error.message}`);
 	}

package/contracts/indexToken/{getNextRandomNFT.ts → getNextRandomNFT.js}

@@ -1,10 +1,8 @@
-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 { IndexToken } from "../../typechain-types";
 
-async function getNextRandomNFT(chainId: ChainId, provider: Provider) {
+async function getNextRandomNFT(chainId, provider) {
 	try {
 		const indexTokenAddress = getContractAddress(chainId, "indextoken");
 		const indexTokenABI = getABI("indextoken");
@@ -12,7 +10,7 @@ async function getNextRandomNFT(chainId: ChainId, provider: Provider) {
 			indexTokenAddress,
 			indexTokenABI,
 			provider
-		) as any as IndexToken;
+		);
 
 		const totalNFTs = await indexTokenContract.getTokensLength();
 		if (totalNFTs === 0n) {
@@ -29,7 +27,7 @@ async function getNextRandomNFT(chainId: ChainId, provider: Provider) {
 		};
 
 		return token;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in claimReward:", error);
 		throw error;
 	}

package/contracts/indexToken/{redeemNFT.ts → redeemNFT.js}

@@ -1,12 +1,10 @@
-import { ethers, parseEther, Signer } from "ethers";
-import { getContractAddress } from "../getContractAddress";
+import { ethers, parseEther } from "ethers";
+import getContractAddress from "../getContractAddress";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { IndexToken } from "../../typechain-types";
 import getNextRandomNFT from "./getNextRandomNFT";
 import getBalance from "../../wallet/assets/getBalance";
 
-async function redeemNFT(chainId: ChainId, signer: Signer) {
+async function redeemNFT(chainId, signer) {
 	try {
 		const indexTokenAddress = getContractAddress(chainId, "indextoken");
 		const indexTokenABI = getABI("indextoken");
@@ -14,7 +12,7 @@ async function redeemNFT(chainId: ChainId, signer: Signer) {
 			indexTokenAddress,
 			indexTokenABI,
 			signer
-		) as any as IndexToken;
+		);
 
 		const redemptionToken = await getNextRandomNFT(chainId, signer.provider);
 		if (redemptionToken === null) {
@@ -56,7 +54,7 @@ async function redeemNFT(chainId: ChainId, signer: Signer) {
 		console.log(`Transaction hash: ${receipt?.hash}`);
 
 		return receipt;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error in redeemNFT:", error);
 		throw error;
 	}

package/contracts/zeno/{createAuction.ts → createAuction.js}

@@ -1,20 +1,18 @@
-import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import { ethers } from "ethers";
+import getContractAddress from "../../utils/contracts";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { AuctionFactory } from "../../typechain-types";
 
 async function createAuction(
-	chainId: ChainId,
-	zenoAddress: string,
-	usdcAddress: string,
-	businessAddress: string,
-	auctionStartTime: bigint,
-	auctionEndTime: bigint,
-	startingPrice: bigint,
-	reservePrice: bigint,
-	totalZenoAllocated: bigint,
-	signer: Signer
+	chainId,
+	zenoAddress,
+	usdcAddress,
+	businessAddress,
+	auctionStartTime,
+	auctionEndTime,
+	startingPrice,
+	reservePrice,
+	totalZenoAllocated,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -28,7 +26,7 @@ async function createAuction(
 			auctionFactoryAddress,
 			auctionFactoryABI,
 			signer
-		) as any as AuctionFactory;
+		);
 
 		const tx = await auctionFactoryContract.createAuction(
 			zenoAddress,
@@ -48,7 +46,7 @@ async function createAuction(
 		);
 
 		console.log(`Zeno auction created at address: ${auctionAddress}`);
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error creating zeno auction:", error);
 		throw new Error(`Failed to create zeno auction: ${error.message}`);
 	}

package/contracts/zeno/{createZeno.ts → createZeno.js}

@@ -1,14 +1,12 @@
-import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import { ethers } from "ethers";
+import getContractAddress from "../../utils/contracts";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { ZENOFactory } from "../../typechain-types";
 
 async function createZeno(
-	chainId: ChainId,
-	usdcAddress: string,
-	maturityDate: string,
-	signer: Signer
+	chainId,
+	usdcAddress,
+	maturityDate,
+	signer
 ) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
@@ -22,7 +20,7 @@ async function createZeno(
 			zenoFactoryAddress,
 			zenoFactoryABI,
 			signer
-		) as any as ZENOFactory;
+		);
 
 		const tx = await zenoFactoryContract.createZENOContract(
 			usdcAddress,
@@ -38,7 +36,7 @@ async function createZeno(
 		console.log(`Zeno created at address: ${zenoAddress}`);
 
 		return zenoAddress;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error creating zeno:", error);
 		throw new Error(`Failed to create zeno: ${error.message}`);
 	}

package/contracts/zeno/{getAuctions.ts → getAuctions.js}

@@ -1,10 +1,8 @@
-import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import { ethers } from "ethers";
+import getContractAddress from "../../utils/contracts";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { AuctionFactory } from "../../typechain-types";
 
-async function getAuctions(chainId: ChainId, signer: Signer) {
+async function getAuctions(chainId, signer) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
 	}
@@ -17,7 +15,7 @@ async function getAuctions(chainId: ChainId, signer: Signer) {
 			auctionFactoryAddress,
 			auctionFactoryABI,
 			signer
-		) as any as AuctionFactory;
+		);
 
 		const auctionsCount = await auctionFactoryContract.getAuctionCount();
 		const auctions = [];
@@ -29,7 +27,7 @@ async function getAuctions(chainId: ChainId, signer: Signer) {
 
 		console.log(`Auctions: ${auctions}`);
 		return auctions;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error getting auctions:", error);
 		throw new Error(`Failed to get auctions: ${error.message}`);
 	}

package/contracts/zeno/{getZenos.ts → getZenos.js}

@@ -1,10 +1,8 @@
-import { ethers, Signer } from "ethers";
-import { getContractAddress } from "../../utils/contracts";
+import { ethers } from "ethers";
+import getContractAddress from "../../utils/contracts";
 import { getABI } from "../../utils/artifacts";
-import { ChainId } from "../../configs/chains/index";
-import { ZENO, ZENOFactory } from "../../typechain-types";
 
-async function getZenos(chainId: ChainId, signer: Signer) {
+async function getZenos(chainId, signer) {
 	if (!signer) {
 		throw new Error("Wallet not connected");
 	}
@@ -17,7 +15,7 @@ async function getZenos(chainId: ChainId, signer: Signer) {
 			zenoFactoryAddress,
 			zenoFactoryABI,
 			signer
-		) as any as ZENOFactory;
+		);
 
 		const zenosCount = await zenoFactoryContract.getZENOCount();
 		const zenos = [];
@@ -29,7 +27,7 @@ async function getZenos(chainId: ChainId, signer: Signer) {
 
 		console.log(`Zenos: ${zenos}`);
 		return zenos;
-	} catch (error: any) {
+	} catch (error) {
 		console.error("Error getting zenos:", error);
 		throw new Error(`Failed to get zenos: ${error.message}`);
 	}