tweak

Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>

bridge/internal/controller/relayer/l2_relayer.go

@@ -457,27 +457,20 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 			}
 		}()
 
-		proofBuffer, icBuffer, err := r.blockBatchOrm.GetVerifiedProofAndInstanceCommitmentsByHash(hash)
+		aggProof, err := r.blockBatchOrm.GetVerifiedProofByHash(hash)
 		if err != nil {
-			log.Warn("fetch get proof by hash failed", "hash", hash, "err", err)
-			return
-		}
-		if proofBuffer == nil || icBuffer == nil {
-			log.Warn("proof or instance not ready", "hash", hash)
-			return
-		}
-		if len(proofBuffer)%32 != 0 {
-			log.Error("proof buffer has wrong length", "hash", hash, "length", len(proofBuffer))
-			return
-		}
-		if len(icBuffer)%32 != 0 {
-			log.Warn("instance buffer has wrong length", "hash", hash, "length", len(icBuffer))
+			log.Warn("get verified proof by hash failed", "hash", hash, "err", err)
 			return
 		}
 
-		proof := utils.BufferToUint256Le(proofBuffer)
-		instance := utils.BufferToUint256Le(icBuffer)
-		data, err := r.l1RollupABI.Pack("finalizeBatchWithProof", common.HexToHash(hash), proof, instance)
+		if err = aggProof.SanityCheck(); err != nil {
+			log.Warn("agg_proof sanity check fails", "hash", hash, "error", err)
+			return
+		}
+
+		proof := utils.BufferToUint256Le(aggProof.Proof)
+		finalPair := utils.BufferToUint256Le(aggProof.FinalPair)
+		data, err := r.l1RollupABI.Pack("finalizeBatchWithProof", common.HexToHash(hash), proof, finalPair)
 		if err != nil {
 			log.Error("Pack finalizeBatchWithProof failed", "err", err)
 			return

bridge/internal/controller/relayer/l2_relayer_test.go

@@ -18,6 +18,7 @@ import (
 	"gorm.io/gorm"
 
 	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
 	"scroll-tech/common/utils"
 
 	"scroll-tech/bridge/internal/controller/sender"
@@ -156,9 +157,11 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	err = blockBatchOrm.UpdateRollupStatus(context.Background(), batchHash, types.RollupCommitted)
 	assert.NoError(t, err)
 
-	tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	err = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
+	proof := &message.AggProof{
+		Proof:     []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
+		FinalPair: []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
+	}
+	err = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, proof, 100)
 	assert.NoError(t, err)
 	err = blockBatchOrm.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
 	assert.NoError(t, err)
@@ -199,9 +202,11 @@ func testL2RelayerSkipBatches(t *testing.T) {
 		err = blockBatchOrm.UpdateRollupStatus(context.Background(), batchHash, rollupStatus)
 		assert.NoError(t, err)
 
-		tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-		tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-		err = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
+		proof := &message.AggProof{
+			Proof:     []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
+			FinalPair: []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
+		}
+		err = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, proof, 100)
 		assert.NoError(t, err)
 		err = blockBatchOrm.UpdateProvingStatus(batchHash, provingStatus)
 		assert.NoError(t, err)

bridge/internal/orm/block_batch.go

@@ -2,6 +2,7 @@ package orm
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"time"
 
@@ -9,6 +10,7 @@ import (
 	"gorm.io/gorm"
 
 	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
 
 	bridgeTypes "scroll-tech/bridge/internal/types"
 )
@@ -17,31 +19,30 @@ import (
 type BlockBatch struct {
 	db *gorm.DB `gorm:"column:-"`
 
-	Hash                string     `json:"hash" gorm:"column:hash"`
-	Index               uint64     `json:"index" gorm:"column:index"`
-	StartBlockNumber    uint64     `json:"start_block_number" gorm:"column:start_block_number"`
-	StartBlockHash      string     `json:"start_block_hash" gorm:"column:start_block_hash"`
-	EndBlockNumber      uint64     `json:"end_block_number" gorm:"column:end_block_number"`
-	EndBlockHash        string     `json:"end_block_hash" gorm:"column:end_block_hash"`
-	ParentHash          string     `json:"parent_hash" gorm:"column:parent_hash"`
-	StateRoot           string     `json:"state_root" gorm:"column:state_root"`
-	TotalTxNum          uint64     `json:"total_tx_num" gorm:"column:total_tx_num"`
-	TotalL1TxNum        uint64     `json:"total_l1_tx_num" gorm:"column:total_l1_tx_num"`
-	TotalL2Gas          uint64     `json:"total_l2_gas" gorm:"column:total_l2_gas"`
-	ProvingStatus       int        `json:"proving_status" gorm:"column:proving_status;default:1"`
-	Proof               []byte     `json:"proof" gorm:"column:proof"`
-	InstanceCommitments []byte     `json:"instance_commitments" gorm:"column:instance_commitments"`
-	ProofTimeSec        uint64     `json:"proof_time_sec" gorm:"column:proof_time_sec;default:0"`
-	RollupStatus        int        `json:"rollup_status" gorm:"column:rollup_status;default:1"`
-	CommitTxHash        string     `json:"commit_tx_hash" gorm:"column:commit_tx_hash;default:NULL"`
-	OracleStatus        int        `json:"oracle_status" gorm:"column:oracle_status;default:1"`
-	OracleTxHash        string     `json:"oracle_tx_hash" gorm:"column:oracle_tx_hash;default:NULL"`
-	FinalizeTxHash      string     `json:"finalize_tx_hash" gorm:"column:finalize_tx_hash;default:NULL"`
-	CreatedAt           time.Time  `json:"created_at" gorm:"column:created_at;default:CURRENT_TIMESTAMP()"`
-	ProverAssignedAt    *time.Time `json:"prover_assigned_at" gorm:"column:prover_assigned_at;default:NULL"`
-	ProvedAt            *time.Time `json:"proved_at" gorm:"column:proved_at;default:NULL"`
-	CommittedAt         *time.Time `json:"committed_at" gorm:"column:committed_at;default:NULL"`
-	FinalizedAt         *time.Time `json:"finalized_at" gorm:"column:finalized_at;default:NULL"`
+	Hash             string     `json:"hash" gorm:"column:hash"`
+	Index            uint64     `json:"index" gorm:"column:index"`
+	StartBlockNumber uint64     `json:"start_block_number" gorm:"column:start_block_number"`
+	StartBlockHash   string     `json:"start_block_hash" gorm:"column:start_block_hash"`
+	EndBlockNumber   uint64     `json:"end_block_number" gorm:"column:end_block_number"`
+	EndBlockHash     string     `json:"end_block_hash" gorm:"column:end_block_hash"`
+	ParentHash       string     `json:"parent_hash" gorm:"column:parent_hash"`
+	StateRoot        string     `json:"state_root" gorm:"column:state_root"`
+	TotalTxNum       uint64     `json:"total_tx_num" gorm:"column:total_tx_num"`
+	TotalL1TxNum     uint64     `json:"total_l1_tx_num" gorm:"column:total_l1_tx_num"`
+	TotalL2Gas       uint64     `json:"total_l2_gas" gorm:"column:total_l2_gas"`
+	ProvingStatus    int        `json:"proving_status" gorm:"column:proving_status;default:1"`
+	Proof            []byte     `json:"proof" gorm:"column:proof"`
+	ProofTimeSec     uint64     `json:"proof_time_sec" gorm:"column:proof_time_sec;default:0"`
+	RollupStatus     int        `json:"rollup_status" gorm:"column:rollup_status;default:1"`
+	CommitTxHash     string     `json:"commit_tx_hash" gorm:"column:commit_tx_hash;default:NULL"`
+	OracleStatus     int        `json:"oracle_status" gorm:"column:oracle_status;default:1"`
+	OracleTxHash     string     `json:"oracle_tx_hash" gorm:"column:oracle_tx_hash;default:NULL"`
+	FinalizeTxHash   string     `json:"finalize_tx_hash" gorm:"column:finalize_tx_hash;default:NULL"`
+	CreatedAt        time.Time  `json:"created_at" gorm:"column:created_at;default:CURRENT_TIMESTAMP()"`
+	ProverAssignedAt *time.Time `json:"prover_assigned_at" gorm:"column:prover_assigned_at;default:NULL"`
+	ProvedAt         *time.Time `json:"proved_at" gorm:"column:proved_at;default:NULL"`
+	CommittedAt      *time.Time `json:"committed_at" gorm:"column:committed_at;default:NULL"`
+	FinalizedAt      *time.Time `json:"finalized_at" gorm:"column:finalized_at;default:NULL"`
 }
 
 // NewBlockBatch create an blockBatchOrm instance
@@ -100,14 +101,24 @@ func (o *BlockBatch) GetBlockBatchesHashByRollupStatus(status types.RollupStatus
 	return hashes, nil
 }
 
-// GetVerifiedProofAndInstanceCommitmentsByHash get verified proof and instance comments by hash
-func (o *BlockBatch) GetVerifiedProofAndInstanceCommitmentsByHash(hash string) ([]byte, []byte, error) {
-	var blockBatch BlockBatch
-	err := o.db.Select("proof, instance_commitments").Where("hash", hash).Where("proving_status", int(types.ProvingTaskVerified)).Find(&blockBatch).Error
-	if err != nil {
-		return nil, nil, err
+// GetVerifiedProofByHash get verified proof and instance comments by hash
+func (o *BlockBatch) GetVerifiedProofByHash(hash string) (*message.AggProof, error) {
+	result := o.db.Model(&BlockBatch{}).Select("proof").Where("hash", hash).Where("proving_status", int(types.ProvingTaskVerified)).Row()
+	if result.Err() != nil {
+		return nil, result.Err()
 	}
-	return blockBatch.Proof, blockBatch.InstanceCommitments, nil
+
+	var proofBytes []byte
+	if err := result.Scan(&proofBytes); err != nil {
+		return nil, err
+	}
+
+	var proof message.AggProof
+	if err := json.Unmarshal(proofBytes, &proof); err != nil {
+		return nil, err
+	}
+
+	return &proof, nil
 }
 
 // GetLatestBatch get the latest batch
@@ -147,10 +158,17 @@ func (o *BlockBatch) GetRollupStatusByHashList(hashes []string) ([]types.RollupS
 		return nil, err
 	}
 
-	var statuses []types.RollupStatus
-	for _, v := range blockBatches {
-		statuses = append(statuses, types.RollupStatus(v.RollupStatus))
+	var (
+		statuses   []types.RollupStatus
+		_statusMap = make(map[string]types.RollupStatus, len(hashes))
+	)
+	for _, _batch := range blockBatches {
+		_statusMap[_batch.Hash] = types.RollupStatus(_batch.RollupStatus)
 	}
+	for _, _hash := range hashes {
+		statuses = append(statuses, _statusMap[_hash])
+	}
+
 	return statuses, nil
 }
 
@@ -279,12 +297,16 @@ func (o *BlockBatch) UpdateL2GasOracleStatusAndOracleTxHash(ctx context.Context,
 
 // UpdateProofByHash update the block batch proof by hash
 // for unit test
-func (o *BlockBatch) UpdateProofByHash(ctx context.Context, hash string, proof, instanceCommitments []byte, proofTimeSec uint64) error {
+func (o *BlockBatch) UpdateProofByHash(ctx context.Context, hash string, proof *message.AggProof, proofTimeSec uint64) error {
+	proofBytes, err := json.Marshal(proof)
+	if err != nil {
+		return err
+	}
+
 	updateFields := make(map[string]interface{})
-	updateFields["proof"] = proof
-	updateFields["instance_commitments"] = instanceCommitments
+	updateFields["proof"] = proofBytes
 	updateFields["proof_time_sec"] = proofTimeSec
-	err := o.db.WithContext(ctx).Model(&BlockBatch{}).Where("hash", hash).Updates(updateFields).Error
+	err = o.db.WithContext(ctx).Model(&BlockBatch{}).Where("hash", hash).Updates(updateFields).Error
 	if err != nil {
 		log.Error("failed to update proof", "err", err)
 	}

bridge/internal/orm/migrate/migrations/00002_l1_message.sql

@@ -13,8 +13,8 @@ create table l1_message
     layer1_hash  VARCHAR NOT NULL,
     layer2_hash  VARCHAR DEFAULT NULL,
     status       INTEGER  DEFAULT 1,
-    created_time TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_time TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
+    created_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 comment
@@ -32,7 +32,7 @@ create index l1_message_height_index
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
 BEGIN
-   NEW.updated_time = CURRENT_TIMESTAMP;
+   NEW.updated_at = CURRENT_TIMESTAMP;
    RETURN NEW;
 END;
 $$ language 'plpgsql';

bridge/internal/orm/migrate/migrations/00003_l2_message.sql

@@ -13,8 +13,8 @@ create table l2_message
     layer1_hash  VARCHAR DEFAULT NULL,
     proof        TEXT    DEFAULT NULL,
     status       INTEGER  DEFAULT 1,
-    created_time TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_time TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
+    created_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 comment
@@ -32,7 +32,7 @@ create index l2_message_height_index
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
 BEGIN
-   NEW.updated_time = CURRENT_TIMESTAMP;
+   NEW.updated_at = CURRENT_TIMESTAMP;
    RETURN NEW;
 END;
 $$ language 'plpgsql';

bridge/internal/orm/migrate/migrations/00004_block_batch.sql

@@ -16,7 +16,6 @@ create table block_batch
     total_l2_gas            BIGINT          NOT NULL,
     proving_status          INTEGER         DEFAULT 1,
     proof                   BYTEA           DEFAULT NULL,
-    instance_commitments    BYTEA           DEFAULT NULL,
     proof_time_sec          INTEGER         DEFAULT 0,
     rollup_status           INTEGER         DEFAULT 1,
     commit_tx_hash          VARCHAR         DEFAULT NULL,

bridge/tests/l2_message_relay_test.go

@@ -14,6 +14,7 @@ import (
 	"gorm.io/gorm"
 
 	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
 
 	"scroll-tech/bridge/internal/controller/relayer"
 	"scroll-tech/bridge/internal/controller/watcher"
@@ -110,9 +111,11 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.NoError(t, err)
 
 	// add dummy proof
-	tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	err = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
+	proof := &message.AggProof{
+		Proof:     []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
+		FinalPair: []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
+	}
+	err = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, proof, 100)
 	assert.NoError(t, err)
 	err = blockBatchOrm.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
 	assert.NoError(t, err)

bridge/tests/rollup_test.go

@@ -13,6 +13,7 @@ import (
 	"gorm.io/gorm"
 
 	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
 
 	"scroll-tech/bridge/internal/controller/relayer"
 	"scroll-tech/bridge/internal/controller/watcher"
@@ -117,9 +118,11 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	assert.Equal(t, types.RollupCommitted, statuses[0])
 
 	// add dummy proof
-	tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	err = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
+	proof := &message.AggProof{
+		Proof:     []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
+		FinalPair: []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
+	}
+	err = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, proof, 100)
 	assert.NoError(t, err)
 	err = blockBatchOrm.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
 	assert.NoError(t, err)

common/types/db.go

@@ -233,31 +233,30 @@ const (
 
 // BlockBatch is structure of stored block_batch
 type BlockBatch struct {
-	Hash                string          `json:"hash" db:"hash"`
-	Index               uint64          `json:"index" db:"index"`
-	ParentHash          string          `json:"parent_hash" db:"parent_hash"`
-	StartBlockNumber    uint64          `json:"start_block_number" db:"start_block_number"`
-	StartBlockHash      string          `json:"start_block_hash" db:"start_block_hash"`
-	EndBlockNumber      uint64          `json:"end_block_number" db:"end_block_number"`
-	EndBlockHash        string          `json:"end_block_hash" db:"end_block_hash"`
-	StateRoot           string          `json:"state_root" db:"state_root"`
-	TotalTxNum          uint64          `json:"total_tx_num" db:"total_tx_num"`
-	TotalL1TxNum        uint64          `json:"total_l1_tx_num" db:"total_l1_tx_num"`
-	TotalL2Gas          uint64          `json:"total_l2_gas" db:"total_l2_gas"`
-	ProvingStatus       ProvingStatus   `json:"proving_status" db:"proving_status"`
-	Proof               []byte          `json:"proof" db:"proof"`
-	InstanceCommitments []byte          `json:"instance_commitments" db:"instance_commitments"`
-	ProofTimeSec        uint64          `json:"proof_time_sec" db:"proof_time_sec"`
-	RollupStatus        RollupStatus    `json:"rollup_status" db:"rollup_status"`
-	OracleStatus        GasOracleStatus `json:"oracle_status" db:"oracle_status"`
-	CommitTxHash        sql.NullString  `json:"commit_tx_hash" db:"commit_tx_hash"`
-	FinalizeTxHash      sql.NullString  `json:"finalize_tx_hash" db:"finalize_tx_hash"`
-	OracleTxHash        sql.NullString  `json:"oracle_tx_hash" db:"oracle_tx_hash"`
-	CreatedAt           *time.Time      `json:"created_at" db:"created_at"`
-	ProverAssignedAt    *time.Time      `json:"prover_assigned_at" db:"prover_assigned_at"`
-	ProvedAt            *time.Time      `json:"proved_at" db:"proved_at"`
-	CommittedAt         *time.Time      `json:"committed_at" db:"committed_at"`
-	FinalizedAt         *time.Time      `json:"finalized_at" db:"finalized_at"`
+	Hash             string          `json:"hash" db:"hash"`
+	Index            uint64          `json:"index" db:"index"`
+	ParentHash       string          `json:"parent_hash" db:"parent_hash"`
+	StartBlockNumber uint64          `json:"start_block_number" db:"start_block_number"`
+	StartBlockHash   string          `json:"start_block_hash" db:"start_block_hash"`
+	EndBlockNumber   uint64          `json:"end_block_number" db:"end_block_number"`
+	EndBlockHash     string          `json:"end_block_hash" db:"end_block_hash"`
+	StateRoot        string          `json:"state_root" db:"state_root"`
+	TotalTxNum       uint64          `json:"total_tx_num" db:"total_tx_num"`
+	TotalL1TxNum     uint64          `json:"total_l1_tx_num" db:"total_l1_tx_num"`
+	TotalL2Gas       uint64          `json:"total_l2_gas" db:"total_l2_gas"`
+	ProvingStatus    ProvingStatus   `json:"proving_status" db:"proving_status"`
+	Proof            []byte          `json:"proof" db:"proof"`
+	ProofTimeSec     uint64          `json:"proof_time_sec" db:"proof_time_sec"`
+	RollupStatus     RollupStatus    `json:"rollup_status" db:"rollup_status"`
+	OracleStatus     GasOracleStatus `json:"oracle_status" db:"oracle_status"`
+	CommitTxHash     sql.NullString  `json:"commit_tx_hash" db:"commit_tx_hash"`
+	FinalizeTxHash   sql.NullString  `json:"finalize_tx_hash" db:"finalize_tx_hash"`
+	OracleTxHash     sql.NullString  `json:"oracle_tx_hash" db:"oracle_tx_hash"`
+	CreatedAt        *time.Time      `json:"created_at" db:"created_at"`
+	ProverAssignedAt *time.Time      `json:"prover_assigned_at" db:"prover_assigned_at"`
+	ProvedAt         *time.Time      `json:"proved_at" db:"proved_at"`
+	CommittedAt      *time.Time      `json:"committed_at" db:"committed_at"`
+	FinalizedAt      *time.Time      `json:"finalized_at" db:"finalized_at"`
 }
 
 // AggTask is a wrapper type around db AggProveTask type.
@@ -269,6 +268,6 @@ type AggTask struct {
 	EndBatchHash    string        `json:"end_batch_hash" db:"end_batch_hash"`
 	ProvingStatus   ProvingStatus `json:"proving_status" db:"proving_status"`
 	Proof           []byte        `json:"proof" db:"proof"`
-	CreatedTime     *time.Time    `json:"created_time" db:"created_time"`
-	UpdatedTime     *time.Time    `json:"updated_time" db:"updated_time"`
+	CreatedAt       *time.Time    `json:"created_at" db:"created_at"`
+	UpdatedAt       *time.Time    `json:"updated_at" db:"updated_at"`
 }

common/types/message/message.go

@@ -4,6 +4,8 @@ import (
 	"crypto/ecdsa"
 	"crypto/rand"
 	"encoding/hex"
+	"errors"
+	"fmt"
 
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/common/hexutil"
@@ -205,7 +207,7 @@ type TaskMsg struct {
 	// For decentralization, basic rollers will get block hashes from the coordinator. So that they can refer to the block hashes and fetch traces locally. Only applicable for basic rollers.
 	BlockHashes []common.Hash `json:"block_hashes,omitempty"`
 	// Only applicable for aggregator rollers.
-	SubProofs [][]byte `json:"sub_proofs,omitempty"`
+	SubProofs []*AggProof `json:"sub_proofs,omitempty"`
 }
 
 // ProofDetail is the message received from rollers that contains zk proof, the status of
@@ -237,3 +239,26 @@ type AggProof struct {
 	Vk         []byte `json:"vk"`
 	BlockCount uint   `json:"block_count"`
 }
+
+// SanityCheck checks whether an AggProof is in a legal format
+// TODO: change to check Proof&Instance when upgrading to snark verifier v0.4
+func (ap *AggProof) SanityCheck() error {
+	if ap == nil {
+		return errors.New("agg_proof is nil")
+	}
+
+	if len(ap.Proof) == 0 {
+		return errors.New("proof not ready")
+	}
+	if len(ap.FinalPair) == 0 {
+		return errors.New("final_pair not ready")
+	}
+	if len(ap.Proof)%32 != 0 {
+		return fmt.Errorf("proof buffer has wrong length, expected: 32, got: %d", len(ap.Proof))
+	}
+	if len(ap.FinalPair)%32 != 0 {
+		return fmt.Errorf("final_pair buffer has wrong length, expected: 32, got: %d", len(ap.FinalPair))
+	}
+
+	return nil
+}

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v3.1.2"
+var tag = "v3.3.1"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

contracts/scripts/foundry/DeployL1BridgeContracts.s.sol

@@ -25,7 +25,7 @@ import {Whitelist} from "../../src/L2/predeploys/Whitelist.sol";
 contract DeployL1BridgeContracts is Script {
     uint256 L1_DEPLOYER_PRIVATE_KEY = vm.envUint("L1_DEPLOYER_PRIVATE_KEY");
 
-    uint256 CHAIN_ID_L2 = vm.envUint("CHAIN_ID_L2");
+    uint32 CHAIN_ID_L2 = uint32(vm.envUint("CHAIN_ID_L2"));
 
     address L1_WETH_ADDR = vm.envAddress("L1_WETH_ADDR");
     address L2_WETH_ADDR = vm.envAddress("L2_WETH_ADDR");

contracts/src/L1/gateways/EnforcedTxGateway.sol

@@ -154,7 +154,7 @@ contract EnforcedTxGateway is OwnableUpgradeable, ReentrancyGuardUpgradeable, Pa
         }
 
         // append transaction
-        IL1MessageQueue(messageQueue).appendEnforcedTransaction(_sender, _target, _value, _gasLimit, _data);
+        IL1MessageQueue(_messageQueue).appendEnforcedTransaction(_sender, _target, _value, _gasLimit, _data);
 
         // refund fee to `_refundAddress`
         unchecked {

contracts/src/L1/rollup/ScrollChain.sol

@@ -10,6 +10,7 @@ import {BatchHeaderV0Codec} from "../../libraries/codec/BatchHeaderV0Codec.sol";
 import {ChunkCodec} from "../../libraries/codec/ChunkCodec.sol";
 import {IRollupVerifier} from "../../libraries/verifier/IRollupVerifier.sol";
 
+// solhint-disable no-inline-assembly
 // solhint-disable reason-string
 
 /// @title ScrollChain
@@ -39,7 +40,7 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
      *************/
 
     /// @notice The chain id of the corresponding layer 2 chain.
-    uint256 public immutable layer2ChainId;
+    uint32 public immutable layer2ChainId;
 
     /*************
      * Variables *
@@ -83,7 +84,7 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
      * Constructor *
      ***************/
 
-    constructor(uint256 _chainId) {
+    constructor(uint32 _chainId) {
         layer2ChainId = _chainId;
     }
 
@@ -295,7 +296,9 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
         require(finalizedStateRoots[_batchIndex] == bytes32(0), "batch already verified");
 
         // compute public input hash
-        bytes32 _publicInputHash = keccak256(abi.encode(_prevStateRoot, _postStateRoot, _withdrawRoot, _dataHash));
+        bytes32 _publicInputHash = keccak256(
+            abi.encodePacked(layer2ChainId, _prevStateRoot, _postStateRoot, _withdrawRoot, _dataHash)
+        );
 
         // verify batch
         IRollupVerifier(verifier).verifyAggregateProof(_aggrProof, _publicInputHash);

contracts/src/libraries/codec/BatchHeaderV0Codec.sol

@@ -2,6 +2,8 @@
 
 pragma solidity ^0.8.0;
 
+// solhint-disable no-inline-assembly
+
 /// @dev Below is the encoding for `BatchHeader` V0, total 89 + ceil(l1MessagePopped / 256) * 32 bytes.
 /// ```text
 ///   * Field                   Bytes       Type        Index   Comments

contracts/src/misc/Fallback.sol

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+
+contract Fallback is Ownable {
+    using SafeERC20 for IERC20;
+
+    /// @notice Withdraw stucked token from this contract.
+    /// @param _token The address of token to withdraw, use `address(0)` if withdraw ETH.
+    /// @param _amount The amount of token to withdraw.
+    /// @param _recipient The address of receiver.
+    function withdraw(
+        address _token,
+        uint256 _amount,
+        address _recipient
+    ) external onlyOwner {
+        if (_token == address(0)) {
+            (bool _success, ) = _recipient.call{value: _amount}("");
+            require(_success, "transfer ETH failed");
+        } else {
+            IERC20(_token).safeTransfer(_recipient, _amount);
+        }
+    }
+
+    /// @notice Execute an arbitrary message.
+    /// @param _target The address of contract to call.
+    /// @param _data The calldata passed to target contract.
+    function execute(address _target, bytes calldata _data) external payable onlyOwner {
+        (bool _success, ) = _target.call{value: msg.value}(_data);
+        require(_success, "call failed");
+    }
+}

coordinator/Makefile

@@ -1,4 +1,4 @@
-.PHONY: lint docker clean coordinator
+.PHONY: lint docker clean coordinator mock_coordinator
 
 IMAGE_NAME=coordinator
 IMAGE_VERSION=latest
@@ -25,6 +25,9 @@ libzkp:
 coordinator: libzkp ## Builds the Coordinator instance.
 	go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -o $(PWD)/build/bin/coordinator ./cmd
 
+mock_coordinator: ## Builds the mocked Coordinator instance.
+	go build -tags="mock_prover mock_verifier" -o $(PWD)/build/bin/coordinator ./cmd
+
 test-verifier: libzkp
 	go test -tags ffi -timeout 0 -v ./verifier
 

coordinator/manager.go

@@ -359,7 +359,7 @@ func (m *Manager) handleZkProof(pk string, msg *message.ProofDetail) error {
 
 	// store proof content
 	if msg.Type == message.BasicProve {
-		if dbErr = m.orm.UpdateProofByHash(m.ctx, msg.ID, msg.Proof.Proof, msg.Proof.FinalPair, proofTimeSec); dbErr != nil {
+		if dbErr = m.orm.UpdateProofByHash(m.ctx, msg.ID, msg.Proof, proofTimeSec); dbErr != nil {
 			log.Error("failed to store basic proof into db", "error", dbErr)
 			return dbErr
 		}

database/migrate/migrations/00002_l1_message.sql

@@ -13,8 +13,8 @@ create table l1_message
     layer1_hash  VARCHAR NOT NULL,
     layer2_hash  VARCHAR DEFAULT NULL,
     status       INTEGER  DEFAULT 1,
-    created_time TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_time TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
+    created_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 comment
@@ -32,7 +32,7 @@ create index l1_message_height_index
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
 BEGIN
-   NEW.updated_time = CURRENT_TIMESTAMP;
+   NEW.updated_at = CURRENT_TIMESTAMP;
    RETURN NEW;
 END;
 $$ language 'plpgsql';

database/migrate/migrations/00003_l2_message.sql

@@ -13,8 +13,8 @@ create table l2_message
     layer1_hash  VARCHAR DEFAULT NULL,
     proof        TEXT    DEFAULT NULL,
     status       INTEGER  DEFAULT 1,
-    created_time TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_time TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
+    created_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 comment
@@ -32,7 +32,7 @@ create index l2_message_height_index
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
 BEGIN
-   NEW.updated_time = CURRENT_TIMESTAMP;
+   NEW.updated_at = CURRENT_TIMESTAMP;
    RETURN NEW;
 END;
 $$ language 'plpgsql';

database/migrate/migrations/00004_block_batch.sql

@@ -16,7 +16,6 @@ create table block_batch
     total_l2_gas            BIGINT          NOT NULL,
     proving_status          INTEGER         DEFAULT 1,
     proof                   BYTEA           DEFAULT NULL,
-    instance_commitments    BYTEA           DEFAULT NULL,
     proof_time_sec          INTEGER         DEFAULT 0,
     rollup_status           INTEGER         DEFAULT 1,
     commit_tx_hash          VARCHAR         DEFAULT NULL,

database/migrate/migrations/00007_agg_task.sql

@@ -10,8 +10,8 @@ create table agg_task
     end_batch_hash         VARCHAR  NOT NULL,
     proving_status         SMALLINT DEFAULT 1,
     proof                  BYTEA DEFAULT NULL,
-    created_time           TIMESTAMP(0)    NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_time           TIMESTAMP(0)    DEFAULT CURRENT_TIMESTAMP
+    created_at           TIMESTAMP(0)    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at           TIMESTAMP(0)    DEFAULT CURRENT_TIMESTAMP
 );
 
 create unique index agg_task_hash_uindex
@@ -21,7 +21,7 @@ create unique index agg_task_hash_uindex
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
 BEGIN
-   NEW.updated_time = CURRENT_TIMESTAMP;
+   NEW.updated_at = CURRENT_TIMESTAMP;
    RETURN NEW;
 END;
 $$ language 'plpgsql';

database/orm/agg_task.go

@@ -20,7 +20,7 @@ func NewAggTaskOrm(db *sqlx.DB) AggTaskOrm {
 	return &aggTaskOrm{db: db}
 }
 
-func (a *aggTaskOrm) GetSubProofsByAggTaskID(id string) ([][]byte, error) {
+func (a *aggTaskOrm) GetSubProofsByAggTaskID(id string) ([]*message.AggProof, error) {
 	var (
 		startIdx uint64
 		endIdx   uint64
@@ -34,14 +34,20 @@ func (a *aggTaskOrm) GetSubProofsByAggTaskID(id string) ([][]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	var subProofs [][]byte
+	var subProofs []*message.AggProof
 	for rows.Next() {
 		var proofByt []byte
 		err = rows.Scan(&proofByt)
 		if err != nil {
 			return nil, err
 		}
-		subProofs = append(subProofs, proofByt)
+
+		var proof message.AggProof
+		if err := json.Unmarshal(proofByt, &proof); err != nil {
+			return nil, err
+		}
+
+		subProofs = append(subProofs, &proof)
 	}
 	return subProofs, nil
 }

database/orm/block_batch.go

@@ -3,6 +3,7 @@ package orm
 import (
 	"context"
 	"database/sql"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"strings"
@@ -12,6 +13,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 
 	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
 )
 
 type blockBatchOrm struct {
@@ -62,22 +64,31 @@ func (o *blockBatchOrm) GetProvingStatusByHash(hash string) (types.ProvingStatus
 	return status, nil
 }
 
-func (o *blockBatchOrm) GetVerifiedProofAndInstanceCommitmentsByHash(hash string) ([]byte, []byte, error) {
-	var proof []byte
-	var instanceCommitments []byte
-	row := o.db.QueryRow(`SELECT proof, instance_commitments FROM block_batch WHERE hash = $1 and proving_status = $2`, hash, types.ProvingTaskVerified)
-
-	if err := row.Scan(&proof, &instanceCommitments); err != nil {
-		return nil, nil, err
+func (o *blockBatchOrm) GetVerifiedProofByHash(hash string) (*message.AggProof, error) {
+	var proofBytes []byte
+	row := o.db.QueryRow(`SELECT proof FROM block_batch WHERE hash = $1 and proving_status = $2`, hash, types.ProvingTaskVerified)
+	if err := row.Scan(&proofBytes); err != nil {
+		return nil, err
 	}
-	return proof, instanceCommitments, nil
+
+	var proof message.AggProof
+	if err := json.Unmarshal(proofBytes, &proof); err != nil {
+		return nil, err
+	}
+
+	return &proof, nil
 }
 
-func (o *blockBatchOrm) UpdateProofByHash(ctx context.Context, hash string, proof, instanceCommitments []byte, proofTimeSec uint64) error {
+func (o *blockBatchOrm) UpdateProofByHash(ctx context.Context, hash string, proof *message.AggProof, proofTimeSec uint64) error {
+	proofBytes, err := json.Marshal(proof)
+	if err != nil {
+		return err
+	}
+
 	db := o.db
 	if _, err := db.ExecContext(ctx,
-		db.Rebind(`UPDATE block_batch set proof = ?, instance_commitments = ?, proof_time_sec = ? where hash = ?;`),
-		proof, instanceCommitments, proofTimeSec, hash,
+		db.Rebind(`UPDATE block_batch set proof = ?, proof_time_sec = ? where hash = ?;`),
+		proofBytes, proofTimeSec, hash,
 	); err != nil {
 		log.Error("failed to update proof", "err", err)
 	}

database/orm/interface.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"database/sql"
 
-	"scroll-tech/common/types"
-	"scroll-tech/common/types/message"
-
 	"github.com/jmoiron/sqlx"
 	"github.com/scroll-tech/go-ethereum/common"
+
+	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
 )
 
 // L1BlockOrm l1_block operation interface
@@ -50,7 +50,7 @@ type SessionInfoOrm interface {
 type AggTaskOrm interface {
 	GetAssignedAggTasks() ([]*types.AggTask, error)
 	GetUnassignedAggTasks() ([]*types.AggTask, error)
-	GetSubProofsByAggTaskID(id string) ([][]byte, error)
+	GetSubProofsByAggTaskID(id string) ([]*message.AggProof, error)
 	InsertAggTask(id string, startBatchIndex uint64, startBatchHash string, endBatchIndex uint64, endBatchHash string) error
 	UpdateAggTaskStatus(aggTaskID string, status types.ProvingStatus) error
 	UpdateProofForAggTask(aggTaskID string, proof *message.AggProof) error
@@ -60,8 +60,8 @@ type AggTaskOrm interface {
 type BlockBatchOrm interface {
 	GetBlockBatches(fields map[string]interface{}, args ...string) ([]*types.BlockBatch, error)
 	GetProvingStatusByHash(hash string) (types.ProvingStatus, error)
-	GetVerifiedProofAndInstanceCommitmentsByHash(hash string) ([]byte, []byte, error)
-	UpdateProofByHash(ctx context.Context, hash string, proof, instanceCommitments []byte, proofTimeSec uint64) error
+	GetVerifiedProofByHash(hash string) (*message.AggProof, error)
+	UpdateProofByHash(ctx context.Context, hash string, proof *message.AggProof, proofTimeSec uint64) error
 	UpdateProvingStatus(hash string, status types.ProvingStatus) error
 	ResetProvingStatusFor(before types.ProvingStatus) error
 	NewBatchInDBTx(dbTx *sqlx.Tx, batchData *types.BatchData) error

database/orm_test.go

@@ -73,8 +73,11 @@ var (
 		},
 	}
 
-	proof1    = []byte{1}
-	subProofs = [][]byte{proof1}
+	proof1 = &message.AggProof{
+		Proof:     []byte{1},
+		FinalPair: []byte{2},
+	}
+	subProofs = []*message.AggProof{proof1}
 
 	aggTask1 = &types.AggTask{ID: "test-agg-1"}
 	aggTask2 = &types.AggTask{ID: "test-agg-2"}
@@ -344,7 +347,7 @@ func testOrmBlockBatch(t *testing.T) {
 	provingStatus, err := ormBatch.GetProvingStatusByHash(batchHash1)
 	assert.NoError(t, err)
 	assert.Equal(t, types.ProvingTaskUnassigned, provingStatus)
-	err = ormBatch.UpdateProofByHash(context.Background(), batchHash1, proof1, []byte{2}, 1200)
+	err = ormBatch.UpdateProofByHash(context.Background(), batchHash1, proof1, 1200)
 	assert.NoError(t, err)
 	err = ormBatch.UpdateProvingStatus(batchHash1, types.ProvingTaskVerified)
 	assert.NoError(t, err)
@@ -489,7 +492,7 @@ func testOrmAggTask(t *testing.T) {
 	provingStatus, err := ormBatch.GetProvingStatusByHash(batchHash1)
 	assert.NoError(t, err)
 	assert.Equal(t, types.ProvingTaskUnassigned, provingStatus)
-	err = ormBatch.UpdateProofByHash(context.Background(), batchHash1, proof1, []byte{2}, 1200)
+	err = ormBatch.UpdateProofByHash(context.Background(), batchHash1, proof1, 1200)
 	assert.NoError(t, err)
 	err = ormBatch.UpdateProvingStatus(batchHash1, types.ProvingTaskVerified)
 	assert.NoError(t, err)

roller/Makefile

@@ -29,12 +29,12 @@ libzkp:
 roller: libzkp ## Build the Roller instance.
 	GOBIN=$(PWD)/build/bin go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -o $(PWD)/build/bin/roller ./cmd
 
+mock_roller: ## Build the mocked Roller instance.
+	GOBIN=$(PWD)/build/bin go build -tags="mock_prover mock_verifier" -o $(PWD)/build/bin/roller ./cmd
+
 gpu-roller: libzkp ## Build the GPU Roller instance.
 	GOBIN=$(PWD)/build/bin go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -tags gpu -o $(PWD)/build/bin/roller ./cmd
 
-mock_roller:
-	GOBIN=$(PWD)/build/bin go build -tags mock_prover -o $(PWD)/build/bin/roller $(PWD)/cmd
-
 test-prover: libzkp
 	go test -tags ffi -timeout 0 -v ./prover
 

roller/prover/mock.go

@@ -3,10 +3,13 @@
 package prover
 
 import (
-	"scroll-tech/common/types/message"
+	"math/big"
 
+	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/core/types"
 
+	"scroll-tech/common/types/message"
+
 	"scroll-tech/roller/config"
 )
 
@@ -22,9 +25,10 @@ func NewProver(cfg *config.ProverConfig) (*Prover, error) {
 
 // Prove call rust ffi to generate proof, if first failed, try again.
 func (p *Prover) Prove(taskID string, traces []*types.BlockTrace) (*message.AggProof, error) {
+	_empty := common.BigToHash(big.NewInt(0))
 	return &message.AggProof{
-		Proof:     []byte{},
-		Instance:  []byte{},
-		FinalPair: []byte{},
+		Proof:     _empty[:],
+		Instance:  _empty[:],
+		FinalPair: _empty[:],
 	}, nil
 }