@4mica/sdk 1.2.7 → 1.2.8

package/dist/client/index.js

@@ -5,6 +5,7 @@ const auth_1 = require("../auth");
 const contract_1 = require("../contract");
 const errors_1 = require("../errors");
 const rpc_1 = require("../rpc");
+const networks_1 = require("../networks");
 const signing_1 = require("../signing");
 const recipient_1 = require("./recipient");
 const user_1 = require("./user");
@@ -84,7 +85,9 @@ class Client {
         return new Client(rpc, params, gateway, guaranteeDomain, signer, authSession);
     }
     static async buildGateway(cfg, params) {
-        const ethRpcUrl = cfg.ethereumHttpRpcUrl ?? params.ethereumHttpRpcUrl;
+        const ethRpcUrl = cfg.ethereumHttpRpcUrl ??
+            params.ethereumHttpRpcUrl ??
+            (0, networks_1.resolvePublicRpcUrl)(`eip155:${params.chainId}`);
         const contractAddress = cfg.contractAddress ?? params.contractAddress;
         return contract_1.ContractGateway.create(ethRpcUrl, cfg.signer, contractAddress, params.chainId);
     }

package/dist/client/user.d.ts

@@ -15,7 +15,7 @@ export declare class UserClient {
      * @param amount - Amount to approve (in token base units).
      * @param waitOptions - Optional timeout/polling overrides for receipt polling.
      */
-    approveErc20(token: string, amount: number | bigint | string, waitOptions?: TxReceiptWaitOptions): Promise<import("viem").TransactionReceipt>;
+    approveErc20(token: string, amount: number | bigint | string, waitOptions?: TxReceiptWaitOptions): Promise<import("viem").TransactionReceipt | undefined>;
     /**
      * Deposit collateral into the Core4Mica contract.
      *

package/dist/contract.d.ts

@@ -29,7 +29,8 @@ export declare class ContractGateway {
         decoder: string;
         enabled: boolean;
     }>;
-    approveErc20(token: string, amount: number | bigint | string, waitOptions?: TxReceiptWaitOptions): Promise<import("viem").TransactionReceipt>;
+    approveErc20(token: string, amount: number | bigint | string, waitOptions?: TxReceiptWaitOptions): Promise<import("viem").TransactionReceipt | undefined>;
+    private waitForErc20Allowance;
     deposit(amount: number | bigint | string, erc20Token?: string, waitOptions?: TxReceiptWaitOptions): Promise<import("viem").TransactionReceipt>;
     getUserAssets(opts?: {
         blockNumber?: bigint;

package/dist/contract.js

@@ -15,10 +15,11 @@ function wrapViemError(error, context) {
         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}`);
+        const cause = e['cause'];
+        const reason = cause?.['reason'] ?? cause?.['message'] ?? e['shortMessage'] ?? error.message;
+        const details = e['details'] ?? cause?.['details'];
+        const suffix = details ? ` (${details})` : '';
+        return new errors_1.ContractError(`${context}: ${reason}${suffix}`);
     }
     return new errors_1.ContractError(`${context}: ${String(error)}`);
 }
@@ -26,6 +27,11 @@ 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');
 const DEFAULT_MAX_PRIORITY_FEE_PER_GAS = (0, viem_1.parseGwei)('0.1');
+const DEFAULT_RECEIPT_TIMEOUT_MS = 60_000;
+const DEFAULT_RECEIPT_POLLING_INTERVAL_MS = 2_000;
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 class ContractGateway {
     publicClient;
     walletClient;
@@ -41,6 +47,7 @@ class ContractGateway {
         const chain = (0, chain_1.getChain)(chainId, rpcUrl);
         const publicClient = (0, viem_1.createPublicClient)({
             transport: (0, viem_1.http)(rpcUrl),
+            pollingInterval: 2_000,
         });
         const rpcChainId = await publicClient.getChainId();
         if (rpcChainId !== Number(chainId)) {
@@ -85,7 +92,7 @@ class ContractGateway {
     }
     splitWaitOptions(waitOptions) {
         if (!waitOptions) {
-            return { receipt: {} };
+            return { receipt: { timeout: DEFAULT_RECEIPT_TIMEOUT_MS } };
         }
         const { gas, timeout, pollingInterval } = waitOptions;
         return {
@@ -108,6 +115,16 @@ class ContractGateway {
         const erc20 = this.erc20(token);
         const spender = this.contract.address;
         const targetAllowance = (0, utils_1.parseU256)(amount);
+        const account = this.walletClient.account;
+        if (account) {
+            const currentAllowance = (await erc20.read.allowance([
+                account.address,
+                spender,
+            ]));
+            if (currentAllowance >= targetAllowance) {
+                return undefined;
+            }
+        }
         const sendApprove = async (value) => {
             const hash = await this.enqueueTx(() => erc20.write.approve([spender, value], this.defaultFeeParams()));
             const txReceipt = await this.publicClient.waitForTransactionReceipt({ hash, ...receipt });
@@ -134,16 +151,8 @@ class ContractGateway {
                 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.
-        // Read at "latest" — waitForTransactionReceipt already confirmed the block,
-        // and many public RPCs reject eth_call at a specific recent blockNumber.
-        const account = this.walletClient.account;
         if (account) {
-            const actual = (await erc20.read.allowance([
-                account.address,
-                spender,
-            ]));
+            const actual = await this.waitForErc20Allowance(erc20, account.address, spender, targetAllowance, receipt);
             if (actual < targetAllowance) {
                 throw new errors_1.ContractError(`ERC20 allowance verification failed: on-chain allowance is ${actual} but expected ${targetAllowance}. ` +
                     `Try calling approveErc20 again.`);
@@ -151,6 +160,20 @@ class ContractGateway {
         }
         return txReceipt;
     }
+    async waitForErc20Allowance(erc20, owner, spender, targetAllowance, receiptOptions) {
+        const timeout = receiptOptions.timeout ?? DEFAULT_RECEIPT_TIMEOUT_MS;
+        const pollingInterval = receiptOptions.pollingInterval ?? DEFAULT_RECEIPT_POLLING_INTERVAL_MS;
+        const deadline = Date.now() + timeout;
+        let actual = 0n;
+        while (Date.now() <= deadline) {
+            actual = (await erc20.read.allowance([owner, spender]));
+            if (actual >= targetAllowance) {
+                return actual;
+            }
+            await sleep(Math.min(pollingInterval, Math.max(0, deadline - Date.now())));
+        }
+        return actual;
+    }
     async deposit(amount, erc20Token, waitOptions) {
         const { receipt } = this.splitWaitOptions(waitOptions);
         const parsedAmount = (0, utils_1.parseU256)(amount);

package/dist/networks.d.ts

@@ -4,6 +4,8 @@ export interface NetworkInfo {
     caip2: string;
     /** Hosted 4Mica core API URL for this network. */
     rpcUrl: string;
+    /** Reliable public Ethereum RPC for on-chain calls (fallback when server doesn't provide one). */
+    publicRpcUrl: string;
 }
 /**
  * Hosted 4Mica network deployments, keyed by human-readable shorthand.
@@ -29,12 +31,10 @@ export declare const NETWORKS: Record<string, NetworkInfo>;
 /**
  * Resolve a network shorthand or CAIP-2 identifier to a core API URL.
  * Returns `undefined` if the identifier is not a known hosted network.
- *
- * @example
- * ```ts
- * resolveNetworkRpcUrl("base");           // "https://base.api.4mica.xyz/"
- * resolveNetworkRpcUrl("eip155:8453");    // "https://base.api.4mica.xyz/"
- * resolveNetworkRpcUrl("eip155:1");       // undefined
- * ```
  */
 export declare function resolveNetworkRpcUrl(network: string): string | undefined;
