Skip to content
This repository was archived by the owner on Nov 25, 2025. It is now read-only.

Commit 83dbf26

Browse files
ceyonurStephenButtolphmichaelkaplan13
authored
ACP-226: add min delay excess to block and verify (#1263)
Signed-off-by: Ceyhun Onur <[email protected]> Co-authored-by: Stephen Buttolph <[email protected]> Co-authored-by: Michael Kaplan <[email protected]>
1 parent 0a6ce77 commit 83dbf26

File tree

47 files changed

+576
-96
lines changed

Some content is hidden

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

47 files changed

+576
-96
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
with:
101101
go-version-file: "go.mod"
102102
- name: Run e2e tests
103-
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@36baa0509d61679085d35bffa590d63732b0a7bd
103+
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@8b8ac94577fec62b1dbd6636e116452b8b4208a5
104104
with:
105105
run: ./scripts/run_task.sh test-e2e-ci
106106
prometheus_url: ${{ secrets.PROMETHEUS_URL || '' }}
@@ -132,7 +132,7 @@ jobs:
132132
ref: ${{ github.event.inputs.avalanchegoBranch }}
133133
path: avalanchego
134134
- name: Run Warp E2E Tests
135-
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@36baa0509d61679085d35bffa590d63732b0a7bd
135+
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@8b8ac94577fec62b1dbd6636e116452b8b4208a5
136136
with:
137137
run: ./scripts/run_task.sh test-e2e-warp-ci
138138
artifact_prefix: warp

consensus/dummy/consensus.go

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"math/big"
1010

1111
"github.com/ava-labs/avalanchego/vms/components/gas"
12+
"github.com/ava-labs/avalanchego/vms/evm/acp226"
1213
"github.com/ava-labs/libevm/common"
1314
"github.com/ava-labs/libevm/core/state"
1415
"github.com/ava-labs/libevm/core/types"
@@ -68,18 +69,21 @@ type (
6869
cb ConsensusCallbacks
6970
consensusMode Mode
7071
desiredTargetExcess *gas.Gas
72+
desiredDelayExcess *acp226.DelayExcess
7173
}
7274
)
7375

7476
func NewDummyEngine(
7577
cb ConsensusCallbacks,
7678
mode Mode,
77-
desiredTargetExcess *gas.Gas,
79+
desiredTargetExcess *gas.Gas, // Guides the target gas excess (ACP-176) toward the desired value
80+
desiredDelayExcess *acp226.DelayExcess, // Guides the min delay excess (ACP-226) toward the desired value
7881
) *DummyEngine {
7982
return &DummyEngine{
8083
cb: cb,
8184
consensusMode: mode,
8285
desiredTargetExcess: desiredTargetExcess,
86+
desiredDelayExcess: desiredDelayExcess,
8387
}
8488
}
8589

@@ -334,6 +338,18 @@ func (eng *DummyEngine) FinalizeAndAssemble(chain consensus.ChainHeaderReader, h
334338
}
335339
header.Extra = append(extraPrefix, header.Extra...)
336340

341+
// Set the min delay excess
342+
minDelayExcess, err := customheader.MinDelayExcess(
343+
configExtra,
344+
parent,
345+
header.Time,
346+
eng.desiredDelayExcess,
347+
)
348+
if err != nil {
349+
return nil, fmt.Errorf("failed to calculate min delay excess: %w", err)
350+
}
351+
headerExtra.MinDelayExcess = minDelayExcess
352+
337353
// commit the final state root
338354
header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
339355

core/genesis.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"fmt"
3535
"math/big"
3636

37+
"github.com/ava-labs/avalanchego/vms/evm/acp226"
3738
"github.com/ava-labs/coreth/core/extstate"
3839
"github.com/ava-labs/coreth/params"
3940
"github.com/ava-labs/coreth/plugin/evm/customtypes"
@@ -325,8 +326,8 @@ func (g *Genesis) toBlock(db ethdb.Database, triedb *triedb.Database) *types.Blo
325326
headerExtra.TimeMilliseconds = new(uint64)
326327
*headerExtra.TimeMilliseconds = g.Timestamp * 1000
327328

