Skip to content

Commit 258ede0

Browse files
committed
Merge branch 'update-20251121141226' into develop
2 parents dcc2356 + c85b514 commit 258ede0

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install -buildtags
4242
FROM ubuntu:20.04
4343

4444
RUN apt-get -qq update \
45-
&& apt-get -qq install -y --no-install-recommends ca-certificates
45+
&& apt-get -qq install -y --no-install-recommends ca-certificates netcat-openbsd curl \
46+
&& rm -rf /var/lib/apt/lists/*
4647

4748
COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
4849

eth/api.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,20 @@ func generateWitness(blockchain *core.BlockChain, block *types.Block) (*stateles
367367
// sure that this is always present in the execution witness.
368368
statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.IsFeynmanSlot)
369369

370+
// Ensure that all access list entries are included in the witness,
371+
// as these are always loaded by revm.
372+
for _, tx := range block.Transactions() {
373+
for _, accessTuple := range tx.AccessList() {
374+
// Load account
375+
statedb.GetBalance(accessTuple.Address)
376+
377+
// Load storage entries
378+
for _, key := range accessTuple.StorageKeys {
379+
statedb.GetState(accessTuple.Address, key)
380+
}
381+
}
382+
}
383+
370384
receipts, _, usedGas, err := blockchain.Processor().Process(block, statedb, *blockchain.GetVMConfig())
371385
if err != nil {
372386
return nil, fmt.Errorf("failed to process block %d: %w", block.Number(), err)

params/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ var (
333333
EuclidTime: newUint64(1741680000),
334334
EuclidV2Time: newUint64(1741852800),
335335
FeynmanTime: newUint64(1753167600),
336+
GalileoTime: newUint64(1764054000),
336337
Clique: &CliqueConfig{
337338
Period: 3,
338339
Epoch: 30000,

params/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
const (
2525
VersionMajor = 5 // Major version component of the current release
2626
VersionMinor = 9 // Minor version component of the current release
27-
VersionPatch = 11 // Patch version component of the current release
27+
VersionPatch = 15 // Patch version component of the current release
2828
VersionMeta = "mainnet" // Version metadata to append to the version string
2929
)
3030

0 commit comments

Comments
 (0)