@raac/rpc 1.1.0-beta.30 → 1.1.0-beta.32

package/dist/RPCLibrary.js

@@ -158,6 +158,7 @@ class RPCLibrary {
                 mintAsset: mintAsset_1.default,
                 burnAsset: burnAsset_1.default,
             },
+            rpcs: {},
         };
         this.nfts = {
             getBaseUri: getBaseUri_1.default,

package/dist/configs/chains/8453.json

@@ -57,26 +57,26 @@
         "rwavault": {
             "id": "rwavault",
             "name": "RWA Vault",
-            "contract": "0xE6E340D132b5f46d1e472DebcD681B2aBc16e57E"
+            "contract": "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F"
         }
     },
     "pools": {
         "stabilitypool": {
             "id": "stabilitypool",
             "name": "Stability Pool",
-            "contract": "0x09635F643e140090A9A8Dcd712eD6285858ceBef"
+            "contract": "0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44"
         },
         "lendingpool": {
             "id": "lendingpool",
             "name": "Lending Pool",
-            "contract": "0x59b670e9fA9D0A427751Af201D676719a970857b"
+            "contract": "0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE"
         }
     },
     "nfts": {
         "raacnft": {
             "id": "raacnft",
             "name": "RAAC NFT",
-            "contract": "0xf5059a5D33d5853360D16C683c16e67980206f36"
+            "contract": "0x9E545E3C0baAB3E08CdfD552C960A1050f373042"
         }
     },
     "assets": {
@@ -96,13 +96,13 @@
             "id": "rtoken",
             "name": "RToken",
             "decimals": 18,
-            "contract": "0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE"
+            "contract": "0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82"
         },
         "detoken": {
             "id": "detoken",
             "name": "DEToken",
             "decimals": 18,
-            "contract": "0x4A679253410272dd5232B3Ff7cF5dbB88f295319"
+            "contract": "0x59b670e9fA9D0A427751Af201D676719a970857b"
         },
         "raactoken": {
             "id": "raactoken",
@@ -120,13 +120,13 @@
             "id": "debttoken",
             "name": "Debt Token",
             "decimals": 18,
-            "contract": "0x68B1D87F95878fE05B998F19b66F4baba5De1aed"
+            "contract": "0x9A676e781A523b5d0C0e43731313A708CB607508"
         },
         "rwaindextoken": {
             "id": "rwaindextoken",
             "name": "Index Token",
             "decimals": 18,
-            "contract": "0x67d269191c92Caf3cD7723F116c85e6E9bf55933"
+            "contract": "0x4A679253410272dd5232B3Ff7cF5dbB88f295319"
         }
     },
     "adapters": {
@@ -134,7 +134,7 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0x998abeb3E57409262aE5b751f60747921B33613E",
+                "contract": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8",
                 "type": "ERC721"
             },
             "rwaindextokenadapter": {
@@ -148,13 +148,13 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0x99bbA657f2BbC93c02D617f8bA121cB8Fc104Acf",
+                "contract": "0x95401dc811bb5740090279Ba06cfA8fcF6113778",
                 "type": "ERC721"
             },
             "crvusdadapter": {
                 "id": "crvusdadapter",
                 "name": "CRVUSD Adapter",
-                "contract": "0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690",
+                "contract": "0x09635F643e140090A9A8Dcd712eD6285858ceBef",
                 "type": "ERC20"
             }
         }

package/dist/pools/rwaVault/_helpers.js

@@ -33,9 +33,8 @@ function getRWAVaultAdapterByAddress(chainId, address) {
         throw new Error("Adapter not found in config.");
     return adaptersConfig.rwavault[matchKey];
 }
