@raac/rpc 1.0.2-beta.5 → 1.1.0-beta.1

package/dist/RPCLibrary.js

@@ -234,7 +234,7 @@ class RPCLibrary {
             return wallet;
         }
     }
-    async getProvider(chainId) {
+    async getProvider(chainId, providerRpc) {
         if (typeof globalThis !== "undefined" &&
             globalThis.window && // @ts-ignore
             typeof globalThis.window.ethereum !== "undefined") {
@@ -244,7 +244,8 @@ class RPCLibrary {
         }
         const config = (0, index_1.getChainConfig)(chainId);
         const rpcs = config.rpcs;
-        const provider = new ethers_1.ethers.JsonRpcProvider(rpcs[0]);
+        const rpc = providerRpc ?? rpcs[0];
+        const provider = new ethers_1.ethers.JsonRpcProvider(rpc);
         return provider;
     }
     async getSigner(chainId, address) {

package/dist/configs/chains/11155111.json

@@ -17,7 +17,7 @@
         "raachouseprices": {
             "id": "raachouseprices",
             "name": "RAAC House Prices",
-            "contract": "0xA151fE9b3F225Ed575D0775c3Db096F14Ead5A0c"
+            "contract": "0x0f497bE68f0F96c40d4007d9848cCD933dAB3C38"
         },
         "raacprimerateoracle": {
             "id": "raacprimerateoracle",

package/dist/nfts/mint.js

@@ -11,7 +11,9 @@ async function mint(chainId, tokenId, amount, signer) {
         const raacNFTAddress = (0, contracts_1.getContractAddress)(chainId, "raacnft");
         const raacNFTABI = (0, artifacts_1.getABI)("raacnft");
         const raacNFTContract = new ethers_1.ethers.Contract(raacNFTAddress, raacNFTABI, signer);
-        const tx = await raacNFTContract.mint(tokenId, ethers_1.ethers.parseEther(amount.toString()));
+        const amountInWei = ethers_1.ethers.parseEther(amount);
+        console.log(`Minting RAAC NFT with token ID ${tokenId} for ${amount} tokens`);
+        const tx = await raacNFTContract.mint(tokenId, amountInWei);
         await tx.wait();
         console.log(`Minted RAAC NFT with token ID ${tokenId} for ${amount} tokens`);
         return tx;

package/dist/pools/lendingPool/withdrawFromLendingPool.js

@@ -18,7 +18,7 @@ async function withdrawFromLendingPool(chainId, amount, signer) {
         const amountInWei = ethers_1.ethers.parseEther(amount.toString());
         const { maxFeePerGas } = await (0, estimateGasPrice_1.default)(signer);
         const userBalance = await rTokenContract.balanceOf(await signer.getAddress());
-        if (userBalance < amount) {
+        if (userBalance < parseFloat(amount)) {
             throw new Error(`Insufficient rToken balance. Available: ${ethers_1.ethers.formatEther(userBalance)}, Requested: ${ethers_1.ethers.formatEther(amount)}`);
         }
         const approveTx = await rTokenContract.approve(lendingPoolAddress, amountInWei);

package/dist/scripts/index.js

@@ -9,16 +9,21 @@ 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 = 8453;
+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;
 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
+    // 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() {
@@ -94,7 +99,14 @@ const execute = async () => {
     rpc.address = signer.address;
     rpc.provider = provider;
     rpc.chainId = chainId;
-    console.log(await rpc.contracts.indexToken.getNextRandomNFT(chainId, provider));
+    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());
 };
 const updateNFTPrice = async (id, price) => {
     const provider = await getProvider();
@@ -132,7 +144,7 @@ const fulfillRequest = async () => {
     const redemptionToken = await rpc.contracts.indexToken.getNextRandomNFT(chainId, provider);
     console.log("Redemption token", redemptionToken);
 };
-// execute();
+execute();
 // setup();
-fulfillRequest();
+// fulfillRequest();
 // updateNFTPrice("7", "1650000");

package/dist/types/RPCLibrary.d.ts

@@ -183,7 +183,7 @@ declare class RPCLibrary {
     setChainsConfig: typeof setChainConfig;
     constructor(privateKey?: string);
     getWallet(privateKey: string, provider: Provider): Promise<ethers.JsonRpcSigner | ethers.Wallet>;
-    getProvider(chainId: ChainId): Promise<ethers.BrowserProvider | ethers.JsonRpcProvider>;
+    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/nfts/mint.d.ts

@@ -1,4 +1,4 @@
 import { ethers, Signer } from "ethers";
 import { ChainId } from "../configs/chains/index";
-declare function mint(chainId: ChainId, tokenId: string, amount: bigint, signer: Signer): Promise<ethers.ContractTransactionResponse>;
+declare function mint(chainId: ChainId, tokenId: string, amount: string, signer: Signer): Promise<ethers.ContractTransactionResponse>;
 export default mint;

package/dist/types/pools/lendingPool/withdrawFromLendingPool.d.ts

@@ -1,4 +1,4 @@
 import { ethers, Signer } from "ethers";
 import { ChainId } from "../../configs/chains";
-declare function withdrawFromLendingPool(chainId: ChainId, amount: bigint, signer: Signer): Promise<ethers.ContractTransactionReceipt>;
+declare function withdrawFromLendingPool(chainId: ChainId, amount: string, signer: Signer): Promise<ethers.ContractTransactionReceipt>;
 export default withdrawFromLendingPool;