Skip to content

Commit da35ee1

Browse files
allformlessallformless
authored
Merge pull request #3535 from bnb-chain/develop
merge: develop to master for v1.7.1
2 parents 1efeee0 + ac84609 commit da35ee1

Some content is hidden

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

57 files changed

+1254
-206
lines changed

‎CHANGELOG.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
# Changelog
2+
## v1.7.1
3+
v1.7.1 is for BSC Chapel testnet [Osaka/Mendel hardfork](https://github.com/bnb-chain/BEPs/blob/master/BEPs/BEP-658.md),the hard fork time is 2026-03-24 02:30:00 AM UTC
4+
5+
### FEATURE
6+
- [feat: support bid block size check for BEP-655](https://github.com/bnb-chain/bsc/pull/3529)
7+
- [feat: support mev bid gas check of bep 652](https://github.com/bnb-chain/bsc/pull/3528)
8+
- [eip4844.go: disable eip-7918 for bsc](https://github.com/bnb-chain/bsc/pull/3531)
9+
- [feat: implement BEP-657 - Limit Blob Transaction Inclusion by Block Number](https://github.com/bnb-chain/bsc/pull/3533)
10+
11+
### BUGFIX
12+
- [core/types: fix typo in vote comparison (#3573)](https://github.com/bnb-chain/bsc/pull/3573)
13+
- [Fee history issue](https://github.com/bnb-chain/bsc/pull/3577)
14+
- [go.mod: upgrade otel to fix CVE-2026-24051](https://github.com/bnb-chain/bsc/pull/3554)
15+
- [fix: fix gaslimit check in trace api (#3580)](https://github.com/bnb-chain/bsc/pull/3580)
16+
- [miner: fix missing tcount increment in commitBlobTransaction (#3581)](https://github.com/bnb-chain/bsc/pull/3581)
17+
- [fix: superinstruction bad block (#3582)](https://github.com/bnb-chain/bsc/pull/3582)
18+
- [core/vm: align super-instruction minStack and maxStack bounds (#3584)](https://github.com/bnb-chain/bsc/pull/3584)
19+
- [rlp: finalize listIterator on parse error to prevent non-advancing loops (#3586)](https://github.com/bnb-chain/bsc/pull/3586)
20+
- [eth/protocols/snap: restore peers to idle pool on request revert (#3587)](https://github.com/bnb-chain/bsc/pull/3587)
21+
222
## v1.7.0
323
v1.7.0-alpha is a preview release for upstream code sync, it catches up with [go-ethereum release [v1.16.7]](https://github.com/ethereum/go-ethereum/releases/tag/v1.16.7) and also include several bug fix and improvements.
424

@@ -35,6 +55,11 @@ Key changes from the code sync include:
3555
- [ci: upgrade github actions to latest versions](https://github.com/bnb-chain/bsc/pull/3515)
3656
- [ci: ignore nancy failre of quic-go@v0.49.1](https://github.com/bnb-chain/bsc/pull/3512)
3757

58+
## v1.6.7
59+
### BUGFIX
60+
crypto/secp256k1: fix coordinate check
61+
crypto/ecies: fix ECIES invalid-curve handling
62+
3863
## v1.6.6
3964
### BUGFIX
4065
core/txpool: drop peers on invalid KZG proofs

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ Download latest chaindata snapshot from [here](https://github.com/bnb-chain/bsc-
147147

148148
#### 4. Start a full node
149149
```shell
150-
## It will run with Path-Base Storage Scheme by default and enable inline state prune, keeping the latest 90000 blocks' history state.
151-
./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0
150+
## It will run with Path-Base Storage Scheme by default and enable inline state prune, keeping the latest 600000 blocks' history state.
151+
./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0 --history.logs 576000
152152

153153
## It is recommend to run fullnode with `--tries-verify-mode none` if you want high performance and care little about state consistency.
154-
./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0 --tries-verify-mode none
154+
./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0 --history.logs 576000 --tries-verify-mode none
155155
```
156156

157157
#### 5. Monitor node status

‎build/checksums.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This file contains sha256 checksums of optional build dependencies.
22

3-
# version:spec-tests v5.1.0
3+
# version:spec-tests v5.4.0
44
# https://github.com/ethereum/execution-spec-tests/releases
5-
# https://github.com/ethereum/execution-spec-tests/releases/download/v5.1.0
5+
# https://github.com/ethereum/execution-spec-tests/releases/download/v5.4.0
66
a3192784375acec7eaec492799d5c5d0c47a2909a3cc40178898e4ecd20cc416 fixtures_develop.tar.gz
77

88
# version:golang 1.25.1

‎cmd/geth/chaincmd.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ var (
7575
utils.OverrideMendel,
7676
utils.OverrideBPO1,
7777
utils.OverrideBPO2,
78+
utils.OverridePasteur,
7879
utils.OverrideVerkle,
7980
// utils.MultiDataBaseFlag,
8081
}, utils.DatabaseFlags),
@@ -365,6 +366,10 @@ func initGenesis(ctx *cli.Context) error {
365366
v := ctx.Uint64(utils.OverrideBPO2.Name)
366367
overrides.OverrideBPO2 = &v
367368
}
369+
if ctx.IsSet(utils.OverridePasteur.Name) {
370+
v := ctx.Uint64(utils.OverridePasteur.Name)
371+
overrides.OverridePasteur = &v
372+
}
368373
if ctx.IsSet(utils.OverrideVerkle.Name) {
369374
v := ctx.Uint64(utils.OverrideVerkle.Name)
370375
overrides.OverrideVerkle = &v

‎cmd/geth/config.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
286286
v := ctx.Uint64(utils.OverrideBPO2.Name)
287287
cfg.Eth.OverrideBPO2 = &v
288288
}
289+
if ctx.IsSet(utils.OverridePasteur.Name) {
290+
v := ctx.Uint64(utils.OverridePasteur.Name)
291+
cfg.Eth.OverridePasteur = &v
292+
}
289293
if ctx.IsSet(utils.OverrideVerkle.Name) {
290294
v := ctx.Uint64(utils.OverrideVerkle.Name)
291295
cfg.Eth.OverrideVerkle = &v

‎cmd/geth/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ var (
8080
utils.OverrideMendel,
8181
utils.OverrideBPO1,
8282
utils.OverrideBPO2,
83+
utils.OverridePasteur,
8384
utils.OverrideVerkle,
8485
utils.OverrideGenesisFlag,
8586
utils.OverrideFullImmutabilityThreshold,

‎cmd/jsutils/getchainstatus.js‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,12 @@ const builderMap = new Map([
227227
["0x48FeE1BB3823D72fdF80671ebaD5646Ae397BB48", "puissant us"],
228228
["0x48B4bBEbF0655557A461e91B8905b85864B8BB48", "puissant x"],
229229
["0x4827b423D03a349b7519Dda537e9A28d31ecBB48", "puissant y"],
230-
["0x48B2665E5E9a343409199D70F7495c8aB660BB48", "puissant:z"],
230+
["0x48B2665E5E9a343409199D70F7495c8aB660BB48", "puissant z"],
231+
// unknown
232+
["0x48265F91F542dCE47ABE5E6683bb086c0f36BB48", "unknown-1"],
233+
["0x48437A0d4AB091b81c6DeD43dEbf23cdfC85BB48", "unknown-2"],
234+
["0x4851f44038fE746173e9E3C4A6e7E904c619BB48", "unknown-3"],
235+
["0x4880cb180d3bb665748f7b66f75F1fEE68D8BB48", "unknown-4"],
231236
// blockroute
232237
["0xD4376FdC9b49d90e6526dAa929f2766a33BFFD52", "blockroute dublin"],
233238
["0x2873fc7aD9122933BECB384f5856f0E87918388d", "blockroute frankfurt"],
@@ -241,10 +246,13 @@ const builderMap = new Map([
241246
["0x36CB523286D57680efBbfb417C63653115bCEBB5", "jetbldr ap"],
242247
["0x3aD6121407f6EDb65C8B2a518515D45863C206A8", "jetbldr eu"],
243248
["0x345324dC15F1CDcF9022E3B7F349e911fb823b4C", "jetbldr us"],
249+
["0xfd38358475078F81a45077f6e59dff8286e0dCA1", "jetbldr dublin"],
250+
["0x7F5fbFd8e2eB3160dF4c96757DEEf29E26F969a3", "jetbldr tokyo"],
251+
["0xA0Cde9891C6966fCe740817cc5576De2C669AB43", "jetbldr virginia"],
244252
// blockbus
245-
["0x3FC0c936c00908c07723ffbf2d536D6E0f62C3A4", "jetbldr dublin"],
246-
["0x17e9F0D7E45A500f0148B29C6C98EfD19d95F138", "jetbldr tokyo"],
247-
["0x1319Be8b8Ec4AA81f501924BdCF365fBcAa8d753", "jetbldr virginia"],
253+
["0x3FC0c936c00908c07723ffbf2d536D6E0f62C3A4", "blockbus dublin"],
254+
["0x17e9F0D7E45A500f0148B29C6C98EfD19d95F138", "blockbus tokyo"],
255+
["0x1319Be8b8Ec4AA81f501924BdCF365fBcAa8d753", "blockbus virginia"],
248256
// txboost(blocksmith)
249257
["0x6Dddf681C908705472D09B1D7036B2241B50e5c7", "txboost ap"],
250258
["0x76736159984AE865a9b9Cc0Df61484A49dA68191", "txboost eu"],
@@ -258,9 +266,12 @@ const builderMap = new Map([
258266
["0xb49f86586a840AB9920D2f340a85586E50FD30a2", "inblock eu"],
259267
["0x0F6D8b72F3687de6f2824903a83B3ba13c0e88A0", "inblock us"],
260268
// nodereal
261-
["0x79102dB16781ddDfF63F301C9Be557Fd1Dd48fA0", "nodereal ap"],
262-
["0xd0d56b330a0dea077208b96910ce452fd77e1b6f", "nodereal eu"],
263-
["0x4f24ce4cd03a6503de97cf139af2c26347930b99", "nodereal us"],
269+
["0x79102dB16781ddDfF63F301C9Be557Fd1Dd48fA0", "nodereal ap-1"],
270+
["0x5B526b45e833704d84b5C2EB0F41323dA9466c48", "nodereal ap-2"],
271+
["0xd0d56b330a0dea077208b96910ce452fd77e1b6f", "nodereal eu-1"],
272+
["0xa547F87B2BADE689a404544859314CBC01f2605e", "nodereal eu-2"],
273+
["0x4f24ce4cd03a6503de97cf139af2c26347930b99", "nodereal us-1"],
274+
["0xFD3F1Ad459D585C50Cf4630649817C6E0cec7335", "nodereal us-2"],
264275
// xzbuilder
265276
["0x812720cb4639550D7BDb1d8F2be463F4a9663762", "xzbuilder"],
266277

‎cmd/keeper/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ require (
7676
github.com/prysmaticlabs/prysm/v5 v5.3.2 // indirect
7777
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
7878
github.com/rivo/uniseg v0.4.7 // indirect
79-
github.com/rogpeppe/go-internal v1.13.1 // indirect
79+
github.com/rogpeppe/go-internal v1.14.1 // indirect
8080
github.com/rs/cors v1.8.2 // indirect
8181
github.com/sasha-s/go-deadlock v0.3.1 // indirect
8282
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
@@ -94,7 +94,7 @@ require (
9494
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
9595
golang.org/x/net v0.47.0 // indirect
9696
golang.org/x/sync v0.18.0 // indirect
97-
golang.org/x/sys v0.38.0 // indirect
97+
golang.org/x/sys v0.40.0 // indirect
9898
golang.org/x/text v0.31.0 // indirect
9999
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
100100
google.golang.org/grpc v1.69.4 // indirect

‎cmd/keeper/go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
112112
github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
113113
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
114114
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
115-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
116-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
115+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
116+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
117117
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
118118
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
119119
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -141,8 +141,8 @@ github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl76
141141
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
142142
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
143143
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
144-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
145-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
144+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
145+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
146146
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
147147
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
148148
github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us=
@@ -258,8 +258,8 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
258258
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
259259
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
260260
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
261-
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
262-
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
261+
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
262+
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
263263
github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U=
264264
github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
265265
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -273,8 +273,8 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
273273
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
274274
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
275275
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
276-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
277-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
276+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
277+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
278278
github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe h1:nbdqkIGOGfUAD54q1s2YBcBz/WcsxCO9HUQ4aGV5hUw=
279279
github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
280280
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
@@ -301,18 +301,18 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi
301301
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
302302
go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI=
303303
go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE=
304-
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
305-
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
306-
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
307-
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
308-
go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
309-
go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
310-
go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
311-
go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
304+
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
305+
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
306+
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
307+
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
308+
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
309+
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
310+
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
311+
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
312312
go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=
313313
go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
314-
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
315-
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
314+
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
315+
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
316316
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
317317
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
318318
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -353,8 +353,8 @@ golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7w
353353
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
354354
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
355355
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
356-
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
357-
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
356+
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
357+
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
358358
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
359359
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
360360
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎cmd/utils/flags.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,11 @@ var (
334334
Usage: "Manually specify the bpo2 fork timestamp, overriding the bundled setting",
335335
Category: flags.EthCategory,
336336
}
337+
OverridePasteur = &cli.Uint64Flag{
338+
Name: "override.pasteur",
339+
Usage: "Manually specify the Pasteur fork timestamp, overriding the bundled setting",
340+
Category: flags.EthCategory,
341+
}
337342
OverrideVerkle = &cli.Uint64Flag{
338343
Name: "override.verkle",
339344
Usage: "Manually specify the Verkle fork timestamp, overriding the bundled setting",

0 commit comments

Comments
 (0)