Bump codechain-keystore and fix the build

Author: kseo

package.json

@@ -33,7 +33,7 @@
     "typescript": "^3.0.1"
   },
   "dependencies": {
-    "codechain-keystore": "git://github.com/CodeChain-io/codechain-keystore.git#5a106d3b10717457f02a6fba5e9846d28671b128",
+    "codechain-keystore": "git://github.com/CodeChain-io/codechain-keystore.git#1483361b94c79e468e055188df0583046d4c9540",
     "codechain-sdk": "^0.1.0-alpha.21.rc1",
     "commander": "^2.17.1",
     "enquirer": "^1.0.3",

src/command/create.ts

@@ -1,32 +1,17 @@
 import { CCKey } from "codechain-keystore";
-import { H256 } from "codechain-sdk/lib/core/classes";
-import { blake256, getAccountIdFromPublic } from "codechain-sdk/lib/utils";
 import * as _ from "lodash";
 
-import { CLIError, CLIErrorType } from "../error";
 import { AccountType } from "../types";
-import { getAddressFromPublic } from "../util";
+import { getAddressFromKey } from "../util";
 
 export async function createKey(
     cckey: CCKey,
     accountType: AccountType,
     passphrase: string
 ): Promise<void> {
-    const publicKey = await cckey[accountType].createKey({
+    const key = await cckey[accountType].createKey({
         passphrase
     });
-    switch (accountType) {
-        case "platform":
-            const accountId = getAccountIdFromPublic(publicKey);
-            cckey.mapping.add({ key: accountId, value: publicKey });
-            break;
-        case "asset":
-            const hash = H256.ensure(blake256(publicKey)).value;
-            cckey.mapping.add({ key: hash, value: publicKey });
-            break;
-        default:
-            throw new CLIError(CLIErrorType.Unreachable);
-    }
 
-    console.log(getAddressFromPublic(accountType, publicKey));
+    console.log(getAddressFromKey(accountType, key));
 }

src/command/delete.ts

@@ -1,16 +1,17 @@
 import { CCKey } from "codechain-keystore";
+import * as _ from "lodash";
 
 import { CLIError, CLIErrorType } from "../error";
 import { AccountType } from "../types";
-import { findPublicKey } from "../util";
+import { findMatchingKey } from "../util";
 
 export async function deleteKey(
     cckey: CCKey,
     accountType: AccountType,
     address: string
 ): Promise<void> {
-    const publicKeys = await cckey[accountType].getKeys();
-    const publicKey = findPublicKey(accountType, publicKeys, address);
+    const keys = await cckey[accountType].getKeys();
+    const key = findMatchingKey(accountType, keys, address);
     const Enquirer = require("enquirer");
     const enquirer = new Enquirer();
     enquirer.register("confirm", require("prompt-confirm"));
@@ -21,9 +22,7 @@ export async function deleteKey(
         .prompt(["delete"])
         .then(async (answers: { delete: boolean }) => {
             if (answers.delete) {
-                const result = await cckey[accountType].deleteKey({
-                    publicKey
-                });
+                const result = await cckey[accountType].deleteKey({ key });
                 if (!result) {
                     throw new CLIError(CLIErrorType.Unknown, {
                         message: "Delete failed"

src/command/export.ts

@@ -1,18 +1,18 @@
 import { CCKey, SecretStorage } from "codechain-keystore";
 
 import { AccountType } from "../types";
-import { findPublicKey } from "../util";
+import { findMatchingKey } from "../util";
 
 export async function exportKey(
     cckey: CCKey,
     accountType: AccountType,
     address: string,
     passphrase: string
 ): Promise<SecretStorage> {
-    const publicKeys = await cckey[accountType].getKeys();
-    const publicKey = findPublicKey(accountType, publicKeys, address);
+    const keys = await cckey[accountType].getKeys();
+    const key = findMatchingKey(accountType, keys, address);
     return cckey[accountType].exportKey({
-        publicKey,
+        key,
         passphrase
     });
 }

src/command/import.ts

@@ -1,35 +1,19 @@
 import { CCKey, SecretStorage } from "codechain-keystore";
-
-import { H256 } from "codechain-sdk/lib/core/classes";
-import { blake256, getAccountIdFromPublic } from "codechain-sdk/lib/utils";
 import * as _ from "lodash";
 
-import { CLIError, CLIErrorType } from "../error";
 import { AccountType } from "../types";
-import { getAddressFromPublic } from "../util";
+import { getAddressFromKey } from "../util";
 
 export async function importKey(
     cckey: CCKey,
     accountType: AccountType,
     secret: SecretStorage,
     passphrase: string
 ): Promise<void> {
-    const publicKey = await cckey[accountType].importKey({
+    const key = await cckey[accountType].importKey({
         secret,
         passphrase
     });
-    switch (accountType) {
-        case "platform":
-            const accountId = getAccountIdFromPublic(publicKey);
-            cckey.mapping.add({ key: accountId, value: publicKey });
-            break;
-        case "asset":
-            const hash = H256.ensure(blake256(publicKey)).value;
-            cckey.mapping.add({ key: hash, value: publicKey });
-            break;
-        default:
-            throw new CLIError(CLIErrorType.Unreachable);
-    }
 
-    console.log(getAddressFromPublic(accountType, publicKey));
+    console.log(getAddressFromKey(accountType, key));
 }

src/command/importRaw.ts

@@ -1,35 +1,20 @@
 import { CCKey } from "codechain-keystore";
-
-import { H256 } from "codechain-sdk/lib/core/classes";
-import { blake256, getAccountIdFromPublic } from "codechain-sdk/lib/utils";
+import { PrivateKey } from "codechain-keystore/lib/types";
 import * as _ from "lodash";
 
-import { CLIError, CLIErrorType } from "../error";
 import { AccountType } from "../types";
-import { getAddressFromPublic } from "../util";
+import { getAddressFromKey } from "../util";
 
 export async function importRawKey(
     cckey: CCKey,
     accountType: AccountType,
-    privateKey: string,
+    privateKey: PrivateKey,
     passphrase: string
 ): Promise<void> {
-    const publicKey = await cckey[accountType].importRaw({
+    const key = await cckey[accountType].importRaw({
         privateKey,
         passphrase
     });
-    switch (accountType) {
-        case "platform":
-            const accountId = getAccountIdFromPublic(publicKey);
-            cckey.mapping.add({ key: accountId, value: publicKey });
-            break;
-        case "asset":
-            const hash = H256.ensure(blake256(publicKey)).value;
-            cckey.mapping.add({ key: hash, value: publicKey });
-            break;
-        default:
-            throw new CLIError(CLIErrorType.Unreachable);
-    }
 
-    console.log(getAddressFromPublic(accountType, publicKey));
+    console.log(getAddressFromKey(accountType, key));
 }

src/command/list.ts

@@ -2,16 +2,14 @@ import { CCKey } from "codechain-keystore";
 import * as _ from "lodash";
 
 import { AccountType } from "../types";
-import { getAddressFromPublic } from "../util";
+import { getAddressFromKey } from "../util";
 
 export async function listKeys(
     cckey: CCKey,
     accountType: AccountType
 ): Promise<void> {
     let keys = await cckey[accountType].getKeys();
-    keys = _.map(keys, publicKey =>
-        getAddressFromPublic(accountType, publicKey)
-    );
+    keys = _.map(keys, key => getAddressFromKey(accountType, key));
     if (keys.length === 0) {
         console.log("");
     } else {

src/util.ts

@@ -1,26 +1,20 @@
-import { H256 } from "codechain-sdk/lib/core/classes";
+import { Key } from "codechain-keystore/lib/types";
 import {
     AssetTransferAddress,
     PlatformAddress
 } from "codechain-sdk/lib/key/classes";
-import { blake256, getAccountIdFromPublic } from "codechain-sdk/lib/utils";
 import _ = require("lodash");
 
 import { networkId } from "./const";
 import { CLIError, CLIErrorType } from "./error";
 import { AccountType } from "./types";
 
-export function getAddressFromPublic(
-    accountType: AccountType,
-    publicKey: string
-): string {
+export function getAddressFromKey(accountType: AccountType, key: Key): string {
     if (accountType === "platform") {
-        const accountId = getAccountIdFromPublic(publicKey);
-        const platformAddress = PlatformAddress.fromAccountId(accountId);
+        const platformAddress = PlatformAddress.fromAccountId(key);
         return platformAddress.toString();
     } else if (accountType === "asset") {
-        const hash = H256.ensure(blake256(publicKey));
-        const assetAddress = AssetTransferAddress.fromTypeAndPayload(1, hash, {
+        const assetAddress = AssetTransferAddress.fromTypeAndPayload(1, key, {
             networkId
         });
         return assetAddress.toString();
@@ -29,18 +23,16 @@ export function getAddressFromPublic(
     }
 }
 
-export function findPublicKey(
+export function findMatchingKey(
     accountType: AccountType,
-    publicKeys: string[],
+    keys: Key[],
     address: string
 ): string {
-    const addresses = _.map(publicKeys, key =>
-        getAddressFromPublic(accountType, key)
-    );
+    const addresses = _.map(keys, key => getAddressFromKey(accountType, key));
     const index = _.indexOf(addresses, address);
     if (index === -1) {
         throw new CLIError(CLIErrorType.NoSuchAddress, { address });
     }
 
-    return publicKeys[index];
+    return keys[index];
 }

yarn.lock

@@ -556,9 +556,9 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-"codechain-keystore@git://github.com/CodeChain-io/codechain-keystore.git#5a106d3b10717457f02a6fba5e9846d28671b128":
+"codechain-keystore@git://github.com/CodeChain-io/codechain-keystore.git#1483361b94c79e468e055188df0583046d4c9540":
   version "0.1.0"
-  resolved "git://github.com/CodeChain-io/codechain-keystore.git#5a106d3b10717457f02a6fba5e9846d28671b128"
+  resolved "git://github.com/CodeChain-io/codechain-keystore.git#1483361b94c79e468e055188df0583046d4c9540"
   dependencies:
     codechain-sdk "^0.1.0-alpha.18"
     config "^2.0.1"