Revert "[cleanup] remove is_genesis flag"

This reverts commit 97880b2c3a.
pull/1613/head
Leo Chen 5 years ago
parent 0903a96db8
commit 343b4e9ff5
  1. 4
      cmd/harmony/main.go
  2. 2
      scripts/docker/run
  3. 1
      scripts/node.sh

@ -42,7 +42,7 @@ var (
commit string commit string
) )
// InitLDBDatabase initializes a LDBDatabase. will return the beacon chain database for normal shard nodes // InitLDBDatabase initializes a LDBDatabase. isGenesis=true will return the beacon chain database for normal shard nodes
func InitLDBDatabase(ip string, port string, freshDB bool, isBeacon bool) (*ethdb.LDBDatabase, error) { func InitLDBDatabase(ip string, port string, freshDB bool, isBeacon bool) (*ethdb.LDBDatabase, error) {
var dbFileName string var dbFileName string
if isBeacon { if isBeacon {
@ -80,6 +80,8 @@ var (
minPeers = flag.Int("min_peers", 32, "Minimal number of Peers in shard") minPeers = flag.Int("min_peers", 32, "Minimal number of Peers in shard")
// Key file to store the private key // Key file to store the private key
keyFile = flag.String("key", "./.hmykey", "the p2p key file of the harmony node") keyFile = flag.String("key", "./.hmykey", "the p2p key file of the harmony node")
// isGenesis indicates this node is a genesis node
isGenesis = flag.Bool("is_genesis", true, "true means this node is a genesis node")
// isArchival indicates this node is an archival node that will save and archive current blockchain // isArchival indicates this node is an archival node that will save and archive current blockchain
isArchival = flag.Bool("is_archival", true, "false makes node faster by turning caching off") isArchival = flag.Bool("is_archival", true, "false makes node faster by turning caching off")
// delayCommit is the commit-delay timer, used by Harmony nodes // delayCommit is the commit-delay timer, used by Harmony nodes

@ -31,6 +31,6 @@ if [ -z "$NODE_ACCOUNT_ID" ]; then
exit 2 exit 2
fi fi
harmony -log_folder log -bootnodes $BN_MA -ip $PUB_IP -port $NODE_PORT -account_index $NODE_ACCOUNT_ID harmony -log_folder log -bootnodes $BN_MA -ip $PUB_IP -port $NODE_PORT -is_genesis -account_index $NODE_ACCOUNT_ID
# vim: ai ts=2 sw=2 et sts=2 ft=sh # vim: ai ts=2 sw=2 et sts=2 ft=sh

@ -491,6 +491,7 @@ do
-bootnodes "${BN_MA}" -bootnodes "${BN_MA}"
-ip "${PUB_IP}" -ip "${PUB_IP}"
-port "${NODE_PORT}" -port "${NODE_PORT}"
-is_genesis
-blskey_file "${BLSKEYFILE}" -blskey_file "${BLSKEYFILE}"
-network_type="${network_type}" -network_type="${network_type}"
-dns_zone="${dns_zone}" -dns_zone="${dns_zone}"

Loading…
Cancel
Save