@meshconnect/uwc-injected-connector 0.26.1 → 0.26.2-snapshot.bd11e28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -132,14 +132,22 @@ export declare class BitcoinWalletService {
132
132
  getAccount(): string | null;
133
133
  /**
134
134
  * The LIVE active address, read at call time from the connected wallet's
135
- * own `accounts` list — never a cache. Unlike Solana's adapter.publicKey
136
- * pull (which awaits a per-call Comlink read), Bitcoin has nothing to
137
- * await: the Wallet Standard wallet keeps `accounts` current in place, the
138
- * same property `checkExistingConnection` already reads without prompting.
135
+ * own `accounts` list — never a cache. A direct Wallet Standard wallet keeps
136
+ * `accounts` current in place, the same property `checkExistingConnection`
137
+ * already reads without prompting; framed, the bridged copy is re-read from
138
+ * the parent first (see `syncBridgedAccounts`).
139
139
  * Returns null when there's no connected wallet or it exposes no accounts;
140
140
  * the caller decides whether to throw.
141
141
  */
142
142
  getLiveAccount(): Promise<string | null>;
143
+ /**
144
+ * Framed, re-read a wallet's accounts from the bridge parent before using
145
+ * them. `BridgeChild` copies `accounts` once, at startup, and a grant usually
146
+ * lands later: an EVM or Solana connect to MetaMask grants its Bitcoin
147
+ * account too, which the copy would otherwise never show. No-op outside the
148
+ * bridge and with a bridge child that predates the refresh hook.
149
+ */
150
+ private syncBridgedAccounts;
143
151
  /**
144
152
  * Refresh `this.account` to the wallet's live active account. Wallet Standard
145
153
  * keeps `connectedWallet.accounts` current in place; OKX exposes it via a
@@ -1 +1 @@
1
- {"version":3,"file":"bitcoin-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/bitcoin/bitcoin-wallet-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bitcoin-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/bitcoin/bitcoin-wallet-service.ts"],"names":[],"mappings":"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"}
@@ -148,6 +148,7 @@ export class BitcoinWalletService {
148
148
  * different account. With no pins, behaviour is unchanged (`accounts[0]`).
149
149
  */
150
150
  async checkExistingConnection(detectedWallet, requiredAddresses) {
151
+ await this.syncBridgedAccounts(detectedWallet.uuid);
151
152
  const wallet = detectedWallet.wallet;
152
153
  const accounts = wallet.accounts ?? [];
153
154
  const pinned = normalizeRequiredAddresses(requiredAddresses);
@@ -177,11 +178,11 @@ export class BitcoinWalletService {
177
178
  // live (MetaMask sets its account before the connect resolves), so
178
179
  // reading it afterwards always reports "granted" and the guard below
179
180
  // would never gate anything.
180
- // - FRAMED, `wallet.accounts` is a one-time snapshot marshaled by
181
- // `BridgeChild` — proxied `bitcoin:connect` calls never update it. A
182
- // bridge that started with no grant therefore reports empty forever, even
183
- // after this session authorized an account. `this.account` is the
184
- // connector's own live record and covers exactly that gap.
181
+ // - FRAMED, `wallet.accounts` is `BridgeChild`'s copy, refreshed only by
182
+ // `syncBridgedAccounts` (never by a proxied `bitcoin:connect`), and
183
+ // never with an older bridge. It can therefore read empty even after
184
+ // this session authorized an account. `this.account` is the connector's
185
+ // own live record and covers exactly that gap.
185
186
  //
186
187
  // Either signal means the origin was already granted, so a pin that the
187
188
  // wallet won't satisfy needs a revoke rather than a silent stale account.
@@ -337,10 +338,10 @@ export class BitcoinWalletService {
337
338
  }
338
339
  /**
339
340
  * The LIVE active address, read at call time from the connected wallet's
340
- * own `accounts` list — never a cache. Unlike Solana's adapter.publicKey
341
- * pull (which awaits a per-call Comlink read), Bitcoin has nothing to
342
- * await: the Wallet Standard wallet keeps `accounts` current in place, the
343
- * same property `checkExistingConnection` already reads without prompting.
341
+ * own `accounts` list — never a cache. A direct Wallet Standard wallet keeps
342
+ * `accounts` current in place, the same property `checkExistingConnection`
343
+ * already reads without prompting; framed, the bridged copy is re-read from
344
+ * the parent first (see `syncBridgedAccounts`).
344
345
  * Returns null when there's no connected wallet or it exposes no accounts;
345
346
  * the caller decides whether to throw.
346
347
  */
@@ -355,8 +356,29 @@ export class BitcoinWalletService {
355
356
  return this.account?.address ?? null;
356
357
  }
357
358
  }
359
+ await this.syncBridgedAccounts(this.connectedWalletUuid);
358
360
  return this.connectedWallet?.accounts?.[0]?.address ?? null;
359
361
  }
362
+ /**
363
+ * Framed, re-read a wallet's accounts from the bridge parent before using
364
+ * them. `BridgeChild` copies `accounts` once, at startup, and a grant usually
365
+ * lands later: an EVM or Solana connect to MetaMask grants its Bitcoin
366
+ * account too, which the copy would otherwise never show. No-op outside the
367
+ * bridge and with a bridge child that predates the refresh hook.
368
+ */
369
+ async syncBridgedAccounts(walletId) {
370
+ if (!walletId || typeof window === 'undefined')
371
+ return;
372
+ const refresh = window.__uwcRefreshBip122Accounts;
373
+ if (!refresh)
374
+ return;
375
+ try {
376
+ await refresh(walletId);
377
+ }
378
+ catch {
379
+ // Keep the accounts we already have.
380
+ }
381
+ }
360
382
  /**
361
383
  * Refresh `this.account` to the wallet's live active account. Wallet Standard
362
384
  * keeps `connectedWallet.accounts` current in place; OKX exposes it via a
@@ -378,6 +400,7 @@ export class BitcoinWalletService {
378
400
  }
379
401
  return;
380
402
  }
403
+ await this.syncBridgedAccounts(this.connectedWalletUuid);
381
404
  const live = this.connectedWallet?.accounts?.[0];
382
405
  if (live) {
383
406
  this.account = {
@@ -1 +1 @@
1
- {"version":3,"file":"bitcoin-wallet-service.js","sourceRoot":"","sources":["../../../src/services/bitcoin/bitcoin-wallet-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bitcoin-wallet-service.js","sourceRoot":"","sources":["../../../src/services/bitcoin/bitcoin-wallet-service.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAKV,0BAA0B,EAE3B,MAAM,wBAAwB,CAAA;AAI/B;;GAEG;AACH,qBAAa,0BAA0B;IACrC,OAAO,CAAC,OAAO,CAA4B;IAE3C,cAEC;IAED;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,0BAA0B,EACnC,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,CAAC,CAiCjB;IAED;;OAEG;YACW,qBAAqB;IAiCnC;;OAEG;YACW,gBAAgB;IAkC9B;;OAEG;YACW,gBAAgB;IAkC9B;;OAEG;YACW,SAAS;CA2HxB"}
1
+ {"version":3,"file":"ethereum-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAKV,0BAA0B,EAE3B,MAAM,wBAAwB,CAAA;AAK/B;;GAEG;AACH,qBAAa,0BAA0B;IACrC,OAAO,CAAC,OAAO,CAA4B;IAE3C,cAEC;IAED;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,0BAA0B,EACnC,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,CAAC,CAiCjB;IAED;;OAEG;YACW,qBAAqB;IAiCnC;;OAEG;YACW,gBAAgB;IAkC9B;;OAEG;YACW,gBAAgB;IAkC9B;;OAEG;YACW,SAAS;CA+HxB"}
@@ -1,4 +1,5 @@
1
1
  import { createWalletClient, custom } from 'viem';
2
+ import { BatchConfirmedWithoutReceiptError } from '@meshconnect/uwc-types';
2
3
  import { parseError } from '../../utils/error-utils';
3
4
  import { EthereumTransactionBuilder } from './ethereum-transaction-builder';
4
5
  /**
@@ -218,10 +219,11 @@ export class EthereumTransactionService {
218
219
  if (result.status !== 200) {
219
220
  throw new Error('Batch transaction failed');
220
221
  }
221
- // Return first transaction hash
222
- const firstReceipt = result.receipts.find(r => r);
222
+ // Return first transaction hash. Receipts are optional in EIP-5792: a
223
+ // confirmed batch without one is reported as confirmed-without-receipt.
224
+ const firstReceipt = result.receipts?.find(r => r);
223
225
  if (!firstReceipt) {
224
- throw new Error('No transaction receipt found');
226
+ throw new BatchConfirmedWithoutReceiptError(response.id, request.chainId);
225
227
  }
226
228
  return firstReceipt.transactionHash;
227
229
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum-transaction-service.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAUjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAA;AAE3E;;GAEG;AACH,MAAM,OAAO,0BAA0B;IAC7B,OAAO,CAA4B;IAE3C;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,0BAA0B,EAAE,CAAA;IACjD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CACnB,OAAmC,EACnC,QAA0B;QAE1B,IAAI,CAAC;YACH,6CAA6C;YAC7C,IAAI,iBAAiB,IAAI,OAAO,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;gBACrD,gBAAgB;gBAChB,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAChC,QAAQ,EACR,OAAiC,CAClC,CAAA;YACH,CAAC;iBAAM,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;gBAC9B,oBAAoB;gBACpB,OAAO,MAAM,IAAI,CAAC,SAAS,CACzB,QAAQ,EACR,OAAqC,CACtC,CAAA;YACH,CAAC;iBAAM,IAAI,MAAM,IAAI,OAAO,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;gBACrD,uCAAuC;gBACvC,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAChC,QAAQ,EACR,OAAiC,CAClC,CAAA;YACH,CAAC;iBAAM,IAAI,QAAQ,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACrE,kBAAkB;gBAClB,OAAO,MAAM,IAAI,CAAC,qBAAqB,CACrC,QAAQ,EACR,OAAmC,CACpC,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;YACrD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,qBAAqB,CACjC,QAA0B,EAC1B,OAAiC;QAEjC,IAAI,CAAC;YACH,oBAAoB;YACpB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;YAE3D,4BAA4B;YAC5B,MAAM,MAAM,GAAG,kBAAkB,CAAC;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAqB;gBACtC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC;aAC5B,CAAC,CAAA;YAEF,6CAA6C;YAC7C,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;gBACxC,OAAO,EAAE,OAAO,CAAC,IAAqB;gBACtC,KAAK,EAAE,IAAI;gBACX,EAAE,EAAE,EAAE,CAAC,EAAmB;gBAC1B,KAAK,EAAE,EAAE,CAAC,KAAK;gBACf,GAAG,CAAC,EAAE,CAAC,QAAQ,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;gBACxC,GAAG,CAAC,EAAE,CAAC,YAAY,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC;gBACzD,GAAG,CAAC,EAAE,CAAC,oBAAoB,IAAI;oBAC7B,oBAAoB,EAAE,EAAE,CAAC,oBAAoB;iBAC9C,CAAC;aACH,CAAC,CAAA;YAEF,OAAO,IAAI,CAAA;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,gBAAgB,CAC5B,QAA0B,EAC1B,OAA+B;QAE/B,IAAI,CAAC;YACH,oBAAoB;YACpB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAA;YAE7D,4BAA4B;YAC5B,MAAM,MAAM,GAAG,kBAAkB,CAAC;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAqB;gBACtC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC;aAC5B,CAAC,CAAA;YAEF,mBAAmB;YACnB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;gBACxC,OAAO,EAAE,OAAO,CAAC,IAAqB;gBACtC,KAAK,EAAE,IAAI;gBACX,EAAE,EAAE,EAAE,CAAC,EAAmB;gBAC1B,IAAI,EAAE,EAAE,CAAC,IAAqB;gBAC9B,KAAK,EAAE,EAAE,CAAC,KAAK;gBACf,GAAG,CAAC,EAAE,CAAC,QAAQ,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;gBACxC,GAAG,CAAC,EAAE,CAAC,YAAY,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC;gBACzD,GAAG,CAAC,EAAE,CAAC,oBAAoB,IAAI;oBAC7B,oBAAoB,EAAE,EAAE,CAAC,oBAAoB;iBAC9C,CAAC;aACH,CAAC,CAAA;YAEF,OAAO,IAAI,CAAA;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,gBAAgB,CAC5B,QAA0B,EAC1B,OAA+B;QAE/B,IAAI,CAAC;YACH,oBAAoB;YACpB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;YAEzD,4BAA4B;YAC5B,MAAM,MAAM,GAAG,kBAAkB,CAAC;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAqB;gBACtC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC;aAC5B,CAAC,CAAA;YAEF,mBAAmB;YACnB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;gBACxC,OAAO,EAAE,OAAO,CAAC,IAAqB;gBACtC,KAAK,EAAE,IAAI;gBACX,EAAE,EAAE,EAAE,CAAC,EAAmB;gBAC1B,IAAI,EAAE,EAAE,CAAC,IAAqB;gBAC9B,KAAK,EAAE,EAAE,CAAC,KAAK;gBACf,GAAG,CAAC,EAAE,CAAC,QAAQ,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;gBACxC,GAAG,CAAC,EAAE,CAAC,YAAY,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC;gBACzD,GAAG,CAAC,EAAE,CAAC,oBAAoB,IAAI;oBAC7B,oBAAoB,EAAE,EAAE,CAAC,oBAAoB;iBAC9C,CAAC;aACH,CAAC,CAAA;YAEF,OAAO,IAAI,CAAA;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,SAAS,CACrB,QAA0B,EAC1B,OAAmC;QAEnC,IAAI,CAAC;YACH,gBAAgB;YAChB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBAC3B,IAAI,iBAAiB,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;oBAC3C,gBAAgB;oBAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CACtD,EAA4B,CAC7B,CAAA;oBACD,OAAO;wBACL,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE;wBACnB,KAAK,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAC/C,IAAI,EAAE,MAAM,CAAC,IAAI;qBAClB,CAAA;gBACH,CAAC;qBAAM,IAAI,QAAQ,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;oBAC3D,kBAAkB;oBAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CACpD,EAA8B,CAC/B,CAAA;oBACD,OAAO;wBACL,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE;wBACnB,KAAK,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;qBAChD,CAAA;gBACH,CAAC;qBAAM,IAAI,MAAM,IAAI,EAAE,IAAI,SAAS,IAAI,EAAE,EAAE,CAAC;oBAC3C,gBAAgB;oBAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAClD,EAA4B,CAC7B,CAAA;oBACD,OAAO;wBACL,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE;wBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,KAAK,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;qBAChD,CAAA;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;gBACrD,CAAC;YACH,CAAC,CAAC,CACH,CAAA;YAED,4BAA4B;YAC5B,MAAM,MAAM,GAAG,kBAAkB,CAAC;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAqB;gBACtC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC;aAC5B,CAAC,CAAA;YAEF,wCAAwC;YACxC,MAAM,QAAQ,GAAmB,MAC/B,MAAM,CAAC,OAIR,CAAC;gBACA,MAAM,EAAE,kBAAkB;gBAC1B,MAAM,EAAE;oBACN;wBACE,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,IAAI,EAAE,OAAO,CAAC,IAAI;wBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,cAAc,EAAE,OAAO,CAAC,cAAc;wBACtC,KAAK,EAAE,KAAK;qBACb;iBACF;aACF,CAAC,CAAA;YAEF,2DAA2D;YAC3D,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAC3B,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;YACjD,IAAI,MAA0C,CAAA;YAE9C,OAAO,IAAI,EAAE,CAAC;gBACZ,IAAI,CAAC;oBACH,MAAM,GAAG,MACP,MAAM,CAAC,OAIR,CAAC;wBACA,MAAM,EAAE,uBAAuB;wBAC/B,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;qBACtB,CAAC,CAAA;oBAEF,iCAAiC;oBACjC,IAAI,MAAM,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;wBAC3B,MAAM,KAAK,CAAC,IAAI,CAAC,CAAA;wBACjB,SAAQ;oBACV,CAAC;oBAED,qDAAqD;oBACrD,MAAK;oBACL,8DAA8D;gBAChE,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBAChB,MAAM,YAAY,GAAG,CAAC,EAAE,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAA;oBAE5C,2DAA2D;oBAC3D,IAAI,YAAY,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;wBACtD,MAAM,KAAK,CAAC,IAAI,CAAC,CAAA;wBACjB,SAAQ;oBACV,CAAC;oBAED,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAA;gBAC/B,CAAC;YACH,CAAC;YAED,sBAAsB;YACtB,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;YAC7C,CAAC;YAED,gCAAgC;YAChC,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YACjD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACjD,CAAC;YAED,OAAO,YAAY,CAAC,eAAe,CAAA;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"ethereum-transaction-service.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@meshconnect/uwc-injected-connector",
3
- "version": "0.26.1",
3
+ "version": "0.26.2-snapshot.bd11e28",
4
4
  "description": "Injected connector for Universal Wallet Connector",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -27,12 +27,12 @@
27
27
  "buffer": "^6.0.3",
28
28
  "uuid": "^14.0.2",
29
29
  "viem": "^2.56.5",
30
- "@meshconnect/uwc-bridge-child": "0.6.0",
31
- "@meshconnect/uwc-constants": "0.8.0",
32
- "@meshconnect/uwc-ton-connector": "0.9.8",
33
- "@meshconnect/uwc-bitcoin": "0.5.2",
34
- "@meshconnect/uwc-tron-connector": "0.7.12",
35
- "@meshconnect/uwc-types": "0.30.0"
30
+ "@meshconnect/uwc-constants": "0.8.1-snapshot.bd11e28",
31
+ "@meshconnect/uwc-bridge-child": "0.6.0-snapshot.bd11e28",
32
+ "@meshconnect/uwc-ton-connector": "0.9.9-snapshot.bd11e28",
33
+ "@meshconnect/uwc-bitcoin": "0.5.3-snapshot.bd11e28",
34
+ "@meshconnect/uwc-tron-connector": "0.7.13-snapshot.bd11e28",
35
+ "@meshconnect/uwc-types": "0.30.1-snapshot.bd11e28"
36
36
  },
37
37
  "devDependencies": {
38
38
  "typescript": "^7.0.2"
@@ -918,6 +918,105 @@ describe('BitcoinWalletService', () => {
918
918
  })
919
919
  })
920
920
 
921
+ // Framed, `BridgeChild` copies a wallet's accounts once, at startup. A grant
922
+ // that lands later (an EVM or Solana connect to MetaMask grants its Bitcoin
923
+ // account too) only shows up after the copy is re-read from the parent.
924
+ describe('framed: re-reads the bridged accounts before using them', () => {
925
+ type Account = { address: string; publicKey: Uint8Array }
926
+ type BridgedWindow = Window & {
927
+ __uwcRefreshBip122Accounts?: (walletId: string) => Promise<void>
928
+ }
929
+ const bridgedWindow = window as BridgedWindow
930
+ const GRANTED: Account = {
931
+ address: 'bc1qgranted',
932
+ publicKey: new Uint8Array([4])
933
+ }
934
+
935
+ afterEach(() => {
936
+ delete bridgedWindow.__uwcRefreshBip122Accounts
937
+ })
938
+
939
+ // Stands in for BridgeChild: rewrites the marshaled wallet in place.
940
+ function installRefresh(wallet: { accounts: Account[] }, next: Account[]) {
941
+ const refresh = vi.fn(async () => {
942
+ wallet.accounts = next
943
+ })
944
+ bridgedWindow.__uwcRefreshBip122Accounts = refresh
945
+ return refresh
946
+ }
947
+
948
+ it('checkExistingConnection sees a grant made after the bridge started', async () => {
949
+ const wallet = {
950
+ name: 'MetaMask',
951
+ accounts: [] as Account[],
952
+ features: {}
953
+ }
954
+ const refresh = installRefresh(wallet, [GRANTED])
955
+
956
+ const address = await service.checkExistingConnection({
957
+ uuid: 'metamask-uuid',
958
+ name: 'MetaMask',
959
+ features: [],
960
+ wallet
961
+ })
962
+
963
+ expect(refresh).toHaveBeenCalledWith('metamask-uuid')
964
+ expect(address).toBe('bc1qgranted')
965
+ })
966
+
967
+ it('getLiveAccount and signMessage follow an account switch made in the parent', async () => {
968
+ const original: Account = {
969
+ address: 'bc1qoriginal',
970
+ publicKey: new Uint8Array([1])
971
+ }
972
+ const signMessage = vi
973
+ .fn()
974
+ .mockResolvedValue([
975
+ { signature: new Uint8Array([9]), signedMessage: new Uint8Array() }
976
+ ])
977
+ const wallet = {
978
+ name: 'MetaMask',
979
+ accounts: [original],
980
+ chains: ['bitcoin:mainnet'],
981
+ features: {
982
+ 'bitcoin:connect': {
983
+ connect: vi.fn().mockResolvedValue({ accounts: [original] })
984
+ },
985
+ 'bitcoin:signMessage': { signMessage }
986
+ }
987
+ }
988
+ discoverWallet(wallet)
989
+ await service.initializeDiscovery()
990
+ await service.connect(NETWORK, makeProvider('metamask-uuid'))
991
+ const refresh = installRefresh(wallet, [GRANTED])
992
+
993
+ expect(await service.getLiveAccount()).toBe('bc1qgranted')
994
+ expect(refresh).toHaveBeenCalledWith('metamask-uuid')
995
+
996
+ await service.signMessage('hi')
997
+ expect(signMessage).toHaveBeenCalledWith(
998
+ expect.objectContaining({
999
+ account: expect.objectContaining({ address: 'bc1qgranted' })
1000
+ })
1001
+ )
1002
+ })
1003
+
1004
+ it('falls back to the accounts it has when the re-read fails', async () => {
1005
+ bridgedWindow.__uwcRefreshBip122Accounts = vi
1006
+ .fn()
1007
+ .mockRejectedValue(new Error('bridge gone'))
1008
+
1009
+ const address = await service.checkExistingConnection({
1010
+ uuid: 'metamask-uuid',
1011
+ name: 'MetaMask',
1012
+ features: [],
1013
+ wallet: { name: 'MetaMask', accounts: [GRANTED], features: {} }
1014
+ })
1015
+
1016
+ expect(address).toBe('bc1qgranted')
1017
+ })
1018
+ })
1019
+
921
1020
  describe('getLiveAccount / onAccountsChanged — live account tracking', () => {
922
1021
  afterEach(() => {
923
1022
  delete (window as any).UWCBridgeChildInitialized
@@ -245,6 +245,7 @@ export class BitcoinWalletService {
245
245
  detectedWallet: DetectedBitcoinWallet,
246
246
  requiredAddresses?: readonly string[]
247
247
  ): Promise<string | null> {
248
+ await this.syncBridgedAccounts(detectedWallet.uuid)
248
249
  const wallet =
249
250
  detectedWallet.wallet as unknown as WalletStandardBitcoinWallet
250
251
  const accounts = wallet.accounts ?? []
@@ -281,11 +282,11 @@ export class BitcoinWalletService {
281
282
  // live (MetaMask sets its account before the connect resolves), so
282
283
  // reading it afterwards always reports "granted" and the guard below
283
284
  // would never gate anything.
284
- // - FRAMED, `wallet.accounts` is a one-time snapshot marshaled by
285
- // `BridgeChild` — proxied `bitcoin:connect` calls never update it. A
286
- // bridge that started with no grant therefore reports empty forever, even
287
- // after this session authorized an account. `this.account` is the
288
- // connector's own live record and covers exactly that gap.
285
+ // - FRAMED, `wallet.accounts` is `BridgeChild`'s copy, refreshed only by
286
+ // `syncBridgedAccounts` (never by a proxied `bitcoin:connect`), and
287
+ // never with an older bridge. It can therefore read empty even after
288
+ // this session authorized an account. `this.account` is the connector's
289
+ // own live record and covers exactly that gap.
289
290
  //
290
291
  // Either signal means the origin was already granted, so a pin that the
291
292
  // wallet won't satisfy needs a revoke rather than a silent stale account.
@@ -457,10 +458,10 @@ export class BitcoinWalletService {
457
458
 
458
459
  /**
459
460
  * The LIVE active address, read at call time from the connected wallet's
460
- * own `accounts` list — never a cache. Unlike Solana's adapter.publicKey
461
- * pull (which awaits a per-call Comlink read), Bitcoin has nothing to
462
- * await: the Wallet Standard wallet keeps `accounts` current in place, the
463
- * same property `checkExistingConnection` already reads without prompting.
461
+ * own `accounts` list — never a cache. A direct Wallet Standard wallet keeps
462
+ * `accounts` current in place, the same property `checkExistingConnection`
463
+ * already reads without prompting; framed, the bridged copy is re-read from
464
+ * the parent first (see `syncBridgedAccounts`).
464
465
  * Returns null when there's no connected wallet or it exposes no accounts;
465
466
  * the caller decides whether to throw.
466
467
  */
@@ -474,9 +475,32 @@ export class BitcoinWalletService {
474
475
  return this.account?.address ?? null
475
476
  }
476
477
  }
