mirror of
https://github.com/status-im/op-geth.git
synced 2025-02-20 18:48:25 +00:00
This commit squashes the op-geth fork history into a more maintainable diff for rebasing upon upstream geth. reference-optimistic-geth changes (origins of op-geth in early Bedrock development stage): - Deposit TX Type - Enable deposit tx in EVM/tx pool - Change deposit nonce to not be the max nonce - Extend PayloadAttributesV1 with a Transactions field - Force deposits at the start of each L2 block - Fix height check - noTxPool flag, reproduce block in verifier mode without tx pool interference - Fix RPC json marshalling (ref op-geth PR 4) - Deposit txs block height check in block body validation (ref op-geth PR 5) - core: do not try to reinject deposit txs into tx-pool (ref-op-geth PR 6) - deposit source hash field instead of L2 block height and tx index combination - Include invalid deposits, rewind state, but always persist mint (#10) - Provide gas to Call/Create in deposit transactions (#12) - Add docker builds (ref-op-geth PR 16, 17) - Don't panic on deposit transaction signature values or chain ID (ref-op-geth PR 18) - core: Add version to DepositTx (ref-op-geth PR 19) - Enable Geth build/lint/test in CircleCI (ref-op-geth PR 23) - core: Include guaranteed gas in the gas pool (ref-op-geth PR 21) - core: handle base fee, l1 availability fee, tx fee (ref-op-geth PR 27) - fix: deposit tx hash - fix l1 fee cache, rpc, tracing and tx pool - core: remove deposit-tx sub-type (a.k.a. deposit version byte) - eth/catalyst: allow engine user to reorg own chain - miner: restore ability to reorg deep as block builder - params: print Optimism consensus type in banner - core/types: remove unused protected() method, see upstream PR 23376 - core: do not mutate original balance value in tx pool l1 cost adjustment - core: subtract deposit gas from pool, so other txs do not use the same gas. And fail tx processing if deposits reach gas limit - core/types: deposits do not tip, avoid basefee subtraction - Unmeter the L1 Attributes Transaction - miner: handle force tx errors as critical, clean up diff - ci: Switch branch - eth,miner: return STATUS_INVALID when failing to process forced transactions in request (ref-op-geth PR 40) - verifier: forward tx to sequencer based on flag - txpool: add flag to disable tx gossip (ref-op-geth PR 42) - Add op-geth version in addition to geth version (ref-op-geth PR 43) - ci: CircleCI improvements (ref-op-geth PR 44) - Rename to op-geth - Build latest tag on optimism branch op-geth changes: - Expose cache config in simulated backend (#2) - Add EIP-1559 parameters - eth/catalyst: update payload id computation (#1) - make eip1559 configurable (#4) - post-merge network should not log warnings about missing transition information (#5) - Make the simulator more configurable (#6) - fix OPB-6 - IsDepositTx check instead of artificial nonce value check (#7) - Simulated backend - enable proof of stake consensus type and fix performance issue (#8) - accounts: simulated backend consensus engine option and immediate tx indexing - consensus/beacon: recognize all blocks as reached TTD with 0 TTD in chain config - Add --rollup.historicalhttp CLI flag and fix backend iface - Flags and interfaces for historical RPC requests (#12) - Redirect historical RPC requests (#13) - Use the pre-existing ethereum.NotFound error (#18) - Add historical endpoint to TraceBlockByNumber and TraceBlockByHash (#19) - Add historical endpoint to TraceTransaction (#20) - Add historical endpoint to TraceCall (#21) - optimism: fee params from info txi, update l1 cost func GPO params read (#15) - add hardcoded addresses for fee payouts (#23) - dynamic gas limit via engine API (#22) Co-authored-by: Matthew Slipper <me@matthewslipper.com> Co-authored-by: Joshua Gutow <jgutow@oplabs.co> Co-authored-by: protolambda <proto@protolambda.com> Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com> Co-authored-by: Maurelian <maurelian@protonmail.ch>
87 lines
3.2 KiB
Go
87 lines
3.2 KiB
Go
// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
|
|
|
|
package engine
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
)
|
|
|
|
var _ = (*payloadAttributesMarshaling)(nil)
|
|
|
|
// MarshalJSON marshals as JSON.
|
|
func (p PayloadAttributes) MarshalJSON() ([]byte, error) {
|
|
type PayloadAttributes struct {
|
|
Timestamp hexutil.Uint64 `json:"timestamp" gencodec:"required"`
|
|
Random common.Hash `json:"prevRandao" gencodec:"required"`
|
|
SuggestedFeeRecipient common.Address `json:"suggestedFeeRecipient" gencodec:"required"`
|
|
Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty" gencodec:"optional"`
|
|
Transactions []hexutil.Bytes `json:"transactions,omitempty" gencodec:"optional"`
|
|
NoTxPool bool `json:"noTxPool,omitempty" gencodec:"optional"`
|
|
GasLimit *hexutil.Uint64 `json:"gasLimit,omitempty" gencodec:"optional"`
|
|
}
|
|
var enc PayloadAttributes
|
|
enc.Timestamp = hexutil.Uint64(p.Timestamp)
|
|
enc.Random = p.Random
|
|
enc.SuggestedFeeRecipient = p.SuggestedFeeRecipient
|
|
enc.Withdrawals = p.Withdrawals
|
|
if p.Transactions != nil {
|
|
enc.Transactions = make([]hexutil.Bytes, len(p.Transactions))
|
|
for k, v := range p.Transactions {
|
|
enc.Transactions[k] = v
|
|
}
|
|
}
|
|
enc.NoTxPool = p.NoTxPool
|
|
enc.GasLimit = (*hexutil.Uint64)(p.GasLimit)
|
|
return json.Marshal(&enc)
|
|
}
|
|
|
|
// UnmarshalJSON unmarshals from JSON.
|
|
func (p *PayloadAttributes) UnmarshalJSON(input []byte) error {
|
|
type PayloadAttributes struct {
|
|
Timestamp *hexutil.Uint64 `json:"timestamp" gencodec:"required"`
|
|
Random *common.Hash `json:"prevRandao" gencodec:"required"`
|
|
SuggestedFeeRecipient *common.Address `json:"suggestedFeeRecipient" gencodec:"required"`
|
|
Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty" gencodec:"optional"`
|
|
Transactions []hexutil.Bytes `json:"transactions,omitempty" gencodec:"optional"`
|
|
NoTxPool *bool `json:"noTxPool,omitempty" gencodec:"optional"`
|
|
GasLimit *hexutil.Uint64 `json:"gasLimit,omitempty" gencodec:"optional"`
|
|
}
|
|
var dec PayloadAttributes
|
|
if err := json.Unmarshal(input, &dec); err != nil {
|
|
return err
|
|
}
|
|
if dec.Timestamp == nil {
|
|
return errors.New("missing required field 'timestamp' for PayloadAttributes")
|
|
}
|
|
p.Timestamp = uint64(*dec.Timestamp)
|
|
if dec.Random == nil {
|
|
return errors.New("missing required field 'prevRandao' for PayloadAttributes")
|
|
}
|
|
p.Random = *dec.Random
|
|
if dec.SuggestedFeeRecipient == nil {
|
|
return errors.New("missing required field 'suggestedFeeRecipient' for PayloadAttributes")
|
|
}
|
|
p.SuggestedFeeRecipient = *dec.SuggestedFeeRecipient
|
|
if dec.Withdrawals != nil {
|
|
p.Withdrawals = dec.Withdrawals
|
|
}
|
|
if dec.Transactions != nil {
|
|
p.Transactions = make([][]byte, len(dec.Transactions))
|
|
for k, v := range dec.Transactions {
|
|
p.Transactions[k] = v
|
|
}
|
|
}
|
|
if dec.NoTxPool != nil {
|
|
p.NoTxPool = *dec.NoTxPool
|
|
}
|
|
if dec.GasLimit != nil {
|
|
p.GasLimit = (*uint64)(dec.GasLimit)
|
|
}
|
|
return nil
|
|
}
|