Make network id switchable

Author: majecty

src/command/create.ts

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

src/command/delete.ts

@@ -8,10 +8,11 @@ import { findMatchingKey } from "../util";
 export async function deleteKey(
     cckey: CCKey,
     accountType: AccountType,
-    address: string
+    address: string,
+    networkId: string
 ): Promise<void> {
     const keys = await cckey[accountType].getKeys();
-    const key = findMatchingKey(accountType, keys, address);
+    const key = findMatchingKey(accountType, keys, address, networkId);
     const Enquirer = require("enquirer");
     const enquirer = new Enquirer();
     enquirer.register("confirm", require("prompt-confirm"));

src/command/export.ts

@@ -7,10 +7,11 @@ export async function exportKey(
     cckey: CCKey,
     accountType: AccountType,
     address: string,
-    passphrase: string
+    passphrase: string,
+    networkId: string
 ): Promise<SecretStorage> {
     const keys = await cckey[accountType].getKeys();
-    const key = findMatchingKey(accountType, keys, address);
+    const key = findMatchingKey(accountType, keys, address, networkId);
     return cckey[accountType].exportKey({
         key,
         passphrase

src/command/import.ts

@@ -8,12 +8,13 @@ export async function importKey(
     cckey: CCKey,
     accountType: AccountType,
     secret: SecretStorage,
-    passphrase: string
+    passphrase: string,
+    networkId: string
 ): Promise<void> {
     const key = await cckey[accountType].importKey({
         secret,
         passphrase
     });
 
-    console.log(getAddressFromKey(accountType, key));
+    console.log(getAddressFromKey(accountType, key, networkId));
 }

src/command/importRaw.ts

@@ -9,12 +9,13 @@ export async function importRawKey(
     cckey: CCKey,
     accountType: AccountType,
     privateKey: PrivateKey,
-    passphrase: string
+    passphrase: string,
+    networkId: string
 ): Promise<void> {
     const key = await cckey[accountType].importRaw({
         privateKey,
         passphrase
     });
 
-    console.log(getAddressFromKey(accountType, key));
+    console.log(getAddressFromKey(accountType, key, networkId));
 }

src/command/list.ts

@@ -6,10 +6,11 @@ import { getAddressFromKey } from "../util";
 
 export async function listKeys(
     cckey: CCKey,
-    accountType: AccountType
+    accountType: AccountType,
+    networkId: string
 ): Promise<void> {
     let keys = await cckey[accountType].getKeys();
-    keys = _.map(keys, key => getAddressFromKey(accountType, key));
+    keys = _.map(keys, key => getAddressFromKey(accountType, key, networkId));
     if (keys.length === 0) {
         console.log("");
     } else {

src/const.ts

@@ -37,6 +37,11 @@ program
         "--keys-path <keysPath>",
         "the path to store the keys",
         DEFAULT_KEYS_PATH
+    )
+    .option(
+        "--network-id <networkId>",
+        "the id of the network (use 'tc' for husky, use 'sc' for saluki)",
+        "tc"
     );
 
 program
@@ -102,44 +107,62 @@ function handleError(
 async function listCommand(args: any[], option: ListOption) {
     const cckey = await CCKey.create({ dbPath: option.parent.keysPath });
     const accountType = parseAccountType(option.parent.accountType);
-    await listKeys(cckey, accountType);
+    const networkId = option.parent.networkId;
+    await listKeys(cckey, accountType, networkId);
 }
 
 async function createCommand(args: any[], option: CreateOption) {
     const cckey = await CCKey.create({ dbPath: option.parent.keysPath });
     const accountType = parseAccountType(option.parent.accountType);
     const passphrase = await parsePassphrase(option.passphrase);
-    await createKey(cckey, accountType, passphrase);
+    const networkId = option.parent.networkId;
+    await createKey(cckey, accountType, passphrase, networkId);
 }
 
 async function deleteCommand(args: any[], option: DeleteOption) {
     const cckey = await CCKey.create({ dbPath: option.parent.keysPath });
     const accountType = parseAccountType(option.parent.accountType);
     const address = parseAddress(option.address);
-    await deleteKey(cckey, accountType, address);
+    const networkId = option.parent.networkId;
+    await deleteKey(cckey, accountType, address, networkId);
 }
 
 async function importCommand([path]: any[], option: ImportOption) {
     const cckey = await CCKey.create({ dbPath: option.parent.keysPath });
     const accountType = parseAccountType(option.parent.accountType);
     const passphrase = await parsePassphrase(option.passphrase);
     const contents = fs.readFileSync(path, { encoding: "utf8" });
-    await importKey(cckey, accountType, JSON.parse(contents), passphrase);
+    const networkId = option.parent.networkId;
+    await importKey(
+        cckey,
+        accountType,
+        JSON.parse(contents),
+        passphrase,
+        networkId
+    );
 }
 
 async function importRawCommand([privateKey]: any[], option: ImportOption) {
     const cckey = await CCKey.create({ dbPath: option.parent.keysPath });
     const accountType = parseAccountType(option.parent.accountType);
     const passphrase = await parsePassphrase(option.passphrase);
-    await importRawKey(cckey, accountType, privateKey, passphrase);
+    const networkId = option.parent.networkId;
+    await importRawKey(cckey, accountType, privateKey, passphrase, networkId);
 }
 
 async function exportCommand(args: any[], option: ExportOption) {
     const cckey = await CCKey.create({ dbPath: option.parent.keysPath });
     const accountType = parseAccountType(option.parent.accountType);
     const address = parseAddress(option.address);
     const passphrase = await parsePassphrase(option.passphrase);
-    const secret = await exportKey(cckey, accountType, address, passphrase);
+    const networkId = option.parent.networkId;
+    const secret = await exportKey(
+        cckey,
+        accountType,
+        address,
+        passphrase,
+        networkId
+    );
     const res = option.pretty
         ? JSON.stringify(secret, null, 2)
         : JSON.stringify(secret);

src/index.ts

@@ -4,6 +4,7 @@ export type Action = "list" | "create" | "delete";
 export interface CommonOption {
     accountType: string;
     keysPath: string;
+    networkId: string;
 }
 
 export interface ListOption {

src/types.ts

@@ -5,13 +5,18 @@ import {
 } from "codechain-sdk/lib/key/classes";
 import _ = require("lodash");
 
-import { networkId } from "./const";
 import { CLIError, CLIErrorType } from "./error";
 import { AccountType } from "./types";
 
-export function getAddressFromKey(accountType: AccountType, key: Key): string {
+export function getAddressFromKey(
+    accountType: AccountType,
+    key: Key,
+    networkId: string
+): string {
     if (accountType === "platform") {
-        const platformAddress = PlatformAddress.fromAccountId(key);
+        const platformAddress = PlatformAddress.fromAccountId(key, {
+            networkId
+        });
         return platformAddress.toString();
     } else if (accountType === "asset") {
         const assetAddress = AssetTransferAddress.fromTypeAndPayload(1, key, {
@@ -26,9 +31,12 @@ export function getAddressFromKey(accountType: AccountType, key: Key): string {
 export function findMatchingKey(
     accountType: AccountType,
     keys: Key[],
-    address: string
+    address: string,
+    networkId: string
 ): string {
-    const addresses = _.map(keys, key => getAddressFromKey(accountType, key));
+    const addresses = _.map(keys, key =>
+        getAddressFromKey(accountType, key, networkId)
+    );
     const index = _.indexOf(addresses, address);
     if (index === -1) {
         throw new CLIError(CLIErrorType.NoSuchAddress, { address });