@keplr-wallet/stores-core 0.12.71-rc.0 → 0.12.71
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/interaction/eth-sign.js +1 -1
- package/build/core/interaction/eth-sign.js.map +1 -1
- package/build/core/tokens.d.ts +1 -0
- package/build/core/tokens.js +20 -34
- package/build/core/tokens.js.map +1 -1
- package/package.json +9 -9
- package/src/core/interaction/eth-sign.ts +1 -1
- package/src/core/tokens.ts +24 -57
|
@@ -46,7 +46,7 @@ class SignEthereumInteractionStore {
|
|
|
46
46
|
}
|
|
47
47
|
rejectAll() {
|
|
48
48
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
|
-
yield this.interactionStore.rejectAll("request-sign-
|
|
49
|
+
yield this.interactionStore.rejectAll("request-sign-cosmos");
|
|
50
50
|
});
|
|
51
51
|
}
|
|
52
52
|
isObsoleteInteraction(id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth-sign.js","sourceRoot":"","sources":["../../../src/core/interaction/eth-sign.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,+BAAgD;AAehD,MAAa,4BAA4B;IACvC,YAA+B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAC/D,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CACrC,uBAAuB,CACxB,CAAC;IACJ,CAAC;IAGD,IAAI,WAAW;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAEhC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEK,sBAAsB,CAC1B,EAAU,EACV,SAAiC,EACjC,OAAuD,EACvD,UAEI,EAAE;;YAEN,MAAM,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAClD,EAAE,EACF;gBACE,SAAS;aACV,EACD,OAAO,EACP,OAAO,CACR,CAAC;QACJ,CAAC;KAAA;IAEK,qBAAqB,CACzB,EAAU,EACV,OAAuD;;YAEvD,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACjE,CAAC;KAAA;IAEK,SAAS;;YACb,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"eth-sign.js","sourceRoot":"","sources":["../../../src/core/interaction/eth-sign.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,+BAAgD;AAehD,MAAa,4BAA4B;IACvC,YAA+B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAC/D,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CACrC,uBAAuB,CACxB,CAAC;IACJ,CAAC;IAGD,IAAI,WAAW;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAEhC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEK,sBAAsB,CAC1B,EAAU,EACV,SAAiC,EACjC,OAAuD,EACvD,UAEI,EAAE;;YAEN,MAAM,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAClD,EAAE,EACF;gBACE,SAAS;aACV,EACD,OAAO,EACP,OAAO,CACR,CAAC;QACJ,CAAC;KAAA;IAEK,qBAAqB,CACzB,EAAU,EACV,OAAuD;;YAEvD,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACjE,CAAC;KAAA;IAEK,SAAS;;YACb,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAC/D,CAAC;KAAA;IAED,qBAAqB,CAAC,EAAsB;QAC1C,OAAO,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC;CACF;AA1CC;IADC,eAAQ;+DASR;AApBH,oEAsDC"}
|
package/build/core/tokens.d.ts
CHANGED
|
@@ -31,6 +31,7 @@ export declare class TokensStore {
|
|
|
31
31
|
get waitingSuggestedToken(): import("@keplr-wallet/background").InteractionWaitingData<{
|
|
32
32
|
chainId: string;
|
|
33
33
|
contractAddress: string;
|
|
34
|
+
viewingKey?: string | undefined;
|
|
34
35
|
}> | undefined;
|
|
35
36
|
approveSuggestedTokenWithProceedNext(id: string, appCurrency: AppCurrency, afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
|
|
36
37
|
rejectSuggestedToken(id: string, afterFn: (proceedNext: boolean) => void | Promise<void>): Promise<void>;
|
package/build/core/tokens.js
CHANGED
|
@@ -56,13 +56,11 @@ class TokensStore {
|
|
|
56
56
|
}
|
|
57
57
|
refreshTokens() {
|
|
58
58
|
return __awaiter(this, void 0, void 0, function* () {
|
|
59
|
-
const
|
|
60
|
-
const
|
|
61
|
-
const cw20Tokens = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, allCW20TokenInfosMsg);
|
|
62
|
-
const erc20Tokens = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, allERC20TokenInfosMsg);
|
|
59
|
+
const msg = new background_1.GetAllTokenInfosMsg();
|
|
60
|
+
const tokens = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
|
|
63
61
|
(0, mobx_1.runInAction)(() => {
|
|
64
62
|
const map = new Map();
|
|
65
|
-
for (const [key, value] of Object.entries(
|
|
63
|
+
for (const [key, value] of Object.entries(tokens)) {
|
|
66
64
|
if (value) {
|
|
67
65
|
map.set(key, value);
|
|
68
66
|
}
|
|
@@ -148,20 +146,17 @@ class TokensStore {
|
|
|
148
146
|
throw new Error("Account not initialized");
|
|
149
147
|
}
|
|
150
148
|
const chainInfo = this.chainStore.getChain(chainId);
|
|
151
|
-
const isEvmChain = chainInfo.evm !== undefined;
|
|
152
149
|
const associatedAccountAddress = buffer_1.Buffer.from(cosmos_1.Bech32Address.fromBech32(bech32Address, chainInfo.bech32Config.bech32PrefixAccAddr).address).toString("hex");
|
|
153
|
-
const msg =
|
|
154
|
-
? new background_1.AddERC20TokenMsg(chainId, currency)
|
|
155
|
-
: new background_1.AddTokenMsg(chainId, associatedAccountAddress, currency);
|
|
150
|
+
const msg = new background_1.AddTokenMsg(chainId, associatedAccountAddress, currency);
|
|
156
151
|
const res = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
|
|
157
152
|
(0, mobx_1.runInAction)(() => {
|
|
158
|
-
const
|
|
159
|
-
const
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
153
|
+
const map = new Map();
|
|
154
|
+
for (const [key, value] of Object.entries(res)) {
|
|
155
|
+
if (value) {
|
|
156
|
+
map.set(key, value);
|
|
157
|
+
}
|
|
163
158
|
}
|
|
164
|
-
this.tokenMap =
|
|
159
|
+
this.tokenMap = map;
|
|
165
160
|
});
|
|
166
161
|
});
|
|
167
162
|
}
|
|
@@ -174,34 +169,26 @@ class TokensStore {
|
|
|
174
169
|
}
|
|
175
170
|
throw new Error("Token info is not for contract");
|
|
176
171
|
})();
|
|
177
|
-
const
|
|
178
|
-
const isEvmChain = chainInfo.evm !== undefined;
|
|
179
|
-
const msg = isEvmChain
|
|
180
|
-
? new background_1.RemoveERC20TokenMsg(chainId, contractAddress)
|
|
181
|
-
: new background_1.RemoveTokenMsg(chainId, (_a = tokenInfo.associatedAccountAddress) !== null && _a !== void 0 ? _a : "", contractAddress);
|
|
172
|
+
const msg = new background_1.RemoveTokenMsg(chainId, (_a = tokenInfo.associatedAccountAddress) !== null && _a !== void 0 ? _a : "", contractAddress);
|
|
182
173
|
const res = yield this.requester.sendMessage(router_1.BACKGROUND_PORT, msg);
|
|
183
174
|
(0, mobx_1.runInAction)(() => {
|
|
184
175
|
// Remove 이후에는 지워진 토큰에 대한 싱크를 맞추기 위해서 clearTokensFromChainInfos를 호출한다.
|
|
185
176
|
// 그냥 다 지우고 다시 다 설정하는 방식임.
|
|
186
177
|
this.clearTokensFromChainInfos();
|
|
187
|
-
const
|
|
188
|
-
const
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
178
|
+
const map = new Map();
|
|
179
|
+
for (const [key, value] of Object.entries(res)) {
|
|
180
|
+
if (value) {
|
|
181
|
+
map.set(key, value);
|
|
182
|
+
}
|
|
192
183
|
}
|
|
193
|
-
this.tokenMap =
|
|
184
|
+
this.tokenMap = map;
|
|
194
185
|
});
|
|
195
186
|
});
|
|
196
187
|
}
|
|
197
188
|
get waitingSuggestedToken() {
|
|
198
|
-
const
|
|
199
|
-
if (
|
|
200
|
-
return
|
|
201
|
-
}
|
|
202
|
-
const erc20Datas = this.interactionStore.getAllData("suggest-token-erc20");
|
|
203
|
-
if (erc20Datas.length > 0) {
|
|
204
|
-
return erc20Datas[0];
|
|
189
|
+
const datas = this.interactionStore.getAllData("suggest-token-cw20");
|
|
190
|
+
if (datas.length > 0) {
|
|
191
|
+
return datas[0];
|
|
205
192
|
}
|
|
206
193
|
}
|
|
207
194
|
approveSuggestedTokenWithProceedNext(id, appCurrency, afterFn) {
|
|
@@ -222,7 +209,6 @@ class TokensStore {
|
|
|
222
209
|
rejectAllSuggestedTokens() {
|
|
223
210
|
return __awaiter(this, void 0, void 0, function* () {
|
|
224
211
|
yield this.interactionStore.rejectAll("suggest-token-cw20");
|
|
225
|
-
yield this.interactionStore.rejectAll("suggest-token-erc20");
|
|
226
212
|
});
|
|
227
213
|
}
|
|
228
214
|
}
|
package/build/core/tokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/core/tokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,iDAAyE;AACzE,
|
|
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.71
|
|
3
|
+
"version": "0.12.71",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"author": "chainapsis",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -16,16 +16,16 @@
|
|
|
16
16
|
"lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@keplr-wallet/background": "0.12.71
|
|
20
|
-
"@keplr-wallet/common": "0.12.71
|
|
21
|
-
"@keplr-wallet/cosmos": "0.12.71
|
|
22
|
-
"@keplr-wallet/router": "0.12.71
|
|
23
|
-
"@keplr-wallet/simple-fetch": "0.12.71
|
|
24
|
-
"@keplr-wallet/stores": "0.12.71
|
|
25
|
-
"@keplr-wallet/types": "0.12.71
|
|
19
|
+
"@keplr-wallet/background": "0.12.71",
|
|
20
|
+
"@keplr-wallet/common": "0.12.71",
|
|
21
|
+
"@keplr-wallet/cosmos": "0.12.71",
|
|
22
|
+
"@keplr-wallet/router": "0.12.71",
|
|
23
|
+
"@keplr-wallet/simple-fetch": "0.12.71",
|
|
24
|
+
"@keplr-wallet/stores": "0.12.71",
|
|
25
|
+
"@keplr-wallet/types": "0.12.71",
|
|
26
26
|
"buffer": "^6.0.3",
|
|
27
27
|
"mobx": "^6.1.7",
|
|
28
28
|
"mobx-utils": "^6.0.3"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "667e172901b0635ef8ce0c3790a124f48c41d60b"
|
|
31
31
|
}
|
|
@@ -62,7 +62,7 @@ export class SignEthereumInteractionStore {
|
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
async rejectAll() {
|
|
65
|
-
await this.interactionStore.rejectAll("request-sign-
|
|
65
|
+
await this.interactionStore.rejectAll("request-sign-cosmos");
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
isObsoleteInteraction(id: string | undefined): boolean {
|
package/src/core/tokens.ts
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import { BACKGROUND_PORT, MessageRequester } from "@keplr-wallet/router";
|
|
2
2
|
import {
|
|
3
|
-
AddERC20TokenMsg,
|
|
4
3
|
AddTokenMsg,
|
|
5
|
-
GetAllERC20TokenInfosMsg,
|
|
6
4
|
GetAllTokenInfosMsg,
|
|
7
5
|
RemoveTokenMsg,
|
|
8
|
-
RemoveERC20TokenMsg,
|
|
9
6
|
TokenInfo,
|
|
10
7
|
} from "@keplr-wallet/background";
|
|
11
8
|
import { action, autorun, makeObservable, observable, runInAction } from "mobx";
|
|
@@ -62,21 +59,11 @@ export class TokensStore {
|
|
|
62
59
|
}
|
|
63
60
|
|
|
64
61
|
protected async refreshTokens() {
|
|
65
|
-
const
|
|
66
|
-
const
|
|
67
|
-
const cw20Tokens = await this.requester.sendMessage(
|
|
68
|
-
BACKGROUND_PORT,
|
|
69
|
-
allCW20TokenInfosMsg
|
|
70
|
-
);
|
|
71
|
-
const erc20Tokens = await this.requester.sendMessage(
|
|
72
|
-
BACKGROUND_PORT,
|
|
73
|
-
allERC20TokenInfosMsg
|
|
74
|
-
);
|
|
62
|
+
const msg = new GetAllTokenInfosMsg();
|
|
63
|
+
const tokens = await this.requester.sendMessage(BACKGROUND_PORT, msg);
|
|
75
64
|
runInAction(() => {
|
|
76
65
|
const map = new Map<string, TokenInfo[]>();
|
|
77
|
-
for (const [key, value] of Object.entries(
|
|
78
|
-
Object.entries(erc20Tokens)
|
|
79
|
-
)) {
|
|
66
|
+
for (const [key, value] of Object.entries(tokens)) {
|
|
80
67
|
if (value) {
|
|
81
68
|
map.set(key, value);
|
|
82
69
|
}
|
|
@@ -191,7 +178,6 @@ export class TokensStore {
|
|
|
191
178
|
throw new Error("Account not initialized");
|
|
192
179
|
}
|
|
193
180
|
const chainInfo = this.chainStore.getChain(chainId);
|
|
194
|
-
const isEvmChain = chainInfo.evm !== undefined;
|
|
195
181
|
const associatedAccountAddress = Buffer.from(
|
|
196
182
|
Bech32Address.fromBech32(
|
|
197
183
|
bech32Address,
|
|
@@ -199,19 +185,16 @@ export class TokensStore {
|
|
|
199
185
|
).address
|
|
200
186
|
).toString("hex");
|
|
201
187
|
|
|
202
|
-
const msg =
|
|
203
|
-
? new AddERC20TokenMsg(chainId, currency)
|
|
204
|
-
: new AddTokenMsg(chainId, associatedAccountAddress, currency);
|
|
188
|
+
const msg = new AddTokenMsg(chainId, associatedAccountAddress, currency);
|
|
205
189
|
const res = await this.requester.sendMessage(BACKGROUND_PORT, msg);
|
|
206
190
|
runInAction(() => {
|
|
207
|
-
const
|
|
208
|
-
const
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
191
|
+
const map = new Map<string, TokenInfo[]>();
|
|
192
|
+
for (const [key, value] of Object.entries(res)) {
|
|
193
|
+
if (value) {
|
|
194
|
+
map.set(key, value);
|
|
195
|
+
}
|
|
212
196
|
}
|
|
213
|
-
|
|
214
|
-
this.tokenMap = newTokenMap;
|
|
197
|
+
this.tokenMap = map;
|
|
215
198
|
});
|
|
216
199
|
}
|
|
217
200
|
|
|
@@ -224,51 +207,36 @@ export class TokensStore {
|
|
|
224
207
|
throw new Error("Token info is not for contract");
|
|
225
208
|
})();
|
|
226
209
|
|
|
227
|
-
const
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
: new RemoveTokenMsg(
|
|
233
|
-
chainId,
|
|
234
|
-
tokenInfo.associatedAccountAddress ?? "",
|
|
235
|
-
contractAddress
|
|
236
|
-
);
|
|
210
|
+
const msg = new RemoveTokenMsg(
|
|
211
|
+
chainId,
|
|
212
|
+
tokenInfo.associatedAccountAddress ?? "",
|
|
213
|
+
contractAddress
|
|
214
|
+
);
|
|
237
215
|
const res = await this.requester.sendMessage(BACKGROUND_PORT, msg);
|
|
238
216
|
runInAction(() => {
|
|
239
217
|
// Remove 이후에는 지워진 토큰에 대한 싱크를 맞추기 위해서 clearTokensFromChainInfos를 호출한다.
|
|
240
218
|
// 그냥 다 지우고 다시 다 설정하는 방식임.
|
|
241
219
|
this.clearTokensFromChainInfos();
|
|
242
220
|
|
|
243
|
-
const
|
|
244
|
-
const
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
221
|
+
const map = new Map<string, TokenInfo[]>();
|
|
222
|
+
for (const [key, value] of Object.entries(res)) {
|
|
223
|
+
if (value) {
|
|
224
|
+
map.set(key, value);
|
|
225
|
+
}
|
|
248
226
|
}
|
|
249
|
-
|
|
250
|
-
this.tokenMap = newTokenMap;
|
|
227
|
+
this.tokenMap = map;
|
|
251
228
|
});
|
|
252
229
|
}
|
|
253
230
|
|
|
254
231
|
get waitingSuggestedToken() {
|
|
255
|
-
const
|
|
232
|
+
const datas = this.interactionStore.getAllData<{
|
|
256
233
|
chainId: string;
|
|
257
234
|
contractAddress: string;
|
|
258
235
|
viewingKey?: string;
|
|
259
236
|
}>("suggest-token-cw20");
|
|
260
237
|
|
|
261
|
-
if (
|
|
262
|
-
return
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
const erc20Datas = this.interactionStore.getAllData<{
|
|
266
|
-
chainId: string;
|
|
267
|
-
contractAddress: string;
|
|
268
|
-
}>("suggest-token-erc20");
|
|
269
|
-
|
|
270
|
-
if (erc20Datas.length > 0) {
|
|
271
|
-
return erc20Datas[0];
|
|
238
|
+
if (datas.length > 0) {
|
|
239
|
+
return datas[0];
|
|
272
240
|
}
|
|
273
241
|
}
|
|
274
242
|
|
|
@@ -303,6 +271,5 @@ export class TokensStore {
|
|
|
303
271
|
|
|
304
272
|
async rejectAllSuggestedTokens() {
|
|
305
273
|
await this.interactionStore.rejectAll("suggest-token-cw20");
|
|
306
|
-
await this.interactionStore.rejectAll("suggest-token-erc20");
|
|
307
274
|
}
|
|
308
275
|
}
|