chore: use specific lint version

bnb-chain · Feb 14, 2025 · 41c4e2e · 41c4e2e
1 parent ca85ea8
commit 41c4e2e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,8 +23,8 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           working-directory: op-node
-          version: latest
-          args: -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 5m -e "errors.As" -e "errors.Is"
+          version: v1.63.4
+          args: -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 15m -e "errors.As" -e "errors.Is"
 
   op-batcher-lint:
     runs-on: ubuntu-latest
@@ -43,7 +43,7 @@ jobs:
         with:
           working-directory: op-batcher
           version: latest
-          args: -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 5m -e "errors.As" -e "errors.Is"
+          args: -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 15m -e "errors.As" -e "errors.Is"
 
   op-proposer-lint:
     runs-on: ubuntu-latest
@@ -62,7 +62,7 @@ jobs:
         with:
           working-directory: op-proposer
           version: latest
-          args: -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 5m -e "errors.As" -e "errors.Is"
+          args: -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 15m -e "errors.As" -e "errors.Is"
 
   op-service-lint:
     runs-on: ubuntu-latest
@@ -81,7 +81,7 @@ jobs:
         with:
           working-directory: op-service
           version: latest
-          args: -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 5m -e "errors.As" -e "errors.Is"
+          args: -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 15m -e "errors.As" -e "errors.Is"
 
   op-node-test:
     runs-on: ubuntu-latest

diff --git a/op-chain-ops/cmd/check-derivation/main.go b/op-chain-ops/cmd/check-derivation/main.go
@@ -225,7 +225,7 @@ func getRandomSignedTransaction(ctx context.Context, ethClient *ethclient.Client
 	var txData types.TxData
 	switch txType {
 	case types.LegacyTxType:
-		gasLimit, err := core.IntrinsicGas(data, nil, nil, false, true, true, false)
+		gasLimit, err := core.IntrinsicGas(data, nil, nil, false, true, false, false)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get intrinsicGas: %w", err)
 		}
@@ -242,7 +242,7 @@ func getRandomSignedTransaction(ctx context.Context, ethClient *ethclient.Client
 			Address:     randomAddress,
 			StorageKeys: []common.Hash{common.HexToHash("0x1234")},
 		}}
-		gasLimit, err := core.IntrinsicGas(data, accessList, nil, false, true, true, false)
+		gasLimit, err := core.IntrinsicGas(data, accessList, nil, false, true, false, false)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get intrinsicGas: %w", err)
 		}
@@ -257,7 +257,7 @@ func getRandomSignedTransaction(ctx context.Context, ethClient *ethclient.Client
 			Data:       data,
 		}
 	case types.DynamicFeeTxType:
-		gasLimit, err := core.IntrinsicGas(data, nil, nil, false, true, true, false)
+		gasLimit, err := core.IntrinsicGas(data, nil, nil, false, true, false, false)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get intrinsicGas: %w", err)
 		}

