Apply the changes in foundry-keystore to CLI

[email protected] and [email protected] were published.
We removed unnecessary the Asset type from them and renamed the Platform type to 'keystore'.
Therefore, there is no keytype in the renewed keystore.
In addition, they use the Ed25519 signature, which uses 64 bytes private key.

To apply the changes in foundry-keystore and primitives to foundry-cli,
we removed the concept of accountType, renamed it to 'keystore'
and changed 32 bytes key private key to 64 bytes.

Author: SeungMin Lee

README.md

@@ -28,7 +28,6 @@ yarn global add foundry-keystore-cli
   Options:
 
     -V, --version                      output the version number
-    -t, --account-type <accountType>   'platform' or 'asset'. The type of the key (default: platform)
     --keys-path <keysPath>             the path to store the keys (default: keystore.db)
     --network-id <networkId>           the id of the network (use 'cc' for mainnet, use 'wc' for corgi) (default: cc)
     -h, --help                         output usage information
@@ -39,20 +38,20 @@ yarn global add foundry-keystore-cli
     create [options]                   create a new key
     delete [options]                   delete a key
     import [options] <path>            import a key
-    import-raw [options] <privateKey>  import a raw private key (32 byte hexadecimal string)
+    import-raw [options] <privateKey>  import a raw private key (64 byte hexadecimal string)
     export [options]                   export the key
 
   Examples:
 
-    cckey create -t platform --passphrase "my password"
+    cckey create --passphrase "passphrase1"
 
-    cckey list -t asset
+    cckey list
 
-    cckey delete -t platform --address "ccc..."
+    cckey delete --address cccqy6vhjxs8ddf6y6etgdqcs5elcrl6n6t0vdwumu8
 
-    cckey import UTC--2018-08-14T06-30-23Z--bbb6685e-7165-819d-0988-fc1a7d2d0523 -t platform --passphrase "satoshi"
+    cckey import UTC--2020-03-05T02-47-14Z--6adba8c6-04ff-f649-6347-5c7946e28733 --passphrase "passphrase2"
 
-    cckey export -t platform --address cccq8ah0efv5ckpx6wy5mwva2aklzwsdw027sqfksrr --passphrase "satoshi"
+    cckey export --address cccq8ah0efv5ckpx6wy5mwva2aklzwsdw027sqfksrr --passphrase "passphrase3"
 
