@dynamic-labs/multi-wallet 0.16.0-RC.10 → 0.16.0-RC.12
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/CHANGELOG.md +30 -0
- package/package.json +6 -6
- package/src/wallets/cosmos/keplr.d.ts +7 -6
- package/src/wallets/cosmos/keplr.js +25 -41
- package/src/wallets/cosmos/keplr.js.map +1 -1
- package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.d.ts +2 -7
- package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js +13 -7
- package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js.map +1 -1
- package/src/wallets/ethereum/evm-network.d.ts +2 -0
- package/src/wallets/ethereum/evm-network.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,34 @@
|
|
|
1
1
|
|
|
2
|
+
## [0.16.0-RC.12](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.0-RC.11...v0.16.0-RC.12) (2023-04-06)
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
### Bug Fixes
|
|
6
|
+
|
|
7
|
+
* only display ouath providers in social accounts profile section ([1d11297](https://github.com/dynamic-labs/DynamicAuth/commit/1d11297bad425867068b5f6bf90473aa014166cc))
|
|
8
|
+
* social auth updates ([#1819](https://github.com/dynamic-labs/DynamicAuth/issues/1819)) ([ade0aba](https://github.com/dynamic-labs/DynamicAuth/commit/ade0aba4f02be756456c947cd634f605517942e3))
|
|
9
|
+
* update multi-wallet list ([#1814](https://github.com/dynamic-labs/DynamicAuth/issues/1814)) ([3d97ebd](https://github.com/dynamic-labs/DynamicAuth/commit/3d97ebd50b8458bece4ad1946d0c397232e28a48))
|
|
10
|
+
* update wallets list so the tiles look stacked again ([#1813](https://github.com/dynamic-labs/DynamicAuth/issues/1813)) ([299f46b](https://github.com/dynamic-labs/DynamicAuth/commit/299f46b89e3dcddc0886509502ede9c2e72d58f3))
|
|
11
|
+
|
|
12
|
+
## [0.16.0-RC.11](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.0-RC.10...v0.16.0-RC.11) (2023-04-05)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Features
|
|
16
|
+
|
|
17
|
+
* **DYN-1710:** Add Manual Switch Network view ([3526a5d](https://github.com/dynamic-labs/DynamicAuth/commit/3526a5d869e2b8b8b404959f02360b1e7db75f97))
|
|
18
|
+
* **DYN-2030:** replace hardcoded network properties to api response ([5af6d5e](https://github.com/dynamic-labs/DynamicAuth/commit/5af6d5efba280bfffa196075cf7b9d9ca702296e))
|
|
19
|
+
* enable social profiles integration ([#1729](https://github.com/dynamic-labs/DynamicAuth/issues/1729)) ([d33ae28](https://github.com/dynamic-labs/DynamicAuth/commit/d33ae2859cbe097de58b9caa654c3c5aec13f9fa))
|
|
20
|
+
* export the type of DynamicContextProp ([452fe1b](https://github.com/dynamic-labs/DynamicAuth/commit/452fe1b066b293659357b9722c5383025639f197))
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
### Bug Fixes
|
|
24
|
+
|
|
25
|
+
* add missing dependecy to the useEffect ([cacbcc4](https://github.com/dynamic-labs/DynamicAuth/commit/cacbcc4bc2ec813bb8b4298eefee8e893377434d))
|
|
26
|
+
* **Button:** loading state ([af7a9b0](https://github.com/dynamic-labs/DynamicAuth/commit/af7a9b0e937bbc859f551ba7fc5463e61d7fc1c4))
|
|
27
|
+
* make Wallets the 1st option in widget switcher ([#1794](https://github.com/dynamic-labs/DynamicAuth/issues/1794)) ([7156b37](https://github.com/dynamic-labs/DynamicAuth/commit/7156b37ee4a94fd4e74e3889d93a5613f39fdf0f))
|
|
28
|
+
* only show ens name/avatar if there's any for the selected wallet ([#1779](https://github.com/dynamic-labs/DynamicAuth/issues/1779)) ([1a6cf6b](https://github.com/dynamic-labs/DynamicAuth/commit/1a6cf6b583f55c67d190bc962451073839b3ecfb))
|
|
29
|
+
* update 'wallet not connected' pop up (update copy, add logout button and spinner) ([#1780](https://github.com/dynamic-labs/DynamicAuth/issues/1780)) ([0b2701f](https://github.com/dynamic-labs/DynamicAuth/commit/0b2701fbfb07b23c646f77608a21eff183fdc0ab))
|
|
30
|
+
* update 'wallet not connected' prompt ([#1793](https://github.com/dynamic-labs/DynamicAuth/issues/1793)) ([a9b9064](https://github.com/dynamic-labs/DynamicAuth/commit/a9b906438255d46ac1a4e3b0dd8efaa3c5d92e1c))
|
|
31
|
+
|
|
2
32
|
## [0.16.0-RC.10](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.0-RC.9...v0.16.0-RC.10) (2023-03-31)
|
|
3
33
|
|
|
4
34
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dynamic-labs/multi-wallet",
|
|
3
|
-
"version": "0.16.0-RC.
|
|
3
|
+
"version": "0.16.0-RC.12",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/dynamic-labs/DynamicAuth.git",
|
|
@@ -10,8 +10,8 @@
|
|
|
10
10
|
"@blocto/sdk": "0.3.3",
|
|
11
11
|
"@coinbase/wallet-sdk": "3.6.4",
|
|
12
12
|
"@dynamic-labs/iconic": "0.1.16",
|
|
13
|
-
"@dynamic-labs/sdk-api": "0.0.
|
|
14
|
-
"@dynamic-labs/wallet-book": "0.0.
|
|
13
|
+
"@dynamic-labs/sdk-api": "0.0.173",
|
|
14
|
+
"@dynamic-labs/wallet-book": "0.0.8",
|
|
15
15
|
"@keplr-wallet/types": "0.11.51",
|
|
16
16
|
"@onflow/fcl": "1.3.2",
|
|
17
17
|
"@randlabs/myalgo-connect": "1.4.2",
|
|
@@ -23,13 +23,13 @@
|
|
|
23
23
|
"ethers": "5.7.2",
|
|
24
24
|
"fortmatic": "2.4.0",
|
|
25
25
|
"get-starknet": "1.5.0",
|
|
26
|
-
"magic-sdk": "
|
|
26
|
+
"magic-sdk": "16.0.1",
|
|
27
27
|
"react": "18.2.0",
|
|
28
28
|
"react-dom": "18.2.0",
|
|
29
29
|
"starknet": "3.19.0",
|
|
30
30
|
"tslib": "2.4.1",
|
|
31
|
-
"@dynamic-labs/logger": "0.16.0-RC.
|
|
32
|
-
"@dynamic-labs/wallet-connector-core": "0.16.0-RC.
|
|
31
|
+
"@dynamic-labs/logger": "0.16.0-RC.12",
|
|
32
|
+
"@dynamic-labs/wallet-connector-core": "0.16.0-RC.12"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@walletconnect/types": "^2.2.1"
|
|
@@ -16,16 +16,16 @@ export interface IFetchBalancePagination {
|
|
|
16
16
|
}
|
|
17
17
|
export declare class Keplr implements WalletConnector {
|
|
18
18
|
evmNetworks: EvmNetwork[];
|
|
19
|
-
networkMap: any;
|
|
20
19
|
canConnectViaCustodialService: boolean;
|
|
21
20
|
canConnectViaQrCode: boolean;
|
|
22
21
|
switchNetworkOnlyFromWallet: boolean;
|
|
23
22
|
isWalletConnect: boolean;
|
|
24
|
-
|
|
23
|
+
selectedNetworkId: number;
|
|
25
24
|
name: string;
|
|
26
25
|
connectedChain: Chain;
|
|
27
26
|
supportedChains: Chain[];
|
|
28
27
|
get key(): string;
|
|
28
|
+
chainIdMap: Record<number, string>;
|
|
29
29
|
constructor({ evmNetworks }: {
|
|
30
30
|
evmNetworks: EvmNetwork[];
|
|
31
31
|
});
|
|
@@ -33,11 +33,12 @@ export declare class Keplr implements WalletConnector {
|
|
|
33
33
|
getRpcProvider(): Promise<unknown>;
|
|
34
34
|
getWeb3Provider(): void;
|
|
35
35
|
getDeepLink(): string | undefined;
|
|
36
|
+
get selectedNetwork(): EvmNetwork | undefined;
|
|
36
37
|
get chainId(): string;
|
|
37
|
-
get lcdUrl(): string;
|
|
38
|
-
get rpcUrl(): string;
|
|
39
|
-
get denom(): string;
|
|
40
|
-
get symbol(): string;
|
|
38
|
+
get lcdUrl(): string | undefined;
|
|
39
|
+
get rpcUrl(): string | undefined;
|
|
40
|
+
get denom(): string | undefined;
|
|
41
|
+
get symbol(): string | undefined;
|
|
41
42
|
protected getAccount(): Promise<import("@keplr-wallet/types").AccountData>;
|
|
42
43
|
get keplr(): KeplrWallet;
|
|
43
44
|
endSession?(): Promise<void>;
|
|
@@ -10,51 +10,24 @@ class Keplr {
|
|
|
10
10
|
return (0, normalizeWalletName_1.normalizeWalletName)(this.name);
|
|
11
11
|
}
|
|
12
12
|
constructor({ evmNetworks }) {
|
|
13
|
-
this.networkMap = {
|
|
14
|
-
401: {
|
|
15
|
-
symbol: 'ATOM',
|
|
16
|
-
name: 'COSMOHUB',
|
|
17
|
-
chainId: 'cosmoshub-4',
|
|
18
|
-
lcdUrl: 'https://lcd-cosmoshub.blockapsis.com',
|
|
19
|
-
rpcUrl: 'https://v1.cosmos.network/rpc/v0.44.5',
|
|
20
|
-
denom: 'uatom',
|
|
21
|
-
networkId: 401,
|
|
22
|
-
connectedChain: 'COSMOS',
|
|
23
|
-
},
|
|
24
|
-
402: {
|
|
25
|
-
symbol: 'AXL',
|
|
26
|
-
name: 'Keplr (Axelar)',
|
|
27
|
-
chainId: 'axelar-dojo-1',
|
|
28
|
-
lcdUrl: 'https://lcd-axelar.imperator.co',
|
|
29
|
-
rpcUrl: 'https://rpc-axelar.imperator.co',
|
|
30
|
-
denom: 'uaxl',
|
|
31
|
-
networkId: 402,
|
|
32
|
-
connectedChain: 'COSMOS',
|
|
33
|
-
},
|
|
34
|
-
403: {
|
|
35
|
-
symbol: 'OSMO',
|
|
36
|
-
name: 'Keplr (Osmosis)',
|
|
37
|
-
chainId: 'osmosis-1',
|
|
38
|
-
lcdUrl: 'https://lcd.osmosis.zone',
|
|
39
|
-
rpcUrl: 'https://rpc.osmosis.zone',
|
|
40
|
-
denom: 'uosmo',
|
|
41
|
-
networkId: 403,
|
|
42
|
-
connectedChain: 'COSMOS',
|
|
43
|
-
},
|
|
44
|
-
};
|
|
45
13
|
this.canConnectViaCustodialService = false;
|
|
46
14
|
this.canConnectViaQrCode = false;
|
|
47
15
|
this.switchNetworkOnlyFromWallet = true;
|
|
48
16
|
this.isWalletConnect = false;
|
|
49
|
-
this.
|
|
17
|
+
this.selectedNetworkId = 401;
|
|
50
18
|
this.name = 'Keplr';
|
|
51
19
|
this.connectedChain = 'COSMOS';
|
|
52
20
|
this.supportedChains = ['COSMOS'];
|
|
21
|
+
this.chainIdMap = {
|
|
22
|
+
401: 'cosmoshub-4',
|
|
23
|
+
402: 'axelar-dojo-1',
|
|
24
|
+
403: 'osmosis-1',
|
|
25
|
+
};
|
|
53
26
|
this.evmNetworks = evmNetworks;
|
|
54
27
|
this._handleAccountChange = this._handleAccountChange.bind(this);
|
|
55
28
|
const persistedNetworkId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
|
|
56
29
|
if (persistedNetworkId) {
|
|
57
|
-
this.
|
|
30
|
+
this.selectedNetworkId = Number(persistedNetworkId);
|
|
58
31
|
}
|
|
59
32
|
}
|
|
60
33
|
getRpcProvider() {
|
|
@@ -66,20 +39,31 @@ class Keplr {
|
|
|
66
39
|
getDeepLink() {
|
|
67
40
|
throw new Error('Method not implemented.');
|
|
68
41
|
}
|
|
42
|
+
get selectedNetwork() {
|
|
43
|
+
var _a;
|
|
44
|
+
return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => network.networkId === this.selectedNetworkId);
|
|
45
|
+
}
|
|
69
46
|
get chainId() {
|
|
70
|
-
|
|
47
|
+
if (!this.selectedNetwork) {
|
|
48
|
+
return '401';
|
|
49
|
+
}
|
|
50
|
+
return this.chainIdMap[this.selectedNetwork.chainId];
|
|
71
51
|
}
|
|
72
52
|
get lcdUrl() {
|
|
73
|
-
|
|
53
|
+
var _a;
|
|
54
|
+
return (_a = this.selectedNetwork) === null || _a === void 0 ? void 0 : _a.lcdUrl;
|
|
74
55
|
}
|
|
75
56
|
get rpcUrl() {
|
|
76
|
-
|
|
57
|
+
var _a;
|
|
58
|
+
return (_a = this.selectedNetwork) === null || _a === void 0 ? void 0 : _a.rpcUrls[0];
|
|
77
59
|
}
|
|
78
60
|
get denom() {
|
|
79
|
-
|
|
61
|
+
var _a;
|
|
62
|
+
return (_a = this.selectedNetwork) === null || _a === void 0 ? void 0 : _a.nativeCurrency.denom;
|
|
80
63
|
}
|
|
81
64
|
get symbol() {
|
|
82
|
-
|
|
65
|
+
var _a;
|
|
66
|
+
return (_a = this.selectedNetwork) === null || _a === void 0 ? void 0 : _a.nativeCurrency.symbol;
|
|
83
67
|
}
|
|
84
68
|
getAccount() {
|
|
85
69
|
var _a, _b;
|
|
@@ -129,7 +113,7 @@ class Keplr {
|
|
|
129
113
|
}
|
|
130
114
|
getNetwork() {
|
|
131
115
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
132
|
-
return Promise.resolve(this.
|
|
116
|
+
return Promise.resolve(this.selectedNetworkId);
|
|
133
117
|
});
|
|
134
118
|
}
|
|
135
119
|
getSigner() {
|
|
@@ -217,7 +201,7 @@ class Keplr {
|
|
|
217
201
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
218
202
|
if (!networkChainId)
|
|
219
203
|
return;
|
|
220
|
-
this.
|
|
204
|
+
this.selectedNetworkId = networkChainId;
|
|
221
205
|
localStorage.setItem(DYNAMIC_KEPLR_NETWORK_ID, networkChainId.toString());
|
|
222
206
|
});
|
|
223
207
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keplr.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/cosmos/keplr.ts"],"names":[],"mappings":";;;;AASA,+CAA4C;AAC5C,yEAAsE;AAmBtE,MAAM,wBAAwB,GAAG,0BAA0B,CAAC;AAE5D,MAAa,KAAK;
|
|
1
|
+
{"version":3,"file":"keplr.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/cosmos/keplr.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Magic } from 'magic-sdk';
|
|
2
2
|
import { EmailOTPWalletConnector } from '@dynamic-labs/wallet-connector-core';
|
|
3
3
|
import { EmailMagicWalletConnector } from '../EmailMagicWalletConnector';
|
|
4
4
|
import { MagicPromiEvent } from '../MagicWalletConnector';
|
|
5
|
-
type LoginWithEmailOTPPromiEvent =
|
|
6
|
-
done: (result: string | null) => void;
|
|
7
|
-
error: (reason: any) => void;
|
|
8
|
-
settled: () => void;
|
|
9
|
-
}>;
|
|
5
|
+
type LoginWithEmailOTPPromiEvent = ReturnType<Magic['auth']['loginWithEmailOTP']>;
|
|
10
6
|
export declare class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector implements EmailOTPWalletConnector {
|
|
11
7
|
_handle: LoginWithEmailOTPPromiEvent | undefined;
|
|
12
|
-
cancelPreviousEmail(): void;
|
|
13
8
|
verifyOneTimePassword(otp: string): Promise<boolean>;
|
|
14
9
|
loginWithMagic(): Promise<MagicPromiEvent | undefined>;
|
|
15
10
|
}
|
|
@@ -2,36 +2,35 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EmailOTPMagicWalletConnector = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const logger_1 = require("../../../../utils/logger");
|
|
5
6
|
const EmailMagicWalletConnector_1 = require("../EmailMagicWalletConnector");
|
|
6
7
|
class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector_1.EmailMagicWalletConnector {
|
|
7
|
-
cancelPreviousEmail() {
|
|
8
|
-
super.cancelPreviousEmail();
|
|
9
|
-
this._magicSdk = undefined;
|
|
10
|
-
}
|
|
11
8
|
verifyOneTimePassword(otp) {
|
|
12
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
10
|
const handle = this._handle;
|
|
14
11
|
const timeoutMs = 1000 * 10;
|
|
12
|
+
const invalidOTPError = new Error('Please double check your code and try again');
|
|
15
13
|
if (!handle) {
|
|
16
14
|
throw new Error('Login with email OTP before verifying');
|
|
17
15
|
}
|
|
18
16
|
const timeoutPromise = new Promise((resolve, reject) => {
|
|
19
17
|
setTimeout(() => {
|
|
20
|
-
reject(
|
|
18
|
+
reject(invalidOTPError);
|
|
21
19
|
}, timeoutMs);
|
|
22
20
|
});
|
|
23
21
|
const promise = new Promise((resolve, reject) => {
|
|
24
22
|
handle
|
|
25
23
|
.on('done', () => resolve(true))
|
|
26
|
-
.on('invalid-email-otp', () => reject(
|
|
24
|
+
.on('invalid-email-otp', () => reject(invalidOTPError))
|
|
27
25
|
.on('error', reject)
|
|
28
26
|
.catch(reject)
|
|
29
|
-
.emit('
|
|
27
|
+
.emit('verify-email-otp', otp);
|
|
30
28
|
});
|
|
31
29
|
return Promise.race([promise, timeoutPromise]);
|
|
32
30
|
});
|
|
33
31
|
}
|
|
34
32
|
loginWithMagic() {
|
|
33
|
+
var _a;
|
|
35
34
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
35
|
const client = this._getClient();
|
|
37
36
|
const user = yield this.getUserMetadata();
|
|
@@ -42,6 +41,13 @@ class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector_1.EmailMagi
|
|
|
42
41
|
const { email } = this;
|
|
43
42
|
if (!email)
|
|
44
43
|
return;
|
|
44
|
+
(_a = this._handle) === null || _a === void 0 ? void 0 : _a.emit('cancel');
|
|
45
|
+
try {
|
|
46
|
+
yield this._handle;
|
|
47
|
+
}
|
|
48
|
+
catch (err) {
|
|
49
|
+
logger_1.logger.error(err);
|
|
50
|
+
}
|
|
45
51
|
this._handle = client.auth.loginWithEmailOTP({
|
|
46
52
|
email,
|
|
47
53
|
showUI: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailOTPMagicWalletConnector.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.ts"],"names":[],"mappings":";;;;AAIA,4EAAyE;
|
|
1
|
+
{"version":3,"file":"EmailOTPMagicWalletConnector.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.ts"],"names":[],"mappings":";;;;AAIA,qDAAkD;AAClD,4EAAyE;AAOzE,MAAa,4BACX,SAAQ,qDAAyB;IAK3B,qBAAqB,CAAC,GAAW;;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;YAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,eAAe,GAAG,IAAI,KAAK,CAC/B,6CAA6C,CAC9C,CAAC;YAEF,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;aAC1D;YAED,MAAM,cAAc,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9D,UAAU,CAAC,GAAG,EAAE;oBACd,MAAM,CAAC,eAAe,CAAC,CAAC;gBAC1B,CAAC,EAAE,SAAS,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACvD,MAAM;qBACH,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;qBAC/B,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;qBACtD,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;qBACnB,KAAK,CAAC,MAAM,CAAC;qBACb,IAAI,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;IAEc,cAAc;;;YAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAEjC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAE1C,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC9B,IAAI,CAAC,QAAQ,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC;gBACjC,OAAO,IAAI,CAAC,aAAa,CAAC;aAC3B;YAED,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAEvB,IAAI,CAAC,KAAK;gBAAE,OAAO;YAEnB,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE7B,IAAI;gBACF,MAAM,IAAI,CAAC,OAAO,CAAC;aACpB;YAAC,OAAO,GAAG,EAAE;gBACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACnB;YAED,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBAC3C,KAAK;gBACL,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,OAAO,CAAC;;KACrB;CACF;AAhED,oEAgEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-network.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/evm-network.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"evm-network.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/evm-network.ts"],"names":[],"mappings":";;;AAkBO,MAAM,cAAc,GAAG,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,QAAQ,GAKT,EAA0B,EAAE;IAC3B,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,EAAE;QACrB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,OAAO,IAAI,IAAI,EAAE;QACnB,OAAO,QAAQ,CAAC,IAAI,CAClB,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,CACvE,CAAC;KACH;SAAM,IAAI,OAAO,EAAE;QAClB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;KAChE;SAAM;QACL,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;KAC/D;AACH,CAAC,CAAC;AAtBW,QAAA,cAAc,kBAsBzB"}
|