Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 8e2cbb9

Browse filesBrowse files
am1r021am1r021
authored
Merge branch 'master' into implement-eip-7823
2 parents 9bb33b8 + 86d7b9b commit 8e2cbb9
Copy full SHA for 8e2cbb9

File tree

Expand file treeCollapse file tree

5 files changed

+80
-1
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+80
-1
lines changed

‎packages/common/src/enums.ts

Copy file name to clipboardExpand all lines: packages/common/src/enums.ts
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ export const Hardfork = {
8686
Prague: 'prague',
8787
Osaka: 'osaka',
8888
Verkle: 'verkle',
89+
Bpo1: 'bpo1',
90+
Bpo2: 'bpo2',
91+
Bpo3: 'bpo3',
92+
Bpo4: 'bpo4',
93+
Bpo5: 'bpo5',
8994
} as const
9095

9196
export type ConsensusType = (typeof ConsensusType)[keyof typeof ConsensusType]

‎packages/common/src/hardforks.ts

Copy file name to clipboardExpand all lines: packages/common/src/hardforks.ts
+40Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,44 @@ export const hardforksDict: HardforksDict = {
176176
verkle: {
177177
eips: [7709, 4762, 6800],
178178
},
179+
/**
180+
* Description: HF to update the blob target, max and updateFraction
181+
* URL : https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/bpo1.md
182+
* Status : Experimental
183+
*/
184+
bpo1: {
185+
eips: [],
186+
},
187+
/**
188+
* Description: HF to update the blob target, max and updateFraction
189+
* URL : https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/bpo2.md
190+
* Status : Experimental
191+
*/
192+
bpo2: {
193+
eips: [],
194+
},
195+
/**
196+
* Description: HF to update the blob target, max and updateFraction
197+
* URL : https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/bpo3.md
198+
* Status : Experimental
199+
*/
200+
bpo3: {
201+
eips: [],
202+
},
203+
/**
204+
* Description: HF to update the blob target, max and updateFraction
205+
* URL : https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/bpo4.md
206+
* Status : Experimental
207+
*/
208+
bpo4: {
209+
eips: [],
210+
},
211+
/**
212+
* Description: HF to update the blob target, max and updateFraction
213+
* URL : https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/bpo5.md
214+
* Status : Experimental
215+
*/
216+
bpo5: {
217+
eips: [],
218+
},
179219
}

‎packages/common/src/utils.ts

Copy file name to clipboardExpand all lines: packages/common/src/utils.ts
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@ function parseGethParams(gethGenesis: GethGenesis) {
168168
[Hardfork.Prague]: { name: 'pragueTime', postMerge: true, isTimestamp: true },
169169
[Hardfork.Osaka]: { name: 'osakaTime', postMerge: true, isTimestamp: true },
170170
[Hardfork.Verkle]: { name: 'verkleTime', postMerge: true, isTimestamp: true },
171+
[Hardfork.Bpo1]: { name: 'bpo1Time', postMerge: true, isTimestamp: true },
172+
[Hardfork.Bpo2]: { name: 'bpo2Time', postMerge: true, isTimestamp: true },
173+
[Hardfork.Bpo3]: { name: 'bpo3Time', postMerge: true, isTimestamp: true },
174+
[Hardfork.Bpo4]: { name: 'bpo4Time', postMerge: true, isTimestamp: true },
175+
[Hardfork.Bpo5]: { name: 'bpo5Time', postMerge: true, isTimestamp: true },
171176
}
172177

173178
// forkMapRev is the map from config field name to Hardfork

‎packages/common/test/gethGenesis.spec.ts

Copy file name to clipboardExpand all lines: packages/common/test/gethGenesis.spec.ts
+25-1Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,20 @@ describe('[Utils/Parse]', () => {
170170
max: 91,
171171
baseFeeUpdateFraction: 13338477,
172172
},
173+
bpo1: {
174+
target: 71,
175+
max: 101,
176+
baseFeeUpdateFraction: 23338477,
177+
},
178+
bpo2: {
179+
target: 81,
180+
max: 111,
181+
baseFeeUpdateFraction: 33338477,
182+
},
173183
},
174184
pragueTime: 1736942378,
185+
bpo1Time: 1736942478,
186+
bpo2Time: 1736942578,
175187
}
176188
Object.assign(customData.config, customConfigData)
177189

@@ -202,7 +214,19 @@ describe('[Utils/Parse]', () => {
202214
Hardfork.Prague,
203215
blobGasPerBlob * BigInt(customConfigData.blobSchedule.prague.target),
204216
blobGasPerBlob * BigInt(customConfigData.blobSchedule.prague.max),
205-
13338477,
217+
customConfigData.blobSchedule.prague.baseFeeUpdateFraction,
218+
],
219+
[
220+
Hardfork.Bpo1,
221+
blobGasPerBlob * BigInt(customConfigData.blobSchedule.bpo1.target),
222+
blobGasPerBlob * BigInt(customConfigData.blobSchedule.bpo1.max),
223+
customConfigData.blobSchedule.bpo1.baseFeeUpdateFraction,
224+
],
225+
[
226+
Hardfork.Bpo2,
227+
blobGasPerBlob * BigInt(customConfigData.blobSchedule.bpo2.target),
228+
blobGasPerBlob * BigInt(customConfigData.blobSchedule.bpo2.max),
229+
customConfigData.blobSchedule.bpo2.baseFeeUpdateFraction,
206230
],
207231
]
208232
for (const [testHf, testTarget, testMax, testUpdateFraction] of testCases) {

‎packages/evm/src/evm.ts

Copy file name to clipboardExpand all lines: packages/evm/src/evm.ts
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,11 @@ export class EVM implements EVMInterface {
153153
Hardfork.Prague,
154154
Hardfork.Osaka,
155155
Hardfork.Verkle,
156+
Hardfork.Bpo1,
157+
Hardfork.Bpo2,
158+
Hardfork.Bpo3,
159+
Hardfork.Bpo4,
160+
Hardfork.Bpo5,
156161
]
157162
protected _tx?: {
158163
gasPrice: bigint

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.