Skip to content

Add HistoryStorageAddress as part of arbos 40 upgrade #3132

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.

Sign up for GitHub

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

Merged
eljobe merged 8 commits into from
Apr 16, 2025
Merged

Add HistoryStorageAddress as part of arbos 40 upgrade #3132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77da75a
Add HistoryStorageAddress as part of arbos 40 upgrade
amsanghi Apr 15, 2025
c9c76fe
Skip calling ProcessParentBlockHash in geth for arbitrum chain
amsanghi Apr 15, 2025
965150f
Merge branch 'master' into eip_2935_arbos_40
amsanghi Apr 15, 2025
b114fc0
Merge branch 'master' into eip_2935_arbos_40
eljobe Apr 15, 2025
dce18f4
Update the pin for go-ethereum
eljobe Apr 15, 2025
0afe9a2
remove first time
amsanghi Apr 16, 2025
d0bffb3
Skip PublishedMachine tests
amsanghi Apr 16, 2025
ed9d716
Merge branch 'master' into eip_2935_arbos_40
amsanghi Apr 16, 2025
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
4 changes: 4 additions & 0 deletions arbos/arbosState/arbosstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/tracing"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/triedb"
Expand Down Expand Up @@ -339,6 +340,9 @@ func (state *ArbosState) UpgradeArbosVersion(
// these versions are left to Orbit chains for custom upgrades.

case params.ArbosVersion_40:
// EIP-2935: Add support for historical block hashes.
stateDB.SetNonce(params.HistoryStorageAddress, 1, tracing.NonceChangeUnspecified)
stateDB.SetCode(params.HistoryStorageAddress, params.HistoryStorageCodeArbitrum)
// The MaxWasmSize was a constant before arbos version 40, and can
// be read as a parameter after arbos version 40.
params, err := state.Programs().Params()
Expand Down
2 changes: 1 addition & 1 deletion go-ethereum
Open in desktop
Submodule go-ethereum updated 6 files
+1 −1 cmd/evm/internal/t8ntool/execution.go
+1 −1 core/chain_makers.go
+1 −1 eth/state_accessor.go
+4 −4 eth/tracers/api.go
+1 −1 internal/ethapi/simulate.go
+1 −1 miner/worker.go
6 changes: 6 additions & 0 deletions system_tests/block_validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,9 @@ func TestBlockValidatorSimpleOnchain(t *testing.T) {
}

func TestBlockValidatorSimpleJITOnchainWithPublishedMachine(t *testing.T) {
t.Skip("Fails cause EIP-2935 (part of arbOs 40) is not implemented in the latest published machine i.e Consensus V32")
// TODO: Remove this skip when consensus V40 is published
// TODO: Make this more robust in the future, so that it can handle if the latest consensus release is behind the arbOS version we want to test.
cr, err := github.LatestConsensusRelease(context.Background())
Require(t, err)
machPath := populateMachineDir(t, cr)
Expand All @@ -326,6 +329,9 @@ func TestBlockValidatorSimpleJITOnchainWithPublishedMachine(t *testing.T) {
}

func TestBlockValidatorSimpleOnchainWithPublishedMachine(t *testing.T) {
t.Skip("Fails cause EIP-2935 (part of arbOs 40) is not implemented in the latest published machine i.e Consensus V32")
// TODO: Remove this skip when consensus V40 is published
// TODO: Make this more robust in the future, so that it can handle if the latest consensus release is behind the arbOS version we want to test.
cr, err := github.LatestConsensusRelease(context.Background())
Require(t, err)
machPath := populateMachineDir(t, cr)
Expand Down
13 changes: 0 additions & 13 deletions system_tests/historical_block_hash_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/params"

"github.com/offchainlabs/nitro/statetransfer"
)

func TestHistoricalBlockHash(t *testing.T) {
Expand All @@ -19,17 +17,6 @@ func TestHistoricalBlockHash(t *testing.T) {
defer cancel()

builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
contractInfo := &statetransfer.AccountInitContractInfo{
Code: params.HistoryStorageCodeArbitrum,
ContractStorage: make(map[common.Hash]common.Hash),
}
accountInfo := statetransfer.AccountInitializationInfo{
Addr: params.HistoryStorageAddress,
EthBalance: big.NewInt(0),
Nonce: 1,
ContractInfo: contractInfo,
}
builder.L2Info.ArbInitData.Accounts = append(builder.L2Info.ArbInitData.Accounts, accountInfo)
cleanup := builder.Build(t)
defer cleanup()

Expand Down
Loading