@keplr-wallet/background 0.11.45 → 0.11.46
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/tokens/service.d.ts +2 -1
- package/build/tokens/service.js +15 -0
- package/build/tokens/service.js.map +1 -1
- package/package.json +13 -12
- package/src/tokens/service.ts +24 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Env } from "@keplr-wallet/router";
|
|
2
|
-
import { ChainInfo, AppCurrency, CW20Currency, Secret20Currency } from "@keplr-wallet/types";
|
|
2
|
+
import { ChainInfo, AppCurrency, CW20Currency, ERC20Currency, Secret20Currency } from "@keplr-wallet/types";
|
|
3
3
|
import { ChainsService } from "../chains";
|
|
4
4
|
import { KeyRingService } from "../keyring";
|
|
5
5
|
import { KVStore } from "@keplr-wallet/common";
|
|
@@ -31,4 +31,5 @@ export declare class TokensService {
|
|
|
31
31
|
static validateCurrency(chainInfo: ChainInfo, currency: AppCurrency): Promise<AppCurrency>;
|
|
32
32
|
static validateCW20Currency(chainInfo: ChainInfo, currency: CW20Currency): Promise<CW20Currency>;
|
|
33
33
|
static validateSecret20Currency(chainInfo: ChainInfo, currency: Secret20Currency): Promise<Secret20Currency>;
|
|
34
|
+
static validateERC20Currency(_: ChainInfo, currency: ERC20Currency): Promise<ERC20Currency>;
|
|
34
35
|
}
|
package/build/tokens/service.js
CHANGED
|
@@ -17,6 +17,7 @@ const keyring_1 = require("../keyring");
|
|
|
17
17
|
const buffer_1 = require("buffer/");
|
|
18
18
|
const messages_1 = require("./messages");
|
|
19
19
|
const types_1 = require("./types");
|
|
20
|
+
const address_1 = require("@ethersproject/address");
|
|
20
21
|
class TokensService {
|
|
21
22
|
constructor(kvStore) {
|
|
22
23
|
this.kvStore = kvStore;
|
|
@@ -233,6 +234,9 @@ class TokensService {
|
|
|
233
234
|
case "secret20":
|
|
234
235
|
currency = yield TokensService.validateSecret20Currency(chainInfo, currency);
|
|
235
236
|
break;
|
|
237
|
+
case "erc20":
|
|
238
|
+
currency = yield TokensService.validateERC20Currency(chainInfo, currency);
|
|
239
|
+
break;
|
|
236
240
|
default:
|
|
237
241
|
throw new router_1.KeplrError("tokens", 110, "Unknown type of currency");
|
|
238
242
|
}
|
|
@@ -261,6 +265,17 @@ class TokensService {
|
|
|
261
265
|
return currency;
|
|
262
266
|
});
|
|
263
267
|
}
|
|
268
|
+
static validateERC20Currency(_, currency) {
|
|
269
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
270
|
+
// Validate the schema.
|
|
271
|
+
currency = yield chain_validator_1.ERC20CurrencySchema.validateAsync(currency);
|
|
272
|
+
// Validate the contract address.
|
|
273
|
+
if (!address_1.isAddress(currency.contractAddress)) {
|
|
274
|
+
throw new Error("Invalid contract address");
|
|
275
|
+
}
|
|
276
|
+
return currency;
|
|
277
|
+
});
|
|
278
|
+
}
|
|
264
279
|
}
|
|
265
280
|
exports.TokensService = TokensService;
|
|
266
281
|
//# sourceMappingURL=service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/tokens/service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAAuD;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/tokens/service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@keplr-wallet/background",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.46",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"author": "chainapsis",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -26,21 +26,22 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@ethereumjs/common": "^2.6.5",
|
|
28
28
|
"@ethereumjs/tx": "^3.5.2",
|
|
29
|
+
"@ethersproject/address": "^5.6.0",
|
|
29
30
|
"@ethersproject/bignumber": "^5.7.0",
|
|
30
31
|
"@ethersproject/bytes": "^5.7.0",
|
|
31
32
|
"@ethersproject/hash": "^5.7.0",
|
|
32
33
|
"@ethersproject/transactions": "^5.7.0",
|
|
33
34
|
"@ethersproject/wallet": "^5.7.0",
|
|
34
|
-
"@keplr-wallet/chain-validator": "0.11.
|
|
35
|
-
"@keplr-wallet/common": "0.11.
|
|
36
|
-
"@keplr-wallet/cosmos": "0.11.
|
|
37
|
-
"@keplr-wallet/crypto": "0.11.
|
|
38
|
-
"@keplr-wallet/ledger-cosmos": "0.11.
|
|
39
|
-
"@keplr-wallet/popup": "0.11.
|
|
40
|
-
"@keplr-wallet/proto-types": "0.11.
|
|
41
|
-
"@keplr-wallet/router": "0.11.
|
|
42
|
-
"@keplr-wallet/types": "0.11.
|
|
43
|
-
"@keplr-wallet/unit": "0.11.
|
|
35
|
+
"@keplr-wallet/chain-validator": "0.11.46",
|
|
36
|
+
"@keplr-wallet/common": "0.11.46",
|
|
37
|
+
"@keplr-wallet/cosmos": "0.11.46",
|
|
38
|
+
"@keplr-wallet/crypto": "0.11.46",
|
|
39
|
+
"@keplr-wallet/ledger-cosmos": "0.11.46",
|
|
40
|
+
"@keplr-wallet/popup": "0.11.46",
|
|
41
|
+
"@keplr-wallet/proto-types": "0.11.46",
|
|
42
|
+
"@keplr-wallet/router": "0.11.46",
|
|
43
|
+
"@keplr-wallet/types": "0.11.46",
|
|
44
|
+
"@keplr-wallet/unit": "0.11.46",
|
|
44
45
|
"@keystonehq/base-eth-keyring": "^0.6.4",
|
|
45
46
|
"@keystonehq/bc-ur-registry": "^0.5.1",
|
|
46
47
|
"@keystonehq/bc-ur-registry-cosmos": "^0.1.1",
|
|
@@ -64,5 +65,5 @@
|
|
|
64
65
|
"secretjs": "0.17.7",
|
|
65
66
|
"utility-types": "^3.10.0"
|
|
66
67
|
},
|
|
67
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "77b91ddbb031fb1c539f22b0f9b0988919322ecc"
|
|
68
69
|
}
|
package/src/tokens/service.ts
CHANGED
|
@@ -3,11 +3,13 @@ import {
|
|
|
3
3
|
ChainInfo,
|
|
4
4
|
AppCurrency,
|
|
5
5
|
CW20Currency,
|
|
6
|
+
ERC20Currency,
|
|
6
7
|
Secret20Currency,
|
|
7
8
|
} from "@keplr-wallet/types";
|
|
8
9
|
import {
|
|
9
10
|
CurrencySchema,
|
|
10
11
|
CW20CurrencySchema,
|
|
12
|
+
ERC20CurrencySchema,
|
|
11
13
|
Secret20CurrencySchema,
|
|
12
14
|
} from "@keplr-wallet/chain-validator";
|
|
13
15
|
import { Bech32Address, ChainIdHelper } from "@keplr-wallet/cosmos";
|
|
@@ -21,6 +23,7 @@ import { PermissionService } from "../permission";
|
|
|
21
23
|
import { Buffer } from "buffer/";
|
|
22
24
|
import { SuggestTokenMsg } from "./messages";
|
|
23
25
|
import { getSecret20ViewingKeyPermissionType } from "./types";
|
|
26
|
+
import { isAddress } from "@ethersproject/address";
|
|
24
27
|
|
|
25
28
|
export class TokensService {
|
|
26
29
|
protected interactionService!: InteractionService;
|
|
@@ -340,6 +343,12 @@ export class TokensService {
|
|
|
340
343
|
currency
|
|
341
344
|
);
|
|
342
345
|
break;
|
|
346
|
+
case "erc20":
|
|
347
|
+
currency = await TokensService.validateERC20Currency(
|
|
348
|
+
chainInfo,
|
|
349
|
+
currency
|
|
350
|
+
);
|
|
351
|
+
break;
|
|
343
352
|
default:
|
|
344
353
|
throw new KeplrError("tokens", 110, "Unknown type of currency");
|
|
345
354
|
}
|
|
@@ -381,4 +390,19 @@ export class TokensService {
|
|
|
381
390
|
|
|
382
391
|
return currency;
|
|
383
392
|
}
|
|
393
|
+
|
|
394
|
+
static async validateERC20Currency(
|
|
395
|
+
_: ChainInfo,
|
|
396
|
+
currency: ERC20Currency
|
|
397
|
+
): Promise<ERC20Currency> {
|
|
398
|
+
// Validate the schema.
|
|
399
|
+
currency = await ERC20CurrencySchema.validateAsync(currency);
|
|
400
|
+
|
|
401
|
+
// Validate the contract address.
|
|
402
|
+
if (!isAddress(currency.contractAddress)) {
|
|
403
|
+
throw new Error("Invalid contract address");
|
|
404
|
+
}
|
|
405
|
+
|
|
406
|
+
return currency;
|
|
407
|
+
}
|
|
384
408
|
}
|