|
|
|
@ -63,6 +63,7 @@ func (node *Node) validateNewShardState(block *types.Block) error { |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
|
|
|
|
utils.Logger().Error().Err(err).Msg("cannot calculate expected shard state") |
|
|
|
return ctxerror.New("cannot calculate expected shard state"). |
|
|
|
return ctxerror.New("cannot calculate expected shard state"). |
|
|
|
WithCause(err) |
|
|
|
WithCause(err) |
|
|
|
} |
|
|
|
} |
|
|
|
@ -73,8 +74,7 @@ func (node *Node) validateNewShardState(block *types.Block) error { |
|
|
|
// TODO ek/chao – calculated shard state is different even with the
|
|
|
|
// TODO ek/chao – calculated shard state is different even with the
|
|
|
|
// same input, i.e. it is nondeterministic.
|
|
|
|
// same input, i.e. it is nondeterministic.
|
|
|
|
// Don't treat this as a blocker until we fix the nondeterminism.
|
|
|
|
// Don't treat this as a blocker until we fix the nondeterminism.
|
|
|
|
//return err
|
|
|
|
utils.Logger().Warn().Err(err).Msg("shard state proposal is different from expected") |
|
|
|
ctxerror.Log15(utils.GetLogger().Warn, err) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// Regular validators fetch the local-shard copy on the beacon chain
|
|
|
|
// Regular validators fetch the local-shard copy on the beacon chain
|
|
|
|
@ -93,6 +93,7 @@ func (node *Node) validateNewShardState(block *types.Block) error { |
|
|
|
// Proposal to discontinue shard
|
|
|
|
// Proposal to discontinue shard
|
|
|
|
if expected != nil { |
|
|
|
if expected != nil { |
|
|
|
// TODO ek – invoke view change
|
|
|
|
// TODO ek – invoke view change
|
|
|
|
|
|
|
|
utils.Logger().Error().Msg("leader proposed to disband against beacon decision") |
|
|
|
return errors.New( |
|
|
|
return errors.New( |
|
|
|
"leader proposed to disband against beacon decision") |
|
|
|
"leader proposed to disband against beacon decision") |
|
|
|
} |
|
|
|
} |
|
|
|
@ -102,6 +103,10 @@ func (node *Node) validateNewShardState(block *types.Block) error { |
|
|
|
// Sanity check: Shard ID should match
|
|
|
|
// Sanity check: Shard ID should match
|
|
|
|
if proposed.ShardID != block.ShardID() { |
|
|
|
if proposed.ShardID != block.ShardID() { |
|
|
|
// TODO ek – invoke view change
|
|
|
|
// TODO ek – invoke view change
|
|
|
|
|
|
|
|
utils.Logger().Error(). |
|
|
|
|
|
|
|
Uint32("proposedShard", proposed.ShardID). |
|
|
|
|
|
|
|
Uint32("blockShard", block.ShardID()). |
|
|
|
|
|
|
|
Msg("proposal has incorrect shard ID") |
|
|
|
return ctxerror.New("proposal has incorrect shard ID", |
|
|
|
return ctxerror.New("proposal has incorrect shard ID", |
|
|
|
"proposedShard", proposed.ShardID, |
|
|
|
"proposedShard", proposed.ShardID, |
|
|
|
"blockShard", block.ShardID()) |
|
|
|
"blockShard", block.ShardID()) |
|
|
|
@ -109,6 +114,8 @@ func (node *Node) validateNewShardState(block *types.Block) error { |
|
|
|
// Did beaconchain say we are no more?
|
|
|
|
// Did beaconchain say we are no more?
|
|
|
|
if expected == nil { |
|
|
|
if expected == nil { |
|
|
|
// TODO ek – invoke view change
|
|
|
|
// TODO ek – invoke view change
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
utils.Logger().Error().Msg("leader proposed to continue against beacon decision") |
|
|
|
return errors.New( |
|
|
|
return errors.New( |
|
|
|
"leader proposed to continue against beacon decision") |
|
|
|
"leader proposed to continue against beacon decision") |
|
|
|
} |
|
|
|
} |
|
|
|
@ -116,10 +123,14 @@ func (node *Node) validateNewShardState(block *types.Block) error { |
|
|
|
if shard.CompareCommittee(expected, &proposed) != 0 { |
|
|
|
if shard.CompareCommittee(expected, &proposed) != 0 { |
|
|
|
// TODO ek – log differences
|
|
|
|
// TODO ek – log differences
|
|
|
|
// TODO ek – invoke view change
|
|
|
|
// TODO ek – invoke view change
|
|
|
|
|
|
|
|
utils.Logger().Error().Msg("proposal differs from one in beacon chain") |
|
|
|
return errors.New("proposal differs from one in beacon chain") |
|
|
|
return errors.New("proposal differs from one in beacon chain") |
|
|
|
} |
|
|
|
} |
|
|
|
default: |
|
|
|
default: |
|
|
|
// TODO ek – invoke view change
|
|
|
|
// TODO ek – invoke view change
|
|
|
|
|
|
|
|
utils.Logger().Error(). |
|
|
|
|
|
|
|
Int("numShards", len(proposed)). |
|
|
|
|
|
|
|
Msg("regular resharding proposal has incorrect number of shards") |
|
|
|
return ctxerror.New( |
|
|
|
return ctxerror.New( |
|
|
|
"regular resharding proposal has incorrect number of shards", |
|
|
|
"regular resharding proposal has incorrect number of shards", |
|
|
|
"numShards", len(proposed)) |
|
|
|
"numShards", len(proposed)) |
|
|
|
@ -147,6 +158,7 @@ func (node *Node) broadcastEpochShardState(newBlock *types.Block) error { |
|
|
|
func (node *Node) epochShardStateMessageHandler(msgPayload []byte) error { |
|
|
|
func (node *Node) epochShardStateMessageHandler(msgPayload []byte) error { |
|
|
|
epochShardState, err := proto_node.DeserializeEpochShardStateFromMessage(msgPayload) |
|
|
|
epochShardState, err := proto_node.DeserializeEpochShardStateFromMessage(msgPayload) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
|
|
|
|
utils.Logger().Error().Err(err).Msg("Can't get shard state message") |
|
|
|
return ctxerror.New("Can't get shard state message").WithCause(err) |
|
|
|
return ctxerror.New("Can't get shard state message").WithCause(err) |
|
|
|
} |
|
|
|
} |
|
|
|
if node.Consensus == nil { |
|
|
|
if node.Consensus == nil { |
|
|
|
@ -171,6 +183,9 @@ func (node *Node) epochShardStateMessageHandler(msgPayload []byte) error { |
|
|
|
err = node.Beaconchain().WriteShardState( |
|
|
|
err = node.Beaconchain().WriteShardState( |
|
|
|
receivedEpoch, epochShardState.ShardState) |
|
|
|
receivedEpoch, epochShardState.ShardState) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
|
|
|
|
utils.Logger().Error(). |
|
|
|
|
|
|
|
Uint64("epoch", receivedEpoch.Uint64()). |
|
|
|
|
|
|
|
Err(err).Msg("cannot store shard state") |
|
|
|
return ctxerror.New("cannot store shard state", "epoch", receivedEpoch). |
|
|
|
return ctxerror.New("cannot store shard state", "epoch", receivedEpoch). |
|
|
|
WithCause(err) |
|
|
|
WithCause(err) |
|
|
|
} |
|
|
|
} |
|
|
|
|
flicker-harmony
5 years ago
committed by
GitHub