Remove count limit for gas constraints

Author: MishkaRogachev

arbos/l2pricing/l2pricing.go

@@ -46,10 +46,6 @@ var multigasConstraintsKey []byte = []byte{1}
 
 const GethBlockGasLimit = 1 << 50
 
-// TODO(NIT-4152): Number of constraints limited because of retryable redeem gas cost calculation.
-const GasConstraintsMaxNum = 20
-const MultiGasConstraintsMaxNum = 15
-
 // MaxPricingExponentBips caps the basefee growth: exp(8.5) ~= x5,000 min base fee.
 const MaxPricingExponentBips = arbmath.Bips(85_000)
 

precompiles/ArbOwner.go

@@ -467,13 +467,6 @@ func (con ArbOwner) SetGasPricingConstraints(c ctx, evm mech, constraints [][3]u
 		return fmt.Errorf("failed to clear existing constraints: %w", err)
 	}
 
-	if c.State.ArbOSVersion() >= params.ArbosVersion_MultiConstraintFix {
-		limit := l2pricing.GasConstraintsMaxNum
-		if len(constraints) > limit {
-			return fmt.Errorf("too many constraints. Max: %d", limit)
-		}
-	}
-
 	for _, constraint := range constraints {
 		gasTargetPerSecond := constraint[0]
 		adjustmentWindowSeconds := constraint[1]
@@ -497,11 +490,6 @@ func (con ArbOwner) SetMultiGasPricingConstraints(
 	evm mech,
 	constraints []MultiGasConstraint,
 ) error {
-	limit := l2pricing.MultiGasConstraintsMaxNum
-	if len(constraints) > limit {
-		return fmt.Errorf("too many constraints. Max: %d", limit)
-	}
-
 	if err := c.State.L2PricingState().ClearMultiGasConstraints(); err != nil {
 		return fmt.Errorf("failed to clear existing multi-gas constraints: %w", err)
 	}

precompiles/ArbRetryableTx_test.go

@@ -120,7 +120,7 @@ func TestRetryableRedeemWithSingleGasConstraints(t *testing.T) {
 	evm := newMockEVMForTesting()
 	precompileCtx := testContext(common.Address{}, evm)
 
-	for i := range l2pricing.GasConstraintsMaxNum {
+	for i := range 20 {
 		// #nosec G115
 		target0 := uint64((i + 1) * 1000000)
 		// #nosec G115
@@ -155,7 +155,7 @@ func TestRetryableRedeemWithMultiGasConstraints(t *testing.T) {
 	err := sto.SetByUint64(versionSlot, common.BigToHash(version))
 	Require(t, err)
 
-	for i := range l2pricing.MultiGasConstraintsMaxNum {
+	for i := range 100 {
 		// #nosec G115
 		target := uint64((i + 1) * 1000000)
 		// #nosec G115

system_tests/retryable_test.go

@@ -1297,8 +1297,22 @@ 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)