@raac/rpc 1.1.0-beta.27 → 1.1.0-beta.29

package/dist/RPCLibrary.js

@@ -57,6 +57,7 @@ const mint_1 = __importDefault(require("./nfts/mint"));
 const getHousePrice_2 = __importDefault(require("./nfts/getHousePrice"));
 const setBaseUri_1 = __importDefault(require("./nfts/setBaseUri"));
 const getTokensByOwner_1 = __importDefault(require("./nfts/getTokensByOwner"));
+const getOwnerOfNFT_1 = __importDefault(require("./nfts/getOwnerOfNFT"));
 // Contracts
 const getContractAddress_1 = __importDefault(require("./contracts/getContractAddress"));
 const getContract_1 = __importDefault(require("./contracts/getContract"));
@@ -163,6 +164,7 @@ class RPCLibrary {
             mint: mint_1.default,
             getHousePrice: getHousePrice_2.default,
             getTokensByOwner: getTokensByOwner_1.default,
+            getOwnerOfNFT: getOwnerOfNFT_1.default,
             setBaseUri: setBaseUri_1.default,
             totalSupply: totalNFTSupply_1.default,
             getMintPrice: getMintPrice_1.default,

package/dist/configs/chains/11155111.json

@@ -1,7 +1,7 @@
 {
     "chainId": 11155111,
     "name": "sepolia",
-    "rpcs": ["https://sepolia.infura.io/v3/38126531f7b3458d80e5a822dfbf5854"],
+    "rpcs": ["https://eth-sepolia.g.alchemy.com/v2/GRu4-s8cjabOCnh-3ZFzapF-MwUcURV_"],
     "nativeCurrency": {
         "name": "ETH",
         "symbol": "ETH",
@@ -17,12 +17,12 @@
         "raachouseprices": {
             "id": "raachouseprices",
             "name": "RAAC House Prices",
-            "contract": "0x0f497bE68f0F96c40d4007d9848cCD933dAB3C38"
+            "contract": "0x3aD29bF120251BF7B2616B7460d38796535E0753"
         },
         "raacprimerateoracle": {
             "id": "raacprimerateoracle",
             "name": "RAAC Prime Rate Oracle",
-            "contract": "0xB710417257e2bcf66759149812e9B5dA97cEcaFF"
+            "contract": "0x755853680b66535067E436f218AF87f1C8Db961a"
         },
         "auctionfactory": {
             "id": "auctionfactory",
@@ -42,12 +42,12 @@
         "feecollector": {
             "id": "feecollector",
             "name": "Fee Collector",
-            "contract": "0x0a4c1755e9d76cdE0361EB6cDF77824cb06C8a98"
+            "contract": "0xA7154A854A86050C69Fc2081f0464ba48a1E6830"
         },
         "treasury": {
             "id": "treasury",
             "name": "Treasury",
-            "contract": "0xEaA6082460b2a1Cb2059551A5e368d7bB410D94c"
+            "contract": "0x6e647B74E06fc008043174EF9fbB06629E143b70"
         },
         "repairfund": {
             "id": "repairfund",
@@ -62,26 +62,26 @@
         "rwavault": {
             "id": "rwavault",
             "name": "RWA Vault",
-            "contract": "0x0165878A594ca255338adfa4d48449f69242Eb8F"
+            "contract": "0xB28264c78bFFAc4Ff4Bc9dB76F138CbaD865F642"
         }
     },
     "pools": {
         "stabilitypool": {
             "id": "stabilitypool",
             "name": "Stability Pool",
-            "contract": "0xCDc21F23A946Ab63bdF941677AE19dC5aBdD5011"
+            "contract": "0x8B8265469B5495c67373fC0655F2c78AcBdAfa5f"
         },
         "lendingpool": {
             "id": "lendingpool",
             "name": "Lending Pool",
-            "contract": "0x98981d5Ae694d8a63d008c1763716ae26e36A9A7"
+            "contract": "0x29f12b7195A863043C437Ae88ffAFd1e0C89Ec2E"
         }
     },
     "nfts": {
         "raacnft": {
             "id": "raacnft",
             "name": "RAAC NFT",
-            "contract": "0xc986D2750327EA6454d16cE2cD00BA62421dd0bC"
+            "contract": "0xEA034D093C73eaF20dBB3d2489B39b4c86848465"
         }
     },
     "assets": {
@@ -95,43 +95,43 @@
             "id": "crvusd",
             "name": "CRVUSD",
             "decimals": 18,
-            "contract": "0x0eeFb2Edd6865fdDA929dDAEB87701C34CE6B1A3"
+            "contract": "0x144346562EE47526D945E86d55C4203642C3b7fD"
         },
         "rtoken": {
             "id": "rtoken",
             "name": "RToken",
             "decimals": 18,
-            "contract": "0x9c0Aae91BeA71737EE802cb29EAA15a279cE58E6"
+            "contract": "0x80D0747737453D30dCE3167bB1284B6c0e6bC5db"
         },
         "detoken": {
             "id": "detoken",
             "name": "DEToken",
             "decimals": 18,
-            "contract": "0x8F499A9303e90a3Df10D6B3C435f78B6b6c0b503"
+            "contract": "0x34c4245991d5041BA8ebA6269B7b9386c32BDEEe"
         },
         "raactoken": {
             "id": "raactoken",
             "name": "RAAC",
             "decimals": 18,
-            "contract": "0x1503F1fE0c451214D9555F524E12984858202cC6"
+            "contract": "0xB1839AE38339Dc0035571cf856BF24254a27FbBC"
         },
         "veraac": {
             "id": "veraac",
             "name": "VERAAC",
             "decimals": 18,
-            "contract": "0x2a2d358cdC342f58911Fb8d569E6aA66f564e0D2"
+            "contract": "0x6eB1E8Ee1F16D23db63Dd8FCe8d127041E8a9588"
         },
         "debttoken": {
             "id": "debttoken",
             "name": "Debt Token",
             "decimals": 18,
-            "contract": "0xf6e002A1E60955d006C5EC1c4Eb74677B73Fba13"
+            "contract": "0x596917E0180fcBa1d809511A743Ea7d4ccf92Ca9"
         },
         "rwaindextoken": {
             "id": "rwaindextoken",
             "name": "RWA Index Token",
             "decimals": 18,
-            "contract": "0x3A663C401AdF767d710C7f0133DF40eA18F24863"
+            "contract": "0x1be9E0875edfbAE72D087500c502b5F84ca9E9Da"
         }
     }
 }

package/dist/configs/chains/18453.json

@@ -1,7 +1,7 @@
 {
     "chainId": 18453,
     "name": "raac",
-    "rpcs": ["http://44.211.155.244:7654"],
+    "rpcs": ["http://44.211.155.244:8545"],
     "nativeCurrency": {
         "name": "RAAC",
         "symbol": "RAAC",

package/dist/nfts/getOwnerOfNFT.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const contracts_1 = require("../utils/contracts");
+const artifacts_1 = require("../utils/artifacts");
+/**
+ * Get the owner of an NFT token
+ * @param chainId - The chain ID
+ * @param nftContractName - The NFT contract name from configs
+ * @param tokenId - The token ID to check ownership for
+ * @param provider - The provider to use for the contract call
+ * @returns The owner address of the NFT, or null if the token doesn't exist or has no owner
+ */
+async function getOwnerOfNFT(chainId, nftContractName, tokenId, provider) {
+    if (!provider) {
+        throw new Error("Provider not available");
+    }
+    try {
+        const nftAddress = (0, contracts_1.getContractAddress)(chainId, nftContractName);
+        const nftABI = (0, artifacts_1.getABI)(nftContractName);
+        const nftContract = new ethers_1.ethers.Contract(nftAddress, nftABI, provider);
+        const owner = await nftContract.ownerOf(tokenId);
+        console.log(`NFT ${nftContractName} token ID ${tokenId} is owned by ${owner}`);
+        return owner;
+    }
+    catch (error) {
+        // If the token doesn't exist, ownerOf will throw an error
+        // In this case, we return null as requested
+        if (error.message?.includes("nonexistent token") ||
+            error.message?.includes("invalid token ID") ||
+            error.message?.includes("ERC721: owner query for nonexistent token")) {
+            console.log(`NFT ${nftContractName} token ID ${tokenId} does not exist or has no owner`);
+            return null;
+        }
+        console.error(`Error getting owner of NFT ${nftContractName} token ID ${tokenId}:`, error);
+        throw new Error(`Failed to get owner of NFT ${nftContractName}: ${error.message}`);
+    }
+}
+exports.default = getOwnerOfNFT;

package/dist/nfts/getTokensByOwner.js

@@ -8,6 +8,8 @@ async function getTokensByOwner(chainId, address, provider, pagination) {
         const raacNFTAddress = (0, contracts_1.getContractAddress)(chainId, "raacnft");
         const raacNFTABI = (0, artifacts_1.getABI)("raacnft");
         const raacNFTContract = new ethers_1.ethers.Contract(raacNFTAddress, raacNFTABI, provider);
+        console.log(raacNFTContract);
+        console.log(address);
         const balance = await raacNFTContract.balanceOf(address);
         if (balance === 0n) {
             return { address, tokens: [] };

package/dist/scripts/index.js

@@ -9,7 +9,7 @@ const chains_1 = __importDefault(require("../configs/chains"));
 const RPCLibrary_1 = __importDefault(require("../RPCLibrary"));
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
-const chainId = 18453;
+const chainId = 11155111;
 const config = chains_1.default[chainId];
 const TEST_MNEMONIC = process.env.TEST_MNEMONIC;
 const TEST_PRIVATE_KEY = process.env.TEST_PRIVATE_KEY;
@@ -17,16 +17,14 @@ async function getProvider() {
     return new ethers_1.ethers.JsonRpcProvider(config.rpcs[0]);
 }
 async function createWallet(mnemonic, provider) {
-    const wallet = ethers_1.ethers.Wallet.fromPhrase(mnemonic, provider);
-    console.info(`[${chainId}]: Loaded wallet from mnemonic: ${wallet.address}`);
-    // the signer is the wallet
-    return wallet;
-    // load from private key
-    // const wallet = new ethers.Wallet(TEST_PRIVATE_KEY, provider);
-    // console.info(
-    // 	`[${chainId}]: Loaded wallet from private key: ${wallet.address}`
-    // );
+    // const wallet = ethers.Wallet.fromPhrase(mnemonic, provider);
+    // console.info(`[${chainId}]: Loaded wallet from mnemonic: ${wallet.address}`);
+    // // the signer is the wallet
     // return wallet;
+    // load from private key
+    const wallet = new ethers_1.ethers.Wallet(TEST_PRIVATE_KEY, provider);
+    console.info(`[${chainId}]: Loaded wallet from private key: ${wallet.address}`);
+    return wallet;
 }
 async function setup() {
     const provider = await getProvider();
@@ -36,15 +34,38 @@ 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, "http://44.211.155.244:3000/v1/properties/", signer);
-    console.log(await rpc.pools.lendingPool.getLendingPoolInfo(chainId, signer.address, provider));
-    console.log(await rpc.wallet.assets.getBalance(chainId, "rtoken", signer.address, provider));
+    // 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
+    // 	)
+    // );
+    // 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
+    // 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);
@@ -52,41 +73,67 @@ async function setup() {
     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);
-    }
+    // // // // 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);
+    // }
+    // // // set house prices with proper error handling and gas management
+    // for (const item of housePrices.map((price, index) => ({ id: index + 3, price: parseEther(price.toString()) }))) {
+    // 	try {
+    // 		// Get the current gas price and add a small increment
+    // 		const gasPrice = await provider.getGasPrice();
+    // 		const tx = await housePriceContract.setHousePrice(item.id, item.price, {
+    // 			gasPrice: gasPrice.add(1000000), // Add a small increment to gas price
+    // 			gasLimit: 300000 // Set a specific gas limit
+    // 		});
+    // 		// Wait for the transaction to be mined
+    // 		const receipt = await tx.wait();
+    // 		console.log("Price set for house", item.id, "tx:", receipt.hash);
+    // 		// Add a delay between transactions
+    // 		await new Promise(resolve => setTimeout(resolve, 2000));
+    // 	} catch (error) {
+    // 		console.error(`Failed to set price for house ${item.id}:`, error);
+    // 		// Continue with the next item instead of stopping
+    // 		continue;
+    // 	}
+    // }
     // // 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");
-        }
-    }
+    // 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");
+    // 	}
+    // }
+    // // // // 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);
+    // }
     // 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);
-    }
+    // let nftIdStart = countTokens + 2;
+    // let nftIdEnd = countTokens + 10;
+    // for (let i = nftIdStart; i <= nftIdEnd; i++) {
+    // 	try {
+    // 		const price = Math.floor(Math.random() * (2000000 - 100000) + 100000);
+    // 		const tx = await housePriceContract.setHousePrice(
+    // 			i,
+    // 			parseEther(price.toString()),
+    // 			{
+    // 				nonce: await provider.getTransactionCount(signer.address)
+    // 			}
+    // 		);
+    // 		const receipt = await tx.wait();
+    // 		console.log("Price set for house", i, "tx:", receipt.hash);
+    // 		await new Promise(resolve => setTimeout(resolve, 2000));
+    // 	} catch (error) {
+    // 		console.error(`Failed to set price for house ${i}:`, error);
+    // 		continue;
+    // 	}
+    // }
 }
 const execute = async () => {
     const provider = await getProvider();
@@ -95,14 +142,7 @@ const execute = async () => {
     rpc.address = signer.address;
     rpc.provider = provider;
     rpc.chainId = chainId;
-    const lendingPoolAddress = (0, contracts_1.getContractAddress)(chainId, "lendingpool");
-    const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-    const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, signer);
-    console.log(await lendingPoolContract.primeRateOracle());
-    const primeRateOracleAddress = (0, contracts_1.getContractAddress)(chainId, "raacprimerateoracle");
-    const primeRateOracleABI = (0, artifacts_1.getABI)("raacprimerateoracle");
-    const primeRateOracleContract = new ethers_1.ethers.Contract(primeRateOracleAddress, primeRateOracleABI, signer);
-    console.log(await primeRateOracleContract.lastPrimeRate());
+    console.log(await rpc.nfts.getTotalPropertiesCount(chainId, provider));
 };
 const updateNFTPrice = async (id, price) => {
     const provider = await getProvider();
@@ -142,6 +182,6 @@ const fulfillRequest = async () => {
     console.log("Redemption token", redemptionToken);
 };
 // execute();
-// setup();
-// fulfillRequest();
 setup();
+// fulfillRequest();
+// setup();

package/dist/types/RPCLibrary.d.ts

@@ -37,6 +37,7 @@ import mintNFT from "./nfts/mint";
 import getNFTHousePrice from "./nfts/getHousePrice";
 import setNFTBaseUri from "./nfts/setBaseUri";
 import getTokensByOwner from "./nfts/getTokensByOwner";
+import getOwnerOfNFT from "./nfts/getOwnerOfNFT";
 import getContractAddress from "./contracts/getContractAddress";
 import getContract from "./contracts/getContract";
 import getLatestPrice from "./contracts/housePrices/getLatestPrice";
@@ -119,6 +120,7 @@ declare class RPCLibrary {
         mint: typeof mintNFT;
         getHousePrice: typeof getNFTHousePrice;
         getTokensByOwner: typeof getTokensByOwner;
+        getOwnerOfNFT: typeof getOwnerOfNFT;
         setBaseUri: typeof setNFTBaseUri;
         totalSupply: typeof totalNFTSupply;
         getMintPrice: typeof getMintPrice;

package/dist/types/nfts/getOwnerOfNFT.d.ts

@@ -0,0 +1,13 @@
+import { Provider } from "ethers";
+import { ChainId } from "../configs/chains/index";
+import { NftContractNames } from "./approveNFT";
+/**
+ * Get the owner of an NFT token
+ * @param chainId - The chain ID
+ * @param nftContractName - The NFT contract name from configs
+ * @param tokenId - The token ID to check ownership for
+ * @param provider - The provider to use for the contract call
+ * @returns The owner address of the NFT, or null if the token doesn't exist or has no owner
+ */
+declare function getOwnerOfNFT(chainId: ChainId, nftContractName: NftContractNames, tokenId: string, provider: Provider): Promise<string | null>;
+export default getOwnerOfNFT;

package/package.json

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