Merge pull request #1125 from rlan35/rj_fork

fix issue for explorer
pull/1126/head
Rongjian Lan 6 years ago committed by GitHub
commit fde87ede52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      cmd/harmony/main.go
  2. 1
      node/node_genesis.go

@ -9,6 +9,8 @@ import (
"path" "path"
"time" "time"
"github.com/harmony-one/bls/ffi/go/bls"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
@ -245,6 +247,7 @@ func createGlobalConfig() *nodeconfig.ConfigType {
} }
} else { } else {
nodeConfig = nodeconfig.GetShardConfig(uint32(*shardID)) nodeConfig = nodeconfig.GetShardConfig(uint32(*shardID))
nodeConfig.ConsensusPriKey = &bls.SecretKey{} // set dummy bls key for consensus object
} }
// Set network type // Set network type

@ -75,6 +75,7 @@ func (node *Node) SetupGenesisBlock(db ethdb.Database, shardID uint32, myShardSt
genesisFunds = genesisFunds.Mul(genesisFunds, big.NewInt(denominations.One)) genesisFunds = genesisFunds.Mul(genesisFunds, big.NewInt(denominations.One))
genesisAlloc[foundationAddress] = core.GenesisAccount{Balance: genesisFunds} genesisAlloc[foundationAddress] = core.GenesisAccount{Balance: genesisFunds}
case nodeconfig.Testnet: case nodeconfig.Testnet:
fallthrough
case nodeconfig.Devnet: case nodeconfig.Devnet:
chainConfig = *params.TestnetChainConfig chainConfig = *params.TestnetChainConfig
// Tests account for txgen to use // Tests account for txgen to use

Loading…
Cancel
Save