@dynamic-labs/multi-wallet 0.13.45 → 0.13.46
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
CHANGED
|
@@ -50,20 +50,30 @@ class BloctoEvm extends ethProvider_1.EthProvider {
|
|
|
50
50
|
}
|
|
51
51
|
getWeb3Provider() {
|
|
52
52
|
const client = this.getClient();
|
|
53
|
-
|
|
53
|
+
// If there are no accounts yet, we shouldn't wrap the provider in ethers
|
|
54
|
+
if (client && client.ethereum && client.ethereum.accounts.length > 0) {
|
|
54
55
|
return new ethers_1.ethers.providers.Web3Provider(client.ethereum);
|
|
55
56
|
}
|
|
56
57
|
else {
|
|
57
58
|
return undefined;
|
|
58
59
|
}
|
|
59
60
|
}
|
|
61
|
+
// We are calling the client directly and not via Web3Provider because if we will wrap it in Ethers,
|
|
62
|
+
// Ethers will be making retries on failure. This becomes an issue on the connect step.
|
|
63
|
+
// When Blocto's modal closes prior to receiving a response with the address on the connect step,
|
|
64
|
+
// then ethers would retry and the modal will open again.
|
|
60
65
|
fetchPublicAddress() {
|
|
61
66
|
return __awaiter(this, void 0, void 0, function* () {
|
|
62
|
-
const
|
|
63
|
-
if (
|
|
64
|
-
|
|
67
|
+
const client = this.getClient();
|
|
68
|
+
if (client && client.ethereum) {
|
|
69
|
+
const addresses = yield client.ethereum.request({
|
|
70
|
+
method: 'eth_requestAccounts',
|
|
71
|
+
});
|
|
72
|
+
if (addresses.length > 0) {
|
|
73
|
+
return addresses[0];
|
|
74
|
+
}
|
|
65
75
|
}
|
|
66
|
-
return
|
|
76
|
+
return undefined;
|
|
67
77
|
});
|
|
68
78
|
}
|
|
69
79
|
connect() {
|
|
@@ -86,9 +96,6 @@ class BloctoEvm extends ethProvider_1.EthProvider {
|
|
|
86
96
|
supportsNetworkSwitching() {
|
|
87
97
|
return true;
|
|
88
98
|
}
|
|
89
|
-
// TODO - switchNetworks is not currently working.
|
|
90
|
-
// It requires more work within multi-wallet and fix some widget bugs
|
|
91
|
-
// (not refreshing the wallet address on network switch)
|
|
92
99
|
switchNetwork({ networkChainId, }) {
|
|
93
100
|
var _a;
|
|
94
101
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BloctoEvm.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/BloctoEvm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,mCAAgC;AAGhC,yEAAsE;AAGtE,+CAA8D;AAC9D,2DAAwD;AACxD,MAAM,SAAU,SAAQ,yBAAW;IAajC,YAAY,EAAE,WAAW,EAAiC;QACxD,MAAM,uBAAuB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACvD,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAC7D,CAAC;QACF,KAAK,CAAC,EAAE,WAAW,EAAE,uBAAuB,EAAE,CAAC,CAAC;QAhBlD,sBAAiB,GAAG,6BAA6B,CAAC;QAGlD,SAAI,GAAG,WAAW,CAAC;QACnB,wBAAmB,GAAG,KAAK,CAAC;QAC5B,kCAA6B,GAAG,IAAI,CAAC;QACrC,oBAAe,GAAG,KAAK,CAAC;QACxB,mBAAc,GAAU,KAAK,CAAC;QAC9B,oBAAe,GAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE1C,sBAAiB,GAAG,IAAI,qCAAiB,EAAE,CAAC;QAO1C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,GAAG,CAAC;IAC7E,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAA,yCAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAEO,SAAS;QACf,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC;YACzE,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,MAAM,GAAG,IAAI,aAAS,CAAC;oBAC1B,QAAQ,EAAE;wBACR,OAAO,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;wBACzC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;qBACxB;iBACF,CAAC,CAAC;aACJ;SACF;QACD,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEQ,eAAe;QACtB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"BloctoEvm.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/BloctoEvm.ts"],"names":[],"mappings":"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"}
|