Merge pull request #839 from harmony-ek/streamline_resharding_timing

Streamline resharding timing + block reward
pull/862/head
Eugene Kim 6 years ago committed by GitHub
commit 919718bbc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      api/proto/node/node_test.go
  2. 5
      cmd/client/txgen/main.go
  3. 7
      cmd/client/wallet/main.go
  4. 33
      cmd/harmony/main.go
  5. 95
      consensus/consensus.go
  6. 31
      consensus/consensus_leader.go
  7. 15
      consensus/consensus_service.go
  8. 42
      consensus/consensus_v2.go
  9. 11
      consensus/consensus_validator.go
  10. 22
      consensus/consensus_validator_test.go
  11. 6
      consensus/engine/consensus_engine.go
  12. 6
      contracts/contract_caller.go
  13. 160
      core/blockchain.go
  14. 7
      core/chain_makers.go
  15. 3
      core/genesis.go
  16. 83
      core/rawdb/accessors_chain.go
  17. 171
      core/rawdb/accessors_chain_test.go
  18. 2
      core/rawdb/interfaces.go
  19. 137
      core/rawdb/mock/mock.go
  20. 13
      core/rawdb/schema.go
  21. 47
      core/resharding.go
  22. 3
      core/resharding_test.go
  23. 6
      core/state_processor.go
  24. 35
      core/types/block.go
  25. 38
      core/types/shard_state.go
  26. 4
      core/types/shard_state_test.go
  27. 7
      crypto/bls/bls.go
  28. 3
      go.mod
  29. 9
      internal/configs/node/config.go
  30. 34
      internal/shardchain/dbfactory.go
  31. 8
      internal/shardchain/dbinit.go
  32. 136
      internal/shardchain/shardchains.go
  33. 6
      node/contract.go
  34. 2
      node/contract_test.go
  35. 198
      node/node.go
  36. 80
      node/node_genesis.go
  37. 336
      node/node_handler.go
  38. 10
      node/node_handler_test.go
  39. 129
      node/node_newblock.go
  40. 22
      node/node_syncing.go
  41. 18
      node/node_test.go
  42. 2
      node/rpc.go
  43. 10
      node/service_setup.go
  44. 2
      node/staking.go
  45. 2
      node/staking_test.go
  46. 18
      node/worker/worker.go
  47. 51
      test/deploy.sh

