Skip to content

Commit

Permalink
resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@s1na
s1na committed Aug 21, 2024
2 parents dd72f79 + d19422c commit 061d3cb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion EIPS/eip-2935.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ We choose to go with the former. It simplifies the logic greatly. It will take r

Clients have generally two options for inserting the parent block hash into state:

1. Performing a sytstem call to `HISTORY_STORAGE_ADDRESS` and letting that handle the storing in state.
1. Performing a system call to `HISTORY_STORAGE_ADDRESS` and letting that handle the storing in state.
2. Avoid EVM processing and directly write to the state trie.

The latter option is as follows:
Expand Down

0 comments on commit 061d3cb

Please sign in to comment.