@raac/rpc 2.0.0-beta.1 → 2.0.0-beta.10

package/dist/pools/lendingPool/getParameters.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 /**
  * Reads the lending pool's protocol parameters.
  * @param chainId The chain id.
@@ -8,6 +10,7 @@ const _helpers_1 = require("./_helpers");
  * @returns The parameters: caps, fees and minimums as `TokenAmount`s in reserve asset base units, ratios as basis points.
  */
 async function getParameters(chainId, provider) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const p = await lendingPoolContract.parameters();
@@ -29,8 +32,7 @@ async function getParameters(chainId, provider) {
         };
     }
     catch (error) {
-        console.error("Error in getParameters:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.getParameters", error, { chainId, address: contractAddress });
     }
 }
 exports.default = getParameters;

package/dist/pools/lendingPool/getPositionDebt.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 // TODO: interface changed
 /**
  * @description Get the raw debt of the user on a NFT. Equivant to the original amount borrowed on NFT.
@@ -13,6 +15,7 @@ const _helpers_1 = require("./_helpers");
  * @returns The raw debt of the position (principal, without accrued interest), in reserve asset (crvUSD) base units.
  */
 async function getPositionDebt(chainId, adapterName, userAddress, data, provider) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
@@ -23,8 +26,7 @@ async function getPositionDebt(chainId, adapterName, userAddress, data, provider
         return (0, _helpers_1.toReserveAmount)(chainId, debt);
     }
     catch (error) {
-        console.error("Error getting position debt:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.getPositionDebt", error, { chainId, address: contractAddress });
     }
 }
 exports.default = getPositionDebt;

package/dist/pools/lendingPool/getPositionScaledDebt.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 // TODO: interface changed
 /**
  * @description Get the scaled debt of the user on a NFT (contains the accured interest)
@@ -13,6 +15,7 @@ const _helpers_1 = require("./_helpers");
  * @returns The debt of the position including accrued interest, in reserve asset (crvUSD) base units.
  */
 async function getPositionScaledDebt(chainId, adapterName, userAddress, data, provider) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
@@ -23,8 +26,7 @@ async function getPositionScaledDebt(chainId, adapterName, userAddress, data, pr
         return (0, _helpers_1.toReserveAmount)(chainId, scaledDebt);
     }
     catch (error) {
-        console.error("Error getting position scaled debt:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.getPositionScaledDebt", error, { chainId, address: contractAddress });
     }
 }
 exports.default = getPositionScaledDebt;

package/dist/pools/lendingPool/getPositionView.js

@@ -4,6 +4,8 @@ exports.transformPositionView = transformPositionView;
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
 const amount_1 = require("../../utils/amount");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 /**
  * Maps the on-chain `CollateralPositionView` struct to a `PositionView`.
  * @param positionView The struct returned by `LendingPool.getPositionView`.
@@ -33,6 +35,7 @@ function transformPositionView(positionView, chainId) {
  * @returns The position's debts, health factor, liquidation state, index, insurance flag, adapter and asset.
  */
 async function getPositionView(chainId, adapterName, userAddress, data, provider) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
@@ -43,8 +46,7 @@ async function getPositionView(chainId, adapterName, userAddress, data, provider
         return transformPositionView(position, chainId);
     }
     catch (error) {
-        console.error("Error in getPositionView:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.getPositionView", error, { chainId, address: contractAddress });
     }
 }
 exports.default = getPositionView;

package/dist/pools/lendingPool/getPositionsScaledDebt.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 // TODO: interface changed
 /**
  * @description Get the sum of all the scaled debts of a user over all NFTs
@@ -10,14 +12,14 @@ const _helpers_1 = require("./_helpers");
  * @returns The user's total debt including accrued interest, in reserve asset (crvUSD) base units.
  */
 async function getPositionsScaledDebt(chainId, address, provider) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const debt = await lendingPoolContract.getPositionsScaledDebt(address);
         return (0, _helpers_1.toReserveAmount)(chainId, debt);
     }
     catch (error) {
-        console.error("Error in getPositionsScaledDebt:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.getPositionsScaledDebt", error, { chainId, address: contractAddress });
     }
 }
 exports.default = getPositionsScaledDebt;

package/dist/pools/lendingPool/getRawUserDepositsInLendingPool.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 /**
  * Reads the user's raw rToken balance in the lending pool, without accrued interest.
  * @param chainId The chain id.
@@ -9,14 +11,14 @@ const _helpers_1 = require("./_helpers");
  * @returns The raw deposit in rToken (reserve asset, crvUSD) base units.
  */
 async function getRawUserDepositsInLendingPool(chainId, address, provider) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const value = await lendingPoolContract.getUserDeposits(address);
         return (0, _helpers_1.toReserveAmount)(chainId, value);
     }
     catch (error) {
-        console.error("Error in getRawUserDepositsInLendingPool:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.getUserDeposits", error, { chainId, address: contractAddress });
     }
 }
 exports.default = getRawUserDepositsInLendingPool;

package/dist/pools/lendingPool/getUserCollateralValue.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
 const amount_1 = require("../../utils/amount");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 // TODO: interface changed: not efficient
 /**
  * @description Sum of the prices of all the NFTS
@@ -11,14 +13,14 @@ const amount_1 = require("../../utils/amount");
  * @returns The total collateral value in crvUSD base units. Asset adapters always price with 18 decimals.
  */
 async function getUserCollateralValue(chainId, address, provider) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const value = await lendingPoolContract.getUserCollateralValue(address);
         return (0, amount_1.toAmount)(value, amount_1.WAD_DECIMALS);
     }
     catch (error) {
-        console.error("Error in getUserCollateralValue:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.getUserCollateralValue", error, { chainId, address: contractAddress });
     }
 }
 exports.default = getUserCollateralValue;

package/dist/pools/lendingPool/initializeLiquidation.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 /**
  * @description Get the sum of all the scaled debts of a user over all NFTs
  * @param chainId
@@ -10,6 +12,7 @@ const _helpers_1 = require("./_helpers");
  * @returns The  debt of the user
  */
 async function initializeLiquidation(chainId, adapterName, userAddress, data, signer) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
@@ -21,8 +24,7 @@ async function initializeLiquidation(chainId, adapterName, userAddress, data, si
         return receipt.status === 1;
     }
     catch (error) {
-        console.error("Error initializing liquidation:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.initiateLiquidation", error, { chainId, address: contractAddress });
     }
 }
 exports.default = initializeLiquidation;

package/dist/pools/lendingPool/openVaultPosition.js

@@ -6,15 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const checkAllowance_1 = __importDefault(require("../../methods/commons/checkAllowance"));
 const approveAsset_1 = __importDefault(require("../../wallet/assets/approveAsset"));
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 async function openVaultPosition(chainId, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         // Get parameters to check vault opening fee
         const parameters = await lendingPoolContract.parameters();
-        console.log(parameters);
         const vaultOpeningFee = parameters.vaultOpeningFee;
         // Check if user has approved the fee
         const userAddress = await signer.getAddress();
@@ -22,18 +24,14 @@ async function openVaultPosition(chainId, signer) {
         // If allowance is less than the fee, approve it
         if (allowance < vaultOpeningFee) {
             await (0, approveAsset_1.default)(chainId, "crvusd", await lendingPoolContract.getAddress(), vaultOpeningFee, signer);
-            console.log(`Approved ${vaultOpeningFee} crvUSD base units for vault opening fee`);
         }
         // Open the vault position
         const tx = await lendingPoolContract.openVaultPosition();
         const receipt = await tx.wait();
-        console.log("Vault position opened successfully");
-        console.log(`Transaction hash: ${receipt?.hash}`);
         return receipt;
     }
     catch (error) {
-        console.error("Error in openVaultPosition:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.openVaultPosition", error, { chainId, address: contractAddress });
     }
 }
 exports.default = openVaultPosition;

