Skip to content

Commit 0dcbb1a

Browse files
ceyonurceyonur
committed
ACP-226: Add MinDelayExcess to header (#1234)
1 parent 34f9192 commit 0dcbb1a

File tree

40 files changed

+108
-58
lines changed

40 files changed

+108
-58
lines changed

‎RELEASES.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
- Add pending releases here
66
- Upgrade to Go version 1.24
77
- Implement ACP-226: Set expected block gas cost to 0 in Granite network upgrade, removing block gas cost requirements for block building.
8-
- Implement ACP-226: Add timeMilliseconds (Unix uint64) timestamp to block header for Granite upgrade.
8+
- Implement ACP-226: Add `timeMilliseconds` (Unix uint64) timestamp to block header for Granite upgrade.
9+
- Implement ACP-226: Add `minDelayExcess` (uint64) to block header for Granite upgrade.
910

1011
## [v0.7.9](https://github.com/ava-labs/subnet-evm/releases/tag/v0.7.9)
1112

‎core/genesis.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,9 @@ func (g *Genesis) toBlock(db ethdb.Database, triedb *triedb.Database) *types.Blo
362362
if confExtra.IsGranite(g.Timestamp) {
363363
headerExtra.TimeMilliseconds = new(uint64)
364364
*headerExtra.TimeMilliseconds = g.Timestamp * 1000
365+
366+
headerExtra.MinDelayExcess = new(uint64)
367+
*headerExtra.MinDelayExcess = 0
365368
}
366369
}
367370

