@raac/rpc 1.1.0-beta.54 → 1.1.0-beta.56

package/dist/RPCLibrary.js

@@ -288,6 +288,8 @@ class RPCLibrary {
             decodeErrorName: errorDecoder_1.decodeErrorName,
             getErrorInfo: errorDecoder_1.getErrorInfo,
             attachDecodedError: errorDecoder_1.attachDecodedError,
+            decodeErrorMessage: errorDecoder_1.decodeErrorMessage,
+            attachDecodedErrorMessage: errorDecoder_1.attachDecodedErrorMessage,
         };
     }
     async getWallet(privateKey, provider) {

package/dist/pools/stabilityPool/getWithdrawRequestInfo.js

@@ -6,6 +6,7 @@ const _helpers_1 = require("./_helpers");
 async function getWithdrawRequestInfo(chainId, userAddress, provider) {
     try {
         const stabilityPoolContract = await (0, _helpers_1.getStabilityPoolContract)(chainId, provider);
+        const duration = await stabilityPoolContract.withdrawTimelockDuration();
         const request = await stabilityPoolContract.withdrawTimelock(userAddress);
         if (request[0] === 0n) {
             return null;
@@ -13,7 +14,8 @@ async function getWithdrawRequestInfo(chainId, userAddress, provider) {
         return {
             amount: ethers_1.ethers.formatEther(request[0]),
             readyAt: Number(request[1]),
-            expiresAt: Number(request[2])
+            expiresAt: Number(request[2]),
+            duration: Number(duration)
         };
     }
     catch (error) {

package/dist/scripts/generateErrorMap.js

@@ -0,0 +1,180 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const ethers_1 = require("ethers");
+// Custom error messages based on error names
+const ERROR_MESSAGES = {
+    // Access Control
+    'AccessControlBadConfirmation': 'Invalid access control confirmation',
+    'AccessControlUnauthorizedAccount': 'Account does not have required permissions',
+    'AccessDenied': 'Access denied - insufficient permissions',
+    // Adapter Errors
+    'AdapterAlreadySupported': 'This adapter is already supported',
+    'AdapterNotSupported': 'This adapter is not supported',
+    // Address Errors
+    'AddressCannotBeZero': 'Address cannot be zero',
+    'AddressEmptyCode': 'Target address has no code',
+    'AddressInsufficientBalance': 'Insufficient balance for operation',
+    // Amount Errors
+    'AmountDifferentThanRequested': 'Amount differs from requested amount',
+    'ApprovalFailed': 'Token approval failed',
+    // Compliance
+    'BlacklistedAddress': 'Address is blacklisted',
+    // Pool Errors
+    'BorrowCapReached': 'Borrow cap has been reached',
+    'BorrowThresholdTooHigh': 'Borrow threshold is too high',
+    'CannotBorrowUnderLiquidation': 'Cannot borrow while under liquidation',
+    'CannotDepositWhenUnderLiquidation': 'Cannot deposit while under liquidation',
+    'CannotRepayUnderLiquidationWithoutInsurance': 'Cannot repay under liquidation without insurance',
+    'CannotWithdrawInSameBlock': 'Cannot withdraw in the same block',
+    'CannotWithdrawUnderLiquidation': 'Cannot withdraw while under liquidation',
+    'CapExceedSupply': 'Cap exceeds available supply',
+    'CapZero': 'Cap cannot be zero',
+    'DebtNotZero': 'Debt must be zero for this operation',
+    'SupplyCapReached': 'Supply cap has been reached',
+    // Pause Errors
+    'EnforcedPause': 'Contract is paused',
+    'ExpectedPause': 'Contract should be paused',
+    // General Errors
+    'FailedInnerCall': 'Internal call failed',
+    'GracePeriodExpired': 'Grace period has expired',
+    'InsufficientAllowance': 'Insufficient allowance for operation',
+    'InsufficientBalance': 'Insufficient balance for operation',
+    'InvalidAmount': 'Invalid amount provided',
+    'InvalidCollateralRatio': 'Invalid collateral ratio',
+    'InvalidHealthFactor': 'Invalid health factor',
+    'InvalidLiquidationThreshold': 'Invalid liquidation threshold',
+    'InvalidParameter': 'Invalid parameter provided',
+    'InvalidPrice': 'Invalid price provided',
+    'InvalidToken': 'Invalid token address',
+    'LiquidationNotAllowed': 'Liquidation is not allowed',
+    'NoLiquidationAvailable': 'No liquidation available',
+    'NotEnoughLiquidity': 'Not enough liquidity available',
+    'OperationNotAllowed': 'Operation is not allowed',
+    'Overflow': 'Arithmetic overflow occurred',
+    'Paused': 'Contract is paused',
+    'ReentrancyGuardReentrantCall': 'Reentrant call detected',
+    'ReserveAlreadyInitialized': 'Reserve is already initialized',
+    'ReserveNotActive': 'Reserve is not active',
+    'ReserveNotInitialized': 'Reserve is not initialized',
+    'SafeERC20FailedOperation': 'SafeERC20 operation failed',
+    'TransferFailed': 'Token transfer failed',
+    'Unauthorized': 'Unauthorized operation',
+    'Underflow': 'Arithmetic underflow occurred',
+    'VaultNotOpen': 'Vault is not open',
+    'WithdrawalNotAllowed': 'Withdrawal is not allowed',
+    // Custom contract-specific errors
+    'InvalidOraclePrice': 'Invalid oracle price received',
+    'PriceStale': 'Oracle price is stale',
+    'InvalidRandomSeed': 'Invalid random seed provided',
+    'RandomSeedNotReady': 'Random seed is not ready',
+    'NFTNotAvailable': 'NFT is not available',
+    'InvalidNFTId': 'Invalid NFT ID provided',
+    'NFTAlreadyDeposited': 'NFT is already deposited',
+    'NFTNotDeposited': 'NFT is not deposited',
+    'InvalidVaultPosition': 'Invalid vault position',
+    'PositionNotOpen': 'Position is not open',
+    'InvalidCollateral': 'Invalid collateral provided',
+    'CollateralNotSupported': 'Collateral is not supported',
+    'InvalidDebtToken': 'Invalid debt token',
+    'DebtTokenNotSupported': 'Debt token is not supported',
+    'InvalidLiquidationProxy': 'Invalid liquidation proxy',
+    'InvalidVaultProxy': 'Invalid vault proxy',
+    'InvalidComplianceRegistry': 'Invalid compliance registry',
+    'InvalidPrimeRate': 'Invalid prime rate',
+    'InvalidAdmin': 'Invalid admin address',
+    'InvalidReserveAsset': 'Invalid reserve asset',
+    'InvalidRToken': 'Invalid R token',
+    'InvalidDebtTokenAddress': 'Invalid debt token address',
+    'InvalidLiquidationProxyAddress': 'Invalid liquidation proxy address',
+    'InvalidVaultProxyAddress': 'Invalid vault proxy address',
+    'InvalidComplianceRegistryAddress': 'Invalid compliance registry address',
+    'InvalidInitialPrimeRate': 'Invalid initial prime rate',
+    'InvalidAdminAddress': 'Invalid admin address',
+};
+function walkDir(dir) {
+    const files = [];
+    const items = fs_1.default.readdirSync(dir, { withFileTypes: true });
+    for (const item of items) {
+        const fullPath = path_1.default.join(dir, item.name);
+        if (item.isDirectory()) {
+            files.push(...walkDir(fullPath));
+        }
+        else if (item.name.endsWith('.json')) {
+            files.push(fullPath);
+        }
+    }
+    return files;
+}
+function generateErrorMap() {
+    const errorMap = {};
+    const artifactsDir = path_1.default.join(process.cwd(), 'artifacts');
+    if (!fs_1.default.existsSync(artifactsDir)) {
+        console.error('Artifacts directory not found');
+        process.exit(1);
+    }
+    const jsonFiles = walkDir(artifactsDir);
+    for (const filePath of jsonFiles) {
+        try {
+            const content = fs_1.default.readFileSync(filePath, 'utf8');
+            const json = JSON.parse(content);
+            if (!json.abi || !Array.isArray(json.abi))
+                continue;
+            const contractName = json.contractName || path_1.default.basename(filePath, '.json');
+            for (const item of json.abi) {
+                if (item.type !== 'error')
+                    continue;
+                const inputs = item.inputs || [];
+                const signature = `${item.name}(${inputs.map((input) => input.type).join(',')})`;
+                const selector = (0, ethers_1.id)(signature).slice(0, 10).toLowerCase();
+                // Skip if already processed (first occurrence wins)
+                if (errorMap[selector])
+                    continue;
+                const customMessage = ERROR_MESSAGES[item.name] ||
+                    `${item.name.replace(/([A-Z])/g, ' $1').trim()} error occurred`;
+                errorMap[selector] = {
+                    name: item.name,
+                    signature,
+                    message: customMessage,
+                    contract: contractName,
+                    inputs: inputs.map((input) => ({
+                        name: input.name || '',
+                        type: input.type,
+                        internalType: input.internalType || input.type,
+                    })),
+                };
+            }
+        }
+        catch (error) {
+            console.warn(`Failed to process ${filePath}:`, error);
+        }
+    }
+    return errorMap;
+}
+function main() {
+    console.log('🔍 Scanning ABIs for error definitions...');
+    const errorMap = generateErrorMap();
+    const outputPath = path_1.default.join(process.cwd(), 'generated', 'errorMap.json');
+    // Ensure generated directory exists
+    const generatedDir = path_1.default.dirname(outputPath);
+    if (!fs_1.default.existsSync(generatedDir)) {
+        fs_1.default.mkdirSync(generatedDir, { recursive: true });
+    }
+    // Write the error map
+    fs_1.default.writeFileSync(outputPath, JSON.stringify(errorMap, null, 2));
+    console.log(`✅ Generated error map with ${Object.keys(errorMap).length} errors`);
+    console.log(`📁 Output: ${outputPath}`);
+    // Show some examples
+    const examples = Object.entries(errorMap).slice(0, 5);
+    console.log('\n📋 Examples:');
+    for (const [selector, info] of examples) {
+        console.log(`  ${selector} → ${info.name}: ${info.message}`);
+    }
+}
+if (require.main === module) {
+    main();
+}

package/dist/scripts/index.js

@@ -10,7 +10,6 @@ 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 errorDecoder_1 = require("../utils/errorDecoder");
 const chainId = 8453;
 const config = chains_1.default[chainId];
 const TEST_MNEMONIC = process.env.TEST_MNEMONIC;
@@ -34,11 +33,10 @@ async function createWallet(mnemonic, provider) {
     }
 }
 async function setup() {
-    console.log((0, errorDecoder_1.decodeErrorName)("Encoded error signature 0xa9b65aba not found on ABI."));
-    return;
+    const rpc = new RPCLibrary_1.default();
     const provider = await getProvider();
     const signer = await createWallet(TEST_MNEMONIC, provider);
-    const rpc = new RPCLibrary_1.default();
+    // const rpc = new RPCLibrary();
     rpc.address = signer.address;
     rpc.provider = provider;
     rpc.chainId = chainId;
@@ -83,10 +81,9 @@ async function setup() {
     // console.log("Liquidity in the Mock Liquidity Pool", liquidity);
     // mint the current user 5 million irAAC
     console.log("Minting 5 million irAAC");
-    await rpc.wallet.assets.approveAsset(chainId, "crvusd", await rpc.pools.rwaVault.getAdapterAddress(chainId, "crvusdadapter").address, "5000000", signer);
-    const data = new ethers_1.ethers.AbiCoder().encode(["uint256"], [ethers_1.ethers.parseEther("5000000")]);
-    await rpc.pools.rwaVault.depositToRWAVault(chainId, "crvusdadapter", data, signer.address, signer);
-    return;
+    // await rpc.wallet.assets.approveAsset(chainId, "crvusd", await rpc.pools.rwaVault.getAdapterAddress(chainId, "crvusdadapter").address, "5000000", signer);
+    // const data = new ethers.AbiCoder().encode(["uint256"], [ ethers.parseEther("5000000") ])
+    // await rpc.pools.rwaVault.depositToRWAVault(chainId, "crvusdadapter", data, signer.address, signer)
     /// END OF ADD FUNDS IN THE MOCK LIQUIDITY POOL
     // // // send myself some CRVUSD
     // await rpc.wallet.assets.mintAsset(

package/dist/types/RPCLibrary.d.ts

@@ -95,7 +95,7 @@ import vaultOpened from "./pools/lendingPool/vaultOpened";
 import { getWithdrawRequestInfo as getStabilityPoolWithdrawRequestInfo } from "./pools/stabilityPool/getWithdrawRequestInfo";
 import { requestWithdraw as requestStabilityPoolWithdraw } from "./pools/stabilityPool/requestWithdraw";
 import { getABI } from "./utils/artifacts";
-import { decodeErrorName, getErrorInfo, attachDecodedError } from "./utils/errorDecoder";
+import { decodeErrorName, getErrorInfo, attachDecodedError, decodeErrorMessage, attachDecodedErrorMessage } from "./utils/errorDecoder";
 declare class RPCLibrary {
     signer: Signer | null;
     isConnected: boolean;
@@ -241,6 +241,8 @@ declare class RPCLibrary {
         decodeErrorName: typeof decodeErrorName;
         getErrorInfo: typeof getErrorInfo;
         attachDecodedError: typeof attachDecodedError;
+        decodeErrorMessage: typeof decodeErrorMessage;
+        attachDecodedErrorMessage: typeof attachDecodedErrorMessage;
     };
     constructor(privateKey?: string);
     getWallet(privateKey: string, provider: Provider): Promise<ethers.JsonRpcSigner | ethers.Wallet>;

package/dist/types/pools/stabilityPool/getWithdrawRequestInfo.d.ts

@@ -4,6 +4,7 @@ interface WithdrawRequestInfo {
     amount: string;
     readyAt: number;
     expiresAt: number;
+    duration: number;
 }
 export declare function getWithdrawRequestInfo(chainId: ChainId, userAddress: string, provider: Provider): Promise<WithdrawRequestInfo | null>;
 export {};

package/dist/types/scripts/generateErrorMap.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,21 +1,37 @@
-interface ErrorInfo {
+interface GeneratedErrorInfo {
     name: string;
     signature: string;
-    abiItem: any;
+    message: string;
+    contract?: string;
+    inputs?: Array<{
+        name: string;
+        type: string;
+        internalType: string;
+    }>;
 }
 /**
  * Returns detailed information about the error encoded in the given data blob.
  * @param data The revert data returned by the EVM (e.g., error.data).
  */
-export declare function getErrorInfo(data?: string): ErrorInfo | null;
+export declare function getErrorInfo(data?: string): GeneratedErrorInfo | null;
 /**
  * Returns only the error name, or null if it cannot be decoded.
  */
 export declare function decodeErrorName(data?: string): string | null;
+/**
+ * Returns the custom error message, or null if it cannot be decoded.
+ */
+export declare function decodeErrorMessage(data?: string): string | null;
 /**
  * Builds a user-friendly error prefix with decoded error name (if available).
  * Usage example:
  *   const msg = attachDecodedError("Deposit failed", caughtError);
  */
 export declare function attachDecodedError(prefix: string, error: any): string;
+/**
+ * Builds a user-friendly error message with custom error description (if available).
+ * Usage example:
+ *   const msg = attachDecodedErrorMessage("Deposit failed", caughtError);
+ */
+export declare function attachDecodedErrorMessage(prefix: string, error: any): string;
 export {};

package/dist/utils/errorDecoder.js

@@ -2,33 +2,50 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getErrorInfo = getErrorInfo;
 exports.decodeErrorName = decodeErrorName;
+exports.decodeErrorMessage = decodeErrorMessage;
 exports.attachDecodedError = attachDecodedError;
+exports.attachDecodedErrorMessage = attachDecodedErrorMessage;
 const ethers_1 = require("ethers");
 const artifacts_1 = require("./artifacts");
-const ERROR_SIGNATURE_MAP = {};
-(function buildErrorSignatureMap() {
-    for (const abiKey in artifacts_1.ABIS) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore – ABIS may contain unknown items
-        const abi = artifacts_1.ABIS[abiKey];
-        if (!Array.isArray(abi))
-            continue;
-        for (const item of abi) {
-            if (item.type !== "error")
+// Try to load the generated error map, fallback to runtime scanning
+let ERROR_SIGNATURE_MAP = {};
+try {
+    const generatedMap = require('../generated/errorMap.json');
+    ERROR_SIGNATURE_MAP = generatedMap;
+}
+catch (error) {
+    console.warn('Generated error map not found, falling back to runtime scanning...');
+    // Fallback to runtime scanning (original implementation)
+    (function buildErrorSignatureMap() {
+        for (const abiKey in artifacts_1.ABIS) {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore – ABIS may contain unknown items
+            const abi = artifacts_1.ABIS[abiKey];
+            if (!Array.isArray(abi))
                 continue;
-            const inputs = (item.inputs || []);
-            const signature = `${item.name}(${inputs.map((input) => input.type).join(",")})`;
-            const selector = (0, ethers_1.id)(signature).slice(0, 10).toLowerCase();
-            if (!ERROR_SIGNATURE_MAP[selector]) {
-                ERROR_SIGNATURE_MAP[selector] = {
-                    name: item.name,
-                    signature,
-                    abiItem: item,
-                };
+            for (const item of abi) {
+                if (item.type !== "error")
+                    continue;
+                const inputs = (item.inputs || []);
+                const signature = `${item.name}(${inputs.map((input) => input.type).join(",")})`;
+                const selector = (0, ethers_1.id)(signature).slice(0, 10).toLowerCase();
+                if (!ERROR_SIGNATURE_MAP[selector]) {
+                    ERROR_SIGNATURE_MAP[selector] = {
+                        name: item.name,
+                        signature,
+                        message: `${item.name.replace(/([A-Z])/g, ' $1').trim()} error occurred`,
+                        contract: abiKey,
+                        inputs: inputs.map((input) => ({
+                            name: input.name || '',
+                            type: input.type,
+                            internalType: input.internalType || input.type,
+                        })),
+                    };
+                }
             }
         }
-    }
-})();
+    })();
+}
 /**
  * Returns detailed information about the error encoded in the given data blob.
  * @param data The revert data returned by the EVM (e.g., error.data).
@@ -57,6 +74,13 @@ function decodeErrorName(data) {
     const info = getErrorInfo(data);
     return info?.name ?? null;
 }
+/**
+ * Returns the custom error message, or null if it cannot be decoded.
+ */
+function decodeErrorMessage(data) {
+    const info = getErrorInfo(data);
+    return info?.message ?? null;
+}
 /**
  * Builds a user-friendly error prefix with decoded error name (if available).
  * Usage example:
@@ -86,3 +110,28 @@ function attachDecodedError(prefix, error) {
     // console.debug("Decoded", selector, decodedName);
     return decodedName ? `${prefix} (${decodedName})` : prefix;
 }
+/**
+ * Builds a user-friendly error message with custom error description (if available).
+ * Usage example:
+ *   const msg = attachDecodedErrorMessage("Deposit failed", caughtError);
+ */
+function attachDecodedErrorMessage(prefix, error) {
+    const data = (error && ((error.data ?? error.error?.data) ||
+        undefined));
+    let selector;
+    if (data && data.startsWith("0x")) {
+        selector = data.slice(0, 10).toLowerCase();
+    }
+    else if (typeof error?.message === "string") {
+        const SIGNATURE_REGEX = /Encoded error signature \"(0x[0-9a-fA-F]{8})\"/;
+        const match = error.message.match(SIGNATURE_REGEX);
+        if (match)
+            selector = match[1].toLowerCase();
+    }
+    if (!selector)
+        return prefix;
+    const errorInfo = ERROR_SIGNATURE_MAP[selector];
+    if (!errorInfo)
+        return prefix;
+    return `${prefix}: ${errorInfo.message}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@raac/rpc",
-	"version": "1.1.0-beta.54",
+	"version": "1.1.0-beta.56",
 	"description": "RPC Library for RAAC ",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",
@@ -9,12 +9,13 @@
 	],
 	"scripts": {
 		"dev": "ts-node-dev --transpile-only --env-file=.env scripts/index.ts",
-		"build": "tsc && cp -r typechain-types dist/types",
+		"build": "npm run generate:errors && tsc && cp -r typechain-types dist/types",
 		"build:watch": "tsc --watch",
 		"test": "echo \"Error: no test specified\" && exit 1",
 		"sync": "bash setup.sh",
 		"clean": "rm -rf dist",
-		"prebuild": "npm run clean"
+		"prebuild": "npm run clean",
+		"generate:errors": "ts-node scripts/generateErrorMap.ts"
 	},
 	"keywords": [
 		"RAAC",