@4mica/sdk 1.2.1 → 1.2.3

package/dist/contract.js

@@ -6,6 +6,22 @@ const core4mica_1 = require("./abi/core4mica");
 const chain_1 = require("./chain");
 const errors_1 = require("./errors");
 const utils_1 = require("./utils");
+/**
+ * Extract a human-readable message from a viem contract error, falling back
+ * to the raw message if no structured reason is available.
+ */
+function wrapViemError(error, context) {
+    if (error instanceof errors_1.ContractError)
+        return error;
+    if (error instanceof Error) {
+        const e = error;
+        const reason = e['cause']?.['reason'] ??
+            e['shortMessage'] ??
+            error.message;
+        return new errors_1.ContractError(`${context}: ${reason}`);
+    }
+    return new errors_1.ContractError(`${context}: ${String(error)}`);
+}
 const DEFAULT_REMUNERATE_GAS_LIMIT = 8000000n;
 const DEFAULT_PAY_TAB_ERC20_GAS_LIMIT = 300000n;
 const DEFAULT_MAX_FEE_PER_GAS = (0, viem_1.parseGwei)('0.1');
@@ -100,26 +116,68 @@ class ContractGateway {
             }
             return txReceipt;
         };
+        let txReceipt;
         try {
-            return await sendApprove(targetAllowance);
+            txReceipt = await sendApprove(targetAllowance);
         }
         catch (error) {
-            // Some ERC20s require resetting allowance to zero before setting a new value.
+            // Some ERC20s (e.g. USDT) require resetting allowance to zero before
+            // setting a new non-zero value.
             if (targetAllowance === 0n) {
-                throw error;
+                throw wrapViemError(error, 'ERC20 approve failed');
+            }
+            try {
+                await sendApprove(0n);
+                txReceipt = await sendApprove(targetAllowance);
+            }
+            catch (retryError) {
+                throw wrapViemError(retryError, 'ERC20 approve failed after allowance reset');
+            }
+        }
+        // Verify the allowance was actually set on-chain. The catch path above can
+        // leave allowance at 0 if the re-approve transaction fails silently.
+        const account = this.walletClient.account;
+        if (account) {
+            const actual = await erc20.read.allowance([account.address, spender]);
+            if (actual < targetAllowance) {
+                throw new errors_1.ContractError(`ERC20 allowance verification failed: on-chain allowance is ${actual} but expected ${targetAllowance}. ` +
+                    `Try calling approveErc20 again.`);
             }
-            await sendApprove(0n);
-            return sendApprove(targetAllowance);
         }
+        return txReceipt;
     }
     async deposit(amount, erc20Token, waitOptions) {
         const { receipt } = this.splitWaitOptions(waitOptions);
+        const parsedAmount = (0, utils_1.parseU256)(amount);
         let hash;
         if (erc20Token) {
-            hash = await this.enqueueTx(() => this.contract.write.depositStablecoin([erc20Token, (0, utils_1.parseU256)(amount)], this.defaultFeeParams()));
+            // Pre-check allowance to surface a clear error before hitting the contract.
+            const account = this.walletClient.account;
+            if (account) {
+                const erc20 = this.erc20(erc20Token);
+                const allowance = await erc20.read.allowance([
+                    account.address,
+                    this.contract.address,
+                ]);
+                if (allowance < parsedAmount) {
+                    throw new errors_1.ContractError(`Insufficient ERC20 allowance: ${allowance} approved but ${parsedAmount} required. ` +
+                        `Call approveErc20("${erc20Token}", ${parsedAmount}) before depositing.`);
+                }
+            }
+            try {
+                hash = await this.enqueueTx(() => this.contract.write.depositStablecoin([erc20Token, parsedAmount], this.defaultFeeParams()));
+            }
+            catch (error) {
+                throw wrapViemError(error, 'depositStablecoin failed');
+            }
         }
         else {
-            hash = await this.enqueueTx(() => this.contract.write.deposit({ value: (0, utils_1.parseU256)(amount), ...this.defaultFeeParams() }));
+            try {
+                hash = await this.enqueueTx(() => this.contract.write.deposit({ value: parsedAmount, ...this.defaultFeeParams() }));
+            }
+            catch (error) {
+                throw wrapViemError(error, 'deposit failed');
+            }
         }
         return this.publicClient.waitForTransactionReceipt({ hash, ...receipt });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4mica/sdk",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "TypeScript SDK for interacting with the 4Mica payment network",
   "license": "MIT",
   "repository": {
@@ -49,8 +49,8 @@
     "fmt": "prettier --check \"{src,tests}/**/*.{ts,js,json}\""
   },
   "dependencies": {
-    "@4mica/x402": "file:../x402-4mica/packages/typescript/x402",
-    "@noble/curves": "^2.0.1",
+    "@4mica/x402": "^1.2.0",
+    "@noble/curves": "^2.2.0",
     "@quillai-network/wachai-validation-sdk": "^0.1.0",
     "viem": "^2.45.1"
   },