From d151fc81c597ea40020dca5e593cde1074fcd32c Mon Sep 17 00:00:00 2001 From: Zach Showalter Date: Thu, 29 Aug 2024 16:44:29 -0400 Subject: [PATCH 1/3] modify arbosstate.go to allow for upgrade to arbOS version 35 --- arbos/arbosState/arbosstate.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arbos/arbosState/arbosstate.go b/arbos/arbosState/arbosstate.go index 9ff3dd3aa5..7864c5be2c 100644 --- a/arbos/arbosState/arbosstate.go +++ b/arbos/arbosState/arbosstate.go @@ -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)), @@ -324,6 +324,15 @@ func (state *ArbosState) UpgradeArbosVersion( ensure(params.UpgradeToVersion(2)) ensure(params.Save()) + case 32, 33, 34: + // leave these versions open to orbit chains that may have performed ArbOS upgrades post Bianca. + + case 35: + // Espresso marketplace compatible ArbOS version. + + case 36, 37, 38, 39: + //leave these versions open to orbit chains that may want to perform ArbOS upgrades after upgrading to an espresso integration. + default: return fmt.Errorf( "the chain is upgrading to unsupported ArbOS version %v, %w", From 1967aa80298fb86fbe6a1ed3fad4aadb1c3796e9 Mon Sep 17 00:00:00 2001 From: sveitser Date: Fri, 30 Aug 2024 07:23:33 +0200 Subject: [PATCH 2/3] Fix lint --- arbos/arbosState/arbosstate.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arbos/arbosState/arbosstate.go b/arbos/arbosState/arbosstate.go index 7864c5be2c..a48eb8d53e 100644 --- a/arbos/arbosState/arbosstate.go +++ b/arbos/arbosState/arbosstate.go @@ -325,13 +325,13 @@ func (state *ArbosState) UpgradeArbosVersion( ensure(params.Save()) case 32, 33, 34: - // leave these versions open to orbit chains that may have performed ArbOS upgrades post Bianca. + // these versions are left to Orbit chains for custom upgrades. case 35: // Espresso marketplace compatible ArbOS version. case 36, 37, 38, 39: - //leave these versions open to orbit chains that may want to perform ArbOS upgrades after upgrading to an espresso integration. + // these versions are left to Orbit chains for custom upgrades. default: return fmt.Errorf( From 6110eafe58d100ab4c0d863d2311741d2acc8c0e Mon Sep 17 00:00:00 2001 From: Zach Showalter Date: Fri, 30 Aug 2024 12:07:59 -0400 Subject: [PATCH 3/3] Modify the chain config during the ArbOS upgrade --- arbos/arbosState/arbosstate.go | 1 + 1 file changed, 1 insertion(+) diff --git a/arbos/arbosState/arbosstate.go b/arbos/arbosState/arbosstate.go index a48eb8d53e..b1c47ffdf4 100644 --- a/arbos/arbosState/arbosstate.go +++ b/arbos/arbosState/arbosstate.go @@ -329,6 +329,7 @@ func (state *ArbosState) UpgradeArbosVersion( case 35: // Espresso marketplace compatible ArbOS version. + chainConfig.ArbitrumChainParams.EnableEspresso = true case 36, 37, 38, 39: // these versions are left to Orbit chains for custom upgrades.