@keplr-wallet/stores-core 0.13.13 → 0.13.15-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.
Files changed (9) hide show
  1. package/build/core/keyring.d.ts +1 -2
  2. package/build/core/keyring.js +2 -2
  3. package/build/core/keyring.js.map +1 -1
  4. package/build/core/tokens.js +49 -56
  5. package/build/core/tokens.js.map +1 -1
  6. package/package.json +9 -9
  7. package/src/core/keyring.ts +2 -3
  8. package/src/core/tokens.ts +62 -71
  9. package/tsconfig.check.json +2 -0
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, chainInfo: ChainInfo): boolean;
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, chainInfo) {
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(chainInfo.chainId).identifier}-coinType`;
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) {
package/build/core/keyring.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/core/keyring.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/core/keyring.ts"],"names":[],"mappings":"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"}
package/build/core/tokens.js CHANGED
@@ -19,6 +19,7 @@ exports.TokensStore = void 0;
19
19
  const router_1 = require("@keplr-wallet/router");
20
20
  const background_1 = require("@keplr-wallet/background");
21
21
  const mobx_1 = require("mobx");
22
+ const stores_1 = require("@keplr-wallet/stores");
22
23
  const cosmos_1 = require("@keplr-wallet/cosmos");
23
24
  const buffer_1 = require("buffer/");
24
25
  const mobx_utils_1 = require("mobx-utils");
@@ -81,32 +82,25 @@ class TokensStore {
81
82
  });
82
83
  }
83
84
  clearTokensFromChainInfos() {
84
- var _a, _b;
85
- const chainInfos = this.chainStore.chainInfos;
86
- for (const chainInfo of chainInfos) {
87
- const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainInfo.chainId);
85
+ var _a;
86
+ const modularChainInfos = this.chainStore.modularChainInfos;
87
+ for (const mcInfo2 of modularChainInfos) {
88
+ const chainIdentifier = cosmos_1.ChainIdHelper.parse(mcInfo2.chainId);
88
89
  // Tokens should be changed whenever the account changed.
89
90
  // But, the added currencies are not removed automatically.
90
91
  // So, we should remove the prev token currencies from the chain info.
91
92
  const prevTokens = (_a = this.prevTokenMap.get(chainIdentifier.identifier)) !== null && _a !== void 0 ? _a : [];
92
- chainInfo.removeCurrencies(...prevTokens.map((token) => token.currency.coinMinimalDenom));
93
- }
94
- const modularChainInfoImpls = this.chainStore.modularChainInfoImpls;
95
- for (const modularChainInfoImpl of modularChainInfoImpls) {
96
- const chainIdentifier = cosmos_1.ChainIdHelper.parse(modularChainInfoImpl.chainId);
97
- const prevTokens = (_b = this.prevTokenMap.get(chainIdentifier.identifier)) !== null && _b !== void 0 ? _b : [];
98
- if ("starknet" in modularChainInfoImpl &&
99
- modularChainInfoImpl.starknet != null) {
100
- modularChainInfoImpl.removeCurrencies("starknet", ...prevTokens.map((token) => token.currency.coinMinimalDenom));
101
- }
93
+ mcInfo2.removeCurrencies(...prevTokens.map((token) => token.currency.coinMinimalDenom));
102
94
  }
103
95
  }
104
96
  updateChainInfos() {
105
97
  var _a, _b;
106
- const modularChainInfoImpls = this.chainStore.modularChainInfoImpls;
107
- for (const modularChainInfoImpl of modularChainInfoImpls) {
108
- if ("cosmos" in modularChainInfoImpl.embedded) {
109
- const chainIdentifier = cosmos_1.ChainIdHelper.parse(modularChainInfoImpl.chainId);
98
+ const modularChainInfos = this.chainStore.modularChainInfos;
99
+ for (const mcInfo2 of modularChainInfos) {
100
+ if (mcInfo2.type === "cosmos" ||
101
+ mcInfo2.type === "ethermint" ||
102
+ mcInfo2.type === "evm") {
103
+ const chainIdentifier = cosmos_1.ChainIdHelper.parse(mcInfo2.chainId);
110
104
  const tokens = (_a = this.tokenMap.get(chainIdentifier.identifier)) !== null && _a !== void 0 ? _a : [];
111
105
  const adds = [];
112
106
  for (const token of tokens) {
@@ -114,28 +108,22 @@ class TokensStore {
114
108
  adds.push(token.currency);
115
109
  }
116
110
  else if (this.keyRingStore.status === "unlocked" &&
117
- this.accountStore.getAccount(modularChainInfoImpl.chainId)
118
- .bech32Address) {
119
- if (buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(this.accountStore.getAccount(modularChainInfoImpl.chainId)
120
- .bech32Address).address).toString("hex") === token.associatedAccountAddress) {
111
+ this.accountStore.getAccount(mcInfo2.chainId).bech32Address) {
112
+ if (buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(this.accountStore.getAccount(mcInfo2.chainId).bech32Address).address).toString("hex") === token.associatedAccountAddress) {
121
113
  adds.push(token.currency);
122
114
  }
123
115
  }
124
116
  }
125
- this.chainStore
126
- .getChain(modularChainInfoImpl.chainId)
127
- .addCurrencies(...adds);
117
+ mcInfo2.addCurrencies(...adds);
128
118
  }
129
- else if ("starknet" in modularChainInfoImpl.embedded) {
130
- if ("starknet" in modularChainInfoImpl.embedded) {
131
- const chainIdentifier = cosmos_1.ChainIdHelper.parse(modularChainInfoImpl.chainId);
132
- const tokens = (_b = this.tokenMap.get(chainIdentifier.identifier)) !== null && _b !== void 0 ? _b : [];
133
- const adds = [];
134
- for (const token of tokens) {
135
- adds.push(token.currency);
136
- }
137
- modularChainInfoImpl.addCurrencies("starknet", ...adds);
119
+ else if (mcInfo2.type === "starknet") {
120
+ const chainIdentifier = cosmos_1.ChainIdHelper.parse(mcInfo2.chainId);
121
+ const tokens = (_b = this.tokenMap.get(chainIdentifier.identifier)) !== null && _b !== void 0 ? _b : [];
122
+ const adds = [];
123
+ for (const token of tokens) {
124
+ adds.push(token.currency);
138
125
  }
126
+ mcInfo2.addCurrencies(...adds);
139
127
  }
140
128
  }
141
129
  this.prevTokenMap = this.tokenMap;
@@ -163,12 +151,14 @@ class TokensStore {
163
151
  getTokens(chainId) {
164
152
  var _a, _b;
165
153
  const bech32Address = this.accountStore.getAccount(chainId).bech32Address;
166
- const modularChainInfo = this.chainStore.getModularChain(chainId);
167
- if ("cosmos" in modularChainInfo) {
168
- const chainInfo = this.chainStore.getChain(chainId);
169
- const hasBech32Config = chainInfo.bech32Config != null;
154
+ const mcInfo2 = this.chainStore.getModularChain(chainId);
155
+ if (mcInfo2.type === "cosmos" ||
156
+ mcInfo2.type === "ethermint" ||
157
+ mcInfo2.type === "evm") {
158
+ const cosmosInfo = (0, stores_1.getCosmosInfo)(mcInfo2);
159
+ const hasBech32Config = (cosmosInfo === null || cosmosInfo === void 0 ? void 0 : cosmosInfo.bech32Config) != null;
170
160
  const associatedAccountAddress = hasBech32Config && bech32Address
171
- ? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, chainInfo.bech32Config.bech32PrefixAccAddr).address).toString("hex")
161
+ ? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, cosmosInfo.bech32Config.bech32PrefixAccAddr).address).toString("hex")
172
162
  : undefined;
173
163
  const tokens = (_a = this.tokenMap.get(cosmos_1.ChainIdHelper.parse(chainId).identifier)) !== null && _a !== void 0 ? _a : [];
174
164
  return tokens.filter((token) => {
@@ -180,7 +170,7 @@ class TokensStore {
180
170
  return true;
181
171
  });
182
172
  }
183
- else if ("starknet" in modularChainInfo) {
173
+ else if (mcInfo2.type === "starknet") {
184
174
  return (_b = this.tokenMap.get(chainId)) !== null && _b !== void 0 ? _b : [];
185
175
  }
186
176
  else {
@@ -192,17 +182,19 @@ class TokensStore {
192
182
  }
193
183
  addToken(chainId, currency) {
194
184
  return __awaiter(this, void 0, void 0, function* () {
195
- const modularChainInfo = this.chainStore.getModularChain(chainId);
196
- if ("cosmos" in modularChainInfo) {
185
+ const mcInfo2 = this.chainStore.getModularChain(chainId);
186
+ if (mcInfo2.type === "cosmos" ||
187
+ mcInfo2.type === "ethermint" ||
188
+ mcInfo2.type === "evm") {
197
189
  const bech32Address = this.accountStore.getAccount(chainId).bech32Address;
198
190
  if (!bech32Address) {
199
191
  throw new Error("Account not initialized");
200
192
  }
201
- const chainInfo = this.chainStore.getChain(chainId);
202
- const isEvmChain = chainInfo.evm != null;
203
- const hasBech32Config = chainInfo.bech32Config != null;
193
+ const cosmosInfo = (0, stores_1.getCosmosInfo)(mcInfo2);
194
+ const isEvmChain = mcInfo2.type === "evm" || mcInfo2.type === "ethermint";
195
+ const hasBech32Config = (cosmosInfo === null || cosmosInfo === void 0 ? void 0 : cosmosInfo.bech32Config) != null;
204
196
  const associatedAccountAddress = hasBech32Config
205
- ? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, chainInfo.bech32Config.bech32PrefixAccAddr).address).toString("hex")
197
+ ? buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, cosmosInfo.bech32Config.bech32PrefixAccAddr).address).toString("hex")
206
198
  : "";
207
199
  const msg = isEvmChain
208
200
  ? new background_1.AddERC20TokenMsg(chainId, currency)
@@ -210,7 +202,7 @@ class TokensStore {
210
202
  const res = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
211
203
  (0, mobx_1.runInAction)(() => {
212
204
  const newTokenMap = new Map(this.tokenMap);
213
- const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainInfo.chainId);
205
+ const chainIdentifier = cosmos_1.ChainIdHelper.parse(mcInfo2.chainId);
214
206
  const newTokens = res[chainIdentifier.identifier];
215
207
  if (newTokens) {
216
208
  newTokenMap.set(chainIdentifier.identifier, newTokens);
@@ -218,12 +210,12 @@ class TokensStore {
218
210
  this.tokenMap = newTokenMap;
219
211
  });
220
212
  }
221
- else if ("starknet" in modularChainInfo) {
213
+ else if (mcInfo2.type === "starknet") {
222
214
  const msg = new background_1.AddERC20TokenMsg(chainId, currency);
223
215
  const res = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
224
216
  (0, mobx_1.runInAction)(() => {
225
217
  const newTokenMap = new Map(this.tokenMap);
226
- const chainIdentifier = cosmos_1.ChainIdHelper.parse(modularChainInfo.chainId);
218
+ const chainIdentifier = cosmos_1.ChainIdHelper.parse(mcInfo2.chainId);
227
219
  const newTokens = res[chainIdentifier.identifier];
228
220
  if (newTokens) {
229
221
  newTokenMap.set(chainIdentifier.identifier, newTokens);
@@ -245,10 +237,11 @@ class TokensStore {
245
237
  }
246
238
  throw new Error("Token info is not for contract");
247
239
  })();
248
- const modularChainInfo = this.chainStore.getModularChain(chainId);
249
- if ("cosmos" in modularChainInfo) {
250
- const chainInfo = this.chainStore.getChain(chainId);
251
- const isEvmChain = chainInfo.evm !== undefined;
240
+ const mcInfo2 = this.chainStore.getModularChain(chainId);
241
+ if (mcInfo2.type === "cosmos" ||
242
+ mcInfo2.type === "ethermint" ||
243
+ mcInfo2.type === "evm") {
244
+ const isEvmChain = mcInfo2.type === "evm" || mcInfo2.type === "ethermint";
252
245
  const msg = isEvmChain
253
246
  ? new background_1.RemoveERC20TokenMsg(chainId, contractAddress)
254
247
  : new background_1.RemoveTokenMsg(chainId, (_a = tokenInfo.associatedAccountAddress) !== null && _a !== void 0 ? _a : "", contractAddress);
@@ -258,7 +251,7 @@ class TokensStore {
258
251
  // 그냥 다 지우고 다시 다 설정하는 방식임.
259
252
  this.clearTokensFromChainInfos();
260
253
  const newTokenMap = new Map(this.tokenMap);
261
- const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainInfo.chainId);
254
+ const chainIdentifier = cosmos_1.ChainIdHelper.parse(mcInfo2.chainId);
262
255
  const newTokens = res[chainIdentifier.identifier];
263
256
  if (newTokens) {
264
257
  newTokenMap.set(chainIdentifier.identifier, newTokens);
@@ -266,7 +259,7 @@ class TokensStore {
266
259
  this.tokenMap = newTokenMap;
267
260
  });
268
261
  }
269
- else if ("starknet" in modularChainInfo) {
262
+ else if (mcInfo2.type === "starknet") {
270
263
  const msg = new background_1.RemoveERC20TokenMsg(chainId, contractAddress);
271
264
  const res = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
272
265
  (0, mobx_1.runInAction)(() => {
@@ -274,7 +267,7 @@ class TokensStore {
274
267
  // 그냥 다 지우고 다시 다 설정하는 방식임.
275
268
  this.clearTokensFromChainInfos();
276
269
  const newTokenMap = new Map(this.tokenMap);
277
- const chainIdentifier = cosmos_1.ChainIdHelper.parse(modularChainInfo.chainId);
270
+ const chainIdentifier = cosmos_1.ChainIdHelper.parse(mcInfo2.chainId);
278
271
  const newTokens = res[chainIdentifier.identifier];
279
272
  if (newTokens) {
280
273
  newTokenMap.set(chainIdentifier.identifier, newTokens);
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.13.13",
3
+ "version": "0.13.15-rc.0",
4
4
  "main": "build/index.js",
5
5
  "author": "chainapsis",
6
6
  "license": "Apache-2.0",
@@ -21,13 +21,13 @@
21
21
  "typecheck": "npx tsc -p tsconfig.check.json"
22
22
  },
23
23
  "dependencies": {
24
- "@keplr-wallet/background": "0.13.13",
25
- "@keplr-wallet/common": "0.13.13",
26
- "@keplr-wallet/cosmos": "0.13.13",
27
- "@keplr-wallet/router": "0.13.13",
28
- "@keplr-wallet/simple-fetch": "0.13.13",
29
- "@keplr-wallet/stores": "0.13.13",
30
- "@keplr-wallet/types": "0.13.13",
24
+ "@keplr-wallet/background": "0.13.15-rc.0",
25
+ "@keplr-wallet/common": "0.13.15-rc.0",
26
+ "@keplr-wallet/cosmos": "0.13.15-rc.0",
27
+ "@keplr-wallet/router": "0.13.15-rc.0",
28
+ "@keplr-wallet/simple-fetch": "0.13.15-rc.0",
29
+ "@keplr-wallet/stores": "0.13.15-rc.0",
30
+ "@keplr-wallet/types": "0.13.15-rc.0",
31
31
  "buffer": "^6.0.3"
32
32
  },
33
33
  "peerDependencies": {
@@ -36,5 +36,5 @@
36
36
  "mobx-utils": "^6",
37
37
  "starknet": "^8"
38
38
  },
39
- "gitHead": "d806e87af06491dd189d849f69614a8b06c627bc"
39
+ "gitHead": "5a3e0763e91ef98e83059cb7340074b5967cf897"
40
40
  }
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, chainInfo: ChainInfo): boolean {
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(chainInfo.chainId).identifier
164
+ ChainIdHelper.parse(chainId).identifier
166
165
  }-coinType`;
