@turnkey/core 1.7.0 → 1.8.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.
Files changed (46) hide show
  1. package/dist/__clients__/core.d.ts +1 -0
  2. package/dist/__clients__/core.d.ts.map +1 -1
  3. package/dist/__clients__/core.js +72 -23
  4. package/dist/__clients__/core.js.map +1 -1
  5. package/dist/__clients__/core.mjs +73 -24
  6. package/dist/__clients__/core.mjs.map +1 -1
  7. package/dist/__generated__/sdk-client-base.d.ts.map +1 -1
  8. package/dist/__generated__/sdk-client-base.js +144 -216
  9. package/dist/__generated__/sdk-client-base.js.map +1 -1
  10. package/dist/__generated__/sdk-client-base.mjs +144 -216
  11. package/dist/__generated__/sdk-client-base.mjs.map +1 -1
  12. package/dist/__generated__/version.d.ts +1 -1
  13. package/dist/__generated__/version.js +1 -1
  14. package/dist/__generated__/version.mjs +1 -1
  15. package/dist/__types__/external-wallets.d.ts +19 -0
  16. package/dist/__types__/external-wallets.d.ts.map +1 -1
  17. package/dist/__types__/method-types.d.ts +4 -0
  18. package/dist/__types__/method-types.d.ts.map +1 -1
  19. package/dist/__wallet__/mobile/manager.d.ts.map +1 -1
  20. package/dist/__wallet__/mobile/manager.js +5 -2
  21. package/dist/__wallet__/mobile/manager.js.map +1 -1
  22. package/dist/__wallet__/mobile/manager.mjs +5 -2
  23. package/dist/__wallet__/mobile/manager.mjs.map +1 -1
  24. package/dist/__wallet__/wallet-connect/base.d.ts +25 -11
  25. package/dist/__wallet__/wallet-connect/base.d.ts.map +1 -1
  26. package/dist/__wallet__/wallet-connect/base.js +112 -30
  27. package/dist/__wallet__/wallet-connect/base.js.map +1 -1
  28. package/dist/__wallet__/wallet-connect/base.mjs +112 -30
  29. package/dist/__wallet__/wallet-connect/base.mjs.map +1 -1
  30. package/dist/__wallet__/wallet-connect/client.d.ts.map +1 -1
  31. package/dist/__wallet__/wallet-connect/client.js +4 -0
  32. package/dist/__wallet__/wallet-connect/client.js.map +1 -1
  33. package/dist/__wallet__/wallet-connect/client.mjs +4 -0
  34. package/dist/__wallet__/wallet-connect/client.mjs.map +1 -1
  35. package/dist/__wallet__/web/manager.d.ts +11 -0
  36. package/dist/__wallet__/web/manager.d.ts.map +1 -1
  37. package/dist/__wallet__/web/manager.js +36 -21
  38. package/dist/__wallet__/web/manager.js.map +1 -1
  39. package/dist/__wallet__/web/manager.mjs +36 -21
  40. package/dist/__wallet__/web/manager.mjs.map +1 -1
  41. package/dist/__wallet__/web/native/ethereum.d.ts.map +1 -1
  42. package/dist/__wallet__/web/native/ethereum.js +27 -4
  43. package/dist/__wallet__/web/native/ethereum.js.map +1 -1
  44. package/dist/__wallet__/web/native/ethereum.mjs +27 -4
  45. package/dist/__wallet__/web/native/ethereum.mjs.map +1 -1
  46. package/package.json +6 -6
