add better error handling and wait for transaction confirmation

Author: jonastheis

permissionless-batches/README.md

@@ -91,9 +91,11 @@ To produce a batch you need to run the `batch-production-submission` profile in
 
 
 Run with `docker compose --profile batch-production-submission up`.
+This will produce chunks, a batch and bundle which will be proven in the next step.
+`Success! You're ready to generate proofs!` indicates that everything is working correctly and the batch is ready to be proven.
 
 #### Proving a batch
-To prove a batch you need to run the `proving` profile in `docker-compose.yml`.
+To prove the chunk, batch and bundle you just generated you need to run the `proving` profile in `docker-compose.yml`.
 
 1. Make sure `verifier` `low_version_circuit` and `high_version_circuit` in `conf/coordinator/config.json` are correct for the latest fork: [TODO link list with versions](#batch-production-toolkit)
 2. Download the latest `assets` and `params` for the circuit from [TODO link list with versions](#batch-production-toolkit) into `conf/coordinator/assets` and `conf/coordinator/params` respectively.
@@ -104,8 +106,17 @@ Run with `docker compose --profile proving up`.
 
 
 #### Batch submission
-TODO
+To submit the batch you need to run the `batch-production-submission` profile in `docker-compose.yml`.
 
+1. Fill in required fields in `conf/relayer/config.json` for the sender config.
+
+Run with `docker compose --profile batch-production-submission up`.
+This will submit the batch to L1 and finalize it. The transaction will be retried in case of failure.
+
+**Troubleshooting**
+- in case the submission fails it will print the calldata for the transaction in an error message. You can use this with `cast call --trace --rpc-url "$SCROLL_L1_DEPLOYMENT_RPC" "$L1_SCROLL_CHAIN_PROXY_ADDR" <calldata>` to see what went wrong.
+  - `0x4df567b9: ErrorNotInEnforcedBatchMode`: permissionless batch mode is not activated, you can't submit a batch
+  - `0xa5d305cc: ErrorBatchIsEmpty`: no blob was provided. This is usually returned if you do the `cast call`, permissionless mode is activated but you didn't provide a blob in the transaction.
 
 ## Operator recovery
 Operator recovery needs to be run by the rollup operator to resume normal rollup operation after permissionless batch mode is deactivated. It consists of two main components:

rollup/cmd/permissionless_batches/app/app.go

@@ -113,7 +113,21 @@ func action(ctx *cli.Context) error {
 			return fmt.Errorf("failed to submit batch: %w", err)
 		}
 
-		// TODO: wait until tx is confirmed here
+		log.Info("Transaction submitted to L1, waiting for confirmation...")
+
+		// Catch CTRL-C to ensure a graceful shutdown.
+		interrupt := make(chan os.Signal, 1)
+		signal.Notify(interrupt, os.Interrupt)
+
+		select {
+		case <-subCtx.Done():
+		case confirmation := <-submitter.Sender().ConfirmChan():
+			if confirmation.IsSuccessful {
+				log.Info("Transaction confirmed on L1, your permissionless batch is part of the ledger!", "tx hash", confirmation.TxHash)
+			}
+		case <-interrupt:
+			log.Info("CTRL-C received, shutting down...")
+		}
 	}
 
 	return nil

rollup/internal/controller/permissionless_batches/minimal_recovery.go

@@ -13,6 +13,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/scroll-tech/go-ethereum/rollup/da_syncer/blob_client"
 	"github.com/scroll-tech/go-ethereum/rollup/l1"
+
 	"scroll-tech/common/types"
 
 	"scroll-tech/database/migrate"
@@ -267,7 +268,7 @@ func (r *MinimalRecovery) restoreMinimalPreviousState() (*orm.Chunk, *orm.Batch,
 	// 4. Get the L1 messages count after the latest finalized batch.
 	var l1MessagesCount uint64
 	if r.cfg.RecoveryConfig.ForceL1MessageCount == 0 {
-		l1MessagesCount, err = reader.FinalizedL1MessageQueueIndex(latestFinalizedL1Block)
+		l1MessagesCount, err = reader.NextUnfinalizedL1MessageQueueIndex(latestFinalizedL1Block)
 		if err != nil {
 			return nil, nil, nil, fmt.Errorf("failed to get L1 messages count: %w", err)
 		}

rollup/internal/controller/permissionless_batches/submitter.go

@@ -2,6 +2,7 @@ package permissionless_batches
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math/big"
 
@@ -15,6 +16,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/scroll-tech/go-ethereum/params"
 	"github.com/scroll-tech/go-ethereum/rpc"
+
 	"scroll-tech/common/types"
 	"scroll-tech/common/types/message"
 	bridgeAbi "scroll-tech/rollup/abi"
@@ -62,6 +64,10 @@ func NewSubmitter(ctx context.Context, db *gorm.DB, cfg *config.RelayerConfig, c
 
 }
 
+func (s *Submitter) Sender() *sender.Sender {
+	return s.finalizeSender
+}
+
 func (s *Submitter) Submit(withProof bool) error {
 	// Check if the bundle is already finalized
 	bundle, err := s.bundleOrm.GetLatestBundle(s.ctx)
@@ -140,9 +146,12 @@ func (s *Submitter) Submit(withProof bool) error {
 		log.Error("commitAndFinalize in layer1 failed", "with proof", withProof, "index", bundle.Index,
 			"batch index", bundle.StartBatchIndex,
 			"RollupContractAddress", s.cfg.RollupContractAddress, "err", err, "calldata", common.Bytes2Hex(calldata))
-		if typedErr, ok := err.(rpc.Error); ok {
-			fmt.Println("errorData", typedErr.ErrorCode())
+
+		var rpcError rpc.DataError
+		if errors.As(err, &rpcError) {
+			log.Error("rpc.DataError ", "error", rpcError.Error(), "message", rpcError.ErrorData())
 		}
+
 		return fmt.Errorf("commitAndFinalize failed, bundle index: %d, err: %w", bundle.Index, err)
 	}