167
166
 
168
167
  return keyInfo.insensitive[coinTypeTag] == null;
package/src/core/tokens.ts CHANGED
@@ -11,7 +11,11 @@ import {
11
11
  } from "@keplr-wallet/background";
12
12
  import { action, autorun, makeObservable, observable, runInAction } from "mobx";
13
13
  import { AppCurrency } from "@keplr-wallet/types";
14
- import { IChainStore, IAccountStore } from "@keplr-wallet/stores";
14
+ import {
15
+ IChainStore,
16
+ IAccountStore,
17
+ getCosmosInfo,
18
+ } from "@keplr-wallet/stores";
15
19
  import { InteractionStore } from "./interaction";
16
20
  import { Bech32Address, ChainIdHelper } from "@keplr-wallet/cosmos";
17
21
  import { Buffer } from "buffer/";
@@ -89,46 +93,30 @@ export class TokensStore {
89
93
 
90
94
  @action
91
95
  protected clearTokensFromChainInfos() {
92
- const chainInfos = this.chainStore.chainInfos;
93
- for (const chainInfo of chainInfos) {
94
- const chainIdentifier = ChainIdHelper.parse(chainInfo.chainId);
96
+ const modularChainInfos = this.chainStore.modularChainInfos;
97
+ for (const mcInfo2 of modularChainInfos) {
98
+ const chainIdentifier = ChainIdHelper.parse(mcInfo2.chainId);
95
99
 
96
100
  // Tokens should be changed whenever the account changed.
97
101
  // But, the added currencies are not removed automatically.
98
102
  // So, we should remove the prev token currencies from the chain info.
99
103
  const prevTokens =
100
104
  this.prevTokenMap.get(chainIdentifier.identifier) ?? [];
101
- chainInfo.removeCurrencies(
105
+ mcInfo2.removeCurrencies(
102
106
  ...prevTokens.map((token) => token.currency.coinMinimalDenom)
103
107
  );
104
108
  }
105
-
106
- const modularChainInfoImpls = this.chainStore.modularChainInfoImpls;
107
- for (const modularChainInfoImpl of modularChainInfoImpls) {
108
- const chainIdentifier = ChainIdHelper.parse(modularChainInfoImpl.chainId);
109
-
110
- const prevTokens =
111
- this.prevTokenMap.get(chainIdentifier.identifier) ?? [];
112
-
113
- if (
114
- "starknet" in modularChainInfoImpl &&
115
- modularChainInfoImpl.starknet != null
116
- ) {
117
- modularChainInfoImpl.removeCurrencies(
118
- "starknet",
119
- ...prevTokens.map((token) => token.currency.coinMinimalDenom)
120
- );
121
- }
122
- }
123
109
  }
124
110
 
125
111
  protected updateChainInfos() {
126
- const modularChainInfoImpls = this.chainStore.modularChainInfoImpls;
127
- for (const modularChainInfoImpl of modularChainInfoImpls) {
128
- if ("cosmos" in modularChainInfoImpl.embedded) {
129
- const chainIdentifier = ChainIdHelper.parse(
130
- modularChainInfoImpl.chainId
131
- );
112
+ const modularChainInfos = this.chainStore.modularChainInfos;
113
+ for (const mcInfo2 of modularChainInfos) {
114
+ if (
115
+ mcInfo2.type === "cosmos" ||
116
+ mcInfo2.type === "ethermint" ||
117
+ mcInfo2.type === "evm"
118
+ ) {
119
+ const chainIdentifier = ChainIdHelper.parse(mcInfo2.chainId);
132
120
 
133
121
  const tokens = this.tokenMap.get(chainIdentifier.identifier) ?? [];
134
122
 
@@ -139,14 +127,12 @@ export class TokensStore {
139
127
  adds.push(token.currency);
140
128
  } else if (
141
129
  this.keyRingStore.status === "unlocked" &&
142
- this.accountStore.getAccount(modularChainInfoImpl.chainId)
143
- .bech32Address
130
+ this.accountStore.getAccount(mcInfo2.chainId).bech32Address
144
131
  ) {
145
132
  if (
146
133
  Buffer.from(
147
134
  Bech32Address.fromBech32(
148
- this.accountStore.getAccount(modularChainInfoImpl.chainId)
149
- .bech32Address
135
+ this.accountStore.getAccount(mcInfo2.chainId).bech32Address
150
136
  ).address
151
137
  ).toString("hex") === token.associatedAccountAddress
152
138
  ) {
@@ -155,25 +141,19 @@ export class TokensStore {
155
141
  }
156
142
  }
157
143
 
158
- this.chainStore
159
- .getChain(modularChainInfoImpl.chainId)
160
- .addCurrencies(...adds);
161
- } else if ("starknet" in modularChainInfoImpl.embedded) {
162
- if ("starknet" in modularChainInfoImpl.embedded) {
163
- const chainIdentifier = ChainIdHelper.parse(
164
- modularChainInfoImpl.chainId
165
- );
166
-
167
- const tokens = this.tokenMap.get(chainIdentifier.identifier) ?? [];
144
+ mcInfo2.addCurrencies(...adds);
145
+ } else if (mcInfo2.type === "starknet") {
146
+ const chainIdentifier = ChainIdHelper.parse(mcInfo2.chainId);
168
147
 
169
- const adds: AppCurrency[] = [];
148
+ const tokens = this.tokenMap.get(chainIdentifier.identifier) ?? [];
170
149
 
171
- for (const token of tokens) {
172
- adds.push(token.currency);
173
- }
150
+ const adds: AppCurrency[] = [];
174
151
 
175
- modularChainInfoImpl.addCurrencies("starknet", ...adds);
152
+ for (const token of tokens) {
153
+ adds.push(token.currency);
176
154
  }
155
+
156
+ mcInfo2.addCurrencies(...adds);
177
157
  }
178
158
  }
179
159
 
@@ -204,17 +184,21 @@ export class TokensStore {
204
184
 
205
185
  getTokens(chainId: string): ReadonlyArray<TokenInfo> {
206
186
  const bech32Address = this.accountStore.getAccount(chainId).bech32Address;
207
- const modularChainInfo = this.chainStore.getModularChain(chainId);
208
- if ("cosmos" in modularChainInfo) {
209
- const chainInfo = this.chainStore.getChain(chainId);
210
-
211
- const hasBech32Config = chainInfo.bech32Config != null;
187
+ const mcInfo2 = this.chainStore.getModularChain(chainId);
188
+ if (
189
+ mcInfo2.type === "cosmos" ||
190
+ mcInfo2.type === "ethermint" ||
191
+ mcInfo2.type === "evm"
192
+ ) {
193
+ const cosmosInfo = getCosmosInfo(mcInfo2);
194
+
195
+ const hasBech32Config = cosmosInfo?.bech32Config != null;
212
196
  const associatedAccountAddress =
213
197
  hasBech32Config && bech32Address
214
198
  ? Buffer.from(
215
199
  Bech32Address.fromBech32(
216
200
  bech32Address,
217
- chainInfo.bech32Config.bech32PrefixAccAddr
201
+ cosmosInfo!.bech32Config!.bech32PrefixAccAddr
218
202
  ).address
219
203
  ).toString("hex")
220
204
  : undefined;
@@ -233,7 +217,7 @@ export class TokensStore {
233
217
 
234
218
  return true;
235
219
  });
236
- } else if ("starknet" in modularChainInfo) {
220
+ } else if (mcInfo2.type === "starknet") {
237
221
  return this.tokenMap.get(chainId) ?? [];
238
222
  } else {
239
223
  throw new Error(`Unsupported chain: ${chainId}`);
@@ -256,21 +240,25 @@ export class TokensStore {
256
240
  }
257
241
 
258
242
  async addToken(chainId: string, currency: AppCurrency): Promise<void> {
259
- const modularChainInfo = this.chainStore.getModularChain(chainId);
260
- if ("cosmos" in modularChainInfo) {
243
+ const mcInfo2 = this.chainStore.getModularChain(chainId);
244
+ if (
245
+ mcInfo2.type === "cosmos" ||
246
+ mcInfo2.type === "ethermint" ||
247
+ mcInfo2.type === "evm"
248
+ ) {
261
249
  const bech32Address = this.accountStore.getAccount(chainId).bech32Address;
262
250
  if (!bech32Address) {
263
251
  throw new Error("Account not initialized");
264
252
  }
265
253
 
266
- const chainInfo = this.chainStore.getChain(chainId);
267
- const isEvmChain = chainInfo.evm != null;
268
- const hasBech32Config = chainInfo.bech32Config != null;
254
+ const cosmosInfo = getCosmosInfo(mcInfo2);
255
+ const isEvmChain = mcInfo2.type === "evm" || mcInfo2.type === "ethermint";
256
+ const hasBech32Config = cosmosInfo?.bech32Config != null;
269
257
  const associatedAccountAddress = hasBech32Config
270
258
  ? Buffer.from(
271
259
  Bech32Address.fromBech32(
272
260
  bech32Address,
273
- chainInfo.bech32Config.bech32PrefixAccAddr
261
+ cosmosInfo!.bech32Config!.bech32PrefixAccAddr
274
262
  ).address
275
263
  ).toString("hex")
276
264
  : "";
@@ -281,7 +269,7 @@ export class TokensStore {
281
269
  const res = await this.requester.sendMessage(BACKGROUND_PORT, msg);
282
270
  runInAction(() => {
283
271
  const newTokenMap = new Map(this.tokenMap);
284
- const chainIdentifier = ChainIdHelper.parse(chainInfo.chainId);
272
+ const chainIdentifier = ChainIdHelper.parse(mcInfo2.chainId);
285
273
  const newTokens = res[chainIdentifier.identifier];
286
274
  if (newTokens) {
287
275
  newTokenMap.set(chainIdentifier.identifier, newTokens);
@@ -289,12 +277,12 @@ export class TokensStore {
289
277
 
290
278
  this.tokenMap = newTokenMap;
291
279
  });
292
- } else if ("starknet" in modularChainInfo) {
280
+ } else if (mcInfo2.type === "starknet") {
293
281
  const msg = new AddERC20TokenMsg(chainId, currency);
294
282
  const res = await this.requester.sendMessage(BACKGROUND_PORT, msg);
295
283
  runInAction(() => {
296
284
  const newTokenMap = new Map(this.tokenMap);
297
- const chainIdentifier = ChainIdHelper.parse(modularChainInfo.chainId);
285
+ const chainIdentifier = ChainIdHelper.parse(mcInfo2.chainId);
298
286
  const newTokens = res[chainIdentifier.identifier];
299
287
  if (newTokens) {
300
288
  newTokenMap.set(chainIdentifier.identifier, newTokens);
@@ -316,10 +304,13 @@ export class TokensStore {
316
304
  throw new Error("Token info is not for contract");
317
305
  })();
318
306
 
319
- const modularChainInfo = this.chainStore.getModularChain(chainId);
320
- if ("cosmos" in modularChainInfo) {
321
- const chainInfo = this.chainStore.getChain(chainId);
322
- const isEvmChain = chainInfo.evm !== undefined;
307
+ const mcInfo2 = this.chainStore.getModularChain(chainId);
308
+ if (
309
+ mcInfo2.type === "cosmos" ||
310
+ mcInfo2.type === "ethermint" ||
311
+ mcInfo2.type === "evm"
312
+ ) {
313
+ const isEvmChain = mcInfo2.type === "evm" || mcInfo2.type === "ethermint";
323
314
 
324
315
  const msg = isEvmChain
325
316
  ? new RemoveERC20TokenMsg(chainId, contractAddress)
@@ -335,7 +326,7 @@ export class TokensStore {
335
326
  this.clearTokensFromChainInfos();
336
327
 
337
328
  const newTokenMap = new Map(this.tokenMap);
338
- const chainIdentifier = ChainIdHelper.parse(chainInfo.chainId);
329
+ const chainIdentifier = ChainIdHelper.parse(mcInfo2.chainId);
339
330
  const newTokens = res[chainIdentifier.identifier];
340
331
  if (newTokens) {
341
332
  newTokenMap.set(chainIdentifier.identifier, newTokens);
@@ -343,7 +334,7 @@ export class TokensStore {
343
334
 
344
335
  this.tokenMap = newTokenMap;
345
336
  });
346
- } else if ("starknet" in modularChainInfo) {
337
+ } else if (mcInfo2.type === "starknet") {
347
338
  const msg = new RemoveERC20TokenMsg(chainId, contractAddress);
348
339
 
349
340
  const res = await this.requester.sendMessage(BACKGROUND_PORT, msg);
@@ -353,7 +344,7 @@ export class TokensStore {
353
344
  this.clearTokensFromChainInfos();
354
345
 
355
346
  const newTokenMap = new Map(this.tokenMap);
356
- const chainIdentifier = ChainIdHelper.parse(modularChainInfo.chainId);
347
+ const chainIdentifier = ChainIdHelper.parse(mcInfo2.chainId);
357
348
  const newTokens = res[chainIdentifier.identifier];
358
349
  if (newTokens) {
359
350
  newTokenMap.set(chainIdentifier.identifier, newTokens);
package/tsconfig.check.json CHANGED
@@ -22,6 +22,8 @@
22
22
  "@keplr-wallet/hooks/build/*": ["../hooks/src/*"],
23
23
  "@keplr-wallet/hooks-bitcoin": ["../hooks-bitcoin/src"],
24
24
  "@keplr-wallet/hooks-bitcoin/build/*": ["../hooks-bitcoin/src/*"],
25
+ "@keplr-wallet/hooks-evm": ["../hooks-evm/src"],
26
+ "@keplr-wallet/hooks-evm/build/*": ["../hooks-evm/src/*"],
25
27
  "@keplr-wallet/hooks-starknet": ["../hooks-starknet/src"],
26
28
  "@keplr-wallet/hooks-starknet/build/*": ["../hooks-starknet/src/*"],
27
29
  "@keplr-wallet/ledger-cosmos": ["../ledger-cosmos/src"],