@ -75,6 +75,7 @@ func TestConstructBlocksSyncMessage(t *testing.T) {
head := &types.Header{ head := &types.Header{
Number: new(big.Int).SetUint64(uint64(10000)), Number: new(big.Int).SetUint64(uint64(10000)),
Nonce: types.EncodeNonce(uint64(10000)), Nonce: types.EncodeNonce(uint64(10000)),
Epoch: big.NewInt(0),
ShardID: 0, ShardID: 0,
Time: new(big.Int).SetUint64(uint64(100000)), Time: new(big.Int).SetUint64(uint64(100000)),
Root: root, Root: root,

@ -13,11 +13,13 @@ import (
"github.com/harmony-one/harmony/consensus" "github.com/harmony-one/harmony/consensus"
"github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/internal/shardchain"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
bls2 "github.com/harmony-one/bls/ffi/go/bls" bls2 "github.com/harmony-one/bls/ffi/go/bls"
"github.com/harmony-one/harmony/api/client" "github.com/harmony-one/harmony/api/client"
proto_node "github.com/harmony-one/harmony/api/proto/node" proto_node "github.com/harmony-one/harmony/api/proto/node"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
@ -97,7 +99,8 @@ func setUpTXGen() *node.Node {
os.Exit(1) os.Exit(1)
} }
consensusObj, err := consensus.New(myhost, uint32(shardID), p2p.Peer{}, nil) consensusObj, err := consensus.New(myhost, uint32(shardID), p2p.Peer{}, nil)
txGen := node.New(myhost, consensusObj, nil, false) //Changed it : no longer archival node. chainDBFactory := &shardchain.MemDBFactory{}
txGen := node.New(myhost, consensusObj, chainDBFactory, false) //Changed it : no longer archival node.
txGen.Client = client.NewClient(txGen.GetHost(), uint32(shardID)) txGen.Client = client.NewClient(txGen.GetHost(), uint32(shardID))
consensusObj.SetStakeInfoFinder(gsif) consensusObj.SetStakeInfoFinder(gsif)
consensusObj.ChainReader = txGen.Blockchain() consensusObj.ChainReader = txGen.Blockchain()

@ -15,12 +15,14 @@ import (
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/harmony-one/harmony/api/client" "github.com/harmony-one/harmony/api/client"
clientService "github.com/harmony-one/harmony/api/client/service" clientService "github.com/harmony-one/harmony/api/client/service"
proto_node "github.com/harmony-one/harmony/api/proto/node" proto_node "github.com/harmony-one/harmony/api/proto/node"
"github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node" nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
"github.com/harmony-one/harmony/internal/shardchain"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/node" "github.com/harmony-one/harmony/node"
"github.com/harmony-one/harmony/p2p" "github.com/harmony-one/harmony/p2p"
@ -239,7 +241,8 @@ func createWalletNode() *node.Node {
if err != nil { if err != nil {
panic(err) panic(err)
} }
w := node.New(host, nil, nil, false) chainDBFactory := &shardchain.MemDBFactory{}
w := node.New(host, nil, chainDBFactory, false)
w.Client = client.NewClient(w.GetHost(), uint32(shardID)) w.Client = client.NewClient(w.GetHost(), uint32(shardID))
w.NodeConfig.SetRole(nodeconfig.ClientNode) w.NodeConfig.SetRole(nodeconfig.ClientNode)
@ -565,7 +568,7 @@ func GetFreeToken(address common.Address) {
log.Debug("GetFreeToken", "response", response) log.Debug("GetFreeToken", "response", response)
txID := common.Hash{} txID := common.Hash{}
txID.SetBytes(response.TxId) txID.SetBytes(response.TxId)
fmt.Printf("Transaction Id requesting free token in shard %d: %s\n", int(0), txID.Hex()) fmt.Printf("Transaction Id requesting free token in shard %d: %s\n", i, txID.Hex())
break break
} }
} }

@ -22,6 +22,7 @@ import (
nodeconfig "github.com/harmony-one/harmony/internal/configs/node" nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
hmykey "github.com/harmony-one/harmony/internal/keystore" hmykey "github.com/harmony-one/harmony/internal/keystore"
"github.com/harmony-one/harmony/internal/profiler" "github.com/harmony-one/harmony/internal/profiler"
"github.com/harmony-one/harmony/internal/shardchain"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/internal/utils/contract" "github.com/harmony-one/harmony/internal/utils/contract"
"github.com/harmony-one/harmony/node" "github.com/harmony-one/harmony/node"
@ -109,6 +110,9 @@ var (
myPass = "" myPass = ""
// logging verbosity // logging verbosity
verbosity = flag.Int("verbosity", 5, "Logging verbosity: 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=detail (default: 5)") verbosity = flag.Int("verbosity", 5, "Logging verbosity: 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=detail (default: 5)")
// dbDir is the database directory.
dbDir = flag.String("db_dir", "", "blockchain database directory")
) )
func initSetup() { func initSetup() {
@ -229,16 +233,6 @@ func createGlobalConfig() *nodeconfig.ConfigType {
} }
// Key Setup ================= [End] // Key Setup ================= [End]
// Initialize leveldb for main blockchain and beacon.
if nodeConfig.MainDB, err = InitLDBDatabase(*ip, *port, *freshDB, false); err != nil {
panic(err)
}
if myShardID != 0 {
if nodeConfig.BeaconDB, err = InitLDBDatabase(*ip, *port, *freshDB, true); err != nil {
panic(err)
}
}
nodeConfig.SelfPeer = p2p.Peer{IP: *ip, Port: *port, ConsensusPubKey: nodeConfig.ConsensusPubKey} nodeConfig.SelfPeer = p2p.Peer{IP: *ip, Port: *port, ConsensusPubKey: nodeConfig.ConsensusPubKey}
if *accountIndex%core.GenesisShardSize == 0 { // The first node in a shard is the leader at genesis if *accountIndex%core.GenesisShardSize == 0 { // The first node in a shard is the leader at genesis
@ -258,6 +252,8 @@ func createGlobalConfig() *nodeconfig.ConfigType {
nodeConfig.Host.AddPeer(&nodeConfig.Leader) nodeConfig.Host.AddPeer(&nodeConfig.Leader)
nodeConfig.DBDir = *dbDir
return nodeConfig return nodeConfig
} }
@ -273,7 +269,8 @@ func setUpConsensusAndNode(nodeConfig *nodeconfig.ConfigType) *node.Node {
currentConsensus.MinPeers = *minPeers currentConsensus.MinPeers = *minPeers
// Current node. // Current node.
currentNode := node.New(nodeConfig.Host, currentConsensus, nodeConfig.MainDB, *isArchival) chainDBFactory := &shardchain.LDBFactory{RootDir: nodeConfig.DBDir}
currentNode := node.New(nodeConfig.Host, currentConsensus, chainDBFactory, *isArchival)
currentNode.NodeConfig.SetRole(nodeconfig.NewNode) currentNode.NodeConfig.SetRole(nodeconfig.NewNode)
currentNode.StakingAccount = myAccount currentNode.StakingAccount = myAccount
utils.GetLogInstance().Info("node account set", utils.GetLogInstance().Info("node account set",
@ -348,10 +345,6 @@ func setUpConsensusAndNode(nodeConfig *nodeconfig.ConfigType) *node.Node {
currentNode.Consensus.RegisterRndChannel(dRand.RndChannel) currentNode.Consensus.RegisterRndChannel(dRand.RndChannel)
currentNode.DRand = dRand currentNode.DRand = dRand
if currentConsensus.ShardID != 0 {
currentNode.AddBeaconChainDatabase(nodeConfig.BeaconDB)
}
// This needs to be executed after consensus and drand are setup // This needs to be executed after consensus and drand are setup
if !*isNewNode || *shardID > -1 { // initial staking new node doesn't need to initialize shard state if !*isNewNode || *shardID > -1 { // initial staking new node doesn't need to initialize shard state
currentNode.InitShardState(*shardID == -1 && !*isNewNode) // TODO: Have a better why to distinguish non-genesis node currentNode.InitShardState(*shardID == -1 && !*isNewNode) // TODO: Have a better why to distinguish non-genesis node
@ -395,7 +388,15 @@ func main() {
// go currentNode.SupportBeaconSyncing() // go currentNode.SupportBeaconSyncing()
//} //}
utils.GetLogInstance().Info("==== New Harmony Node ====", "BlsPubKey", hex.EncodeToString(nodeConfig.ConsensusPubKey.Serialize()), "ShardID", nodeConfig.ShardID, "ShardGroupID", nodeConfig.GetShardGroupID(), "BeaconGroupID", nodeConfig.GetBeaconGroupID(), "ClientGroupID", nodeConfig.GetClientGroupID(), "Role", currentNode.NodeConfig.Role(), "multiaddress", fmt.Sprintf("/ip4/%s/tcp/%s/p2p/%s", *ip, *port, nodeConfig.Host.GetID().Pretty())) utils.GetLogInstance().Info("==== New Harmony Node ====",
"BlsPubKey", hex.EncodeToString(nodeConfig.ConsensusPubKey.Serialize()),
"ShardID", nodeConfig.ShardID,
"ShardGroupID", nodeConfig.GetShardGroupID(),
"BeaconGroupID", nodeConfig.GetBeaconGroupID(),
"ClientGroupID", nodeConfig.GetClientGroupID(),
"Role", currentNode.NodeConfig.Role(),
"multiaddress", fmt.Sprintf("/ip4/%s/tcp/%s/p2p/%s",
*ip, *port, nodeConfig.Host.GetID().Pretty()))
currentNode.MaybeKeepSendingPongMessage() currentNode.MaybeKeepSendingPongMessage()
go currentNode.SupportSyncing() go currentNode.SupportSyncing()

@ -2,12 +2,12 @@
package consensus // consensus package consensus // consensus
import ( import (
"errors"
"math/big" "math/big"
"sync" "sync"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
@ -125,7 +125,7 @@ type Consensus struct {
// Called when consensus on a new block is done // Called when consensus on a new block is done
OnConsensusDone func(*types.Block) OnConsensusDone func(*types.Block)
// The verifier func passed from Node object // The verifier func passed from Node object
BlockVerifier func(*types.Block) bool BlockVerifier func(*types.Block) error
// verified block to state sync broadcast // verified block to state sync broadcast
VerifiedNewBlock chan *types.Block VerifiedNewBlock chan *types.Block
@ -246,61 +246,82 @@ func New(host p2p.Host, ShardID uint32, leader p2p.Peer, blsPriKey *bls.SecretKe
return &consensus, nil return &consensus, nil
} }
// AccumulateRewards credits the coinbase of the given block with the mining // accumulateRewards credits the coinbase of the given block with the mining
// reward. The total reward consists of the static block reward and rewards for // reward. The total reward consists of the static block reward and rewards for
// included uncles. The coinbase of each uncle block is also rewarded. // included uncles. The coinbase of each uncle block is also rewarded.
func (consensus *Consensus) accumulateRewards( func accumulateRewards(
config *params.ChainConfig, state *state.DB, header *types.Header, bc consensus_engine.ChainReader, state *state.DB, header *types.Header,
) error { ) error {
logger := utils.GetLogInstance().New("parentHash", header.ParentHash) logger := header.Logger(utils.GetLogInstance())
if header.ParentHash == (common.Hash{}) { getLogger := func() log.Logger { return utils.WithCallerSkip(logger, 1) }
// This block is a genesis block, blockNum := header.Number.Uint64()
// without a parent block whose signer to reward. if blockNum == 0 {
// Epoch block has no parent to reward.
return nil return nil
} }
if consensus.ChainReader == nil { // TODO ek – retrieving by parent number (blockNum - 1) doesn't work,
return errors.New("ChainReader is nil") // while it is okay with hash. Sounds like DB inconsistency.
// Figure out why.
parentHeader := bc.GetHeaderByHash(header.ParentHash)
if parentHeader == nil {
return ctxerror.New("cannot find parent block header in DB",
"parentHash", header.ParentHash)
} }
parent := consensus.ChainReader.GetHeaderByHash(header.ParentHash) if parentHeader.Number.Cmp(common.Big0) == 0 {
if parent == nil { // Parent is an epoch block,
return ctxerror.New("cannot retrieve parent header", // which is not signed in the usual manner therefore rewards nothing.
"parentHash", header.ParentHash, return nil
}
parentShardState, err := bc.ReadShardState(parentHeader.Epoch)
if err != nil {
return ctxerror.New("cannot read shard state",
"epoch", parentHeader.Epoch,
).WithCause(err)
}
parentCommittee := parentShardState.FindCommitteeByID(parentHeader.ShardID)
if parentCommittee == nil {
return ctxerror.New("cannot find shard in the shard state",
"parentBlockNumber", parentHeader.Number,
"shardID", parentHeader.ShardID,
) )
} }
mask, err := bls_cosi.NewMask(consensus.PublicKeys, nil) var committerKeys []*bls.PublicKey
for _, member := range parentCommittee.NodeList {
committerKey := new(bls.PublicKey)
err := member.BlsPublicKey.ToLibBLSPublicKey(committerKey)
if err != nil {
return ctxerror.New("cannot convert BLS public key",
"blsPublicKey", member.BlsPublicKey).WithCause(err)
}
committerKeys = append(committerKeys, committerKey)
}
mask, err := bls_cosi.NewMask(committerKeys, nil)
if err != nil { if err != nil {
return ctxerror.New("cannot create group sig mask").WithCause(err) return ctxerror.New("cannot create group sig mask").WithCause(err)
} }
logger.Debug("accumulateRewards: setting group sig mask", if err := mask.SetMask(parentHeader.CommitBitmap); err != nil {
"destLen", mask.Len(),
"srcLen", len(parent.CommitBitmap),
)
if err := mask.SetMask(parent.CommitBitmap); err != nil {
return ctxerror.New("cannot set group sig mask bits").WithCause(err) return ctxerror.New("cannot set group sig mask bits").WithCause(err)
} }
totalAmount := big.NewInt(0) totalAmount := big.NewInt(0)
numAccounts := 0 numAccounts := 0
signingKeys := mask.GetPubKeyFromMask(true) for idx, member := range parentCommittee.NodeList {
for _, key := range signingKeys { if signed, err := mask.IndexEnabled(idx); err != nil {
stakeInfos := consensus.stakeInfoFinder.FindStakeInfoByNodeKey(key) return ctxerror.New("cannot check for committer bit",
if len(stakeInfos) == 0 { "committerIndex", idx,
logger.Error("accumulateRewards: node has no stake info", ).WithCause(err)
"nodeKey", key.GetHexString()) } else if !signed {
continue continue
} }
numAccounts += len(stakeInfos) numAccounts++
for _, stakeInfo := range stakeInfos { account := common.HexToAddress(member.EcdsaAddress)
utils.GetLogInstance().Info("accumulateRewards: rewarding", getLogger().Info("rewarding block signer",
"block", header.Hash(), "account", account,
"account", stakeInfo.Account, "node", member.BlsPublicKey.Hex(),
"node", stakeInfo.BlsPublicKey.Hex(),
"amount", BlockReward) "amount", BlockReward)
state.AddBalance(stakeInfo.Account, BlockReward) state.AddBalance(account, BlockReward)
totalAmount = new(big.Int).Add(totalAmount, BlockReward) totalAmount = new(big.Int).Add(totalAmount, BlockReward)
} }
} getLogger().Debug("paid out block reward",
logger.Debug("accumulateRewards: paid out block reward",
"numSigs", len(signingKeys),
"numAccounts", numAccounts, "numAccounts", numAccounts,
"totalAmount", totalAmount) "totalAmount", totalAmount)
return nil return nil

@ -9,9 +9,9 @@ import (
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
protobuf "github.com/golang/protobuf/proto" protobuf "github.com/golang/protobuf/proto"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
msg_pb "github.com/harmony-one/harmony/api/proto/message" msg_pb "github.com/harmony-one/harmony/api/proto/message"
"github.com/harmony-one/harmony/api/service/explorer" "github.com/harmony-one/harmony/api/service/explorer"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
bls_cosi "github.com/harmony-one/harmony/crypto/bls" bls_cosi "github.com/harmony-one/harmony/crypto/bls"
"github.com/harmony-one/harmony/internal/profiler" "github.com/harmony-one/harmony/internal/profiler"
@ -51,20 +51,21 @@ func (consensus *Consensus) WaitForNewBlock(blockChannel chan *types.Block, stop
// TODO: think about potential race condition // TODO: think about potential race condition
if consensus.ShardID == 0 { if consensus.ShardID == 0 {
if core.IsEpochBlock(newBlock) { // Only beacon chain do randomness generation // TODO ek/rj - re-enable this after fixing DRand
// Receive pRnd from DRG protocol //if core.IsEpochBlock(newBlock) { // Only beacon chain do randomness generation
utils.GetLogInstance().Debug("[DRG] Waiting for pRnd") // // Receive pRnd from DRG protocol
pRndAndBitmap := <-consensus.PRndChannel // utils.GetLogInstance().Debug("[DRG] Waiting for pRnd")
utils.GetLogInstance().Debug("[DRG] Got pRnd", "pRnd", pRndAndBitmap) // pRndAndBitmap := <-consensus.PRndChannel
pRnd := [32]byte{} // utils.GetLogInstance().Debug("[DRG] Got pRnd", "pRnd", pRndAndBitmap)
copy(pRnd[:], pRndAndBitmap[:32]) // pRnd := [32]byte{}
bitmap := pRndAndBitmap[32:] // copy(pRnd[:], pRndAndBitmap[:32])
vrfBitmap, _ := bls_cosi.NewMask(consensus.PublicKeys, consensus.leader.ConsensusPubKey) // bitmap := pRndAndBitmap[32:]
vrfBitmap.SetMask(bitmap) // vrfBitmap, _ := bls_cosi.NewMask(consensus.PublicKeys, consensus.leader.ConsensusPubKey)
// vrfBitmap.SetMask(bitmap)
// TODO: check validity of pRnd //
newBlock.AddRandPreimage(pRnd) // // TODO: check validity of pRnd
} // newBlock.AddRandPreimage(pRnd)
//}
rnd, blockHash, err := consensus.GetNextRnd() rnd, blockHash, err := consensus.GetNextRnd()
if err == nil { if err == nil {

@ -12,6 +12,9 @@ import (
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
protobuf "github.com/golang/protobuf/proto" protobuf "github.com/golang/protobuf/proto"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
libp2p_peer "github.com/libp2p/go-libp2p-peer"
"golang.org/x/crypto/sha3"
proto_discovery "github.com/harmony-one/harmony/api/proto/discovery" proto_discovery "github.com/harmony-one/harmony/api/proto/discovery"
msg_pb "github.com/harmony-one/harmony/api/proto/message" msg_pb "github.com/harmony-one/harmony/api/proto/message"
consensus_engine "github.com/harmony-one/harmony/consensus/engine" consensus_engine "github.com/harmony-one/harmony/consensus/engine"
@ -19,11 +22,10 @@ import (
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
bls_cosi "github.com/harmony-one/harmony/crypto/bls" bls_cosi "github.com/harmony-one/harmony/crypto/bls"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node" nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/p2p" "github.com/harmony-one/harmony/p2p"
"github.com/harmony-one/harmony/p2p/host" "github.com/harmony-one/harmony/p2p/host"
libp2p_peer "github.com/libp2p/go-libp2p-peer"
"golang.org/x/crypto/sha3"
) )
// WaitForNewRandomness listens to the RndChannel to receive new VDF randomness. // WaitForNewRandomness listens to the RndChannel to receive new VDF randomness.
@ -244,7 +246,9 @@ func (consensus *Consensus) VerifySeal(chain consensus_engine.ChainReader, heade
func (consensus *Consensus) Finalize(chain consensus_engine.ChainReader, header *types.Header, state *state.DB, txs []*types.Transaction, receipts []*types.Receipt) (*types.Block, error) { func (consensus *Consensus) Finalize(chain consensus_engine.ChainReader, header *types.Header, state *state.DB, txs []*types.Transaction, receipts []*types.Receipt) (*types.Block, error) {
// Accumulate any block and uncle rewards and commit the final state root // Accumulate any block and uncle rewards and commit the final state root
// Header seems complete, assemble into a block and return // Header seems complete, assemble into a block and return
consensus.accumulateRewards(chain.Config(), state, header) if err := accumulateRewards(chain, state, header); err != nil {
return nil, ctxerror.New("cannot pay block reward").WithCause(err)
}
header.Root = state.IntermediateRoot(false) header.Root = state.IntermediateRoot(false)
return types.NewBlock(header, txs, receipts), nil return types.NewBlock(header, txs, receipts), nil
} }
@ -533,7 +537,10 @@ func (consensus *Consensus) checkConsensusMessage(message *msg_pb.Message, publi
// Verify message signature // Verify message signature
err := verifyMessageSig(publicKey, message) err := verifyMessageSig(publicKey, message)
if err != nil { if err != nil {
utils.GetLogInstance().Warn("Failed to verify the message signature", "Error", err) ctxerror.Log15(utils.GetLogger().Warn,
ctxerror.New("failed to verify the message signature",
"publicKey", publicKey.GetHexString(),
).WithCause(err))
return consensus_engine.ErrInvalidConsensusMessage return consensus_engine.ErrInvalidConsensusMessage
} }
if !bytes.Equal(blockHash, consensus.blockHash[:]) { if !bytes.Equal(blockHash, consensus.blockHash[:]) {

@ -8,13 +8,14 @@ import (
protobuf "github.com/golang/protobuf/proto" protobuf "github.com/golang/protobuf/proto"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
"github.com/harmony-one/harmony/api/proto" "github.com/harmony-one/harmony/api/proto"
msg_pb "github.com/harmony-one/harmony/api/proto/message" msg_pb "github.com/harmony-one/harmony/api/proto/message"
"github.com/harmony-one/harmony/api/service/explorer" "github.com/harmony-one/harmony/api/service/explorer"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
bls_cosi "github.com/harmony-one/harmony/crypto/bls" bls_cosi "github.com/harmony-one/harmony/crypto/bls"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node" nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/p2p" "github.com/harmony-one/harmony/p2p"
"github.com/harmony-one/harmony/p2p/host" "github.com/harmony-one/harmony/p2p/host"
@ -140,6 +141,16 @@ func (consensus *Consensus) onAnnounce(msg *msg_pb.Message) {
utils.GetLogInstance().Warn("onAnnounce block content is not verified successfully", "error", err) utils.GetLogInstance().Warn("onAnnounce block content is not verified successfully", "error", err)
return return
} }
if consensus.BlockVerifier == nil {
// do nothing
} else if err := consensus.BlockVerifier(&blockObj); err != nil {
// TODO ek – maybe we could do this in commit phase
err := ctxerror.New("block verification failed",
"blockHash", blockObj.Hash(),
).WithCause(err)
ctxerror.Log15(utils.GetLogInstance().Warn, err)
return
}
logMsgs := consensus.pbftLog.GetMessagesByTypeSeqView(msg_pb.MessageType_ANNOUNCE, recvMsg.BlockNum, recvMsg.ViewID) logMsgs := consensus.pbftLog.GetMessagesByTypeSeqView(msg_pb.MessageType_ANNOUNCE, recvMsg.BlockNum, recvMsg.ViewID)
if len(logMsgs) > 0 { if len(logMsgs) > 0 {
@ -697,20 +708,21 @@ func (consensus *Consensus) Start(blockChannel chan *types.Block, stopChan chan
case newBlock := <-blockChannel: case newBlock := <-blockChannel:
utils.GetLogInstance().Info("receive newBlock", "blockNum", newBlock.NumberU64()) utils.GetLogInstance().Info("receive newBlock", "blockNum", newBlock.NumberU64())
if consensus.ShardID == 0 { if consensus.ShardID == 0 {
if core.IsEpochBlock(newBlock) { // Only beacon chain do randomness generation // TODO ek/rj - re-enable this after fixing DRand
// Receive pRnd from DRG protocol //if core.IsEpochBlock(newBlock) { // Only beacon chain do randomness generation
utils.GetLogInstance().Debug("[DRG] Waiting for pRnd") // // Receive pRnd from DRG protocol
pRndAndBitmap := <-consensus.PRndChannel // utils.GetLogInstance().Debug("[DRG] Waiting for pRnd")
utils.GetLogInstance().Debug("[DRG] Got pRnd", "pRnd", pRndAndBitmap) // pRndAndBitmap := <-consensus.PRndChannel
pRnd := [32]byte{} // utils.GetLogInstance().Debug("[DRG] Got pRnd", "pRnd", pRndAndBitmap)
copy(pRnd[:], pRndAndBitmap[:32]) // pRnd := [32]byte{}
bitmap := pRndAndBitmap[32:] // copy(pRnd[:], pRndAndBitmap[:32])
vrfBitmap, _ := bls_cosi.NewMask(consensus.PublicKeys, consensus.leader.ConsensusPubKey) // bitmap := pRndAndBitmap[32:]
vrfBitmap.SetMask(bitmap) // vrfBitmap, _ := bls_cosi.NewMask(consensus.PublicKeys, consensus.leader.ConsensusPubKey)
// vrfBitmap.SetMask(bitmap)
// TODO: check validity of pRnd //
newBlock.AddRandPreimage(pRnd) // // TODO: check validity of pRnd
} // newBlock.AddRandPreimage(pRnd)
//}
rnd, blockHash, err := consensus.GetNextRnd() rnd, blockHash, err := consensus.GetNextRnd()
if err == nil { if err == nil {

@ -9,6 +9,7 @@ import (
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
bls_cosi "github.com/harmony-one/harmony/crypto/bls" bls_cosi "github.com/harmony-one/harmony/crypto/bls"
"github.com/harmony-one/harmony/internal/attack" "github.com/harmony-one/harmony/internal/attack"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/p2p" "github.com/harmony-one/harmony/p2p"
"github.com/harmony-one/harmony/p2p/host" "github.com/harmony-one/harmony/p2p/host"
@ -82,6 +83,16 @@ func (consensus *Consensus) processAnnounceMessage(message *msg_pb.Message) {
utils.GetLogInstance().Warn("Block content is not verified successfully", "error", err) utils.GetLogInstance().Warn("Block content is not verified successfully", "error", err)
return return
} }
if consensus.BlockVerifier == nil {
// do nothing
} else if err := consensus.BlockVerifier(&blockObj); err != nil {
// TODO ek – maybe we could do this in commit phase
err := ctxerror.New("block verification failed",
"blockHash", blockObj.Hash(),
).WithCause(err)
ctxerror.Log15(utils.GetLogInstance().Warn, err)
return
}
// Construct and send prepare message // Construct and send prepare message
msgToSend := consensus.constructPrepareMessage() msgToSend := consensus.constructPrepareMessage()

@ -2,14 +2,15 @@ package consensus
import ( import (
"encoding/hex" "encoding/hex"
"math/big"
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/golang/mock/gomock" "github.com/golang/mock/gomock"
protobuf "github.com/golang/protobuf/proto" protobuf "github.com/golang/protobuf/proto"
"github.com/harmony-one/harmony/api/proto" "github.com/harmony-one/harmony/api/proto"
msg_pb "github.com/harmony-one/harmony/api/proto/message" msg_pb "github.com/harmony-one/harmony/api/proto/message"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
@ -18,7 +19,6 @@ import (
"github.com/harmony-one/harmony/p2p" "github.com/harmony-one/harmony/p2p"
mock_host "github.com/harmony-one/harmony/p2p/host/mock" mock_host "github.com/harmony-one/harmony/p2p/host/mock"
"github.com/harmony-one/harmony/p2p/p2pimpl" "github.com/harmony-one/harmony/p2p/p2pimpl"
//"github.com/stretchr/testify/assert"
) )
type MockChainReader struct{} type MockChainReader struct{}
@ -48,6 +48,10 @@ func (MockChainReader) GetBlock(hash common.Hash, number uint64) *types.Block {
return &types.Block{} return &types.Block{}
} }
func (MockChainReader) ReadShardState(epoch *big.Int) (types.ShardState, error) {
return nil, nil
}
func TestProcessMessageValidatorAnnounce(test *testing.T) { func TestProcessMessageValidatorAnnounce(test *testing.T) {
ctrl := gomock.NewController(test) ctrl := gomock.NewController(test)
defer ctrl.Finish() defer ctrl.Finish()
@ -118,10 +122,10 @@ func TestProcessMessageValidatorAnnounce(test *testing.T) {
func testBlockBytes() ([]byte, error) { func testBlockBytes() ([]byte, error) {
return hex.DecodeString("" + return hex.DecodeString("" +
// BEGIN 673-byte Block // BEGIN 675-byte Block
"f902a1" + "f902a3" +
// BEGIN 668-byte header // BEGIN 670-byte header
"f9029c" + "f9029e" +
// 32-byte ParentHash // 32-byte ParentHash
"a0" + "a0" +
"0000000000000000000000000000000000000000000000000000000000000000" + "0000000000000000000000000000000000000000000000000000000000000000" +
@ -171,6 +175,9 @@ func testBlockBytes() ([]byte, error) {
// 8-byte Nonce // 8-byte Nonce
"88" + "88" +
"0000000000000000" + "0000000000000000" +
// 0-byte Epoch
"80" +
"" +
// single-byte ShardID // single-byte ShardID
"01" + "01" +
// 48-byte PrepareSignature // 48-byte PrepareSignature
@ -196,6 +203,9 @@ func testBlockBytes() ([]byte, error) {
// 32-byte ShardStateHash // 32-byte ShardStateHash
"a0" + "a0" +
"0000000000000000000000000000000000000000000000000000000000000000" + "0000000000000000000000000000000000000000000000000000000000000000" +
// BEGIN 0-byte ShardState
"c0" +
// END ShardState
// END header // END header
// BEGIN 0-byte uncles // BEGIN 0-byte uncles
"c0" + "c0" +

@ -1,8 +1,11 @@
package engine package engine
import ( import (
"math/big"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/harmony-one/harmony/core/state" "github.com/harmony-one/harmony/core/state"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
) )
@ -28,6 +31,9 @@ type ChainReader interface {
// GetBlock retrieves a block from the database by hash and number. // GetBlock retrieves a block from the database by hash and number.
GetBlock(hash common.Hash, number uint64) *types.Block GetBlock(hash common.Hash, number uint64) *types.Block
// ReadShardState retrieves sharding state given the epoch number.
ReadShardState(epoch *big.Int) (types.ShardState, error)
} }
// Engine is an algorithm agnostic consensus engine. // Engine is an algorithm agnostic consensus engine.

@ -6,8 +6,8 @@ import (
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
"github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/core/vm" "github.com/harmony-one/harmony/core/vm"
@ -15,7 +15,6 @@ import (
// ContractCaller is used to call smart contract locally // ContractCaller is used to call smart contract locally
type ContractCaller struct { type ContractCaller struct {
database *ethdb.Database
blockchain *core.BlockChain // Ethereum blockchain to handle the consensus blockchain *core.BlockChain // Ethereum blockchain to handle the consensus
mu sync.Mutex mu sync.Mutex
@ -23,9 +22,8 @@ type ContractCaller struct {
} }
// NewContractCaller initialize a new contract caller. // NewContractCaller initialize a new contract caller.
func NewContractCaller(db *ethdb.Database, bc *core.BlockChain, config *params.ChainConfig) *ContractCaller { func NewContractCaller(bc *core.BlockChain, config *params.ChainConfig) *ContractCaller {
cc := ContractCaller{} cc := ContractCaller{}
cc.database = db
cc.blockchain = bc cc.blockchain = bc
cc.mu = sync.Mutex{} cc.mu = sync.Mutex{}
cc.config = config cc.config = config

@ -27,9 +27,6 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/harmony-one/harmony/contracts/structs"
lru "github.com/hashicorp/golang-lru"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/common/mclock"
"github.com/ethereum/go-ethereum/common/prque" "github.com/ethereum/go-ethereum/common/prque"
@ -41,11 +38,15 @@ import (
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/trie" "github.com/ethereum/go-ethereum/trie"
lru "github.com/hashicorp/golang-lru"
consensus_engine "github.com/harmony-one/harmony/consensus/engine" consensus_engine "github.com/harmony-one/harmony/consensus/engine"
"github.com/harmony-one/harmony/contracts/structs"
"github.com/harmony-one/harmony/core/rawdb" "github.com/harmony-one/harmony/core/rawdb"
"github.com/harmony-one/harmony/core/state" "github.com/harmony-one/harmony/core/state"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/core/vm" "github.com/harmony-one/harmony/core/vm"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
) )
@ -66,11 +67,15 @@ const (
badBlockLimit = 10 badBlockLimit = 10
triesInMemory = 128 triesInMemory = 128
shardCacheLimit = 2 shardCacheLimit = 2
epochCacheLimit = 10
// BlocksPerEpoch is the number of blocks in one epoch // BlocksPerEpoch is the number of blocks in one epoch
// currently set to small number for testing // currently set to small number for testing
// in future, this need to be adjusted dynamically instead of constant // in future, this need to be adjusted dynamically instead of constant
BlocksPerEpoch = 10000 // TODO ek – inflate to disable resharding until we can 1) fix shard
// state mutation bug and 2) implement key passphrase recycle across
// process restart (exec) for shard migration
BlocksPerEpoch = 1000000000000
// BlockChainVersion ensures that an incompatible database forces a resync from scratch. // BlockChainVersion ensures that an incompatible database forces a resync from scratch.
BlockChainVersion = 3 BlockChainVersion = 3
@ -130,6 +135,7 @@ type BlockChain struct {
blockCache *lru.Cache // Cache for the most recent entire blocks blockCache *lru.Cache // Cache for the most recent entire blocks
futureBlocks *lru.Cache // future blocks are blocks added for later processing futureBlocks *lru.Cache // future blocks are blocks added for later processing
shardStateCache *lru.Cache shardStateCache *lru.Cache
epochCache *lru.Cache // Cache epoch number → first block number
quit chan struct{} // blockchain quit channel quit chan struct{} // blockchain quit channel
running int32 // running must be called atomically running int32 // running must be called atomically
@ -163,6 +169,7 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
futureBlocks, _ := lru.New(maxFutureBlocks) futureBlocks, _ := lru.New(maxFutureBlocks)
badBlocks, _ := lru.New(badBlockLimit) badBlocks, _ := lru.New(badBlockLimit)
shardCache, _ := lru.New(shardCacheLimit) shardCache, _ := lru.New(shardCacheLimit)
epochCache, _ := lru.New(epochCacheLimit)
bc := &BlockChain{ bc := &BlockChain{
chainConfig: chainConfig, chainConfig: chainConfig,
@ -178,6 +185,7 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
blockCache: blockCache, blockCache: blockCache,
futureBlocks: futureBlocks, futureBlocks: futureBlocks,
shardStateCache: shardCache, shardStateCache: shardCache,
epochCache: epochCache,
engine: engine, engine: engine,
vmConfig: vmConfig, vmConfig: vmConfig,
badBlocks: badBlocks, badBlocks: badBlocks,
@ -1072,6 +1080,23 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) { func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) {
n, events, logs, err := bc.insertChain(chain) n, events, logs, err := bc.insertChain(chain)
bc.PostChainEvents(events, logs) bc.PostChainEvents(events, logs)
// TODO ek – make this a post-chain event
if err == nil {
for idx, block := range chain {
header := block.Header()
header.Logger(utils.GetLogger()).Info("added block to chain",
"segmentIndex", idx,
"parentHash", header.ParentHash)
if header.ShardStateHash != (common.Hash{}) {
epoch := new(big.Int).Add(header.Epoch, common.Big1)
err = bc.WriteShardState(epoch, header.ShardState)
if err != nil {
ctxerror.Log15(header.Logger(utils.GetLogger()).Warn,
ctxerror.New("cannot store shard state").WithCause(err))
}
}
}
}
return n, err return n, err
} }
@ -1651,36 +1676,33 @@ func (bc *BlockChain) SubscribeLogsEvent(ch chan<- []*types.Log) event.Subscript
return bc.scope.Track(bc.logsFeed.Subscribe(ch)) return bc.scope.Track(bc.logsFeed.Subscribe(ch))
} }
// GetShardState retrieves sharding state given block hash and block number // ReadShardState retrieves sharding state given the epoch number.
func (bc *BlockChain) GetShardState(hash common.Hash, number uint64) types.ShardState { func (bc *BlockChain) ReadShardState(epoch *big.Int) (types.ShardState, error) {
if cached, ok := bc.shardStateCache.Get(hash); ok { cacheKey := string(epoch.Bytes())
if cached, ok := bc.shardStateCache.Get(cacheKey); ok {
shardState := cached.(types.ShardState) shardState := cached.(types.ShardState)
return shardState return shardState, nil
} }
shardState := rawdb.ReadShardState(bc.db, hash, number) shardState, err := rawdb.ReadShardState(bc.db, epoch)
if shardState == nil { if err != nil {
return nil return nil, err
} }
bc.shardStateCache.Add(hash, shardState) bc.shardStateCache.Add(cacheKey, shardState)
return shardState return shardState, nil
} }
// GetShardStateByNumber retrieves sharding state given the block number // WriteShardState saves the given sharding state under the given epoch number.
func (bc *BlockChain) GetShardStateByNumber(number uint64) types.ShardState { func (bc *BlockChain) WriteShardState(
hash := rawdb.ReadCanonicalHash(bc.db, number) epoch *big.Int, shardState types.ShardState,
if hash == (common.Hash{}) { ) error {
return nil shardState = shardState.DeepCopy()
err := rawdb.WriteShardState(bc.db, epoch, shardState)
if err != nil {
return err
} }
return bc.GetShardState(hash, number) cacheKey := string(epoch.Bytes())
} bc.shardStateCache.Add(cacheKey, shardState)
// GetShardStateByHash retrieves the shard state given the blockhash, return nil if not exist
func (bc *BlockChain) GetShardStateByHash(hash common.Hash) types.ShardState {
number := bc.hc.GetBlockNumber(hash)
if number == nil {
return nil return nil
}
return bc.GetShardState(hash, *number)
} }
// GetRandSeedByNumber retrieves the rand seed given the block number, return 0 if not exist // GetRandSeedByNumber retrieves the rand seed given the block number, return 0 if not exist
@ -1701,46 +1723,60 @@ func (bc *BlockChain) GetRandPreimageByNumber(number uint64) [32]byte {
return header.RandPreimage return header.RandPreimage
} }
// GetNewShardState will calculate (if not exist) and get the new shard state for epoch block or nil if block is not epoch block // GetShardState returns the shard state for the given epoch,
// epoch block is where the new shard state stored // creating one if needed.
func (bc *BlockChain) GetNewShardState(block *types.Block, stakeInfo *map[common.Address]*structs.StakeInfo) types.ShardState { func (bc *BlockChain) GetShardState(
hash := block.Hash() epoch *big.Int, stakeInfo *map[common.Address]*structs.StakeInfo,
// just ignore non-epoch block ) (types.ShardState, error) {
if !IsEpochBlock(block) { shardState, err := bc.ReadShardState(epoch)
return nil if err == nil { // TODO ek – distinguish ErrNotFound
return shardState, err
}
shardState, err = CalculateNewShardState(bc, epoch, stakeInfo)
if err != nil {
return nil, err
} }
number := block.NumberU64() err = bc.WriteShardState(epoch, shardState)
shardState := bc.GetShardState(hash, number) if err != nil {
if shardState == nil { return nil, err
epoch := GetEpochFromBlockNumber(number)
shardState = CalculateNewShardState(bc, epoch, stakeInfo)
bc.shardStateCache.Add(hash, shardState)
} }
return shardState utils.GetLogger().Debug("saved new shard state", "epoch", epoch)
return shardState, nil
} }
// ValidateNewShardState validate whether the new shard state root matches // ChainDb returns the database
func (bc *BlockChain) ValidateNewShardState(block *types.Block, stakeInfo *map[common.Address]*structs.StakeInfo) error { func (bc *BlockChain) ChainDb() ethdb.Database { return bc.db }
shardState := bc.GetNewShardState(block, stakeInfo)
if shardState == nil { // GetEpochBlockNumber returns the first block number of the given epoch.
return nil func (bc *BlockChain) GetEpochBlockNumber(epoch *big.Int) (*big.Int, error) {
// Try cache first
cacheKey := string(epoch.Bytes())
if cachedValue, ok := bc.epochCache.Get(cacheKey); ok {
return (&big.Int{}).SetBytes([]byte(cachedValue.(string))), nil
} }
if shardState.Hash() != block.Header().ShardStateHash { blockNum, err := rawdb.ReadEpochBlockNumber(bc.db, epoch)
return ErrShardStateNotMatch if err != nil {
return nil, ctxerror.New("cannot read epoch block number from database",
"epoch", epoch,
).WithCause(err)
}
cachedValue := []byte(blockNum.Bytes())
bc.epochCache.Add(cacheKey, cachedValue)
return blockNum, nil
}
// StoreEpochBlockNumber stores the given epoch-first block number.
func (bc *BlockChain) StoreEpochBlockNumber(
epoch *big.Int, blockNum *big.Int,
) error {
cacheKey := string(epoch.Bytes())
cachedValue := []byte(blockNum.Bytes())
bc.epochCache.Add(cacheKey, cachedValue)
if err := rawdb.WriteEpochBlockNumber(bc.db, epoch, blockNum); err != nil {
return ctxerror.New("cannot write epoch block number to database",
"epoch", epoch,
"epochBlockNum", blockNum,
).WithCause(err)
} }
utils.GetLogInstance().Debug("[resharding] validate new shard state successfully", "shardStateHash", shardState.Hash())
return nil return nil
} }
// StoreNewShardState insert new shard state into epoch block
func (bc *BlockChain) StoreNewShardState(block *types.Block, stakeInfo *map[common.Address]*structs.StakeInfo) types.ShardState {
// write state into db.
shardState := bc.GetNewShardState(block, stakeInfo)
if shardState != nil {
hash := block.Hash()
number := block.NumberU64()
rawdb.WriteShardState(bc.db, hash, number, shardState)
utils.GetLogInstance().Debug("[Resharding] Saved new shard state successfully", "epoch", GetEpochFromBlockNumber(block.NumberU64()))
}
return shardState
}

@ -23,6 +23,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
consensus_engine "github.com/harmony-one/harmony/consensus/engine" consensus_engine "github.com/harmony-one/harmony/consensus/engine"
"github.com/harmony-one/harmony/core/state" "github.com/harmony-one/harmony/core/state"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
@ -189,7 +190,10 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
} }
if b.engine != nil { if b.engine != nil {
// Finalize and seal the block // Finalize and seal the block
block, _ := b.engine.Finalize(chainreader, b.header, statedb, b.txs, b.receipts) block, err := b.engine.Finalize(chainreader, b.header, statedb, b.txs, b.receipts)
if err != nil {
panic(err)
}
// Write state changes to db // Write state changes to db
root, err := statedb.Commit(config.IsEIP158(b.header.Number)) root, err := statedb.Commit(config.IsEIP158(b.header.Number))
@ -273,3 +277,4 @@ func (cr *fakeChainReader) GetHeaderByNumber(number uint64) *types.Header
func (cr *fakeChainReader) GetHeaderByHash(hash common.Hash) *types.Header { return nil } func (cr *fakeChainReader) GetHeaderByHash(hash common.Hash) *types.Header { return nil }
func (cr *fakeChainReader) GetHeader(hash common.Hash, number uint64) *types.Header { return nil } func (cr *fakeChainReader) GetHeader(hash common.Hash, number uint64) *types.Header { return nil }
func (cr *fakeChainReader) GetBlock(hash common.Hash, number uint64) *types.Block { return nil } func (cr *fakeChainReader) GetBlock(hash common.Hash, number uint64) *types.Block { return nil }
func (cr *fakeChainReader) ReadShardState(epoch *big.Int) (types.ShardState, error) { return nil, nil }

@ -56,6 +56,7 @@ type Genesis struct {
Coinbase common.Address `json:"coinbase"` Coinbase common.Address `json:"coinbase"`
Alloc GenesisAlloc `json:"alloc" gencodec:"required"` Alloc GenesisAlloc `json:"alloc" gencodec:"required"`
ShardStateHash common.Hash `json:"shardStateHash"` ShardStateHash common.Hash `json:"shardStateHash"`
ShardState types.ShardState `json:"shardState"`
// These fields are used for consensus tests. Please don't use them // These fields are used for consensus tests. Please don't use them
// in actual genesis blocks. // in actual genesis blocks.
@ -240,6 +241,7 @@ func (g *Genesis) ToBlock(db ethdb.Database) *types.Block {
head := &types.Header{ head := &types.Header{
Number: new(big.Int).SetUint64(g.Number), Number: new(big.Int).SetUint64(g.Number),
Nonce: types.EncodeNonce(g.Nonce), Nonce: types.EncodeNonce(g.Nonce),
Epoch: big.NewInt(0),
ShardID: g.ShardID, ShardID: g.ShardID,
Time: new(big.Int).SetUint64(g.Timestamp), Time: new(big.Int).SetUint64(g.Timestamp),
ParentHash: g.ParentHash, ParentHash: g.ParentHash,
@ -251,6 +253,7 @@ func (g *Genesis) ToBlock(db ethdb.Database) *types.Block {
Coinbase: g.Coinbase, Coinbase: g.Coinbase,
Root: root, Root: root,
ShardStateHash: g.ShardStateHash, ShardStateHash: g.ShardStateHash,
// ShardState is absent in epoch block; genesis shard state is implied
} }
if g.GasLimit == 0 { if g.GasLimit == 0 {
head.GasLimit = 10000000000 // TODO(RJ): figure out better solution. // params.GenesisGasLimit head.GasLimit = 10000000000 // TODO(RJ): figure out better solution. // params.GenesisGasLimit

@ -24,7 +24,10 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils"
) )
// ReadCanonicalHash retrieves the hash assigned to a canonical block number. // ReadCanonicalHash retrieves the hash assigned to a canonical block number.
@ -337,6 +340,30 @@ func ReadBlock(db DatabaseReader, hash common.Hash, number uint64) *types.Block
func WriteBlock(db DatabaseWriter, block *types.Block) { func WriteBlock(db DatabaseWriter, block *types.Block) {
WriteBody(db, block.Hash(), block.NumberU64(), block.Body()) WriteBody(db, block.Hash(), block.NumberU64(), block.Body())
WriteHeader(db, block.Header()) WriteHeader(db, block.Header())
// TODO ek – maybe roll the below into WriteHeader()
epoch := block.Header().Epoch
if epoch == nil {
// backward compatibility
return
}
epoch = new(big.Int).Set(epoch)
epochBlockNum := block.Number()
writeOne := func() {
if err := WriteEpochBlockNumber(db, epoch, epochBlockNum); err != nil {
ctxerror.Log15(utils.GetLogInstance().Error, err)
}
}
// A block may be a genesis block AND end-of-epoch block at the same time.
if epochBlockNum.Sign() == 0 {
// Genesis block; record this block's epoch and block numbers.
writeOne()
}
if len(block.Header().ShardState) > 0 {
// End-of-epoch block; record the next epoch after this block.
epoch = new(big.Int).Add(epoch, common.Big1)
epochBlockNum = new(big.Int).Add(epochBlockNum, common.Big1)
writeOne()
}
} }
// DeleteBlock removes all block data associated with a hash. // DeleteBlock removes all block data associated with a hash.
@ -375,26 +402,56 @@ func FindCommonAncestor(db DatabaseReader, a, b *types.Header) *types.Header {
} }
// ReadShardState retrieves sharding state. // ReadShardState retrieves sharding state.
func ReadShardState(db DatabaseReader, hash common.Hash, number uint64) types.ShardState { func ReadShardState(
data, _ := db.Get(shardStateKey(number, hash)) db DatabaseReader, epoch *big.Int,
if len(data) == 0 { ) (shardState types.ShardState, err error) {
return nil var data []byte
data, err = db.Get(shardStateKey(epoch))
if err != nil {
return nil, ctxerror.New("cannot read sharding state from rawdb",
"epoch", epoch,
).WithCause(err)
} }
shardState := types.ShardState{} if err = rlp.DecodeBytes(data, &shardState); err != nil {
if err := rlp.DecodeBytes(data, &shardState); err != nil { return nil, ctxerror.New("cannot decode sharding state",
log.Error("Fail to decode sharding state", "hash", hash, "number", number, "err", err) "epoch", epoch,
return nil ).WithCause(err)
} }
return shardState return shardState, nil
} }
// WriteShardState stores sharding state into database. // WriteShardState stores sharding state into database.
func WriteShardState(db DatabaseWriter, hash common.Hash, number uint64, shardState types.ShardState) { func WriteShardState(
db DatabaseWriter, epoch *big.Int, shardState types.ShardState,
) (err error) {
data, err := rlp.EncodeToBytes(shardState) data, err := rlp.EncodeToBytes(shardState)
if err != nil { if err != nil {
log.Crit("Failed to encode sharding state", "err", err) return ctxerror.New("cannot encode sharding state",
"epoch", epoch,
).WithCause(err)
}
if err = db.Put(shardStateKey(epoch), data); err != nil {
return ctxerror.New("cannot write sharding state",
"epoch", epoch,
).WithCause(err)
} }
if err := db.Put(shardStateKey(number, hash), data); err != nil { utils.GetLogger().Info("wrote sharding state",
log.Crit("Failed to store sharding state", "err", err) "epoch", epoch, "numShards", len(shardState))
return nil
}
// ReadEpochBlockNumber retrieves the epoch block number for the given epoch,
// or nil if the given epoch is not found in the database.
func ReadEpochBlockNumber(db DatabaseReader, epoch *big.Int) (*big.Int, error) {
data, err := db.Get(epochBlockNumberKey(epoch))
if err != nil {
return nil, err
} }
return new(big.Int).SetBytes(data), nil
}
// WriteEpochBlockNumber stores the given epoch-number-to-epoch-block-number
// in the database.
func WriteEpochBlockNumber(db DatabaseWriter, epoch, blockNum *big.Int) error {
return db.Put(epochBlockNumberKey(epoch), blockNum.Bytes())
} }

@ -19,12 +19,17 @@ package rawdb
import ( import (
"bytes" "bytes"
"math/big" "math/big"
"os"
"reflect"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/golang/mock/gomock"
mock "github.com/harmony-one/harmony/core/rawdb/mock"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/syndtr/goleveldb/leveldb"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"
) )
@ -108,6 +113,11 @@ func TestBlockStorage(t *testing.T) {
Extra: []byte("test block"), Extra: []byte("test block"),
TxHash: types.EmptyRootHash, TxHash: types.EmptyRootHash,
ReceiptHash: types.EmptyRootHash, ReceiptHash: types.EmptyRootHash,
Epoch: big.NewInt(0),
Number: big.NewInt(0),
ShardState: types.ShardState{
{},
},
}) })
if entry := ReadBlock(db, block.Hash(), block.NumberU64()); entry != nil { if entry := ReadBlock(db, block.Hash(), block.NumberU64()); entry != nil {
t.Fatalf("Non existent block returned: %v", entry) t.Fatalf("Non existent block returned: %v", entry)
@ -135,6 +145,16 @@ func TestBlockStorage(t *testing.T) {
} else if types.DeriveSha(types.Transactions(entry.Transactions)) != types.DeriveSha(block.Transactions()) || types.CalcUncleHash(entry.Uncles) != types.CalcUncleHash(block.Uncles()) { } else if types.DeriveSha(types.Transactions(entry.Transactions)) != types.DeriveSha(block.Transactions()) || types.CalcUncleHash(entry.Uncles) != types.CalcUncleHash(block.Uncles()) {
t.Fatalf("Retrieved body mismatch: have %v, want %v", entry, block.Body()) t.Fatalf("Retrieved body mismatch: have %v, want %v", entry, block.Body())
} }
if actual, err := ReadEpochBlockNumber(db, big.NewInt(0)); err != nil {
t.Fatalf("Genesis epoch block number not found, error=%#v", err)
} else if expected := big.NewInt(0); actual.Cmp(expected) != 0 {
t.Fatalf("Genesis epoch block number mismatch: have %v, want %v", actual, expected)
}
if actual, err := ReadEpochBlockNumber(db, big.NewInt(1)); err != nil {
t.Fatalf("Next epoch block number not found, error=%#v", err)
} else if expected := big.NewInt(1); actual.Cmp(expected) != 0 {
t.Fatalf("Next epoch block number mismatch: have %v, want %v", actual, expected)
}
// Delete the block and verify the execution // Delete the block and verify the execution
DeleteBlock(db, block.Hash(), block.NumberU64()) DeleteBlock(db, block.Hash(), block.NumberU64())
if entry := ReadBlock(db, block.Hash(), block.NumberU64()); entry != nil { if entry := ReadBlock(db, block.Hash(), block.NumberU64()); entry != nil {
@ -315,3 +335,154 @@ func TestBlockReceiptStorage(t *testing.T) {
t.Fatalf("deleted receipts returned: %v", rs) t.Fatalf("deleted receipts returned: %v", rs)
} }
} }
func TestReadEpochBlockNumber(t *testing.T) {
type args struct {
// db is mocked
epoch *big.Int
}
type dbCall struct {
key []byte
data []byte
error error
}
tests := []struct {
name string
args args
dbCall dbCall
want *big.Int
wantErr bool
}{
{
"0",
args{epoch: big.NewInt(0)},
dbCall{
key: []byte{},
data: []byte{},
error: nil,
},
big.NewInt(0),
false,
},
{
"1",
args{epoch: big.NewInt(1)},
dbCall{
key: []byte{0x01},
data: []byte{0x64},
error: nil,
},
big.NewInt(100),
false,
},
{
"1000",
args{epoch: big.NewInt(1000)},
dbCall{
key: []byte{0x03, 0xe8},
data: []byte{0x01, 0x86, 0xa0},
error: nil,
},
big.NewInt(100000),
false,
},
{
"error",
args{epoch: big.NewInt(0)},
dbCall{
key: []byte{},
data: []byte{},
error: leveldb.ErrNotFound,
},
nil,
true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
db := mock.NewMockDatabaseReader(ctrl)
fullKey := append(epochBlockNumberPrefix, tt.dbCall.key...)
db.EXPECT().Get(fullKey).Return(tt.dbCall.data, tt.dbCall.error)
got, err := ReadEpochBlockNumber(db, tt.args.epoch)
if (err != nil) != tt.wantErr {
t.Errorf("ReadEpochBlockNumber() error = %v, wantErr %v", err, tt.wantErr)
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("ReadEpochBlockNumber() = %v, want %v", got, tt.want)
}
})
}
}
func TestWriteEpochBlockNumber(t *testing.T) {
type args struct {
epoch *big.Int
blockNum *big.Int
}
type dbCall struct {
key []byte
data []byte
error error
}
tests := []struct {
name string
args args
dbCall dbCall
wantErr bool
}{
{
"0",
args{epoch: big.NewInt(0), blockNum: big.NewInt(0)},
dbCall{
key: []byte{},
data: []byte{},
error: nil,
},
false,
},
{
"1",
args{epoch: big.NewInt(1), blockNum: big.NewInt(100)},
dbCall{
key: []byte{0x01},
data: []byte{0x64},
error: nil,
},
false,
},
{
"1000",
args{epoch: big.NewInt(1000), blockNum: big.NewInt(100000)},
dbCall{
key: []byte{0x03, 0xe8},
data: []byte{0x01, 0x86, 0xa0},
error: nil,
},
false,
},
{
"error",
args{epoch: big.NewInt(1000), blockNum: big.NewInt(100000)},
dbCall{
key: []byte{0x03, 0xe8},
data: []byte{0x01, 0x86, 0xa0},
error: os.ErrClosed,
},
true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
db := mock.NewMockDatabaseWriter(ctrl)
fullKey := append(epochBlockNumberPrefix, tt.dbCall.key...)
db.EXPECT().Put(fullKey, tt.dbCall.data).Return(tt.dbCall.error)
if err := WriteEpochBlockNumber(db, tt.args.epoch, tt.args.blockNum); (err != nil) != tt.wantErr {
t.Errorf("WriteEpochBlockNumber() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}

@ -16,6 +16,8 @@
package rawdb package rawdb
//go:generate mockgen -source interfaces.go -destination mock/mock.go
// DatabaseReader wraps the Has and Get method of a backing data store. // DatabaseReader wraps the Has and Get method of a backing data store.
type DatabaseReader interface { type DatabaseReader interface {
Has(key []byte) (bool, error) Has(key []byte) (bool, error)

@ -0,0 +1,137 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: interfaces.go
// Package mock_rawdb is a generated GoMock package.
package mock_rawdb
import (
gomock "github.com/golang/mock/gomock"
reflect "reflect"
)
// MockDatabaseReader is a mock of DatabaseReader interface
type MockDatabaseReader struct {
ctrl *gomock.Controller
recorder *MockDatabaseReaderMockRecorder
}
// MockDatabaseReaderMockRecorder is the mock recorder for MockDatabaseReader
type MockDatabaseReaderMockRecorder struct {
mock *MockDatabaseReader
}
// NewMockDatabaseReader creates a new mock instance
func NewMockDatabaseReader(ctrl *gomock.Controller) *MockDatabaseReader {
mock := &MockDatabaseReader{ctrl: ctrl}
mock.recorder = &MockDatabaseReaderMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockDatabaseReader) EXPECT() *MockDatabaseReaderMockRecorder {
return m.recorder
}
// Has mocks base method
func (m *MockDatabaseReader) Has(key []byte) (bool, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Has", key)
ret0, _ := ret[0].(bool)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Has indicates an expected call of Has
func (mr *MockDatabaseReaderMockRecorder) Has(key interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Has", reflect.TypeOf((*MockDatabaseReader)(nil).Has), key)
}
// Get mocks base method
func (m *MockDatabaseReader) Get(key []byte) ([]byte, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Get", key)
ret0, _ := ret[0].([]byte)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Get indicates an expected call of Get
func (mr *MockDatabaseReaderMockRecorder) Get(key interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockDatabaseReader)(nil).Get), key)
}
// MockDatabaseWriter is a mock of DatabaseWriter interface
type MockDatabaseWriter struct {
ctrl *gomock.Controller
recorder *MockDatabaseWriterMockRecorder
}
// MockDatabaseWriterMockRecorder is the mock recorder for MockDatabaseWriter
type MockDatabaseWriterMockRecorder struct {
mock *MockDatabaseWriter
}
// NewMockDatabaseWriter creates a new mock instance
func NewMockDatabaseWriter(ctrl *gomock.Controller) *MockDatabaseWriter {
mock := &MockDatabaseWriter{ctrl: ctrl}
mock.recorder = &MockDatabaseWriterMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockDatabaseWriter) EXPECT() *MockDatabaseWriterMockRecorder {
return m.recorder
}
// Put mocks base method
func (m *MockDatabaseWriter) Put(key, value []byte) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Put", key, value)
ret0, _ := ret[0].(error)
return ret0
}
// Put indicates an expected call of Put
func (mr *MockDatabaseWriterMockRecorder) Put(key, value interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Put", reflect.TypeOf((*MockDatabaseWriter)(nil).Put), key, value)
}
// MockDatabaseDeleter is a mock of DatabaseDeleter interface
type MockDatabaseDeleter struct {
ctrl *gomock.Controller
recorder *MockDatabaseDeleterMockRecorder
}
// MockDatabaseDeleterMockRecorder is the mock recorder for MockDatabaseDeleter
type MockDatabaseDeleterMockRecorder struct {
mock *MockDatabaseDeleter
}
// NewMockDatabaseDeleter creates a new mock instance
func NewMockDatabaseDeleter(ctrl *gomock.Controller) *MockDatabaseDeleter {
mock := &MockDatabaseDeleter{ctrl: ctrl}
mock.recorder = &MockDatabaseDeleterMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockDatabaseDeleter) EXPECT() *MockDatabaseDeleterMockRecorder {
return m.recorder
}
// Delete mocks base method
func (m *MockDatabaseDeleter) Delete(key []byte) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", key)
ret0, _ := ret[0].(error)
return ret0
}
// Delete indicates an expected call of Delete
func (mr *MockDatabaseDeleterMockRecorder) Delete(key interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockDatabaseDeleter)(nil).Delete), key)
}

@ -19,6 +19,7 @@ package rawdb
import ( import (
"encoding/binary" "encoding/binary"
"math/big"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/metrics"
@ -58,6 +59,10 @@ var (
preimagePrefix = []byte("secure-key-") // preimagePrefix + hash -> preimage preimagePrefix = []byte("secure-key-") // preimagePrefix + hash -> preimage
configPrefix = []byte("ethereum-config-") // config prefix for the db configPrefix = []byte("ethereum-config-") // config prefix for the db
// epochBlockNumberPrefix + epoch (big.Int.Bytes())
// -> epoch block number (big.Int.Bytes())
epochBlockNumberPrefix = []byte("harmony-epoch-block-number-")
// Chain index prefixes (use `i` + single byte to avoid mixing data types). // Chain index prefixes (use `i` + single byte to avoid mixing data types).
BloomBitsIndexPrefix = []byte("iB") // BloomBitsIndexPrefix is the data table of a chain indexer to track its progress BloomBitsIndexPrefix = []byte("iB") // BloomBitsIndexPrefix is the data table of a chain indexer to track its progress
@ -135,6 +140,10 @@ func configKey(hash common.Hash) []byte {
return append(configPrefix, hash.Bytes()...) return append(configPrefix, hash.Bytes()...)
} }
func shardStateKey(number uint64, hash common.Hash) []byte { func shardStateKey(epoch *big.Int) []byte {
return append(append(shardStatePrefix, encodeBlockNumber(number)...), hash.Bytes()...) return append(shardStatePrefix, epoch.Bytes()...)
}
func epochBlockNumberKey(epoch *big.Int) []byte {
return append(epochBlockNumberPrefix, epoch.Bytes()...)
} }

@ -2,12 +2,15 @@ package core
import ( import (
"encoding/binary" "encoding/binary"
"math/big"
"math/rand" "math/rand"
"sort" "sort"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
"github.com/harmony-one/harmony/contracts/structs" "github.com/harmony-one/harmony/contracts/structs"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/internal/utils/contract" "github.com/harmony-one/harmony/internal/utils/contract"
@ -33,7 +36,7 @@ const (
type ShardingState struct { type ShardingState struct {
epoch uint64 // current epoch epoch uint64 // current epoch
rnd uint64 // random seed for resharding rnd uint64 // random seed for resharding
numShards int numShards int // TODO ek – equal to len(shardState); remove this
shardState types.ShardState shardState types.ShardState
} }
@ -123,7 +126,6 @@ func (ss *ShardingState) Reshard(newNodeList []types.NodeID, percent float64) {
} }
for i := 0; i < ss.numShards; i++ { for i := 0; i < ss.numShards; i++ {
ss.shardState[i].NodeList = append([]types.NodeID{leaders[i]}, ss.shardState[i].NodeList...) ss.shardState[i].NodeList = append([]types.NodeID{leaders[i]}, ss.shardState[i].NodeList...)
ss.shardState[i].Leader = leaders[i]
} }
} }
@ -144,32 +146,50 @@ func GetBlockNumberFromEpoch(epoch uint64) uint64 {
return number return number
} }
// GetLastBlockNumberFromEpoch calculates the last block number for the given
// epoch. TODO ek – this is a temp hack.
func GetLastBlockNumberFromEpoch(epoch uint64) uint64 {
return (epoch+1)*BlocksPerEpoch - 1
}
// GetEpochFromBlockNumber calculates the epoch number the block belongs to // GetEpochFromBlockNumber calculates the epoch number the block belongs to
func GetEpochFromBlockNumber(blockNumber uint64) uint64 { func GetEpochFromBlockNumber(blockNumber uint64) uint64 {
return blockNumber / uint64(BlocksPerEpoch) return blockNumber / uint64(BlocksPerEpoch)
} }
// GetShardingStateFromBlockChain will retrieve random seed and shard map from beacon chain for given a epoch // GetShardingStateFromBlockChain will retrieve random seed and shard map from beacon chain for given a epoch
func GetShardingStateFromBlockChain(bc *BlockChain, epoch uint64) *ShardingState { func GetShardingStateFromBlockChain(bc *BlockChain, epoch *big.Int) (*ShardingState, error) {
number := GetBlockNumberFromEpoch(epoch) shardState, err := bc.ReadShardState(epoch)
shardState := bc.GetShardStateByNumber(number) if err != nil {
return nil, err
}
shardState = shardState.DeepCopy()
rndSeedBytes := bc.GetRandSeedByNumber(number) blockNumber := GetBlockNumberFromEpoch(epoch.Uint64())
rndSeedBytes := bc.GetRandSeedByNumber(blockNumber)
rndSeed := binary.BigEndian.Uint64(rndSeedBytes[:]) rndSeed := binary.BigEndian.Uint64(rndSeedBytes[:])
return &ShardingState{epoch: epoch, rnd: rndSeed, shardState: shardState, numShards: len(shardState)} return &ShardingState{epoch: epoch.Uint64(), rnd: rndSeed, shardState: shardState, numShards: len(shardState)}, nil
} }
// CalculateNewShardState get sharding state from previous epoch and calculate sharding state for new epoch // CalculateNewShardState get sharding state from previous epoch and calculate sharding state for new epoch
func CalculateNewShardState(bc *BlockChain, epoch uint64, stakeInfo *map[common.Address]*structs.StakeInfo) types.ShardState { func CalculateNewShardState(
if epoch == GenesisEpoch { bc *BlockChain, epoch *big.Int,
return GetInitShardState() stakeInfo *map[common.Address]*structs.StakeInfo,
) (types.ShardState, error) {
if epoch.Cmp(big.NewInt(GenesisEpoch)) == 0 {
return GetInitShardState(), nil
}
prevEpoch := new(big.Int).Sub(epoch, common.Big1)
ss, err := GetShardingStateFromBlockChain(bc, prevEpoch)
if err != nil {
return nil, ctxerror.New("cannot retrieve previous sharding state").
WithCause(err)
} }
ss := GetShardingStateFromBlockChain(bc, epoch-1)
newNodeList := ss.UpdateShardingState(stakeInfo) newNodeList := ss.UpdateShardingState(stakeInfo)
utils.GetLogInstance().Info("Cuckoo Rate", "percentage", CuckooRate) utils.GetLogInstance().Info("Cuckoo Rate", "percentage", CuckooRate)
ss.Reshard(newNodeList, CuckooRate) ss.Reshard(newNodeList, CuckooRate)
return ss.shardState return ss.shardState, nil
} }
// UpdateShardingState remove the unstaked nodes and returns the newly staked node Ids. // UpdateShardingState remove the unstaked nodes and returns the newly staked node Ids.
@ -212,9 +232,6 @@ func GetInitShardState() types.ShardState {
copy(pubKey[:], priKey.GetPublicKey().Serialize()[:]) copy(pubKey[:], priKey.GetPublicKey().Serialize()[:])
// TODO: directly read address for bls too // TODO: directly read address for bls too
curNodeID := types.NodeID{contract.GenesisAccounts[index].Address, pubKey} curNodeID := types.NodeID{contract.GenesisAccounts[index].Address, pubKey}
if j == 0 {
com.Leader = curNodeID
}
com.NodeList = append(com.NodeList, curNodeID) com.NodeList = append(com.NodeList, curNodeID)
} }
shardState = append(shardState, com) shardState = append(shardState, com)

@ -123,9 +123,6 @@ func TestUpdateShardState(t *testing.T) {
ss.Reshard(newNodeList, 0.2) ss.Reshard(newNodeList, 0.2)
assert.Equal(t, 6, ss.numShards) assert.Equal(t, 6, ss.numShards)
for _, shard := range ss.shardState {
assert.Equal(t, shard.Leader.BlsPublicKey, shard.NodeList[0].BlsPublicKey)
}
} }
func TestAssignNewNodes(t *testing.T) { func TestAssignNewNodes(t *testing.T) {

@ -24,6 +24,7 @@ import (
"github.com/harmony-one/harmony/core/state" "github.com/harmony-one/harmony/core/state"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/core/vm" "github.com/harmony-one/harmony/core/vm"
"github.com/harmony-one/harmony/internal/ctxerror"
) )
// StateProcessor is a basic Processor, which takes care of transitioning // StateProcessor is a basic Processor, which takes care of transitioning
@ -75,7 +76,10 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.DB, cfg vm.C
allLogs = append(allLogs, receipt.Logs...) allLogs = append(allLogs, receipt.Logs...)
} }
// Finalize the block, applying any consensus engine specific extras (e.g. block rewards) // Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
p.engine.Finalize(p.bc, header, statedb, block.Transactions(), receipts) _, err := p.engine.Finalize(p.bc, header, statedb, block.Transactions(), receipts)
if err != nil {
return nil, nil, 0, ctxerror.New("cannot finalize block").WithCause(err)
}
return receipts, allLogs, *usedGas, nil return receipts, allLogs, *usedGas, nil
} }

@ -28,6 +28,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"
@ -84,6 +85,7 @@ type Header struct {
MixDigest common.Hash `json:"mixHash" gencodec:"required"` MixDigest common.Hash `json:"mixHash" gencodec:"required"`
Nonce BlockNonce `json:"nonce" gencodec:"required"` Nonce BlockNonce `json:"nonce" gencodec:"required"`
// Additional Fields // Additional Fields
Epoch *big.Int `json:"epoch" gencodec:"required"`
ShardID uint32 `json:"shardID" gencodec:"required"` ShardID uint32 `json:"shardID" gencodec:"required"`
PrepareSignature [48]byte `json:"prepareSignature" gencodec:"required"` PrepareSignature [48]byte `json:"prepareSignature" gencodec:"required"`
PrepareBitmap []byte `json:"prepareBitmap" gencodec:"required"` // Contains which validator signed PrepareBitmap []byte `json:"prepareBitmap" gencodec:"required"` // Contains which validator signed
@ -92,6 +94,7 @@ type Header struct {
RandPreimage [32]byte `json:"randPreimage"` RandPreimage [32]byte `json:"randPreimage"`
RandSeed [32]byte `json:"randSeed"` RandSeed [32]byte `json:"randSeed"`
ShardStateHash common.Hash `json:"shardStateRoot"` ShardStateHash common.Hash `json:"shardStateRoot"`
ShardState ShardState `json:"shardState"`
} }
// field type overrides for gencodec // field type overrides for gencodec
@ -117,6 +120,16 @@ func (h *Header) Size() common.StorageSize {
return common.StorageSize(unsafe.Sizeof(*h)) + common.StorageSize(len(h.Extra)+(h.Difficulty.BitLen()+h.Number.BitLen()+h.Time.BitLen())/8) return common.StorageSize(unsafe.Sizeof(*h)) + common.StorageSize(len(h.Extra)+(h.Difficulty.BitLen()+h.Number.BitLen()+h.Time.BitLen())/8)
} }
// Logger returns a sub-logger with block contexts added.
func (h *Header) Logger(logger log.Logger) log.Logger {
return logger.New(
"blockHash", h.Hash(),
"blockShard", h.ShardID,
"blockEpoch", h.Epoch,
"blockNumber", h.Number,
)
}
func rlpHash(x interface{}) (h common.Hash) { func rlpHash(x interface{}) (h common.Hash) {
hw := sha3.NewLegacyKeccak256() hw := sha3.NewLegacyKeccak256()
rlp.Encode(hw, x) rlp.Encode(hw, x)
@ -417,9 +430,10 @@ func (b *Block) WithBody(transactions []*Transaction, uncles []*Header) *Block {
// Hash returns the keccak256 hash of b's header. // Hash returns the keccak256 hash of b's header.
// The hash is computed on the first call and cached thereafter. // The hash is computed on the first call and cached thereafter.
func (b *Block) Hash() common.Hash { func (b *Block) Hash() common.Hash {
if hash := b.hash.Load(); hash != nil { //if hash := b.hash.Load(); hash != nil {
return hash.(common.Hash) // return hash.(common.Hash)
} //}
//b.Logger(utils.GetLogger()).Debug("finalizing and caching block hash")
v := b.header.Hash() v := b.header.Hash()
b.hash.Store(v) b.hash.Store(v)
return v return v
@ -475,7 +489,16 @@ func (b *Block) AddRandPreimage(pRnd [32]byte) {
b.header.RandPreimage = pRnd b.header.RandPreimage = pRnd
} }
// AddShardStateHash add shardStateHash into block header // AddShardState add shardState into block header
func (b *Block) AddShardStateHash(shardStateHash common.Hash) { func (b *Block) AddShardState(shardState ShardState) {
b.header.ShardStateHash = shardStateHash // Make a copy because ShardState.Hash() internally sorts entries.
// Store the sorted copy.
shardState = append(shardState[:0:0], shardState...)
b.header.ShardStateHash = shardState.Hash()
b.header.ShardState = shardState
}
// Logger returns a sub-logger with block contexts added.
func (b *Block) Logger(logger log.Logger) log.Logger {
return b.header.Logger(logger)
} }

@ -22,6 +22,26 @@ type EpochShardState struct {
// ShardState is the collection of all committees // ShardState is the collection of all committees
type ShardState []Committee type ShardState []Committee
// FindCommitteeByID returns the committee configuration for the given shard,
// or nil if the given shard is not found.
func (ss ShardState) FindCommitteeByID(shardID uint32) *Committee {
for _, committee := range ss {
if committee.ShardID == shardID {
return &committee
}
}
return nil
}
// DeepCopy returns a deep copy of the receiver.
func (ss ShardState) DeepCopy() ShardState {
var r ShardState
for _, c := range ss {
r = append(r, c.DeepCopy())
}
return r
}
// CompareShardState compares two ShardState instances. // CompareShardState compares two ShardState instances.
func CompareShardState(s1, s2 ShardState) int { func CompareShardState(s1, s2 ShardState) int {
commonLen := len(s1) commonLen := len(s1)
@ -92,6 +112,11 @@ func CompareNodeID(id1, id2 *NodeID) int {
// NodeIDList is a list of NodeIDList. // NodeIDList is a list of NodeIDList.
type NodeIDList []NodeID type NodeIDList []NodeID
// DeepCopy returns a deep copy of the receiver.
func (l NodeIDList) DeepCopy() NodeIDList {
return append(l[:0:0], l...)
}
// CompareNodeIDList compares two node ID lists. // CompareNodeIDList compares two node ID lists.
func CompareNodeIDList(l1, l2 NodeIDList) int { func CompareNodeIDList(l1, l2 NodeIDList) int {
commonLen := len(l1) commonLen := len(l1)
@ -115,10 +140,16 @@ func CompareNodeIDList(l1, l2 NodeIDList) int {
// Committee contains the active nodes in one shard // Committee contains the active nodes in one shard
type Committee struct { type Committee struct {
ShardID uint32 ShardID uint32
Leader NodeID
NodeList NodeIDList NodeList NodeIDList
} }
// DeepCopy returns a deep copy of the receiver.
func (c Committee) DeepCopy() Committee {
r := c
r.NodeList = r.NodeList.DeepCopy()
return r
}
// CompareCommittee compares two committees and their leader/node list. // CompareCommittee compares two committees and their leader/node list.
func CompareCommittee(c1, c2 *Committee) int { func CompareCommittee(c1, c2 *Committee) int {
switch { switch {
@ -127,9 +158,6 @@ func CompareCommittee(c1, c2 *Committee) int {
case c1.ShardID > c2.ShardID: case c1.ShardID > c2.ShardID:
return +1 return +1
} }
if c := CompareNodeID(&c1.Leader, &c2.Leader); c != 0 {
return c
}
if c := CompareNodeIDList(c1.NodeList, c2.NodeList); c != 0 { if c := CompareNodeIDList(c1.NodeList, c2.NodeList); c != 0 {
return c return c
} }
@ -156,6 +184,8 @@ func GetHashFromNodeList(nodeList []NodeID) []byte {
// Hash is the root hash of ShardState // Hash is the root hash of ShardState
func (ss ShardState) Hash() (h common.Hash) { func (ss ShardState) Hash() (h common.Hash) {
// TODO ek – this sorting really doesn't belong here; it should instead
// be made an explicit invariant to be maintained and, if needed, checked.
sort.Slice(ss, func(i, j int) bool { sort.Slice(ss, func(i, j int) bool {
return ss[i].ShardID < ss[j].ShardID return ss[i].ShardID < ss[j].ShardID
}) })

@ -49,7 +49,6 @@ func TestGetHashFromNodeList(t *testing.T) {
func TestHash(t *testing.T) { func TestHash(t *testing.T) {
com1 := Committee{ com1 := Committee{
ShardID: 22, ShardID: 22,
Leader: NodeID{"node11", blsPubKey11},
NodeList: []NodeID{ NodeList: []NodeID{
{"node11", blsPubKey11}, {"node11", blsPubKey11},
{"node22", blsPubKey22}, {"node22", blsPubKey22},
@ -58,7 +57,6 @@ func TestHash(t *testing.T) {
} }
com2 := Committee{ com2 := Committee{
ShardID: 2, ShardID: 2,
Leader: NodeID{"node4", blsPubKey4},
NodeList: []NodeID{ NodeList: []NodeID{
{"node4", blsPubKey4}, {"node4", blsPubKey4},
{"node5", blsPubKey5}, {"node5", blsPubKey5},
@ -70,7 +68,6 @@ func TestHash(t *testing.T) {
com3 := Committee{ com3 := Committee{
ShardID: 2, ShardID: 2,
Leader: NodeID{"node4", blsPubKey4},
NodeList: []NodeID{ NodeList: []NodeID{
{"node6", blsPubKey6}, {"node6", blsPubKey6},
{"node5", blsPubKey5}, {"node5", blsPubKey5},
@ -79,7 +76,6 @@ func TestHash(t *testing.T) {
} }
com4 := Committee{ com4 := Committee{
ShardID: 22, ShardID: 22,
Leader: NodeID{"node11", blsPubKey11},
NodeList: []NodeID{ NodeList: []NodeID{
{"node1", blsPubKey1}, {"node1", blsPubKey1},
{"node11", blsPubKey11}, {"node11", blsPubKey11},

@ -2,9 +2,10 @@ package bls
import ( import (
"errors" "errors"
"fmt"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
"github.com/harmony-one/harmony/internal/ctxerror"
) )
func init() { func init() {
@ -84,7 +85,9 @@ func (m *Mask) Len() int {
// cosigners 0-7, bits 0-7 of byte 1 correspond to cosigners 8-15, etc. // cosigners 0-7, bits 0-7 of byte 1 correspond to cosigners 8-15, etc.
func (m *Mask) SetMask(mask []byte) error { func (m *Mask) SetMask(mask []byte) error {
if m.Len() != len(mask) { if m.Len() != len(mask) {
return fmt.Errorf("mismatching Bitmap lengths") return ctxerror.New("mismatching bitmap lengths",
"expectedBitmapLength", m.Len(),
"providedBitmapLength", len(mask))
} }
for i := range m.publics { for i := range m.publics {
byt := i >> 3 byt := i >> 3

@ -41,15 +41,16 @@ require (
github.com/multiformats/go-multiaddr v0.0.2 github.com/multiformats/go-multiaddr v0.0.2
github.com/multiformats/go-multiaddr-net v0.0.1 github.com/multiformats/go-multiaddr-net v0.0.1
github.com/pborman/uuid v1.2.0 github.com/pborman/uuid v1.2.0
github.com/pkg/errors v0.8.1
github.com/rjeczalik/notify v0.9.2 github.com/rjeczalik/notify v0.9.2
github.com/rs/cors v1.6.0 // indirect github.com/rs/cors v1.6.0 // indirect
github.com/shirou/gopsutil v2.18.12+incompatible github.com/shirou/gopsutil v2.18.12+incompatible
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
github.com/stretchr/testify v1.3.0 github.com/stretchr/testify v1.3.0
github.com/syndtr/goleveldb v1.0.0
github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc
golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3
golang.org/x/net v0.0.0-20190313220215-9f648a60d977
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384
google.golang.org/grpc v1.19.0 google.golang.org/grpc v1.19.0
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127

@ -9,10 +9,10 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
"github.com/harmony-one/harmony/p2p"
p2p_crypto "github.com/libp2p/go-libp2p-crypto" p2p_crypto "github.com/libp2p/go-libp2p-crypto"
"github.com/harmony-one/harmony/p2p"
) )
// Role defines a role of a node. // Role defines a role of a node.
@ -76,8 +76,9 @@ type ConfigType struct {
P2pPriKey p2p_crypto.PrivKey P2pPriKey p2p_crypto.PrivKey
ConsensusPriKey *bls.SecretKey ConsensusPriKey *bls.SecretKey
ConsensusPubKey *bls.PublicKey ConsensusPubKey *bls.PublicKey
MainDB *ethdb.LDBDatabase
BeaconDB *ethdb.LDBDatabase // Database directory
DBDir string
SelfPeer p2p.Peer SelfPeer p2p.Peer
Leader p2p.Peer Leader p2p.Peer

@ -0,0 +1,34 @@
package shardchain
import (
"fmt"
"path"
"github.com/ethereum/go-ethereum/ethdb"
)
// DBFactory is a blockchain database factory.
type DBFactory interface {
// NewChainDB returns a new database for the blockchain for
// given shard.
NewChainDB(shardID uint32) (ethdb.Database, error)
}
// LDBFactory is a LDB-backed blockchain database factory.
type LDBFactory struct {
RootDir string // directory in which to put shard databases in.
}
// NewChainDB returns a new LDB for the blockchain for given shard.
func (f *LDBFactory) NewChainDB(shardID uint32) (ethdb.Database, error) {
dir := path.Join(f.RootDir, fmt.Sprintf("harmony_db_%d", shardID))
return ethdb.NewLDBDatabase(dir, 0, 0)
}
// MemDBFactory is a memory-backed blockchain database factory.
type MemDBFactory struct{}
// NewChainDB returns a new memDB for the blockchain for given shard.
func (f *MemDBFactory) NewChainDB(shardID uint32) (ethdb.Database, error) {
return ethdb.NewMemDatabase(), nil
}

@ -0,0 +1,8 @@
package shardchain
import "github.com/ethereum/go-ethereum/ethdb"
// DBInitializer initializes a newly created chain database.
type DBInitializer interface {
InitChainDB(db ethdb.Database, shardID uint32) error
}

@ -0,0 +1,136 @@
package shardchain
import (
"math/big"
"sync"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/params"
"github.com/harmony-one/harmony/consensus/engine"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/rawdb"
"github.com/harmony-one/harmony/core/vm"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils"
)
// Collection is a collection of per-shard blockchains.
type Collection interface {
// ShardChain returns the blockchain for the given shard,
// opening one as necessary.
ShardChain(shardID uint32) (*core.BlockChain, error)
// CloseShardChain closes the given shard chain.
CloseShardChain(shardID uint32) error
// Close closes all shard chains.
Close() error
}
// CollectionImpl is the main implementation of the shard chain collection.
// See the Collection interface for details.
type CollectionImpl struct {
dbFactory DBFactory
dbInit DBInitializer
engine engine.Engine
mtx sync.Mutex
pool map[uint32]*core.BlockChain
}
// NewCollection creates and returns a new shard chain collection.
//
// dbFactory is the shard chain database factory to use.
//
// dbInit is the shard chain initializer to use when the database returned by
// the factory is brand new (empty).
func NewCollection(
dbFactory DBFactory, dbInit DBInitializer, engine engine.Engine,
) *CollectionImpl {
return &CollectionImpl{
dbFactory: dbFactory,
dbInit: dbInit,
engine: engine,
pool: make(map[uint32]*core.BlockChain),
}
}
// ShardChain returns the blockchain for the given shard,
// opening one as necessary.
func (sc *CollectionImpl) ShardChain(shardID uint32) (*core.BlockChain, error) {
sc.mtx.Lock()
defer sc.mtx.Unlock()
if bc, ok := sc.pool[shardID]; ok {
return bc, nil
}
var db ethdb.Database
defer func() {
if db != nil {
db.Close()
}
}()
var err error
if db, err = sc.dbFactory.NewChainDB(shardID); err != nil {
// NewChainDB may return incompletely initialized DB;
// avoid closing it.
db = nil
return nil, ctxerror.New("cannot open chain database").WithCause(err)
}
if rawdb.ReadCanonicalHash(db, 0) == (common.Hash{}) {
utils.GetLogger().Info("initializing a new chain database",
"shardID", shardID)
if err := sc.dbInit.InitChainDB(db, shardID); err != nil {
return nil, ctxerror.New("cannot initialize a new chain database").
WithCause(err)
}
}
var cacheConfig *core.CacheConfig
// TODO ek – archival
if false {
cacheConfig = &core.CacheConfig{Disabled: true}
}
chainConfig := *params.TestChainConfig
chainConfig.ChainID = big.NewInt(int64(shardID))
bc, err := core.NewBlockChain(
db, cacheConfig, &chainConfig, sc.engine, vm.Config{}, nil,
)
if err != nil {
return nil, ctxerror.New("cannot create blockchain").WithCause(err)
}
db = nil // don't close
sc.pool[shardID] = bc
return bc, nil
}
// CloseShardChain closes the given shard chain.
func (sc *CollectionImpl) CloseShardChain(shardID uint32) error {
sc.mtx.Lock()
defer sc.mtx.Unlock()
bc, ok := sc.pool[shardID]
if !ok {
return ctxerror.New("shard chain not found", "shardID", shardID)
}
utils.GetLogger().Info("closing shard chain", "shardID", shardID)
delete(sc.pool, shardID)
bc.Stop()
bc.ChainDb().Close()
utils.GetLogger().Info("closed shard chain", "shardID", shardID)
return nil
}
// Close closes all shard chains.
func (sc *CollectionImpl) Close() error {
newPool := make(map[uint32]*core.BlockChain)
sc.mtx.Lock()
oldPool := sc.pool
sc.pool = newPool
sc.mtx.Unlock()
for shardID, bc := range oldPool {
utils.GetLogger().Info("closing shard chain", "shardID", shardID)
bc.Stop()
bc.ChainDb().Close()
utils.GetLogger().Info("closed shard chain", "shardID", shardID)
}
return nil
}

@ -85,7 +85,7 @@ func (node *Node) QueryStakeInfo() *structs.StakeInfoReturnValue {
priKey := contract_constants.GenesisBeaconAccountPriKey priKey := contract_constants.GenesisBeaconAccountPriKey
deployerAddress := crypto.PubkeyToAddress(priKey.PublicKey) deployerAddress := crypto.PubkeyToAddress(priKey.PublicKey)
state, err := node.blockchain.State() state, err := node.Blockchain().State()
if err != nil { if err != nil {
utils.GetLogInstance().Error("Failed to get blockchain state", "error", err) utils.GetLogInstance().Error("Failed to get blockchain state", "error", err)
@ -131,7 +131,7 @@ func (node *Node) getDeployedStakingContract() common.Address {
// GetNonceOfAddress returns nonce of an address. // GetNonceOfAddress returns nonce of an address.
func (node *Node) GetNonceOfAddress(address common.Address) uint64 { func (node *Node) GetNonceOfAddress(address common.Address) uint64 {
state, err := node.blockchain.State() state, err := node.Blockchain().State()
if err != nil { if err != nil {
log.Error("Failed to get chain state", "Error", err) log.Error("Failed to get chain state", "Error", err)
return 0 return 0
@ -141,7 +141,7 @@ func (node *Node) GetNonceOfAddress(address common.Address) uint64 {
// GetBalanceOfAddress returns balance of an address. // GetBalanceOfAddress returns balance of an address.
func (node *Node) GetBalanceOfAddress(address common.Address) (*big.Int, error) { func (node *Node) GetBalanceOfAddress(address common.Address) (*big.Int, error) {
state, err := node.blockchain.State() state, err := node.Blockchain().State()
if err != nil { if err != nil {
log.Error("Failed to get chain state", "Error", err) log.Error("Failed to get chain state", "Error", err)
return nil, err return nil, err

@ -23,7 +23,7 @@ func prepareNode(t *testing.T) *Node {
if err != nil { if err != nil {
t.Fatalf("Cannot craeate consensus: %v", err) t.Fatalf("Cannot craeate consensus: %v", err)
} }
return New(host, consensus, nil, false) return New(host, consensus, testDBFactory, false)
} }

@ -2,17 +2,17 @@ package node
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"encoding/hex"
"fmt" "fmt"
"math/big" "math/big"
"os"
"sync" "sync"
"time" "time"
"github.com/harmony-one/bls/ffi/go/bls"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/harmony-one/bls/ffi/go/bls"
"github.com/harmony-one/harmony/accounts" "github.com/harmony-one/harmony/accounts"
"github.com/harmony-one/harmony/api/client" "github.com/harmony-one/harmony/api/client"
clientService "github.com/harmony-one/harmony/api/client/service" clientService "github.com/harmony-one/harmony/api/client/service"
@ -25,10 +25,11 @@ import (
"github.com/harmony-one/harmony/contracts/structs" "github.com/harmony-one/harmony/contracts/structs"
"github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/core/vm"
"github.com/harmony-one/harmony/crypto/pki" "github.com/harmony-one/harmony/crypto/pki"
"github.com/harmony-one/harmony/drand" "github.com/harmony-one/harmony/drand"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node" nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/shardchain"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/node/worker" "github.com/harmony-one/harmony/node/worker"
"github.com/harmony-one/harmony/p2p" "github.com/harmony-one/harmony/p2p"
@ -94,9 +95,8 @@ type Node struct {
pendingTxMutex sync.Mutex pendingTxMutex sync.Mutex
DRand *drand.DRand // The instance for distributed randomness protocol DRand *drand.DRand // The instance for distributed randomness protocol
blockchain *core.BlockChain // The blockchain for the shard where this node belongs // Shard databases
beaconChain *core.BlockChain // The blockchain for beacon chain. shardChains shardchain.Collection
db *ethdb.LDBDatabase // LevelDB to store blockchain.
ClientPeer *p2p.Peer // The peer for the harmony tx generator client, used for leaders to return proof-of-accept ClientPeer *p2p.Peer // The peer for the harmony tx generator client, used for leaders to return proof-of-accept
Client *client.Client // The presence of a client object means this node will also act as a client Client *client.Client // The presence of a client object means this node will also act as a client
@ -148,8 +148,9 @@ type Node struct {
// TODO: leochen, can we use multiple account for staking? // TODO: leochen, can we use multiple account for staking?
StakingAccount accounts.Account StakingAccount accounts.Account
// For test only // For test only; TODO ek – remove this
TestBankKeys []*ecdsa.PrivateKey TestBankKeys []*ecdsa.PrivateKey
ContractDeployerKey *ecdsa.PrivateKey ContractDeployerKey *ecdsa.PrivateKey
ContractDeployerCurrentNonce uint64 // The nonce of the deployer contract at current block ContractDeployerCurrentNonce uint64 // The nonce of the deployer contract at current block
ContractAddresses []common.Address ContractAddresses []common.Address
@ -183,11 +184,41 @@ type Node struct {
ContractCaller *contracts.ContractCaller ContractCaller *contracts.ContractCaller
accountManager *accounts.Manager accountManager *accounts.Manager
// Next shard state
nextShardState struct {
// The received master shard state
master *types.EpochShardState
// When for a leader to propose the next shard state,
// or for a validator to wait for a proposal before view change.
// TODO ek – replace with retry-based logic instead of delay
proposeTime time.Time
}
isFirstTime bool // the node was started with a fresh database
} }
// Blockchain returns the blockchain from node // Blockchain returns the blockchain for the node's current shard.
func (node *Node) Blockchain() *core.BlockChain { func (node *Node) Blockchain() *core.BlockChain {
return node.blockchain shardID := node.Consensus.ShardID
bc, err := node.shardChains.ShardChain(shardID)
if err != nil {
err = ctxerror.New("cannot get shard chain", "shardID", shardID).
WithCause(err)
panic(err) //ctxerror.Log15(utils.GetLogger().Crit, err)
}
return bc
}
// Beaconchain returns the beaconchain from node.
func (node *Node) Beaconchain() *core.BlockChain {
bc, err := node.shardChains.ShardChain(0)
if err != nil {
err = ctxerror.New("cannot get beaconchain").WithCause(err)
ctxerror.Log15(utils.GetLogger().Crit, err)
}
return bc
} }
// Add new transactions to the pending transaction list // Add new transactions to the pending transaction list
@ -226,7 +257,7 @@ func (node *Node) StartServer() {
// Currently used for stats reporting purpose // Currently used for stats reporting purpose
func (node *Node) countNumTransactionsInBlockchain() int { func (node *Node) countNumTransactionsInBlockchain() int {
count := 0 count := 0
for block := node.blockchain.CurrentBlock(); block != nil; block = node.blockchain.GetBlockByHash(block.Header().ParentHash) { for block := node.Blockchain().CurrentBlock(); block != nil; block = node.Blockchain().GetBlockByHash(block.Header().ParentHash) {
count += len(block.Transactions()) count += len(block.Transactions())
} }
return count return count
@ -238,10 +269,8 @@ func (node *Node) GetSyncID() [SyncIDLength]byte {
} }
// New creates a new node. // New creates a new node.
func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, isArchival bool) *Node { func New(host p2p.Host, consensusObj *consensus.Consensus, chainDBFactory shardchain.DBFactory, isArchival bool) *Node {
var chain *core.BlockChain
var err error var err error
var isFirstTime bool // if cannot get blockchain from database, then isFirstTime = true
node := Node{} node := Node{}
copy(node.syncID[:], GenerateRandomString(SyncIDLength)) copy(node.syncID[:], GenerateRandomString(SyncIDLength))
@ -250,39 +279,23 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
node.SelfPeer = host.GetSelfPeer() node.SelfPeer = host.GetSelfPeer()
} }
// Create test keys. Genesis will later need this.
node.TestBankKeys, err = CreateTestBankKeys(FakeAddressNumber)
if err != nil {
utils.GetLogInstance().Crit("Error while creating test keys",
"error", err)
}
node.shardChains = shardchain.NewCollection(
chainDBFactory, &genesisInitializer{&node}, consensusObj)
if host != nil && consensusObj != nil { if host != nil && consensusObj != nil {
// Consensus and associated channel to communicate blocks // Consensus and associated channel to communicate blocks
node.Consensus = consensusObj node.Consensus = consensusObj
// TODO(ricl): placeholder. Set the account manager to node.accountManager // Load the chains.
// // Ensure that the AccountManager method works before the node has started. chain := node.Blockchain() // this also sets node.isFirstTime if the DB is fresh
// // We rely on this in cmd/geth. _ = node.Beaconchain()
// am, ephemeralKeystore, err := makeAccountManager(conf)
// if err != nil {
// return nil, err
// }
// node.accountManager = am
// Init db
database := db
if database == nil {
database = ethdb.NewMemDatabase()
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, consensusObj.ShardID, isArchival)
isFirstTime = true
}
}
if err != nil {
utils.GetLogInstance().Error("Error when setup blockchain", "err", err)
os.Exit(1)
}
node.blockchain = chain
node.BlockChannel = make(chan *types.Block) node.BlockChannel = make(chan *types.Block)
node.ConfirmedBlockChannel = make(chan *types.Block) node.ConfirmedBlockChannel = make(chan *types.Block)
@ -296,7 +309,7 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
// Add Faucet contract to all shards, so that on testnet, we can demo wallet in explorer // Add Faucet contract to all shards, so that on testnet, we can demo wallet in explorer
// TODO (leo): we need to have support of cross-shard tx later so that the token can be transferred from beacon chain shard to other tx shards. // TODO (leo): we need to have support of cross-shard tx later so that the token can be transferred from beacon chain shard to other tx shards.
if isFirstTime { if node.isFirstTime {
// Setup one time smart contracts // Setup one time smart contracts
node.AddFaucetContractToPendingTransactions() node.AddFaucetContractToPendingTransactions()
} else { } else {
@ -305,7 +318,7 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
if node.Consensus.ShardID == 0 { if node.Consensus.ShardID == 0 {
// Contracts only exist in beacon chain // Contracts only exist in beacon chain
if isFirstTime { if node.isFirstTime {
// Setup one time smart contracts // Setup one time smart contracts
node.CurrentStakes = make(map[common.Address]*structs.StakeInfo) node.CurrentStakes = make(map[common.Address]*structs.StakeInfo)
node.AddStakingContractToPendingTransactions() //This will save the latest information about staked nodes in current staked node.AddStakingContractToPendingTransactions() //This will save the latest information about staked nodes in current staked
@ -313,7 +326,7 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
node.AddContractKeyAndAddress(scStaking) node.AddContractKeyAndAddress(scStaking)
} }
} }
if isFirstTime { if node.isFirstTime {
// TODO(minhdoan): Think of a better approach to deploy smart contract. // TODO(minhdoan): Think of a better approach to deploy smart contract.
// This is temporary for demo purpose. // This is temporary for demo purpose.
node.AddLotteryContract() node.AddLotteryContract()
@ -324,7 +337,7 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
} }
} }
node.ContractCaller = contracts.NewContractCaller(&db, node.blockchain, params.TestChainConfig) node.ContractCaller = contracts.NewContractCaller(node.Blockchain(), params.TestChainConfig)
if consensusObj != nil && nodeconfig.GetDefaultConfig().IsLeader() { if consensusObj != nil && nodeconfig.GetDefaultConfig().IsLeader() {
node.State = NodeLeader node.State = NodeLeader
@ -359,40 +372,47 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, db ethdb.Database, is
} }
// InitShardState initialize genesis shard state and update committee pub keys for consensus and drand // InitShardState initialize genesis shard state and update committee pub keys for consensus and drand
func (node *Node) InitShardState(isGenesis bool) { func (node *Node) InitShardState(isGenesis bool) (err error) {
shardState := types.ShardState{} logger := utils.GetLogInstance().New("isGenesis", isGenesis)
if isGenesis { getLogger := func() log.Logger { return utils.WithCallerSkip(logger, 1) }
// Store the genesis shard state into db. if node.Consensus == nil {
if node.Consensus != nil { getLogger().Crit("consensus is nil; cannot figure out shard ID")
if node.Consensus.ShardID == 0 { }
shardState = node.blockchain.StoreNewShardState(node.blockchain.CurrentBlock(), nil) shardID := node.Consensus.ShardID
} else { logger = logger.New("shardID", shardID)
shardState = node.beaconChain.StoreNewShardState(node.beaconChain.CurrentBlock(), nil) getLogger().Info("initializing shard state")
}
} // Get genesis epoch shard state from chain
} else { genesisEpoch := big.NewInt(core.GenesisEpoch)
epochShardState, err := node.retrieveEpochShardState() shardState, err := node.Beaconchain().GetShardState(genesisEpoch, nil)
if err != nil { if err != nil {
utils.GetLogInstance().Error("[Shard State] Failed to decode epoch shard state", "error", err) return ctxerror.New("cannot read genesis shard state").WithCause(err)
}
utils.GetLogInstance().Info("Successfully loaded epoch shard state")
shardState = epochShardState.ShardState
} }
getLogger().Info("Successfully loaded epoch shard state")
// Update validator public keys // Update validator public keys
for _, shard := range shardState { committee := shardState.FindCommitteeByID(shardID)
if shard.ShardID == node.Consensus.ShardID { if committee == nil {
return ctxerror.New("our shard is not found in genesis shard state",
"shardID", shardID)
}
pubKeys := []*bls.PublicKey{} pubKeys := []*bls.PublicKey{}
for _, node := range shard.NodeList { for _, node := range committee.NodeList {
blsPubKey := &bls.PublicKey{} pubKey := &bls.PublicKey{}
blsPubKey.Deserialize(node.BlsPublicKey[:]) pubKeyBytes := node.BlsPublicKey[:]
pubKeys = append(pubKeys, blsPubKey) err = pubKey.Deserialize(pubKeyBytes)
if err != nil {
return ctxerror.New("cannot deserialize BLS public key",
"shardID", shardID,
"pubKeyBytes", hex.EncodeToString(pubKeyBytes),
).WithCause(err)
}
pubKeys = append(pubKeys, pubKey)
} }
getLogger().Info("initialized shard state", "numPubKeys", len(pubKeys))
node.Consensus.UpdatePublicKeys(pubKeys) node.Consensus.UpdatePublicKeys(pubKeys)
node.DRand.UpdatePublicKeys(pubKeys) node.DRand.UpdatePublicKeys(pubKeys)
break return nil
}
}
} }
// AddPeers adds neighbors nodes // AddPeers adds neighbors nodes
@ -466,33 +486,3 @@ func (node *Node) initNodeConfiguration() (service.NodeConfig, chan p2p.Peer) {
return nodeConfig, chanPeer return nodeConfig, chanPeer
} }
// AddBeaconChainDatabase adds database support for beaconchain blocks on normal sharding nodes (not BeaconChain node)
func (node *Node) AddBeaconChainDatabase(db ethdb.Database) {
database := db
if database == nil {
database = ethdb.NewMemDatabase()
}
// TODO (chao) currently we use the same genesis block as normal shard
chain, err := node.GenesisBlockSetup(database, 0, true)
if err != nil {
utils.GetLogInstance().Error("Error when doing genesis setup")
os.Exit(1)
}
node.beaconChain = chain
node.BeaconWorker = worker.New(params.TestChainConfig, chain, &consensus.Consensus{}, pki.GetAddressFromPublicKey(node.SelfPeer.ConsensusPubKey), node.Consensus.ShardID)
}
// InitBlockChainFromDB retrieves the latest blockchain and state available from the local database
func (node *Node) InitBlockChainFromDB(db ethdb.Database, consensus *consensus.Consensus, isArchival bool) (*core.BlockChain, error) {
chainConfig := params.TestChainConfig
if consensus != nil {
chainConfig.ChainID = big.NewInt(int64(consensus.ShardID)) // Use ChainID as piggybacked ShardID
}
cacheConfig := core.CacheConfig{}
if isArchival {
cacheConfig = core.CacheConfig{Disabled: true, TrieNodeLimit: 256 * 1024 * 1024, TrieTimeLimit: 30 * time.Second}
}
chain, err := core.NewBlockChain(db, &cacheConfig, chainConfig, consensus, vm.Config{}, nil)
return chain, err
}

@ -5,14 +5,18 @@ import (
"math/big" "math/big"
"math/rand" "math/rand"
"strings" "strings"
"time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/pkg/errors"
"github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/vm" "github.com/harmony-one/harmony/core/rawdb"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/internal/utils/contract" "github.com/harmony-one/harmony/internal/utils/contract"
) )
@ -25,8 +29,39 @@ const (
InitFreeFundInEther = 100 InitFreeFundInEther = 100
) )
// GenesisBlockSetup setups a genesis blockchain. // genesisInitializer is a shardchain.DBInitializer adapter.
func (node *Node) GenesisBlockSetup(db ethdb.Database, shardID uint32, isArchival bool) (*core.BlockChain, error) { type genesisInitializer struct {
node *Node
}
// InitChainDB sets up a new genesis block in the database for the given shard.
func (gi *genesisInitializer) InitChainDB(db ethdb.Database, shardID uint32) error {
shardState := core.GetInitShardState()
if shardID != 0 {
// store only the local shard
c := shardState.FindCommitteeByID(shardID)
if c == nil {
return errors.New("cannot find local shard in genesis")
}
shardState = types.ShardState{*c}
}
if err := rawdb.WriteShardState(db, common.Big0, shardState); err != nil {
return ctxerror.New("cannot store epoch shard state").WithCause(err)
}
if err := gi.node.SetupGenesisBlock(db, shardID); err != nil {
return ctxerror.New("cannot setup genesis block").WithCause(err)
}
return nil
}
// SetupGenesisBlock sets up a genesis blockchain.
func (node *Node) SetupGenesisBlock(db ethdb.Database, shardID uint32) error {
utils.GetLogger().Info("setting up a brand new chain database",
"shardID", shardID)
if shardID == node.Consensus.ShardID {
node.isFirstTime = true
}
// Initialize genesis block and blockchain // Initialize genesis block and blockchain
// Tests account for txgen to use // Tests account for txgen to use
@ -57,37 +92,42 @@ func (node *Node) GenesisBlockSetup(db ethdb.Database, shardID uint32, isArchiva
Config: &chainConfig, Config: &chainConfig,
Alloc: genesisAlloc, Alloc: genesisAlloc,
ShardID: shardID, ShardID: shardID,
ShardStateHash: core.GetInitShardState().Hash(),
} }
// Store genesis block into db. // Store genesis block into db.
gspec.MustCommit(db) _, err := gspec.Commit(db)
cacheConfig := core.CacheConfig{}
if isArchival { return err
cacheConfig = core.CacheConfig{Disabled: true, TrieNodeLimit: 256 * 1024 * 1024, TrieTimeLimit: 30 * time.Second} }
// CreateTestBankKeys deterministically generates testing addresses.
func CreateTestBankKeys(numAddresses int) (keys []*ecdsa.PrivateKey, err error) {
rand.Seed(0)
bytes := make([]byte, 1000000)
for i := range bytes {
bytes[i] = byte(rand.Intn(100))
}
reader := strings.NewReader(string(bytes))
for i := 0; i < numAddresses; i++ {
key, err := ecdsa.GenerateKey(crypto.S256(), reader)
if err != nil {
return nil, err
} }
return core.NewBlockChain(db, &cacheConfig, gspec.Config, node.Consensus, vm.Config{}, nil) keys = append(keys, key)
}
return keys, nil
} }
// CreateGenesisAllocWithTestingAddresses create the genesis block allocation that contains deterministically // CreateGenesisAllocWithTestingAddresses create the genesis block allocation that contains deterministically
// generated testing addresses with tokens. This is mostly used for generated simulated transactions in txgen. // generated testing addresses with tokens. This is mostly used for generated simulated transactions in txgen.
// TODO: Remove it later when moving to production. // TODO: Remove it later when moving to production.
func (node *Node) CreateGenesisAllocWithTestingAddresses(numAddress int) core.GenesisAlloc { func (node *Node) CreateGenesisAllocWithTestingAddresses(numAddress int) core.GenesisAlloc {
rand.Seed(0)
len := 1000000
bytes := make([]byte, len)
for i := 0; i < len; i++ {
bytes[i] = byte(rand.Intn(100))
}
reader := strings.NewReader(string(bytes))
genesisAloc := make(core.GenesisAlloc) genesisAloc := make(core.GenesisAlloc)
for i := 0; i < numAddress; i++ { for _, testBankKey := range node.TestBankKeys {
testBankKey, _ := ecdsa.GenerateKey(crypto.S256(), reader)
testBankAddress := crypto.PubkeyToAddress(testBankKey.PublicKey) testBankAddress := crypto.PubkeyToAddress(testBankKey.PublicKey)
testBankFunds := big.NewInt(InitFreeFundInEther) testBankFunds := big.NewInt(InitFreeFundInEther)
testBankFunds = testBankFunds.Mul(testBankFunds, big.NewInt(params.Ether)) testBankFunds = testBankFunds.Mul(testBankFunds, big.NewInt(params.Ether))
genesisAloc[testBankAddress] = core.GenesisAccount{Balance: testBankFunds} genesisAloc[testBankAddress] = core.GenesisAccount{Balance: testBankFunds}
node.TestBankKeys = append(node.TestBankKeys, testBankKey)
} }
return genesisAloc return genesisAloc
} }

@ -3,11 +3,10 @@ package node
import ( import (
"bytes" "bytes"
"context" "context"
"encoding/gob"
"encoding/hex" "encoding/hex"
"fmt" "errors"
"io/ioutil"
"math" "math"
"math/big"
"os" "os"
"os/exec" "os/exec"
"strconv" "strconv"
@ -15,10 +14,9 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
"github.com/harmony-one/harmony/core"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
pb "github.com/golang/protobuf/proto" pb "github.com/golang/protobuf/proto"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
@ -28,9 +26,12 @@ import (
"github.com/harmony-one/harmony/api/proto/message" "github.com/harmony-one/harmony/api/proto/message"
proto_node "github.com/harmony-one/harmony/api/proto/node" proto_node "github.com/harmony-one/harmony/api/proto/node"
"github.com/harmony-one/harmony/api/service" "github.com/harmony-one/harmony/api/service"
"github.com/harmony-one/harmony/contracts/structs"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/crypto/pki" "github.com/harmony-one/harmony/crypto/pki"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node" nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/p2p" "github.com/harmony-one/harmony/p2p"
"github.com/harmony-one/harmony/p2p/host" "github.com/harmony-one/harmony/p2p/host"
@ -177,7 +178,9 @@ func (node *Node) messageHandler(content []byte, sender string) {
case proto_node.PONG: case proto_node.PONG:
node.pongMessageHandler(msgPayload) node.pongMessageHandler(msgPayload)
case proto_node.ShardState: case proto_node.ShardState:
node.epochShardStateMessageHandler(msgPayload) if err := node.epochShardStateMessageHandler(msgPayload); err != nil {
ctxerror.Log15(utils.GetLogger().Warn, err)
}
} }
default: default:
utils.GetLogInstance().Error("Unknown", "MsgCategory", msgCategory) utils.GetLogInstance().Error("Unknown", "MsgCategory", msgCategory)
@ -248,21 +251,127 @@ func (node *Node) BroadcastNewBlock(newBlock *types.Block) {
} }
// VerifyNewBlock is called by consensus participants to verify the block (account model) they are running consensus on // VerifyNewBlock is called by consensus participants to verify the block (account model) they are running consensus on
func (node *Node) VerifyNewBlock(newBlock *types.Block) bool { func (node *Node) VerifyNewBlock(newBlock *types.Block) error {
err := node.blockchain.ValidateNewBlock(newBlock, pki.GetAddressFromPublicKey(node.SelfPeer.ConsensusPubKey)) // TODO ek – where do we verify parent-child invariants,
// e.g. "child.Number == child.IsGenesis() ? 0 : parent.Number+1"?
err := node.Blockchain().ValidateNewBlock(newBlock, pki.GetAddressFromPublicKey(node.SelfPeer.ConsensusPubKey))
if err != nil { if err != nil {
utils.GetLogInstance().Debug("Failed verifying new block", "Error", err, "tx", newBlock.Transactions()[0]) return ctxerror.New("cannot ValidateNewBlock",
return false "blockHash", newBlock.Hash(),
"numTx", len(newBlock.Transactions()),
).WithCause(err)
} }
// TODO: verify the vrf randomness // TODO: verify the vrf randomness
_ = newBlock.Header().RandPreimage _ = newBlock.Header().RandPreimage
err = node.blockchain.ValidateNewShardState(newBlock, &node.CurrentStakes) err = node.validateNewShardState(newBlock, &node.CurrentStakes)
if err != nil { if err != nil {
utils.GetLogInstance().Debug("Failed to verify new sharding state", "err", err) return ctxerror.New("failed to verify sharding state").WithCause(err)
}
return nil
}
// BigMaxUint64 is maximum possible uint64 value, that is, (1**64)-1.
var BigMaxUint64 = new(big.Int).SetBytes([]byte{
255, 255, 255, 255, 255, 255, 255, 255,
})
// validateNewShardState validate whether the new shard state root matches
func (node *Node) validateNewShardState(block *types.Block, stakeInfo *map[common.Address]*structs.StakeInfo) error {
// Common case first – blocks without resharding proposal
header := block.Header()
if header.ShardStateHash == (common.Hash{}) {
// No new shard state was proposed
if block.ShardID() == 0 {
if core.IsEpochLastBlock(block) {
// TODO ek - invoke view change
return errors.New("beacon leader did not propose resharding")
}
} else {
if node.nextShardState.master != nil &&
!time.Now().Before(node.nextShardState.proposeTime) {
// TODO ek – invoke view change
return errors.New("regular leader did not propose resharding")
}
}
// We aren't expecting to reshard, so proceed to sign
return nil
}
proposed := header.ShardState
if block.ShardID() == 0 {
// Beacon validators independently recalculate the master state and
// compare it against the proposed copy.
nextEpoch := new(big.Int).Add(block.Header().Epoch, common.Big1)
// TODO ek – this may be called from regular shards,
// for vetting beacon chain blocks received during block syncing.
// DRand may or or may not get in the way. Test this out.
expected, err := core.CalculateNewShardState(
node.Blockchain(), nextEpoch, stakeInfo)
if err != nil {
return ctxerror.New("cannot calculate expected shard state").
WithCause(err)
}
if types.CompareShardState(expected, proposed) != 0 {
// TODO ek – log state proposal differences
// TODO ek – this error should trigger view change
err := errors.New("shard state proposal is different from expected")
// TODO ek/chao – calculated shard state is different even with the
// same input, i.e. it is nondeterministic.
// Don't treat this as a blocker until we fix the nondeterminism.
//return err
ctxerror.Log15(utils.GetLogger().Warn, err)
}
} else {
// Regular validators fetch the local-shard copy on the beacon chain
// and compare it against the proposed copy.
//
// We trust the master proposal in our copy of beacon chain.
// The sanity check for the master proposal is done earlier,
// when the beacon block containing the master proposal is received
// and before it is admitted into the local beacon chain.
//
// TODO ek – fetch masterProposal from beaconchain instead
masterProposal := node.nextShardState.master.ShardState
expected := masterProposal.FindCommitteeByID(block.ShardID())
switch len(proposed) {
case 0:
// Proposal to discontinue shard
if expected != nil {
// TODO ek – invoke view change
return errors.New(
"leader proposed to disband against beacon decision")
}
case 1:
// Proposal to continue shard
proposed := proposed[0]
// Sanity check: Shard ID should match
if proposed.ShardID != block.ShardID() {
// TODO ek – invoke view change
return ctxerror.New("proposal has incorrect shard ID",
"proposedShard", proposed.ShardID,
"blockShard", block.ShardID())
}
// Did beaconchain say we are no more?
if expected == nil {
// TODO ek – invoke view change
return errors.New(
"leader proposed to continue against beacon decision")
}
// Did beaconchain say the same proposal?
if types.CompareCommittee(expected, &proposed) != 0 {
// TODO ek – log differences
// TODO ek – invoke view change
return errors.New("proposal differs from one in beacon chain")
}
default:
// TODO ek – invoke view change
return ctxerror.New(
"regular resharding proposal has incorrect number of shards",
"numShards", len(proposed))
} }
return true }
return nil
} }
// PostConsensusProcessing is called by consensus participants, after consensus is done, to: // PostConsensusProcessing is called by consensus participants, after consensus is done, to:
@ -315,29 +424,37 @@ func (node *Node) PostConsensusProcessing(newBlock *types.Block) {
// TODO: update staking information once per epoch. // TODO: update staking information once per epoch.
node.UpdateStakingList(node.QueryStakeInfo()) node.UpdateStakingList(node.QueryStakeInfo())
node.printStakingList() node.printStakingList()
if core.IsEpochBlock(newBlock) {
shardState := node.blockchain.StoreNewShardState(newBlock, &node.CurrentStakes)
if shardState != nil {
if nodeconfig.GetDefaultConfig().IsLeader() {
epochShardState := types.EpochShardState{Epoch: core.GetEpochFromBlockNumber(newBlock.NumberU64()), ShardState: shardState}
epochShardStateMessage := proto_node.ConstructEpochShardStateMessage(epochShardState)
// Broadcast new shard state
err := node.host.SendMessageToGroups([]p2p.GroupID{node.NodeConfig.GetClientGroupID()}, host.ConstructP2pMessage(byte(0), epochShardStateMessage))
if err != nil {
utils.GetLogInstance().Error("[Resharding] failed to broadcast shard state message", "group", node.NodeConfig.GetClientGroupID())
} else {
utils.GetLogInstance().Info("[Resharding] broadcasted shard state message to", "group", node.NodeConfig.GetClientGroupID())
} }
} newBlockHeader := newBlock.Header()
node.processEpochShardState(&types.EpochShardState{Epoch: core.GetEpochFromBlockNumber(newBlock.NumberU64()), ShardState: shardState}) if newBlockHeader.ShardStateHash != (common.Hash{}) {
if node.Consensus.ShardID == 0 {
// TODO ek – this is a temp hack until beacon chain sync is fixed
// End-of-epoch block on beacon chain; block's EpochState is the
// master resharding table. Broadcast it to the network.
if err := node.broadcastEpochShardState(newBlock); err != nil {
e := ctxerror.New("cannot broadcast shard state").WithCause(err)
ctxerror.Log15(utils.GetLogInstance().Error, e)
} }
} }
node.transitionIntoNextEpoch(newBlockHeader.ShardState)
} }
} }
func (node *Node) broadcastEpochShardState(newBlock *types.Block) error {
epochShardStateMessage := proto_node.ConstructEpochShardStateMessage(
types.EpochShardState{
Epoch: newBlock.Header().Epoch.Uint64() + 1,
ShardState: newBlock.Header().ShardState,
},
)
return node.host.SendMessageToGroups(
[]p2p.GroupID{node.NodeConfig.GetClientGroupID()},
host.ConstructP2pMessage(byte(0), epochShardStateMessage))
}
// AddNewBlock is usedd to add new block into the blockchain. // AddNewBlock is usedd to add new block into the blockchain.
func (node *Node) AddNewBlock(newBlock *types.Block) { func (node *Node) AddNewBlock(newBlock *types.Block) {
blockNum, err := node.blockchain.InsertChain([]*types.Block{newBlock}) blockNum, err := node.Blockchain().InsertChain([]*types.Block{newBlock})
if err != nil { if err != nil {
utils.GetLogInstance().Debug("Error adding new block to blockchain", "blockNum", blockNum, "hash", newBlock.Header().Hash(), "Error", err) utils.GetLogInstance().Debug("Error adding new block to blockchain", "blockNum", blockNum, "hash", newBlock.Header().Hash(), "Error", err)
} else { } else {
@ -473,7 +590,10 @@ func (node *Node) pongMessageHandler(msgPayload []byte) int {
} }
if pong.ShardID != node.Consensus.ShardID { if pong.ShardID != node.Consensus.ShardID {
utils.GetLogInstance().Error("Received Pong message for the wrong shard", "receivedShardID", pong.ShardID) utils.GetLogInstance().Error(
"Received Pong message for the wrong shard",
"receivedShardID", pong.ShardID,
"expectedShardID", node.Consensus.ShardID)
return 0 return 0
} }
@ -547,89 +667,115 @@ func (node *Node) pongMessageHandler(msgPayload []byte) int {
return 0 return 0
} }
func (node *Node) epochShardStateMessageHandler(msgPayload []byte) int { func (node *Node) epochShardStateMessageHandler(msgPayload []byte) error {
utils.GetLogInstance().Error("[Received new shard state]") logger := utils.GetLogInstance()
getLogger := func() log.Logger { return utils.WithCallerSkip(logger, 1) }
epochShardState, err := proto_node.DeserializeEpochShardStateFromMessage(msgPayload) epochShardState, err := proto_node.DeserializeEpochShardStateFromMessage(msgPayload)
if err != nil { if err != nil {
utils.GetLogInstance().Error("Can't get shard state Message", "error", err) return ctxerror.New("Can't get shard state message").WithCause(err)
return -1
} }
if (node.Consensus != nil && node.Consensus.ShardID != 0) || node.NodeConfig.Role() == nodeconfig.NewNode { if node.Consensus == nil && node.NodeConfig.Role() != nodeconfig.NewNode {
node.processEpochShardState(epochShardState) return nil
} }
return 0 receivedEpoch := big.NewInt(int64(epochShardState.Epoch))
getLogger().Info("received new shard state", "epoch", receivedEpoch)
node.nextShardState.master = epochShardState
if node.NodeConfig.IsLeader() {
// Wait a bit to allow the master table to reach other validators.
node.nextShardState.proposeTime = time.Now().Add(5 * time.Second)
} else {
// Wait a bit to allow the master table to reach the leader,
// and to allow the leader to propose next shard state based upon it.
node.nextShardState.proposeTime = time.Now().Add(15 * time.Second)
}
// TODO ek – this should be done from replaying beaconchain once
// beaconchain sync is fixed
err = node.Beaconchain().WriteShardState(
receivedEpoch, epochShardState.ShardState)
if err != nil {
return ctxerror.New("cannot store shard state", "epoch", receivedEpoch).
WithCause(err)
}
return nil
} }
func (node *Node) processEpochShardState(epochShardState *types.EpochShardState) { func (node *Node) transitionIntoNextEpoch(shardState types.ShardState) {
shardState := epochShardState.ShardState logger := utils.GetLogInstance()
epoch := epochShardState.Epoch getLogger := func() log.Logger { return utils.WithCallerSkip(logger, 1) }
logger = logger.New(
"blsPubKey", hex.EncodeToString(node.Consensus.PubKey.Serialize()),
"curShard", node.Blockchain().ShardID(),
"curLeader", node.NodeConfig.IsLeader())
for _, c := range shardState { for _, c := range shardState {
utils.GetLogInstance().Debug("new shard information", "shardID", c.ShardID, "NodeList", c.NodeList) logger.Debug("new shard information",
"shardID", c.ShardID,
"nodeList", c.NodeList)
}
myShardID, isNextLeader := findRoleInShardState(
node.Consensus.PubKey, shardState)
logger = logger.New(
"nextShard", myShardID,
"nextLeader", isNextLeader)
if myShardID == math.MaxUint32 {
getLogger().Info("Somehow I got kicked out. Exiting")
os.Exit(8) // 8 represents it's a loop and the program restart itself
} }
myShardID := uint32(math.MaxUint32) myShardState := shardState[myShardID]
isNextLeader := false
myBlsPubKey := node.Consensus.PubKey.Serialize()
myShardState := types.Committee{}
for _, shard := range shardState {
for _, nodeID := range shard.NodeList {
if bytes.Compare(nodeID.BlsPublicKey[:], myBlsPubKey) == 0 {
myShardID = shard.ShardID
isNextLeader = shard.Leader == nodeID
myShardState = shard
}
}
}
if myShardID != uint32(math.MaxUint32) {
// Update public keys // Update public keys
ss := myShardState var publicKeys []*bls.PublicKey
publicKeys := []*bls.PublicKey{} for idx, nodeID := range myShardState.NodeList {
for _, nodeID := range ss.NodeList {
key := &bls.PublicKey{} key := &bls.PublicKey{}
err := key.Deserialize(nodeID.BlsPublicKey[:]) err := key.Deserialize(nodeID.BlsPublicKey[:])
if err != nil { if err != nil {
utils.GetLogInstance().Error("Failed to deserialize BLS public key in shard state", "error", err) getLogger().Error("Failed to deserialize BLS public key in shard state",
"idx", idx,
"error", err)
} }
publicKeys = append(publicKeys, key) publicKeys = append(publicKeys, key)
} }
node.Consensus.UpdatePublicKeys(publicKeys) node.Consensus.UpdatePublicKeys(publicKeys)
node.DRand.UpdatePublicKeys(publicKeys) node.DRand.UpdatePublicKeys(publicKeys)
aboutLeader := "" if node.Blockchain().ShardID() == myShardID {
if nodeconfig.GetDefaultConfig().IsLeader() { getLogger().Info("staying in the same shard")
aboutLeader = "I am not leader anymore"
if isNextLeader {
aboutLeader = "I am still leader"
}
} else { } else {
aboutLeader = "I am still validator" getLogger().Info("moving to another shard")
if isNextLeader { if err := node.shardChains.Close(); err != nil {
aboutLeader = "I become the leader" getLogger().Error("cannot close shard chains", "error", err)
} }
restartProcess(getRestartArguments(myShardID))
} }
if node.blockchain.ShardID() == myShardID { }
utils.GetLogInstance().Info(fmt.Sprintf("[Resharded][epoch:%d] I stay at shard %d, %s", epoch, myShardID, aboutLeader), "BlsPubKey", hex.EncodeToString(myBlsPubKey))
} else {
utils.GetLogInstance().Info(fmt.Sprintf("[Resharded][epoch:%d] I got resharded to shard %d from shard %d, %s", epoch, myShardID, node.blockchain.ShardID(), aboutLeader), "BlsPubKey", hex.EncodeToString(myBlsPubKey))
node.storeEpochShardState(epochShardState)
func findRoleInShardState(
key *bls.PublicKey, state types.ShardState,
) (shardID uint32, isLeader bool) {
keyBytes := key.Serialize()
for idx, shard := range state {
for nodeIdx, nodeID := range shard.NodeList {
if bytes.Compare(nodeID.BlsPublicKey[:], keyBytes) == 0 {
return uint32(idx), nodeIdx == 0
}
}
}
return math.MaxUint32, false
}
func restartProcess(args []string) {
execFile, err := getBinaryPath() execFile, err := getBinaryPath()
if err != nil { if err != nil {
utils.GetLogInstance().Crit("Failed to get program path when restarting program", "error", err, "file", execFile) utils.GetLogInstance().Crit("Failed to get program path when restarting program", "error", err, "file", execFile)
} }
args := getRestartArguments(myShardID)
utils.GetLogInstance().Info("Restarting program", "args", args, "env", os.Environ()) utils.GetLogInstance().Info("Restarting program", "args", args, "env", os.Environ())
err = syscall.Exec(execFile, args, os.Environ()) err = syscall.Exec(execFile, args, os.Environ())
if err != nil { if err != nil {
utils.GetLogInstance().Crit("Failed to restart program after resharding", "error", err) utils.GetLogInstance().Crit("Failed to restart program after resharding", "error", err)
} }
} panic("syscall.Exec() is not supposed to return")
} else {
utils.GetLogInstance().Info(fmt.Sprintf("[Resharded][epoch:%d] Somehow I got kicked out. Exiting", epoch), "BlsPubKey", hex.EncodeToString(myBlsPubKey))
os.Exit(8) // 8 represents it's a loop and the program restart itself
}
} }
func getRestartArguments(myShardID uint32) []string { func getRestartArguments(myShardID uint32) []string {
@ -670,38 +816,6 @@ func getBinaryPath() (argv0 string, err error) {
return return
} }
// Stores the epoch shard state into local file
// TODO: think about storing it into level db.
func (node *Node) storeEpochShardState(epochShardState *types.EpochShardState) {
byteBuffer := bytes.NewBuffer([]byte{})
encoder := gob.NewEncoder(byteBuffer)
err := encoder.Encode(epochShardState)
if err != nil {
utils.GetLogInstance().Error("[Resharded] Failed to encode epoch shard state", "error", err)
}
err = ioutil.WriteFile("./epoch_shard_state"+node.SelfPeer.IP+node.SelfPeer.Port, byteBuffer.Bytes(), 0644)
if err != nil {
utils.GetLogInstance().Error("[Resharded] Failed to store epoch shard state in local file", "error", err)
}
}
func (node *Node) retrieveEpochShardState() (*types.EpochShardState, error) {
b, err := ioutil.ReadFile("./epoch_shard_state" + node.SelfPeer.IP + node.SelfPeer.Port)
if err != nil {
utils.GetLogInstance().Error("[Resharded] Failed to retrieve epoch shard state", "error", err)
}
epochShardState := new(types.EpochShardState)
r := bytes.NewBuffer(b)
decoder := gob.NewDecoder(r)
err = decoder.Decode(epochShardState)
if err != nil {
return nil, fmt.Errorf("Decode local epoch shard state error")
}
return epochShardState, nil
}
// ConsensusMessageHandler passes received message in node_handler to consensus // ConsensusMessageHandler passes received message in node_handler to consensus
func (node *Node) ConsensusMessageHandler(msgPayload []byte) { func (node *Node) ConsensusMessageHandler(msgPayload []byte) {
if node.Consensus.ConsensusVersion == "v1" { if node.Consensus.ConsensusVersion == "v1" {

@ -23,7 +23,7 @@ func TestAddNewBlock(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Cannot craeate consensus: %v", err) t.Fatalf("Cannot craeate consensus: %v", err)
} }
node := New(host, consensus, nil, false) node := New(host, consensus, testDBFactory, false)
selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock) selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock)
node.Worker.CommitTransactions(selectedTxs) node.Worker.CommitTransactions(selectedTxs)
@ -31,7 +31,7 @@ func TestAddNewBlock(t *testing.T) {
node.AddNewBlock(block) node.AddNewBlock(block)
if node.blockchain.CurrentBlock().NumberU64() != 1 { if node.Blockchain().CurrentBlock().NumberU64() != 1 {
t.Error("New block is not added successfully") t.Error("New block is not added successfully")
} }
} }
@ -48,13 +48,13 @@ func TestVerifyNewBlock(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Cannot craeate consensus: %v", err) t.Fatalf("Cannot craeate consensus: %v", err)
} }
node := New(host, consensus, nil, false) node := New(host, consensus, testDBFactory, false)
selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock) selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock)
node.Worker.CommitTransactions(selectedTxs) node.Worker.CommitTransactions(selectedTxs)
block, _ := node.Worker.Commit() block, _ := node.Worker.Commit()
if !node.VerifyNewBlock(block) { if err := node.VerifyNewBlock(block); err != nil {
t.Error("New block is not verified successfully") t.Error("New block is not verified successfully:", err)
} }
} }

@ -1,9 +1,15 @@
package node package node
import ( import (
"math/big"
"time" "time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/internal/ctxerror"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
) )
@ -12,7 +18,8 @@ const (
DefaultThreshold = 1 DefaultThreshold = 1
FirstTimeThreshold = 2 FirstTimeThreshold = 2
ConsensusTimeOut = 10 ConsensusTimeOut = 10
PeriodicBlock = 3 * time.Second PeriodicBlock = 1 * time.Second
BlockPeriod = 10 * time.Second
) )
// WaitForConsensusReady listen for the readiness signal from consensus and generate new block for consensus. // WaitForConsensusReady listen for the readiness signal from consensus and generate new block for consensus.
@ -27,6 +34,7 @@ func (node *Node) WaitForConsensusReady(readySignal chan struct{}, stopChan chan
firstTime := true firstTime := true
var newBlock *types.Block var newBlock *types.Block
timeoutCount := 0 timeoutCount := 0
deadline := time.Now().Add(BlockPeriod)
for { for {
// keep waiting for Consensus ready // keep waiting for Consensus ready
select { select {
@ -50,27 +58,32 @@ func (node *Node) WaitForConsensusReady(readySignal chan struct{}, stopChan chan
threshold = FirstTimeThreshold threshold = FirstTimeThreshold
firstTime = false firstTime = false
} }
if len(node.pendingTransactions) >= threshold { if len(node.pendingTransactions) >= threshold || !time.Now().Before(deadline) {
utils.GetLogInstance().Debug("PROPOSING NEW BLOCK ------------------------------------------------", "blockNum", node.blockchain.CurrentBlock().NumberU64()+1, "threshold", threshold, "pendingTransactions", len(node.pendingTransactions)) deadline = time.Now().Add(BlockPeriod)
utils.GetLogInstance().Debug("PROPOSING NEW BLOCK ------------------------------------------------", "blockNum", node.Blockchain().CurrentBlock().NumberU64()+1, "threshold", threshold, "pendingTransactions", len(node.pendingTransactions))
// Normal tx block consensus // Normal tx block consensus
selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock) selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock)
if len(selectedTxs) != 0 { if err := node.Worker.CommitTransactions(selectedTxs); err != nil {
node.Worker.CommitTransactions(selectedTxs) ctxerror.Log15(utils.GetLogger().Error,
ctxerror.New("cannot commit transacttions").
WithCause(err))
}
block, err := node.Worker.Commit() block, err := node.Worker.Commit()
if err != nil { if err != nil {
utils.GetLogInstance().Debug("Failed committing new block", "Error", err) ctxerror.Log15(utils.GetLogInstance().Error,
ctxerror.New("Failed committing new block").
WithCause(err))
} else if err := node.proposeShardState(block); err != nil {
ctxerror.Log15(utils.GetLogger().Error,
ctxerror.New("cannot add shard state").
WithCause(err))
} else { } else {
if node.Consensus.ShardID == 0 {
// add new shard state if it's epoch block
// TODO: bug fix - the stored shard state between here and PostConsensusProcessing are different.
//node.addNewShardStateHash(block)
}
newBlock = block newBlock = block
utils.GetLogInstance().Debug("Successfully proposed new block", "blockNum", block.NumberU64(), "numTxs", block.Transactions().Len()) utils.GetLogInstance().Debug("Successfully proposed new block", "blockNum", block.NumberU64(), "numTxs", block.Transactions().Len())
threshold = DefaultThreshold
break break
} }
} }
}
// If not enough transactions to run Consensus, // If not enough transactions to run Consensus,
// periodically check whether we have enough transactions to package into block. // periodically check whether we have enough transactions to package into block.
time.Sleep(PeriodicBlock) time.Sleep(PeriodicBlock)
@ -85,15 +98,6 @@ func (node *Node) WaitForConsensusReady(readySignal chan struct{}, stopChan chan
}() }()
} }
func (node *Node) addNewShardStateHash(block *types.Block) {
shardState := node.blockchain.GetNewShardState(block, &node.CurrentStakes)
if shardState != nil {
shardHash := shardState.Hash()
utils.GetLogInstance().Debug("[Shard State Hash] adding new shard state", "shardHash", shardHash)
block.AddShardStateHash(shardHash)
}
}
// WaitForConsensusReadyv2 listen for the readiness signal from consensus and generate new block for consensus. // WaitForConsensusReadyv2 listen for the readiness signal from consensus and generate new block for consensus.
// only leader will receive the ready signal // only leader will receive the ready signal
// TODO: clean pending transactions for validators; or validators not prepare pending transactions // TODO: clean pending transactions for validators; or validators not prepare pending transactions
@ -115,6 +119,7 @@ func (node *Node) WaitForConsensusReadyv2(readySignal chan struct{}, stopChan ch
case <-readySignal: case <-readySignal:
firstTry := true firstTry := true
deadline := time.Now().Add(BlockPeriod)
for { for {
if !firstTry { if !firstTry {
time.Sleep(PeriodicBlock) time.Sleep(PeriodicBlock)
@ -127,26 +132,29 @@ func (node *Node) WaitForConsensusReadyv2(readySignal chan struct{}, stopChan ch
threshold = FirstTimeThreshold threshold = FirstTimeThreshold
firstTime = false firstTime = false
} }
if len(node.pendingTransactions) < threshold { if len(node.pendingTransactions) < threshold && time.Now().Before(deadline) {
continue continue
} }
deadline = time.Now().Add(BlockPeriod)
// Normal tx block consensus // Normal tx block consensus
selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock) selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock)
if len(selectedTxs) == 0 { utils.GetLogInstance().Debug("PROPOSING NEW BLOCK ------------------------------------------------", "blockNum", node.Blockchain().CurrentBlock().NumberU64()+1, "threshold", threshold, "selectedTxs", len(selectedTxs))
continue if err := node.Worker.CommitTransactions(selectedTxs); err != nil {
ctxerror.Log15(utils.GetLogger().Error,
ctxerror.New("cannot commit transactions").
WithCause(err))
} }
utils.GetLogInstance().Debug("PROPOSING NEW BLOCK ------------------------------------------------", "blockNum", node.blockchain.CurrentBlock().NumberU64()+1, "threshold", threshold, "selectedTxs", len(selectedTxs))
node.Worker.CommitTransactions(selectedTxs)
block, err := node.Worker.Commit() block, err := node.Worker.Commit()
if err != nil { if err != nil {
utils.GetLogInstance().Debug("Failed committing new block", "Error", err) ctxerror.Log15(utils.GetLogger().Error,
ctxerror.New("cannot commit new block").
WithCause(err))
continue continue
} } else if err := node.proposeShardState(block); err != nil {
if node.Consensus.ShardID == 0 { ctxerror.Log15(utils.GetLogger().Error,
// add new shard state if it's epoch block ctxerror.New("cannot add shard state").
// TODO: bug fix - the stored shard state between here and PostConsensusProcessing are different. WithCause(err))
//node.addNewShardStateHash(block) } else {
}
newBlock := block newBlock := block
utils.GetLogInstance().Debug("Successfully proposed new block", "blockNum", block.NumberU64(), "numTxs", block.Transactions().Len()) utils.GetLogInstance().Debug("Successfully proposed new block", "blockNum", block.NumberU64(), "numTxs", block.Transactions().Len())
@ -156,5 +164,60 @@ func (node *Node) WaitForConsensusReadyv2(readySignal chan struct{}, stopChan ch
} }
} }
} }
}
}() }()
} }
func (node *Node) proposeShardState(block *types.Block) error {
switch node.Consensus.ShardID {
case 0:
return node.proposeBeaconShardState(block)
default:
node.proposeLocalShardState(block)
return nil
}
}
func (node *Node) proposeBeaconShardState(block *types.Block) error {
// TODO ek - replace this with variable epoch logic.
if !core.IsEpochLastBlock(block) {
// We haven't reached the end of this epoch; don't propose yet.
return nil
}
nextEpoch := new(big.Int).Add(block.Header().Epoch, common.Big1)
shardState, err := core.CalculateNewShardState(
node.Blockchain(), nextEpoch, &node.CurrentStakes)
if err != nil {
return err
}
block.AddShardState(shardState)
return nil
}
func (node *Node) proposeLocalShardState(block *types.Block) {
logger := block.Logger(utils.GetLogInstance())
getLogger := func() log.Logger { return utils.WithCallerSkip(logger, 1) }
// TODO ek – read this from beaconchain once BC sync is fixed
if node.nextShardState.master == nil {
getLogger().Debug("yet to receive master proposal from beaconchain")
return
}
logger = logger.New(
"nextEpoch", node.nextShardState.master.Epoch,
"proposeTime", node.nextShardState.proposeTime)
if time.Now().Before(node.nextShardState.proposeTime) {
getLogger().Debug("still waiting for shard state to propagate")
return
}
masterShardState := node.nextShardState.master.ShardState
var localShardState types.ShardState
committee := masterShardState.FindCommitteeByID(block.ShardID())
if committee != nil {
getLogger().Info("found local shard info; proposing it")
localShardState = append(localShardState, *committee)
} else {
getLogger().Info("beacon committee disowned us; proposing nothing")
// Leave local proposal empty to signal the end of shard (disbanding).
}
block.AddShardState(localShardState)
}

@ -6,7 +6,9 @@ import (
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/harmony-one/harmony/api/service/syncing" "github.com/harmony-one/harmony/api/service/syncing"
"github.com/harmony-one/harmony/api/service/syncing/downloader" "github.com/harmony-one/harmony/api/service/syncing/downloader"
downloader_pb "github.com/harmony-one/harmony/api/service/syncing/downloader/proto" downloader_pb "github.com/harmony-one/harmony/api/service/syncing/downloader/proto"
@ -42,7 +44,7 @@ func (node *Node) getNeighborPeers(neighbor *sync.Map) []p2p.Peer {
// DoSyncWithoutConsensus gets sync-ed to blockchain without joining consensus // DoSyncWithoutConsensus gets sync-ed to blockchain without joining consensus
func (node *Node) DoSyncWithoutConsensus() { func (node *Node) DoSyncWithoutConsensus() {
go node.DoSyncing(node.blockchain, node.Worker, node.GetSyncingPeers, false) //Don't join consensus go node.DoSyncing(node.Blockchain(), node.Worker, node.GetSyncingPeers, false) //Don't join consensus
} }
// GetBeaconSyncingPeers returns a list of peers for beaconchain syncing // GetBeaconSyncingPeers returns a list of peers for beaconchain syncing
@ -71,7 +73,7 @@ func (node *Node) DoBeaconSyncing() {
} }
} }
node.beaconSync.AddLastMileBlock(beaconBlock) node.beaconSync.AddLastMileBlock(beaconBlock)
node.beaconSync.SyncLoop(node.beaconChain, node.BeaconWorker, false, true) node.beaconSync.SyncLoop(node.Beaconchain(), node.BeaconWorker, false, true)
} }
} }
} }
@ -80,12 +82,16 @@ func (node *Node) DoBeaconSyncing() {
func (node *Node) DoSyncing(bc *core.BlockChain, worker *worker.Worker, getPeers func() []p2p.Peer, willJoinConsensus bool) { func (node *Node) DoSyncing(bc *core.BlockChain, worker *worker.Worker, getPeers func() []p2p.Peer, willJoinConsensus bool) {
ticker := time.NewTicker(SyncFrequency * time.Second) ticker := time.NewTicker(SyncFrequency * time.Second)
logger := utils.GetLogInstance()
getLogger := func() log.Logger { return utils.WithCallerSkip(logger, 1) }
SyncingLoop: SyncingLoop:
for { for {
select { select {
case <-ticker.C: case <-ticker.C:
if node.stateSync == nil { if node.stateSync == nil {
node.stateSync = syncing.CreateStateSync(node.SelfPeer.IP, node.SelfPeer.Port, node.GetSyncID()) node.stateSync = syncing.CreateStateSync(node.SelfPeer.IP, node.SelfPeer.Port, node.GetSyncID())
logger = logger.New("syncID", node.GetSyncID())
getLogger().Debug("initialized state sync")
} }
if node.stateSync.GetActivePeerNumber() == 0 { if node.stateSync.GetActivePeerNumber() == 0 {
peers := getPeers() peers := getPeers()
@ -100,7 +106,9 @@ SyncingLoop:
node.State = NodeNotInSync node.State = NodeNotInSync
node.stateMutex.Unlock() node.stateMutex.Unlock()
node.stateSync.SyncLoop(bc, worker, willJoinConsensus, false) node.stateSync.SyncLoop(bc, worker, willJoinConsensus, false)
getLogger().Debug("now in sync")
if willJoinConsensus { if willJoinConsensus {
getLogger().Debug("entering NodeReadyForConsensus state")
node.stateMutex.Lock() node.stateMutex.Lock()
node.State = NodeReadyForConsensus node.State = NodeReadyForConsensus
node.stateMutex.Unlock() node.stateMutex.Unlock()
@ -129,7 +137,7 @@ func (node *Node) SupportSyncing() {
go node.SendNewBlockToUnsync() go node.SendNewBlockToUnsync()
if node.NodeConfig.Role() != nodeconfig.ShardLeader && node.NodeConfig.Role() != nodeconfig.BeaconLeader { if node.NodeConfig.Role() != nodeconfig.ShardLeader && node.NodeConfig.Role() != nodeconfig.BeaconLeader {
go node.DoSyncing(node.blockchain, node.Worker, node.GetSyncingPeers, true) go node.DoSyncing(node.Blockchain(), node.Worker, node.GetSyncingPeers, true)
} }
} }
@ -192,12 +200,12 @@ func (node *Node) CalculateResponse(request *downloader_pb.DownloaderRequest) (*
case downloader_pb.DownloaderRequest_HEADER: case downloader_pb.DownloaderRequest_HEADER:
var startHeaderHash []byte var startHeaderHash []byte
if request.BlockHash == nil { if request.BlockHash == nil {
tmp := node.blockchain.Genesis().Hash() tmp := node.Blockchain().Genesis().Hash()
startHeaderHash = tmp[:] startHeaderHash = tmp[:]
} else { } else {
startHeaderHash = request.BlockHash startHeaderHash = request.BlockHash
} }
for block := node.blockchain.CurrentBlock(); block != nil; block = node.blockchain.GetBlockByHash(block.Header().ParentHash) { for block := node.Blockchain().CurrentBlock(); block != nil; block = node.Blockchain().GetBlockByHash(block.Header().ParentHash) {
blockHash := block.Hash() blockHash := block.Hash()
if bytes.Compare(blockHash[:], startHeaderHash) == 0 { if bytes.Compare(blockHash[:], startHeaderHash) == 0 {
break break
@ -209,7 +217,7 @@ func (node *Node) CalculateResponse(request *downloader_pb.DownloaderRequest) (*
for _, bytes := range request.Hashes { for _, bytes := range request.Hashes {
var hash common.Hash var hash common.Hash
hash.SetBytes(bytes) hash.SetBytes(bytes)
block := node.blockchain.GetBlockByHash(hash) block := node.Blockchain().GetBlockByHash(hash)
if block == nil { if block == nil {
continue continue
} }
@ -220,7 +228,7 @@ func (node *Node) CalculateResponse(request *downloader_pb.DownloaderRequest) (*
} }
case downloader_pb.DownloaderRequest_BLOCKHEIGHT: case downloader_pb.DownloaderRequest_BLOCKHEIGHT:
response.BlockHeight = node.blockchain.CurrentBlock().NumberU64() response.BlockHeight = node.Blockchain().CurrentBlock().NumberU64()
// this is the out of sync node acts as grpc server side // this is the out of sync node acts as grpc server side
case downloader_pb.DownloaderRequest_NEWBLOCK: case downloader_pb.DownloaderRequest_NEWBLOCK:

@ -7,8 +7,10 @@ import (
"time" "time"
bls2 "github.com/harmony-one/harmony/crypto/bls" bls2 "github.com/harmony-one/harmony/crypto/bls"
"github.com/harmony-one/harmony/internal/shardchain"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
"github.com/harmony-one/harmony/drand" "github.com/harmony-one/harmony/drand"
proto_discovery "github.com/harmony-one/harmony/api/proto/discovery" proto_discovery "github.com/harmony-one/harmony/api/proto/discovery"
@ -19,6 +21,8 @@ import (
"github.com/harmony-one/harmony/p2p/p2pimpl" "github.com/harmony-one/harmony/p2p/p2pimpl"
) )
var testDBFactory = &shardchain.MemDBFactory{}
func TestNewNode(t *testing.T) { func TestNewNode(t *testing.T) {
pubKey := bls2.RandPrivateKey().GetPublicKey() pubKey := bls2.RandPrivateKey().GetPublicKey()
leader := p2p.Peer{IP: "127.0.0.1", Port: "8882", ConsensusPubKey: pubKey} leader := p2p.Peer{IP: "127.0.0.1", Port: "8882", ConsensusPubKey: pubKey}
@ -31,16 +35,16 @@ func TestNewNode(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Cannot craeate consensus: %v", err) t.Fatalf("Cannot craeate consensus: %v", err)
} }
node := New(host, consensus, nil, false) node := New(host, consensus, testDBFactory, false)
if node.Consensus == nil { if node.Consensus == nil {
t.Error("Consensus is not initialized for the node") t.Error("Consensus is not initialized for the node")
} }
if node.blockchain == nil { if node.Blockchain() == nil {
t.Error("Blockchain is not initialized for the node") t.Error("Blockchain is not initialized for the node")
} }
if node.blockchain.CurrentBlock() == nil { if node.Blockchain().CurrentBlock() == nil {
t.Error("Genesis block is not initialized for the node") t.Error("Genesis block is not initialized for the node")
} }
} }
@ -58,7 +62,7 @@ func TestGetSyncingPeers(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Cannot craeate consensus: %v", err) t.Fatalf("Cannot craeate consensus: %v", err)
} }
node := New(host, consensus, nil, false) node := New(host, consensus, testDBFactory, false)
peer := p2p.Peer{IP: "127.0.0.1", Port: "8000"} peer := p2p.Peer{IP: "127.0.0.1", Port: "8000"}
peer2 := p2p.Peer{IP: "127.0.0.1", Port: "8001"} peer2 := p2p.Peer{IP: "127.0.0.1", Port: "8001"}
node.Neighbors.Store("minh", peer) node.Neighbors.Store("minh", peer)
@ -102,7 +106,7 @@ func TestAddPeers(t *testing.T) {
} }
dRand := drand.New(host, 0, []p2p.Peer{leader, validator}, leader, nil, nil) dRand := drand.New(host, 0, []p2p.Peer{leader, validator}, leader, nil, nil)
node := New(host, consensus, nil, false) node := New(host, consensus, testDBFactory, false)
node.DRand = dRand node.DRand = dRand
r1 := node.AddPeers(peers1) r1 := node.AddPeers(peers1)
e1 := 2 e1 := 2
@ -148,7 +152,7 @@ func TestAddBeaconPeer(t *testing.T) {
} }
dRand := drand.New(host, 0, []p2p.Peer{leader, validator}, leader, nil, nil) dRand := drand.New(host, 0, []p2p.Peer{leader, validator}, leader, nil, nil)
node := New(host, consensus, nil, false) node := New(host, consensus, testDBFactory, false)
node.DRand = dRand node.DRand = dRand
for _, p := range peers1 { for _, p := range peers1 {
ret := node.AddBeaconPeer(p) ret := node.AddBeaconPeer(p)
@ -220,7 +224,7 @@ func TestPingPongHandler(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Cannot craeate consensus: %v", err) t.Fatalf("Cannot craeate consensus: %v", err)
} }
node := New(host, consensus, nil, false) node := New(host, consensus, testDBFactory, false)
//go sendPingMessage(leader) //go sendPingMessage(leader)
go sendPongMessage(node, leader) go sendPongMessage(node, leader)
go exitServer() go exitServer()

@ -42,7 +42,7 @@ var (
// StartRPC start RPC service // StartRPC start RPC service
func (node *Node) StartRPC(nodePort string) error { func (node *Node) StartRPC(nodePort string) error {
// Gather all the possible APIs to surface // Gather all the possible APIs to surface
apiBackend = core.NewBackend(node.blockchain, node.TxPool, node.accountManager) apiBackend = core.NewBackend(node.Blockchain(), node.TxPool, node.accountManager)
apis := hmyapi.GetAPIs(apiBackend) apis := hmyapi.GetAPIs(apiBackend)
for _, service := range node.serviceManager.GetServices() { for _, service := range node.serviceManager.GetServices() {

@ -37,14 +37,14 @@ func (node *Node) setupForShardLeader() {
// Register new block service. // Register new block service.
node.serviceManager.RegisterService(service.BlockProposal, blockproposal.New(node.Consensus.ReadySignal, node.WaitForConsensusReadyv2)) node.serviceManager.RegisterService(service.BlockProposal, blockproposal.New(node.Consensus.ReadySignal, node.WaitForConsensusReadyv2))
// Register client support service. // Register client support service.
node.serviceManager.RegisterService(service.ClientSupport, clientsupport.New(node.blockchain.State, node.CallFaucetContract, node.getDeployedStakingContract, node.SelfPeer.IP, node.SelfPeer.Port)) node.serviceManager.RegisterService(service.ClientSupport, clientsupport.New(node.Blockchain().State, node.CallFaucetContract, node.getDeployedStakingContract, node.SelfPeer.IP, node.SelfPeer.Port))
} }
func (node *Node) setupForShardValidator() { func (node *Node) setupForShardValidator() {
nodeConfig, chanPeer := node.initNodeConfiguration() nodeConfig, chanPeer := node.initNodeConfiguration()
// Register client support service. // Register client support service.
node.serviceManager.RegisterService(service.ClientSupport, clientsupport.New(node.blockchain.State, node.CallFaucetContract, node.getDeployedStakingContract, node.SelfPeer.IP, node.SelfPeer.Port)) node.serviceManager.RegisterService(service.ClientSupport, clientsupport.New(node.Blockchain().State, node.CallFaucetContract, node.getDeployedStakingContract, node.SelfPeer.IP, node.SelfPeer.Port))
// Register peer discovery service. "0" is the beacon shard ID. No need to do staking for beacon chain node. // Register peer discovery service. "0" is the beacon shard ID. No need to do staking for beacon chain node.
node.serviceManager.RegisterService(service.PeerDiscovery, discovery.New(node.host, nodeConfig, chanPeer, node.AddBeaconPeer)) node.serviceManager.RegisterService(service.PeerDiscovery, discovery.New(node.host, nodeConfig, chanPeer, node.AddBeaconPeer))
// Register networkinfo service. "0" is the beacon shard ID // Register networkinfo service. "0" is the beacon shard ID
@ -69,7 +69,7 @@ func (node *Node) setupForBeaconLeader() {
// Register new block service. // Register new block service.
node.serviceManager.RegisterService(service.BlockProposal, blockproposal.New(node.Consensus.ReadySignal, node.WaitForConsensusReadyv2)) node.serviceManager.RegisterService(service.BlockProposal, blockproposal.New(node.Consensus.ReadySignal, node.WaitForConsensusReadyv2))
// Register client support service. // Register client support service.
node.serviceManager.RegisterService(service.ClientSupport, clientsupport.New(node.blockchain.State, node.CallFaucetContract, node.getDeployedStakingContract, node.SelfPeer.IP, node.SelfPeer.Port)) node.serviceManager.RegisterService(service.ClientSupport, clientsupport.New(node.Blockchain().State, node.CallFaucetContract, node.getDeployedStakingContract, node.SelfPeer.IP, node.SelfPeer.Port))
// TODO(minhdoan): We will remove the old client support and use the new client support which uses new message protocol. // TODO(minhdoan): We will remove the old client support and use the new client support which uses new message protocol.
// Register client new support service. // Register client new support service.
node.serviceManager.RegisterService(service.RestClientSupport, restclientsupport.New( node.serviceManager.RegisterService(service.RestClientSupport, restclientsupport.New(
@ -86,7 +86,7 @@ func (node *Node) setupForBeaconValidator() {
nodeConfig, chanPeer := node.initNodeConfiguration() nodeConfig, chanPeer := node.initNodeConfiguration()
// Register client support service. // Register client support service.
node.serviceManager.RegisterService(service.ClientSupport, clientsupport.New(node.blockchain.State, node.CallFaucetContract, node.getDeployedStakingContract, node.SelfPeer.IP, node.SelfPeer.Port)) node.serviceManager.RegisterService(service.ClientSupport, clientsupport.New(node.Blockchain().State, node.CallFaucetContract, node.getDeployedStakingContract, node.SelfPeer.IP, node.SelfPeer.Port))
// Register peer discovery service. No need to do staking for beacon chain node. // Register peer discovery service. No need to do staking for beacon chain node.
node.serviceManager.RegisterService(service.PeerDiscovery, discovery.New(node.host, nodeConfig, chanPeer, nil)) node.serviceManager.RegisterService(service.PeerDiscovery, discovery.New(node.host, nodeConfig, chanPeer, nil))
// Register networkinfo service. // Register networkinfo service.
@ -104,7 +104,7 @@ func (node *Node) setupForNewNode() {
nodeConfig, chanPeer := node.initNodeConfiguration() nodeConfig, chanPeer := node.initNodeConfiguration()
// Register staking service. // Register staking service.
node.serviceManager.RegisterService(service.Staking, staking.New(node.host, node.StakingAccount, node.beaconChain, node.NodeConfig.ConsensusPubKey)) node.serviceManager.RegisterService(service.Staking, staking.New(node.host, node.StakingAccount, node.Beaconchain(), node.NodeConfig.ConsensusPubKey))
// Register peer discovery service. "0" is the beacon shard ID // Register peer discovery service. "0" is the beacon shard ID
node.serviceManager.RegisterService(service.PeerDiscovery, discovery.New(node.host, nodeConfig, chanPeer, node.AddBeaconPeer)) node.serviceManager.RegisterService(service.PeerDiscovery, discovery.New(node.host, nodeConfig, chanPeer, node.AddBeaconPeer))
// Register networkinfo service. "0" is the beacon shard ID // Register networkinfo service. "0" is the beacon shard ID

@ -41,7 +41,7 @@ func (node *Node) UpdateStakingList(stakeInfoReturnValue *structs.StakeInfoRetur
lockPeriodCount := stakeInfoReturnValue.LockPeriodCounts[i] lockPeriodCount := stakeInfoReturnValue.LockPeriodCounts[i]
startEpoch := core.GetEpochFromBlockNumber(blockNum.Uint64()) startEpoch := core.GetEpochFromBlockNumber(blockNum.Uint64())
curEpoch := core.GetEpochFromBlockNumber(node.blockchain.CurrentBlock().NumberU64()) curEpoch := core.GetEpochFromBlockNumber(node.Blockchain().CurrentBlock().NumberU64())
if startEpoch == curEpoch { if startEpoch == curEpoch {
continue // The token are counted into stakes at the beginning of next epoch. continue // The token are counted into stakes at the beginning of next epoch.

@ -37,7 +37,7 @@ func TestUpdateStakingList(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Cannot craeate consensus: %v", err) t.Fatalf("Cannot craeate consensus: %v", err)
} }
node := New(host, consensus, nil, false) node := New(host, consensus, testDBFactory, false)
for i := 0; i < 5; i++ { for i := 0; i < 5; i++ {
selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock) selectedTxs := node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock)

@ -8,11 +8,13 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
consensus_engine "github.com/harmony-one/harmony/consensus/engine" consensus_engine "github.com/harmony-one/harmony/consensus/engine"
"github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/state" "github.com/harmony-one/harmony/core/state"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/core/vm" "github.com/harmony-one/harmony/core/vm"
"github.com/harmony-one/harmony/internal/ctxerror"
) )
// environment is the worker's current environment and holds all of the current state information. // environment is the worker's current environment and holds all of the current state information.
@ -110,11 +112,18 @@ func (w *Worker) UpdateCurrent() error {
parent := w.chain.CurrentBlock() parent := w.chain.CurrentBlock()
num := parent.Number() num := parent.Number()
timestamp := time.Now().Unix() timestamp := time.Now().Unix()
// New block's epoch is the same as parent's...
epoch := new(big.Int).Set(parent.Header().Epoch)
if len(parent.Header().ShardState) > 0 {
// ... except if parent has a resharding assignment it increases by 1.
epoch = epoch.Add(epoch, common.Big1)
}
header := &types.Header{ header := &types.Header{
ParentHash: parent.Hash(), ParentHash: parent.Hash(),
Number: num.Add(num, common.Big1), Number: num.Add(num, common.Big1),
GasLimit: core.CalcGasLimit(parent, w.gasFloor, w.gasCeil), GasLimit: core.CalcGasLimit(parent, w.gasFloor, w.gasCeil),
Time: big.NewInt(timestamp), Time: big.NewInt(timestamp),
Epoch: epoch,
ShardID: w.chain.ShardID(), ShardID: w.chain.ShardID(),
} }
return w.makeCurrent(parent, header) return w.makeCurrent(parent, header)
@ -150,7 +159,7 @@ func (w *Worker) Commit() (*types.Block, error) {
s := w.current.state.Copy() s := w.current.state.Copy()
block, err := w.engine.Finalize(w.chain, w.current.header, s, w.current.txs, w.current.receipts) block, err := w.engine.Finalize(w.chain, w.current.header, s, w.current.txs, w.current.receipts)
if err != nil { if err != nil {
return nil, err return nil, ctxerror.New("cannot finalize block").WithCause(err)
} }
return block, nil return block, nil
} }
@ -170,11 +179,18 @@ func New(config *params.ChainConfig, chain *core.BlockChain, engine consensus_en
parent := worker.chain.CurrentBlock() parent := worker.chain.CurrentBlock()
num := parent.Number() num := parent.Number()
timestamp := time.Now().Unix() timestamp := time.Now().Unix()
// New block's epoch is the same as parent's...
epoch := new(big.Int).Set(parent.Header().Epoch)
if len(parent.Header().ShardState) > 0 {
// ... except if parent has a resharding assignment it increases by 1.
epoch = epoch.Add(epoch, common.Big1)
}
header := &types.Header{ header := &types.Header{
ParentHash: parent.Hash(), ParentHash: parent.Hash(),
Number: num.Add(num, common.Big1), Number: num.Add(num, common.Big1),
GasLimit: core.CalcGasLimit(parent, worker.gasFloor, worker.gasCeil), GasLimit: core.CalcGasLimit(parent, worker.gasFloor, worker.gasCeil),
Time: big.NewInt(timestamp), Time: big.NewInt(timestamp),
Epoch: epoch,
ShardID: worker.chain.ShardID(), ShardID: worker.chain.ShardID(),
} }
worker.makeCurrent(parent, header) worker.makeCurrent(parent, header)

@ -69,7 +69,7 @@ EOU
exit 0 exit 0
} }
DB= DB=false
TXGEN=true TXGEN=true
DURATION= DURATION=
MIN=5 MIN=5
@ -80,7 +80,7 @@ DRYRUN=
while getopts "hdtD:m:s:nS" option; do while getopts "hdtD:m:s:nS" option; do
case $option in case $option in
h) usage ;; h) usage ;;
d) DB='-db_supported' ;; d) DB=true ;;
t) TXGEN=false ;; t) TXGEN=false ;;
D) DURATION=$OPTARG ;; D) DURATION=$OPTARG ;;
m) MIN=$OPTARG ;; m) MIN=$OPTARG ;;
@ -131,9 +131,15 @@ echo "launching boot node ..."
$DRYRUN $ROOT/bin/bootnode -port 19876 > $log_folder/bootnode.log 2>&1 | tee -a $LOG_FILE & $DRYRUN $ROOT/bin/bootnode -port 19876 > $log_folder/bootnode.log 2>&1 | tee -a $LOG_FILE &
sleep 1 sleep 1
BN_MA=$(grep "BN_MA" $log_folder/bootnode.log | awk -F\= ' { print $2 } ') BN_MA=$(grep "BN_MA" $log_folder/bootnode.log | awk -F\= ' { print $2 } ')
HMY_OPT2=" -bootnodes $BN_MA"
echo "bootnode launched." + " $BN_MA" echo "bootnode launched." + " $BN_MA"
HMY_OPT3=" -is_genesis"
unset -v base_args
declare -a base_args args
base_args=(-log_folder "${log_folder}" -min_peers "${MIN}" -bootnodes "${BN_MA}")
if "${DB}"
then
base_args=("${base_args[@]}" -db_supported)
fi
NUM_NN=0 NUM_NN=0
@ -143,27 +149,20 @@ sleep 2
i=0 i=0
while IFS='' read -r line || [[ -n "$line" ]]; do while IFS='' read -r line || [[ -n "$line" ]]; do
IFS=' ' read ip port mode shardID <<< $line IFS=' ' read ip port mode shardID <<< $line
if [ "$mode" == "leader" ]; then args=("${base_args[@]}" -ip "${ip}" -port "${port}" -account_index "${i}" -key "/tmp/${ip}-${port}.key" -db_dir "db-${ip}-${port}")
echo "launching leader ..." case "${mode}" in
$DRYRUN $ROOT/bin/harmony -ip $ip -port $port -log_folder $log_folder $DB -account_index $i -min_peers $MIN $HMY_OPT2 $HMY_OPT3 -key /tmp/$ip-$port.key -is_leader 2>&1 | tee -a $LOG_FILE & leader*|validator*) args=("${args[@]}" -is_genesis);;
fi esac
if [ "$mode" == "leader_archival" ]; then case "${mode}" in leader*) args=("${args[@]}" -is_leader);; esac
echo "launching leader ..." case "${mode}" in *archival|archival) args=("${args[@]}" -is_archival);; esac
$DRYRUN $ROOT/bin/harmony -ip $ip -port $port -log_folder $log_folder $DB -account_index $i -min_peers $MIN $HMY_OPT2 -key /tmp/$ip-$port.key -is_leader -is_archival 2>&1 | tee -a $LOG_FILE & case "${mode}" in
fi newnode)
if [ "$mode" == "validator" ]; then "${SYNC}" || continue
echo "launching validator ..." sleep "${NUM_NN}"
$DRYRUN $ROOT/bin/harmony -ip $ip -port $port -log_folder $log_folder $DB -account_index $i -min_peers $MIN $HMY_OPT2 $HMY_OPT3 -key /tmp/$ip-$port.key 2>&1 | tee -a $LOG_FILE & NUM_NN=$((${NUM_NN} + 30))
fi ;;
if [ "$mode" == "archival" ]; then esac
echo "launching archival node ... wait" $DRYRUN "${ROOT}/bin/harmony" "${args[@]}" 2>&1 | tee -a "${LOG_FILE}" &
$DRYRUN $ROOT/bin/harmony -ip $ip -port $port -log_folder $log_folder $DB -account_index $i -min_peers $MIN $HMY_OPT2 -key /tmp/$ip-$port.key -is_archival 2>&1 | tee -a $LOG_FILE &
fi
if [[ "$mode" == "newnode" && "$SYNC" == "true" ]]; then
(( NUM_NN += 30 ))
echo "launching new node ..."
(sleep $NUM_NN; $DRYRUN $ROOT/bin/harmony -ip $ip -port $port -log_folder $log_folder $DB -account_index $i -min_peers $MIN $HMY_OPT2 -key /tmp/$ip-$port.key 2>&1 | tee -a $LOG_FILE ) &
fi
i=$((i+1)) i=$((i+1))
done < $config done < $config
@ -173,7 +172,7 @@ if [ "$TXGEN" == "true" ]; then
line=$(grep client $config) line=$(grep client $config)
IFS=' ' read ip port mode shardID <<< $line IFS=' ' read ip port mode shardID <<< $line
if [ "$mode" == "client" ]; then if [ "$mode" == "client" ]; then
$DRYRUN $ROOT/bin/txgen -log_folder $log_folder -duration $DURATION -ip $ip -port $port $HMY_OPT2 2>&1 | tee -a $LOG_FILE $DRYRUN $ROOT/bin/txgen -log_folder $log_folder -duration $DURATION -ip $ip -port $port -bootnodes "${BN_MA}" > $LOG_FILE 2>&1
fi fi
else else
sleep $DURATION sleep $DURATION

Loading…
Cancel
Save