Skip to content
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.

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

Merge v1.11.3 #218

Merged
merged 47 commits into from
Jun 6, 2023
Merged
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
a0d63bc
ci: disable coverage reporting in appveyor and travis
holiman Feb 17, 2023
f6a7cc6
params: begin v.1.11.3 release cycle
karalabe Feb 22, 2023
a36c68f
log: improve documentation (#26753)
naterarmstrong Feb 22, 2023
09a9ccd
core/rawdb, node: use standalone flock dependency (#26633)
holiman Feb 23, 2023
b3ae073
eth: use the last announced finalized block as the sync ancient limit…
karalabe Feb 23, 2023
ee530c0
Merge pull request #26721 from holiman/nocover
karalabe Feb 23, 2023
c155c8e
cmd/devp2p: faster crawling + less verbose dns updates (#26697)
holiman Feb 27, 2023
2ad150d
eth/tracers: add native flatCallTracer (aka parity style tracer) (#26…
ziogaschr Feb 28, 2023
2ea48f8
core: improve withdrawal index assignment in GenerateChain (#26756)
Rjected Feb 28, 2023
98b0ea6
ethdb/pebble: fix range compaction (#26771)
rjl493456442 Feb 28, 2023
2bb622c
ethdb/pebble: fix max memorytable size (#26776)
rjl493456442 Feb 28, 2023
e1b98f4
ethclient: include withdrawals in ethclient block responses (#26778)
peterbitfly Feb 28, 2023
cd31f2d
all: change chain head markers from block to header (#26777)
karalabe Mar 2, 2023
19f74fa
core/rawdb, ethdb/pebble: disable pebble on openbsd (#26801)
karalabe Mar 3, 2023
0101895
core: fix a merge fault (#26802)
karalabe Mar 3, 2023
403cac7
README, go.mod, event, internal/version: bump min Go to 1.19 (#26803)
karalabe Mar 3, 2023
27e5982
travi: remove strange leftover Go version
karalabe Mar 3, 2023
d865a5d
core, params: schedule Shanghai on goerli (#26795)
MariusVanDerWijden Mar 6, 2023
4c23fe9
eth: remove admin.peers[i].eth.head and difficulty (#26804)
karalabe Mar 6, 2023
8718614
core/types: add EffectiveGasPrice in Receipt (#26713)
fjl Mar 6, 2023
5bc2ef9
core, eth/catalyst: fix race conditions in tests (#26790)
MariusVanDerWijden Mar 6, 2023
544e4a7
metrics: improve accuracy of CPU gauges (#26793)
turboboost55 Mar 6, 2023
4688d3c
ethclient: fix panic when requesting missing blocks (#26817)
fjl Mar 7, 2023
77e33e5
core, miner: revert block gas counter in case of invalid transaction …
rjl493456442 Mar 7, 2023
39be753
internal/ethapi: add tests for transaction types JSON marshal/unmarsh…
ajsutton Mar 7, 2023
cb1f6bd
cmd/evm: correct `alloc` for `t8n` testdata (#26822)
gurukamath Mar 7, 2023
41af42e
eth/tracers/native: set created address to nil in case of failure (#2…
s1na Mar 7, 2023
1e3177d
accounts/usbwallet: mitigate ledger app chunking issue (#26773)
prestwich Mar 7, 2023
78429f7
beacon/engine: don't omit empty withdrawals in ExecutionPayloadBodies…
MariusVanDerWijden Mar 7, 2023
a54d91a
build: update to go 1.20.2 (#26824)
fjl Mar 7, 2023
5ed08c4
params: go-ethereum v1.11.3 stable
fjl Mar 7, 2023
29c498c
Merge tag 'v1.11.3' into merge-v1.11.3
Tristan-Wilson May 9, 2023
a9df09c
Post merge build fix
Tristan-Wilson May 9, 2023
6371ba9
effectiveGasPrice impl for arbitrum txs
Tristan-Wilson May 10, 2023
67329cb
Merge remote-tracking branch 'origin/master' into merge-v1.11.3
Tristan-Wilson May 11, 2023
ea42ed9
Set placeholder value for arbos version in tracer
Tristan-Wilson May 11, 2023
451f8fb
Update arbitrum pkg for CurrentBlock retrn Header
Tristan-Wilson May 11, 2023
a7f574e
Wrap flock dep usage with conditional for js
Tristan-Wilson May 11, 2023
b0d399c
Fix reversed sign in nil block check
Tristan-Wilson May 11, 2023
05908e4
Merge remote-tracking branch 'origin/master' into merge-v1.11.3
Tristan-Wilson May 15, 2023
41a1d2a
Pass ArbOSVersion to flatCallTracer
Tristan-Wilson May 16, 2023
f9cc921
Regenerate gen_callframe_json using correct cmd
Tristan-Wilson May 16, 2023
c915a2b
Add EVMTransfers to flatCallTracer
Tristan-Wilson May 16, 2023
ab37f4f
Fix callTracer EVMTransfer GetResult
Tristan-Wilson May 16, 2023
37a27c1
Restore ContractAddress check before recalc
Tristan-Wilson Jun 2, 2023
3470205
Merge remote-tracking branch 'origin/master' into merge-v1.11.3
Tristan-Wilson Jun 2, 2023
31e9c0c
Fix Receipt ContractAddress DeriveFields merge err
Tristan-Wilson Jun 6, 2023
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
Prev Previous commit
Next Next commit
eth: remove admin.peers[i].eth.head and difficulty (#26804)
  • Loading branch information
karalabe authored Mar 6, 2023
commit 4c23fe97c5472f2c0a6c89fcf4e459316110fb0c
12 changes: 2 additions & 10 deletions eth/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,14 @@
package eth

import (
"math/big"

"github.com/ethereum/go-ethereum/eth/protocols/eth"
"github.com/ethereum/go-ethereum/eth/protocols/snap"
)

// ethPeerInfo represents a short summary of the `eth` sub-protocol metadata known
// about a connected peer.
type ethPeerInfo struct {
Version uint `json:"version"` // Ethereum protocol version negotiated
Difficulty *big.Int `json:"difficulty"` // Total difficulty of the peer's blockchain
Head string `json:"head"` // Hex hash of the peer's best owned block
Version uint `json:"version"` // Ethereum protocol version negotiated
}

// ethPeer is a wrapper around eth.Peer to maintain a few extra metadata.
Expand All @@ -39,12 +35,8 @@ type ethPeer struct {

// info gathers and returns some `eth` protocol metadata known about a peer.
func (p *ethPeer) info() *ethPeerInfo {
hash, td := p.Head()

return &ethPeerInfo{
Version: p.Version(),
Difficulty: td,
Head: hash.Hex(),
Version: p.Version(),
}
}

Expand Down