Merge pull request #681 from harmony-one/rj_branch

Separate functionality and genesis block between beacon and shard chain

api/service/syncing/downloader/server.go

@@ -17,6 +17,7 @@ const (
 // Server is the Server struct for downloader package.
 type Server struct {
 	downloadInterface DownloadInterface
+	GrpcServer        *grpc.Server
 }
 
 // Query returns the feature at the given point.
@@ -39,6 +40,8 @@ func (s *Server) Start(ip, port string) (*grpc.Server, error) {
 	grpcServer := grpc.NewServer(opts...)
 	pb.RegisterDownloaderServer(grpcServer, s)
 	go grpcServer.Serve(lis)
+	s.GrpcServer = grpcServer
+
 	return grpcServer, nil
 }
 

cmd/harmony/main.go

@@ -167,7 +167,7 @@ func createGlobalConfig() *nodeconfig.ConfigType {
 	if nodeConfig.MainDB, err = InitLDBDatabase(*ip, *port, *freshDB, false); err != nil {
 		panic(err)
 	}
-	if !*isGenesis {
+	if shardID != 0 {
 		if nodeConfig.BeaconDB, err = InitLDBDatabase(*ip, *port, *freshDB, true); err != nil {
 			panic(err)
 		}
@@ -238,8 +238,6 @@ func setUpConsensusAndNode(nodeConfig *nodeconfig.ConfigType) (*consensus.Consen
 			currentNode.NodeConfig.SetShardGroupID(p2p.NewGroupIDByShardID(p2p.ShardID(nodeConfig.ShardID)))
 		}
 	} else {
-		currentNode.AddBeaconChainDatabase(nodeConfig.BeaconDB)
-
 		if *isNewNode {
 			currentNode.NodeConfig.SetRole(nodeconfig.NewNode)
 			// TODO: fix the roles as it's unknown before resharding.
@@ -262,6 +260,12 @@ func setUpConsensusAndNode(nodeConfig *nodeconfig.ConfigType) (*consensus.Consen
 	currentNode.Consensus.RegisterRndChannel(dRand.RndChannel)
 	currentNode.DRand = dRand
 
+	if consensus.ShardID != 0 {
+		currentNode.AddBeaconChainDatabase(nodeConfig.BeaconDB)
+	}
+	// This needs to be executed after consensus and drand are setup
+	currentNode.InitGenesisShardState()
+
 	// Assign closure functions to the consensus object
 	consensus.BlockVerifier = currentNode.VerifyNewBlock
 	consensus.OnConsensusDone = currentNode.PostConsensusProcessing
@@ -293,6 +297,10 @@ func main() {
 	if consensus.IsLeader {
 		go currentNode.SendPongMessage()
 	}
+	// TODO: enable beacon chain sync
+	//if consensus.ShardID != 0 {
+	//	go currentNode.SupportBeaconSyncing()
+	//}
 	go currentNode.SupportSyncing()
 	utils.GetLogInstance().Info("New Harmony Node ====", "Role", currentNode.NodeConfig.Role(), "multiaddress", fmt.Sprintf("/ip4/%s/tcp/%s/p2p/%s", *ip, *port, nodeConfig.Host.GetID().Pretty()))
 	currentNode.ServiceManagerSetup()

consensus/consensus_leader.go

@@ -55,7 +55,8 @@ func (consensus *Consensus) WaitForNewBlock(blockChannel chan *types.Block, stop
 					utils.GetLogInstance().Debug("WaitForNewBlock", "removed peers", c)
 				}
 
-				if core.IsEpochBlock(newBlock) {
+				if consensus.ShardID == 0 {
+					if core.IsEpochBlock(newBlock) { // Only beacon chain do randomness generation
 						// Receive pRnd from DRG protocol
 						utils.GetLogInstance().Debug("[DRG] Waiting for pRnd")
 						pRndAndBitmap := <-consensus.PRndChannel
@@ -69,6 +70,7 @@ func (consensus *Consensus) WaitForNewBlock(blockChannel chan *types.Block, stop
 						// TODO: check validity of pRnd
 						newBlock.AddRandPreimage(pRnd)
 					}
+
 					rnd, blockHash, err := consensus.GetNextRnd()
 					if err == nil {
 						// Verify the randomness
@@ -78,6 +80,7 @@ func (consensus *Consensus) WaitForNewBlock(blockChannel chan *types.Block, stop
 					} else {
 						utils.GetLogInstance().Info("Failed to get randomness", "error", err)
 					}
+				}
 				startTime = time.Now()
 				utils.GetLogInstance().Debug("STARTING CONSENSUS", "numTxs", len(newBlock.Transactions()), "consensus", consensus, "startTime", startTime, "publicKeys", len(consensus.PublicKeys))
 				for { // Wait until last consensus is finished
@@ -312,7 +315,7 @@ func (consensus *Consensus) processCommitMessage(message *msg_pb.Message) {
 		select {
 		case consensus.VerifiedNewBlock <- &blockObj:
 		default:
-			utils.GetLogInstance().Info("[SYNC] consensus verified block send to chan failed", "blockHash", blockObj.Hash())
+			utils.GetLogInstance().Info("[SYNC] Failed to send consensus verified block for state sync", "blockHash", blockObj.Hash())
 		}
 
 		consensus.reportMetrics(blockObj)

node/node.go

@@ -243,13 +243,13 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
 		database := db
 		if database == nil {
 			database = ethdb.NewMemDatabase()
-			chain, err = node.GenesisBlockSetup(database, false)
+			chain, err = node.GenesisBlockSetup(database, consensusObj.ShardID, false)
 			isFirstTime = true
 		} else {
 			chain, err = node.InitBlockChainFromDB(db, node.Consensus, isArchival)
 			isFirstTime = false
 			if err != nil || chain == nil || chain.CurrentBlock().NumberU64() <= 0 {
-				chain, err = node.GenesisBlockSetup(database, isArchival)
+				chain, err = node.GenesisBlockSetup(database, consensusObj.ShardID, isArchival)
 				isFirstTime = true
 			}
 		}
@@ -267,6 +267,8 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
 
 		node.Consensus.VerifiedNewBlock = make(chan *types.Block)
 
+		if node.Consensus.ShardID == 0 {
+			// Contracts only exist in beacon chain
 			if isFirstTime {
 				// Setup one time smart contracts
 				node.AddFaucetContractToPendingTransactions()
@@ -278,7 +280,7 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
 			} else {
 				node.AddContractKeyAndAddress()
 			}
-
+		}
 	}
 
 	node.ContractCaller = contracts.NewContractCaller(&db, node.blockchain, params.TestChainConfig)
@@ -315,7 +317,14 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
 // InitGenesisShardState initialize genesis shard state and update committee pub keys for consensus and drand
 func (node *Node) InitGenesisShardState() {
 	// Store the genesis shard state into db.
-	shardState := node.blockchain.StoreNewShardState(node.blockchain.CurrentBlock(), nil)
+	shardState := types.ShardState{}
+	if node.Consensus != nil {
+		if node.Consensus.ShardID == 0 {
+			shardState = node.blockchain.StoreNewShardState(node.blockchain.CurrentBlock(), nil)
+		} else {
+			shardState = node.beaconChain.StoreNewShardState(node.beaconChain.CurrentBlock(), nil)
+		}
+	}
 	// Update validator public keys
 	for _, shard := range shardState {
 		if shard.ShardID == node.Consensus.ShardID {
@@ -428,7 +437,7 @@ func (node *Node) AddBeaconChainDatabase(db ethdb.Database) {
 		database = ethdb.NewMemDatabase()
 	}
 	// TODO (chao) currently we use the same genesis block as normal shard
-	chain, err := node.GenesisBlockSetup(database, false)
+	chain, err := node.GenesisBlockSetup(database, 0, false)
 	if err != nil {
 		utils.GetLogInstance().Error("Error when doing genesis setup")
 		os.Exit(1)

node/node_genesis.go

@@ -26,7 +26,7 @@ const (
 )
 
 // GenesisBlockSetup setups a genesis blockchain.
-func (node *Node) GenesisBlockSetup(db ethdb.Database, isArchival bool) (*core.BlockChain, error) {
+func (node *Node) GenesisBlockSetup(db ethdb.Database, shardID uint32, isArchival bool) (*core.BlockChain, error) {
 	// Initialize genesis block and blockchain
 	// Tests account for txgen to use
 	genesisAlloc := node.CreateGenesisAllocWithTestingAddresses(FakeAddressNumber)
@@ -39,11 +39,13 @@ func (node *Node) GenesisBlockSetup(db ethdb.Database, isArchival bool) (*core.B
 	genesisAlloc[contractDeployerAddress] = core.GenesisAccount{Balance: contractDeployerFunds}
 	node.ContractDeployerKey = contractDeployerKey
 
+	if shardID == 0 {
 		// Accounts used by validator/nodes to stake and participate in the network.
 		AddNodeAddressesToGenesisAlloc(genesisAlloc)
+	}
 
 	chainConfig := params.TestChainConfig
-	chainConfig.ChainID = big.NewInt(int64(node.Consensus.ShardID)) // Use ChainID as piggybacked ShardID
+	chainConfig.ChainID = big.NewInt(int64(shardID)) // Use ChainID as piggybacked ShardID
 	gspec := core.Genesis{
 		Config:         chainConfig,
 		Alloc:          genesisAlloc,

node/node_handler.go

@@ -288,7 +288,8 @@ func (node *Node) PostConsensusProcessing(newBlock *types.Block) {
 
 	node.AddNewBlock(newBlock)
 
-	// TODO: enable drand only for beacon chain
+	if node.Consensus.ShardID == 0 {
+
 		// ConfirmedBlockChannel which is listened by drand leader who will initiate DRG if its a epoch block (first block of a epoch)
 		if node.DRand != nil {
 			go func() {
@@ -338,6 +339,7 @@ func (node *Node) PostConsensusProcessing(newBlock *types.Block) {
 			}
 		}
 	}
+}
 
 // AddNewBlock is usedd to add new block into the blockchain.
 func (node *Node) AddNewBlock(newBlock *types.Block) {

node/node_newblock.go

@@ -60,9 +60,10 @@ func (node *Node) WaitForConsensusReady(readySignal chan struct{}, stopChan chan
 						if err != nil {
 							utils.GetLogInstance().Debug("Failed commiting new block", "Error", err)
 						} else {
+							if node.Consensus.ShardID == 0 {
 								// add new shard state if it's epoch block
-							// TODO(minhdoan): only happens for beaconchain
 								node.addNewShardStateHash(block)
+							}
 							newBlock = block
 							utils.GetLogInstance().Debug("Successfully proposed new block", "blockNum", block.NumberU64(), "numTxs", block.Transactions().Len())
 							break

node/node_syncing.go

@@ -111,14 +111,18 @@ func (node *Node) SupportSyncing() {
 
 // InitSyncingServer starts downloader server.
 func (node *Node) InitSyncingServer() {
+	if node.downloaderServer == nil {
 		node.downloaderServer = downloader.NewServer(node)
 	}
+}
 
 // StartSyncingServer starts syncing server.
 func (node *Node) StartSyncingServer() {
 	utils.GetLogInstance().Info("support_sycning: StartSyncingServer")
+	if node.downloaderServer.GrpcServer == nil {
 		node.downloaderServer.Start(node.SelfPeer.IP, syncing.GetSyncingPort(node.SelfPeer.Port))
 	}
+}
 
 // SendNewBlockToUnsync send latest verified block to unsync, registered nodes
 func (node *Node) SendNewBlockToUnsync() {

node/service_setup.go

@@ -33,8 +33,6 @@ func (node *Node) setupForShardLeader() {
 	node.serviceManager.RegisterService(service.BlockProposal, blockproposal.New(node.Consensus.ReadySignal, node.WaitForConsensusReady))
 	// Register client support service.
 	node.serviceManager.RegisterService(service.ClientSupport, clientsupport.New(node.blockchain.State, node.CallFaucetContract, node.getDeployedStakingContract, node.SelfPeer.IP, node.SelfPeer.Port))
-	// Register randomness service
-	node.serviceManager.RegisterService(service.Randomness, randomness.New(node.DRand))
 }
 
 func (node *Node) setupForShardValidator() {

test/deploy.sh

@@ -70,7 +70,7 @@ EOU
 
 DB=
 TXGEN=true
-DURATION=90
+DURATION=60
 MIN=5
 SHARDS=2
 KILLPORT=9004
@@ -99,7 +99,7 @@ if [ -z "$config" ]; then
 fi
 
 if [ "$SYNC" == "true" ]; then
-    DURATION=300
+    DURATION=120
 fi
 
 # Kill nodes if any