|
|
|
|
@ -13,12 +13,13 @@ import ( |
|
|
|
|
|
|
|
|
|
// CrossLink is only used on beacon chain to store the hash links from other shards
|
|
|
|
|
// signature and bitmap correspond to |blockNumber|parentHash| byte array
|
|
|
|
|
// Captial to enable rlp encoding
|
|
|
|
|
// Capital to enable rlp encoding
|
|
|
|
|
// Here we replace header to signatures only, the basic assumption is the committee will not be
|
|
|
|
|
// corrupted during one epoch, which is the same as consensus assumption
|
|
|
|
|
type CrossLink struct { |
|
|
|
|
HashF common.Hash |
|
|
|
|
BlockNumberF *big.Int |
|
|
|
|
ViewIDF *big.Int |
|
|
|
|
SignatureF [96]byte //aggregated signature
|
|
|
|
|
BitmapF []byte //corresponding bitmap mask for agg signature
|
|
|
|
|
ShardIDF uint32 //will be verified with signature on |blockNumber|blockHash| is correct
|
|
|
|
|
@ -26,56 +27,72 @@ type CrossLink struct { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// NewCrossLink returns a new cross link object
|
|
|
|
|
// epoch is the parentHeader's epoch
|
|
|
|
|
func NewCrossLink(header *block.Header, epoch *big.Int) CrossLink { |
|
|
|
|
func NewCrossLink(header *block.Header, parentHeader *block.Header) *CrossLink { |
|
|
|
|
parentBlockNum := big.NewInt(0) |
|
|
|
|
if header.Number().Uint64() == 0 { // should not happend, just to be defensive
|
|
|
|
|
return CrossLink{header.ParentHash(), parentBlockNum, header.LastCommitSignature(), header.LastCommitBitmap(), header.ShardID(), epoch} |
|
|
|
|
parentViewID := big.NewInt(0) |
|
|
|
|
parentEpoch := big.NewInt(0) |
|
|
|
|
if parentHeader != nil { // Should always happen, default values to be defensive.
|
|
|
|
|
parentBlockNum = parentHeader.Number() |
|
|
|
|
parentViewID = parentHeader.ViewID() |
|
|
|
|
parentEpoch = parentHeader.Epoch() |
|
|
|
|
} |
|
|
|
|
return &CrossLink{ |
|
|
|
|
HashF: header.ParentHash(), |
|
|
|
|
BlockNumberF: parentBlockNum, |
|
|
|
|
ViewIDF: parentViewID, |
|
|
|
|
SignatureF: header.LastCommitSignature(), |
|
|
|
|
BitmapF: header.LastCommitBitmap(), |
|
|
|
|
ShardIDF: header.ShardID(), |
|
|
|
|
EpochF: parentEpoch, |
|
|
|
|
} |
|
|
|
|
parentBlockNum.Sub(header.Number(), big.NewInt(1)) |
|
|
|
|
return CrossLink{header.ParentHash(), parentBlockNum, header.LastCommitSignature(), header.LastCommitBitmap(), header.ShardID(), epoch} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// ShardID returns shardID
|
|
|
|
|
func (cl CrossLink) ShardID() uint32 { |
|
|
|
|
func (cl *CrossLink) ShardID() uint32 { |
|
|
|
|
return cl.ShardIDF |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Number returns blockNum with big.Int format
|
|
|
|
|
func (cl CrossLink) Number() *big.Int { |
|
|
|
|
func (cl *CrossLink) Number() *big.Int { |
|
|
|
|
return cl.BlockNumberF |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// ViewID returns viewID with big.Int format
|
|
|
|
|
func (cl *CrossLink) ViewID() *big.Int { |
|
|
|
|
return cl.ViewIDF |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Epoch returns epoch with big.Int format
|
|
|
|
|
func (cl CrossLink) Epoch() *big.Int { |
|
|
|
|
func (cl *CrossLink) Epoch() *big.Int { |
|
|
|
|
return cl.EpochF |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// BlockNum returns blockNum
|
|
|
|
|
func (cl CrossLink) BlockNum() uint64 { |
|
|
|
|
func (cl *CrossLink) BlockNum() uint64 { |
|
|
|
|
return cl.BlockNumberF.Uint64() |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Hash returns hash
|
|
|
|
|
func (cl CrossLink) Hash() common.Hash { |
|
|
|
|
func (cl *CrossLink) Hash() common.Hash { |
|
|
|
|
return cl.HashF |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Bitmap returns bitmap
|
|
|
|
|
func (cl CrossLink) Bitmap() []byte { |
|
|
|
|
func (cl *CrossLink) Bitmap() []byte { |
|
|
|
|
return cl.BitmapF |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Signature returns aggregated signature
|
|
|
|
|
func (cl CrossLink) Signature() [96]byte { |
|
|
|
|
func (cl *CrossLink) Signature() [96]byte { |
|
|
|
|
return cl.SignatureF |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// MarshalJSON ..
|
|
|
|
|
func (cl CrossLink) MarshalJSON() ([]byte, error) { |
|
|
|
|
func (cl *CrossLink) MarshalJSON() ([]byte, error) { |
|
|
|
|
return json.Marshal(struct { |
|
|
|
|
Hash common.Hash `json:"hash"` |
|
|
|
|
BlockNumber *big.Int `json:"block-number"` |
|
|
|
|
ViewID *big.Int `json:"view-id"` |
|
|
|
|
Signature string `json:"signature"` |
|
|
|
|
Bitmap string `json:"signature-bitmap"` |
|
|
|
|
ShardID uint32 `json:"shard-id"` |
|
|
|
|
@ -83,6 +100,7 @@ func (cl CrossLink) MarshalJSON() ([]byte, error) { |
|
|
|
|
}{ |
|
|
|
|
cl.HashF, |
|
|
|
|
cl.BlockNumberF, |
|
|
|
|
cl.ViewIDF, |
|
|
|
|
hex.EncodeToString(cl.SignatureF[:]), |
|
|
|
|
hex.EncodeToString(cl.BitmapF), |
|
|
|
|
cl.ShardIDF, |
|
|
|
|
@ -91,7 +109,7 @@ func (cl CrossLink) MarshalJSON() ([]byte, error) { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Serialize returns bytes of cross link rlp-encoded content
|
|
|
|
|
func (cl CrossLink) Serialize() []byte { |
|
|
|
|
func (cl *CrossLink) Serialize() []byte { |
|
|
|
|
bytes, _ := rlp.EncodeToBytes(cl) |
|
|
|
|
return bytes |
|
|
|
|
} |
|
|
|
|
@ -109,16 +127,20 @@ func DeserializeCrossLink(bytes []byte) (*CrossLink, error) { |
|
|
|
|
// CrossLinks is a collection of cross links
|
|
|
|
|
type CrossLinks []CrossLink |
|
|
|
|
|
|
|
|
|
// Sort crosslinks by shardID and then by blockNum
|
|
|
|
|
// Sort crosslinks by shardID and then tie break by blockNum then by viewID
|
|
|
|
|
func (cls CrossLinks) Sort() { |
|
|
|
|
sort.Slice(cls, func(i, j int) bool { |
|
|
|
|
return cls[i].ShardID() < cls[j].ShardID() || (cls[i].ShardID() == cls[j].ShardID() && cls[i].Number().Cmp(cls[j].Number()) < 0) |
|
|
|
|
return cls[i].ShardID() < cls[j].ShardID() || |
|
|
|
|
(cls[i].ShardID() == cls[j].ShardID() && cls[i].Number().Cmp(cls[j].Number()) < 0) || |
|
|
|
|
(cls[i].ShardID() == cls[j].ShardID() && cls[i].Number() == cls[j].Number() && cls[i].ViewID().Cmp(cls[j].ViewID()) < 0) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// IsSorted checks whether the cross links are sorted
|
|
|
|
|
func (cls CrossLinks) IsSorted() bool { |
|
|
|
|
return sort.SliceIsSorted(cls, func(i, j int) bool { |
|
|
|
|
return cls[i].ShardID() < cls[j].ShardID() || (cls[i].ShardID() == cls[j].ShardID() && cls[i].Number().Cmp(cls[j].Number()) < 0) |
|
|
|
|
return cls[i].ShardID() < cls[j].ShardID() || |
|
|
|
|
(cls[i].ShardID() == cls[j].ShardID() && cls[i].Number().Cmp(cls[j].Number()) < 0) || |
|
|
|
|
(cls[i].ShardID() == cls[j].ShardID() && cls[i].Number() == cls[j].Number() && cls[i].ViewID().Cmp(cls[j].ViewID()) < 0) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
Daniel Van Der Maden
5 years ago
committed by
GitHub