Skip to content

Commit 8d3a51e

Browse files
spencer-tbmarioevz
andauthored
chore(forks): update bpo hardfork params to match testnet (#2234)
* chore(forks): update bpo hardfork params to match testnet. * feat(execute): Update eth-config networks.yml --------- Co-authored-by: Mario Vega <[email protected]>
1 parent 7152202 commit 8d3a51e

File tree

2 files changed

+76
-13
lines changed

2 files changed

+76
-13
lines changed

src/ethereum_test_forks/forks/forks.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,31 +1840,31 @@ def blob_base_cost(cls, block_number: int = 0, timestamp: int = 0) -> int:
18401840

18411841

18421842
class BPO1(Osaka, bpo_fork=True):
1843-
"""BPO1 fork - Blob Parameter Only fork 1."""
1843+
"""Mainnet BPO1 fork - Blob Parameter Only fork 1."""
18441844

18451845
@classmethod
18461846
def blob_base_fee_update_fraction(cls, block_number: int = 0, timestamp: int = 0) -> int:
18471847
"""Return the blob base fee update fraction for BPO1."""
1848-
return 8832827
1848+
return 8346193
18491849

18501850
@classmethod
18511851
def target_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
1852-
"""Blobs in BPO1 have a target of 9 blobs per block."""
1853-
return 9
1852+
"""Blobs in BPO1 have a target of 10 blobs per block."""
1853+
return 10
18541854

18551855
@classmethod
18561856
def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
1857-
"""Blobs in BPO1 have a max of 14 blobs per block."""
1858-
return 14
1857+
"""Blobs in BPO1 have a max of 15 blobs per block."""
1858+
return 15
18591859

18601860

18611861
class BPO2(BPO1, bpo_fork=True):
1862-
"""BPO2 fork - Blob Parameter Only fork 2."""
1862+
"""Mainnet BPO2 fork - Blob Parameter Only fork 2."""
18631863

18641864
@classmethod
18651865
def blob_base_fee_update_fraction(cls, block_number: int = 0, timestamp: int = 0) -> int:
18661866
"""Return the blob base fee update fraction for BPO2."""
1867-
return 13739630
1867+
return 11684671
18681868

18691869
@classmethod
18701870
def target_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
@@ -1878,7 +1878,10 @@ def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
18781878

18791879

18801880
class BPO3(BPO2, bpo_fork=True):
1881-
"""BPO3 fork - Blob Parameter Only fork 3."""
1881+
"""
1882+
Pseudo BPO3 fork - Blob Parameter Only fork 3.
1883+
For testing purposes only.
1884+
"""
18821885

18831886
@classmethod
18841887
def blob_base_fee_update_fraction(cls, block_number: int = 0, timestamp: int = 0) -> int:
@@ -1897,7 +1900,10 @@ def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
18971900

18981901

18991902
class BPO4(BPO3, bpo_fork=True):
1900-
"""BPO4 fork - Blob Parameter Only fork 4."""
1903+
"""
1904+
Pseudo BPO4 fork - Blob Parameter Only fork 4.
1905+
For testing purposes only. Testing a decrease in values from BPO3.
1906+
"""
19011907

19021908
@classmethod
19031909
def blob_base_fee_update_fraction(cls, block_number: int = 0, timestamp: int = 0) -> int:
@@ -1917,8 +1923,8 @@ def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
19171923

19181924
class BPO5(BPO4, bpo_fork=True):
19191925
"""
1920-
BPO5 fork - Blob Parameter Only fork 5 (Required to parse Fusaka devnet
1921-
genesis files).
1926+
Pseudo BPO5 fork - Blob Parameter Only fork 5.
1927+
For testing purposes only. Required to parse Fusaka devnet genesis files.
19221928
"""
19231929

19241930
pass

src/pytest_plugins/execute/eth_config/networks.yml

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@ Mainnet:
2727
target: 6
2828
max: 9
2929
baseFeeUpdateFraction: 5007716
30+
Osaka:
31+
target: 6
32+
max: 9
33+
baseFeeUpdateFraction: 5007716
34+
BPO1:
35+
target: 10
36+
max: 15
37+
baseFeeUpdateFraction: 8346193
38+
BPO2:
39+
target: 14
40+
max: 21
41+
baseFeeUpdateFraction: 11684671
3042

3143
Sepolia:
3244
chainId: 0xaa36a7
@@ -37,6 +49,9 @@ Sepolia:
3749
Shanghai: 1677557088
3850
Cancun: 1706655072
3951
Prague: 1741159776
52+
Osaka: 1760427360
53+
BPO1: 1761017184
54+
BPO2: 1761607008
4055
blobSchedule:
4156
Cancun:
4257
target: 3
@@ -46,6 +61,18 @@ Sepolia:
4661
target: 6
4762
max: 9
4863
baseFeeUpdateFraction: 5007716
64+
Osaka:
65+
target: 6
66+
max: 9
67+
baseFeeUpdateFraction: 5007716
68+
BPO1:
69+
target: 10
70+
max: 15
71+
baseFeeUpdateFraction: 8346193
72+
BPO2:
73+
target: 14
74+
max: 21
75+
baseFeeUpdateFraction: 11684671
4976
addressOverrides:
5077
0x00000000219ab540356cbb839cbe05303d7705fa: 0x7f02c3e3c98b133055b8b348b2ac625669ed295d
5178

@@ -55,6 +82,9 @@ Hoodi:
5582
forkActivationTimes:
5683
Cancun: 0
5784
Prague: 1742999832
85+
Osaka: 1761677592
86+
BPO1: 1762365720
87+
BPO2: 1762955544
5888
blobSchedule:
5989
Cancun:
6090
target: 3
@@ -64,6 +94,18 @@ Hoodi:
6494
target: 6
6595
max: 9
6696
baseFeeUpdateFraction: 5007716
97+
Osaka:
98+
target: 6
99+
max: 9
100+
baseFeeUpdateFraction: 5007716
101+
BPO1:
102+
target: 10
103+
max: 15
104+
baseFeeUpdateFraction: 8346193
105+
BPO2:
106+
target: 14
107+
max: 21
108+
baseFeeUpdateFraction: 11684671
67109

68110
Holesky:
69111
chainId: 0x4268
@@ -73,6 +115,9 @@ Holesky:
73115
Shanghai: 1696000704
74116
Cancun: 1707305664
75117
Prague: 1740434112
118+
Osaka: 1759308480
119+
BPO1: 1759800000
120+
BPO2: 1760389824
76121
addressOverrides:
77122
0x00000000219ab540356cbb839cbe05303d7705fa: 0x4242424242424242424242424242424242424242
78123
blobSchedule:
@@ -83,4 +128,16 @@ Holesky:
83128
Prague:
84129
target: 6
85130
max: 9
86-
baseFeeUpdateFraction: 5007716
131+
baseFeeUpdateFraction: 5007716
132+
Osaka:
133+
target: 6
134+
max: 9
135+
baseFeeUpdateFraction: 5007716
136+
BPO1:
137+
target: 10
138+
max: 15
139+
baseFeeUpdateFraction: 8346193
140+
BPO2:
141+
target: 14
142+
max: 21
143+
baseFeeUpdateFraction: 11684671

0 commit comments

Comments
 (0)