Merge pull request #35 from vitelabs/niklr_nodes

feat: allow start of multiple nodes

.gitignore

@@ -3,3 +3,4 @@ bin/gvite-*
 bin/ledger
 bin/gvite.log
 tsconfig.tsbuildinfo
+test/configs/temp

bin/node_config.json

@@ -29,7 +29,7 @@
   "EntropyStorePassword": "123",
   "VMTestEnabled": true,
   "VMDebug": true,
-  "DataDir": "ledger",
+  "DataDir": "ledger/23456",
   "KeyStoreDir": "./",
   "SubscribeEnabled": true,
   "OpenPlugins": true,

bin/shutdown.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
-pgrep gvite | xargs kill -9
-pgrep gvite | xargs wait
-# keep the debug logs in ./ledger/devdata util the next start
+pgrep gvite | xargs kill -9 > /dev/null 2>&1
+pgrep gvite | xargs wait > /dev/null 2>&1
+SCRIPT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}); pwd)
+rm -rf $SCRIPT_DIR/ledger
+rm -f $SCRIPT_DIR/gvite-*.log

bin/startup.sh

@@ -1,15 +1,12 @@
 #!/bin/bash
 SCRIPT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}); pwd)
-rm -rf $SCRIPT_DIR/ledger
-rm -f $SCRIPT_DIR/gvite.log
 BIN_FILE=gvite
 CFG_FILE=node_config.json
-if [ $# == 1 ]; then
-BIN_FILE=$1
-fi
-if [ $# == 2 ]; then
+LOG_FILE=gvite.log
+if [ $# == 3 ]; then
 BIN_FILE=$1
 CFG_FILE=$2
+LOG_FILE=$3
 fi
 cd $SCRIPT_DIR
-exec ./$BIN_FILE --config $CFG_FILE --pprof > ./gvite.log
+exec ./$BIN_FILE --config $CFG_FILE --pprof > ./$LOG_FILE

lib/index.d.ts

@@ -2,8 +2,8 @@ import * as utils from "./utils";
 import { compile } from "./compiler";
 import { loadViteConfig, updateNodeConfig } from "./config";
 import { compile as compileLegacy } from "./legacyCompiler";
-import { startLocalNetwork, newProvider, newAccount } from "./vite";
+import { startLocalNetwork, stopLocalNetworks, newProvider, newAccount } from "./vite";
 import { UserAccount } from "./user";
 import { Contract } from "./contract";
-export { compile, compileLegacy, loadViteConfig, updateNodeConfig, utils, startLocalNetwork, newProvider, newAccount, UserAccount, Contract, };
+export { compile, compileLegacy, loadViteConfig, updateNodeConfig, utils, startLocalNetwork, stopLocalNetworks, newProvider, newAccount, UserAccount, Contract, };
 //# sourceMappingURL=index.d.ts.map

lib/node.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { ChildProcess } from "child_process";
 export declare function init({ name, version, type, }: {
     name?: String;
     version: String;
@@ -6,9 +8,11 @@ export declare function init({ name, version, type, }: {
 export declare function binName(name: String, version: String): string;
 export declare function binPath(): string;
 export declare class Node {
+    process?: ChildProcess;
     httpUrl: string;
     binPath: string;
     binName: string;
+    logFileName: string;
     nodeCfgPath: string;
     provider?: any;
     stopped: boolean;