Skip to content

Commit 786460e

Browse files
AusIVholimanbodhi-crypoprotolambdakeienWang
authored
Merge/v1.13.12 (#159)
* params: begin v.1.13.12 release cycle * internal/flags: fix typo (ethereum#28876) * core/types: fix and test handling of faulty nil-returning signer (ethereum#28879) This adds an error if the signer returns a nil value for one of the signature value fields. * README.md: fix travis badge (ethereum#28889) The hyperlink in the README file that directs to the Travis CI build was broken. This commit updates the link to point to the corrent build page. * eth/catalyst: allow payload attributes v1 in fcu v2 (ethereum#28882) At some point, `ForkchoiceUpdatedV2` stopped working for `PayloadAttributesV1` while `paris` was active. This was causing a few failures in hive. This PR fixes that, and also adds a gate in `ForkchoiceUpdatedV1` to disallow `PayloadAttributesV3`. * docs/postmortems: fix outdated link (ethereum#28893) * core: reset tx lookup cache if necessary (ethereum#28865) This pull request resets the txlookup cache if chain reorg happens, preventing them from remaining reachable. It addresses failures in the hive tests. * build: fix problem with windows line-endings in CI download (ethereum#28900) fixes ethereum#28890 * eth/downloader: fix skeleton cleanup (ethereum#28581) * eth/downloader: fix skeleton cleanup * eth/downloader: short circuit if nothing to delete * eth/downloader: polish the logic in cleanup * eth/downloader: address comments * deps: update memsize (ethereum#28916) * core/txpool/blobpool: post-crash cleanup and addition/removal metrics (ethereum#28914) * core/txpool/blobpool: clean up resurrected junk after a crash * core/txpool/blobpool: track transaction insertions and rejections * core/txpool/blobpool: linnnnnnnt * core/txpool: don't inject lazy resolved transactions into the container (ethereum#28917) * core/txpool: don't inject lazy resolved transactions into the container * core/txpool: minor typo fixes * core/types: fix typo (ethereum#28922) * p2p: fix accidental termination of portMappingLoop (ethereum#28911) * internal/flags: fix --miner.gasprice default listing (ethereum#28932) * all: fix typos in comments (ethereum#28881) * Makefile: add help target to display available targets (ethereum#28845) Co-authored-by: Martin HS <[email protected]> Co-authored-by: Felix Lange <[email protected]> * core: cache transaction indexing tail in memory (ethereum#28908) * eth, miner: fix enforcing the minimum miner tip (ethereum#28933) * eth, miner: fix enforcing the minimum miner tip * ethclient/simulated: fix failing test due the min tip change * accounts/abi/bind: fix simulater gas tip issue * core/state, core/vm: minor uint256 related perf improvements (ethereum#28944) * cmd,internal/era: implement `export-history` subcommand (ethereum#26621) * all: implement era format, add history importer/export * internal/era/e2store: refactor e2store to provide ReadAt interface * internal/era/e2store: export HeaderSize * internal/era: refactor era to use ReadAt interface * internal/era: elevate anonymous func to named * cmd/utils: don't store entire era file in-memory during import / export * internal/era: better abstraction between era and e2store * cmd/era: properly close era files * cmd/era: don't let defers stack * cmd/geth: add description for import-history * cmd/utils: better bytes buffer * internal/era: error if accumulator has more records than max allowed * internal/era: better doc comment * internal/era/e2store: rm superfluous reader, rm superfluous testcases, add fuzzer * internal/era: avoid some repetition * internal/era: simplify clauses * internal/era: unexport things * internal/era,cmd/utils,cmd/era: change to iterator interface for reading era entries * cmd/utils: better defer handling in history test * internal/era,cmd: add number method to era iterator to get the current block number * internal/era/e2store: avoid double allocation during write * internal/era,cmd/utils: fix lint issues * internal/era: add ReaderAt func so entry value can be read lazily Co-authored-by: lightclient <[email protected]> Co-authored-by: Martin Holst Swende <[email protected]> * internal/era: improve iterator interface * internal/era: fix rlp decode of header and correctly read total difficulty * cmd/era: fix rebase errors * cmd/era: clearer comments * cmd,internal: fix comment typos --------- Co-authored-by: Martin Holst Swende <[email protected]> * core,params: add holesky to default genesis function (ethereum#28903) * node, rpc: add configurable HTTP request limit (ethereum#28948) Adds a configurable HTTP request limit, and bumps the engine default * all: fix docstring names (ethereum#28923) * fix wrong comment * reviewers input * Update log/handler_glog.go --------- Co-authored-by: Martin HS <[email protected]> * ethclient/simulated: fix typo (ethereum#28952) (ethclient/simulated):fix typo * eth/gasprice: fix percentile validation in eth_feeHistory (ethereum#28954) * cmd/devp2p, eth: drop support for eth/67 (ethereum#28956) * params, core/forkid: add mainnet timestamp for Cancun (ethereum#28958) * params: add cancun timestamp for mainnet * core/forkid: add test for mainnet cancun forkid * core/forkid: update todo tests for cancun * internal/ethapi: add support for blobs in eth_fillTransaction (ethereum#28839) This change adds support for blob-transaction in certain API-endpoints, e.g. eth_fillTransaction. A follow-up PR will add support for signing such transactions. * internal/era: update block index format to be based on record offset (ethereum#28959) As mentioned in ethereum#26621, the block index format for era1 is not in line with the regular era block index. This change modifies the index so all relative offsets are based against the beginning of the block index record. * params: go-ethereum v1.13.12 stable --------- Co-authored-by: Martin Holst Swende <[email protected]> Co-authored-by: alex <[email protected]> Co-authored-by: protolambda <[email protected]> Co-authored-by: KeienWang <[email protected]> Co-authored-by: lightclient <[email protected]> Co-authored-by: rjl493456442 <[email protected]> Co-authored-by: Péter Szilágyi <[email protected]> Co-authored-by: zoereco <[email protected]> Co-authored-by: Chris Ziogas <[email protected]> Co-authored-by: Dimitris Apostolou <[email protected]> Co-authored-by: Halimao <[email protected]> Co-authored-by: Felix Lange <[email protected]> Co-authored-by: lmittmann <[email protected]> Co-authored-by: Sina Mahmoodi <[email protected]> Co-authored-by: Austin Roberts <[email protected]>
1 parent ec11a81 commit 786460e

File tree

111 files changed

+3070
-421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+3070
-421
lines changed

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,43 @@ GOBIN = ./build/bin
88
GO ?= latest
99
GORUN = go run
1010

11+
#? geth: Build geth
1112
geth:
1213
$(GORUN) build/ci.go install ./cmd/geth
1314
@echo "Done building."
1415
@echo "Run \"$(GOBIN)/geth\" to launch geth."
1516

17+
#? all: Build all packages and executables
1618
all:
1719
$(GORUN) build/ci.go install
1820

21+
#? test: Run the tests
1922
test: all
2023
$(GORUN) build/ci.go test
2124

25+
#? lint: Run certain pre-selected linters
2226
lint: ## Run linters.
2327
$(GORUN) build/ci.go lint
2428

29+
#? clean: Clean go cache, built executables, and the auto generated folder
2530
clean:
2631
go clean -cache
2732
rm -fr build/_workspace/pkg/ $(GOBIN)/*
2833

2934
# The devtools target installs tools required for 'go generate'.
3035
# You need to put $GOBIN (or $GOPATH/bin) in your PATH to use 'go generate'.
3136

37+
#? devtools: Install recommended developer tools
3238
devtools:
3339
env GOBIN= go install golang.org/x/tools/cmd/stringer@latest
3440
env GOBIN= go install github.com/fjl/gencodec@latest
3541
env GOBIN= go install github.com/golang/protobuf/protoc-gen-go@latest
3642
env GOBIN= go install ./cmd/abigen
3743
@type "solc" 2> /dev/null || echo 'Please install solc'
3844
@type "protoc" 2> /dev/null || echo 'Please install protoc'
45+
46+
#? help: Get more info on make commands.
47+
help: Makefile
48+
@echo " Choose a command run in go-ethereum:"
49+
@sed -n 's/^#?//p' $< | column -t -s ':' | sort | sed -e 's/^/ /'
50+
.PHONY: help

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Golang execution layer implementation of the Ethereum protocol.
66
https://pkg.go.dev/badge/github.com/ethereum/go-ethereum
77
)](https://pkg.go.dev/github.com/ethereum/go-ethereum?tab=doc)
88
[![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum)
9-
[![Travis](https://travis-ci.com/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.com/ethereum/go-ethereum)
9+
[![Travis](https://app.travis-ci.com/ethereum/go-ethereum.svg?branch=master)](https://app.travis-ci.com/github/ethereum/go-ethereum)
1010
[![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv)
1111

1212
Automated builds are available for stable releases and the unstable master branch. Binary

accounts/abi/abi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
)
3030

3131
// The ABI holds information about a contract's context and available
32-
// invokable methods. It will allow you to type check function calls and
32+
// invocable methods. It will allow you to type check function calls and
3333
// packs data accordingly.
3434
type ABI struct {
3535
Constructor Method

accounts/abi/bind/util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestWaitDeployed(t *testing.T) {
6565

6666
// Create the transaction
6767
head, _ := backend.Client().HeaderByNumber(context.Background(), nil) // Should be child's, good enough
68-
gasPrice := new(big.Int).Add(head.BaseFee, big.NewInt(1))
68+
gasPrice := new(big.Int).Add(head.BaseFee, big.NewInt(params.GWei))
6969

7070
tx := types.NewContractCreation(0, big.NewInt(0), test.gas, gasPrice, common.FromHex(test.code))
7171
tx, _ = types.SignTx(tx, types.LatestSignerForChainID(big.NewInt(1337)), testKey)

accounts/scwallet/hub.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ func (hub *Hub) refreshWallets() {
241241
card.Disconnect(pcsc.LeaveCard)
242242
continue
243243
}
244-
// Card connected, start tracking in amongs the wallets
244+
// Card connected, start tracking among the wallets
245245
hub.wallets[reader] = wallet
246246
events = append(events, accounts.WalletEvent{Wallet: wallet, Kind: accounts.WalletArrived})
247247
}

cmd/clef/datatypes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Example:
7575
},
7676
{
7777
"type": "Info",
78-
"message": "User should see this aswell"
78+
"message": "User should see this as well"
7979
}
8080
],
8181
"meta": {

cmd/devp2p/internal/ethtest/conn.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func (c *Conn) ReadEth() (any, error) {
166166
case eth.TransactionsMsg:
167167
msg = new(eth.TransactionsPacket)
168168
case eth.NewPooledTransactionHashesMsg:
169-
msg = new(eth.NewPooledTransactionHashesPacket68)
169+
msg = new(eth.NewPooledTransactionHashesPacket)
170170
case eth.GetPooledTransactionsMsg:
171171
msg = new(eth.GetPooledTransactionsPacket)
172172
case eth.PooledTransactionsMsg:

cmd/devp2p/internal/ethtest/suite.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ func (s *Suite) TestNewPooledTxs(t *utesting.T) {
710710
}
711711

712712
// Send announcement.
713-
ann := eth.NewPooledTransactionHashesPacket68{Types: txTypes, Sizes: sizes, Hashes: hashes}
713+
ann := eth.NewPooledTransactionHashesPacket{Types: txTypes, Sizes: sizes, Hashes: hashes}
714714
err = conn.Write(ethProto, eth.NewPooledTransactionHashesMsg, ann)
715715
if err != nil {
716716
t.Fatalf("failed to write to connection: %v", err)
@@ -728,7 +728,7 @@ func (s *Suite) TestNewPooledTxs(t *utesting.T) {
728728
t.Fatalf("unexpected number of txs requested: wanted %d, got %d", len(hashes), len(msg.GetPooledTransactionsRequest))
729729
}
730730
return
731-
case *eth.NewPooledTransactionHashesPacket68:
731+
case *eth.NewPooledTransactionHashesPacket:
732732
continue
733733
case *eth.TransactionsPacket:
734734
continue
@@ -796,12 +796,12 @@ func (s *Suite) TestBlobViolations(t *utesting.T) {
796796
t2 = s.makeBlobTxs(2, 3, 0x2)
797797
)
798798
for _, test := range []struct {
799-
ann eth.NewPooledTransactionHashesPacket68
799+
ann eth.NewPooledTransactionHashesPacket
800800
resp eth.PooledTransactionsResponse
801801
}{
802802
// Invalid tx size.
803803
{
804-
ann: eth.NewPooledTransactionHashesPacket68{
804+
ann: eth.NewPooledTransactionHashesPacket{
805805
Types: []byte{types.BlobTxType, types.BlobTxType},
806806
Sizes: []uint32{uint32(t1[0].Size()), uint32(t1[1].Size() + 10)},
807807
Hashes: []common.Hash{t1[0].Hash(), t1[1].Hash()},
@@ -810,7 +810,7 @@ func (s *Suite) TestBlobViolations(t *utesting.T) {
810810
},
811811
// Wrong tx type.
812812
{
813-
ann: eth.NewPooledTransactionHashesPacket68{
813+
ann: eth.NewPooledTransactionHashesPacket{
814814
Types: []byte{types.DynamicFeeTxType, types.BlobTxType},
815815
Sizes: []uint32{uint32(t2[0].Size()), uint32(t2[1].Size())},
816816
Hashes: []common.Hash{t2[0].Hash(), t2[1].Hash()},

cmd/devp2p/internal/ethtest/transaction.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (s *Suite) sendTxs(txs []*types.Transaction) error {
7070
for _, tx := range *msg {
7171
got[tx.Hash()] = true
7272
}
73-
case *eth.NewPooledTransactionHashesPacket68:
73+
case *eth.NewPooledTransactionHashesPacket:
7474
for _, hash := range msg.Hashes {
7575
got[hash] = true
7676
}
@@ -146,7 +146,7 @@ func (s *Suite) sendInvalidTxs(txs []*types.Transaction) error {
146146
return fmt.Errorf("received bad tx: %s", tx.Hash())
147147
}
148148
}
149-
case *eth.NewPooledTransactionHashesPacket68:
149+
case *eth.NewPooledTransactionHashesPacket:
150150
for _, hash := range msg.Hashes {
151151
if _, ok := invalids[hash]; ok {
152152
return fmt.Errorf("received bad tx: %s", hash)

0 commit comments

Comments
 (0)