Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core/vm: Add Venoki header's fields when verify double sign #639

Merged
merged 1 commit into from
Dec 10, 2024
Merged

core/vm: Add Venoki header's fields when verify double sign #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 172 additions & 26 deletions core/types/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,39 @@ func (n *BlockNonce) UnmarshalText(input []byte) error {
return hexutil.UnmarshalFixedText("BlockNonce", input, n[:])
}

// BlockHeader is used for consortium precompiled contracts
type BlockHeader struct {
ChainId *big.Int `abi:"chainId"`
ParentHash [32]uint8 `abi:"parentHash"`
OmmersHash [32]uint8 `abi:"ommersHash"`
Benificiary common.Address `abi:"coinbase"`
StateRoot [32]uint8 `abi:"stateRoot"`
TransactionsRoot [32]uint8 `abi:"transactionsRoot"`
ReceiptsRoot [32]uint8 `abi:"receiptsRoot"`
LogsBloom [256]uint8 `abi:"logsBloom"`
Difficulty *big.Int `abi:"difficulty"`
Number *big.Int `abi:"number"`
GasLimit uint64 `abi:"gasLimit"`
GasUsed uint64 `abi:"gasUsed"`
Timestamp uint64 `abi:"timestamp"`
ExtraData []byte `abi:"extraData"`
MixHash [32]uint8 `abi:"mixHash"`
Nonce uint64 `abi:"nonce"`
}
type BlockHeader interface {
GetNumber() *big.Int
GetChainId() *big.Int
GetExtraData() []byte
GetBenificiary() common.Address
ToHeader() *Header
Bytes(verifyHeadersAbi string, methodName string) ([]byte, error)
}

// FromHeader creates a BlockHeader from a Header, this due to the lack of null or optional fields in the abi package
func FromHeader(header *Header, chainId *big.Int, isVenoki bool) BlockHeader {
if !isVenoki {
blockHeader := &BlockHeaderV1{
ChainId: chainId,
Difficulty: header.Difficulty,
Number: header.Number,
GasLimit: header.GasLimit,
GasUsed: header.GasUsed,
Timestamp: header.Time,
Nonce: header.Nonce.Uint64(),
ExtraData: header.Extra,
LogsBloom: header.Bloom,
Benificiary: header.Coinbase,
}
copy(blockHeader.ParentHash[:], header.ParentHash.Bytes())
copy(blockHeader.StateRoot[:], header.Root.Bytes())
copy(blockHeader.TransactionsRoot[:], header.TxHash.Bytes())
copy(blockHeader.ReceiptsRoot[:], header.ReceiptHash.Bytes())
copy(blockHeader.MixHash[:], header.MixDigest.Bytes())
return blockHeader
}

func FromHeader(header *Header, chainId *big.Int) *BlockHeader {
blockHeader := &BlockHeader{
blockHeader := &BlockHeaderV2{
ChainId: chainId,
Difficulty: header.Difficulty,
Number: header.Number,
Expand All @@ -98,20 +109,64 @@ func FromHeader(header *Header, chainId *big.Int) *BlockHeader {
ExtraData: header.Extra,
LogsBloom: header.Bloom,
Benificiary: header.Coinbase,
BaseFee: header.BaseFee,
}
copy(blockHeader.ParentHash[:], header.ParentHash.Bytes())
copy(blockHeader.StateRoot[:], header.Root.Bytes())
copy(blockHeader.TransactionsRoot[:], header.TxHash.Bytes())
copy(blockHeader.ReceiptsRoot[:], header.ReceiptHash.Bytes())
copy(blockHeader.MixHash[:], header.MixDigest.Bytes())
if header.BlobGasUsed != nil {
blockHeader.BlobGasUsed = *header.BlobGasUsed
}
if header.ExcessBlobGas != nil {
blockHeader.ExcessBlobGas = *header.ExcessBlobGas
}
return blockHeader
}

func (b *BlockHeader) Bytes(consortiumVerifyHeadersAbi string, methodName string) ([]byte, error) {
// BlockHeaderV1 is used for consortium precompiled contracts
type BlockHeaderV1 struct {
ChainId *big.Int `abi:"chainId"`
ParentHash [32]uint8 `abi:"parentHash"`
OmmersHash [32]uint8 `abi:"ommersHash"`
Benificiary common.Address `abi:"coinbase"`
StateRoot [32]uint8 `abi:"stateRoot"`
TransactionsRoot [32]uint8 `abi:"transactionsRoot"`
ReceiptsRoot [32]uint8 `abi:"receiptsRoot"`
LogsBloom [256]uint8 `abi:"logsBloom"`
Difficulty *big.Int `abi:"difficulty"`
Number *big.Int `abi:"number"`
GasLimit uint64 `abi:"gasLimit"`
GasUsed uint64 `abi:"gasUsed"`
Timestamp uint64 `abi:"timestamp"`
ExtraData []byte `abi:"extraData"`
MixHash [32]uint8 `abi:"mixHash"`
Nonce uint64 `abi:"nonce"`
}

func (b *BlockHeaderV1) GetNumber() *big.Int {
return b.Number
}

func (b *BlockHeaderV1) GetChainId() *big.Int {
return b.ChainId
}

func (b *BlockHeaderV1) GetExtraData() []byte {
return b.ExtraData
}

func (b *BlockHeaderV1) GetBenificiary() common.Address {
return b.Benificiary
}

func (b *BlockHeaderV1) Bytes(consortiumVerifyHeadersAbi string, methodName string) ([]byte, error) {
pAbi, _ := abi.JSON(strings.NewReader(consortiumVerifyHeadersAbi))
bloom := BytesToBloom(b.LogsBloom[:])
var uncles [32]uint8
return pAbi.Methods[methodName].Inputs.Pack(
var uncles [32]uint8 // this field only for POW

args := []any{
b.ChainId,
b.ParentHash,
uncles,
Expand All @@ -128,10 +183,11 @@ func (b *BlockHeader) Bytes(consortiumVerifyHeadersAbi string, methodName string
b.ExtraData,
b.MixHash,
b.Nonce,
)
}
return pAbi.Methods[methodName].Inputs.Pack(args...)
}

func (b *BlockHeader) ToHeader() *Header {
func (b *BlockHeaderV1) ToHeader() *Header {
return &Header{
ParentHash: common.BytesToHash(b.ParentHash[:]),
Root: common.BytesToHash(b.StateRoot[:]),
Expand All @@ -150,6 +206,96 @@ func (b *BlockHeader) ToHeader() *Header {
}
}

// BlockHeaderV2 is used for consortium precompiled contracts after Venoki hard fork
type BlockHeaderV2 struct {
ChainId *big.Int `abi:"chainId"`
ParentHash [32]uint8 `abi:"parentHash"`
OmmersHash [32]uint8 `abi:"ommersHash"`
Benificiary common.Address `abi:"coinbase"`
StateRoot [32]uint8 `abi:"stateRoot"`
TransactionsRoot [32]uint8 `abi:"transactionsRoot"`
ReceiptsRoot [32]uint8 `abi:"receiptsRoot"`
LogsBloom [256]uint8 `abi:"logsBloom"`
Difficulty *big.Int `abi:"difficulty"`
Number *big.Int `abi:"number"`
GasLimit uint64 `abi:"gasLimit"`
GasUsed uint64 `abi:"gasUsed"`
Timestamp uint64 `abi:"timestamp"`
ExtraData []byte `abi:"extraData"`
MixHash [32]uint8 `abi:"mixHash"`
Nonce uint64 `abi:"nonce"`
BaseFee *big.Int `abi:"baseFee"`
BlobGasUsed uint64 `abi:"blobGasUsed"`
ExcessBlobGas uint64 `abi:"excessBlobGas"`
}

func (b *BlockHeaderV2) GetNumber() *big.Int {
return b.Number
}

func (b *BlockHeaderV2) GetChainId() *big.Int {
return b.ChainId
}

func (b *BlockHeaderV2) GetExtraData() []byte {
return b.ExtraData
}

func (b *BlockHeaderV2) GetBenificiary() common.Address {
return b.Benificiary
}

func (b *BlockHeaderV2) Bytes(consortiumVerifyHeadersAbi string, methodName string) ([]byte, error) {
pAbi, _ := abi.JSON(strings.NewReader(consortiumVerifyHeadersAbi))
bloom := BytesToBloom(b.LogsBloom[:])
var uncles [32]uint8 // this field only for POW

args := []any{
b.ChainId,
b.ParentHash,
uncles,
b.Benificiary,
b.StateRoot,
b.TransactionsRoot,
b.ReceiptsRoot,
bloom.Bytes(),
b.Difficulty,
b.Number,
b.GasLimit,
b.GasUsed,
b.Timestamp,
b.ExtraData,
b.MixHash,
b.Nonce,
b.BaseFee,
b.BlobGasUsed,
b.ExcessBlobGas,
}
return pAbi.Methods[methodName].Inputs.Pack(args...)
}

func (b *BlockHeaderV2) ToHeader() *Header {
return &Header{
ParentHash: common.BytesToHash(b.ParentHash[:]),
Root: common.BytesToHash(b.StateRoot[:]),
TxHash: common.BytesToHash(b.TransactionsRoot[:]),
ReceiptHash: common.BytesToHash(b.ReceiptsRoot[:]),
Bloom: BytesToBloom(b.LogsBloom[:]),
Difficulty: b.Difficulty,
Number: b.Number,
GasLimit: b.GasLimit,
GasUsed: b.GasUsed,
Time: b.Timestamp,
Extra: b.ExtraData,
MixDigest: common.BytesToHash(b.MixHash[:]),
Nonce: EncodeNonce(b.Nonce),
Coinbase: b.Benificiary,
BaseFee: b.BaseFee,
BlobGasUsed: &b.BlobGasUsed,
ExcessBlobGas: &b.ExcessBlobGas,
}
}

//go:generate gencodec -type Header -field-override headerMarshaling -out gen_header_json.go

// Header represents a block header in the Ethereum blockchain.
Expand Down
Loading
Loading