@@ -55,15 +55,14 @@ class WebWalletManager {
55
55
  // if WalletConnect is configured, set it up
56
56
  if (cfg.walletConnect && enableWalletConnect) {
57
57
  this.wcClient = new WalletConnectClient();
58
- const wcUnified = new WalletConnectWallet(this.wcClient);
58
+ const wcUnified = new WalletConnectWallet(this.wcClient, () => this.ensureWalletConnectReady(), { ethereumNamespaces, solanaNamespaces });
59
59
  this.wallets[WalletInterfaceType.WalletConnect] = wcUnified;
60
60
  // add async init step to the initializer queue
61
- this.initializers.push(() => withTimeout(wcUnified.init({ ethereumNamespaces, solanaNamespaces }), 5000, "WalletConnect wallet").catch((err) => {
62
- // WalletConnect can be a bit unreliable, so instead of throwing an error
63
- // we handle failures silently to avoid blocking the rest of the client
64
- // from initializing. If setup fails, we also remove WalletConnect
65
- // from the available wallets list
66
- console.error("Failed to init WalletConnect wallet:", err);
61
+ this.initializers.push(() => withTimeout(wcUnified.init(), 15000, "WalletConnect wallet").catch((err) => {
62
+ // WalletConnect can be a bit unreliable, we don't want to load forever
63
+ // so we limit the initialization time to 15 seconds. After that we emit a
64
+ // failure event and remove WalletConnect from the available wallets
65
+ wcUnified.abortInit(err);
67
66
  this.removeWalletInterface(WalletInterfaceType.WalletConnect);
68
67
  }));
69
68
  // register WalletConnect as a wallet interface for each enabled chain
@@ -84,32 +83,48 @@ class WebWalletManager {
84
83
  *
85
84
  * - Initializes the low-level WalletConnect client with the provided config.
86
85
  * - Runs any registered async wallet initializers (currently only `WalletConnectWallet`).
86
+ * - WalletConnect initialization happens in the background and does not block this method.
87
87
  *
88
88
  * @param cfg - Wallet manager configuration used for initializing the WalletConnect client.
89
89
  */
90
90
  async init(cfg) {
91
91
  if (this.wcClient) {
92
- try {
93
- await this.wcClient.init(cfg.walletConnect);
94
- }
95
- catch (error) {
96
- // WalletConnect can be a bit unreliable, so instead of throwing an error
97
- // we handle failures silently to avoid blocking the rest of the client
98
- // from initializing. If setup fails, we also remove WalletConnect
99
- // from the available wallets list
100
- console.error("Failed to initialize WalletConnect client", error);
101
- this.removeWalletInterface(WalletInterfaceType.WalletConnect);
102
- }
92
+ // we start WalletConnect initialization in the background (this is non-blocking)
93
+ this.wcInitPromise = (async () => {
94
+ try {
95
+ await this.wcClient.init(cfg.walletConnect);
96
+ // initialize the high-level WalletConnectWallet after client is ready
97
+ await Promise.all(this.initializers.map((fn) => fn()));
98
+ }
99
+ catch (error) {
100
+ // WalletConnect can be a bit unreliable, so instead of throwing an error
101
+ // we handle failures silently to avoid blocking the rest of the client
102
+ // from initializing. If setup fails, we also remove WalletConnect
103
+ // from the available wallets list
104
+ console.error("Failed to initialize WalletConnect", error);
105
+ this.removeWalletInterface(WalletInterfaceType.WalletConnect);
106
+ }
107
+ })();
108
+ }
109
+ }
110
+ /**
111
+ * Ensures WalletConnect is fully initialized before proceeding.
112
+ * This should be called before any WalletConnect operations.
113
+ *
114
+ * @returns A promise that resolves when WalletConnect is ready.
115
+ */
116
+ async ensureWalletConnectReady() {
117
+ if (this.wcInitPromise) {
118
+ await this.wcInitPromise;
103
119
  }
104
- // we initialize the high-level WalletConnectWallet
105
- // we do this because we can't init this inside the constructor since it's async
106
- await Promise.all(this.initializers.map((fn) => fn()));
107
120
  }
108
121
  /**
109
122
  * Retrieves available wallet providers, optionally filtered by chain.
110
123
  *
111
124
  * - If a chain is specified, filters wallet interfaces that support that chain.
112
125
  * - Aggregates providers across all wallet interfaces and filters WalletConnect results accordingly.
126
+ * - Returns native wallet providers immediately without waiting for WalletConnect.
127
+ * - WalletConnect providers will only be included if WalletConnect has already initialized.
113
128
  *
114
129
  * @param chain - Optional chain to filter providers by (e.g., Ethereum, Solana).
115
130
  * @returns A promise that resolves to an array of `WalletProvider` objects.
@@ -1 +1 @@
1
- {"version":3,"file":"manager.mjs","sources":["../../../src/__wallet__/web/manager.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manager.mjs","sources":["../../../src/__wallet__/web/manager.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../../../../src/__wallet__/web/native/ethereum.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,GAAG,EAIJ,MAAM,MAAM,CAAC;AAGd,OAAO,EAEL,uBAAuB,EACvB,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,cAAc,EAGf,MAAM,oBAAoB,CAAC;AAM5B;;;;;;;GAOG;AACH,8BAAsB,kBAAmB,YAAW,uBAAuB;IACzE,QAAQ,CAAC,aAAa,gCAAgC;IAEtD;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,MAAM,GAAG,GAAG,EACrB,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,GAAG,CAAC;IAEf;;;;;;;;OAQG;IACH,YAAY,aAAoB,cAAc,KAAG,QAAQ,MAAM,CAAC,CAQ9D;IAEF;;;;;;;;;OASG;IACH,YAAY,QAAa,QAAQ,cAAc,EAAE,CAAC,CA2DhD;IAEF;;;;;;;;;OASG;IACH,oBAAoB,aAAoB,cAAc,KAAG,QAAQ,MAAM,CAAC,CAGtE;IAEF;;;;;;;;;OASG;IACH,uBAAuB,aAAoB,cAAc,KAAG,QAAQ,IAAI,CAAC,CAMvE;IAEF;;;;;;;;;;;OAWG;IACG,WAAW,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,MAAM,GAAG,eAAe,GAClC,OAAO,CAAC,IAAI,CAAC;CAwDjB;AAED;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,kBAAkB;IACpD;;;;;;;;;;;;;OAaG;IACH,IAAI,YACO,MAAM,YACL,cAAc,UAChB,UAAU,KACjB,QAAQ,GAAG,CAAC,CAiCb;CACH"}
1
+ {"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../../../../src/__wallet__/web/native/ethereum.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,GAAG,EAIJ,MAAM,MAAM,CAAC;AAGd,OAAO,EAIL,uBAAuB,EACvB,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,cAAc,EAGf,MAAM,oBAAoB,CAAC;AAM5B;;;;;;;GAOG;AACH,8BAAsB,kBAAmB,YAAW,uBAAuB;IACzE,QAAQ,CAAC,aAAa,gCAAgC;IAEtD;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,MAAM,GAAG,GAAG,EACrB,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,GAAG,CAAC;IAEf;;;;;;;;OAQG;IACH,YAAY,aAAoB,cAAc,KAAG,QAAQ,MAAM,CAAC,CAQ9D;IAEF;;;;;;;;;OASG;IACH,YAAY,QAAa,QAAQ,cAAc,EAAE,CAAC,CA2DhD;IAEF;;;;;;;;;OASG;IACH,oBAAoB,aAAoB,cAAc,KAAG,QAAQ,MAAM,CAAC,CAGtE;IAEF;;;;;;;;;OASG;IACH,uBAAuB,aAAoB,cAAc,KAAG,QAAQ,IAAI,CAAC,CAMvE;IAEF;;;;;;;;;;;OAWG;IACG,WAAW,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,MAAM,GAAG,eAAe,GAClC,OAAO,CAAC,IAAI,CAAC;CAwDjB;AAED;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,kBAAkB;IACpD;;;;;;;;;;;;;OAaG;IACH,IAAI,YACO,MAAM,YACL,cAAc,UAChB,UAAU,KACjB,QAAQ,GAAG,CAAC,CA+Db;CACH"}
@@ -206,23 +206,46 @@ class EthereumWallet extends BaseEthereumWallet {
206
206
  method: "personal_sign",
207
207
  params: [payload, account],
208
208
  });
209
- case enums.SignIntent.SignAndSendTransaction:
209
+ case enums.SignIntent.SignAndSendTransaction: {
210
210
  const tx = ethers.Transaction.from(payload);
211
- const txParams = {
211
+ const base = {
212
212
  from: account,
213
213
  to: tx.to?.toString(),
214
214
  value: viem.toHex(tx.value),
215
215
  gas: viem.toHex(tx.gasLimit),
216
- maxFeePerGas: viem.toHex(tx.maxFeePerGas ?? 0n),
217
- maxPriorityFeePerGas: viem.toHex(tx.maxPriorityFeePerGas ?? 0n),
218
216
  nonce: viem.toHex(tx.nonce),
219
217
  chainId: viem.toHex(tx.chainId),
220
218
  data: tx.data?.toString() ?? "0x",
221
219
  };
220
+ // Some libs use undefined for legacy, so normalize
221
+ const txType = tx.type ?? 0;
222
+ let txParams;
223
+ if (txType === undefined || txType === 0 || txType === 1) {
224
+ // legacy or EIP-2930 (gasPrice-based)
225
+ if (tx.gasPrice == null) {
226
+ throw new Error("Legacy or EIP-2930 transaction missing gasPrice");
227
+ }
228
+ txParams = {
229
+ ...base,
230
+ gasPrice: viem.toHex(tx.gasPrice),
231
+ };
232
+ }
233
+ else {
234
+ // EIP-1559 or future fee-market types
235
+ if (tx.maxFeePerGas == null || tx.maxPriorityFeePerGas == null) {
236
+ throw new Error("EIP-1559-style transaction missing maxFeePerGas or maxPriorityFeePerGas");
237
+ }
238
+ txParams = {
239
+ ...base,
240
+ maxFeePerGas: viem.toHex(tx.maxFeePerGas),
241
+ maxPriorityFeePerGas: viem.toHex(tx.maxPriorityFeePerGas),
242
+ };
243
+ }
222
244
  return await selectedProvider.request({
223
245
  method: "eth_sendTransaction",
224
246
  params: [txParams],
225
247
  });
248
+ }
226
249
  default:
227
250
  throw new Error(`Unsupported sign intent: ${intent}`);
228
251
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.js","sources":["../../../../src/__wallet__/web/native/ethereum.ts"],"sourcesContent":[null],"names":["WalletInterfaceType","SignIntent","Chain","Transaction","toHex","recoverPublicKey","hashMessage","uint8ArrayFromHexString","compressRawPublicKey","uint8ArrayToHexString"],"mappings":"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"}
1
+ {"version":3,"file":"ethereum.js","sources":["../../../../src/__wallet__/web/native/ethereum.ts"],"sourcesContent":[null],"names":["WalletInterfaceType","SignIntent","Chain","Transaction","toHex","recoverPublicKey","hashMessage","uint8ArrayFromHexString","compressRawPublicKey","uint8ArrayToHexString"],"mappings":"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"}
@@ -204,23 +204,46 @@ class EthereumWallet extends BaseEthereumWallet {
204
204
  method: "personal_sign",
205
205
  params: [payload, account],
206
206
  });
207
- case SignIntent.SignAndSendTransaction:
207
+ case SignIntent.SignAndSendTransaction: {
208
208
  const tx = Transaction.from(payload);
209
- const txParams = {
209
+ const base = {
210
210
  from: account,
211
211
  to: tx.to?.toString(),
212
212
  value: toHex(tx.value),
213
213
  gas: toHex(tx.gasLimit),
214
- maxFeePerGas: toHex(tx.maxFeePerGas ?? 0n),
215
- maxPriorityFeePerGas: toHex(tx.maxPriorityFeePerGas ?? 0n),
216
214
  nonce: toHex(tx.nonce),
217
215
  chainId: toHex(tx.chainId),
218
216
  data: tx.data?.toString() ?? "0x",
219
217
  };
218
+ // Some libs use undefined for legacy, so normalize
219
+ const txType = tx.type ?? 0;
220
+ let txParams;
221
+ if (txType === undefined || txType === 0 || txType === 1) {
222
+ // legacy or EIP-2930 (gasPrice-based)
223
+ if (tx.gasPrice == null) {
224
+ throw new Error("Legacy or EIP-2930 transaction missing gasPrice");
225
+ }
226
+ txParams = {
227
+ ...base,
228
+ gasPrice: toHex(tx.gasPrice),
229
+ };
230
+ }
231
+ else {
232
+ // EIP-1559 or future fee-market types
233
+ if (tx.maxFeePerGas == null || tx.maxPriorityFeePerGas == null) {
234
+ throw new Error("EIP-1559-style transaction missing maxFeePerGas or maxPriorityFeePerGas");
235
+ }
236
+ txParams = {
237
+ ...base,
238
+ maxFeePerGas: toHex(tx.maxFeePerGas),
239
+ maxPriorityFeePerGas: toHex(tx.maxPriorityFeePerGas),
240
+ };
241
+ }
220
242
  return await selectedProvider.request({
221
243
  method: "eth_sendTransaction",
222
244
  params: [txParams],
223
245
  });
246
+ }
224
247
  default:
225
248
  throw new Error(`Unsupported sign intent: ${intent}`);
226
249
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.mjs","sources":["../../../../src/__wallet__/web/native/ethereum.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ethereum.mjs","sources":["../../../../src/__wallet__/web/native/ethereum.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@turnkey/core",
3
- "version": "1.7.0",
3
+ "version": "1.8.0",
4
4
  "description": "A core JavaScript web and React Native package for interfacing with Turnkey's infrastructure.",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.mjs",
@@ -29,18 +29,18 @@
29
29
  "dependencies": {
30
30
  "@wallet-standard/app": "^1.1.0",
31
31
  "@wallet-standard/base": "^1.1.0",
32
- "@walletconnect/sign-client": "^2.21.8",
33
- "@walletconnect/types": "^2.21.8",
32
+ "@walletconnect/sign-client": "^2.23.0",
33
+ "@walletconnect/types": "^2.23.0",
34
34
  "cross-fetch": "^3.1.5",
35
35
  "ethers": "^6.10.0",
36
36
  "jwt-decode": "4.0.0",
37
37
  "uuid": "^11.1.0",
38
38
  "viem": "^2.33.1",
39
- "@turnkey/api-key-stamper": "0.5.0",
40
- "@turnkey/crypto": "2.8.5",
39
+ "@turnkey/crypto": "2.8.6",
41
40
  "@turnkey/encoding": "0.6.0",
42
- "@turnkey/sdk-types": "0.8.0",
41
+ "@turnkey/api-key-stamper": "0.5.0",
43
42
  "@turnkey/http": "3.15.0",
43
+ "@turnkey/sdk-types": "0.9.0",
44
44
  "@turnkey/webauthn-stamper": "0.6.0"
45
45
  },
46
46
  "devDependencies": {