3038e480f5
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
61 lines
2.0 KiB
Go
61 lines
2.0 KiB
Go
// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
|
|
|
|
package catalyst
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
)
|
|
|
|
var _ = (*assembleBlockParamsMarshaling)(nil)
|
|
|
|
// MarshalJSON marshals as JSON.
|
|
func (a AssembleBlockParams) MarshalJSON() ([]byte, error) {
|
|
type AssembleBlockParams struct {
|
|
ParentHash common.Hash `json:"parentHash" gencodec:"required"`
|
|
Timestamp hexutil.Uint64 `json:"timestamp" gencodec:"required"`
|
|
Random common.Hash `json:"random" gencodec:"required"`
|
|
FeeRecipient common.Address `json:"feeRecipient" gencodec:"required"`
|
|
}
|
|
var enc AssembleBlockParams
|
|
enc.ParentHash = a.ParentHash
|
|
enc.Timestamp = hexutil.Uint64(a.Timestamp)
|
|
enc.Random = a.Random
|
|
enc.FeeRecipient = a.FeeRecipient
|
|
return json.Marshal(&enc)
|
|
}
|
|
|
|
// UnmarshalJSON unmarshals from JSON.
|
|
func (a *AssembleBlockParams) UnmarshalJSON(input []byte) error {
|
|
type AssembleBlockParams struct {
|
|
ParentHash *common.Hash `json:"parentHash" gencodec:"required"`
|
|
Timestamp *hexutil.Uint64 `json:"timestamp" gencodec:"required"`
|
|
Random *common.Hash `json:"random" gencodec:"required"`
|
|
FeeRecipient *common.Address `json:"feeRecipient" gencodec:"required"`
|
|
}
|
|
var dec AssembleBlockParams
|
|
if err := json.Unmarshal(input, &dec); err != nil {
|
|
return err
|
|
}
|
|
if dec.ParentHash == nil {
|
|
return errors.New("missing required field 'parentHash' for AssembleBlockParams")
|
|
}
|
|
a.ParentHash = *dec.ParentHash
|
|
if dec.Timestamp == nil {
|
|
return errors.New("missing required field 'timestamp' for AssembleBlockParams")
|
|
}
|
|
a.Timestamp = uint64(*dec.Timestamp)
|
|
if dec.Random == nil {
|
|
return errors.New("missing required field 'random' for AssembleBlockParams")
|
|
}
|
|
a.Random = *dec.Random
|
|
if dec.FeeRecipient == nil {
|
|
return errors.New("missing required field 'feeRecipient' for AssembleBlockParams")
|
|
}
|
|
a.FeeRecipient = *dec.FeeRecipient
|
|
return nil
|
|
}
|