-async function getRWAVaultContract(chainId) {
+async function getRWAVaultContract(chainId, provider_signer) {
     const rwaVaultAddress = (0, getContractAddress_1.default)(chainId, "rwavault");
     const rwaVaultABI = (0, artifacts_1.getABI)("rwavault");
-    const provider = new ethers_1.ethers.JsonRpcProvider();
-    return new ethers_1.ethers.Contract(rwaVaultAddress, rwaVaultABI, provider);
+    return new ethers_1.ethers.Contract(rwaVaultAddress, rwaVaultABI, provider_signer);
 }

package/dist/pools/rwaVault/depositToRWAVault.js

@@ -6,7 +6,7 @@ async function depositToRWAVault(chainId, adapter, data, receiver, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
         const tx = await rwaVaultContract.depositAsset(adapter, data, receiver, {
             nonce: await signer.getNonce(),
         });

package/dist/pools/rwaVault/getNextRandomNFT.js

@@ -6,7 +6,7 @@ async function getNextRandomNFT(chainId, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
         const [adapter, tokenId] = await rwaVaultContract.getNextRandomNFT();
         return {
             adapter,

package/dist/pools/rwaVault/getRWAVaultInfo.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
-async function getRWAVaultInfo(chainId, signer) {
-    if (!signer) {
-        throw new Error("Wallet not connected");
-    }
+async function getRWAVaultInfo(chainId, provider) {
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
         const [totalAssets, pricePerShare, vaultToken, underlyingAssetToken, stabilityPool, vrfConsumer, indexTokenMintingFee, feeCollector, vrfRequestDelay, allowVRFRequest, llamaTemple, llamaPerkDiscount, llamaPerkMultiplier, llamaPerkClassName] = await Promise.all([
             rwaVaultContract.totalAssets(),
             rwaVaultContract.pricePerShare(),

package/dist/pools/rwaVault/redeemNFTFromRWAVault.js

@@ -6,7 +6,7 @@ async function redeemNFTFromRWAVault(chainId, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
         const tx = await rwaVaultContract.redeemNFT({
             nonce: await signer.getNonce(),
         });

package/dist/pools/rwaVault/requestRandomSeed.js

@@ -6,7 +6,7 @@ async function requestRandomSeed(chainId, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
         const tx = await rwaVaultContract.requestRandomSeed({
             nonce: await signer.getNonce(),
         });

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 = 11155111;
+const chainId = 8453;
 const config = chains_1.default[chainId];
 const TEST_MNEMONIC = process.env.TEST_MNEMONIC;
 const TEST_PRIVATE_KEY = process.env.TEST_PRIVATE_KEY;
@@ -17,14 +17,16 @@ async function getProvider() {
     return new ethers_1.ethers.JsonRpcProvider(config.rpcs[0]);
 }
 async function createWallet(mnemonic, provider) {
-    // 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}`);
+    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}`
+    // );
+    // return wallet;
 }
 async function setup() {
     const provider = await getProvider();
@@ -34,37 +36,16 @@ 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
-    // );
+    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.pools.lendingPool.getLendingPoolInfo(
-    // 		chainId,
-    // 		signer.address,
-    // 		provider
-    // 	)
+    // 	await rpc.nfts.getTokensByOwner(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);
+    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");
@@ -74,45 +55,38 @@ async function setup() {
     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);
-    // }
-    // // // 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");
-    // 	}
-    // }
-    // // // // 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);
-    // }
+    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);
+    }
+    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");
+        }
+    }
+    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);
+    }
     // Generate some random NFT and set price only: not purchased yet
     // let nftIdStart = countTokens + 2;
     // let nftIdEnd = countTokens + 10;

package/dist/types/RPCLibrary.d.ts

@@ -114,6 +114,7 @@ declare class RPCLibrary {
             mintAsset: typeof mintAsset;
             burnAsset: typeof burnAsset;
         };
+        rpcs: {};
     };
     nfts: {
         getBaseUri: typeof getBaseUri;
@@ -231,7 +232,7 @@ declare class RPCLibrary {
     setChainsConfig: typeof setChainConfig;
     constructor(privateKey?: string);
     getWallet(privateKey: string, provider: Provider): Promise<ethers.JsonRpcSigner | ethers.Wallet>;
-    getProvider(chainId: ChainId, providerRpc?: string): Promise<ethers.JsonRpcProvider | ethers.BrowserProvider>;
+    getProvider(chainId: ChainId, providerRpc?: string): Promise<ethers.BrowserProvider | ethers.JsonRpcProvider>;
     getSigner(chainId: ChainId, address: string): Promise<ethers.JsonRpcSigner>;
     connectWallet(): Promise<void>;
     checkConnection(): Promise<void>;

package/dist/types/configs/chains/index.d.ts

@@ -1,15 +1,15 @@
-import { Chain8453, Chain11155111 } from "./chain";
+import { Chain8453 } from "./chain";
 declare const chains: {
     8453: Chain8453;
     17000: Chain8453;
-    11155111: Chain11155111;
+    11155111: Chain8453;
     18453: Chain8453;
 };
 export default chains;
 export declare const configs: {
     8453: Chain8453;
     17000: Chain8453;
-    11155111: Chain11155111;
+    11155111: Chain8453;
     18453: Chain8453;
 };
 export type Configs = typeof chains;

package/dist/types/configs/index.d.ts

@@ -2,7 +2,7 @@ import { ChainId } from "./chains/index";
 declare function getChainsConfig(): {
     8453: import("./chains/chain").Chain8453;
     17000: import("./chains/chain").Chain8453;
-    11155111: import("./chains/chain").Chain11155111;
+    11155111: import("./chains/chain").Chain8453;
     18453: import("./chains/chain").Chain8453;
 };
 declare function setChainConfig(chainId: ChainId, config: any): void;

package/dist/types/pools/rwaVault/_helpers.d.ts

@@ -1,4 +1,4 @@
-import { BytesLike, ethers } from "ethers";
+import { BytesLike, ethers, Provider, Signer } from "ethers";
 import { ChainId } from "../../configs/chains";
 import { Adapter } from "../../configs/chains/chain";
 import { RWAVault } from "../../typechain-types";
@@ -7,4 +7,4 @@ export declare function decodeERC721(data: BytesLike): ethers.Result;
 export declare function encodeERC20(amount: string): string;
 export declare function decodeERC20(data: BytesLike): bigint;
 export declare function getRWAVaultAdapterByAddress(chainId: ChainId, address: string): Adapter;
-export declare function getRWAVaultContract(chainId: ChainId): Promise<RWAVault>;
+export declare function getRWAVaultContract(chainId: ChainId, provider_signer?: Provider | Signer): Promise<RWAVault>;

package/dist/types/pools/rwaVault/getRWAVaultInfo.d.ts

@@ -1,4 +1,4 @@
-import { Signer } from "ethers";
+import { Provider } from "ethers";
 import { ChainId } from "../../configs/chains/index";
 interface RWAVaultInfo {
     totalAssets: string;
@@ -16,5 +16,5 @@ interface RWAVaultInfo {
     llamaPerkMultiplier: string;
     llamaPerkClassName: string;
 }
-declare function getRWAVaultInfo(chainId: ChainId, signer: Signer): Promise<RWAVaultInfo>;
+declare function getRWAVaultInfo(chainId: ChainId, provider: Provider): Promise<RWAVaultInfo>;
 export default getRWAVaultInfo;

package/dist/types/utils/contracts.d.ts

@@ -4,7 +4,7 @@ import { ethers, Provider } from "ethers";
 export declare const getConfigs: () => {
     8453: import("../configs/chains/chain").Chain8453;
     17000: import("../configs/chains/chain").Chain8453;
-    11155111: import("../configs/chains/chain").Chain11155111;
+    11155111: import("../configs/chains/chain").Chain8453;
     18453: import("../configs/chains/chain").Chain8453;
 };
 export declare const setOverrideConfig: (chainId: ChainId, newConfig: any) => void;
@@ -19,7 +19,7 @@ declare const _default: {
     getConfigs: () => {
         8453: import("../configs/chains/chain").Chain8453;
         17000: import("../configs/chains/chain").Chain8453;
-        11155111: import("../configs/chains/chain").Chain11155111;
+        11155111: import("../configs/chains/chain").Chain8453;
         18453: import("../configs/chains/chain").Chain8453;
     };
 };

package/package.json

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