Merge branch 'master' into consensus-pushes-sync-info

Author: Tristan-Wilson

.github/workflows/_fast.yml

@@ -25,7 +25,7 @@ jobs:
       - name: GolangCI Lint
         uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.1
+          version: v2.5
 
       - name: Custom Lint
         run: |

.github/workflows/fuzz.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
       - id: list
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
       - uses: shogo82148/actions-go-fuzz/run@v1

.github/workflows/nightly-ci.yml

@@ -122,5 +122,7 @@ jobs:
           method: chat.postMessage
           token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
-            "channel": "${{ secrets.SLACK_CHANNEL_ID }}",
-            "text": "⚠️ CI job failed! ${RUN_URL}",
+            {
+              "channel": "${{ secrets.SLACK_CHANNEL_ID }}",
+              "text": "⚠️ CI job failed! ${{ env.RUN_URL }}",
+            }

Dockerfile

@@ -72,7 +72,7 @@ COPY --from=wasm-libs-builder /workspace/ /
 FROM wasm-base AS wasm-bin-builder
 RUN apt update && apt install -y wabt
 # pinned go version
-RUN curl -L https://golang.org/dl/go1.24.5.linux-`dpkg --print-architecture`.tar.gz | tar -C /usr/local -xzf -
+RUN curl -L https://golang.org/dl/go1.25.1.linux-`dpkg --print-architecture`.tar.gz | tar -C /usr/local -xzf -
 COPY ./Makefile ./go.mod ./go.sum ./
 COPY ./arbcompress ./arbcompress
 COPY ./arbos ./arbos
@@ -245,7 +245,7 @@ RUN ./download-machine.sh consensus-v50-rc.3 0x385fa2524d86d4ebc340988224f8686b3
 RUN ./download-machine.sh consensus-v50-rc.4 0x393be710f252e8217d66fe179739eba1ed471f0d5a847b5905c30926d853241a
 RUN ./download-machine.sh consensus-v40 0xdb698a2576298f25448bc092e52cf13b1e24141c997135d70f217d674bbeb69a
 
-FROM golang:1.24.5-bookworm AS node-builder
+FROM golang:1.25-bookworm AS node-builder
 WORKDIR /workspace
 ARG version=""
 ARG datetime=""

arbnode/mel/extraction/message_extraction_function.go

