@dynamic-labs/multi-wallet 0.13.46 → 0.13.47

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dynamic-labs/multi-wallet",
3
- "version": "0.13.46",
3
+ "version": "0.13.47",
4
4
  "publishConfig": {
5
5
  "registry": "https://registry.npmjs.org"
6
6
  },
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const sdk_1 = __importDefault(require("@blocto/sdk"));
16
16
  const ethers_1 = require("ethers");
17
17
  const normalizeWalletName_1 = require("../../utils/normalizeWalletName");
18
+ const console_1 = __importDefault(require("../../utils/console"));
18
19
  const ethProvider_1 = require("./ethProvider");
19
20
  const ethProviderHelper_1 = require("./ethProviderHelper");
20
21
  class BloctoEvm extends ethProvider_1.EthProvider {
@@ -64,16 +65,22 @@ class BloctoEvm extends ethProvider_1.EthProvider {
64
65
  // then ethers would retry and the modal will open again.
65
66
  fetchPublicAddress() {
66
67
  return __awaiter(this, void 0, void 0, function* () {
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];
68
+ try {
69
+ const client = this.getClient();
70
+ if (client && client.ethereum) {
71
+ const addresses = yield client.ethereum.request({
72
+ method: 'eth_requestAccounts',
73
+ });
74
+ if (addresses.length > 0) {
75
+ return addresses[0];
76
+ }
74
77
  }
78
+ return undefined;
79
+ }
80
+ catch (e) {
81
+ console_1.default.error(e);
82
+ return Promise.reject(e);
75
83
  }
76
- return undefined;
77
84
  });
78
85
  }
79
86
  connect() {
@@ -126,7 +133,7 @@ class BloctoEvm extends ethProvider_1.EthProvider {
126
133
  endSession() {
127
134
  return __awaiter(this, void 0, void 0, function* () {
128
135
  const client = this.getClient();
129
- if (client && client.ethereum) {
136
+ if (client && client.ethereum && client.ethereum.accounts.length > 0) {
130
137
  yield client.ethereum.request({ method: 'wallet_disconnect' });
131
138
  localStorage.removeItem('sdk.session');
132
139
  }
@@ -1 +1 @@
1
- {"version":3,"file":"BloctoEvm.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/BloctoEvm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BloctoEvm.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/BloctoEvm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,mCAAgC;AAGhC,yEAAsE;AACtE,kEAA0C;AAG1C,+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,yEAAyE;QACzE,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACpE,OAAO,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SAC3D;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED,oGAAoG;IACpG,uFAAuF;IACvF,iGAAiG;IACjG,yDAAyD;IACnD,kBAAkB;;YACtB,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;gBAChC,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE;oBAC7B,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;wBAC9C,MAAM,EAAE,qBAAqB;qBAC9B,CAAC,CAAC;oBACH,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACxB,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC;qBACrB;iBACF;gBACD,OAAO,SAAS,CAAC;aAClB;YAAC,OAAO,CAAC,EAAE;gBACV,iBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aAC1B;QACH,CAAC;KAAA;IAEK,OAAO;;YACX,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC;KAAA;IAED,oBAAoB;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,cAAc,CAAC,aAAqB;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACzC,CAAC;IAEK,WAAW,CAAC,aAAqB;;YACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACtC,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,CAAC,aAAa,CAAC,CAAC;QAC5C,CAAC;KAAA;IAED,wBAAwB;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAEc,aAAa,CAAC,EAC3B,cAAc,GACG;;;YACjB,IAAI,CAAC,cAAc;gBAAE,OAAO;YAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CACtC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,cAAc,CAChD,CAAC;YACF,IAAI,UAAU,IAAI,cAAc,KAAK,IAAI,CAAC,OAAO,EAAE;gBACjD,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACxE,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;gBAE9B,IAAI,CAAC,MAAM,GAAG,IAAI,aAAS,CAAC;oBAC1B,QAAQ,EAAE;wBACR,OAAO,EAAE,KAAK,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,CAAC,EAAE,CAAC,EAAE;wBAC1C,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;qBAC3B;iBACF,CAAC,CAAC;aACJ;;KACF;IAED,wBAAwB;IACxB,wBAAwB;IACxB,wBAAwB;IAExB,mBAAmB;QACjB,OAAO;IACT,CAAC;IAED,sBAAsB;QACpB,OAAO;IACT,CAAC;IAEK,UAAU;;YACd,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChC,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpE,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAC;gBAC/D,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;aACxC;QACH,CAAC;KAAA;CACF;AAED,kBAAe,SAAS,CAAC"}