@raac/rpc 1.1.0-beta.31 → 1.1.0-beta.33

package/dist/configs/chains/8453.json

@@ -76,7 +76,7 @@
         "raacnft": {
             "id": "raacnft",
             "name": "RAAC NFT",
-            "contract": "0x9E545E3C0baAB3E08CdfD552C960A1050f373042"
+            "contract": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
         }
     },
     "assets": {
@@ -134,13 +134,13 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8",
+                "contract": "0xf5059a5D33d5853360D16C683c16e67980206f36",
                 "type": "ERC721"
             },
             "rwaindextokenadapter": {
                 "id": "rwaindextokenadapter",
                 "name": "RWA Index Token",
-                "contract": "0x95401dc811bb5740090279Ba06cfA8fcF6113778",
+                "contract": "0x851356ae760d987E095750cCeb3bC6014560891C",
                 "type": "ERC20"
             }
         },
@@ -148,13 +148,13 @@
             "raacnftadapter": {
                 "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "0x95401dc811bb5740090279Ba06cfA8fcF6113778",
+                "contract": "0x70e0bA845a1A0F2DA3359C97E0285013525FFC49",
                 "type": "ERC721"
             },
             "crvusdadapter": {
                 "id": "crvusdadapter",
                 "name": "CRVUSD Adapter",
-                "contract": "0x09635F643e140090A9A8Dcd712eD6285858ceBef",
+                "contract": "0x67d269191c92Caf3cD7723F116c85e6E9bf55933",
                 "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

@@ -1,15 +1,23 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const getAllowance_1 = __importDefault(require("../../wallet/assets/getAllowance"));
 async function depositToRWAVault(chainId, adapter, data, receiver, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
-        const tx = await rwaVaultContract.depositAsset(adapter, data, receiver, {
-            nonce: await signer.getNonce(),
-        });
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
+        const adapterAddress = await (0, getAdapterAddress_1.getAdapterAddress)(chainId, adapter);
+        console.log("adapterAddress", adapterAddress.address);
+        console.log("data", data);
+        console.log("receiver", receiver);
+        console.log(await (0, getAllowance_1.default)(chainId, "crvusd", await signer.getAddress(), adapterAddress.address, signer.provider));
+        const tx = await rwaVaultContract.depositAsset(adapterAddress.address, data, receiver);
         console.log(`Deposit transaction sent to RWA Vault:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Deposited to RWA Vault successfully:`, receipt?.hash);

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,6 +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 _helpers_1 = require("../pools/rwaVault/_helpers");
 const chainId = 8453;
 const config = chains_1.default[chainId];
 const TEST_MNEMONIC = process.env.TEST_MNEMONIC;
@@ -116,7 +117,44 @@ const execute = async () => {
     rpc.address = signer.address;
     rpc.provider = provider;
     rpc.chainId = chainId;
-    console.log(await rpc.nfts.getTotalPropertiesCount(chainId, provider));
+    // await rpc.wallet.assets.mintAsset(
+    // 	chainId,
+    // 	"crvusd",
+    // 	10000000n,
+    // 	signer.address,
+    // 	signer
+    // );
+    // Minting Fee collection
+    const feeCollectorAddress = (0, contracts_1.getContractAddress)(chainId, "feecollector");
+    const feeCollectorABI = (0, artifacts_1.getABI)("feecollector");
+    const feeCollectorContract = new ethers_1.ethers.Contract(feeCollectorAddress, feeCollectorABI, signer);
+    const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
+    const erc20AdapterAddress = rpc.pools.rwaVault.getAdapterAddress(chainId, "crvusdadapter").address;
+    const abi = (0, artifacts_1.getABI)("erc20vaultadapter");
+    const erc20AdapterContract = new ethers_1.ethers.Contract(erc20AdapterAddress, abi, signer);
+    const crvusdAddress = await erc20AdapterContract.getAssetToken();
+    const crvusdABI = (0, artifacts_1.getABI)("crvusd");
+    const crvusdContract = new ethers_1.ethers.Contract(crvusdAddress, crvusdABI, signer);
+    const vaultTokenAddress = await rwaVaultContract.vaultToken();
+    const vaultTokenABI = (0, artifacts_1.getABI)("rwaindextoken");
+    const vaultTokenContract = new ethers_1.ethers.Contract(vaultTokenAddress, vaultTokenABI, signer);
+    // console.log("CRVUSD address", await getContractAddress(chainId, "crvusd"));
+    // console.log("CRVUSD address", await erc20AdapterContract.getAssetToken());
+    // console.log("Total value", await erc20AdapterContract.totalValue());
+    // console.log("Price oracle", await erc20AdapterContract.priceOracle());
+    // await feeCollectorContract.addClaimableToken(getContractAddress(chainId, "rwaindextoken"));
+    // await feeCollectorContract.addFeeType(MINT_FEE, 10000, 0, 0, 0, 0, 0);
+    // console.log(await rwaVaultContract.supportedDepositableAdapters(erc20AdapterAddress));
+    // console.log(await rwaVaultContract.depositableAdapters(1));
+    // await rwaVaultContract.setIndexTokenMintingFee(0);
+    await rpc.wallet.assets.approveAsset(chainId, "crvusd", erc20AdapterAddress, "200", signer);
+    const data = new ethers_1.ethers.AbiCoder().encode(["uint256"], [ethers_1.ethers.parseEther("200")]);
+    await rpc.pools.rwaVault.depositToRWAVault(chainId, "crvusdadapter", data, signer.address, signer);
+    console.log(await rwaVaultContract.pricePerShare());
+    console.log(await vaultTokenContract.balanceOf(signer.address));
+    console.log(await crvusdContract.balanceOf(signer.address));
+    console.log(await crvusdContract.balanceOf(erc20AdapterAddress));
+    console.log(await crvusdContract.allowance(signer.address, await rwaVaultContract.getAddress()));
 };
 const updateNFTPrice = async (id, price) => {
     const provider = await getProvider();

package/dist/types/RPCLibrary.d.ts

@@ -232,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/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/package.json

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