@dynamic-labs/multi-wallet 0.14.16 → 0.14.18
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/package.json +2 -2
- package/src/data/wallet-links.json +4 -2
- package/src/multi-wallet.js +13 -1
- package/src/multi-wallet.js.map +1 -1
- package/src/utils/walletLinks.d.ts +1 -0
- package/src/utils/walletLinks.js.map +1 -1
- package/src/wallets/ethereum/ethProvider.js +10 -0
- package/src/wallets/ethereum/ethProvider.js.map +1 -1
- package/src/wallets/wallet-connector.d.ts +1 -0
- package/src/wallets/walletConnect/walletConnect.d.ts +1 -0
- package/src/wallets/walletConnect/walletConnect.js +12 -0
- package/src/wallets/walletConnect/walletConnect.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dynamic-labs/multi-wallet",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.18",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/dynamic-labs/DynamicAuth.git",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"buffer": "^6.0.3",
|
|
11
|
-
"@dynamic-labs/sdk-api": "^0.0.
|
|
11
|
+
"@dynamic-labs/sdk-api": "^0.0.117",
|
|
12
12
|
"starknet": "^3.19.0",
|
|
13
13
|
"ethers": "^5.7.2",
|
|
14
14
|
"@randlabs/myalgo-connect": "^1.4.2",
|
|
@@ -363,7 +363,8 @@
|
|
|
363
363
|
"android": "https://play.google.com/store/apps/details?id=com.ledger.live",
|
|
364
364
|
"ios": "https://itunes.apple.com/app/id1361671700",
|
|
365
365
|
"disabled": false
|
|
366
|
-
}
|
|
366
|
+
},
|
|
367
|
+
"switchNetworkOnlyFromWallet": true
|
|
367
368
|
},
|
|
368
369
|
"authereum": {
|
|
369
370
|
"desktop": {
|
|
@@ -671,7 +672,8 @@
|
|
|
671
672
|
"android": "https://play.google.com/store/apps/details?id=io.safepal.wallet",
|
|
672
673
|
"ios": "https://apps.apple.com/app/safepal-wallet/id1548297139",
|
|
673
674
|
"disabled": false
|
|
674
|
-
}
|
|
675
|
+
},
|
|
676
|
+
"switchNetworkOnlyFromWallet": true
|
|
675
677
|
},
|
|
676
678
|
"infinito": {
|
|
677
679
|
"desktop": {
|
package/src/multi-wallet.js
CHANGED
|
@@ -94,10 +94,19 @@ const getSupportedWallets = ({ appLogoUrl, appName, networkConfigurations, skipM
|
|
|
94
94
|
...filtered,
|
|
95
95
|
];
|
|
96
96
|
// Memoize the wallets
|
|
97
|
-
|
|
97
|
+
const walletsWithOverrides = applyLinksOverrides(allWallets);
|
|
98
|
+
wallets = filterWalletsForPlatform(walletsWithOverrides);
|
|
98
99
|
return wallets;
|
|
99
100
|
};
|
|
100
101
|
exports.getSupportedWallets = getSupportedWallets;
|
|
102
|
+
const applyLinksOverrides = (wallets) => wallets.map((wallet) => {
|
|
103
|
+
const links = (0, walletLinks_1.getWalletLinks)(wallet.name);
|
|
104
|
+
if (links !== undefined &&
|
|
105
|
+
links.switchNetworkOnlyFromWallet !== undefined) {
|
|
106
|
+
wallet.switchNetworkOnlyFromWallet = links.switchNetworkOnlyFromWallet;
|
|
107
|
+
}
|
|
108
|
+
return wallet;
|
|
109
|
+
});
|
|
101
110
|
const filterWalletsForPlatform = (wallets) => wallets.filter((wallet) => {
|
|
102
111
|
// Always show if installed
|
|
103
112
|
if (wallet.isInstalledOnBrowser()) {
|
|
@@ -108,6 +117,9 @@ const filterWalletsForPlatform = (wallets) => wallets.filter((wallet) => {
|
|
|
108
117
|
console_1.default.error(`Missing wallet configuration for ${wallet.name}`);
|
|
109
118
|
return false;
|
|
110
119
|
}
|
|
120
|
+
if (links.switchNetworkOnlyFromWallet !== undefined) {
|
|
121
|
+
wallet.switchNetworkOnlyFromWallet = links.switchNetworkOnlyFromWallet;
|
|
122
|
+
}
|
|
111
123
|
if (!(0, isMobile_1.isMobile)() && !links.showOnlyIfInstalled) {
|
|
112
124
|
return true;
|
|
113
125
|
}
|
package/src/multi-wallet.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-wallet.js","sourceRoot":"","sources":["../../../../packages/multi-wallet/src/multi-wallet.ts"],"names":[],"mappings":";;;;AAAA,+EAA+C;AAE/C,mFAAmD;AACnD,2EAA2C;AAC3C,iFAAiD;AACjD,yEAAyC;AACzC,oFAAoD;AACpD,2EAA2C;AAC3C,2EAA2C;AAE3C,+CAA8D;AAC9D,qDAAkE;AAClE,yDAG+B;AAC/B,+EAA+C;AAC/C,4FAA4D;AAC5D,sFAAsD;AACtD,0FAA0D;AAC1D,sHAAsF;AACtF,4FAA4D;AAC5D,8FAA8D;AAC9D,4FAA4D;AAC5D,wGAAwE;AACxE,iFAAiD;AACjD,iFAAiD;AACjD,qFAAqD;AACrD,6FAA4D;AAC5D,6FAA6D;AAC7D,sFAAsD;AACtD,qFAAqD;AACrD,sEAAsC;AACtC,yEAAsE;AACtE,kEAAwF;AAA/E,yHAAA,UAAU,OAA2B;AAE9C,IAAI,OAAO,GAAsB,EAAE,CAAC;AAEvB,QAAA,4BAA4B,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAEjE,MAAM,mBAAmB,GAAwB,CACtD,EACE,UAAU,EACV,OAAO,EACP,qBAAqB,EACrB,QAAQ,EACR,iBAAiB,GAClB,GAAG;IACF,UAAU,EAAE,EAAE;IACd,OAAO,EAAE,EAAE;IACX,qBAAqB,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IAC9C,QAAQ,EAAE,KAAK;IACf,iBAAiB,EAAE,EAAE;CACtB,EACD,EAAE;IACF,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,iBAAiB,GAAG,CAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,GAAG,KAAI,EAAE,CAAC;IAC3D,MAAM,oBAAoB,GAAG,CAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,MAAM,KAAI,EAAE,CAAC;IAEjE,MAAM,oBAAoB,GAAG,IAAA,yCAAyB,EAAC,iBAAiB,CAAC,CAAC;IAE1E,2EAA2E;IAC3E,yBAAyB;IACzB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAC1C,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,oCAA4B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC3D,CAAC;IACF,MAAM,UAAU,GAAG;QACjB,IAAI,iBAAO,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QAClD,IAAA,2CAAoB,EAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QACxD,IAAI,kBAAQ,CAAC;YACX,UAAU;YACV,OAAO;YACP,WAAW,EAAE,iBAAiB;SAC/B,CAAC;QACF,IAAI,kBAAQ,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QACnD,IAAI,cAAI,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QAC/C,IAAI,eAAK,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QAChD,IAAI,gBAAM,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;QACnC,IAAI,gBAAM,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;QACnC,IAAI,mBAAS,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QACjD,IAAI,wBAAc,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QACtD,IAAI,uBAAa,CAAC;YAChB,WAAW,EAAE,iBAAiB;YAC9B,UAAU,EAAE,eAAe;SAC5B,CAAC;QACF,IAAI,kBAAQ,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QACnD,IAAI,kBAAQ,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QAChD,IAAI,+BAAqB,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QAC7D,IAAI,kBAAQ,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QAChD,IAAI,mBAAS,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QACjD,IAAI,mBAAS,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QACpD,IAAI,eAAK,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QAC7C,IAAI,gBAAM,EAAE;QACZ,IAAI,iBAAO,EAAE;QACb,IAAI,iBAAO,EAAE;QACb,IAAI,wBAAa,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QACxD,IAAI,wBAAc,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QACzD,IAAI,eAAK,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QAC7C,GAAG,CAAC,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,SAAS;YAC9B,CAAC,CAAC;gBACE,IAAI,mBAAS,CAAC;oBACZ,MAAM,EAAE,iBAAiB,CAAC,SAAS;oBACnC,WAAW,EAAE,iBAAiB;iBAC/B,CAAC;aACH;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,QAAQ;KACZ,CAAC;IAEF,sBAAsB;
|
|
1
|
+
{"version":3,"file":"multi-wallet.js","sourceRoot":"","sources":["../../../../packages/multi-wallet/src/multi-wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export interface WalletLinks {
|
|
|
7
7
|
ios: string;
|
|
8
8
|
};
|
|
9
9
|
showOnlyIfInstalled?: boolean;
|
|
10
|
+
switchNetworkOnlyFromWallet?: boolean;
|
|
10
11
|
}
|
|
11
12
|
export type WalletLinksJson = Record<string, WalletLinks>;
|
|
12
13
|
export declare const getWalletLinks: (walletName: string) => WalletLinks;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"walletLinks.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/utils/walletLinks.ts"],"names":[],"mappings":";;;;AAAA,0FAAwD;AAExD,+DAA4D;
|
|
1
|
+
{"version":3,"file":"walletLinks.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/utils/walletLinks.ts"],"names":[],"mappings":";;;;AAAA,0FAAwD;AAExD,+DAA4D;AAiBrD,MAAM,cAAc,GAAG,CAAC,UAAkB,EAAe,EAAE;IAChE,MAAM,IAAI,GAAoB,2BAAe,CAAC;IAC9C,OAAO,IAAI,CAAC,IAAA,yCAAmB,EAAC,UAAU,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC;AAHW,QAAA,cAAc,kBAGzB"}
|
|
@@ -73,6 +73,9 @@ class EthProvider {
|
|
|
73
73
|
if (!network) {
|
|
74
74
|
throw new Error('Could not find network');
|
|
75
75
|
}
|
|
76
|
+
if (!this.supportsNetworkSwitching()) {
|
|
77
|
+
throw new Error('Network switching is not supported');
|
|
78
|
+
}
|
|
76
79
|
const provider = this.getWeb3Provider();
|
|
77
80
|
if (!provider) {
|
|
78
81
|
throw new Error('Provider not found');
|
|
@@ -92,7 +95,14 @@ class EthProvider {
|
|
|
92
95
|
var _a, _b, _c;
|
|
93
96
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
94
97
|
const { chainId } = network;
|
|
98
|
+
const currentNetworkId = yield this.getNetwork();
|
|
99
|
+
if (currentNetworkId && currentNetworkId === chainId) {
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
95
102
|
try {
|
|
103
|
+
if (!this.supportsNetworkSwitching()) {
|
|
104
|
+
throw new Error('Network switching is not supported');
|
|
105
|
+
}
|
|
96
106
|
return yield provider.send('wallet_switchEthereumChain', [
|
|
97
107
|
{
|
|
98
108
|
chainId: `0x${chainId.toString(16)}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethProvider.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/ethProvider.ts"],"names":[],"mappings":";;;;AAAA,mCAAgC;AAEhC,qDAG4B;AAE5B,+CAA2D;AAW3D,MAAsB,WAAW;IAIzB,cAAc;;;YAGlB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YAE1C,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;gBACjC,OAAO,SAAS,CAAC;aAClB;YAED,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YAE7D,IAAI,CAAC,SAAS,EAAE;gBACd,OAAO,MAAA,IAAA,uCAAwB,EAAC,cAAc,CAAC,0CAAE,QAAQ,CAAC;aAC3D;YAED,OAAO,MAAA,IAAA,yCAA0B,EAAC,cAAc,EAAE,SAAS,CAAC,0CAAE,QAAQ,CAAC;;KACxE;IAED,YAAY,EAAE,WAAW,EAAiC;QAwB1D,eAAU,GAAG,GAAS,EAAE;;YACtB,oEAAoE;YACpE,iCAAiC;YACjC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACpD,IAAI,CAAC,OAAO;gBAAE,OAAO;YAErB,MAAM,MAAM,GAAG,MAAM,CAAA,MAAA,IAAI,CAAC,eAAe,EAAE,0CAAE,UAAU,CAAC,OAAO,CAAC,CAAA,CAAC;YACjE,IAAI,CAAC,MAAM;gBAAE,OAAO;YAEpB,OAAO,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC,CAAA,CAAC;
|
|
1
|
+
{"version":3,"file":"ethProvider.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/ethProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ declare class WalletConnect extends EthProvider implements WalletConnector {
|
|
|
10
10
|
canConnectViaQrCode: boolean;
|
|
11
11
|
canConnectViaCustodialService: boolean;
|
|
12
12
|
isWalletConnect: boolean;
|
|
13
|
+
switchNetworkOnlyFromWallet: boolean;
|
|
13
14
|
client?: Client;
|
|
14
15
|
constructor({ walletName, evmNetworks, }: {
|
|
15
16
|
evmNetworks: EvmNetwork[];
|
|
@@ -17,6 +17,7 @@ class WalletConnect extends ethProvider_1.EthProvider {
|
|
|
17
17
|
this.canConnectViaQrCode = true;
|
|
18
18
|
this.canConnectViaCustodialService = false;
|
|
19
19
|
this.isWalletConnect = true;
|
|
20
|
+
this.switchNetworkOnlyFromWallet = false;
|
|
20
21
|
this.name = walletName;
|
|
21
22
|
}
|
|
22
23
|
get key() {
|
|
@@ -96,6 +97,17 @@ class WalletConnect extends ethProvider_1.EthProvider {
|
|
|
96
97
|
});
|
|
97
98
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
98
99
|
const client = this.getClient();
|
|
100
|
+
const currentNetworkId = yield this.getNetwork();
|
|
101
|
+
if (currentNetworkId && currentNetworkId === network.chainId) {
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
if (this.switchNetworkOnlyFromWallet !== undefined &&
|
|
105
|
+
this.switchNetworkOnlyFromWallet) {
|
|
106
|
+
throw new Error('Network switching is only supported through the wallet');
|
|
107
|
+
}
|
|
108
|
+
if (!this.supportsNetworkSwitching()) {
|
|
109
|
+
throw new Error('Network switching not supported');
|
|
110
|
+
}
|
|
99
111
|
if (!client) {
|
|
100
112
|
throw new Error('Client not found');
|
|
101
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"walletConnect.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/walletConnect/walletConnect.ts"],"names":[],"mappings":";;;AACA,iGAAqE;AACrE,mCAAgC;AAEhC,6DAAqE;AACrE,4CAAwC;AACxC,yDAAsD;AAEtD,4DAQkC;AAOlC,mDAAgD;AAChD,yEAAsE;AACtE,MAAM,aAAc,SAAQ,yBAAW;
|
|
1
|
+
{"version":3,"file":"walletConnect.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/walletConnect/walletConnect.ts"],"names":[],"mappings":"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"}
|