Add changelog and move arbos version preset to testContext

Author: MishkaRogachev

changelog/mrogachev-nit-4152.md

@@ -0,0 +1,13 @@
+### Added
+- Add static backlog update cost for L2 pricing
+
+### Removed
+- Remove manual backlog update cost calculation for multi-gas multi constraints pricer
+
+### Changed
+- Move multi constraints pricer version constants to go-ethereum/params/config_arbitrum.go
+- Make backlog update cost static, starting from ArbosVersion_MultiGasConstraintsVersion
+- Move arbos version preset to testContext
+
+### Fixed
+- Fix flaky TestMultiGasConstraintsStorage

precompiles/ArbOwner.go

@@ -468,7 +468,7 @@ func (con ArbOwner) SetGasPricingConstraints(c ctx, evm mech, constraints [][3]u
 	}
 
 	arbosVersion := c.State.ArbOSVersion()
-	if arbosVersion >= params.ArbosVersion_MultiConstraintFix && arbosVersion < params.ArbosVersion_60 {
+	if arbosVersion >= params.ArbosVersion_MultiConstraintFix && arbosVersion < params.ArbosVersion_MultiGasConstraintsVersion {
 		limit := l2pricing.GasConstraintsMaxNum
 		if len(constraints) > limit {
 			return fmt.Errorf("too many constraints. Max: %d", limit)

precompiles/ArbRetryableTx_test.go

@@ -14,7 +14,6 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 
 	"github.com/offchainlabs/nitro/arbos"
-	"github.com/offchainlabs/nitro/arbos/burn"
 	"github.com/offchainlabs/nitro/arbos/l2pricing"
 	"github.com/offchainlabs/nitro/arbos/storage"
 	"github.com/offchainlabs/nitro/solgen/go/precompilesgen"
@@ -103,14 +102,6 @@ func testRetryableRedeem(t *testing.T, evm *vm.EVM, precompileCtx *Context) {
 	}
 }
 
-func overrideStateArbOSVersion(evm *vm.EVM, arbosVersion uint64) error {
-	versionSlot := uint64(0)
-	version := new(big.Int).SetUint64(arbosVersion)
-	burner := burn.NewSystemBurner(nil, false)
-	sto := storage.NewGeth(evm.StateDB, burner)
-	return sto.SetByUint64(versionSlot, common.BigToHash(version))
-}
-
 func TestRetryableRedeemLegacy(t *testing.T) {
 	evm := newMockEVMForTesting()
 	precompileCtx := testContext(common.Address{}, evm)
@@ -126,10 +117,8 @@ func TestRetryableRedeemLegacy(t *testing.T) {
 }
 
 func TestRetryableRedeemLegacyArbOS60(t *testing.T) {
-	evm := newMockEVMForTesting()
-	err := overrideStateArbOSVersion(evm, params.ArbosVersion_MultiGasConstraintsVersion)
-	Require(t, err)
-
+	arbosVersion := params.ArbosVersion_MultiGasConstraintsVersion
+	evm := newMockEVMForTestingWithVersion(&arbosVersion)
 	precompileCtx := testContext(common.Address{}, evm)
 
 	model, err := precompileCtx.State.L2PricingState().GasModelToUse()
@@ -165,10 +154,9 @@ func TestRetryableRedeemWithGasConstraints(t *testing.T) {
 	testRetryableRedeem(t, evm, precompileCtx)
 }
 
-func TestRetryableRedeemWithGasConstraintsArbOS60(t *testing.T) {
-	evm := newMockEVMForTesting()
-	err := overrideStateArbOSVersion(evm, params.ArbosVersion_MultiGasConstraintsVersion)
-	Require(t, err)
+func TestRetryableRedeemWithGasConstraintsArbOSMultiGasConstraintsVersion(t *testing.T) {
+	arbosVersion := params.ArbosVersion_MultiGasConstraintsVersion
+	evm := newMockEVMForTestingWithVersion(&arbosVersion)
 
 	precompileCtx := testContext(common.Address{}, evm)
 
@@ -192,9 +180,8 @@ func TestRetryableRedeemWithGasConstraintsArbOS60(t *testing.T) {
 }
 
 func TestRetryableRedeemWithMultiGasConstraints(t *testing.T) {
-	evm := newMockEVMForTesting()
-	err := overrideStateArbOSVersion(evm, params.ArbosVersion_MultiGasConstraintsVersion)
-	Require(t, err)
+	arbosVersion := params.ArbosVersion_MultiGasConstraintsVersion
+	evm := newMockEVMForTestingWithVersion(&arbosVersion)
 
 	precompileCtx := testContext(common.Address{}, evm)
 
@@ -215,7 +202,7 @@ func TestRetryableRedeemWithMultiGasConstraints(t *testing.T) {
 			uint8(multigas.ResourceKindWasmComputation): 6,
 		}
 
-		err = precompileCtx.State.L2PricingState().AddMultiGasConstraint(target, window, backlog, weights)
+		err := precompileCtx.State.L2PricingState().AddMultiGasConstraint(target, window, backlog, weights)
 		Require(t, err)
 	}
 

precompiles/context.go

@@ -15,6 +15,7 @@ import (
 	"github.com/offchainlabs/nitro/arbos"
 	"github.com/offchainlabs/nitro/arbos/arbosState"
 	"github.com/offchainlabs/nitro/arbos/burn"
+	"github.com/offchainlabs/nitro/arbos/storage"
 	"github.com/offchainlabs/nitro/arbos/util"
 )
 
@@ -99,6 +100,13 @@ func testContext(caller addr, evm mech) *Context {
 		tracingInfo: tracingInfo,
 		readOnly:    false,
 	}
+
+	versionOffset := uint64(0)
+	versionValue := new(big.Int).SetUint64(evm.ChainConfig().ArbitrumChainParams.InitialArbOSVersion)
+	burner := burn.NewSystemBurner(nil, false)
+	backingStorage := storage.NewGeth(evm.StateDB, burner)
+	_ = backingStorage.SetByUint64(versionOffset, common.BigToHash(versionValue))
+
 	state, err := arbosState.OpenArbosState(evm.StateDB, burn.NewSystemBurner(tracingInfo, false))
 	if err != nil {
 		panic("unable to open arbos state :" + err.Error())

system_tests/retryable_test.go

@@ -1297,22 +1297,10 @@ func TestL1FundedUnsignedTransaction(t *testing.T) {
 }
 
 func TestRetryableSubmissionAndRedeemFees(t *testing.T) {
-	testRetryableSubmissionAndRedeemFees(t, nil)
-}
-
-func TestRetryableSubmissionAndRedeemFeesArbOS60(t *testing.T) {
-	version := params.ArbosVersion_60
-	testRetryableSubmissionAndRedeemFees(t, &version)
-}
-
-func testRetryableSubmissionAndRedeemFees(t *testing.T, arbosVersion *uint64) {
 	t.Helper()
 
 	builder, delayedInbox, lookupL2Tx, ctx, teardown := retryableSetup(t, func(b *NodeBuilder) {
 		b.WithDatabase(rawdb.DBPebble)
-		if arbosVersion != nil {
-			b.WithArbOSVersion(*arbosVersion)
-		}
 	})
 	defer teardown()
 	infraFeeAddr, networkFeeAddr := setupFeeAddresses(t, ctx, builder)