@meshconnect/uwc-injected-connector 0.20.3 → 0.22.0
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.
- package/dist/eip6963-discovery.d.ts +13 -0
- package/dist/eip6963-discovery.d.ts.map +1 -1
- package/dist/eip6963-discovery.js +12 -3
- package/dist/eip6963-discovery.js.map +1 -1
- package/dist/injected-connector.d.ts +39 -2
- package/dist/injected-connector.d.ts.map +1 -1
- package/dist/injected-connector.js +170 -19
- package/dist/injected-connector.js.map +1 -1
- package/dist/services/connection-manager.d.ts +84 -5
- package/dist/services/connection-manager.d.ts.map +1 -1
- package/dist/services/connection-manager.js +172 -30
- package/dist/services/connection-manager.js.map +1 -1
- package/dist/services/ethereum/ethereum-transaction-builder.d.ts.map +1 -1
- package/dist/services/ethereum/ethereum-transaction-builder.js +3 -2
- package/dist/services/ethereum/ethereum-transaction-builder.js.map +1 -1
- package/dist/services/ethereum/ethereum-wallet-service.d.ts +86 -7
- package/dist/services/ethereum/ethereum-wallet-service.d.ts.map +1 -1
- package/dist/services/ethereum/ethereum-wallet-service.js +201 -28
- package/dist/services/ethereum/ethereum-wallet-service.js.map +1 -1
- package/dist/services/solana/solana-wallet-service.d.ts +57 -0
- package/dist/services/solana/solana-wallet-service.d.ts.map +1 -1
- package/dist/services/solana/solana-wallet-service.js +118 -0
- package/dist/services/solana/solana-wallet-service.js.map +1 -1
- package/dist/services/ton/ton-wallet-service.d.ts +9 -0
- package/dist/services/ton/ton-wallet-service.d.ts.map +1 -1
- package/dist/services/ton/ton-wallet-service.js +15 -0
- package/dist/services/ton/ton-wallet-service.js.map +1 -1
- package/dist/services/tron/tron-wallet-service.d.ts +11 -0
- package/dist/services/tron/tron-wallet-service.d.ts.map +1 -1
- package/dist/services/tron/tron-wallet-service.js +21 -0
- package/dist/services/tron/tron-wallet-service.js.map +1 -1
- package/dist/utils/step-reporter.d.ts +33 -0
- package/dist/utils/step-reporter.d.ts.map +1 -0
- package/dist/utils/step-reporter.js +54 -0
- package/dist/utils/step-reporter.js.map +1 -0
- package/dist/utils/with-deadline.d.ts +30 -0
- package/dist/utils/with-deadline.d.ts.map +1 -0
- package/dist/utils/with-deadline.js +67 -0
- package/dist/utils/with-deadline.js.map +1 -0
- package/package.json +6 -6
- package/src/eip6963-discovery.test.ts +111 -2
- package/src/eip6963-discovery.ts +28 -4
- package/src/injected-connector.test.ts +574 -16
- package/src/injected-connector.ts +210 -23
- package/src/services/connection-manager.test.ts +338 -1
- package/src/services/connection-manager.ts +236 -41
- package/src/services/ethereum/ethereum-transaction-builder.test.ts +97 -0
- package/src/services/ethereum/ethereum-transaction-builder.ts +3 -2
- package/src/services/ethereum/ethereum-wallet-service.test.ts +495 -17
- package/src/services/ethereum/ethereum-wallet-service.ts +248 -32
- package/src/services/solana/solana-wallet-service.lifecycle.test.ts +156 -6
- package/src/services/solana/solana-wallet-service.reconnect.test.ts +175 -0
- package/src/services/solana/solana-wallet-service.ts +132 -0
- package/src/services/ton/ton-wallet-service.test.ts +25 -0
- package/src/services/ton/ton-wallet-service.ts +15 -0
- package/src/services/tron/tron-wallet-service.test.ts +45 -0
- package/src/services/tron/tron-wallet-service.ts +20 -0
- package/src/signSolanaTransactionBytes.test.ts +1 -1
- package/src/utils/step-reporter.test.ts +56 -0
- package/src/utils/step-reporter.ts +83 -0
- package/src/utils/with-deadline.test.ts +80 -0
- package/src/utils/with-deadline.ts +67 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum-transaction-builder.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAA;AAQzC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD;;GAEG;AACH,MAAM,OAAO,0BAA0B;IACrC,KAAK,CAAC,sBAAsB,CAC1B,OAA+B;QAE/B,IAAI,CAAC;YACH,kCAAkC;YAClC,MAAM,IAAI,GAAG,kBAAkB,CAAC;gBAC9B,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE;aACzB,CAAC,CAAA;YACF,MAAM,SAAS,GAAyB;gBACtC,EAAE,EAAE,OAAO,CAAC,eAAe;gBAC3B,IAAI;gBACJ,KAAK,EAAE,OAAO,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"ethereum-transaction-builder.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAA;AAQzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD;;GAEG;AACH,MAAM,OAAO,0BAA0B;IACrC,KAAK,CAAC,sBAAsB,CAC1B,OAA+B;QAE/B,IAAI,CAAC;YACH,kCAAkC;YAClC,MAAM,IAAI,GAAG,kBAAkB,CAAC;gBAC9B,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE;aACzB,CAAC,CAAA;YACF,MAAM,SAAS,GAAyB;gBACtC,EAAE,EAAE,OAAO,CAAC,eAAe;gBAC3B,IAAI;gBACJ,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;aAC3C,CAAA;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAAiC;QAEjC,IAAI,CAAC;YACH,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,KAAK,EAAE,OAAO,CAAC,MAAM;gBACrB,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;aAC3C,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,OAA+B;QAE/B,IAAI,CAAC;YACH,MAAM,SAAS,GAAyB;gBACtC,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;aAC3C,CAAA;YAED,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,eAAe,CACrB,SAAwB;QAExB,MAAM,SAAS,GAAkC,EAAE,CAAA;QACnD,IAAI,SAAS,EAAE,QAAQ,EAAE,CAAC;YACxB,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC7D,CAAC;QACD,IAAI,SAAS,EAAE,YAAY,EAAE,CAAC;YAC5B,SAAS,CAAC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QACrE,CAAC;QACD,IAAI,SAAS,EAAE,oBAAoB,EAAE,CAAC;YACpC,SAAS,CAAC,oBAAoB,GAAG,MAAM,CACrC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAC3C,CAAA;QACH,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { NetworkId, AvailableAddress, EVMCapabilities, Network, WalletMetadata, WalletLifecycleEvent } from '@meshconnect/uwc-types';
|
|
1
|
+
import type { NetworkId, AvailableAddress, EVMCapabilities, Network, WalletMetadata, WalletLifecycleEvent, WalletStepInfo } from '@meshconnect/uwc-types';
|
|
2
2
|
import type { EthereumProvider, DetectedWallet as EIP6963DetectedWallet } from '../../eip6963-discovery';
|
|
3
3
|
/**
|
|
4
4
|
* Service for managing Ethereum wallet connections
|
|
@@ -6,6 +6,18 @@ import type { EthereumProvider, DetectedWallet as EIP6963DetectedWallet } from '
|
|
|
6
6
|
export declare class EthereumWalletService {
|
|
7
7
|
private detectedWallets;
|
|
8
8
|
private connectedProvider;
|
|
9
|
+
private connectedWalletUuid;
|
|
10
|
+
/**
|
|
11
|
+
* Provenance of the CONNECTED wallet's provider, captured once at
|
|
12
|
+
* connect()/setConnectionState() time (when `findWalletByUuid` is
|
|
13
|
+
* guaranteed to still resolve it) rather than re-derived later — see
|
|
14
|
+
* `attachBridgedListeners` for why this can't be a live lookup by uuid.
|
|
15
|
+
* `null` means unknown (e.g. state set without a uuid) and is treated as
|
|
16
|
+
* bridge-sourced, preserving the pre-existing bridge-first behavior.
|
|
17
|
+
*/
|
|
18
|
+
private connectedWalletSource;
|
|
19
|
+
/** Wallet-stable rdns of the connected wallet, captured alongside source above. */
|
|
20
|
+
private connectedWalletRdns;
|
|
9
21
|
private account;
|
|
10
22
|
/**
|
|
11
23
|
* Initialize wallet discovery
|
|
@@ -25,8 +37,15 @@ export declare class EthereumWalletService {
|
|
|
25
37
|
checkExistingConnection(provider: EthereumProvider): Promise<string[] | null>;
|
|
26
38
|
/**
|
|
27
39
|
* Connect to wallet
|
|
40
|
+
*
|
|
41
|
+
* `onStep` (optional) reports the two wallet round-trips separately (ONC-183)
|
|
42
|
+
* — `eth_requestAccounts` is the user-facing approval, `eth_chainId` is a
|
|
43
|
+
* follow-on read against an already-granted permission, and they fail for
|
|
44
|
+
* different reasons (an abandoned prompt vs. a provider that granted accounts
|
|
45
|
+
* then went unresponsive, the bridge-mode case). Rolled together they were
|
|
46
|
+
* one opaque duration.
|
|
28
47
|
*/
|
|
29
|
-
connect(provider: EthereumProvider): Promise<string>;
|
|
48
|
+
connect(provider: EthereumProvider, uuid?: string, onStep?: (info: WalletStepInfo) => void): Promise<string>;
|
|
30
49
|
/**
|
|
31
50
|
* Helper function to get network data by network ID
|
|
32
51
|
*/
|
|
@@ -42,27 +61,87 @@ export declare class EthereumWalletService {
|
|
|
42
61
|
/**
|
|
43
62
|
* Set connection state
|
|
44
63
|
*/
|
|
45
|
-
setConnectionState(provider: EthereumProvider | null, account: string | null): void;
|
|
64
|
+
setConnectionState(provider: EthereumProvider | null, account: string | null, uuid?: string | null): void;
|
|
65
|
+
/**
|
|
66
|
+
* Snapshot the connected wallet's `source`/`rdns` from `detectedWallets` at
|
|
67
|
+
* connect time. Deliberately NOT re-derived later: `detectedWallets` is
|
|
68
|
+
* replaced wholesale by a later `initializeDiscovery()` call (e.g. a
|
|
69
|
+
* refresh), which can drop the entry this uuid resolved to even though the
|
|
70
|
+
* wallet is still connected — a live re-lookup at subscribe time would then
|
|
71
|
+
* silently lose both fields.
|
|
72
|
+
*/
|
|
73
|
+
private captureConnectedWalletProvenance;
|
|
46
74
|
/**
|
|
47
75
|
* Get current account
|
|
48
76
|
*/
|
|
49
77
|
getAccount(): string | null;
|
|
78
|
+
/**
|
|
79
|
+
* The LIVE selected account of the connected EVM provider, read at call time
|
|
80
|
+
* via `eth_accounts` (non-prompting). Unlike `getAccount()`'s connect-time
|
|
81
|
+
* cache, this reflects an in-wallet account switch, so the signMessage flow
|
|
82
|
+
* can claim the account that ACTUALLY signs — a stale claim surfaces as a
|
|
83
|
+
* backend "Signature is invalid" after a switch. Returns null when there is
|
|
84
|
+
* no connected provider, the wallet exposes no accounts, or the request
|
|
85
|
+
* fails; the caller decides whether to fall back to the cache or throw.
|
|
86
|
+
*/
|
|
87
|
+
getLiveAccount(): Promise<string | null>;
|
|
50
88
|
/**
|
|
51
89
|
* Get connected provider
|
|
52
90
|
*/
|
|
53
91
|
getConnectedProvider(): EthereumProvider | null;
|
|
92
|
+
/**
|
|
93
|
+
* Live-provider guard shared by `onLifecycleEvent` and `onAccountsChanged`:
|
|
94
|
+
* both need a connected EIP-1193 provider with `.on`/`.removeListener`
|
|
95
|
+
* (EIP-1193 lists `removeListener` as SHOULD — attaching listeners we could
|
|
96
|
+
* never remove would BE the zombie-listener class this layer exists to
|
|
97
|
+
* prevent), and neither can attach across the production iframe's Comlink
|
|
98
|
+
* proxy (an un-proxied handler can't be cloned over postMessage).
|
|
99
|
+
*/
|
|
100
|
+
private getObservableProvider;
|
|
101
|
+
private isBridgeMode;
|
|
102
|
+
/**
|
|
103
|
+
* Whether the CONNECTED wallet's own provider lives in the top frame (so
|
|
104
|
+
* lifecycle events must be relayed across the bridge) as opposed to this
|
|
105
|
+
* frame's own injection context (so `provider.on` can attach directly).
|
|
106
|
+
* Bridge mode alone isn't sufficient: `eip6963-discovery`'s bridge poll can
|
|
107
|
+
* come back empty and fall back to local discovery even while embedded, in
|
|
108
|
+
* which case the wallet this session actually connected to is a real,
|
|
109
|
+
* non-proxied object right here — attaching via the bridge would register a
|
|
110
|
+
* listener on the TOP frame's copy of that wallet, which never received the
|
|
111
|
+
* connection permission (wallets scope `accountsChanged` per origin) and so
|
|
112
|
+
* never fires. `connectedWalletSource === null` (uuid-less connection
|
|
113
|
+
* state) is treated as bridged, preserving the pre-existing behavior.
|
|
114
|
+
*/
|
|
115
|
+
private shouldUseBridgedListeners;
|
|
116
|
+
/**
|
|
117
|
+
* Attach one or more bridge-forwarded provider events via the global
|
|
118
|
+
* `window.__uwcSubscribeEip6963ProviderEvent` (installed by
|
|
119
|
+
* `@meshconnect/uwc-bridge-child`, only present in bridge mode). Returns
|
|
120
|
+
* `undefined` when there's no connected wallet uuid or the bridge global
|
|
121
|
+
* isn't installed (an older bridge-parent that predates this capability),
|
|
122
|
+
* matching this method's existing "unsupported returns undefined"
|
|
123
|
+
* contract elsewhere in this file.
|
|
124
|
+
*/
|
|
125
|
+
private attachBridgedListeners;
|
|
54
126
|
/**
|
|
55
127
|
* Subscribe to the live EIP-1193 provider's lifecycle events (account/chain
|
|
56
|
-
* switched in the wallet, disconnect). Returns a teardown, or `undefined`
|
|
57
|
-
* there is no connected provider
|
|
58
|
-
*
|
|
59
|
-
* would BE the zombie-listener class this layer exists to prevent).
|
|
128
|
+
* switched in the wallet, disconnect). Returns a teardown, or `undefined`
|
|
129
|
+
* when there is no connected provider, it lacks `.on`/`.removeListener`, or
|
|
130
|
+
* this is the production iframe (see `getObservableProvider`).
|
|
60
131
|
*
|
|
61
132
|
* PII boundary: the new address from `accountsChanged` is NEVER forwarded — an
|
|
62
133
|
* empty account list maps to `disconnect`, a non-empty one to a content-free
|
|
63
134
|
* `accountChanged`. `chainChanged` carries only the (non-PII) CAIP-2 chain id.
|
|
64
135
|
*/
|
|
65
136
|
onLifecycleEvent(listener: (event: WalletLifecycleEvent) => void): (() => void) | undefined;
|
|
137
|
+
/**
|
|
138
|
+
* Subscribe to the live provider's REAL account list, for session-sync
|
|
139
|
+
* (NOT telemetry — see `onLifecycleEvent`'s PII boundary above, which this
|
|
140
|
+
* deliberately does not share). Forwards the raw `accountsChanged` payload
|
|
141
|
+
* as-is, including an empty array; the caller (core) interprets an empty
|
|
142
|
+
* list as a disconnect signal.
|
|
143
|
+
*/
|
|
144
|
+
onAccountsChanged(listener: (accounts: string[]) => void): (() => void) | undefined;
|
|
66
145
|
/**
|
|
67
146
|
* Disconnect (clear state only)
|
|
68
147
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,eAAe,EAEf,OAAO,EACP,cAAc,EACd,oBAAoB,
|
|
1
|
+
{"version":3,"file":"ethereum-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,eAAe,EAEf,OAAO,EACP,cAAc,EACd,oBAAoB,EACpB,cAAc,EAEf,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EACV,gBAAgB,EAEhB,cAAc,IAAI,qBAAqB,EACxC,MAAM,yBAAyB,CAAA;AA+BhC;;GAEG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,iBAAiB,CAAgC;IACzD,OAAO,CAAC,mBAAmB,CAAsB;IACjD;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB,CAAkC;IAC/D,mFAAmF;IACnF,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,OAAO,CAAsB;IAErC;;OAEG;IACG,mBAAmB,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;OAEG;IACH,kBAAkB,IAAI,qBAAqB,EAAE;IAI7C;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS;IAIjE;;OAEG;IACG,uBAAuB,CAC3B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAY3B;;;;;;;;;OASG;IACG,OAAO,CACX,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,GACtC,OAAO,CAAC,MAAM,CAAC;IA4BlB;;OAEG;IACH,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS;IAKzD;;OAEG;IACG,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,sBAAsB,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,GAClD,OAAO,CAAC,IAAI,CAAC;IAsEhB;;OAEG;IACH,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE;IAarB;;OAEG;IACH,kBAAkB,CAChB,QAAQ,EAAE,gBAAgB,GAAG,IAAI,EACjC,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GACnB,IAAI;IAOP;;;;;;;OAOG;IACH,OAAO,CAAC,gCAAgC;IAMxC;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI;IAI3B;;;;;;;;OAQG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAa9C;;OAEG;IACH,oBAAoB,IAAI,gBAAgB,GAAG,IAAI;IAI/C;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,YAAY;IAQpB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,yBAAyB;IAIjC;;;;;;;;OAQG;IACH,OAAO,CAAC,sBAAsB;IAwC9B;;;;;;;;;OASG;IACH,gBAAgB,CACd,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAC9C,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS;IA4D3B;;;;;;OAMG;IACH,iBAAiB,CACf,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,GACrC,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS;IA0B3B;;OAEG;IACH,UAAU,IAAI,IAAI;IAQlB;;OAEG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAsD5C"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getAvailableWallets as getEIP6963Wallets } from '../../eip6963-discovery';
|
|
2
2
|
import { supportedNetworks } from '@meshconnect/uwc-constants';
|
|
3
|
+
import { createStepReporter } from '../../utils/step-reporter';
|
|
3
4
|
/**
|
|
4
5
|
* Normalize an EIP-1193 `chainChanged` payload (hex `'0x1'`, decimal string, or a
|
|
5
6
|
* number) to a CAIP-2 id. Returns undefined for an unparseable value rather than
|
|
@@ -33,6 +34,18 @@ function toCaipChainId(raw) {
|
|
|
33
34
|
export class EthereumWalletService {
|
|
34
35
|
detectedWallets = [];
|
|
35
36
|
connectedProvider = null;
|
|
37
|
+
connectedWalletUuid = null;
|
|
38
|
+
/**
|
|
39
|
+
* Provenance of the CONNECTED wallet's provider, captured once at
|
|
40
|
+
* connect()/setConnectionState() time (when `findWalletByUuid` is
|
|
41
|
+
* guaranteed to still resolve it) rather than re-derived later — see
|
|
42
|
+
* `attachBridgedListeners` for why this can't be a live lookup by uuid.
|
|
43
|
+
* `null` means unknown (e.g. state set without a uuid) and is treated as
|
|
44
|
+
* bridge-sourced, preserving the pre-existing bridge-first behavior.
|
|
45
|
+
*/
|
|
46
|
+
connectedWalletSource = null;
|
|
47
|
+
/** Wallet-stable rdns of the connected wallet, captured alongside source above. */
|
|
48
|
+
connectedWalletRdns = undefined;
|
|
36
49
|
account = null;
|
|
37
50
|
/**
|
|
38
51
|
* Initialize wallet discovery
|
|
@@ -69,21 +82,30 @@ export class EthereumWalletService {
|
|
|
69
82
|
}
|
|
70
83
|
/**
|
|
71
84
|
* Connect to wallet
|
|
85
|
+
*
|
|
86
|
+
* `onStep` (optional) reports the two wallet round-trips separately (ONC-183)
|
|
87
|
+
* — `eth_requestAccounts` is the user-facing approval, `eth_chainId` is a
|
|
88
|
+
* follow-on read against an already-granted permission, and they fail for
|
|
89
|
+
* different reasons (an abandoned prompt vs. a provider that granted accounts
|
|
90
|
+
* then went unresponsive, the bridge-mode case). Rolled together they were
|
|
91
|
+
* one opaque duration.
|
|
72
92
|
*/
|
|
73
|
-
async connect(provider) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
93
|
+
async connect(provider, uuid, onStep) {
|
|
94
|
+
// Shared reporter (ONC-183 review) rather than a fourth hand-rolled copy of
|
|
95
|
+
// the time-and-report shape — see `createStepReporter`.
|
|
96
|
+
const steps = createStepReporter(onStep);
|
|
97
|
+
const track = (step, request) => steps.track(step, 'eip155', request);
|
|
98
|
+
const accounts = await track('primaryConnect', () => provider.request({ method: 'eth_requestAccounts' }));
|
|
77
99
|
if (!accounts || accounts.length === 0) {
|
|
78
100
|
throw new Error('No accounts returned from wallet');
|
|
79
101
|
}
|
|
80
102
|
const address = accounts[0];
|
|
81
103
|
this.connectedProvider = provider;
|
|
104
|
+
this.connectedWalletUuid = uuid ?? null;
|
|
105
|
+
this.captureConnectedWalletProvenance(uuid);
|
|
82
106
|
this.account = address;
|
|
83
107
|
// Request chain ID to ensure we're connected
|
|
84
|
-
await provider.request({
|
|
85
|
-
method: 'eth_chainId'
|
|
86
|
-
});
|
|
108
|
+
await track('chainIdRead', () => provider.request({ method: 'eth_chainId' }));
|
|
87
109
|
return address;
|
|
88
110
|
}
|
|
89
111
|
/**
|
|
@@ -177,16 +199,54 @@ export class EthereumWalletService {
|
|
|
177
199
|
/**
|
|
178
200
|
* Set connection state
|
|
179
201
|
*/
|
|
180
|
-
setConnectionState(provider, account) {
|
|
202
|
+
setConnectionState(provider, account, uuid) {
|
|
181
203
|
this.connectedProvider = provider;
|
|
204
|
+
this.connectedWalletUuid = uuid ?? null;
|
|
205
|
+
this.captureConnectedWalletProvenance(uuid ?? undefined);
|
|
182
206
|
this.account = account;
|
|
183
207
|
}
|
|
208
|
+
/**
|
|
209
|
+
* Snapshot the connected wallet's `source`/`rdns` from `detectedWallets` at
|
|
210
|
+
* connect time. Deliberately NOT re-derived later: `detectedWallets` is
|
|
211
|
+
* replaced wholesale by a later `initializeDiscovery()` call (e.g. a
|
|
212
|
+
* refresh), which can drop the entry this uuid resolved to even though the
|
|
213
|
+
* wallet is still connected — a live re-lookup at subscribe time would then
|
|
214
|
+
* silently lose both fields.
|
|
215
|
+
*/
|
|
216
|
+
captureConnectedWalletProvenance(uuid) {
|
|
217
|
+
const wallet = uuid ? this.findWalletByUuid(uuid) : undefined;
|
|
218
|
+
this.connectedWalletSource = wallet?.source ?? null;
|
|
219
|
+
this.connectedWalletRdns = wallet?.rdns;
|
|
220
|
+
}
|
|
184
221
|
/**
|
|
185
222
|
* Get current account
|
|
186
223
|
*/
|
|
187
224
|
getAccount() {
|
|
188
225
|
return this.account;
|
|
189
226
|
}
|
|
227
|
+
/**
|
|
228
|
+
* The LIVE selected account of the connected EVM provider, read at call time
|
|
229
|
+
* via `eth_accounts` (non-prompting). Unlike `getAccount()`'s connect-time
|
|
230
|
+
* cache, this reflects an in-wallet account switch, so the signMessage flow
|
|
231
|
+
* can claim the account that ACTUALLY signs — a stale claim surfaces as a
|
|
232
|
+
* backend "Signature is invalid" after a switch. Returns null when there is
|
|
233
|
+
* no connected provider, the wallet exposes no accounts, or the request
|
|
234
|
+
* fails; the caller decides whether to fall back to the cache or throw.
|
|
235
|
+
*/
|
|
236
|
+
async getLiveAccount() {
|
|
237
|
+
const provider = this.connectedProvider;
|
|
238
|
+
if (!provider)
|
|
239
|
+
return null;
|
|
240
|
+
try {
|
|
241
|
+
const accounts = await provider.request({ method: 'eth_accounts' });
|
|
242
|
+
return Array.isArray(accounts) && accounts.length > 0
|
|
243
|
+
? accounts[0]
|
|
244
|
+
: null;
|
|
245
|
+
}
|
|
246
|
+
catch {
|
|
247
|
+
return null;
|
|
248
|
+
}
|
|
249
|
+
}
|
|
190
250
|
/**
|
|
191
251
|
* Get connected provider
|
|
192
252
|
*/
|
|
@@ -194,35 +254,114 @@ export class EthereumWalletService {
|
|
|
194
254
|
return this.connectedProvider;
|
|
195
255
|
}
|
|
196
256
|
/**
|
|
197
|
-
*
|
|
198
|
-
*
|
|
199
|
-
*
|
|
200
|
-
*
|
|
201
|
-
*
|
|
202
|
-
*
|
|
203
|
-
* PII boundary: the new address from `accountsChanged` is NEVER forwarded — an
|
|
204
|
-
* empty account list maps to `disconnect`, a non-empty one to a content-free
|
|
205
|
-
* `accountChanged`. `chainChanged` carries only the (non-PII) CAIP-2 chain id.
|
|
257
|
+
* Live-provider guard shared by `onLifecycleEvent` and `onAccountsChanged`:
|
|
258
|
+
* both need a connected EIP-1193 provider with `.on`/`.removeListener`
|
|
259
|
+
* (EIP-1193 lists `removeListener` as SHOULD — attaching listeners we could
|
|
260
|
+
* never remove would BE the zombie-listener class this layer exists to
|
|
261
|
+
* prevent), and neither can attach across the production iframe's Comlink
|
|
262
|
+
* proxy (an un-proxied handler can't be cloned over postMessage).
|
|
206
263
|
*/
|
|
207
|
-
|
|
264
|
+
getObservableProvider() {
|
|
208
265
|
const provider = this.connectedProvider;
|
|
209
266
|
if (!provider ||
|
|
210
267
|
typeof provider.on !== 'function' ||
|
|
211
268
|
typeof provider.removeListener !== 'function') {
|
|
212
|
-
return
|
|
269
|
+
return null;
|
|
213
270
|
}
|
|
214
|
-
//
|
|
215
|
-
//
|
|
216
|
-
//
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
if (typeof window !== 'undefined' &&
|
|
271
|
+
// Narrowed above: `.on`/`.removeListener` are confirmed present, matching
|
|
272
|
+
// EIP1193Provider's (non-optional) shape — `EthereumProvider` alone leaves
|
|
273
|
+
// both optional, which loses that narrowing once returned from this method.
|
|
274
|
+
return provider;
|
|
275
|
+
}
|
|
276
|
+
isBridgeMode() {
|
|
277
|
+
return (typeof window !== 'undefined' &&
|
|
222
278
|
window
|
|
223
|
-
.UWCBridgeChildInitialized === true)
|
|
279
|
+
.UWCBridgeChildInitialized === true);
|
|
280
|
+
}
|
|
281
|
+
/**
|
|
282
|
+
* Whether the CONNECTED wallet's own provider lives in the top frame (so
|
|
283
|
+
* lifecycle events must be relayed across the bridge) as opposed to this
|
|
284
|
+
* frame's own injection context (so `provider.on` can attach directly).
|
|
285
|
+
* Bridge mode alone isn't sufficient: `eip6963-discovery`'s bridge poll can
|
|
286
|
+
* come back empty and fall back to local discovery even while embedded, in
|
|
287
|
+
* which case the wallet this session actually connected to is a real,
|
|
288
|
+
* non-proxied object right here — attaching via the bridge would register a
|
|
289
|
+
* listener on the TOP frame's copy of that wallet, which never received the
|
|
290
|
+
* connection permission (wallets scope `accountsChanged` per origin) and so
|
|
291
|
+
* never fires. `connectedWalletSource === null` (uuid-less connection
|
|
292
|
+
* state) is treated as bridged, preserving the pre-existing behavior.
|
|
293
|
+
*/
|
|
294
|
+
shouldUseBridgedListeners() {
|
|
295
|
+
return this.isBridgeMode() && this.connectedWalletSource !== 'local';
|
|
296
|
+
}
|
|
297
|
+
/**
|
|
298
|
+
* Attach one or more bridge-forwarded provider events via the global
|
|
299
|
+
* `window.__uwcSubscribeEip6963ProviderEvent` (installed by
|
|
300
|
+
* `@meshconnect/uwc-bridge-child`, only present in bridge mode). Returns
|
|
301
|
+
* `undefined` when there's no connected wallet uuid or the bridge global
|
|
302
|
+
* isn't installed (an older bridge-parent that predates this capability),
|
|
303
|
+
* matching this method's existing "unsupported returns undefined"
|
|
304
|
+
* contract elsewhere in this file.
|
|
305
|
+
*/
|
|
306
|
+
attachBridgedListeners(subscriptions) {
|
|
307
|
+
const uuid = this.connectedWalletUuid;
|
|
308
|
+
const bridgeSubscribe = window.__uwcSubscribeEip6963ProviderEvent;
|
|
309
|
+
if (!uuid || !bridgeSubscribe)
|
|
224
310
|
return undefined;
|
|
311
|
+
// The wallet's rdns (e.g. "io.metamask") is stable across independent
|
|
312
|
+
// EIP-6963 injection contexts, unlike its uuid (freshly minted per
|
|
313
|
+
// injection per spec). Threading it through lets BridgeParent fall back
|
|
314
|
+
// to matching by rdns when the uuid this session discovered locally
|
|
315
|
+
// doesn't match what the parent's own top-frame discovery saw — see
|
|
316
|
+
// BridgeParent.ts's subscribeEip6963ProviderEvent for the other half.
|
|
317
|
+
// Uses the rdns CAPTURED at connect time (`connectedWalletRdns`), not a
|
|
318
|
+
// live `findWalletByUuid` lookup: `detectedWallets` can be replaced
|
|
319
|
+
// wholesale by a later `initializeDiscovery()` refresh that drops this
|
|
320
|
+
// uuid's entry even though the wallet is still connected, which would
|
|
321
|
+
// silently turn this into an unqualified (fallback-less) uuid lookup.
|
|
322
|
+
const rdns = this.connectedWalletRdns;
|
|
323
|
+
const teardowns = subscriptions.map(({ eventName, handler }) => bridgeSubscribe(uuid, eventName, handler, rdns));
|
|
324
|
+
return () => {
|
|
325
|
+
for (const teardown of teardowns)
|
|
326
|
+
teardown();
|
|
327
|
+
};
|
|
328
|
+
}
|
|
329
|
+
/**
|
|
330
|
+
* Subscribe to the live EIP-1193 provider's lifecycle events (account/chain
|
|
331
|
+
* switched in the wallet, disconnect). Returns a teardown, or `undefined`
|
|
332
|
+
* when there is no connected provider, it lacks `.on`/`.removeListener`, or
|
|
333
|
+
* this is the production iframe (see `getObservableProvider`).
|
|
334
|
+
*
|
|
335
|
+
* PII boundary: the new address from `accountsChanged` is NEVER forwarded — an
|
|
336
|
+
* empty account list maps to `disconnect`, a non-empty one to a content-free
|
|
337
|
+
* `accountChanged`. `chainChanged` carries only the (non-PII) CAIP-2 chain id.
|
|
338
|
+
*/
|
|
339
|
+
onLifecycleEvent(listener) {
|
|
340
|
+
if (this.shouldUseBridgedListeners()) {
|
|
341
|
+
return this.attachBridgedListeners(['accountsChanged', 'chainChanged', 'disconnect'].map(eventName => ({
|
|
342
|
+
eventName,
|
|
343
|
+
handler: (payload) => {
|
|
344
|
+
if (eventName === 'accountsChanged') {
|
|
345
|
+
const list = Array.isArray(payload) ? payload : [];
|
|
346
|
+
listener(list.length === 0
|
|
347
|
+
? { type: 'disconnect' }
|
|
348
|
+
: { type: 'accountChanged' });
|
|
349
|
+
}
|
|
350
|
+
else if (eventName === 'chainChanged') {
|
|
351
|
+
const caip = toCaipChainId(payload);
|
|
352
|
+
listener(caip !== undefined
|
|
353
|
+
? { type: 'chainChanged', chainId: caip }
|
|
354
|
+
: { type: 'chainChanged' });
|
|
355
|
+
}
|
|
356
|
+
else {
|
|
357
|
+
listener({ type: 'disconnect' });
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
})));
|
|
225
361
|
}
|
|
362
|
+
const provider = this.getObservableProvider();
|
|
363
|
+
if (!provider)
|
|
364
|
+
return undefined;
|
|
226
365
|
const onAccounts = (accounts) => {
|
|
227
366
|
const list = Array.isArray(accounts) ? accounts : [];
|
|
228
367
|
listener(list.length === 0 ? { type: 'disconnect' } : { type: 'accountChanged' });
|
|
@@ -243,11 +382,45 @@ export class EthereumWalletService {
|
|
|
243
382
|
provider.removeListener?.('disconnect', onDisconnect);
|
|
244
383
|
};
|
|
245
384
|
}
|
|
385
|
+
/**
|
|
386
|
+
* Subscribe to the live provider's REAL account list, for session-sync
|
|
387
|
+
* (NOT telemetry — see `onLifecycleEvent`'s PII boundary above, which this
|
|
388
|
+
* deliberately does not share). Forwards the raw `accountsChanged` payload
|
|
389
|
+
* as-is, including an empty array; the caller (core) interprets an empty
|
|
390
|
+
* list as a disconnect signal.
|
|
391
|
+
*/
|
|
392
|
+
onAccountsChanged(listener) {
|
|
393
|
+
if (this.shouldUseBridgedListeners()) {
|
|
394
|
+
return this.attachBridgedListeners([
|
|
395
|
+
{
|
|
396
|
+
eventName: 'accountsChanged',
|
|
397
|
+
handler: (payload) => {
|
|
398
|
+
const list = Array.isArray(payload) ? payload : [];
|
|
399
|
+
this.account = list[0] ?? null;
|
|
400
|
+
listener(list);
|
|
401
|
+
}
|
|
402
|
+
}
|
|
403
|
+
]);
|
|
404
|
+
}
|
|
405
|
+
const provider = this.getObservableProvider();
|
|
406
|
+
if (!provider)
|
|
407
|
+
return undefined;
|
|
408
|
+
const onAccounts = (accounts) => {
|
|
409
|
+
const list = Array.isArray(accounts) ? accounts : [];
|
|
410
|
+
this.account = list[0] ?? null;
|
|
411
|
+
listener(list);
|
|
412
|
+
};
|
|
413
|
+
provider.on('accountsChanged', onAccounts);
|
|
414
|
+
return () => provider.removeListener?.('accountsChanged', onAccounts);
|
|
415
|
+
}
|
|
246
416
|
/**
|
|
247
417
|
* Disconnect (clear state only)
|
|
248
418
|
*/
|
|
249
419
|
disconnect() {
|
|
250
420
|
this.connectedProvider = null;
|
|
421
|
+
this.connectedWalletUuid = null;
|
|
422
|
+
this.connectedWalletSource = null;
|
|
423
|
+
this.connectedWalletRdns = undefined;
|
|
251
424
|
this.account = null;
|
|
252
425
|
}
|
|
253
426
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum-wallet-service.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-wallet-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ethereum-wallet-service.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-wallet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare class SolanaWalletService {
|
|
|
8
8
|
private detectedWallets;
|
|
9
9
|
private connectedAdapter;
|
|
10
10
|
private account;
|
|
11
|
+
private connectedWalletUuid;
|
|
11
12
|
private storageService;
|
|
12
13
|
constructor(storageService: StorageService);
|
|
13
14
|
/**
|
|
@@ -50,10 +51,35 @@ export declare class SolanaWalletService {
|
|
|
50
51
|
* Get current account
|
|
51
52
|
*/
|
|
52
53
|
getAccount(): string | null;
|
|
54
|
+
/**
|
|
55
|
+
* The LIVE public key of the connected adapter, read at call time from
|
|
56
|
+
* `adapter.publicKey?.toBase58()`. Unlike `getAccount()`'s connect-time
|
|
57
|
+
* cache, this reflects an in-wallet account switch (in bridged mode the
|
|
58
|
+
* publicKey is a live Comlink proxy whose `toBase58()` is async, so this
|
|
59
|
+
* awaits it), letting the signMessage flow claim the account that ACTUALLY
|
|
60
|
+
* signs. Returns null when there is no connected adapter or it exposes no
|
|
61
|
+
* public key; the caller decides whether to throw.
|
|
62
|
+
*/
|
|
63
|
+
getLiveAccount(): Promise<string | null>;
|
|
53
64
|
/**
|
|
54
65
|
* Get connected adapter
|
|
55
66
|
*/
|
|
56
67
|
getConnectedAdapter(): SolanaAdapter | null;
|
|
68
|
+
/**
|
|
69
|
+
* (Re)bind the connected adapter if the reference was cleared (e.g. a re-auth
|
|
70
|
+
* teardown after an in-wallet account switch) but the wallet is still
|
|
71
|
+
* authorized. Silent: uses the no-prompt `checkExistingConnection` path, so
|
|
72
|
+
* signing after a switch never surfaces an extra approval popup.
|
|
73
|
+
*
|
|
74
|
+
* Returns a BOOLEAN, never the adapter itself: in bridge mode the adapter is
|
|
75
|
+
* a Comlink proxy, and `await`ing that proxy value (as callers would with
|
|
76
|
+
* `const a = await ensureConnectedAdapter()`) makes the Promise machinery
|
|
77
|
+
* follow its thenable and forces Comlink to structured-clone the
|
|
78
|
+
* (unserializable) adapter → "Unserializable return value". Callers must read
|
|
79
|
+
* the adapter SYNCHRONOUSLY via `getConnectedAdapter()` AFTER awaiting this,
|
|
80
|
+
* so the proxy's methods are called remotely but the proxy is never awaited.
|
|
81
|
+
*/
|
|
82
|
+
ensureConnectedAdapter(): Promise<boolean>;
|
|
57
83
|
/**
|
|
58
84
|
* Subscribe to the connected wallet-standard adapter's lifecycle. Only the
|
|
59
85
|
* adapter's typed `disconnect` event is forwarded (`WalletAdapterEvents` doesn't
|
|
@@ -66,6 +92,37 @@ export declare class SolanaWalletService {
|
|
|
66
92
|
* unavailable), mirroring the EVM path.
|
|
67
93
|
*/
|
|
68
94
|
onLifecycleEvent(listener: (event: WalletLifecycleEvent) => void): (() => void) | undefined;
|
|
95
|
+
/**
|
|
96
|
+
* Subscribe to the connected Solana adapter's account changes (direct mode
|
|
97
|
+
* only). `StandardWalletAdapter` re-emits `'connect'` with the new
|
|
98
|
+
* `PublicKey` whenever the underlying Wallet-Standard wallet reports a
|
|
99
|
+
* `change` to its accounts (e.g. the user switches accounts in Phantom),
|
|
100
|
+
* and emits `'disconnect'` when the account goes away entirely. We forward
|
|
101
|
+
* `[address]` on connect and `[]` on disconnect — core reads `[]` as a
|
|
102
|
+
* namespace disconnect.
|
|
103
|
+
*
|
|
104
|
+
* Bridge guard: in the production iframe the adapter published to this
|
|
105
|
+
* service is a Comlink proxy (no real `.on`/`.off`), so a direct
|
|
106
|
+
* subscription is impossible here. Instead, relay through
|
|
107
|
+
* `window.__uwcSubscribeSolanaWalletEvent` (installed by
|
|
108
|
+
* `@meshconnect/uwc-bridge-child`, only present in bridge mode), which asks
|
|
109
|
+
* the PARENT frame — where the live adapter actually lives — to subscribe
|
|
110
|
+
* on our behalf. Falls back to `undefined` (polling remains the fallback)
|
|
111
|
+
* when the global or a connected wallet id isn't available, e.g. an older
|
|
112
|
+
* bridge-parent that predates this capability.
|
|
113
|
+
*/
|
|
114
|
+
onAccountsChanged(listener: (accounts: string[]) => void): (() => void) | undefined;
|
|
115
|
+
/**
|
|
116
|
+
* Bridge half of `onAccountsChanged`. `walletId` is
|
|
117
|
+
* `connectedWalletUuid` — the SAME id BridgeParent's
|
|
118
|
+
* `walletStandardWallets[].uuid` publishes (name+chain based, not a real
|
|
119
|
+
* UUID; see `generateWalletId` in `wallet-standard-discovery.ts`), which
|
|
120
|
+
* this service captured at connect time. The bridge global forwards a
|
|
121
|
+
* plain `string | null` address (never a `PublicKey`); we map it to the
|
|
122
|
+
* `[address]` / `[]` shape `onAccountsChanged`'s direct-mode branch already
|
|
123
|
+
* uses (core reads `[]` as a namespace disconnect).
|
|
124
|
+
*/
|
|
125
|
+
private subscribeAccountsChangedViaBridge;
|
|
69
126
|
/**
|
|
70
127
|
* Disconnect (clear state only, don't actually disconnect from wallet)
|
|
71
128
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACf,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,oCAAoC,EAC1C,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,cAAc,CAAgB;gBAE1B,cAAc,EAAE,cAAc;IAI1C;;OAEG;IACG,mBAAmB,CACvB,eAAe,GAAE,cAAc,EAAO,EACtC,sBAAsB,UAAQ,EAC9B,wBAAwB,CAAC,EAAE,oCAAoC,GAC9D,OAAO,CAAC,IAAI,CAAC;IAQhB;;OAEG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IAI1C;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI9D;;;;;;;;OAQG;IACG,uBAAuB,CAC3B,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;QAAE,oBAAoB,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAmCzB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"solana-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACf,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,oCAAoC,EAC1C,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,cAAc,CAAgB;gBAE1B,cAAc,EAAE,cAAc;IAI1C;;OAEG;IACG,mBAAmB,CACvB,eAAe,GAAE,cAAc,EAAO,EACtC,sBAAsB,UAAQ,EAC9B,wBAAwB,CAAC,EAAE,oCAAoC,GAC9D,OAAO,CAAC,IAAI,CAAC;IAQhB;;OAEG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IAI1C;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI9D;;;;;;;;OAQG;IACG,uBAAuB,CAC3B,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;QAAE,oBAAoB,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAmCzB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoB1E;;OAEG;IACH,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE;IAarB;;OAEG;IACH,kBAAkB,CAChB,OAAO,EAAE,aAAa,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,IAAI;IAWP;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI;IAI3B;;;;;;;;OAQG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAW9C;;OAEG;IACH,mBAAmB,IAAI,aAAa,GAAG,IAAI;IAI3C;;;;;;;;;;;;;OAaG;IACG,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAmBhD;;;;;;;;;;OAUG;IACH,gBAAgB,CACd,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAC9C,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS;IAqB3B;;;;;;;;;;;;;;;;;;OAkBG;IACH,iBAAiB,CACf,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,GACrC,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS;IAyB3B;;;;;;;;;OASG;IACH,OAAO,CAAC,iCAAiC;IAmBzC;;OAEG;IACH,UAAU,IAAI,IAAI;CAKnB"}
|