@trustwallet/wallet-core 3.1.0 → 3.1.3

package/dist/src/keystore/default-impl.d.ts

@@ -1,4 +1,4 @@
-import { WalletCore, CoinType, PrivateKey, StoredKey } from "../wallet-core";
+import { WalletCore, CoinType, PrivateKey, StoredKey, StoredKeyEncryption } from "../wallet-core";
 import * as Types from "./types";
 export declare class Default implements Types.IKeyStore {
     private readonly core;
@@ -11,8 +11,8 @@ export declare class Default implements Types.IKeyStore {
     mapWallet(storedKey: StoredKey): Types.Wallet;
     mapStoredKey(wallet: Types.Wallet): StoredKey;
     importWallet(wallet: Types.Wallet): Promise<void>;
-    import(mnemonic: string, name: string, password: string, coins: CoinType[]): Promise<Types.Wallet>;
-    importKey(key: Uint8Array, name: string, password: string, coin: CoinType): Promise<Types.Wallet>;
+    import(mnemonic: string, name: string, password: string, coins: CoinType[], encryption: StoredKeyEncryption): Promise<Types.Wallet>;
+    importKey(key: Uint8Array, name: string, password: string, coin: CoinType, encryption: StoredKeyEncryption): Promise<Types.Wallet>;
     addAccounts(id: string, password: string, coins: CoinType[]): Promise<Types.Wallet>;
     getKey(id: string, password: string, account: Types.ActiveAccount): Promise<PrivateKey>;
     export(id: string, password: string): Promise<string | Uint8Array>;

package/dist/src/keystore/default-impl.js

@@ -38,15 +38,15 @@ var Default = /** @class */ (function () {
     Default.prototype.importWallet = function (wallet) {
         return this.storage.set(wallet.id, wallet);
     };
-    Default.prototype.import = function (mnemonic, name, password, coins) {
+    Default.prototype.import = function (mnemonic, name, password, coins, encryption) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            var _a = _this.core, Mnemonic = _a.Mnemonic, StoredKey = _a.StoredKey, HDWallet = _a.HDWallet;
+            var _a = _this.core, Mnemonic = _a.Mnemonic, StoredKey = _a.StoredKey, HDWallet = _a.HDWallet, StoredKeyEncryption = _a.StoredKeyEncryption;
             if (!Mnemonic.isValid(mnemonic)) {
                 throw Types.Error.InvalidMnemonic;
             }
             var pass = Buffer.from(password);
-            var storedKey = StoredKey.importHDWallet(mnemonic, name, pass, coins[0]);
+            var storedKey = StoredKey.importHDWalletWithEncryption(mnemonic, name, pass, coins[0], encryption);
             var hdWallet = HDWallet.createWithMnemonic(mnemonic, "");
             coins.forEach(function (coin) {
                 storedKey.accountForCoin(coin, hdWallet);
@@ -59,17 +59,17 @@ var Default = /** @class */ (function () {
                 .catch(function (error) { return reject(error); });
         });
     };
-    Default.prototype.importKey = function (key, name, password, coin) {
+    Default.prototype.importKey = function (key, name, password, coin, encryption) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            var _a = _this.core, StoredKey = _a.StoredKey, PrivateKey = _a.PrivateKey, Curve = _a.Curve;
+            var _a = _this.core, StoredKey = _a.StoredKey, PrivateKey = _a.PrivateKey, Curve = _a.Curve, StoredKeyEncryption = _a.StoredKeyEncryption;
             // FIXME: get curve from coin
             if (!PrivateKey.isValid(key, Curve.secp256k1) ||
                 !PrivateKey.isValid(key, Curve.ed25519)) {
                 throw Types.Error.InvalidKey;
             }
             var pass = Buffer.from(password);
-            var storedKey = StoredKey.importPrivateKey(key, name, pass, coin);
+            var storedKey = StoredKey.importPrivateKeyWithEncryption(key, name, pass, coin, encryption);
             var wallet = _this.mapWallet(storedKey);
             storedKey.delete();
             _this.importWallet(wallet)

package/dist/src/keystore/types.d.ts

@@ -1,4 +1,4 @@
-import { CoinType, PrivateKey } from "../wallet-core";
+import { CoinType, PrivateKey, StoredKeyEncryption } from "../wallet-core";
 export declare enum WalletType {
     Mnemonic = "mnemonic",
     PrivateKey = "privateKey",
@@ -31,8 +31,8 @@ export interface IKeyStore {
     hasWallet(id: string): Promise<boolean>;
     load(id: string): Promise<Wallet>;
     loadAll(): Promise<Wallet[]>;
-    import(mnemonic: string, name: string, password: string, coins: CoinType[]): Promise<Wallet>;
-    importKey(key: Uint8Array, name: string, password: string, coin: CoinType): Promise<Wallet>;
+    import(mnemonic: string, name: string, password: string, coins: CoinType[], encryption: StoredKeyEncryption): Promise<Wallet>;
+    importKey(key: Uint8Array, name: string, password: string, coin: CoinType, encryption: StoredKeyEncryption): Promise<Wallet>;
     importWallet(wallet: Wallet): Promise<void>;
     addAccounts(id: string, password: string, coins: CoinType[]): Promise<Wallet>;
     getKey(id: string, password: string, account: ActiveAccount): Promise<PrivateKey>;