+/**
+ * Resolve a CAIP-2 identifier to a reliable public Ethereum RPC URL.
+ * Returns `undefined` for unknown networks.
+ */
+export declare function resolvePublicRpcUrl(caip2: string): string | undefined;

package/dist/networks.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NETWORKS = void 0;
 exports.resolveNetworkRpcUrl = resolveNetworkRpcUrl;
+exports.resolvePublicRpcUrl = resolvePublicRpcUrl;
 /**
  * Hosted 4Mica network deployments, keyed by human-readable shorthand.
  *
@@ -26,28 +27,31 @@ exports.NETWORKS = {
     base: {
         caip2: 'eip155:8453',
         rpcUrl: 'https://base.api.4mica.xyz/',
+        publicRpcUrl: 'https://base-rpc.publicnode.com',
     },
     'base-sepolia': {
         caip2: 'eip155:84532',
         rpcUrl: 'https://base.sepolia.api.4mica.xyz/',
+        publicRpcUrl: 'https://base-sepolia-rpc.publicnode.com',
     },
     'ethereum-sepolia': {
         caip2: 'eip155:11155111',
         rpcUrl: 'https://ethereum.sepolia.api.4mica.xyz/',
+        publicRpcUrl: 'https://ethereum-sepolia-rpc.publicnode.com',
     },
 };
 const NETWORKS_BY_CAIP2 = Object.fromEntries(Object.values(exports.NETWORKS).map((n) => [n.caip2, n]));
 /**
  * Resolve a network shorthand or CAIP-2 identifier to a core API URL.
  * Returns `undefined` if the identifier is not a known hosted network.
- *
- * @example
- * ```ts
- * resolveNetworkRpcUrl("base");           // "https://base.api.4mica.xyz/"
- * resolveNetworkRpcUrl("eip155:8453");    // "https://base.api.4mica.xyz/"
- * resolveNetworkRpcUrl("eip155:1");       // undefined
- * ```
  */
 function resolveNetworkRpcUrl(network) {
     return exports.NETWORKS[network]?.rpcUrl ?? NETWORKS_BY_CAIP2[network]?.rpcUrl;
 }
+/**
+ * Resolve a CAIP-2 identifier to a reliable public Ethereum RPC URL.
+ * Returns `undefined` for unknown networks.
+ */
+function resolvePublicRpcUrl(caip2) {
+    return NETWORKS_BY_CAIP2[caip2]?.publicRpcUrl;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4mica/sdk",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "TypeScript SDK for interacting with the 4Mica payment network",
   "license": "MIT",
   "repository": {