@keplr-wallet/stores-core 0.12.299 → 0.12.300-rc.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/build/core/keyring.d.ts +1 -2
- package/build/core/keyring.js +2 -2
- package/build/core/keyring.js.map +1 -1
- package/build/core/tokens.d.ts +1 -0
- package/build/core/tokens.js +53 -53
- package/build/core/tokens.js.map +1 -1
- package/package.json +9 -9
- package/src/core/keyring.ts +2 -3
- package/src/core/tokens.ts +62 -62
package/build/core/keyring.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { MessageRequester } from "@keplr-wallet/router";
|
|
2
2
|
import { BIP44HDPath, ExtendedKey, KeyInfo, KeyRingStatus, PlainObject } from "@keplr-wallet/background";
|
|
3
3
|
import type { MultiAccounts } from "@keplr-wallet/background";
|
|
4
|
-
import { ChainInfo } from "@keplr-wallet/types";
|
|
5
4
|
export declare class KeyRingStore {
|
|
6
5
|
protected readonly eventDispatcher: {
|
|
7
6
|
dispatchEvent: (type: string) => void;
|
|
@@ -43,7 +42,7 @@ export declare class KeyRingStore {
|
|
|
43
42
|
status: KeyRingStatus;
|
|
44
43
|
keyInfos: KeyInfo[];
|
|
45
44
|
}>;
|
|
46
|
-
needKeyCoinTypeFinalize(vaultId: string,
|
|
45
|
+
needKeyCoinTypeFinalize(vaultId: string, chainId: string): boolean;
|
|
47
46
|
computeNotFinalizedKeyAddresses(vaultId: string, chainId: string): Promise<{
|
|
48
47
|
coinType: number;
|
|
49
48
|
bech32Address: string;
|
package/build/core/keyring.js
CHANGED
|
@@ -101,7 +101,7 @@ class KeyRingStore {
|
|
|
101
101
|
this._keyInfos = result.keyInfos;
|
|
102
102
|
this.eventDispatcher.dispatchEvent("keplr_keystorechange");
|
|
103
103
|
}
|
|
104
|
-
needKeyCoinTypeFinalize(vaultId,
|
|
104
|
+
needKeyCoinTypeFinalize(vaultId, chainId) {
|
|
105
105
|
const keyInfo = this.keyInfos.find((keyInfo) => keyInfo.id === vaultId);
|
|
106
106
|
if (!keyInfo) {
|
|
107
107
|
return false;
|
|
@@ -109,7 +109,7 @@ class KeyRingStore {
|
|
|
109
109
|
if (keyInfo.type !== "mnemonic" && keyInfo.type !== "keystone") {
|
|
110
110
|
return false;
|
|
111
111
|
}
|
|
112
|
-
const coinTypeTag = `keyRing-${cosmos_1.ChainIdHelper.parse(
|
|
112
|
+
const coinTypeTag = `keyRing-${cosmos_1.ChainIdHelper.parse(chainId).identifier}-coinType`;
|
|
113
113
|
return keyInfo.insensitive[coinTypeTag] == null;
|
|
114
114
|
}
|
|
115
115
|
computeNotFinalizedKeyAddresses(vaultId, chainId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/core/keyring.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,iDAAyE;AACzE,+BAOc;AACd,iDAAmD;AACnD,yDA0BkC;
|
|
1
|
+
{"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/core/keyring.ts"],"names":[],"mappings":"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"}
|
package/build/core/tokens.d.ts
CHANGED
|
@@ -30,6 +30,7 @@ export declare class TokensStore {
|
|
|
30
30
|
tokenIsRegistered(chainId: string, coinMinimalDenom: string): boolean;
|
|
31
31
|
addToken(chainId: string, currency: AppCurrency): Promise<void>;
|
|
32
32
|
removeToken(chainId: string, tokenInfo: TokenInfo): Promise<void>;
|
|
33
|
+
private updateTokenMap;
|
|
33
34
|
get waitingSuggestedToken(): InteractionWaitingData<{
|
|
34
35
|
chainId: string;
|
|
35
36
|
contractAddress: string;
|
package/build/core/tokens.js
CHANGED
|
@@ -95,14 +95,20 @@ class TokensStore {
|
|
|
95
95
|
for (const modularChainInfoImpl of modularChainInfoImpls) {
|
|
96
96
|
const chainIdentifier = cosmos_1.ChainIdHelper.parse(modularChainInfoImpl.chainId);
|
|
97
97
|
const prevTokens = (_b = this.prevTokenMap.get(chainIdentifier.identifier)) !== null && _b !== void 0 ? _b : [];
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
98
|
+
const module = "cosmos" in modularChainInfoImpl.embedded
|
|
99
|
+
? "cosmos"
|
|
100
|
+
: "starknet" in modularChainInfoImpl.embedded
|
|
101
|
+
? "starknet"
|
|
102
|
+
: "bitcoin" in modularChainInfoImpl.embedded
|
|
103
|
+
? "bitcoin"
|
|
104
|
+
: "evm";
|
|
105
|
+
if (modularChainInfoImpl.matchModule(module)) {
|
|
106
|
+
modularChainInfoImpl.removeCurrencies(module, ...prevTokens.map((token) => token.currency.coinMinimalDenom));
|
|
101
107
|
}
|
|
102
108
|
}
|
|
103
109
|
}
|
|
104
110
|
updateChainInfos() {
|
|
105
|
-
var _a, _b;
|
|
111
|
+
var _a, _b, _c;
|
|
106
112
|
const modularChainInfoImpls = this.chainStore.modularChainInfoImpls;
|
|
107
113
|
for (const modularChainInfoImpl of modularChainInfoImpls) {
|
|
108
114
|
if ("cosmos" in modularChainInfoImpl.embedded) {
|
|
@@ -122,6 +128,7 @@ class TokensStore {
|
|
|
122
128
|
}
|
|
123
129
|
}
|
|
124
130
|
}
|
|
131
|
+
modularChainInfoImpl.addCurrencies("cosmos", ...adds);
|
|
125
132
|
this.chainStore
|
|
126
133
|
.getChain(modularChainInfoImpl.chainId)
|
|
127
134
|
.addCurrencies(...adds);
|
|
@@ -137,6 +144,15 @@ class TokensStore {
|
|
|
137
144
|
modularChainInfoImpl.addCurrencies("starknet", ...adds);
|
|
138
145
|
}
|
|
139
146
|
}
|
|
147
|
+
else if ("evm" in modularChainInfoImpl.embedded) {
|
|
148
|
+
const chainIdentifier = cosmos_1.ChainIdHelper.parse(modularChainInfoImpl.chainId);
|
|
149
|
+
const tokens = (_c = this.tokenMap.get(chainIdentifier.identifier)) !== null && _c !== void 0 ? _c : [];
|
|
150
|
+
const adds = [];
|
|
151
|
+
for (const token of tokens) {
|
|
152
|
+
adds.push(token.currency);
|
|
153
|
+
}
|
|
154
|
+
modularChainInfoImpl.addCurrencies("evm", ...adds);
|
|
155
|
+
}
|
|
140
156
|
}
|
|
141
157
|
this.prevTokenMap = this.tokenMap;
|
|
142
158
|
}
|
|
@@ -161,16 +177,18 @@ class TokensStore {
|
|
|
161
177
|
});
|
|
162
178
|
}
|
|
163
179
|
getTokens(chainId) {
|
|
164
|
-
var _a, _b;
|
|
180
|
+
var _a, _b, _c, _d;
|
|
165
181
|
const bech32Address = this.accountStore.getAccount(chainId).bech32Address;
|
|
166
182
|
const modularChainInfo = this.chainStore.getModularChain(chainId);
|
|
167
|
-
if ("cosmos" in modularChainInfo) {
|
|
168
|
-
|
|
169
|
-
|
|
183
|
+
if ("evm" in modularChainInfo && !("cosmos" in modularChainInfo)) {
|
|
184
|
+
return (_a = this.tokenMap.get(cosmos_1.ChainIdHelper.parse(chainId).identifier)) !== null && _a !== void 0 ? _a : [];
|
|
185
|
+
}
|
|
186
|
+
else if ("cosmos" in modularChainInfo) {
|
|
187
|
+
const hasBech32Config = modularChainInfo.cosmos.bech32Config != null;
|
|
170
188
|
const associatedAccountAddress = hasBech32Config && bech32Address
|
|
171
|
-
? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address,
|
|
189
|
+
? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, (_b = modularChainInfo.cosmos.bech32Config) === null || _b === void 0 ? void 0 : _b.bech32PrefixAccAddr).address).toString("hex")
|
|
172
190
|
: undefined;
|
|
173
|
-
const tokens = (
|
|
191
|
+
const tokens = (_c = this.tokenMap.get(cosmos_1.ChainIdHelper.parse(chainId).identifier)) !== null && _c !== void 0 ? _c : [];
|
|
174
192
|
return tokens.filter((token) => {
|
|
175
193
|
if (token.associatedAccountAddress &&
|
|
176
194
|
associatedAccountAddress &&
|
|
@@ -181,7 +199,7 @@ class TokensStore {
|
|
|
181
199
|
});
|
|
182
200
|
}
|
|
183
201
|
else if ("starknet" in modularChainInfo) {
|
|
184
|
-
return (
|
|
202
|
+
return (_d = this.tokenMap.get(chainId)) !== null && _d !== void 0 ? _d : [];
|
|
185
203
|
}
|
|
186
204
|
else {
|
|
187
205
|
throw new Error(`Unsupported chain: ${chainId}`);
|
|
@@ -198,37 +216,23 @@ class TokensStore {
|
|
|
198
216
|
if (!bech32Address) {
|
|
199
217
|
throw new Error("Account not initialized");
|
|
200
218
|
}
|
|
201
|
-
const
|
|
202
|
-
const isEvmChain = chainInfo.evm != null;
|
|
203
|
-
const hasBech32Config = chainInfo.bech32Config != null;
|
|
219
|
+
const hasBech32Config = modularChainInfo.cosmos.bech32Config != null;
|
|
204
220
|
const associatedAccountAddress = hasBech32Config
|
|
205
|
-
? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address,
|
|
221
|
+
? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, modularChainInfo.cosmos.bech32Config.bech32PrefixAccAddr).address).toString("hex")
|
|
206
222
|
: "";
|
|
207
|
-
const msg =
|
|
208
|
-
? new background_1.AddERC20TokenMsg(chainId, currency)
|
|
209
|
-
: new background_1.AddTokenMsg(chainId, associatedAccountAddress, currency);
|
|
223
|
+
const msg = new background_1.AddTokenMsg(chainId, associatedAccountAddress, currency);
|
|
210
224
|
const res = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
|
|
211
225
|
(0, mobx_1.runInAction)(() => {
|
|
212
|
-
const
|
|
213
|
-
|
|
214
|
-
const newTokens = res[chainIdentifier.identifier];
|
|
215
|
-
if (newTokens) {
|
|
216
|
-
newTokenMap.set(chainIdentifier.identifier, newTokens);
|
|
217
|
-
}
|
|
218
|
-
this.tokenMap = newTokenMap;
|
|
226
|
+
const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainId).identifier;
|
|
227
|
+
this.updateTokenMap(chainIdentifier, res[chainIdentifier]);
|
|
219
228
|
});
|
|
220
229
|
}
|
|
221
|
-
else if ("starknet" in modularChainInfo) {
|
|
230
|
+
else if ("evm" in modularChainInfo || "starknet" in modularChainInfo) {
|
|
222
231
|
const msg = new background_1.AddERC20TokenMsg(chainId, currency);
|
|
223
232
|
const res = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
|
|
224
233
|
(0, mobx_1.runInAction)(() => {
|
|
225
|
-
const
|
|
226
|
-
|
|
227
|
-
const newTokens = res[chainIdentifier.identifier];
|
|
228
|
-
if (newTokens) {
|
|
229
|
-
newTokenMap.set(chainIdentifier.identifier, newTokens);
|
|
230
|
-
}
|
|
231
|
-
this.tokenMap = newTokenMap;
|
|
234
|
+
const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainId).identifier;
|
|
235
|
+
this.updateTokenMap(chainIdentifier, res[chainIdentifier]);
|
|
232
236
|
});
|
|
233
237
|
}
|
|
234
238
|
else {
|
|
@@ -247,39 +251,25 @@ class TokensStore {
|
|
|
247
251
|
})();
|
|
248
252
|
const modularChainInfo = this.chainStore.getModularChain(chainId);
|
|
249
253
|
if ("cosmos" in modularChainInfo) {
|
|
250
|
-
const
|
|
251
|
-
const isEvmChain = chainInfo.evm !== undefined;
|
|
252
|
-
const msg = isEvmChain
|
|
253
|
-
? new background_1.RemoveERC20TokenMsg(chainId, contractAddress)
|
|
254
|
-
: new background_1.RemoveTokenMsg(chainId, (_a = tokenInfo.associatedAccountAddress) !== null && _a !== void 0 ? _a : "", contractAddress);
|
|
254
|
+
const msg = new background_1.RemoveTokenMsg(chainId, (_a = tokenInfo.associatedAccountAddress) !== null && _a !== void 0 ? _a : "", contractAddress);
|
|
255
255
|
const res = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
|
|
256
256
|
(0, mobx_1.runInAction)(() => {
|
|
257
257
|
// Remove 이후에는 지워진 토큰에 대한 싱크를 맞추기 위해서 clearTokensFromChainInfos를 호출한다.
|
|
258
258
|
// 그냥 다 지우고 다시 다 설정하는 방식임.
|
|
259
259
|
this.clearTokensFromChainInfos();
|
|
260
|
-
const
|
|
261
|
-
|
|
262
|
-
const newTokens = res[chainIdentifier.identifier];
|
|
263
|
-
if (newTokens) {
|
|
264
|
-
newTokenMap.set(chainIdentifier.identifier, newTokens);
|
|
265
|
-
}
|
|
266
|
-
this.tokenMap = newTokenMap;
|
|
260
|
+
const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainId).identifier;
|
|
261
|
+
this.updateTokenMap(chainIdentifier, res[chainIdentifier]);
|
|
267
262
|
});
|
|
268
263
|
}
|
|
269
|
-
else if ("starknet" in modularChainInfo) {
|
|
264
|
+
else if ("evm" in modularChainInfo || "starknet" in modularChainInfo) {
|
|
270
265
|
const msg = new background_1.RemoveERC20TokenMsg(chainId, contractAddress);
|
|
271
266
|
const res = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
|
|
272
267
|
(0, mobx_1.runInAction)(() => {
|
|
273
268
|
// Remove 이후에는 지워진 토큰에 대한 싱크를 맞추기 위해서 clearTokensFromChainInfos를 호출한다.
|
|
274
269
|
// 그냥 다 지우고 다시 다 설정하는 방식임.
|
|
275
270
|
this.clearTokensFromChainInfos();
|
|
276
|
-
const
|
|
277
|
-
|
|
278
|
-
const newTokens = res[chainIdentifier.identifier];
|
|
279
|
-
if (newTokens) {
|
|
280
|
-
newTokenMap.set(chainIdentifier.identifier, newTokens);
|
|
281
|
-
}
|
|
282
|
-
this.tokenMap = newTokenMap;
|
|
271
|
+
const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainId).identifier;
|
|
272
|
+
this.updateTokenMap(chainIdentifier, res[chainIdentifier]);
|
|
283
273
|
});
|
|
284
274
|
}
|
|
285
275
|
else {
|
|
@@ -287,6 +277,13 @@ class TokensStore {
|
|
|
287
277
|
}
|
|
288
278
|
});
|
|
289
279
|
}
|
|
280
|
+
updateTokenMap(chainIdentifier, newTokens) {
|
|
281
|
+
const newTokenMap = new Map(this.tokenMap);
|
|
282
|
+
if (newTokens) {
|
|
283
|
+
newTokenMap.set(chainIdentifier, newTokens);
|
|
284
|
+
}
|
|
285
|
+
this.tokenMap = newTokenMap;
|
|
286
|
+
}
|
|
290
287
|
get waitingSuggestedToken() {
|
|
291
288
|
const cw20Datas = this.interactionStore.getAllData("suggest-token-cw20");
|
|
292
289
|
if (cw20Datas.length > 0) {
|
|
@@ -328,5 +325,8 @@ __decorate([
|
|
|
328
325
|
__decorate([
|
|
329
326
|
mobx_1.action
|
|
330
327
|
], TokensStore.prototype, "clearTokensFromChainInfos", null);
|
|
328
|
+
__decorate([
|
|
329
|
+
mobx_1.action
|
|
330
|
+
], TokensStore.prototype, "updateTokenMap", null);
|
|
331
331
|
exports.TokensStore = TokensStore;
|
|
332
332
|
//# sourceMappingURL=tokens.js.map
|
package/build/core/tokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/core/tokens.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/core/tokens.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@keplr-wallet/stores-core",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.300-rc.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"author": "chainapsis",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -16,13 +16,13 @@
|
|
|
16
16
|
"lint-fix": "npx eslint --fix \"src/**/*\" && npx prettier --write \"src/**/*\""
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@keplr-wallet/background": "0.12.
|
|
20
|
-
"@keplr-wallet/common": "0.12.
|
|
21
|
-
"@keplr-wallet/cosmos": "0.12.
|
|
22
|
-
"@keplr-wallet/router": "0.12.
|
|
23
|
-
"@keplr-wallet/simple-fetch": "0.12.
|
|
24
|
-
"@keplr-wallet/stores": "0.12.
|
|
25
|
-
"@keplr-wallet/types": "0.12.
|
|
19
|
+
"@keplr-wallet/background": "0.12.300-rc.0",
|
|
20
|
+
"@keplr-wallet/common": "0.12.300-rc.0",
|
|
21
|
+
"@keplr-wallet/cosmos": "0.12.300-rc.0",
|
|
22
|
+
"@keplr-wallet/router": "0.12.300-rc.0",
|
|
23
|
+
"@keplr-wallet/simple-fetch": "0.12.300-rc.0",
|
|
24
|
+
"@keplr-wallet/stores": "0.12.300-rc.0",
|
|
25
|
+
"@keplr-wallet/types": "0.12.300-rc.0",
|
|
26
26
|
"buffer": "^6.0.3"
|
|
27
27
|
},
|
|
28
28
|
"peerDependencies": {
|
|
@@ -31,5 +31,5 @@
|
|
|
31
31
|
"mobx-utils": "^6",
|
|
32
32
|
"starknet": "^7"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "8381489c409d1fe7810a8da05982c7d9432c6ff7"
|
|
35
35
|
}
|
package/src/core/keyring.ts
CHANGED
|
@@ -36,7 +36,6 @@ import {
|
|
|
36
36
|
UnlockKeyRingMsg,
|
|
37
37
|
} from "@keplr-wallet/background";
|
|
38
38
|
import type { MultiAccounts } from "@keplr-wallet/background";
|
|
39
|
-
import { ChainInfo } from "@keplr-wallet/types";
|
|
40
39
|
import { ChainIdHelper } from "@keplr-wallet/cosmos";
|
|
41
40
|
|
|
42
41
|
export class KeyRingStore {
|
|
@@ -151,7 +150,7 @@ export class KeyRingStore {
|
|
|
151
150
|
this.eventDispatcher.dispatchEvent("keplr_keystorechange");
|
|
152
151
|
}
|
|
153
152
|
|
|
154
|
-
needKeyCoinTypeFinalize(vaultId: string,
|
|
153
|
+
needKeyCoinTypeFinalize(vaultId: string, chainId: string): boolean {
|
|
155
154
|
const keyInfo = this.keyInfos.find((keyInfo) => keyInfo.id === vaultId);
|
|
156
155
|
if (!keyInfo) {
|
|
157
156
|
return false;
|
|
@@ -162,7 +161,7 @@ export class KeyRingStore {
|
|
|
162
161
|
}
|
|
163
162
|
|
|
164
163
|
const coinTypeTag = `keyRing-${
|
|
165
|
-
ChainIdHelper.parse(
|
|
164
|
+
ChainIdHelper.parse(chainId).identifier
|
|
166
165
|
}-coinType`;
|
|
167
166
|
|
|
168
167
|
return keyInfo.insensitive[coinTypeTag] == null;
|
package/src/core/tokens.ts
CHANGED
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
InteractionWaitingData,
|
|
11
11
|
} from "@keplr-wallet/background";
|
|
12
12
|
import { action, autorun, makeObservable, observable, runInAction } from "mobx";
|
|
13
|
-
import { AppCurrency } from "@keplr-wallet/types";
|
|
13
|
+
import { AppCurrency, ChainInfoModule } from "@keplr-wallet/types";
|
|
14
14
|
import { IChainStore, IAccountStore } from "@keplr-wallet/stores";
|
|
15
15
|
import { InteractionStore } from "./interaction";
|
|
16
16
|
import { Bech32Address, ChainIdHelper } from "@keplr-wallet/cosmos";
|
|
@@ -110,12 +110,18 @@ export class TokensStore {
|
|
|
110
110
|
const prevTokens =
|
|
111
111
|
this.prevTokenMap.get(chainIdentifier.identifier) ?? [];
|
|
112
112
|
|
|
113
|
-
|
|
114
|
-
"
|
|
115
|
-
|
|
116
|
-
|
|
113
|
+
const module =
|
|
114
|
+
"cosmos" in modularChainInfoImpl.embedded
|
|
115
|
+
? "cosmos"
|
|
116
|
+
: "starknet" in modularChainInfoImpl.embedded
|
|
117
|
+
? "starknet"
|
|
118
|
+
: "bitcoin" in modularChainInfoImpl.embedded
|
|
119
|
+
? "bitcoin"
|
|
120
|
+
: "evm";
|
|
121
|
+
|
|
122
|
+
if (modularChainInfoImpl.matchModule(module)) {
|
|
117
123
|
modularChainInfoImpl.removeCurrencies(
|
|
118
|
-
|
|
124
|
+
module as ChainInfoModule,
|
|
119
125
|
...prevTokens.map((token) => token.currency.coinMinimalDenom)
|
|
120
126
|
);
|
|
121
127
|
}
|
|
@@ -155,6 +161,8 @@ export class TokensStore {
|
|
|
155
161
|
}
|
|
156
162
|
}
|
|
157
163
|
|
|
164
|
+
modularChainInfoImpl.addCurrencies("cosmos", ...adds);
|
|
165
|
+
|
|
158
166
|
this.chainStore
|
|
159
167
|
.getChain(modularChainInfoImpl.chainId)
|
|
160
168
|
.addCurrencies(...adds);
|
|
@@ -174,6 +182,20 @@ export class TokensStore {
|
|
|
174
182
|
|
|
175
183
|
modularChainInfoImpl.addCurrencies("starknet", ...adds);
|
|
176
184
|
}
|
|
185
|
+
} else if ("evm" in modularChainInfoImpl.embedded) {
|
|
186
|
+
const chainIdentifier = ChainIdHelper.parse(
|
|
187
|
+
modularChainInfoImpl.chainId
|
|
188
|
+
);
|
|
189
|
+
|
|
190
|
+
const tokens = this.tokenMap.get(chainIdentifier.identifier) ?? [];
|
|
191
|
+
|
|
192
|
+
const adds: AppCurrency[] = [];
|
|
193
|
+
|
|
194
|
+
for (const token of tokens) {
|
|
195
|
+
adds.push(token.currency);
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
modularChainInfoImpl.addCurrencies("evm", ...adds);
|
|
177
199
|
}
|
|
178
200
|
}
|
|
179
201
|
|
|
@@ -205,16 +227,16 @@ export class TokensStore {
|
|
|
205
227
|
getTokens(chainId: string): ReadonlyArray<TokenInfo> {
|
|
206
228
|
const bech32Address = this.accountStore.getAccount(chainId).bech32Address;
|
|
207
229
|
const modularChainInfo = this.chainStore.getModularChain(chainId);
|
|
208
|
-
if ("cosmos" in modularChainInfo) {
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
const hasBech32Config =
|
|
230
|
+
if ("evm" in modularChainInfo && !("cosmos" in modularChainInfo)) {
|
|
231
|
+
return this.tokenMap.get(ChainIdHelper.parse(chainId).identifier) ?? [];
|
|
232
|
+
} else if ("cosmos" in modularChainInfo) {
|
|
233
|
+
const hasBech32Config = modularChainInfo.cosmos.bech32Config != null;
|
|
212
234
|
const associatedAccountAddress =
|
|
213
235
|
hasBech32Config && bech32Address
|
|
214
236
|
? Buffer.from(
|
|
215
237
|
Bech32Address.fromBech32(
|
|
216
238
|
bech32Address,
|
|
217
|
-
|
|
239
|
+
modularChainInfo.cosmos.bech32Config?.bech32PrefixAccAddr
|
|
218
240
|
).address
|
|
219
241
|
).toString("hex")
|
|
220
242
|
: undefined;
|
|
@@ -263,44 +285,28 @@ export class TokensStore {
|
|
|
263
285
|
throw new Error("Account not initialized");
|
|
264
286
|
}
|
|
265
287
|
|
|
266
|
-
const
|
|
267
|
-
const isEvmChain = chainInfo.evm != null;
|
|
268
|
-
const hasBech32Config = chainInfo.bech32Config != null;
|
|
288
|
+
const hasBech32Config = modularChainInfo.cosmos.bech32Config != null;
|
|
269
289
|
const associatedAccountAddress = hasBech32Config
|
|
270
290
|
? Buffer.from(
|
|
271
291
|
Bech32Address.fromBech32(
|
|
272
292
|
bech32Address,
|
|
273
|
-
|
|
293
|
+
modularChainInfo.cosmos.bech32Config.bech32PrefixAccAddr
|
|
274
294
|
).address
|
|
275
295
|
).toString("hex")
|
|
276
296
|
: "";
|
|
277
297
|
|
|
278
|
-
const msg =
|
|
279
|
-
? new AddERC20TokenMsg(chainId, currency)
|
|
280
|
-
: new AddTokenMsg(chainId, associatedAccountAddress, currency);
|
|
298
|
+
const msg = new AddTokenMsg(chainId, associatedAccountAddress, currency);
|
|
281
299
|
const res = await this.requester.sendMessage(BACKGROUND_PORT, msg);
|
|
282
300
|
runInAction(() => {
|
|
283
|
-
const
|
|
284
|
-
|
|
285
|
-
const newTokens = res[chainIdentifier.identifier];
|
|
286
|
-
if (newTokens) {
|
|
287
|
-
newTokenMap.set(chainIdentifier.identifier, newTokens);
|
|
288
|
-
}
|
|
289
|
-
|
|
290
|
-
this.tokenMap = newTokenMap;
|
|
301
|
+
const chainIdentifier = ChainIdHelper.parse(chainId).identifier;
|
|
302
|
+
this.updateTokenMap(chainIdentifier, res[chainIdentifier]);
|
|
291
303
|
});
|
|
292
|
-
} else if ("starknet" in modularChainInfo) {
|
|
304
|
+
} else if ("evm" in modularChainInfo || "starknet" in modularChainInfo) {
|
|
293
305
|
const msg = new AddERC20TokenMsg(chainId, currency);
|
|
294
306
|
const res = await this.requester.sendMessage(BACKGROUND_PORT, msg);
|
|
295
307
|
runInAction(() => {
|
|
296
|
-
const
|
|
297
|
-
|
|
298
|
-
const newTokens = res[chainIdentifier.identifier];
|
|
299
|
-
if (newTokens) {
|
|
300
|
-
newTokenMap.set(chainIdentifier.identifier, newTokens);
|
|
301
|
-
}
|
|
302
|
-
|
|
303
|
-
this.tokenMap = newTokenMap;
|
|
308
|
+
const chainIdentifier = ChainIdHelper.parse(chainId).identifier;
|
|
309
|
+
this.updateTokenMap(chainIdentifier, res[chainIdentifier]);
|
|
304
310
|
});
|
|
305
311
|
} else {
|
|
306
312
|
throw new Error(`Unsupported chain: ${chainId}`);
|
|
@@ -317,33 +323,23 @@ export class TokensStore {
|
|
|
317
323
|
})();
|
|
318
324
|
|
|
319
325
|
const modularChainInfo = this.chainStore.getModularChain(chainId);
|
|
326
|
+
|
|
320
327
|
if ("cosmos" in modularChainInfo) {
|
|
321
|
-
const
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
: new RemoveTokenMsg(
|
|
327
|
-
chainId,
|
|
328
|
-
tokenInfo.associatedAccountAddress ?? "",
|
|
329
|
-
contractAddress
|
|
330
|
-
);
|
|
328
|
+
const msg = new RemoveTokenMsg(
|
|
329
|
+
chainId,
|
|
330
|
+
tokenInfo.associatedAccountAddress ?? "",
|
|
331
|
+
contractAddress
|
|
332
|
+
);
|
|
331
333
|
const res = await this.requester.sendMessage(BACKGROUND_PORT, msg);
|
|
332
334
|
runInAction(() => {
|
|
333
335
|
// Remove 이후에는 지워진 토큰에 대한 싱크를 맞추기 위해서 clearTokensFromChainInfos를 호출한다.
|
|
334
336
|
// 그냥 다 지우고 다시 다 설정하는 방식임.
|
|
335
337
|
this.clearTokensFromChainInfos();
|
|
336
338
|
|
|
337
|
-
const
|
|
338
|
-
|
|
339
|
-
const newTokens = res[chainIdentifier.identifier];
|
|
340
|
-
if (newTokens) {
|
|
341
|
-
newTokenMap.set(chainIdentifier.identifier, newTokens);
|
|
342
|
-
}
|
|
343
|
-
|
|
344
|
-
this.tokenMap = newTokenMap;
|
|
339
|
+
const chainIdentifier = ChainIdHelper.parse(chainId).identifier;
|
|
340
|
+
this.updateTokenMap(chainIdentifier, res[chainIdentifier]);
|
|
345
341
|
});
|
|
346
|
-
} else if ("starknet" in modularChainInfo) {
|
|
342
|
+
} else if ("evm" in modularChainInfo || "starknet" in modularChainInfo) {
|
|
347
343
|
const msg = new RemoveERC20TokenMsg(chainId, contractAddress);
|
|
348
344
|
|
|
349
345
|
const res = await this.requester.sendMessage(BACKGROUND_PORT, msg);
|
|
@@ -352,20 +348,24 @@ export class TokensStore {
|
|
|
352
348
|
// 그냥 다 지우고 다시 다 설정하는 방식임.
|
|
353
349
|
this.clearTokensFromChainInfos();
|
|
354
350
|
|
|
355
|
-
const
|
|
356
|
-
|
|
357
|
-
const newTokens = res[chainIdentifier.identifier];
|
|
358
|
-
if (newTokens) {
|
|
359
|
-
newTokenMap.set(chainIdentifier.identifier, newTokens);
|
|
360
|
-
}
|
|
361
|
-
|
|
362
|
-
this.tokenMap = newTokenMap;
|
|
351
|
+
const chainIdentifier = ChainIdHelper.parse(chainId).identifier;
|
|
352
|
+
this.updateTokenMap(chainIdentifier, res[chainIdentifier]);
|
|
363
353
|
});
|
|
364
354
|
} else {
|
|
365
355
|
throw new Error(`Unsupported chain: ${chainId}`);
|
|
366
356
|
}
|
|
367
357
|
}
|
|
368
358
|
|
|
359
|
+
@action
|
|
360
|
+
private updateTokenMap(chainIdentifier: string, newTokens?: TokenInfo[]) {
|
|
361
|
+
const newTokenMap = new Map(this.tokenMap);
|
|
362
|
+
if (newTokens) {
|
|
363
|
+
newTokenMap.set(chainIdentifier, newTokens);
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
this.tokenMap = newTokenMap;
|
|
367
|
+
}
|
|
368
|
+
|
|
369
369
|
get waitingSuggestedToken():
|
|
370
370
|
| InteractionWaitingData<{
|
|
371
371
|
chainId: string;
|