@@ -100,7 +100,7 @@ func extractMessagesImpl(
 	if state.ParentChainBlockHash != parentChainHeader.ParentHash {
 		return nil, nil, nil, fmt.Errorf(
 			"parent chain block hash in MEL state does not match incoming block's parent hash: expected %s, got %s",
-			state.ParentChainPreviousBlockHash.Hex(),
+			state.ParentChainBlockHash.Hex(),
 			parentChainHeader.ParentHash.Hex(),
 		)
 	}

arbnode/transaction_streamer.go

@@ -1063,17 +1063,19 @@ func (s *TransactionStreamer) WriteMessageFromSequencer(
 		if s.insertionMutex.TryLock() {
 			return true
 		}
-		lockTick := time.Tick(5 * time.Millisecond)
-		lockTimeout := time.After(50 * time.Millisecond)
+		lockTicker := time.NewTicker(5 * time.Millisecond)
+		defer lockTicker.Stop()
+		lockTimeout := time.NewTimer(50 * time.Millisecond)
+		defer lockTimeout.Stop()
 		for {
 			select {
-			case <-lockTimeout:
+			case <-lockTimeout.C:
 				return false
 			default:
 				select {
-				case <-lockTimeout:
+				case <-lockTimeout.C:
 					return false
-				case <-lockTick:
+				case <-lockTicker.C:
 					if s.insertionMutex.TryLock() {
 						return true
 					}

arbos/arbosState/arbosstate.go

@@ -34,7 +34,6 @@ import (
 	"github.com/offchainlabs/nitro/arbos/storage"
 	"github.com/offchainlabs/nitro/arbos/util"
 	"github.com/offchainlabs/nitro/cmd/chaininfo"
-	"github.com/offchainlabs/nitro/util/arbmath"
 	"github.com/offchainlabs/nitro/util/testhelpers/env"
 )
 
@@ -392,10 +391,6 @@ func (state *ArbosState) UpgradeArbosVersion(
 			ensure(p.UpgradeToArbosVersion(nextArbosVersion))
 			ensure(p.Save())
 			ensure(state.l2PricingState.SetMaxPerTxGasLimit(l2pricing.InitialPerTxGasLimitV50))
-			oldBlockGasLimit, err := state.l2PricingState.PerBlockGasLimit()
-			ensure(err)
-			newBlockGasLimit := arbmath.SaturatingUMul(oldBlockGasLimit, 4)
-			ensure(state.l2PricingState.SetMaxPerBlockGasLimit(newBlockGasLimit))
 		default:
 			return fmt.Errorf(
 				"the chain is upgrading to unsupported ArbOS version %v, %w",

arbos/block_processor.go

@@ -32,6 +32,7 @@ var ArbRetryableTxAddress common.Address
 var ArbSysAddress common.Address
 var InternalTxStartBlockMethodID [4]byte
 var InternalTxBatchPostingReportMethodID [4]byte
+var InternalTxBatchPostingReportV2MethodID [4]byte
 var RedeemScheduledEventID common.Hash
 var L2ToL1TransactionEventID common.Hash
 var L2ToL1TxEventID common.Hash
@@ -186,7 +187,8 @@ func ProduceBlock(
 	exposeMultiGas bool,
 ) (*types.Block, types.Receipts, error) {
 	chainConfig := chainContext.Config()
-	txes, err := ParseL2Transactions(message, chainConfig.ChainID)
+	lastArbosVersion := types.DeserializeHeaderExtraInformation(lastBlockHeader).ArbOSFormatVersion
+	txes, err := ParseL2Transactions(message, chainConfig.ChainID, lastArbosVersion)
 	if err != nil {
 		log.Warn("error parsing incoming message", "err", err)
 		txes = types.Transactions{}

arbos/incomingmessage_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/params"
 
 	"github.com/offchainlabs/nitro/arbos/arbostypes"
 )
@@ -38,7 +39,7 @@ func TestSerializeAndParseL1Message(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	txes, err := ParseL2Transactions(newMsg, chainId)
+	txes, err := ParseL2Transactions(newMsg, chainId, params.MaxDebugArbosVersionSupported)
 	if err != nil {
 		t.Error(err)
 	}

arbos/internal_tx.go

@@ -117,27 +117,48 @@ func ApplyInternalTxUpdate(tx *types.ArbitrumInternalTx, state *arbosState.Arbos
 		}
 		batchTimestamp := util.SafeMapGet[*big.Int](inputs, "batchTimestamp")
 		batchPosterAddress := util.SafeMapGet[common.Address](inputs, "batchPosterAddress")
+		batchDataGas := util.SafeMapGet[uint64](inputs, "batchDataGas")
+		l1BaseFeeWei := util.SafeMapGet[*big.Int](inputs, "l1BaseFeeWei")
+
+		l1p := state.L1PricingState()
+		perBatchGas, err := l1p.PerBatchGasCost()
+		if err != nil {
+			log.Warn("L1Pricing PerBatchGas failed", "err", err)
+		}
+		gasSpent := arbmath.SaturatingAdd(perBatchGas, arbmath.SaturatingCast[int64](batchDataGas))
+		weiSpent := arbmath.BigMulByUint(l1BaseFeeWei, arbmath.SaturatingUCast[uint64](gasSpent))
+		err = l1p.UpdateForBatchPosterSpending(
+			evm.StateDB,
+			evm,
+			state.ArbOSVersion(),
+			batchTimestamp.Uint64(),
+			evm.Context.Time,
+			batchPosterAddress,
+			weiSpent,
+			l1BaseFeeWei,
+			util.TracingDuringEVM,
+		)
+		if err != nil {
+			log.Warn("L1Pricing UpdateForSequencerSpending failed", "err", err)
+		}
+		return nil
+	case InternalTxBatchPostingReportV2MethodID:
+		inputs, err := util.UnpackInternalTxDataBatchPostingReportV2(tx.Data)
+		if err != nil {
+			return err
+		}
+		batchTimestamp := util.SafeMapGet[*big.Int](inputs, "batchTimestamp")
+		batchPosterAddress := util.SafeMapGet[common.Address](inputs, "batchPosterAddress")
 		batchCalldataLength := util.SafeMapGet[uint64](inputs, "batchCalldataLength")
 		batchCalldataNonZeros := util.SafeMapGet[uint64](inputs, "batchCalldataNonZeros")
-		batchLegacyGas := util.SafeMapGet[uint64](inputs, "batchLegacyGas")
 		batchExtraGas := util.SafeMapGet[uint64](inputs, "batchExtraGas")
 		l1BaseFeeWei := util.SafeMapGet[*big.Int](inputs, "l1BaseFeeWei")
 
-		var gasSpent uint64
-		if batchCalldataLength == ^uint64(0) {
-			if state.ArbOSVersion() >= params.ArbosVersion_50 {
-				return fmt.Errorf("missing batch calldata stats for arbos >= 50")
-			}
-			gasSpent = batchLegacyGas
-		} else {
-			gasSpent = arbostypes.LegacyCostForStats(&arbostypes.BatchDataStats{
-				Length:   batchCalldataLength,
-				NonZeros: batchCalldataNonZeros,
-			})
-			if batchLegacyGas != ^uint64(0) && batchLegacyGas != gasSpent {
-				log.Error("legacy gas doesn't fit local compute", "local", gasSpent, "legacy", batchLegacyGas, "timestamp", batchTimestamp)
-			}
-		}
+		gasSpent := arbostypes.LegacyCostForStats(&arbostypes.BatchDataStats{
+			Length:   batchCalldataLength,
+			NonZeros: batchCalldataNonZeros,
+		})
+
 		gasSpent = arbmath.SaturatingUAdd(gasSpent, batchExtraGas)
 
 		l1p := state.L1PricingState()
@@ -172,9 +193,10 @@ func ApplyInternalTxUpdate(tx *types.ArbitrumInternalTx, state *arbosState.Arbos
 			util.TracingDuringEVM,
 		)
 		if err != nil {
-			log.Warn("L1Pricing UpdateForSequencerSpending failed", "err", err)
+			log.Warn("L1Pricing UpdateForSequencerSpending failed (v2 report)", "err", err)
 		}
 		return nil
+
 	default:
 		return fmt.Errorf("unknown internal tx method selector: %v", hex.EncodeToString(tx.Data[:4]))
 	}