-    cckey import-raw -t platform a05f81608217738d99da8fd227897b87e8890d3c9159b559c7c8bbd408e5fb6e --passphrase "satoshi"
+    cckey import-raw b71f1a9a5fb62155b7ccc12841867e95a33da91c30515804546c7c5e575f2048287dec3980387a12ef9f159721c853e47e64a37f61407e0231ee62983cd6d2e --passphrase "passphrase4"
 ```

build-binaries

@@ -13,9 +13,9 @@ execSync("yarn pkg -t node12-linux-x64,node12-macos-x64,node12-win-x64 --out-pat
 console.log("Build done");
 
 const files = [
-    "codechain-keystore-cli-linux",
-    "codechain-keystore-cli-macos",
-    "codechain-keystore-cli-win.exe"
+    "foundry-keystore-cli-linux",
+    "foundry-keystore-cli-macos",
+    "foundry-keystore-cli-win.exe"
 ];
 
 process.chdir("binaries");

package.json

@@ -34,10 +34,10 @@
     "typescript": "^3.0.1"
   },
   "dependencies": {
-    "codechain-keystore": "^0.6.3",
-    "codechain-primitives": "^1.0.4",
     "commander": "^2.17.1",
     "enquirer": "^2.3.1",
+    "foundry-keystore": "^0.1.0",
+    "foundry-primitives": "^0.2.1",
     "lodash": "^4.17.14"
   }
 }

src/command/create.ts

@@ -2,12 +2,12 @@ import { Context } from "../types";
 import { getAddressFromKey } from "../util";
 
 export async function createKey(
-    { cckey, accountType, networkId }: Context,
+    { cckey, networkId }: Context,
     passphrase: string
 ): Promise<void> {
-    const key = await cckey[accountType].createKey({
+    const key = await cckey.keystore.createKey({
         passphrase
     });
 
-    console.log(getAddressFromKey(accountType, key, networkId));
+    console.log(getAddressFromKey(key, networkId));
 }

src/command/delete.ts

@@ -5,11 +5,11 @@ import { Context } from "../types";
 import { findMatchingKey } from "../util";
 
 export async function deleteKey(
-    { cckey, accountType, networkId }: Context,
+    { cckey, networkId }: Context,
     address: string
 ): Promise<void> {
-    const keys = await cckey[accountType].getKeys();
-    const key = findMatchingKey(accountType, keys, address, networkId);
+    const keys = await cckey.keystore.getKeys();
+    const key = findMatchingKey(keys, address, networkId);
 
     const question = {
         type: "confirm",
@@ -19,7 +19,7 @@ export async function deleteKey(
 
     const answer: any = await prompt(question);
     if (answer.delete) {
-        const result = await cckey[accountType].deleteKey({ key });
+        const result = await cckey.keystore.deleteKey({ key });
         if (!result) {
             throw new CLIError(CLIErrorType.Unknown, {
                 message: "Delete failed"

src/command/export.ts

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

src/command/import.ts

@@ -1,17 +1,17 @@
-import { SecretStorage } from "codechain-keystore";
+import { SecretStorage } from "foundry-keystore";
 
 import { Context } from "../types";
 import { getAddressFromKey } from "../util";
 
 export async function importKey(
-    { cckey, accountType, networkId }: Context,
+    { cckey, networkId }: Context,
     secret: SecretStorage,
     passphrase: string
 ): Promise<void> {
-    const key = await cckey[accountType].importKey({
+    const key = await cckey.keystore.importKey({
         secret,
         passphrase
     });
 
-    console.log(getAddressFromKey(accountType, key, networkId));
+    console.log(getAddressFromKey(key, networkId));
 }

src/command/importRaw.ts

@@ -1,17 +1,17 @@
-import { PrivateKey } from "codechain-keystore/lib/types";
+import { PrivateKey } from "foundry-keystore/lib/types";
 
 import { Context } from "../types";
 import { getAddressFromKey } from "../util";
 
 export async function importRawKey(
-    { cckey, accountType, networkId }: Context,
+    { cckey, networkId }: Context,
     privateKey: PrivateKey,
     passphrase: string
 ): Promise<void> {
-    const key = await cckey[accountType].importRaw({
+    const key = await cckey.keystore.importRaw({
         privateKey,
         passphrase
     });
 
-    console.log(getAddressFromKey(accountType, key, networkId));
+    console.log(getAddressFromKey(key, networkId));
 }

src/command/list.ts

@@ -3,13 +3,9 @@ import * as _ from "lodash";
 import { Context } from "../types";
 import { getAddressFromKey } from "../util";
 
-export async function listKeys({
-    cckey,
-    accountType,
-    networkId
-}: Context): Promise<void> {
-    let keys = await cckey[accountType].getKeys();
-    keys = _.map(keys, key => getAddressFromKey(accountType, key, networkId));
+export async function listKeys({ cckey, networkId }: Context): Promise<void> {
+    let keys = await cckey.keystore.getKeys();
+    keys = _.map(keys, key => getAddressFromKey(key, networkId));
     if (keys.length === 0) {
         console.log("");
     } else {

src/error.ts

@@ -1,7 +1,6 @@
 import { Action } from "./types";
 
 export enum CLIErrorType {
-    InvalidAccountType,
     InvalidAction,
     InvalidAddress,
     OptionRequired,
@@ -19,8 +18,6 @@ function getErrorMessage(type: CLIErrorType, args: any = {}) {
     const actions: Action[] = ["list", "create", "delete"];
 
     switch (type) {
-        case CLIErrorType.InvalidAccountType:
-            return "Account-type should be 'platform' or 'asset'";
         case CLIErrorType.InvalidAction:
             return `Action should one of the ${JSON.stringify(actions)}`;
         case CLIErrorType.InvalidAddress: