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.

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

modify arbosstate.go to allow for upgrade to arbOS version 35 #216

Merged
merged 5 commits into from
Sep 3, 2024
Merged

modify arbosstate.go to allow for upgrade to arbOS version 35 #216

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d151fc8
modify arbosstate.go to allow for upgrade to arbOS version 35
zacshowa Aug 29, 2024
1967aa8
Fix lint
sveitser Aug 30, 2024
5f3c061
Merge branch 'integration' into arbos-upgrade
sveitser Aug 30, 2024
6110eaf
Modify the chain config during the ArbOS upgrade
zacshowa Aug 30, 2024
82023b7
Merge branch 'integration' into arbos-upgrade
sveitser Sep 3, 2024
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
14 changes: 12 additions & 2 deletions arbos/arbosState/arbosstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ func OpenArbosState(stateDB vm.StateDB, burner burn.Burner) (*ArbosState, error)
}
return &ArbosState{
arbosVersion,
31,
31,
35,
35,
backingStorage.OpenStorageBackedUint64(uint64(upgradeVersionOffset)),
backingStorage.OpenStorageBackedUint64(uint64(upgradeTimestampOffset)),
backingStorage.OpenStorageBackedAddress(uint64(networkFeeAccountOffset)),
Expand Down Expand Up @@ -324,6 +324,16 @@ func (state *ArbosState) UpgradeArbosVersion(
ensure(params.UpgradeToVersion(2))
ensure(params.Save())

case 32, 33, 34:
// these versions are left to Orbit chains for custom upgrades.

case 35:
sveitser marked this conversation as resolved.
Show resolved Hide resolved
// Espresso marketplace compatible ArbOS version.
chainConfig.ArbitrumChainParams.EnableEspresso = true

case 36, 37, 38, 39:
// these versions are left to Orbit chains for custom upgrades.

default:
return fmt.Errorf(
"the chain is upgrading to unsupported ArbOS version %v, %w",
Expand Down
Loading