Merge branch 'master' into task/g381_repositoryInterfacesAndFactory

Author: rg911

src/infrastructure/wallet/simpleWalletDTO.ts

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 NEM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Used to instantiate a SimpleWallet
+ */
+export interface ISimpleWalletDTO {
+    name: string;
+    network: number;
+    address: {
+        address: string
+        networkType: number,
+    };
+    creationDate: string;
+    schema: string;
+    encryptedPrivateKey: {
+        encryptedKey: string
+        iv: string,
+    };
+}

src/model/wallet/SimpleWallet.ts

@@ -16,7 +16,8 @@
 
 import {LocalDateTime} from 'js-joda';
 import {Crypto, KeyPair, SHA3Hasher} from '../../core/crypto';
-import { Convert as convert} from '../../core/format';
+import {Convert as convert} from '../../core/format';
+import {ISimpleWalletDTO} from '../../infrastructure/wallet/simpleWalletDTO';
 import {Account} from '../account/Account';
 import {Address} from '../account/Address';
 import {NetworkType} from '../blockchain/NetworkType';
@@ -105,6 +106,23 @@ export class SimpleWallet extends Wallet {
         return new SimpleWallet(name, network, address, LocalDateTime.now(), encryptedPrivateKey);
     }
 
+    /**
+     * Instantiate a SimpleWallet from a DTO
+     * @param simpleWalletDTO simple wallet without prototype
+     */
+    static createFromDTO(simpleWalletDTO: ISimpleWalletDTO) {
+        return new SimpleWallet(
+            simpleWalletDTO.name,
+            simpleWalletDTO.network,
+            Address.createFromRawAddress(simpleWalletDTO.address.address),
+            LocalDateTime.now(),
+            new EncryptedPrivateKey(
+                simpleWalletDTO.encryptedPrivateKey.encryptedKey,
+                simpleWalletDTO.encryptedPrivateKey.iv,
+            ),
+        );
+    }
+
     /**
      * Open a wallet and generate an Account
      * @param password - Password to decrypt private key

test/model/wallet/SimpleWallet.spec.ts

@@ -49,4 +49,15 @@ describe('SimpleWallet', () => {
         const account = simpleWallet.open(new Password('password'));
         expect(simpleWallet.address.plain()).to.be.equal(account.address.plain());
     });
+
+    it('should open a simple wallet from a simple wallet without prototype', () => {
+        const privateKey = '5149a02ca2b2610138376717daaff8477f1639796aa108b7eee83e99e585b250';
+        const password = new Password('password');
+        const simpleWallet = SimpleWallet.createFromPrivateKey('wallet-name', password, privateKey, NetworkType.MIJIN_TEST);
+        const account = simpleWallet.open(new Password('password'));
+        const simpleWalletNoProto = JSON.parse(JSON.stringify(simpleWallet));
+        const simpleWallet2 = SimpleWallet.createFromDTO(simpleWalletNoProto);
+        const account2 = simpleWallet2.open(password);
+        expect(account).to.deep.equal(account2);
+    });
 });