‎core/genesis_extra_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func TestGenesisToBlockDecoding(t *testing.T) {
8787
upgradetest.Durango: common.HexToHash("0x74dd5d404823f342fb3d372ea289565e5b1ff25d07e48a59db8130c5f61e941a"),
8888
upgradetest.Etna: common.HexToHash("0xa5de01cb7e5c6d721be62ab4b37878e863d65e0c1fe308e5df1f4c5b148650f9"),
8989
upgradetest.Fortuna: common.HexToHash("0xa5de01cb7e5c6d721be62ab4b37878e863d65e0c1fe308e5df1f4c5b148650f9"),
90-
upgradetest.Granite: common.HexToHash("0xea2056b1b65d0d7347a34457efb15ed1f3aea8a7b44067e8eb7e88f593d6ed32"),
90+
upgradetest.Granite: common.HexToHash("0x9f3811050eedcfd289695cd16bbc3ccd9db4c3b32aec1125e96654df35285656"),
9191
}
9292
for fork, chainConfig := range paramstest.ForkToChainConfig {
9393
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
@@ -65,7 +65,7 @@ func setupGenesisBlock(db ethdb.Database, triedb *triedb.Database, genesis *Gene
6565
}
6666

6767
func TestGenesisBlockForTesting(t *testing.T) {
68-
genesisBlockForTestingHash := common.HexToHash("0xb48632f7536a73cb5ae3e913c5cbd15ed32340a83079ced37556315a423019ad")
68+
genesisBlockForTestingHash := common.HexToHash("0x66d680f02c4a370700a8c0af564d147f65b797cc6752ee62675c6e6927dc45ae")
6969
block := GenesisBlockForTesting(rawdb.NewMemoryDatabase(), common.Address{1}, big.NewInt(1))
7070
if block.Hash() != genesisBlockForTestingHash {
7171
t.Errorf("wrong testing genesis hash, got %v, want %v", block.Hash(), genesisBlockForTestingHash)

‎internal/ethapi/api.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,6 +1275,9 @@ func RPCMarshalHeader(head *types.Header) map[string]interface{} {
12751275
if headExtra.TimeMilliseconds != nil {
12761276
result["timestampMilliseconds"] = hexutil.Uint64(*headExtra.TimeMilliseconds)
12771277
}
1278+
if headExtra.MinDelayExcess != nil {
1279+
result["minDelayExcess"] = hexutil.Uint64(*headExtra.MinDelayExcess)
1280+
}
12781281
return result
12791282
}
12801283

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"extraData": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
88
"gasLimit": "0x7a1200",
99
"gasUsed": "0x5208",
10-
"hash": "0xbbf1441803e04e7b2de76afda642c3cccd573908ef9b126dd642d04d48ff4afd",
10+
"hash": "0x52f9cafd5ba612afa80c61f0cbd1413fd7ff88adccc6caf31b135abafff8f5c2",
1111
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
1212
"miner": "0x0000000000000000000000000000000000000000",
1313
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1414
"nonce": "0x0000000000000000",
1515
"number": "0x1",
1616
"parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
17-
"parentHash": "0x783b519e7e7ad68f84befe75a7a8df669228f4102b9d4bc0a2922279b300cc5f",
17+
"parentHash": "0x2bd12052feeb217a8521d3b4fb9998b17924e9f6d776d1ce45d9dd46d17b087c",
1818
"receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
1919
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
2020
"size": "0x2e1",

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
"extraData": "0x",
88
"gasLimit": "0x47e7c4",
99
"gasUsed": "0x0",
10-
"hash": "0x783b519e7e7ad68f84befe75a7a8df669228f4102b9d4bc0a2922279b300cc5f",
10+
"hash": "0x2bd12052feeb217a8521d3b4fb9998b17924e9f6d776d1ce45d9dd46d17b087c",
1111
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
12+
"minDelayExcess": "0x0",
1213
"miner": "0x0000000000000000000000000000000000000000",
1314
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1415
"nonce": "0x0000000000000000",
@@ -17,7 +18,7 @@
1718
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1819
"receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
1920
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
20-
"size": "0x226",
21+
"size": "0x227",
2122
"stateRoot": "0xd883f48b83cc9c1e8389453beb4ad4e572462eec049ca4fffbe16ecefb3fe937",
2223
"timestamp": "0x0",
2324
"timestampMilliseconds": "0x0",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"extraData": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
88
"gasLimit": "0x7a1200",
99
"gasUsed": "0x5208",
10-
"hash": "0x93639ebecc789d313e9e0cf751d51c6c488b0d5157523fa80637e8b8db588009",
10+
"hash": "0xe11dcbcbee11121181a96a9780b736360fa5ce4eea025a196e2bc46fc7f2d369",
1111
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
1212
"miner": "0x0000000000000000000000000000000000000000",
1313
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1414
"nonce": "0x0000000000000000",
1515
"number": "0x9",
1616
"parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
17-
"parentHash": "0xb4362eb77fc3fc42f4d7c7659848712cd04ec5224538cacdca17427bf3a0a470",
17+
"parentHash": "0x93f96b6105875977135589cdc68e8a2cfb9fca99875737c0c3b594cbb9a09ff0",
1818
"receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
1919
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
2020
"size": "0x2e2",
@@ -24,7 +24,7 @@
2424
"totalDifficulty": "0x9",
2525
"transactions": [
2626
{
27-
"blockHash": "0x93639ebecc789d313e9e0cf751d51c6c488b0d5157523fa80637e8b8db588009",
27+
"blockHash": "0xe11dcbcbee11121181a96a9780b736360fa5ce4eea025a196e2bc46fc7f2d369",
2828
"blockNumber": "0x9",
2929
"from": "0x703c4b2bd70c169f5717101caee543299fc946c7",
3030
"gas": "0x5208",

‎internal/ethapi/testdata/eth_getBlockByHash-hash-latest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"extraData": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
88
"gasLimit": "0x7a1200",
99
"gasUsed": "0x5208",
10-
"hash": "0x4b629dd2146133fb2e81848a96bd19c27c25f7f7037a7323c382994e7e5d5c1d",
10+
"hash": "0x63901ae32d0f88fb19b10f95eaa27adfc9fa93f6e6a6c0a9e4f89b43ae85998c",
1111
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
1212
"miner": "0x0000000000000000000000000000000000000000",
1313
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1414
"nonce": "0x0000000000000000",
1515
"number": "0xa",
1616
"parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
17-
"parentHash": "0x93639ebecc789d313e9e0cf751d51c6c488b0d5157523fa80637e8b8db588009",
17+
"parentHash": "0xe11dcbcbee11121181a96a9780b736360fa5ce4eea025a196e2bc46fc7f2d369",
1818
"receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
1919
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
2020
"size": "0x2e2",

‎internal/ethapi/testdata/eth_getBlockByNumber-number-0.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
"extraData": "0x",
88
"gasLimit": "0x47e7c4",
99
"gasUsed": "0x0",
10-
"hash": "0x783b519e7e7ad68f84befe75a7a8df669228f4102b9d4bc0a2922279b300cc5f",
10+
"hash": "0x2bd12052feeb217a8521d3b4fb9998b17924e9f6d776d1ce45d9dd46d17b087c",
1111
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
12+
"minDelayExcess": "0x0",
1213
"miner": "0x0000000000000000000000000000000000000000",
1314
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1415
"nonce": "0x0000000000000000",
@@ -17,7 +18,7 @@
1718
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
1819
"receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
1920
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
20-
"size": "0x226",
21+
"size": "0x227",
2122
"stateRoot": "0xd883f48b83cc9c1e8389453beb4ad4e572462eec049ca4fffbe16ecefb3fe937",
2223
"timestamp": "0x0",
2324
"timestampMilliseconds": "0x0",

0 commit comments

Comments
 (0)