@nibgate/sdk 0.2.14 → 0.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nibgate/sdk",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Framework-agnostic browser and server package for creator-owned gated content, unlock events, and receipts.",
   "type": "module",
   "sideEffects": [

package/src/browser/evm-gateway.js

@@ -113,12 +113,16 @@ export function createEvmGatewayUnlock(resource, options = {}) {
   async function checkout(input) {
     const evm = provider();
     if (!evm) throw new Error(options.noWalletMessage || 'Install or open an EVM wallet to continue.');
-    if (!walletAddress) await connect();
+    // Always fetch the current wallet from MetaMask — the cached walletAddress
+    // might be stale if the user switched accounts after connecting.
+    const currentAccounts = await evm.request({ method: 'eth_accounts' }).catch(() => walletAddress ? [walletAddress] : []);
+    const currentAddress = Array.isArray(currentAccounts) && currentAccounts[0] ? currentAccounts[0] : (walletAddress || await connect());
+    if (currentAddress !== walletAddress) walletAddress = currentAddress;
     const gatewayWallet = await createCircleGatewayBrowserAdapter({
       network,
       signer: {
-        address: walletAddress,
-        signTypedData: (typedData) => evm.request({ method: 'eth_signTypedData_v4', params: [walletAddress, stringifyJson(typedData)] })
+        address: currentAddress,
+        signTypedData: (typedData) => evm.request({ method: 'eth_signTypedData_v4', params: [currentAddress, stringifyJson(typedData)] })
       },
       clientModule: options.circleClientModule
     });

package/src/browser/gateway.js

@@ -1,3 +1,4 @@
+import { BatchEvmScheme as CircleBatchEvmScheme } from '@circle-fin/x402-batching/client';
 import { stringifyJson } from './json.js';
 
 function encodeBase64(value) {
@@ -17,19 +18,7 @@ export async function createCircleGatewayBrowserAdapter(options = {}) {
     throw new Error('Circle Gateway browser adapter requires an EVM signer with address and signTypedData.');
   }
 
-  let BatchEvmScheme;
-  try {
-    const circle = await import('@circle-fin/x402-batching/client');
-    BatchEvmScheme = circle.BatchEvmScheme;
-  } catch (err) {
-    console.warn('[nibgate] Failed to import @circle-fin/x402-batching/client:', err.message);
-    console.warn('[nibgate] Falling back to custom BatchEvmScheme');
-    const local = await import('./schemes/batch-scheme.js');
-    BatchEvmScheme = local.BatchEvmScheme;
-  }
-  const scheme = options.clientModule?.BatchEvmScheme
-    ? new options.clientModule.BatchEvmScheme(signer)
-    : new BatchEvmScheme(signer);
+  const scheme = new CircleBatchEvmScheme(signer);
   const network = options.network || options.chainId && `eip155:${options.chainId}` || 'eip155:5042002';
 
   function parsePaymentRequired(input) {