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.

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

Jump to bottom

feat: merge upstream #99

Merged
merged 75 commits into from
Feb 22, 2023
Merged

feat: merge upstream #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
8828b4f
all: Go workspace support and dependency sync (#664)
protolambda Dec 13, 2022
bfabd99
internal/libdocker: add optional registry authentication in builder (…
mrod502 Dec 14, 2022
2598837
simulators/ethereum/consensus: Fix Consensus Tests (#668)
marioevz Dec 19, 2022
a3428ee
clients/besu: change sync mode to snap sync instead of fast sync (#666)
Gabriel-Trintinalia Jan 3, 2023
8071a3e
clients/besu: update config to address rpc and send-legacy-transactio…
mark-terry Jan 3, 2023
a4b0ccd
test.sh: fix typo (#670)
onbjerg Jan 12, 2023
c2b81df
go.work: disable top-level go.work by default
fjl Jan 23, 2023
e2595c8
simulators/ethereum/engine: adding tests for Shanghai (#676)
fjl Jan 23, 2023
e491cf8
clients/nethermind: add Shanghai fork timestamp
fjl Jan 23, 2023
3e7d20c
clients/go-ethereum: add Shanghai for timestamp
fjl Jan 23, 2023
1084506
clients/erigon: add Shanghai fork timestamp
fjl Jan 23, 2023
3fd0a5d
simulators/ethereum/engine: fix nil pointer exception (#678)
marioevz Jan 23, 2023
4fcdc0d
clients/ethereumjs: fix build and add Shanghai fork configuration (#679)
marioevz Jan 23, 2023
104c185
clients/besu: add Shanghai fork and fix issue with duplicated node ke…
gfukushima Jan 23, 2023
f15fbd4
simulators/eth2: add common library and tests for withdrawals (#681)
fjl Jan 23, 2023
2c75c1a
clients/lodestar: new beacon node and validator client definition (#680)
marioevz Jan 23, 2023
a3a455a
simulators/eth2/withdrawals: rename suite
fjl Jan 23, 2023
5b56192
simulators/eth2/common: avoid <nil> value for HIVE_SHANGHAI_TIMESTAMP
fjl Jan 24, 2023
316abea
simulators/eth2/withdrawals: clean up go.mod
fjl Jan 24, 2023
a49efd5
simulators/eth2/testnet: clean up go.mod
fjl Jan 24, 2023
8862124
simulators/eth2/engine: clean up go.mod
fjl Jan 24, 2023
3ffb4ee
simulators/eth2: go mod tidy
fjl Jan 24, 2023
ce0da5b
simulators/ethereum/engine: set HIVE_MERGE_BLOCK_ID before shanghai f…
fjl Jan 24, 2023
9a6033b
README.md, docs: fix typos in documentation (#683)
omahs Jan 24, 2023
415d855
simulators/eth2/common: handle client branch when getting validator name
fjl Jan 24, 2023
abdaeff
clients/nethermind: add shanghai EIPs to mapper (#686)
marioevz Jan 24, 2023
ef7bb9c
simulators/eth2/withdrawals: check exact partial withdrawn balance ex…
marioevz Jan 24, 2023
289b8f3
clients/nethermind: use terminal block hash/number in config (#687)
marioevz Jan 25, 2023
6295612
hivesim: make test matching case insensitive (#689)
fjl Jan 25, 2023
7184544
simulators/eth2/withdrawals: handle missed slots in test (#690)
marioevz Jan 25, 2023
d8dfa0d
simulators/ethereum/engine: Remove PoW config from withdrawals (#691)
marioevz Jan 25, 2023
e4b8623
clients/nimbus: fix nimbus (#693)
marioevz Jan 27, 2023
380c6c9
simulators/eth2: support 12 second slots, add test for large withdraw…
marioevz Jan 27, 2023
88640e0
cmd/hiveview: viewer app update (#696)
fjl Jan 28, 2023
63dee08
simulators/ethereum/consensus: update for Shanghai
fjl Jan 28, 2023
54737f0
cmd/hiveview: fix hourglass in Safari
fjl Jan 28, 2023
b8fc30b
simulators/ethereum/graphql: align tests with current spec (#692)
shemnon Jan 28, 2023
01175e0
cmd/hiveview: responsive layout for table views (#697)
fjl Feb 1, 2023
fa8d62c
simulators/ethereum/engine: INVALID_BLOCK_HASH is deprecated in Shan…
yperbasis Feb 1, 2023
7068ab4
simulators/ethereum/engine: tests for getPayloadBodies*, exchangeCapa…
marioevz Feb 2, 2023
52fbfc3
cmd/hiveview: small UI improvements (#701)
fjl Feb 2, 2023
be72423
cmd/hiveview: fixing more stuff in the UI (#702)
fjl Feb 2, 2023
cbbe48f
cmd/hiveview: print listing generator errors in -serve mode
fjl Feb 6, 2023
97557e8
cmd/hiveview: skip hive.json
fjl Feb 6, 2023
84c255d
cmd/hiveview: hide client list in details box when test has no clients
fjl Feb 6, 2023
97d9b7b
simulators/ethereum/engine: increase tests coverage (#700)
marioevz Feb 6, 2023
e4ef5d9
README.md: update description of hivetests2 server
fjl Feb 6, 2023
bf45c94
docs: add info about ethereum/engine simulator
fjl Feb 6, 2023
603391a
docs: remove accidental \
fjl Feb 6, 2023
33224ab
cmd/hiveview: UI improvements (#705)
fjl Feb 6, 2023
2de942f
clients/nimbus: clean Dockerfile, accept branch arg (#704)
marioevz Feb 7, 2023
0716d91
cmd/hiveview: JS/CSS bundling with esbuild (#708)
fjl Feb 8, 2023
870853a
cmd/hiveview: remove arrow in test table header
fjl Feb 8, 2023
a63a663
cmd/hiveview: improve esbuild setup (#710)
fjl Feb 9, 2023
ececcea
cmd/hiveview: disable caching for hive.json fetch
fjl Feb 9, 2023
47c4304
cmd/hiveview: enable sourcemaps in bundle output
fjl Feb 9, 2023
3e8b7be
cmd/hiveview: fix file name in error messages
fjl Feb 9, 2023
07bb8ff
cmd/hiveview: link to history instead of diff in header
fjl Feb 9, 2023
dc76446
simulators/ethereum/engine: test using getPayloadBodiesByRange/Hash a…
marioevz Feb 9, 2023
ee0ba53
simulators/eth2/common,withdrawals: Verify Engine API Calls from Beac…
marioevz Feb 14, 2023
1f978cb
simulators/ethereum/engine: send test transactions in batch (#713)
marioevz Feb 15, 2023
4c3aaef
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
5cba065
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
54ea217
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
1ba2d85
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
ded471d
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
38e8171
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
17412d1
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
bee2309
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
302026c
bump golang.org/x/net from 0.5.0 to 0.7.0 (#724)
dependabot[bot] Feb 20, 2023
6e5d9ae
build(deps): bump github.com/containerd/containerd from 1.6.6 to 1.6.…
dependabot[bot] Feb 20, 2023
b0fc9f6
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
f62c7f8
build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /simulators…
dependabot[bot] Feb 20, 2023
3ae553b
clients/ethereumjs: add support for loading chain.rlp (#729)
acolytec3 Feb 21, 2023
acf50eb
Merge remote-tracking branch 'upstream/master' into feat/upstream
alexshliu Feb 22, 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
6 changes: 0 additions & 6 deletions simulators/ethereum/engine/client/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,12 +703,6 @@ func (n *GethNode) NewPayloadV2(ctx context.Context, pl *beacon.ExecutableData)
n.latestPayloadStatusReponse = &resp
return resp, err
}
func (n *GethNode) NewPayloadV2(ctx context.Context, pl *beacon.ExecutableData) (beacon.PayloadStatusV1, error) {
n.latestPayloadSent = pl
resp, err := n.api.NewPayloadV2(*pl)
n.latestPayloadStatusReponse = &resp
return resp, err
}

func (n *GethNode) ForkchoiceUpdatedV1(ctx context.Context, fcs *beacon.ForkchoiceStateV1, payload *beacon.PayloadAttributes) (beacon.ForkChoiceResponse, error) {
n.latestFcUStateSent = fcs
Expand Down
9 changes: 5 additions & 4 deletions simulators/ethereum/engine/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/ethereum/go-ethereum v1.10.26
github.com/ethereum/hive v0.0.0-20230124094404-5b561920e19b
github.com/golang-jwt/jwt/v4 v4.4.3
golang.org/x/exp v0.0.0-20230126173853-a67bb567ff2e
)

require (
Expand Down Expand Up @@ -61,12 +62,12 @@ require (
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/crypto v0.4.0 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.3.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
)

replace github.com/ethereum/go-ethereum v1.10.26 => github.com/lightclient/go-ethereum v1.10.10-0.20230116085521-6ab6d738866f
replace github.com/ethereum/go-ethereum v1.10.26 => github.com/ethereum/go-ethereum v1.10.24-0.20230127123926-a63875bf4d7f
18 changes: 10 additions & 8 deletions simulators/ethereum/engine/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ethereum/go-ethereum v1.10.24-0.20230127123926-a63875bf4d7f h1:4zLYUPuCDwBfQSCY1QWJfVn9fmOFmX1D4GCnMC8UlU8=
github.com/ethereum/go-ethereum v1.10.24-0.20230127123926-a63875bf4d7f/go.mod h1:C5Xij/C5W1rXkm7pCvr7p2HWUiVk6RmTF3EUvp8LXMY=
github.com/ethereum/hive v0.0.0-20230124094404-5b561920e19b h1:TW8iKjNf7tZZkleHIGNG2wkawQC8BzGce++cxRw10lU=
github.com/ethereum/hive v0.0.0-20230124094404-5b561920e19b/go.mod h1:pqToex2uV+Tg7bhBla/uvB3APKZ6FogJMMpow33nUIA=
github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ=
Expand Down Expand Up @@ -216,8 +218,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lightclient/go-ethereum v1.10.10-0.20230116085521-6ab6d738866f h1:Pox2oxBYKWVEw2JUCyiEybqEIurSkq8VHjRp6s9jdf8=
github.com/lightclient/go-ethereum v1.10.10-0.20230116085521-6ab6d738866f/go.mod h1:n7VlOgCwYheLB/mi+V8ni2yf8K2qM3N9WAmalxkhk+c=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
Expand Down Expand Up @@ -369,6 +369,8 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20230126173853-a67bb567ff2e h1:nEzRHNOazEST44vMvEwxGxnYGrzXEmxJmnti5mKSWTk=
golang.org/x/exp v0.0.0-20230126173853-a67bb567ff2e/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
Expand Down Expand Up @@ -407,8 +409,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -458,8 +460,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -468,8 +470,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
Expand Down
29 changes: 28 additions & 1 deletion simulators/ethereum/engine/helper/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,8 @@ func (tc *BigInitcodeTransactionCreator) MakeTransaction(nonce uint64) (*types.T
// already knew the tx (might happen if we produced a re-org where the tx was
// unwind back into the txpool)
func SentTxAlreadyKnown(err error) bool {
return strings.Contains(err.Error(), "already known")
return strings.Contains(err.Error(), "already known") || strings.Contains(err.Error(), "already in the TxPool") ||
strings.Contains(err.Error(), "AlreadyKnown")
}

func SendNextTransaction(testCtx context.Context, node client.EngineClient, txCreator TransactionCreator) (*types.Transaction, error) {
Expand Down Expand Up @@ -504,3 +505,29 @@ func SendNextTransaction(testCtx context.Context, node client.EngineClient, txCr
}
}
}

func SendNextTransactions(testCtx context.Context, node client.EngineClient, txCreator TransactionCreator, txCount uint64) ([]*types.Transaction, error) {
var err error
nonce, err := node.GetNextAccountNonce(testCtx, globals.VaultAccountAddress)
if err != nil {
return nil, err
}
txs := make([]*types.Transaction, txCount)
for i := range txs {
txs[i], err = txCreator.MakeTransaction(nonce)
if err != nil {
return nil, err
}
nonce++
}
ctx, cancel := context.WithTimeout(testCtx, globals.RPCTimeout)
defer cancel()
errs := node.SendTransactions(ctx, txs)
for _, err := range errs {
if err != nil && !SentTxAlreadyKnown(err) {
return txs, err
}
}
node.UpdateNonce(testCtx, globals.VaultAccountAddress, nonce+txCount)
return txs, nil
}