add debug logs

Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>

bridge/l2/batch_proposer.go

@@ -157,7 +157,7 @@ func (p *BatchProposer) recoverBatchDataBuffer() {
 		}
 		blockBatches, err := p.orm.GetBlockBatches(map[string]interface{}{"hash": batchHash})
 		if err != nil || len(blockBatches) == 0 {
-			return nil, err
+			return nil, err //
 		}
 		blockBatchCache[batchHash] = blockBatches[0]
 		return blockBatches[0], nil
@@ -178,7 +178,11 @@ func (p *BatchProposer) recoverBatchDataBuffer() {
 			continue
 		}
 
-		blockInfos, err := p.orm.GetL2BlockInfos(map[string]interface{}{"batch_hash": batchHash})
+		blockInfos, err := p.orm.GetL2BlockInfos(
+			map[string]interface{}{"batch_hash": batchHash},
+			"order by number ASC",
+		)
+
 		if err != nil {
 			log.Error("could not GetL2BlockInfos", "batch_hash", batchHash, "error", err)
 			continue
@@ -209,18 +213,19 @@ func (p *BatchProposer) tryProposeBatch() {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
-	blocks, err := p.orm.GetUnbatchedL2Blocks(
-		map[string]interface{}{},
-		fmt.Sprintf("order by number ASC LIMIT %d", p.batchBlocksLimit),
-	)
-	if err != nil {
-		log.Error("failed to get unbatched blocks", "err", err)
-		return
-	}
-
 	if p.getBatchDataBufferSize() < p.batchDataBufferSizeLimit {
+		blocks, err := p.orm.GetUnbatchedL2Blocks(
+			map[string]interface{}{},
+			fmt.Sprintf("order by number ASC LIMIT %d", p.batchBlocksLimit),
+		)
+		if err != nil {
+			log.Error("failed to get unbatched blocks", "err", err)
+			return
+		}
+
 		p.proposeBatch(blocks)
 	}
+
 	p.tryCommitBatches()
 }
 
@@ -244,6 +249,7 @@ func (p *BatchProposer) tryCommitBatches() {
 			break
 		}
 	}
+	log.Info("tryCommitBatches", "calldataByteLen", calldataByteLen, "p.commitCalldataSizeLimit", p.commitCalldataSizeLimit)
 	if !commit {
 		return
 	}

bridge/l2/relayer.go

@@ -285,6 +285,7 @@ func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
 	// generate a unique txID and send transaction
 	var bytes []byte
 	for _, batch := range batchData {
+		log.Info("!!!!!", "BatchIndex", batch.Batch.BatchIndex, "BatchHash", batch.Hash().String(), "ParentBatchHash", batch.Batch.ParentBatchHash.String(), "PrevStateRoot", batch.Batch.PrevStateRoot.String(), "NewStateRoot", batch.Batch.NewStateRoot.String())
 		bytes = append(bytes, batch.Hash().Bytes()...)
 	}
 	txID := crypto.Keccak256Hash(bytes).String()
@@ -292,6 +293,7 @@ func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
 	if err != nil {
 		if !errors.Is(err, sender.ErrNoAvailableAccount) {
 			log.Error("Failed to send commitBatches tx to layer1 ", "err", err)
+			fmt.Printf("Calldata = %v\n", common.Bytes2Hex(calldata))
 		}
 		return err
 	}

common/types/batch.go

@@ -7,6 +7,7 @@ import (
 	"math/big"
 
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/common/hexutil"
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/crypto"
 
@@ -140,6 +141,7 @@ func NewBatchData(parentBatch *BlockBatch, blockTraces []*types.BlockTrace, piCf
 
 		// fill in RLP-encoded transactions
 		for _, txData := range trace.Transactions {
+			data, _ := hexutil.Decode(txData.Data)
 			// right now we only support legacy tx
 			tx := types.NewTx(&types.LegacyTx{
 				Nonce:    txData.Nonce,
@@ -147,15 +149,12 @@ func NewBatchData(parentBatch *BlockBatch, blockTraces []*types.BlockTrace, piCf
 				Value:    txData.Value.ToInt(),
 				Gas:      txData.Gas,
 				GasPrice: txData.GasPrice.ToInt(),
-				Data:     []byte(txData.Data),
+				Data:     data,
 				V:        txData.V.ToInt(),
 				R:        txData.R.ToInt(),
 				S:        txData.S.ToInt(),
 			})
-			var rlpBuf bytes.Buffer
-			writer := bufio.NewWriter(&rlpBuf)
-			_ = tx.EncodeRLP(writer)
-			rlpTxData := rlpBuf.Bytes()
+			rlpTxData, _ := tx.MarshalBinary()
 			var txLen [4]byte
 			binary.BigEndian.PutUint32(txLen[:], uint32(len(rlpTxData)))
 			_, _ = batchTxDataWriter.Write(txLen[:])
@@ -175,6 +174,10 @@ func NewBatchData(parentBatch *BlockBatch, blockTraces []*types.BlockTrace, piCf
 		}
 	}
 
+	if err := batchTxDataWriter.Flush(); err != nil {
+		panic("Buffered I/O flush failed")
+	}
+
 	batch.L2Transactions = batchTxDataBuf.Bytes()
 	batchData.piCfg = piCfg
 

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "alpha-v1.3"
+var tag = "alpha-v1.6"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {