Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

fix: add support for mergeForkIdTransition #4463

Merged
merged 14 commits into from
Jul 4, 2023
Merged

fix: add support for mergeForkIdTransition #4463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
20167dc
upgrade @ethereumjs/common to 3.1.2
jeffsmale90 Jun 22, 2023
4ffc97f
WIP - resolve common from blocknumber+timestamp, where it's not avail…
jeffsmale90 Jun 22, 2023
4717d19
One less place that we fetch the block to resolve the common
jeffsmale90 Jun 22, 2023
bd80d60
Shuffle around transaction serialization logic so that we don't need …
jeffsmale90 Jun 26, 2023
ae13677
Revert those silly package-lock files
jeffsmale90 Jun 26, 2023
e99e7f0
Assume rpc transaction has gasPrice set, even for EIP-1559 Fee Market…
jeffsmale90 Jun 27, 2023
b29117a
Revert ethereumjs upgrade, because it does not support nodejs v14.0 :(
jeffsmale90 Jun 27, 2023
44405b7
Add tests for resolving Common by blocknumber and timestamp
jeffsmale90 Jun 28, 2023
8093a75
Only tidy ups
jeffsmale90 Jun 28, 2023
6bbc42b
Add tests for transaction serialization
jeffsmale90 Jun 28, 2023
668d1c3
Extend those transaction serialization tests
jeffsmale90 Jun 29, 2023
c6b824a
tidy up
jeffsmale90 Jun 29, 2023
2612412
Add mergeForkIdTransition hardfork
jeffsmale90 Jun 29, 2023
ca9509c
Merge branch 'develop' into fix/mergeForkIdTransition
jeffsmale90 Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/chains/ethereum/transaction/src/hardfork.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ export type Hardfork =
| "arrowGlacier"
| "grayGlacier"
| "merge"
| "mergeForkIdTransition"
| "shanghai";
2 changes: 2 additions & 0 deletions src/chains/ethereum/transaction/src/params.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export const Params = {
| "arrowGlacier"
| "grayGlacier"
| "merge"
| "mergeForkIdTransition"
| "shanghai",
bigint
>([
Expand All @@ -47,6 +48,7 @@ export const Params = {
["arrowGlacier", 16n],
["grayGlacier", 16n],
["merge", 16n],
["mergeForkIdTransition", 16n],
["shanghai", 16n]
]),

Expand Down