@turnkey/react-wallet-kit 2.1.0 → 2.2.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/components/auth/wallet/ExternalWalletChainSelector.d.ts.map +1 -1
- package/dist/components/auth/wallet/ExternalWalletChainSelector.js +4 -2
- package/dist/components/auth/wallet/ExternalWalletChainSelector.js.map +1 -1
- package/dist/components/auth/wallet/ExternalWalletChainSelector.mjs +4 -2
- package/dist/components/auth/wallet/ExternalWalletChainSelector.mjs.map +1 -1
- package/dist/providers/client/Provider.d.ts.map +1 -1
- package/dist/providers/client/Provider.js +45 -16
- package/dist/providers/client/Provider.js.map +1 -1
- package/dist/providers/client/Provider.mjs +63 -38
- package/dist/providers/client/Provider.mjs.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalWalletChainSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/auth/wallet/ExternalWalletChainSelector.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAOpD,UAAU,gCAAgC;IACxC,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,QAAQ,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,iGAAiG;IACjG,YAAY,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;CAC1E;AACD,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,gCAAgC,
|
|
1
|
+
{"version":3,"file":"ExternalWalletChainSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/auth/wallet/ExternalWalletChainSelector.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAOpD,UAAU,gCAAgC;IACxC,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,QAAQ,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,iGAAiG;IACjG,YAAY,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;CAC1E;AACD,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,gCAAgC,2CAsIxC"}
|
|
@@ -27,8 +27,10 @@ function ExternalWalletChainSelector(props) {
|
|
|
27
27
|
popPage
|
|
28
28
|
} = Hook$1.useModal();
|
|
29
29
|
const [loadingProvider, setLoadingProvider] = react.useState();
|
|
30
|
-
// we find matching providers in current state
|
|
31
|
-
|
|
30
|
+
// we find matching providers in current state, matching by wallet identity
|
|
31
|
+
// (rdns preferred, name as fallback) in addition to interfaceType + namespace
|
|
32
|
+
// to avoid picking a different wallet that happens to support the same chain
|
|
33
|
+
const currentProviders = providers.map(inputProvider => walletProviders.find(p => p.interfaceType === inputProvider.interfaceType && p.chainInfo.namespace === inputProvider.chainInfo.namespace && (p.info.rdns && inputProvider.info.rdns ? p.info.rdns === inputProvider.info.rdns : p.info.name === inputProvider.info.name))).filter(p => p !== undefined);
|
|
32
34
|
// if no providers are found then that means that the user entered this screen
|
|
33
35
|
// while WalletConnect was still initializing, and then it failed to initialize
|
|
34
36
|
react.useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalWalletChainSelector.js","sources":["../../../../src/components/auth/wallet/ExternalWalletChainSelector.tsx"],"sourcesContent":[null],"names":["ExternalWalletChainSelector","props","providers","onSelect","onDisconnect","walletProviders","useTurnkey","isMobile","popPage","useModal","loadingProvider","setLoadingProvider","useState","currentProviders","map","inputProvider","find","p","interfaceType","chainInfo","namespace","filter","undefined","useEffect","length","shouldShowDisconnect","handleSelect","provider","canDisconnect","_jsxs","className","clsx","children","_jsx","src","
|
|
1
|
+
{"version":3,"file":"ExternalWalletChainSelector.js","sources":["../../../../src/components/auth/wallet/ExternalWalletChainSelector.tsx"],"sourcesContent":[null],"names":["ExternalWalletChainSelector","props","providers","onSelect","onDisconnect","walletProviders","useTurnkey","isMobile","popPage","useModal","loadingProvider","setLoadingProvider","useState","currentProviders","map","inputProvider","find","p","interfaceType","chainInfo","namespace","info","rdns","name","filter","undefined","useEffect","length","shouldShowDisconnect","handleSelect","provider","canDisconnect","_jsxs","className","clsx","children","_jsx","src","icon","isHovering","setIsHovering","ActionButton","loading","loadingText","onClick","onMouseEnter","onMouseLeave","isEthereumProvider","EthereumLogo","ConnectedIndicator","isPinging","isSolanaProvider","SolanaLogo","connectedAddresses","slice","FontAwesomeIcon","size","faClose","faChevronRight"],"mappings":"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"}
|
|
@@ -26,10 +26,12 @@ function ExternalWalletChainSelector(props) {
|
|
|
26
26
|
_useState2 = _slicedToArray(_useState, 2),
|
|
27
27
|
loadingProvider = _useState2[0],
|
|
28
28
|
setLoadingProvider = _useState2[1];
|
|
29
|
-
// we find matching providers in current state
|
|
29
|
+
// we find matching providers in current state, matching by wallet identity
|
|
30
|
+
// (rdns preferred, name as fallback) in addition to interfaceType + namespace
|
|
31
|
+
// to avoid picking a different wallet that happens to support the same chain
|
|
30
32
|
var currentProviders = providers.map(function (inputProvider) {
|
|
31
33
|
return walletProviders.find(function (p) {
|
|
32
|
-
return p.interfaceType === inputProvider.interfaceType && p.chainInfo.namespace === inputProvider.chainInfo.namespace;
|
|
34
|
+
return p.interfaceType === inputProvider.interfaceType && p.chainInfo.namespace === inputProvider.chainInfo.namespace && (p.info.rdns && inputProvider.info.rdns ? p.info.rdns === inputProvider.info.rdns : p.info.name === inputProvider.info.name);
|
|
33
35
|
});
|
|
34
36
|
}).filter(function (p) {
|
|
35
37
|
return p !== undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalWalletChainSelector.mjs","sources":["../../../../src/components/auth/wallet/ExternalWalletChainSelector.tsx"],"sourcesContent":[null],"names":["ExternalWalletChainSelector","props","_providers$","_providers$0$info$nam","_providers$2","providers","onSelect","onDisconnect","_useTurnkey","useTurnkey","walletProviders","_useModal","useModal","isMobile","popPage","_useState","useState","_useState2","_slicedToArray","loadingProvider","setLoadingProvider","currentProviders","map","inputProvider","find","p","interfaceType","chainInfo","namespace","filter","undefined","useEffect","length","shouldShowDisconnect","handleSelect","_ref","_asyncToGenerator","_regenerator","m","_callee","provider","w","_context","n","canDisconnect","a","_x","apply","arguments","_jsxs","className","clsx","children","_jsx","src","
|
|
1
|
+
{"version":3,"file":"ExternalWalletChainSelector.mjs","sources":["../../../../src/components/auth/wallet/ExternalWalletChainSelector.tsx"],"sourcesContent":[null],"names":["ExternalWalletChainSelector","props","_providers$","_providers$0$info$nam","_providers$2","providers","onSelect","onDisconnect","_useTurnkey","useTurnkey","walletProviders","_useModal","useModal","isMobile","popPage","_useState","useState","_useState2","_slicedToArray","loadingProvider","setLoadingProvider","currentProviders","map","inputProvider","find","p","interfaceType","chainInfo","namespace","info","rdns","name","filter","undefined","useEffect","length","shouldShowDisconnect","handleSelect","_ref","_asyncToGenerator","_regenerator","m","_callee","provider","w","_context","n","canDisconnect","a","_x","apply","arguments","_jsxs","className","clsx","children","_jsx","src","icon","_p$connectedAddresses","_p$connectedAddresses2","_useState3","_useState4","isHovering","setIsHovering","ActionButton","_objectSpread","loading","loadingText","onClick","onMouseEnter","onMouseLeave","isEthereumProvider","EthereumLogo","ConnectedIndicator","isPinging","isSolanaProvider","SolanaLogo","connectedAddresses","slice","FontAwesomeIcon","size","faClose","faChevronRight"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../src/providers/client/Provider.tsx"],"names":[],"mappings":"AAiIA,OAAO,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAwB5E,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAM3B,MAAM,kBAAkB,CAAC;AAyD1B;;GAEG;AACH,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,SAAS,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;CAC1C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../src/providers/client/Provider.tsx"],"names":[],"mappings":"AAiIA,OAAO,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAwB5E,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAM3B,MAAM,kBAAkB,CAAC;AAyD1B;;GAEG;AACH,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,SAAS,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;CAC1C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAshMxD,CAAC"}
|
|
@@ -3547,29 +3547,22 @@ const ClientProvider = ({
|
|
|
3547
3547
|
transaction: transaction,
|
|
3548
3548
|
stampWith
|
|
3549
3549
|
}) : await (async () => {
|
|
3550
|
+
const ethTx = transaction;
|
|
3551
|
+
// Drop empty/no-op calldata ("0x" or "") so it isn't sent.
|
|
3552
|
+
const cleanData = data => data && data !== "0x" && data !== "" ? data : undefined;
|
|
3553
|
+
// Shared fee/nonce fields, present on both the V1 and V2 intents.
|
|
3550
3554
|
const {
|
|
3551
3555
|
from,
|
|
3552
|
-
|
|
3553
|
-
value,
|
|
3554
|
-
data,
|
|
3556
|
+
sponsor,
|
|
3555
3557
|
nonce,
|
|
3556
3558
|
gasLimit,
|
|
3557
3559
|
maxFeePerGas,
|
|
3558
|
-
maxPriorityFeePerGas
|
|
3559
|
-
|
|
3560
|
-
|
|
3561
|
-
const cleanedData = data && data !== "0x" && data !== "" ? data : undefined;
|
|
3562
|
-
const tx = {
|
|
3560
|
+
maxPriorityFeePerGas
|
|
3561
|
+
} = ethTx;
|
|
3562
|
+
const commonFields = {
|
|
3563
3563
|
from,
|
|
3564
|
-
|
|
3565
|
-
caip2: caip2,
|
|
3564
|
+
caip2: ethTx.caip2,
|
|
3566
3565
|
sponsor: sponsor ?? false,
|
|
3567
|
-
...(value ? {
|
|
3568
|
-
value
|
|
3569
|
-
} : {}),
|
|
3570
|
-
...(cleanedData ? {
|
|
3571
|
-
data: cleanedData
|
|
3572
|
-
} : {}),
|
|
3573
3566
|
...(nonce ? {
|
|
3574
3567
|
nonce
|
|
3575
3568
|
} : {}),
|
|
@@ -3583,6 +3576,42 @@ const ClientProvider = ({
|
|
|
3583
3576
|
maxPriorityFeePerGas
|
|
3584
3577
|
} : {})
|
|
3585
3578
|
};
|
|
3579
|
+
// V2 multi-call intent vs. legacy single-call (V1) intent.
|
|
3580
|
+
// TODO (breaking change): eventually, we wont generate the v1 activity at all, remove this check and update the intent.
|
|
3581
|
+
let tx;
|
|
3582
|
+
if ("calls" in ethTx) {
|
|
3583
|
+
tx = {
|
|
3584
|
+
...commonFields,
|
|
3585
|
+
calls: ethTx.calls.map(({
|
|
3586
|
+
to,
|
|
3587
|
+
value,
|
|
3588
|
+
data
|
|
3589
|
+
}) => {
|
|
3590
|
+
const cleanedData = cleanData(data);
|
|
3591
|
+
return {
|
|
3592
|
+
to,
|
|
3593
|
+
...(value ? {
|
|
3594
|
+
value
|
|
3595
|
+
} : {}),
|
|
3596
|
+
...(cleanedData ? {
|
|
3597
|
+
data: cleanedData
|
|
3598
|
+
} : {})
|
|
3599
|
+
};
|
|
3600
|
+
})
|
|
3601
|
+
};
|
|
3602
|
+
} else {
|
|
3603
|
+
const cleanedData = cleanData(ethTx.data);
|
|
3604
|
+
tx = {
|
|
3605
|
+
...commonFields,
|
|
3606
|
+
to: ethTx.to,
|
|
3607
|
+
...(ethTx.value ? {
|
|
3608
|
+
value: ethTx.value
|
|
3609
|
+
} : {}),
|
|
3610
|
+
...(cleanedData ? {
|
|
3611
|
+
data: cleanedData
|
|
3612
|
+
} : {})
|
|
3613
|
+
};
|
|
3614
|
+
}
|
|
3586
3615
|
return ethSendTransaction({
|
|
3587
3616
|
organizationId,
|
|
3588
3617
|
transaction: tx,
|