forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Adjust based on spec change

Browse source
This commit is contained in:
Francis Li 2025-03-27 16:03:55 -07:00
parent 607ee3b450
commit 0236be9402
No known key found for this signature in database
GPG key ID: 39F1A72C987F3F88
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
beacon/engine/gen_ed.go
View file

@ -35,7 +35,6 @@ func (e ExecutableData) MarshalJSON() ([]byte, error) {
BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"`
ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"`
ExecutionWitness *types.ExecutionWitness `json:"executionWitness,omitempty"`
ProofVersion *uint8 `json:"proofVersion"`
}
var enc ExecutableData
enc.ParentHash = e.ParentHash
@ -61,7 +60,6 @@ func (e ExecutableData) MarshalJSON() ([]byte, error) {
enc.BlobGasUsed = (*hexutil.Uint64)(e.BlobGasUsed)
enc.ExcessBlobGas = (*hexutil.Uint64)(e.ExcessBlobGas)
enc.ExecutionWitness = e.ExecutionWitness
enc.ProofVersion = e.ProofVersion
return json.Marshal(&enc)
}
@ -86,7 +84,6 @@ func (e *ExecutableData) UnmarshalJSON(input []byte) error {
BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"`
ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"`
ExecutionWitness *types.ExecutionWitness `json:"executionWitness,omitempty"`
ProofVersion *uint8 `json:"proofVersion"`
}
var dec ExecutableData
if err := json.Unmarshal(input, &dec); err != nil {
@ -163,8 +160,5 @@ func (e *ExecutableData) UnmarshalJSON(input []byte) error {
if dec.ExecutionWitness != nil {
e.ExecutionWitness = dec.ExecutionWitness
}
if dec.ProofVersion != nil {
e.ProofVersion = dec.ProofVersion
}
return nil
}

7
beacon/engine/types.go
View file

@ -77,7 +77,6 @@ type ExecutableData struct {
BlobGasUsed *uint64 `json:"blobGasUsed"`
ExcessBlobGas *uint64 `json:"excessBlobGas"`
ExecutionWitness *types.ExecutionWitness `json:"executionWitness,omitempty"`
ProofVersion *uint8 `json:"proofVersion"`
}
// JSON type overrides for executableData.
@ -307,11 +306,6 @@ func ExecutableDataToBlockNoHash(data ExecutableData, versionedHashes []common.H
// BlockToExecutableData constructs the ExecutableData structure by filling the
// fields from the given block. It assumes the given block is post-merge block.
func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types.BlobTxSidecar, requests [][]byte) *ExecutionPayloadEnvelope {
proofVersion := uint8(0)
// TODO: could be more strict
if len(sidecars) > 0 && len(sidecars[0].Proofs) != len(sidecars[0].Blobs) {
proofVersion = 1
}
data := &ExecutableData{
BlockHash: block.Hash(),
ParentHash: block.ParentHash(),
@ -331,7 +325,6 @@ func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types.
BlobGasUsed: block.BlobGasUsed(),
ExcessBlobGas: block.ExcessBlobGas(),
ExecutionWitness: block.ExecutionWitness(),
ProofVersion: &proofVersion,
}
// Add blobs.

2
core/txpool/blobpool/blobpool.go
View file

@ -107,7 +107,7 @@ type blobTxMeta struct {
evictionExecFeeJumps float64 // Worst base fee (converted to fee jumps) across all previous nonces
evictionBlobFeeJumps float64 // Worse blob fee (converted to fee jumps) across all previous nonces
proofVersion uint64 // Version of the proof to use for this transaction
proofVersion uint64 // proof version of the transaction, 0 for legacy, 1 for cell proofs
}
// newBlobTxMeta retrieves the indexed metadata fields from a blob transaction

5
miner/worker.go
View file

@ -425,6 +425,8 @@ func (miner *Miner) commitTransactions(env *environment, plainTxs, blobTxs *tran
// into the given sealing block. The transaction selection and ordering strategy can
// be customized with the plugin in the future.
func (miner *Miner) fillTransactions(interrupt *atomic.Int32, env *environment) error {
miner.Pending()
miner.confMu.RLock()
tip := miner.config.GasPrice
prio := miner.prio
@ -444,6 +446,9 @@ func (miner *Miner) fillTransactions(interrupt *atomic.Int32, env *environment)
pendingPlainTxs := miner.txpool.Pending(filter)
filter.OnlyPlainTxs, filter.OnlyBlobTxs = false, true
if miner.chainConfig.IsOsaka(env.header.Number, env.header.Time) {
filter.OnlyBlobTxWithCellProofs = true
}
pendingBlobTxs := miner.txpool.Pending(filter)
// Split the pending transactions into locals and remotes.