package/dist/pools/lendingPool/repayToLendingPool.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 /**
  * Repays debt on a collateral position.
  * @param chainId The chain id.
@@ -12,6 +14,7 @@ const _helpers_1 = require("./_helpers");
  * @returns Whether the transaction succeeded.
  */
 async function repayToLendingPool(chainId, adapterName, amount, data, signer) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
@@ -23,8 +26,7 @@ async function repayToLendingPool(chainId, adapterName, amount, data, signer) {
         return receipt.status === 1;
     }
     catch (error) {
-        console.error("Error repaying to lending pool:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.repay", error, { chainId, address: contractAddress });
     }
 }
 exports.default = repayToLendingPool;

package/dist/pools/lendingPool/vaultOpened.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 /**
  * @description Check if the vault position is opened for a given address in the lending pool
  * @param chainId - The chain ID
@@ -9,14 +11,14 @@ const _helpers_1 = require("./_helpers");
  * @returns Promise<boolean> - True if vault position is opened, false otherwise
  */
 async function vaultOpened(chainId, address, provider) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const isVaultOpened = await lendingPoolContract.vaultOpened(address);
         return isVaultOpened;
     }
     catch (error) {
-        console.error("Error in vaultOpened:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.vaultOpened", error, { chainId, address: contractAddress });
     }
 }
 exports.default = vaultOpened;

package/dist/pools/lendingPool/withdrawAssetFromLendingPool.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = withdrawAssetFromLendingPool;
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 async function withdrawAssetFromLendingPool(chainId, adapterName, data, signer) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
@@ -15,7 +18,6 @@ async function withdrawAssetFromLendingPool(chainId, adapterName, data, signer)
         return receipt.status === 1;
     }
     catch (error) {
-        console.error("Error withdrawing asset from lending pool:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.withdrawAsset", error, { chainId, address: contractAddress });
     }
 }

package/dist/pools/lendingPool/withdrawFromLendingPool.js

@@ -4,6 +4,7 @@ const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../../contracts/getContractAddress");
 const artifacts_1 = require("../../utils/artifacts");
 const _helpers_1 = require("./_helpers");
