Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix testnet EVM replay #6759

Merged
merged 1 commit into from
Nov 25, 2024
Merged
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions fvm/evm/offchain/blocks/block_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func UseBlockHashCorrection(chainID flow.ChainID, evmHeightOfCurrentBlock uint64
// array of hashes.
if chainID == flow.Mainnet && evmHeightOfCurrentBlock < blockHashListFixHCUEVMHeightMainnet {
return fixedHashes[flow.Mainnet][queriedEVMHeight%256], true
} else if chainID == flow.Testnet && blockHashListBugIntroducedHCUEVMHeightTestnet <= evmHeightOfCurrentBlock && evmHeightOfCurrentBlock < blockHashListFixHCUEVMHeightTestnet {
} else if chainID == flow.Testnet && evmHeightOfCurrentBlock < blockHashListFixHCUEVMHeightTestnet {
return fixedHashes[flow.Testnet][queriedEVMHeight%256], true
}
return gethCommon.Hash{}, false
Expand All @@ -83,11 +83,6 @@ const blockHashListFixHCUEVMHeightMainnet = 8357079
// PR: https://github.com/onflow/flow-go/pull/6734
const blockHashListFixHCUEVMHeightTestnet = 16848829

// Testnet52 - Spork
// Flow Block: 218215350 cc7188f0bdac4c442cc3ee072557d7f7c8ca4462537da945b148d5d0efa7a1ff
// PR: https://github.com/onflow/flow-go/pull/6377
const blockHashListBugIntroducedHCUEVMHeightTestnet = 7038679

// Testnet51 - Height Coordinated Upgrade 1
// Flow Block: 212562161 1a520608c5457f228405c4c30fc39c8a0af7cf915fb2ede7ec5ccffc2a000f57
// PR: https://github.com/onflow/flow-go/pull/6380
Expand Down
Loading