Merge pull request #1303 from ethereum-optimism/fix/deterministic-extradata

l2geth: make block hashes deterministic

Merge pull request #1303 from ethereum-optimism/fix/deterministic-extradata
l2geth: make block hashes deterministic
7ffb8350 · Mark Tyneway · GitHub · 33cb9025 · 11d46182 · 7ffb8350
Commit 7ffb8350 authored Jul 30, 2021 by Mark Tyneway Committed by GitHub Jul 30, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

wet-foxes-collect.md .changeset/wet-foxes-collect.md +5 -0

backend.go l2geth/eth/backend.go +10 -0

No files found.
--- a/.changeset/wet-foxes-collect.md
+++ b/.changeset/wet-foxes-collect.md
+---
+'@eth-optimism/l2geth': patch
+---
+
+Make the extradata deterministic for deterministic block hashes
--- a/l2geth/eth/backend.go
+++ b/l2geth/eth/backend.go
@@ -241,6 +241,16 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 }

 func makeExtraData(extra []byte) []byte {
+	if vm.UsingOVM {
+		// Make the extradata deterministic
+		extra, _ = rlp.EncodeToBytes([]interface{}{
+			uint(params.VersionMajor<<16 | params.VersionMinor<<8 | params.VersionPatch),
+			"geth",
+			"go1.15.13",
+			"linux",
+		})
+		return extra
+	}
 	if len(extra) == 0 {
 		// create default extradata
 		extra, _ = rlp.EncodeToBytes([]interface{}{