328-
headerExtra.MinDelayExcess = new(uint64)
329-
*headerExtra.MinDelayExcess = 0 // TODO: decide whether we want this to be configurable by genesis/chainconfig
329+
headerExtra.MinDelayExcess = new(acp226.DelayExcess)
330+
*headerExtra.MinDelayExcess = acp226.InitialDelayExcess
330331
}
331332
}
332333

core/genesis_extra_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func TestGenesisToBlockDecoding(t *testing.T) {
118118
upgradetest.Durango: common.HexToHash("0xab4ce08ac987c618e1d12642338da6b2308e7f3886fb6a671e9560212d508d2a"),
119119
upgradetest.Etna: common.HexToHash("0x1094f685d39b737cf599fd599744b9849923a11ea3314826f170b443a87cb0e0"),
120120
upgradetest.Fortuna: common.HexToHash("0x1094f685d39b737cf599fd599744b9849923a11ea3314826f170b443a87cb0e0"),
121-
upgradetest.Granite: common.HexToHash("0x479c4950fdd50b7228808188b790fecde7e8b29776daf24e612307b0fd280365"),
121+
upgradetest.Granite: common.HexToHash("0xe870dd86820001c7ca3f2fb9a2f31e1fcfdb17743874a061db8e75425ae7fd23"),
122122
}
123123
for fork, chainConfig := range paramstest.ForkToChainConfig {
124124
t.Run(fork.String(), func(t *testing.T) {

core/genesis_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func setupGenesisBlock(db ethdb.Database, triedb *triedb.Database, genesis *Gene
6262
}
6363

6464
func TestGenesisBlockForTesting(t *testing.T) {
65-
genesisBlockForTestingHash := common.HexToHash("0xab81ae467cf9b9d64b1f54e6ee341ded32432cd57a33d5a1909d7585f5e9db31")
65+
genesisBlockForTestingHash := common.HexToHash("0x9cb63c1f765d359257f0a9f132c967d7d9325015be73789cade2db5f65e83ad6")
6666
block := GenesisBlockForTesting(rawdb.NewMemoryDatabase(), common.Address{1}, big.NewInt(1))
6767
if block.Hash() != genesisBlockForTestingHash {
6868
t.Errorf("wrong testing genesis hash, got %v, want %v", block.Hash(), genesisBlockForTestingHash)

go.mod

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.7
44

55
require (
66
github.com/VictoriaMetrics/fastcache v1.12.1
7-
github.com/ava-labs/avalanchego v1.13.6-0.20250925183853-36baa0509d61
7+
github.com/ava-labs/avalanchego v1.13.6-0.20250929150840-8b8ac94577fe
88
github.com/ava-labs/firewood-go-ethhash/ffi v0.0.12
99
github.com/ava-labs/libevm v1.13.14-0.3.0.release
1010
github.com/davecgh/go-spew v1.1.1
@@ -37,11 +37,13 @@ require (
3737
golang.org/x/sync v0.17.0
3838
golang.org/x/time v0.3.0
3939
golang.org/x/tools v0.37.0
40-
google.golang.org/protobuf v1.36.5
40+
google.golang.org/protobuf v1.36.7
4141
gopkg.in/natefinch/lumberjack.v2 v2.0.0
4242
)
4343

4444
require (
45+
connectrpc.com/connect v1.18.1 // indirect
46+
connectrpc.com/grpcreflect v1.3.0 // indirect
4547
github.com/BurntSushi/toml v1.5.0 // indirect
4648
github.com/DataDog/zstd v1.5.2 // indirect
4749
github.com/Microsoft/go-winio v0.6.1 // indirect
@@ -73,7 +75,7 @@ require (
7375
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
7476
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
7577
github.com/getsentry/sentry-go v0.18.0 // indirect
76-
github.com/go-logr/logr v1.4.1 // indirect
78+
github.com/go-logr/logr v1.4.3 // indirect
7779
github.com/go-logr/stdr v1.2.2 // indirect
7880
github.com/go-ole/go-ole v1.3.0 // indirect
7981
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -88,7 +90,7 @@ require (
8890
github.com/google/btree v1.1.2 // indirect
8991
github.com/google/gnostic-models v0.6.8 // indirect
9092
github.com/google/gofuzz v1.2.0 // indirect
91-
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
93+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
9294
github.com/google/renameio/v2 v2.0.0 // indirect
9395
github.com/google/uuid v1.6.0 // indirect
9496
github.com/gorilla/mux v1.8.0 // indirect

go.sum

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
3535
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
3636
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
3737
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
38+
connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
39+
connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
40+
connectrpc.com/grpcreflect v1.3.0 h1:Y4V+ACf8/vOb1XOc251Qun7jMB75gCUNw6llvB9csXc=
41+
connectrpc.com/grpcreflect v1.3.0/go.mod h1:nfloOtCS8VUQOQ1+GTdFzVg2CJo4ZGaat8JIovCtDYs=
3842
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
3943
github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
4044
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -60,8 +64,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax
6064
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
6165
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
6266
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
63-
github.com/ava-labs/avalanchego v1.13.6-0.20250925183853-36baa0509d61 h1:jO+73dnER4I04a16ZjEM2M8L40bCXsac1vwKppRkIB8=
64-
github.com/ava-labs/avalanchego v1.13.6-0.20250925183853-36baa0509d61/go.mod h1:xgSvWMEJjXRKXmpeH3yNs2uM4brSYiFqgPaw3c26PwY=
67+
github.com/ava-labs/avalanchego v1.13.6-0.20250929150840-8b8ac94577fe h1:3R8/unbQqLynNHIRGfAH0IPwSUNkxXaietgoYzhYTQA=
68+
github.com/ava-labs/avalanchego v1.13.6-0.20250929150840-8b8ac94577fe/go.mod h1:xgSvWMEJjXRKXmpeH3yNs2uM4brSYiFqgPaw3c26PwY=
6569
github.com/ava-labs/firewood-go-ethhash/ffi v0.0.12 h1:aMcrLbpJ/dyu2kZDf/Di/4JIWsUcYPyTDKymiHpejt0=
6670
github.com/ava-labs/firewood-go-ethhash/ffi v0.0.12/go.mod h1:cq89ua3iiZ5wPBALTEQS5eG8DIZcs7ov6OiL4YR1BVY=
6771
github.com/ava-labs/libevm v1.13.14-0.3.0.release h1:7sPD8wExeLl8XsK2zHNGeDH1p+h6jVMl/Zz867epMD8=
@@ -213,8 +217,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
213217
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
214218
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
215219
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
216-
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
217-
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
220+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
221+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
218222
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
219223
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
220224
github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
@@ -318,8 +322,9 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
318322
github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
319323
github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
320324
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
321-
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U=
322325
github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
326+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
327+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
323328
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
324329
github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
325330
github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4=
@@ -1036,8 +1041,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
10361041
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
10371042
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
10381043
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1039-
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
1040-
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
1044+
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
1045+
google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
10411046
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10421047
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10431048
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/ethapi/testdata/eth_getBlockByHash-hash-1.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@
1010
"extraData": "0x000000000098447800000000000052080000000000000000",
1111
"gasLimit": "0x989680",
1212
"gasUsed": "0x5208",
13-
"hash": "0x43cc4cc6e48d6cc240d0138bac1e76c7f7787aa33160773ea44ff3f15987eba0",
13+
"hash": "0xf81ad58778a090ed344621e354290a8318cfe6d0227d702274799a9f465dc3dd",
1414
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
15+
"minDelayExcess": "0x799d4c",
1516
"miner": "0x0000000000000000000000000000000000000000",
1617
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1718
"nonce": "0x0000000000000000",
1819
"number": "0x1",
1920
"parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
20-
"parentHash": "0x3ea6e4815881ce84bc66eee3e217f867bfaa5253694eb0c10bc1f0bf9ac51b92",
21+
"parentHash": "0x258e78c10ee669d502425096e02e3e01646ec993cd09076f28c5731b1fefa4b1",
2122
"receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
2223
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
23-
"size": "0x2c2",
24+
"size": "0x2c6",
2425
"stateRoot": "0xd2936a5affc08b2842ded96c61db43e85298ef604c36a07eab095a06130edc40",
2526
"timestamp": "0xa",
2627
"timestampMilliseconds": "0x2710",

internal/ethapi/testdata/eth_getBlockByHash-hash-genesis.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"extraData": "0x",
1111
"gasLimit": "0x47e7c4",
1212
"gasUsed": "0x0",
13-
"hash": "0x3ea6e4815881ce84bc66eee3e217f867bfaa5253694eb0c10bc1f0bf9ac51b92",
13+
"hash": "0x258e78c10ee669d502425096e02e3e01646ec993cd09076f28c5731b1fefa4b1",
1414
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
15-
"minDelayExcess": "0x0",
15+
"minDelayExcess": "0x799d4c",
1616
"miner": "0x0000000000000000000000000000000000000000",
1717
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1818
"nonce": "0x0000000000000000",
@@ -21,7 +21,7 @@
2121
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
2222
"receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
2323
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
24-
"size": "0x24b",
24+
"size": "0x24e",
2525
"stateRoot": "0xb7b3d2030ccceaa351c051a03a77862e839cf96e5eec451c4697232e703b754b",
2626
"timestamp": "0x0",
2727
"timestampMilliseconds": "0x0",

internal/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,25 @@
1010
"extraData": "0x000000000098447800000000000052080000000000000000",
1111
"gasLimit": "0x989680",
1212
"gasUsed": "0x5208",
13-
"hash": "0x1d57ee1ba38d7cea475ff06f09614161146e264a35eafa2cf86f1f4137b0e497",
13+
"hash": "0xcff199da2c1c619b9caf41ccae69db6ea642f6bb358e031a4aaf9aa9bf2c5b4e",
1414
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
15+
"minDelayExcess": "0x799d4c",
1516
"miner": "0x0000000000000000000000000000000000000000",
1617
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1718
"nonce": "0x0000000000000000",
1819
"number": "0x9",
1920
"parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
20-
"parentHash": "0x489777b08a1817bde269229f97a1579f77e22f8ec08712f4ba90c7e057519808",
21+
"parentHash": "0xf02eac9a15b7f85237acdda86edbf9b05782a71524ecc96d92d5eed37408e4f1",
2122
"receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
2223
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
23-
"size": "0x2c3",
24+
"size": "0x2c7",
2425
"stateRoot": "0x0079c4f658ca6481223860cbe48a032a7b54de44ef980b1aa9b6be2859663fa4",
2526
"timestamp": "0x5a",
2627
"timestampMilliseconds": "0x15f90",
2728
"totalDifficulty": "0x9",
2829
"transactions": [
2930
{
30-
"blockHash": "0x1d57ee1ba38d7cea475ff06f09614161146e264a35eafa2cf86f1f4137b0e497",
31+
"blockHash": "0xcff199da2c1c619b9caf41ccae69db6ea642f6bb358e031a4aaf9aa9bf2c5b4e",
3132
"blockNumber": "0x9",
3233
"from": "0x703c4b2bd70c169f5717101caee543299fc946c7",
3334
"gas": "0x5208",

0 commit comments

Comments
 (0)