diff --git a/op-e2e/actions/l2_batcher.go b/op-e2e/actions/l2_batcher.go
@@ -277,7 +277,7 @@ func (s *L2Batcher) ActL2BatchSubmit(t Testing, txOpts ...func(tx *types.Dynamic
 			opt(rawTx)
 		}
 
-		gas, err := core.IntrinsicGas(rawTx.Data, nil, nil, false, true, true, false)
+		gas, err := core.IntrinsicGas(rawTx.Data, nil, nil, false, true, false, false)
 		require.NoError(t, err, "need to compute intrinsic gas")
 		rawTx.Gas = gas
 		txData = rawTx
@@ -468,7 +468,7 @@ func (s *L2Batcher) ActL2BatchSubmitGarbage(t Testing, kind GarbageKind) {
 		GasFeeCap: gasFeeCap,
 		Data:      outputFrame,
 	}
-	gas, err := core.IntrinsicGas(rawTx.Data, nil, nil, false, true, true, false)
+	gas, err := core.IntrinsicGas(rawTx.Data, nil, nil, false, true, false, false)
 	require.NoError(t, err, "need to compute intrinsic gas")
 	rawTx.Gas = gas
 

diff --git a/op-e2e/actions/span_batch_test.go b/op-e2e/actions/span_batch_test.go
@@ -524,7 +524,7 @@ func TestSpanBatchLowThroughputChain(gt *testing.T) {
 				data := make([]byte, rand.Intn(100))
 				_, err := crand.Read(data[:]) // fill with random bytes
 				require.NoError(t, err)
-				gas, err := core.IntrinsicGas(data, nil, nil, false, true, true, false)
+				gas, err := core.IntrinsicGas(data, nil, nil, false, true, false, false)
 				require.NoError(t, err)
 				baseFee := seqEngine.l2Chain.CurrentBlock().BaseFee
 				nonce, err := cl.PendingNonceAt(t.Ctx(), addrs[userIdx])
@@ -663,7 +663,7 @@ func TestBatchEquivalence(gt *testing.T) {
 			data := make([]byte, rand.Intn(100))
 			_, err := crand.Read(data[:]) // fill with random bytes
 			require.NoError(t, err)
-			gas, err := core.IntrinsicGas(data, nil, nil, false, true, true, false)
+			gas, err := core.IntrinsicGas(data, nil, nil, false, true, false, false)
 			require.NoError(t, err)
 			baseFee := seqEngine.l2Chain.CurrentBlock().BaseFee
 			nonce, err := seqEngCl.PendingNonceAt(t.Ctx(), addrs[userIdx])

diff --git a/op-e2e/actions/sync_test.go b/op-e2e/actions/sync_test.go
@@ -896,7 +896,7 @@ func TestInvalidPayloadInSpanBatch(gt *testing.T) {
 			aliceNonce, err := seqEng.EthClient().PendingNonceAt(t.Ctx(), dp.Addresses.Alice)
 			require.NoError(t, err)
 			data := make([]byte, rand.Intn(100))
-			gas, err := core.IntrinsicGas(data, nil, nil, false, true, true, false)
+			gas, err := core.IntrinsicGas(data, nil, nil, false, true, false, false)
 			require.NoError(t, err)
 			baseFee := seqEng.l2Chain.CurrentBlock().BaseFee
 			tx := types.MustSignNewTx(dp.Secrets.Alice, signer, &types.DynamicFeeTx{

diff --git a/op-e2e/brotli_batcher_test.go b/op-e2e/brotli_batcher_test.go
@@ -85,7 +85,7 @@ func TestBrotliBatcherFjord(t *testing.T) {
 		opts.Value = big.NewInt(1_000_000_000)
 		opts.Nonce = 1 // Already have deposit
 		opts.ToAddr = &common.Address{0xff, 0xff}
-		opts.Gas, err = core.IntrinsicGas(opts.Data, nil, nil, false, true, true, false)
+		opts.Gas, err = core.IntrinsicGas(opts.Data, nil, nil, false, true, false, false)
 		require.NoError(t, err)
 		opts.VerifyOnClients(l2Verif)
 	})

diff --git a/op-e2e/eip4844_test.go b/op-e2e/eip4844_test.go
@@ -102,7 +102,7 @@ func testSystem4844E2E(t *testing.T, multiBlob bool) {
 		opts.ToAddr = &common.Address{0xff, 0xff}
 		// put some random data in the tx to make it fill up 6 blobs (multi-blob case)
 		opts.Data = testutils.RandomData(rand.New(rand.NewSource(420)), 400)
-		opts.Gas, err = core.IntrinsicGas(opts.Data, nil, nil, false, true, true, false)
+		opts.Gas, err = core.IntrinsicGas(opts.Data, nil, nil, false, true, false, false)
 		require.NoError(t, err)
 		opts.VerifyOnClients(l2Verif)
 	})