+const rpcError_1 = require("../../utils/rpcError");
 /**
  * Redeems rToken for the reserve asset.
  * @param chainId The chain id.
@@ -16,6 +17,7 @@ async function withdrawFromLendingPool(chainId, amount, signer) {
     if (!signer) {
         throw new Error("Signer is required");
     }
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const rtokenAddress = (0, getContractAddress_1.getContractAddress)(chainId, "rtoken");
@@ -27,13 +29,10 @@ async function withdrawFromLendingPool(chainId, amount, signer) {
         }
         const tx = await lendingPoolContract.withdraw(amount);
         const receipt = await tx.wait();
-        console.log(`Withdrawn ${amount} base units from Lending Pool`);
-        console.log(`Transaction hash: ${receipt?.hash}`);
         return receipt;
     }
     catch (error) {
-        console.error("Error in withdrawFromLendingPool:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("lendingPool.withdraw", error, { chainId, address: contractAddress });
     }
 }
 exports.default = withdrawFromLendingPool;

package/dist/pools/liquidityPool/getLiquidityPoolInfo.js

@@ -4,6 +4,7 @@ const ethers_1 = require("ethers");
 const contracts_1 = require("../../utils/contracts");
 const artifacts_1 = require("../../utils/artifacts");
 const amount_1 = require("../../utils/amount");
+const rpcError_1 = require("../../utils/rpcError");
 /**
  * Reads liquidity pool markets. The liquidity pool is disabled and this method is not wired into `RPCLibrary`.
  * @param chainId The chain id.
@@ -12,8 +13,8 @@ const amount_1 = require("../../utils/amount");
  * @returns Market info keyed by paired token, and the TVL (18 decimals, fixed by the contract).
  */
 async function getLiquidityPoolInfo(chainId, address, provider) {
+    const liquidityPoolAddress = (0, contracts_1.getContractAddress)(chainId, "liquiditypool");
     try {
-        const liquidityPoolAddress = (0, contracts_1.getContractAddress)(chainId, "liquiditypool");
         // @ts-ignore
         const abi = (0, artifacts_1.getABI)("liquiditypool");
         const liquidityPoolContract = new ethers_1.ethers.Contract(liquidityPoolAddress, abi, provider);
@@ -59,8 +60,7 @@ async function getLiquidityPoolInfo(chainId, address, provider) {
         return result;
     }
     catch (error) {
-        console.error("Error fetching liquidity pool info:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("liquidityPool.getLiquidityPoolInfo", error, { chainId, address: liquidityPoolAddress });
     }
 }
 exports.default = getLiquidityPoolInfo;

package/dist/pools/rwaVault/adapters/erc20/getERC20VaultAdapterAssetValue.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const artifacts_1 = require("../../../../utils/artifacts");
 const amount_1 = require("../../../../utils/amount");
 const ethers_1 = require("ethers");
+const rpcError_1 = require("../../../../utils/rpcError");
 /**
  * Values an amount of the adapter's ERC20 token.
  * @param adapterAddress The ERC20 vault adapter address.
@@ -22,8 +23,7 @@ async function getERC20VaultAdapterAssetValue(adapterAddress, amount, signer) {
         return (0, amount_1.toAmount)(assetValue, amount_1.WAD_DECIMALS);
     }
     catch (error) {
-        console.error(`Error getting ERC20 Vault Adapter asset value:`, error);
-        throw new Error(`Failed to get ERC20 Vault Adapter asset value: ${error.message}`);
+        throw (0, rpcError_1.toRpcError)("rwaVault.getERC20VaultAdapterAssetValue", error);
     }
 }
 exports.default = getERC20VaultAdapterAssetValue;

package/dist/pools/rwaVault/adapters/erc20/getERC20VaultAdapterInfo.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const artifacts_1 = require("../../../../utils/artifacts");
 const ethers_1 = require("ethers");
+const rpcError_1 = require("../../../../utils/rpcError");
 async function getERC20VaultAdapterInfo(adapterAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -23,8 +24,7 @@ async function getERC20VaultAdapterInfo(adapterAddress, signer) {
         };
     }
     catch (error) {
-        console.error(`Error getting ERC20 Vault Adapter info:`, error);
-        throw new Error(`Failed to get ERC20 Vault Adapter info: ${error.message}`);
+        throw (0, rpcError_1.toRpcError)("rwaVault.getERC20VaultAdapterInfo", error);
     }
 }
 exports.default = getERC20VaultAdapterInfo;

package/dist/pools/rwaVault/adapters/erc20/getERC20VaultAdapterTotalValue.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const artifacts_1 = require("../../../../utils/artifacts");
 const amount_1 = require("../../../../utils/amount");
 const ethers_1 = require("ethers");
+const rpcError_1 = require("../../../../utils/rpcError");
 /**
  * Reads the value of all tokens held by an ERC20 vault adapter.
  * @param adapterAddress The ERC20 vault adapter address.
@@ -20,8 +21,7 @@ async function getERC20VaultAdapterTotalValue(adapterAddress, signer) {
         return (0, amount_1.toAmount)(totalValue, amount_1.WAD_DECIMALS);
     }
     catch (error) {
-        console.error(`Error getting ERC20 Vault Adapter total value:`, error);
-        throw new Error(`Failed to get ERC20 Vault Adapter total value: ${error.message}`);
+        throw (0, rpcError_1.toRpcError)("rwaVault.getERC20VaultAdapterTotalValue", error);
     }
 }
 exports.default = getERC20VaultAdapterTotalValue;

package/dist/pools/rwaVault/adapters/erc721/getERC721VaultAdapterAssetValue.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const artifacts_1 = require("../../../../utils/artifacts");
 const amount_1 = require("../../../../utils/amount");
+const rpcError_1 = require("../../../../utils/rpcError");
 /**
  * Values an NFT held by an ERC721 vault adapter.
  * @param adapterAddress The ERC721 vault adapter address.
@@ -22,8 +23,7 @@ async function getERC721VaultAdapterAssetValue(adapterAddress, tokenId, signer)
         return (0, amount_1.toAmount)(assetValue, amount_1.WAD_DECIMALS);
     }
     catch (error) {
-        console.error(`Error getting ERC721 Vault Adapter asset value:`, error);
-        throw new Error(`Failed to get ERC721 Vault Adapter asset value: ${error.message}`);
+        throw (0, rpcError_1.toRpcError)("rwaVault.getERC721VaultAdapterAssetValue", error);
     }
 }
 exports.default = getERC721VaultAdapterAssetValue;

package/dist/pools/rwaVault/adapters/erc721/getERC721VaultAdapterDeposits.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const artifacts_1 = require("../../../../utils/artifacts");
 const ethers_1 = require("ethers");
+const rpcError_1 = require("../../../../utils/rpcError");
 async function getERC721VaultAdapterDeposits(adapterAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -13,8 +14,7 @@ async function getERC721VaultAdapterDeposits(adapterAddress, signer) {
         return depositedTokens;
     }
     catch (error) {
-        console.error(`Error getting ERC721 Vault Adapter deposits:`, error);
-        throw new Error(`Failed to get ERC721 Vault Adapter deposits: ${error.message}`);
+        throw (0, rpcError_1.toRpcError)("rwaVault.getERC721VaultAdapterDeposits", error);
     }
 }
 exports.default = getERC721VaultAdapterDeposits;

package/dist/pools/rwaVault/adapters/erc721/getERC721VaultAdapterInfo.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const artifacts_1 = require("../../../../utils/artifacts");
 const ethers_1 = require("ethers");
+const rpcError_1 = require("../../../../utils/rpcError");
 async function getERC721VaultAdapterInfo(adapterAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -23,8 +24,7 @@ async function getERC721VaultAdapterInfo(adapterAddress, signer) {
         };
     }
     catch (error) {
-        console.error(`Error getting ERC721 Vault Adapter info:`, error);
-        throw new Error(`Failed to get ERC721 Vault Adapter info: ${error.message}`);
+        throw (0, rpcError_1.toRpcError)("rwaVault.getERC721VaultAdapterInfo", error);
     }
 }
 exports.default = getERC721VaultAdapterInfo;

package/dist/pools/rwaVault/adapters/erc721/getERC721VaultAdapterTotalValue.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const artifacts_1 = require("../../../../utils/artifacts");
 const amount_1 = require("../../../../utils/amount");
 const ethers_1 = require("ethers");
+const rpcError_1 = require("../../../../utils/rpcError");
 /**
  * Reads the value of all NFTs held by an ERC721 vault adapter.
  * @param adapterAddress The ERC721 vault adapter address.
@@ -20,8 +21,7 @@ async function getERC721VaultAdapterTotalValue(adapterAddress, signer) {
         return (0, amount_1.toAmount)(totalValue, amount_1.WAD_DECIMALS);
     }
     catch (error) {
-        console.error(`Error getting ERC721 Vault Adapter total value:`, error);
-        throw new Error(`Failed to get ERC721 Vault Adapter total value: ${error.message}`);
+        throw (0, rpcError_1.toRpcError)("rwaVault.getERC721VaultAdapterTotalValue", error);
     }
 }
 exports.default = getERC721VaultAdapterTotalValue;

package/dist/pools/rwaVault/checkRedeemEligibility.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkRedeemEligibility = checkRedeemEligibility;
+const _helpers_1 = require("./_helpers");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const artifacts_1 = require("../../utils/artifacts");
+const errorDecoder_1 = require("../../utils/errorDecoder");
+const rpcError_1 = require("../../utils/rpcError");
+function revertName(abi, error) {
+    const data = error?.data ?? error?.error?.data ?? error?.info?.error?.data;
+    return (0, errorDecoder_1.decodeRevertWithAbi)(abi, data)?.name;
+}
+/**
+ * Simulates a redeem (via `staticCall`, no transaction sent) to determine
+ * whether `account` can currently redeem an NFT from the RWA vault, reading
+ * the revert name from each simulated call to classify why not, when not.
+ */
+async function checkRedeemEligibility(chainId, account, maxSharesBurn, provider) {
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "rwavault");
+    const abi = (0, artifacts_1.getABI)("rwavault");
+    const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
+    let adapter;
+    let tokenId;
+    try {
+        const [drawnAdapter, drawnTokenId] = await rwaVaultContract.getNextRandomNFT.staticCall();
+        adapter = drawnAdapter;
+        tokenId = drawnTokenId.toString();
+    }
+    catch (error) {
+        if (revertName(abi, error) === "RequestNotFulfilled")
+            return { eligible: false, reason: "no-draw" };
+        throw (0, rpcError_1.toRpcError)("rwaVault.checkRedeemEligibility", error, { chainId, address: contractAddress });
+    }
+    try {
+        await rwaVaultContract.redeemNFT.staticCall(adapter, tokenId, maxSharesBurn, { from: account });
+        return { eligible: true, adapter, tokenId };
+    }
+    catch (error) {
+        const name = revertName(abi, error);
+        const reason = name === "KYCNotVerified" ? "kyc"
+            : name === "NFTNotRedeemable" ? "not-redeemable"
+                : name === "InsufficientBalance" || name === "SlippageExceeded" ? "insufficient-shares"
+                    : "other";
+        return { eligible: false, reason, adapter, tokenId };
+    }
+}

package/dist/pools/rwaVault/depositToRWAVault.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
 const getAdapterAddress_1 = require("./getAdapterAddress");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+const rpcError_1 = require("../../utils/rpcError");
 /**
  * Deposits an asset into the RWA vault through an adapter and mints vault shares to `receiver`.
  * @param chainId The chain id.
@@ -16,6 +18,7 @@ async function depositToRWAVault(chainId, adapter, data, receiver, minSharesOut,
     if (!signer) {
         throw new Error("Wallet not connected");
     }
+    const contractAddress = (0, getContractAddress_1.getContractAddress)(chainId, "rwavault");
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddress)(chainId, adapter);
@@ -23,14 +26,11 @@ async function depositToRWAVault(chainId, adapter, data, receiver, minSharesOut,
             throw new Error(`Adapter ${adapter} not found`);
         }
         const tx = await rwaVaultContract.depositAsset(adapterAddress.address, data, receiver, minSharesOut);
-        console.log(`Deposit transaction sent to RWA Vault:`, tx.hash);
         const receipt = await tx.wait();
-        console.log(`Deposited to RWA Vault successfully:`, receipt?.hash);
         return receipt;
     }
     catch (error) {
-        console.error(`Error depositing to RWA Vault:`, error);
-        throw new Error(`Deposit to RWA Vault failed: ${error.message}`);
+        throw (0, rpcError_1.toRpcError)("rwaVault.depositToRWAVault", error, { chainId, address: contractAddress });
     }
 }
 exports.default = depositToRWAVault;

package/dist/pools/rwaVault/getAdapters.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = require("../../configs/chains/index");
+const rpcError_1 = require("../../utils/rpcError");
 async function getAdapters(chainId, provider) {
     try {
         // RWAVault doesn't have a single getAdapters method, so we'll get the config
@@ -13,8 +14,7 @@ async function getAdapters(chainId, provider) {
         };
     }
     catch (error) {
-        console.error("Error in getAdapters:", error);
-        throw error;
+        throw (0, rpcError_1.toRpcError)("rwaVault.getAdapters", error, { chainId });
     }
 }
 exports.default = getAdapters;