Skip to content

Update geth to v1.15.2 #21

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

Merged
wcgcyx merged 3 commits into from
Feb 18, 2025
Merged

Update geth to v1.15.2 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2075bde
Update geth to v1.15.2
wcgcyx Feb 18, 2025
edb5924
Fix panic
wcgcyx Feb 18, 2025
7f3e35e
Revert "Fix panic"
wcgcyx Feb 18, 2025
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.6

require (
github.com/dgraph-io/badger/v2 v2.2007.3
github.com/ethereum/go-ethereum v1.15.1
github.com/ethereum/go-ethereum v1.15.2
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/holiman/uint256 v1.3.2
github.com/ipfs/go-datastore v0.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
github.com/ethereum/go-ethereum v1.15.1 h1:ZR5hh6NXem4hNnhMIrdPFMTGHo6USTwWn47hbs6gRj4=
github.com/ethereum/go-ethereum v1.15.1/go.mod h1:wGQINJKEVUunCeoaA9C9qKMQ9GEOsEIunzzqTUO2F6Y=
github.com/ethereum/go-ethereum v1.15.2 h1:CcU13w1IXOo6FvS60JGCTVcAJ5Ik6RkWoVIvziiHdTU=
github.com/ethereum/go-ethereum v1.15.2/go.mod h1:wGQINJKEVUunCeoaA9C9qKMQ9GEOsEIunzzqTUO2F6Y=
github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
Expand Down
2 changes: 1 addition & 1 deletion processor/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func ApplyTransaction(msg *core.Message, gp *core.GasPool, worldState worldstate

// Set the receipt logs and create the bloom filter.
receipt.Logs = worldState.GetLogs(tx.Hash(), blockNumber.Uint64(), blockHash)
receipt.Bloom = types.CreateBloom(types.Receipts{receipt})
receipt.Bloom = types.CreateBloom(receipt)
receipt.BlockHash = blockHash
receipt.BlockNumber = blockNumber
receipt.TransactionIndex = uint(worldState.TxIndex())
Expand Down
2 changes: 1 addition & 1 deletion processor/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var log = logging.Logger("processor")

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/core/state_processor.go
// go-ethereum@v1.15.2/core/state_processor.go
// Adapted code have been commented below.
// When merge from upstream, perform check from Process() function below.

Expand Down
2 changes: 1 addition & 1 deletion rpc/call.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/internal/ethapi/api.go
// go-ethereum@v1.15.2/internal/ethapi/api.go

func DoCall(ctx context.Context, be backend.Backend, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *StateOverride, blockOverrides *BlockOverrides, timeout time.Duration, globalGasCap uint64) (*core.ExecutionResult, error) {
defer func(start time.Time) { log.Debug("Executing EVM call finished", "runtime", time.Since(start)) }(time.Now())
Expand Down
4 changes: 2 additions & 2 deletions rpc/estimate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/internal/ethapi/api.go
// go-ethereum@v1.15.0/gasestimator/gasestimator.go
// go-ethereum@v1.15.2/internal/ethapi/api.go
// go-ethereum@v1.15.2/gasestimator/gasestimator.go

const estimateGasErrorRatio = 0.015

Expand Down
2 changes: 1 addition & 1 deletion rpc/eth_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/internal/ethapi/api.go
// go-ethereum@v1.15.2/internal/ethapi/api.go

// ethAPIHandler is used to handle eth API.
type ethAPIHandler struct {
Expand Down
4 changes: 2 additions & 2 deletions rpc/gasprice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/internal/ethapi/api.go
// go-ethereum@v1.15.0/eth/gasprice/gasprice.go
// go-ethereum@v1.15.2/internal/ethapi/api.go
// go-ethereum@v1.15.2/eth/gasprice/gasprice.go

type feeHistoryResult struct {
OldestBlock *hexutil.Big `json:"oldestBlock"`
Expand Down
6 changes: 3 additions & 3 deletions rpc/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/internal/ethapi/api.go
// go-ethereum@v1.15.0/internal/ethapi/transaction_args.go
// go-ethereum@v1.15.0/internal/ethapi/errors.go
// go-ethereum@v1.15.2/internal/ethapi/api.go
// go-ethereum@v1.15.2/internal/ethapi/transaction_args.go
// go-ethereum@v1.15.2/internal/ethapi/errors.go

// TransactionArgs represents the arguments to construct a new transaction
// or a message call.
Expand Down
2 changes: 1 addition & 1 deletion rpc/trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/eth/tracers/api.go
// go-ethereum@v1.15.2/eth/tracers/api.go

const (
// defaultTraceTimeout is the amount of time a single transaction can execute
Expand Down
2 changes: 1 addition & 1 deletion rpc/trace_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/eth/tracers/api.go
// go-ethereum@v1.15.2/eth/tracers/api.go

// traceAPIHandler is used to handle trace API.
type traceAPIHandler struct {
Expand Down
2 changes: 1 addition & 1 deletion rpc/trace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/eth/tracers/api_test.go
// go-ethereum@v1.15.2/eth/tracers/api_test.go

const (
testDS = "./test-ds"
Expand Down
2 changes: 1 addition & 1 deletion tests/chain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/core/blockchain_test.go
// go-ethereum@v1.15.2/core/blockchain_test.go

// Logger
var log = logging.Logger("tests")
Expand Down
4 changes: 2 additions & 2 deletions validator/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

// Note:
// This is adapted from:
// go-ethereum@v1.15.0/core/block_validator.go
// go-ethereum@v1.15.2/core/block_validator.go
// Adapted code have been commented below.

// Validate validates the given block against the receipts and gas used.
Expand All @@ -31,7 +31,7 @@ func Validate(chainConfig *params.ChainConfig, block *types.Block, receipts type
}
// Validate the received block's bloom with the one derived from the generated receipts.
// For valid blocks this should always validate to true.
rbloom := types.CreateBloom(receipts)
rbloom := types.MergeBloom(receipts)
if rbloom != header.Bloom {
return fmt.Errorf("invalid bloom (remote: %x local: %x)", header.Bloom, rbloom)
}
Expand Down
2 changes: 1 addition & 1 deletion worldstate/mutablestate_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func (s *mutableStateImpl) Prepare(rules params.Rules, sender, coinbase common.A
// log.Debugf("precompiles: %v", precompiles)
// log.Debugf("txAccesses: %v", txAccesses)

// Adapted from go-ethereum@v1.15.0/core/state/statedb.go
// Adapted from go-ethereum@v1.15.2/core/state/statedb.go
if rules.IsEIP2929 && rules.IsEIP4762 {
log.Panicf("eip2929 and eip4762 are both activated")
}
Expand Down