478
+ await this.syncBridgedAccounts(this.connectedWalletUuid)
477
479
  return this.connectedWallet?.accounts?.[0]?.address ?? null
478
480
  }
479
481
 
482
+ /**
483
+ * Framed, re-read a wallet's accounts from the bridge parent before using
484
+ * them. `BridgeChild` copies `accounts` once, at startup, and a grant usually
485
+ * lands later: an EVM or Solana connect to MetaMask grants its Bitcoin
486
+ * account too, which the copy would otherwise never show. No-op outside the
487
+ * bridge and with a bridge child that predates the refresh hook.
488
+ */
489
+ private async syncBridgedAccounts(walletId: string | null): Promise<void> {
490
+ if (!walletId || typeof window === 'undefined') return
491
+ const refresh = (
492
+ window as Window & {
493
+ __uwcRefreshBip122Accounts?: (walletId: string) => Promise<void>
494
+ }
495
+ ).__uwcRefreshBip122Accounts
496
+ if (!refresh) return
497
+ try {
498
+ await refresh(walletId)
499
+ } catch {
500
+ // Keep the accounts we already have.
501
+ }
502
+ }
503
+
480
504
  /**
481
505
  * Refresh `this.account` to the wallet's live active account. Wallet Standard
482
506
  * keeps `connectedWallet.accounts` current in place; OKX exposes it via a
@@ -495,6 +519,7 @@ export class BitcoinWalletService {
495
519
  }
496
520
  return
497
521
  }
522
+ await this.syncBridgedAccounts(this.connectedWalletUuid)
498
523
  const live = this.connectedWallet?.accounts?.[0]
499
524
  if (live) {
500
525
  this.account = {
@@ -1,9 +1,12 @@
1
- import { describe, it, expect, beforeEach, vi } from 'vitest'
1
+ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
2
2
  import { EthereumTransactionService } from './ethereum-transaction-service'
3
- import type {
4
- EVMNativeTransferRequest,
5
- EVMContractCallRequest,
6
- EVMDataTransferRequest
3
+ import {
4
+ BatchConfirmedWithoutReceiptError,
5
+ WalletConnectorError,
6
+ type EVMNativeTransferRequest,
7
+ type EVMContractCallRequest,
8
+ type EVMDataTransferRequest,
9
+ type EVMBatchTransactionRequest
7
10
  } from '@meshconnect/uwc-types'
8
11
  import type { EthereumProvider } from '../../eip6963-discovery'
9
12
 
@@ -271,4 +274,194 @@ describe('EthereumTransactionService', () => {
271
274
  ).rejects.toThrow()
272
275
  })
273
276
  })
277
+
278
+ describe('sendBatch (EIP-5792)', () => {
279
+ const BATCH_ID = '0x8becd65ed2d2425485a9a90d04b63ec0'
280
+ const TX_HASH =
281
+ '0x1986bfb2c0ffee00000000000000000000000000000000000000000000aad1'
282
+
283
+ // Recorded from MetaMask Mobile (iOS in-app browser) paying the network fee
284
+ // in ARB on Arbitrum: confirmed, atomic, and no `receipts` field at all.
285
+ const confirmedWithoutReceipts = {
286
+ version: '2.0.0',
287
+ id: BATCH_ID,
288
+ chainId: '0xa4b1',
289
+ atomic: true,
290
+ status: 200
291
+ }
292
+ const confirmedWithReceipts = {
293
+ ...confirmedWithoutReceipts,
294
+ receipts: [{ transactionHash: TX_HASH }]
295
+ }
296
+
297
+ const batchRequest: EVMBatchTransactionRequest = {
298
+ version: '2.0.0',
299
+ from: '0x1234567890123456789012345678901234567890',
300
+ chainId: '0xa4b1',
301
+ atomicRequired: true,
302
+ calls: [
303
+ {
304
+ from: '0x1234567890123456789012345678901234567890',
305
+ to: '0x0987654321098765432109876543210987654321',
306
+ data: '0x095ea7b3',
307
+ chainId: '42161'
308
+ },
309
+ {
310
+ from: '0x1234567890123456789012345678901234567890',
311
+ to: '0x0987654321098765432109876543210987654321',
312
+ data: '0xa9059cbb',
313
+ chainId: '42161'
314
+ }
315
+ ]
316
+ }
317
+
318
+ /**
319
+ * Provider that accepts `wallet_sendCalls` and answers each
320
+ * `wallet_getCallsStatus` with the next scripted reply (the last one
321
+ * repeats). A reply that is an Error is thrown instead.
322
+ */
323
+ const batchProvider = (statusReplies: unknown[]) => {
324
+ let call = 0
325
+ const request = vi.fn(async ({ method }: { method: string }) => {
326
+ if (method === 'wallet_sendCalls') return { id: BATCH_ID }
327
+ if (method === 'wallet_getCallsStatus') {
328
+ const reply =
329
+ statusReplies[Math.min(call++, statusReplies.length - 1)]
330
+ if (reply instanceof Error) throw reply
331
+ return reply
332
+ }
333
+ throw new Error(`unexpected method ${method}`)
334
+ })
335
+ return { request } as unknown as EthereumProvider & {
336
+ request: typeof request
337
+ }
338
+ }
339
+
340
+ const statusCalls = (provider: { request: ReturnType<typeof vi.fn> }) =>
341
+ provider.request.mock.calls.filter(
342
+ ([args]) =>
343
+ (args as { method: string }).method === 'wallet_getCallsStatus'
344
+ ).length
345
+
346
+ /** Run a send to completion under fake timers; resolves to its outcome. */
347
+ const settle = async (provider: EthereumProvider) => {
348
+ const outcome = service.sendTransaction(batchRequest, provider).then(
349
+ hash => ({ hash }),
350
+ (error: unknown) => ({ error })
351
+ )
352
+ await vi.runAllTimersAsync()
353
+ return outcome
354
+ }
355
+
356
+ beforeEach(() => {
357
+ vi.useFakeTimers()
358
+ })
359
+
360
+ afterEach(() => {
361
+ vi.useRealTimers()
362
+ })
363
+
364
+ it('returns the first receipt hash when the confirmation carries receipts', async () => {
365
+ const provider = batchProvider([confirmedWithReceipts])
366
+
367
+ expect(await settle(provider)).toEqual({ hash: TX_HASH })
368
+ expect(statusCalls(provider)).toBe(1)
369
+ const sendCalls = provider.request.mock.calls.find(
370
+ ([args]) => (args as { method: string }).method === 'wallet_sendCalls'
371
+ )
372
+ expect(sendCalls?.[0]).toMatchObject({
373
+ params: [{ version: '2.0.0', chainId: '0xa4b1', atomicRequired: true }]
374
+ })
375
+ })
376
+
377
+ it('throws BatchConfirmedWithoutReceiptError when a confirmed batch has no receipts', async () => {
378
+ const provider = batchProvider([confirmedWithoutReceipts])
379
+
380
+ const outcome = await settle(provider)
381
+
382
+ expect(outcome).not.toHaveProperty('hash')
383
+ const { error } = outcome as { error: unknown }
384
+ expect(error).toBeInstanceOf(BatchConfirmedWithoutReceiptError)
385
+ // Subclass of the connector error, so `parseError` passes it through.
386
+ expect(error).toBeInstanceOf(WalletConnectorError)
387
+ expect(error).toMatchObject({
388
+ name: 'BatchConfirmedWithoutReceiptError',
389
+ batchId: BATCH_ID,
390
+ chainId: '0xa4b1'
391
+ })
392
+ // Reported on the first confirmed read: the status is not re-read.
393
+ expect(statusCalls(provider)).toBe(1)
394
+ })
395
+
396
+ it('reports it without waiting on any timer', async () => {
397
+ const provider = batchProvider([confirmedWithoutReceipts])
398
+
399
+ const outcome = await service
400
+ .sendTransaction(batchRequest, provider)
401
+ .then(
402
+ () => 'resolved',
403
+ (error: unknown) => error
404
+ )
405
+
406
+ expect(outcome).toBeInstanceOf(BatchConfirmedWithoutReceiptError)
407
+ })
408
+
409
+ it('treats an empty receipts array like a missing one', async () => {
410
+ const provider = batchProvider([
411
+ { ...confirmedWithoutReceipts, receipts: [] }
412
+ ])
413
+
414
+ const { error } = (await settle(provider)) as { error: unknown }
415
+
416
+ expect(error).toBeInstanceOf(BatchConfirmedWithoutReceiptError)
417
+ expect(error).toMatchObject({ batchId: BATCH_ID, chainId: '0xa4b1' })
418
+ })
419
+
420
+ it.each([400, 500])(
421
+ 'throws "Batch transaction failed" for status %i without re-reading',
422
+ async status => {
423
+ const provider = batchProvider([
424
+ { ...confirmedWithoutReceipts, status }
425
+ ])
426
+
427
+ const { error } = (await settle(provider)) as { error: unknown }
428
+
429
+ expect(error).toBeInstanceOf(WalletConnectorError)
430
+ expect(error).not.toBeInstanceOf(BatchConfirmedWithoutReceiptError)
431
+ expect((error as Error).message).toBe('Batch transaction failed')
432
+ expect(statusCalls(provider)).toBe(1)
433
+ }
434
+ )
435
+
436
+ it('keeps polling while the batch is pending (status 100)', async () => {
437
+ const provider = batchProvider([
438
+ { ...confirmedWithoutReceipts, status: 100 },
439
+ confirmedWithReceipts
440
+ ])
441
+
442
+ expect(await settle(provider)).toEqual({ hash: TX_HASH })
443
+ expect(statusCalls(provider)).toBe(2)
444
+ })
445
+
446
+ it('retries "No matching bundle found" until the batch is known', async () => {
447
+ const provider = batchProvider([
448
+ new Error('No matching bundle found'),
449
+ new Error('No matching bundle found'),
450
+ confirmedWithReceipts
451
+ ])
452
+
453
+ expect(await settle(provider)).toEqual({ hash: TX_HASH })
454
+ expect(statusCalls(provider)).toBe(3)
455
+ })
456
+
457
+ it('fails immediately on any other status-read error', async () => {
458
+ const provider = batchProvider([new Error('Unsupported method')])
459
+
460
+ const { error } = (await settle(provider)) as { error: unknown }
461
+
462
+ expect(error).toBeInstanceOf(WalletConnectorError)
463
+ expect(error).not.toBeInstanceOf(BatchConfirmedWithoutReceiptError)
464
+ expect((error as Error).message).toContain('Unsupported method')
465
+ })
466
+ })
274
467
  })
@@ -8,6 +8,7 @@ import type {
8
8
  EthereumTransactionRequest,
9
9
  EVMDataTransferRequest
10
10
  } from '@meshconnect/uwc-types'
11
+ import { BatchConfirmedWithoutReceiptError } from '@meshconnect/uwc-types'
11
12
  import { parseError } from '../../utils/error-utils'
12
13
  import { EthereumTransactionBuilder } from './ethereum-transaction-builder'
13
14
 
@@ -287,10 +288,14 @@ export class EthereumTransactionService {
287
288
  throw new Error('Batch transaction failed')
288
289
  }
289
290
 
290
- // Return first transaction hash
291
- const firstReceipt = result.receipts.find(r => r)
291
+ // Return first transaction hash. Receipts are optional in EIP-5792: a
292
+ // confirmed batch without one is reported as confirmed-without-receipt.
293
+ const firstReceipt = result.receipts?.find(r => r)
292
294
  if (!firstReceipt) {
293
- throw new Error('No transaction receipt found')
295
+ throw new BatchConfirmedWithoutReceiptError(
296
+ response.id,
297
+ request.chainId
298
+ )
294
299
  }
295
300
 
296
301
  return firstReceipt.transactionHash