handle failed proof in ProcessCommittedBatches

refactor(contracts): OZ-L1-N03 Events Should Emit Old and New Value (#673 )
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
2026-01-12 07:28:08 -05:00 · 2023-08-06 22:39:20 +08:00 · 2023-08-06 14:18:13 +02:00 · 2023-08-06 19:56:16 +08:00 · 2023-08-06 17:36:02 +08:00 · 2023-08-06 10:21:18 +02:00
136 changed files with 3509 additions and 16257 deletions
--- a/bridge-history-api/abi/backend_abi.go
+++ b/bridge-history-api/abi/backend_abi.go
--- a/bridge-history-api/crossmsg/messageproof/msg_proof_updater.go
+++ b/bridge-history-api/crossmsg/messageproof/msg_proof_updater.go
@@ -53,11 +53,11 @@ func (m *MsgProofUpdater) Start() {
 					continue
 				}
 				latestBatchIndexWithProof, err := m.l2SentMsgOrm.GetLatestL2SentMsgBatchIndex(m.ctx)
-				log.Info("latest batc with proof", "batch_index", latestBatchIndexWithProof)
 				if err != nil {
 					log.Error("MsgProofUpdater: Can not get latest L2SentMsgBatchIndex: ", "err", err)
 					continue
 				}
+				log.Info("latest batch with proof", "batch_index", latestBatchIndexWithProof)
 				var start uint64
 				if latestBatchIndexWithProof < 0 {
 					start = 1
--- a/bridge-history-api/internal/route/route.go
+++ b/bridge-history-api/internal/route/route.go
@@ -15,6 +15,7 @@ func Route(router *gin.Engine, conf *config.Config) {
 	router.Use(cors.New(cors.Config{
 		AllowOrigins:     []string{"*"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE"},
+		AllowHeaders:     []string{"Origin", "Content-Type", "Authorization"},
 		AllowCredentials: true,
 		MaxAge:           12 * time.Hour,
 	}))
--- a/bridge-history-api/orm/cross_msg.go
+++ b/bridge-history-api/orm/cross_msg.go
@@ -204,7 +204,7 @@ func (c *CrossMsg) DeleteL1CrossMsgAfterHeight(ctx context.Context, height uint6
 // GetL2CrossMsgByHash returns layer2 cross message by given hash
 func (c *CrossMsg) GetL2CrossMsgByHash(ctx context.Context, l2Hash common.Hash) (*CrossMsg, error) {
 	var result CrossMsg
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).Where("layer2_hash = ? AND msg_type = ?", l2Hash.String(), Layer1Msg).First(&result).Error
+	err := c.db.WithContext(ctx).Model(&CrossMsg{}).Where("layer2_hash = ? AND msg_type = ?", l2Hash.String(), Layer2Msg).First(&result).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, nil
--- a/bridge-history-api/orm/l2_sent_msg.go
+++ b/bridge-history-api/orm/l2_sent_msg.go
@@ -2,6 +2,7 @@ package orm

 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"

@@ -102,6 +103,9 @@ func (l *L2SentMsg) GetLatestL2SentMsgBatchIndex(ctx context.Context) (int64, er
 		Select("batch_index").
 		First(&result).
 		Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		return -1, nil
+	}
 	if err != nil {
 		return -1, fmt.Errorf("L2SentMsg.GetLatestL2SentMsgBatchIndex error: %w", err)
 	}
--- a/bridge-history-api/utils/utils.go
+++ b/bridge-history-api/utils/utils.go
@@ -1,7 +1,6 @@
 package utils

 import (
-	"bytes"
 	"context"
 	"encoding/binary"
 	"errors"
@@ -76,6 +75,14 @@ func GetBatchRangeFromCalldataV2(calldata []byte) (uint64, uint64, uint64, error
 	method := backendabi.ScrollChainV2ABI.Methods["commitBatch"]
 	values, err := method.Inputs.Unpack(calldata[4:])
 	if err != nil {
+		// special case: import genesis batch
+		method = backendabi.ScrollChainV2ABI.Methods["importGenesisBatch"]
+		_, err2 := method.Inputs.Unpack(calldata[4:])
+		if err2 == nil {
+			// genesis batch
+			return 0, 0, 0, nil
+		}
+		// none of "commitBatch" and "importGenesisBatch" match, give up
 		return 0, 0, 0, err
 	}
 	args := commitBatchArgs{}
@@ -110,48 +117,3 @@ func GetBatchRangeFromCalldataV2(calldata []byte) (uint64, uint64, uint64, error

 	return batchIndex, startBlock, finishBlock, err
 }
-
-// GetBatchRangeFromCalldataV1 find the block range from calldata, both inclusive.
-func GetBatchRangeFromCalldataV1(calldata []byte) ([]uint64, []uint64, []uint64, error) {
-	var batchIndices []uint64
-	var startBlocks []uint64
-	var finishBlocks []uint64
-	if bytes.Equal(calldata[0:4], common.Hex2Bytes("cb905499")) {
-		// commitBatches
-		method := backendabi.ScrollChainABI.Methods["commitBatches"]
-		values, err := method.Inputs.Unpack(calldata[4:])
-		if err != nil {
-			return batchIndices, startBlocks, finishBlocks, err
-		}
-		args := make([]backendabi.IScrollChainBatch, len(values))
-		err = method.Inputs.Copy(&args, values)
-		if err != nil {
-			return batchIndices, startBlocks, finishBlocks, err
-		}
-
-		for i := 0; i < len(args); i++ {
-			batchIndices = append(batchIndices, args[i].BatchIndex)
-			startBlocks = append(startBlocks, args[i].Blocks[0].BlockNumber)
-			finishBlocks = append(finishBlocks, args[i].Blocks[len(args[i].Blocks)-1].BlockNumber)
-		}
-	} else if bytes.Equal(calldata[0:4], common.Hex2Bytes("8c73235d")) {
-		// commitBatch
-		method := backendabi.ScrollChainABI.Methods["commitBatch"]
-		values, err := method.Inputs.Unpack(calldata[4:])
-		if err != nil {
-			return batchIndices, startBlocks, finishBlocks, err
-		}
-
-		args := backendabi.IScrollChainBatch{}
-		err = method.Inputs.Copy(&args, values)
-		if err != nil {
-			return batchIndices, startBlocks, finishBlocks, err
-		}
-		batchIndices = append(batchIndices, args.BatchIndex)
-		startBlocks = append(startBlocks, args.Blocks[0].BlockNumber)
-		finishBlocks = append(finishBlocks, args.Blocks[len(args.Blocks)-1].BlockNumber)
-	} else {
-		return batchIndices, startBlocks, finishBlocks, errors.New("invalid selector")
-	}
-	return batchIndices, startBlocks, finishBlocks, nil
-}
--- a/bridge-history-api/utils/utils_test.go
+++ b/bridge-history-api/utils/utils_test.go
@@ -1,7 +1,6 @@
 package utils_test

 import (
-	"os"
 	"testing"

 	"github.com/ethereum/go-ethereum/common"
@@ -34,31 +33,11 @@ func TestGetBatchRangeFromCalldataV2(t *testing.T) {
 	assert.Equal(t, start, uint64(10))
 	assert.Equal(t, finish, uint64(20))
 	assert.Equal(t, batchIndex, uint64(2))
-}

-func TestGetBatchRangeFromCalldataV1(t *testing.T) {
-	calldata, err := os.ReadFile("../testdata/commit-batches-0x3095e91db7ba4a6fbf4654d607db322e58ff5579c502219c8024acaea74cf311.txt")
+	// genesis batch
+	batchIndex, start, finish, err = utils.GetBatchRangeFromCalldataV2(common.Hex2Bytes("3fdeecb200000000000000000000000000000000000000000000000000000000000000402dcb5308098d24a37fc1487a229fcedb09fa4343ede39cbad365bc925535bb09000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000c252bc9780c4d83cf11f14b8cd03c92c4d18ce07710ba836d31d12da216c8330000000000000000000000000000000000000000000000000000000000000000000000000000000"))
 	assert.NoError(t, err)
-
-	// multiple batches
-	batchIndices, startBlocks, finishBlocks, err := utils.GetBatchRangeFromCalldataV1(common.Hex2Bytes(string(calldata[:])))
-	assert.NoError(t, err)
-	assert.Equal(t, len(batchIndices), 5)
-	assert.Equal(t, len(startBlocks), 5)
-	assert.Equal(t, len(finishBlocks), 5)
-	assert.Equal(t, batchIndices[0], uint64(1))
-	assert.Equal(t, batchIndices[1], uint64(2))
-	assert.Equal(t, batchIndices[2], uint64(3))
-	assert.Equal(t, batchIndices[3], uint64(4))
-	assert.Equal(t, batchIndices[4], uint64(5))
-	assert.Equal(t, startBlocks[0], uint64(1))
-	assert.Equal(t, startBlocks[1], uint64(6))
-	assert.Equal(t, startBlocks[2], uint64(7))
-	assert.Equal(t, startBlocks[3], uint64(19))
-	assert.Equal(t, startBlocks[4], uint64(20))
-	assert.Equal(t, finishBlocks[0], uint64(5))
-	assert.Equal(t, finishBlocks[1], uint64(6))
-	assert.Equal(t, finishBlocks[2], uint64(18))
-	assert.Equal(t, finishBlocks[3], uint64(19))
-	assert.Equal(t, finishBlocks[4], uint64(20))
+	assert.Equal(t, start, uint64(0))
+	assert.Equal(t, finish, uint64(0))
+	assert.Equal(t, batchIndex, uint64(0))
 }
--- a/bridge/abi/bridge_abi.go
+++ b/bridge/abi/bridge_abi.go
--- a/bridge/abi/bridge_abi_test.go
+++ b/bridge/abi/bridge_abi_test.go
@@ -15,8 +15,8 @@ func TestEventSignature(t *testing.T) {
 	assert.Equal(L1RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
 	assert.Equal(L1FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))

-	assert.Equal(L1CommitBatchEventSignature, common.HexToHash("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
-	assert.Equal(L1FinalizeBatchEventSignature, common.HexToHash("9d3058a3cb9739a2527f22dd9a4138065844037d3004254952e2458d808cc364"))
+	assert.Equal(L1CommitBatchEventSignature, common.HexToHash("2c32d4ae151744d0bf0b9464a3e897a1d17ed2f1af71f7c9a75f12ce0d28238f"))
+	assert.Equal(L1FinalizeBatchEventSignature, common.HexToHash("26ba82f907317eedc97d0cbef23de76a43dd6edb563bdb6e9407645b950a7a2d"))

 	assert.Equal(L1QueueTransactionEventSignature, common.HexToHash("69cfcb8e6d4192b8aba9902243912587f37e550d75c1fa801491fce26717f37e"))

--- a/bridge/internal/controller/relayer/l2_relayer.go
+++ b/bridge/internal/controller/relayer/l2_relayer.go
@@ -415,8 +415,8 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 	hash := batch.Hash
 	status := types.ProvingStatus(batch.ProvingStatus)
 	switch status {
-	case types.ProvingTaskUnassigned, types.ProvingTaskAssigned:
-		// The proof for this block is not ready yet.
+	case types.ProvingTaskUnassigned, types.ProvingTaskAssigned, types.ProvingTaskFailed:
+		// We do not handle pending or failed proving tasks in this function.
 		return
 	case types.ProvingTaskProved:
 		// It's an intermediate state. The prover manager received the proof but has not verified
--- a/bridge/mock_bridge/MockBridgeL1.sol
+++ b/bridge/mock_bridge/MockBridgeL1.sol
@@ -56,13 +56,13 @@ contract MockBridgeL1 {

  /// @notice Emitted when a new batch is committed.
  /// @param batchHash The hash of the batch.
-  event CommitBatch(bytes32 indexed batchHash);
+  event CommitBatch(uint256 indexed batchIndex, bytes32 indexed batchHash);

  /// @notice Emitted when a batch is finalized.
  /// @param batchHash The hash of the batch
  /// @param stateRoot The state root on layer 2 after this batch.
  /// @param withdrawRoot The merkle root on layer2 after this batch.
-  event FinalizeBatch(bytes32 indexed batchHash, bytes32 stateRoot, bytes32 withdrawRoot);
+  event FinalizeBatch(uint256 indexed batchIndex, bytes32 indexed batchHash, bytes32 stateRoot, bytes32 withdrawRoot);

  /***********
   * Structs *
@@ -130,7 +130,7 @@ contract MockBridgeL1 {

  function commitBatch(
    uint8 /*version*/,
-    bytes calldata /*parentBatchHeader*/,
+    bytes calldata _parentBatchHeader,
    bytes[] memory chunks,
    bytes calldata /*skippedL1MessageBitmap*/
  ) external {
@@ -138,6 +138,17 @@ contract MockBridgeL1 {
    uint256 _chunksLength = chunks.length;
    require(_chunksLength > 0, "batch is empty");

+    // decode batch index
+    uint256 headerLength = _parentBatchHeader.length;
+    uint256 parentBatchPtr;
+    uint256 parentBatchIndex;
+    assembly {
+      parentBatchPtr := mload(0x40)
+      calldatacopy(parentBatchPtr, _parentBatchHeader.offset, headerLength)
+      mstore(0x40, add(parentBatchPtr, headerLength))
+      parentBatchIndex := shr(192, mload(add(parentBatchPtr, 1)))
+    }
+
    uint256 dataPtr;
    assembly {
      dataPtr := mload(0x40)
@@ -169,18 +180,29 @@ contract MockBridgeL1 {
    }
    bytes32 _batchHash = BatchHeaderV0Codec.computeBatchHash(batchPtr, 89);
    committedBatches[0] = _batchHash;
-    emit CommitBatch(_batchHash);
+    emit CommitBatch(parentBatchIndex + 1, _batchHash);
  }

  function finalizeBatchWithProof(
-    bytes calldata /*batchHeader*/,
+    bytes calldata batchHeader,
    bytes32 /*prevStateRoot*/,
    bytes32 postStateRoot,
    bytes32 withdrawRoot,
    bytes calldata /*aggrProof*/
  ) external {
+    // decode batch index
+    uint256 headerLength = batchHeader.length;
+    uint256 batchPtr;
+    uint256 batchIndex;
+    assembly {
+      batchPtr := mload(0x40)
+      calldatacopy(batchPtr, batchHeader.offset, headerLength)
+      mstore(0x40, add(batchPtr, headerLength))
+      batchIndex := shr(192, mload(add(batchPtr, 1)))
+    }
+
    bytes32 _batchHash = committedBatches[0];
-    emit FinalizeBatch(_batchHash, postStateRoot, withdrawRoot);
+    emit FinalizeBatch(batchIndex, _batchHash, postStateRoot, withdrawRoot);
  }

  /**********************
--- a/common/cmd/cmd.go
+++ b/common/cmd/cmd.go
@@ -83,7 +83,9 @@ func (c *Cmd) Write(data []byte) (int, error) {
 	out := string(data)
 	if verbose || c.openLog {
 		fmt.Printf("%s:\n\t%v", c.name, out)
-	} else if strings.Contains(out, "error") || strings.Contains(out, "warning") {
+	} else if strings.Contains(strings.ToLower(out), "error") ||
+		strings.Contains(strings.ToLower(out), "warning") ||
+		strings.Contains(strings.ToLower(out), "info") {
 		fmt.Printf("%s:\n\t%v", c.name, out)
 	}
 	go c.checkFuncs.IterCb(func(_ string, value interface{}) {
--- a/common/libzkp/impl/Cargo.lock
+++ b/common/libzkp/impl/Cargo.lock
@@ -32,7 +32,7 @@ dependencies = [
 [[package]]
 name = "aggregator"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "ark-std",
 "env_logger 0.10.0",
@@ -432,7 +432,7 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 [[package]]
 name = "bus-mapping"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "eth-types",
 "ethers-core",
@@ -1045,7 +1045,7 @@ dependencies = [
 [[package]]
 name = "eth-types"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "ethers-core",
 "ethers-signers",
@@ -1223,7 +1223,7 @@ dependencies = [
 [[package]]
 name = "external-tracer"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "eth-types",
 "geth-utils",
@@ -1436,7 +1436,7 @@ dependencies = [
 [[package]]
 name = "gadgets"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "digest 0.7.6",
 "eth-types",
@@ -1476,7 +1476,7 @@ dependencies = [
 [[package]]
 name = "geth-utils"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "env_logger 0.9.3",
 "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)",
@@ -2074,7 +2074,7 @@ dependencies = [
 [[package]]
 name = "keccak256"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "env_logger 0.9.3",
 "eth-types",
@@ -2261,7 +2261,7 @@ dependencies = [
 [[package]]
 name = "mock"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "eth-types",
 "ethers-core",
@@ -2276,7 +2276,7 @@ dependencies = [
 [[package]]
 name = "mpt-zktrie"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "bus-mapping",
 "eth-types",
@@ -2752,7 +2752,7 @@ dependencies = [
 [[package]]
 name = "prover"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.1#15aac6e1484a42f723098fbc9d8783f374e7e90a"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.3#337089ac40bac756d88b9ae30a3be1f82538b216"
 dependencies = [
 "aggregator",
 "anyhow",
@@ -3621,7 +3621,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 [[package]]
 name = "snark-verifier"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#f8bdcbee60348e5c996c04f19ff30522e6b276b0"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c306ec57849921e690221b10b8a08189868d4a"
 dependencies = [
 "bytes",
 "ethereum-types 0.14.1",
@@ -3645,7 +3645,7 @@ dependencies = [
 [[package]]
 name = "snark-verifier-sdk"
 version = "0.0.1"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#f8bdcbee60348e5c996c04f19ff30522e6b276b0"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c306ec57849921e690221b10b8a08189868d4a"
 dependencies = [
 "bincode",
 "env_logger 0.10.0",
@@ -4037,7 +4037,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.1#15aac6e1484a42f723098fbc9d8783f374e7e90a"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.3#337089ac40bac756d88b9ae30a3be1f82538b216"
 dependencies = [
 "base64 0.13.1",
 "blake2",
@@ -4482,7 +4482,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 [[package]]
 name = "zkevm-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
 "array-init",
 "bus-mapping",
--- a/common/libzkp/impl/Cargo.toml
+++ b/common/libzkp/impl/Cargo.toml
@@ -18,8 +18,8 @@ maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2-
 halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "0.3.1-derive-serde" }

 [dependencies]
-prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.1" }
-types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.1" }
+prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.3" }
+types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.3" }
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }

 log = "0.4"
@@ -33,8 +33,6 @@ once_cell = "1.8.0"

 [profile.test]
 opt-level = 3
-# debug-assertions = true

 [profile.release]
 opt-level = 3
-# debug-assertions = true
--- a/common/types/errno.go
+++ b/common/types/errno.go
@@ -0,0 +1,20 @@
+package types
+
+const (
+	// Success shows OK.
+	Success = 0
+
+	// ErrJWTCommonErr jwt common error
+	ErrJWTCommonErr = 50000
+	// ErrJWTTokenExpired jwt token expired
+	ErrJWTTokenExpired = 50001
+
+	// ErrCoordinatorParameterInvalidNo is invalid params
+	ErrCoordinatorParameterInvalidNo = 20001
+	// ErrCoordinatorGetTaskFailure is getting prover task error
+	ErrCoordinatorGetTaskFailure = 20002
+	// ErrCoordinatorHandleZkProofFailure is handle submit proof error
+	ErrCoordinatorHandleZkProofFailure = 20003
+	// ErrCoordinatorEmptyProofData get empty proof data
+	ErrCoordinatorEmptyProofData = 20004
+)
--- a/common/types/message/message.go
+++ b/common/types/message/message.go
@@ -33,7 +33,7 @@ func (r ProofType) String() string {
 	case ProofTypeBatch:
 		return "proof type batch"
 	default:
-		return "illegal proof type"
+		return fmt.Sprintf("illegal proof type: %d", r)
 	}
 }

@@ -58,15 +58,12 @@ type AuthMsg struct {

 // Identity contains all the fields to be signed by the prover.
 type Identity struct {
-	// Prover name
-	Name string `json:"name"`
-	// Prover ProverType
-	ProverType ProofType `json:"prover_type,omitempty"`
-	// Version is common.Version+ZkVersion. Use the following to check the latest ZkVersion version.
-	// curl -sL https://api.github.com/repos/scroll-tech/scroll-prover/commits | jq -r ".[0].sha"
-	Version string `json:"version"`
-	// Random unique token generated by manager
-	Token string `json:"token"`
+	// ProverName the prover name
+	ProverName string `json:"prover_name"`
+	// ProverVersion the prover version
+	ProverVersion string `json:"prover_version"`
+	// Challenge unique challenge generated by manager
+	Challenge string `json:"challenge"`
 }

 // GenerateToken generates token
--- a/common/types/message/message_test.go
+++ b/common/types/message/message_test.go
@@ -15,9 +15,9 @@ func TestAuthMessageSignAndVerify(t *testing.T) {

 	authMsg := &AuthMsg{
 		Identity: &Identity{
-			Name:    "testName",
-			Version: "testVersion",
-			Token:   "testToken",
+			Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzgxNzUsIm9yaWdfaWF0IjoxNjkxMDM0NTc1fQ.HybBMsEJFhyZqtIa2iVcHUP7CEFttf708jmTMAImAWA",
+			ProverName:    "test",
+			ProverVersion: "v1.0.0",
 		},
 	}
 	assert.NoError(t, authMsg.SignWithKey(privkey))
@@ -46,15 +46,15 @@ func TestGenerateToken(t *testing.T) {

 func TestIdentityHash(t *testing.T) {
 	identity := &Identity{
-		Name:       "testName",
-		ProverType: ProofTypeChunk,
-		Version:    "testVersion",
-		Token:      "testToken",
+		Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzM0MTksIm9yaWdfaWF0IjoxNjkxMDI5ODE5fQ.EhkLZsj__rNPVC3ZDYBtvdh0nB8mmM_Hl82hObaIWOs",
+		ProverName:    "test",
+		ProverVersion: "v1.0.0",
 	}
+
 	hash, err := identity.Hash()
 	assert.NoError(t, err)

-	expectedHash := "c0411a19531fb8c6133b2bae91f361c14e65f2d318aef72b83519e6061cad001"
+	expectedHash := "83f5e0ad023e9c1de639ab07b9b4cb972ec9dbbd2524794c533a420a5b137721"
 	assert.Equal(t, expectedHash, hex.EncodeToString(hash))
 }

@@ -118,7 +118,7 @@ func TestProveTypeString(t *testing.T) {
 	assert.Equal(t, "proof type batch", proofTypeBatch.String())

 	illegalProof := ProofType(3)
-	assert.Equal(t, "illegal proof type", illegalProof.String())
+	assert.Equal(t, "illegal proof type: 3", illegalProof.String())
 }

 func TestProofMsgPublicKey(t *testing.T) {
--- a/common/version/version.go
+++ b/common/version/version.go
@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )

-var tag = "v4.0.43"
+var tag = "v4.1.13"

 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {
--- a/contracts/docs/apis/L1ERC1155Gateway.md
+++ b/contracts/docs/apis/L1ERC1155Gateway.md
@@ -533,7 +533,7 @@ Emitted when some ERC1155 token is refunded.
 ### UpdateTokenMapping

 ```solidity
-event UpdateTokenMapping(address _l1Token, address _l2Token)
+event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token)
 ```

 Emitted when token mapping for ERC1155 token is updated.
@@ -544,8 +544,9 @@ Emitted when token mapping for ERC1155 token is updated.

 | Name | Type | Description |
 |---|---|---|
-| _l1Token  | address | The address of ERC1155 token on layer 1. |
-| _l2Token  | address | The address of corresponding ERC1155 token on layer 2. |
+| l1Token `indexed` | address | The address of ERC1155 token in layer 1. |
+| oldL2Token `indexed` | address | The address of the old corresponding ERC1155 token in layer 2. |
+| newL2Token `indexed` | address | The address of the new corresponding ERC1155 token in layer 2. |



--- a/contracts/docs/apis/L1ERC721Gateway.md
+++ b/contracts/docs/apis/L1ERC721Gateway.md
@@ -472,7 +472,7 @@ Emitted when some ERC721 token is refunded.
 ### UpdateTokenMapping

 ```solidity
-event UpdateTokenMapping(address _l1Token, address _l2Token)
+event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token)
 ```

 Emitted when token mapping for ERC721 token is updated.
@@ -483,8 +483,9 @@ Emitted when token mapping for ERC721 token is updated.

 | Name | Type | Description |
 |---|---|---|
-| _l1Token  | address | The address of ERC721 token on layer 1. |
-| _l2Token  | address | The address of corresponding ERC721 token on layer 2. |
+| l1Token `indexed` | address | The address of ERC721 token in layer 1. |
+| oldL2Token `indexed` | address | The address of the old corresponding ERC721 token in layer 2. |
+| newL2Token `indexed` | address | The address of the new corresponding ERC721 token in layer 2. |



--- a/contracts/docs/apis/L1GatewayRouter.md
+++ b/contracts/docs/apis/L1GatewayRouter.md
@@ -350,7 +350,7 @@ Request ERC20 token transfer from users to gateways.
 ### setDefaultERC20Gateway

 ```solidity
-function setDefaultERC20Gateway(address _defaultERC20Gateway) external nonpayable
+function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external nonpayable
 ```

 Update the address of default ERC20 gateway contract.
@@ -361,7 +361,7 @@ Update the address of default ERC20 gateway contract.

 | Name | Type | Description |
 |---|---|---|
-| _defaultERC20Gateway | address | The address to update. |
+| _newDefaultERC20Gateway | address | undefined |

 ### setERC20Gateway

@@ -383,7 +383,7 @@ Update the mapping from token address to gateway address.
 ### setETHGateway

 ```solidity
-function setETHGateway(address _ethGateway) external nonpayable
+function setETHGateway(address _newEthGateway) external nonpayable
 ```

 Update the address of ETH gateway contract.
@@ -394,7 +394,7 @@ Update the address of ETH gateway contract.

 | Name | Type | Description |
 |---|---|---|
-| _ethGateway | address | The address to update. |
+| _newEthGateway | address | undefined |

 ### transferOwnership

@@ -567,7 +567,7 @@ Emitted when some ETH is refunded.
 ### SetDefaultERC20Gateway

 ```solidity
-event SetDefaultERC20Gateway(address indexed defaultERC20Gateway)
+event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway)
 ```

 Emitted when the address of default ERC20 Gateway is updated.
@@ -578,12 +578,13 @@ Emitted when the address of default ERC20 Gateway is updated.

 | Name | Type | Description |
 |---|---|---|
-| defaultERC20Gateway `indexed` | address | undefined |
+| oldDefaultERC20Gateway `indexed` | address | undefined |
+| newDefaultERC20Gateway `indexed` | address | undefined |

 ### SetERC20Gateway

 ```solidity
-event SetERC20Gateway(address indexed token, address indexed gateway)
+event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway)
 ```

 Emitted when the `gateway` for `token` is updated.
@@ -595,12 +596,13 @@ Emitted when the `gateway` for `token` is updated.
 | Name | Type | Description |
 |---|---|---|
 | token `indexed` | address | undefined |
-| gateway `indexed` | address | undefined |
+| oldGateway `indexed` | address | undefined |
+| newGateway `indexed` | address | undefined |

 ### SetETHGateway

 ```solidity
-event SetETHGateway(address indexed ethGateway)
+event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway)
 ```

 Emitted when the address of ETH Gateway is updated.
@@ -611,7 +613,8 @@ Emitted when the address of ETH Gateway is updated.

 | Name | Type | Description |
 |---|---|---|
-| ethGateway `indexed` | address | undefined |
+| oldETHGateway `indexed` | address | undefined |
+| newEthGateway `indexed` | address | undefined |



--- a/contracts/docs/apis/L1ScrollMessenger.md
+++ b/contracts/docs/apis/L1ScrollMessenger.md
@@ -423,7 +423,7 @@ Update fee vault contract.
 ### updateMaxReplayTimes

 ```solidity
-function updateMaxReplayTimes(uint256 _maxReplayTimes) external nonpayable
+function updateMaxReplayTimes(uint256 _newMaxReplayTimes) external nonpayable
 ```

 Update max replay times.
@@ -434,7 +434,7 @@ Update max replay times.

 | Name | Type | Description |
 |---|---|---|
-| _maxReplayTimes | uint256 | The new max replay times. |
+| _newMaxReplayTimes | uint256 | The new max replay times. |

 ### xDomainMessageSender

@@ -595,7 +595,7 @@ Emitted when owner updates fee vault contract.
 ### UpdateMaxReplayTimes

 ```solidity
-event UpdateMaxReplayTimes(uint256 maxReplayTimes)
+event UpdateMaxReplayTimes(uint256 oldMaxReplayTimes, uint256 newMaxReplayTimes)
 ```

 Emitted when the maximum number of times each message can be replayed is updated.
@@ -606,7 +606,8 @@ Emitted when the maximum number of times each message can be replayed is updated

 | Name | Type | Description |
 |---|---|---|
-| maxReplayTimes  | uint256 | undefined |
+| oldMaxReplayTimes  | uint256 | undefined |
+| newMaxReplayTimes  | uint256 | undefined |



--- a/contracts/docs/apis/L1StandardERC20Gateway.md
+++ b/contracts/docs/apis/L1StandardERC20Gateway.md
@@ -214,6 +214,34 @@ function onDropMessage(bytes _message) external payable
 |---|---|---|
 | _message | bytes | undefined |

+### owner
+
+```solidity
+function owner() external view returns (address)
+```
+
+
+
+*Returns the address of the current owner.*
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+
+### renounceOwnership
+
+```solidity
+function renounceOwnership() external nonpayable
+```
+
+
+
+*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby disabling any functionality that is only available to the owner.*
+
+
 ### router

 ```solidity
@@ -231,6 +259,22 @@ The address of L1GatewayRouter/L2GatewayRouter contract.
 |---|---|---|
 | _0 | address | undefined |

+### transferOwnership
+
+```solidity
+function transferOwnership(address newOwner) external nonpayable
+```
+
+
+
+*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newOwner | address | undefined |
+


 ## Events
@@ -293,6 +337,23 @@ event Initialized(uint8 version)
 |---|---|---|
 | version  | uint8 | undefined |

+### OwnershipTransferred
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| previousOwner `indexed` | address | undefined |
+| newOwner `indexed` | address | undefined |
+
 ### RefundERC20

 ```solidity
--- a/contracts/docs/apis/L1WETHGateway.md
+++ b/contracts/docs/apis/L1WETHGateway.md
@@ -212,6 +212,34 @@ function onDropMessage(bytes _message) external payable
 |---|---|---|
 | _message | bytes | undefined |

+### owner
+
+```solidity
+function owner() external view returns (address)
+```
+
+
+
+*Returns the address of the current owner.*
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+
+### renounceOwnership
+
+```solidity
+function renounceOwnership() external nonpayable
+```
+
+
+
+*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby disabling any functionality that is only available to the owner.*
+
+
 ### router

 ```solidity
@@ -229,6 +257,22 @@ The address of L1GatewayRouter/L2GatewayRouter contract.
 |---|---|---|
 | _0 | address | undefined |

+### transferOwnership
+
+```solidity
+function transferOwnership(address newOwner) external nonpayable
+```
+
+
+
+*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newOwner | address | undefined |
+


 ## Events
@@ -291,6 +335,23 @@ event Initialized(uint8 version)
 |---|---|---|
 | version  | uint8 | undefined |

+### OwnershipTransferred
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| previousOwner `indexed` | address | undefined |
+| newOwner `indexed` | address | undefined |
+
 ### RefundERC20

 ```solidity
--- a/contracts/docs/apis/L2ERC1155Gateway.md
+++ b/contracts/docs/apis/L2ERC1155Gateway.md
@@ -458,7 +458,7 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### UpdateTokenMapping

 ```solidity
-event UpdateTokenMapping(address _l2Token, address _l1Token)
+event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token)
 ```

 Emitted when token mapping for ERC1155 token is updated.
@@ -469,8 +469,9 @@ Emitted when token mapping for ERC1155 token is updated.

 | Name | Type | Description |
 |---|---|---|
-| _l2Token  | address | The address of corresponding ERC1155 token on layer 2. |
-| _l1Token  | address | The address of ERC1155 token on layer 1. |
+| l2Token `indexed` | address | The address of corresponding ERC1155 token in layer 2. |
+| oldL1Token `indexed` | address | The address of the old corresponding ERC1155 token in layer 1. |
+| newL1Token `indexed` | address | The address of the new corresponding ERC1155 token in layer 1. |

 ### WithdrawERC1155

--- a/contracts/docs/apis/L2ERC721Gateway.md
+++ b/contracts/docs/apis/L2ERC721Gateway.md
@@ -400,7 +400,7 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### UpdateTokenMapping

 ```solidity
-event UpdateTokenMapping(address _l2Token, address _l1Token)
+event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token)
 ```

 Emitted when token mapping for ERC721 token is updated.
@@ -411,8 +411,9 @@ Emitted when token mapping for ERC721 token is updated.

 | Name | Type | Description |
 |---|---|---|
-| _l2Token  | address | The address of corresponding ERC721 token on layer 2. |
-| _l1Token  | address | The address of ERC721 token on layer 1. |
+| l2Token `indexed` | address | The address of corresponding ERC721 token in layer 2. |
+| oldL1Token `indexed` | address | The address of the old corresponding ERC721 token in layer 1. |
+| newL1Token `indexed` | address | The address of the new corresponding ERC721 token in layer 1. |

 ### WithdrawERC721

--- a/contracts/docs/apis/L2GatewayRouter.md
+++ b/contracts/docs/apis/L2GatewayRouter.md
@@ -220,7 +220,7 @@ function renounceOwnership() external nonpayable
 ### setDefaultERC20Gateway

 ```solidity
-function setDefaultERC20Gateway(address _defaultERC20Gateway) external nonpayable
+function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external nonpayable
 ```

 Update the address of default ERC20 gateway contract.
@@ -231,7 +231,7 @@ Update the address of default ERC20 gateway contract.

 | Name | Type | Description |
 |---|---|---|
-| _defaultERC20Gateway | address | The address to update. |
+| _newDefaultERC20Gateway | address | The address to update. |

 ### setERC20Gateway

@@ -253,7 +253,7 @@ Update the mapping from token address to gateway address.
 ### setETHGateway

 ```solidity
-function setETHGateway(address _ethGateway) external nonpayable
+function setETHGateway(address _newEthGateway) external nonpayable
 ```

 Update the address of ETH gateway contract.
@@ -264,7 +264,7 @@ Update the address of ETH gateway contract.

 | Name | Type | Description |
 |---|---|---|
-| _ethGateway | address | The address to update. |
+| _newEthGateway | address | The address to update. |

 ### transferOwnership

@@ -473,7 +473,7 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### SetDefaultERC20Gateway

 ```solidity
-event SetDefaultERC20Gateway(address indexed defaultERC20Gateway)
+event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway)
 ```

 Emitted when the address of default ERC20 Gateway is updated.
@@ -484,12 +484,13 @@ Emitted when the address of default ERC20 Gateway is updated.

 | Name | Type | Description |
 |---|---|---|
-| defaultERC20Gateway `indexed` | address | undefined |
+| oldDefaultERC20Gateway `indexed` | address | undefined |
+| newDefaultERC20Gateway `indexed` | address | undefined |

 ### SetERC20Gateway

 ```solidity
-event SetERC20Gateway(address indexed token, address indexed gateway)
+event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway)
 ```

 Emitted when the `gateway` for `token` is updated.
@@ -501,12 +502,13 @@ Emitted when the `gateway` for `token` is updated.
 | Name | Type | Description |
 |---|---|---|
 | token `indexed` | address | undefined |
-| gateway `indexed` | address | undefined |
+| oldGateway `indexed` | address | undefined |
+| newGateway `indexed` | address | undefined |

 ### SetETHGateway

 ```solidity
-event SetETHGateway(address indexed ethGateway)
+event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway)
 ```

 Emitted when the address of ETH Gateway is updated.
@@ -517,7 +519,8 @@ Emitted when the address of ETH Gateway is updated.

 | Name | Type | Description |
 |---|---|---|
-| ethGateway `indexed` | address | undefined |
+| oldETHGateway `indexed` | address | undefined |
+| newEthGateway `indexed` | address | undefined |

 ### WithdrawERC20

--- a/contracts/docs/apis/L2ScrollMessenger.md
+++ b/contracts/docs/apis/L2ScrollMessenger.md
@@ -47,7 +47,7 @@ The address of fee vault, collecting cross domain messaging fee.
 ### initialize

 ```solidity
-function initialize(address _counterpart, address _feeVault) external nonpayable
+function initialize(address _counterpart) external nonpayable
 ```


@@ -59,7 +59,6 @@ function initialize(address _counterpart, address _feeVault) external nonpayable
 | Name | Type | Description |
 |---|---|---|
 | _counterpart | address | undefined |
-| _feeVault | address | undefined |

 ### isL1MessageExecuted

@@ -316,7 +315,7 @@ Update fee vault contract.
 ### updateMaxFailedExecutionTimes

 ```solidity
-function updateMaxFailedExecutionTimes(uint256 _maxFailedExecutionTimes) external nonpayable
+function updateMaxFailedExecutionTimes(uint256 _newMaxFailedExecutionTimes) external nonpayable
 ```

 Update max failed execution times.
@@ -327,7 +326,7 @@ Update max failed execution times.

 | Name | Type | Description |
 |---|---|---|
-| _maxFailedExecutionTimes | uint256 | The new max failed execution times. |
+| _newMaxFailedExecutionTimes | uint256 | The new max failed execution times. |

 ### xDomainMessageSender

@@ -488,7 +487,7 @@ Emitted when owner updates fee vault contract.
 ### UpdateMaxFailedExecutionTimes

 ```solidity
-event UpdateMaxFailedExecutionTimes(uint256 maxFailedExecutionTimes)
+event UpdateMaxFailedExecutionTimes(uint256 oldMaxFailedExecutionTimes, uint256 newMaxFailedExecutionTimes)
 ```

 Emitted when the maximum number of times each message can fail in L2 is updated.
@@ -499,7 +498,8 @@ Emitted when the maximum number of times each message can fail in L2 is updated.

 | Name | Type | Description |
 |---|---|---|
-| maxFailedExecutionTimes  | uint256 | The new maximum number of times each message can fail in L2. |
+| oldMaxFailedExecutionTimes  | uint256 | undefined |
+| newMaxFailedExecutionTimes  | uint256 | undefined |



--- a/contracts/docs/apis/L2StandardERC20Gateway.md
+++ b/contracts/docs/apis/L2StandardERC20Gateway.md
@@ -128,6 +128,34 @@ The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 |---|---|---|
 | _0 | address | undefined |

+### owner
+
+```solidity
+function owner() external view returns (address)
+```
+
+
+
+*Returns the address of the current owner.*
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+
+### renounceOwnership
+
+```solidity
+function renounceOwnership() external nonpayable
+```
+
+
+
+*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby disabling any functionality that is only available to the owner.*
+
+
 ### router

 ```solidity
@@ -162,6 +190,22 @@ The address of ScrollStandardERC20Factory.
 |---|---|---|
 | _0 | address | undefined |

+### transferOwnership
+
+```solidity
+function transferOwnership(address newOwner) external nonpayable
+```
+
+
+
+*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newOwner | address | undefined |
+
 ### withdrawERC20

 ```solidity
@@ -260,6 +304,23 @@ event Initialized(uint8 version)
 |---|---|---|
 | version  | uint8 | undefined |

+### OwnershipTransferred
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| previousOwner `indexed` | address | undefined |
+| newOwner `indexed` | address | undefined |
+
 ### WithdrawERC20

 ```solidity
--- a/contracts/docs/apis/L2WETHGateway.md
+++ b/contracts/docs/apis/L2WETHGateway.md
@@ -161,6 +161,34 @@ The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 |---|---|---|
 | _0 | address | undefined |

+### owner
+
+```solidity
+function owner() external view returns (address)
+```
+
+
+
+*Returns the address of the current owner.*
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+
+### renounceOwnership
+
+```solidity
+function renounceOwnership() external nonpayable
+```
+
+
+
+*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby disabling any functionality that is only available to the owner.*
+
+
 ### router

 ```solidity
@@ -178,6 +206,22 @@ The address of L1GatewayRouter/L2GatewayRouter contract.
 |---|---|---|
 | _0 | address | undefined |

+### transferOwnership
+
+```solidity
+function transferOwnership(address newOwner) external nonpayable
+```
+
+
+
+*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newOwner | address | undefined |
+
 ### withdrawERC20

 ```solidity
@@ -276,6 +320,23 @@ event Initialized(uint8 version)
 |---|---|---|
 | version  | uint8 | undefined |

+### OwnershipTransferred
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| previousOwner `indexed` | address | undefined |
+| newOwner `indexed` | address | undefined |
+
 ### WithdrawERC20

 ```solidity
--- a/contracts/integration-test/ScrollChain.spec.ts
+++ b/contracts/integration-test/ScrollChain.spec.ts
@@ -1,7 +1,6 @@
 /* eslint-disable node/no-unpublished-import */
 /* eslint-disable node/no-missing-import */
 import { constants } from "ethers";
-import { concat } from "ethers/lib/utils";
 import { ethers } from "hardhat";
 import { ScrollChain, L1MessageQueue } from "../typechain";

@@ -28,7 +27,7 @@ describe("ScrollChain", async () => {
    await chain.deployed();

    await chain.initialize(queue.address, constants.AddressZero, 44);
-    await chain.updateSequencer(deployer.address, true);
+    await chain.addSequencer(deployer.address);
    await queue.initialize(
      constants.AddressZero,
      chain.address,
--- a/contracts/scripts/foundry/InitializeL1BridgeContracts.s.sol
+++ b/contracts/scripts/foundry/InitializeL1BridgeContracts.s.sol
@@ -66,8 +66,8 @@ contract InitializeL1BridgeContracts is Script {
            L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR,
            MAX_L2_TX_IN_CHUNK
        );
-        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).updateSequencer(L1_ROLLUP_OPERATOR_ADDR, true);
-        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).updateProver(L1_ROLLUP_OPERATOR_ADDR, true);
+        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).addSequencer(L1_ROLLUP_OPERATOR_ADDR);
+        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).addProver(L1_ROLLUP_OPERATOR_ADDR);

        // initialize L2GasPriceOracle
        L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).initialize(
--- a/contracts/scripts/foundry/InitializeL2BridgeContracts.s.sol
+++ b/contracts/scripts/foundry/InitializeL2BridgeContracts.s.sol
@@ -65,10 +65,7 @@ contract InitializeL2BridgeContracts is Script {
        L1GasPriceOracle(L1_GAS_PRICE_ORACLE_ADDR).updateWhitelist(L2_WHITELIST_ADDR);

        // initialize L2ScrollMessenger
-        L2ScrollMessenger(payable(L2_SCROLL_MESSENGER_PROXY_ADDR)).initialize(
-            L1_SCROLL_MESSENGER_PROXY_ADDR,
-            L2_TX_FEE_VAULT_ADDR
-        );
+        L2ScrollMessenger(payable(L2_SCROLL_MESSENGER_PROXY_ADDR)).initialize(L1_SCROLL_MESSENGER_PROXY_ADDR);

        // initialize L2GatewayRouter
        L2GatewayRouter(L2_GATEWAY_ROUTER_PROXY_ADDR).initialize(
--- a/contracts/src/L1/IL1ScrollMessenger.sol
+++ b/contracts/src/L1/IL1ScrollMessenger.sol
@@ -10,8 +10,9 @@ interface IL1ScrollMessenger is IScrollMessenger {
     **********/

    /// @notice Emitted when the maximum number of times each message can be replayed is updated.
-    /// @param maxReplayTimes The new maximum number of times each message can be replayed.
-    event UpdateMaxReplayTimes(uint256 maxReplayTimes);
+    /// @param oldMaxReplayTimes The old maximum number of times each message can be replayed.
+    /// @param newMaxReplayTimes The new maximum number of times each message can be replayed.
+    event UpdateMaxReplayTimes(uint256 oldMaxReplayTimes, uint256 newMaxReplayTimes);

    /***********
     * Structs *
--- a/contracts/src/L1/L1ScrollMessenger.sol
+++ b/contracts/src/L1/L1ScrollMessenger.sol
@@ -2,15 +2,12 @@

 pragma solidity =0.8.16;

-import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
-
 import {IScrollChain} from "./rollup/IScrollChain.sol";
 import {IL1MessageQueue} from "./rollup/IL1MessageQueue.sol";
 import {IL1ScrollMessenger} from "./IL1ScrollMessenger.sol";
 import {ScrollConstants} from "../libraries/constants/ScrollConstants.sol";
 import {IScrollMessenger} from "../libraries/IScrollMessenger.sol";
 import {ScrollMessengerBase} from "../libraries/ScrollMessengerBase.sol";
-import {AddressAliasHelper} from "../libraries/common/AddressAliasHelper.sol";
 import {WithdrawTrieVerifier} from "../libraries/verifier/WithdrawTrieVerifier.sol";

 import {IMessageDropCallback} from "../libraries/callbacks/IMessageDropCallback.sol";
@@ -28,7 +25,7 @@ import {IMessageDropCallback} from "../libraries/callbacks/IMessageDropCallback.
 ///
 /// @dev All deposited Ether (including `WETH` deposited throng `L1WETHGateway`) will locked in
 /// this contract.
-contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1ScrollMessenger {
+contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
    /***********
     * Structs *
     ***********/
@@ -97,8 +94,7 @@ contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1Scrol
        address _rollup,
        address _messageQueue
    ) public initializer {
-        PausableUpgradeable.__Pausable_init();
-        ScrollMessengerBase._initialize(_counterpart, _feeVault);
+        ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, _feeVault);

        rollup = _rollup;
        messageQueue = _messageQueue;
@@ -295,24 +291,14 @@ contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1Scrol
     * Restricted Functions *
     ************************/

-    /// @notice Pause the contract
-    /// @dev This function can only called by contract owner.
-    /// @param _status The pause status to update.
-    function setPause(bool _status) external onlyOwner {
-        if (_status) {
-            _pause();
-        } else {
-            _unpause();
-        }
-    }
-
    /// @notice Update max replay times.
    /// @dev This function can only called by contract owner.
-    /// @param _maxReplayTimes The new max replay times.
-    function updateMaxReplayTimes(uint256 _maxReplayTimes) external onlyOwner {
-        maxReplayTimes = _maxReplayTimes;
+    /// @param _newMaxReplayTimes The new max replay times.
+    function updateMaxReplayTimes(uint256 _newMaxReplayTimes) external onlyOwner {
+        uint256 _oldMaxReplayTimes = maxReplayTimes;
+        maxReplayTimes = _newMaxReplayTimes;

-        emit UpdateMaxReplayTimes(_maxReplayTimes);
+        emit UpdateMaxReplayTimes(_oldMaxReplayTimes, _newMaxReplayTimes);
    }

    /**********************
--- a/contracts/src/L1/gateways/IL1GatewayRouter.sol
+++ b/contracts/src/L1/gateways/IL1GatewayRouter.sol
@@ -11,17 +11,20 @@ interface IL1GatewayRouter is IL1ETHGateway, IL1ERC20Gateway {
     **********/

    /// @notice Emitted when the address of ETH Gateway is updated.
-    /// @param ethGateway The address of new ETH Gateway.
-    event SetETHGateway(address indexed ethGateway);
+    /// @param oldETHGateway The address of the old ETH Gateway.
+    /// @param newEthGateway The address of the new ETH Gateway.
+    event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway);

    /// @notice Emitted when the address of default ERC20 Gateway is updated.
-    /// @param defaultERC20Gateway The address of new default ERC20 Gateway.
-    event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
+    /// @param oldDefaultERC20Gateway The address of the old default ERC20 Gateway.
+    /// @param newDefaultERC20Gateway The address of the new default ERC20 Gateway.
+    event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway);

    /// @notice Emitted when the `gateway` for `token` is updated.
    /// @param token The address of token updated.
-    /// @param gateway The corresponding address of gateway updated.
-    event SetERC20Gateway(address indexed token, address indexed gateway);
+    /// @param oldGateway The corresponding address of the old gateway.
+    /// @param newGateway The corresponding address of the new gateway.
+    event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway);

    /*************************
     * Public View Functions *
--- a/contracts/src/L1/gateways/L1CustomERC20Gateway.sol
+++ b/contracts/src/L1/gateways/L1CustomERC20Gateway.sol
@@ -2,7 +2,6 @@

 pragma solidity =0.8.16;

-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";

@@ -18,7 +17,7 @@ import {L1ERC20Gateway} from "./L1ERC20Gateway.sol";
 /// finalize withdraw the tokens from layer 2.
 /// @dev The deposited tokens are held in this gateway. On finalizing withdraw, the corresponding
 /// tokens will be transfer to the recipient directly.
-contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20Gateway {
+contract L1CustomERC20Gateway is L1ERC20Gateway {
    using SafeERC20Upgradeable for IERC20Upgradeable;

    /**********
@@ -26,9 +25,10 @@ contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20G
     **********/

    /// @notice Emitted when token mapping for ERC20 token is updated.
-    /// @param _l1Token The address of ERC20 token on layer 1.
-    /// @param _l2Token The address of corresponding ERC20 token on layer 2.
-    event UpdateTokenMapping(address _l1Token, address _l2Token);
+    /// @param l1Token The address of ERC20 token in layer 1.
+    /// @param oldL2Token The address of the old corresponding ERC20 token in layer 2.
+    /// @param newL2Token The address of the new corresponding ERC20 token in layer 2.
+    event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token);

    /*************
     * Variables *
@@ -56,7 +56,6 @@ contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20G
    ) external initializer {
        require(_router != address(0), "zero router address");

-        OwnableUpgradeable.__Ownable_init();
        ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
    }

@@ -79,9 +78,10 @@ contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20G
    function updateTokenMapping(address _l1Token, address _l2Token) external onlyOwner {
        require(_l2Token != address(0), "token address cannot be 0");

+        address _oldL2Token = tokenMapping[_l1Token];
        tokenMapping[_l1Token] = _l2Token;

-        emit UpdateTokenMapping(_l1Token, _l2Token);
+        emit UpdateTokenMapping(_l1Token, _oldL2Token, _l2Token);
    }

    /**********************
--- a/contracts/src/L1/gateways/L1ERC1155Gateway.sol
+++ b/contracts/src/L1/gateways/L1ERC1155Gateway.sol
@@ -2,7 +2,6 @@

 pragma solidity =0.8.16;

-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/IERC1155Upgradeable.sol";
 import {ERC1155HolderUpgradeable, ERC1155ReceiverUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155HolderUpgradeable.sol";

@@ -20,21 +19,16 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// NFT will be transfer to the recipient directly.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L1ERC1155Gateway is
-    OwnableUpgradeable,
-    ERC1155HolderUpgradeable,
-    ScrollGatewayBase,
-    IL1ERC1155Gateway,
-    IMessageDropCallback
-{
+contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC1155Gateway, IMessageDropCallback {
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC1155 token is updated.
-    /// @param _l1Token The address of ERC1155 token on layer 1.
-    /// @param _l2Token The address of corresponding ERC1155 token on layer 2.
-    event UpdateTokenMapping(address _l1Token, address _l2Token);
+    /// @param l1Token The address of ERC1155 token in layer 1.
+    /// @param oldL2Token The address of the old corresponding ERC1155 token in layer 2.
+    /// @param newL2Token The address of the new corresponding ERC1155 token in layer 2.
+    event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token);

    /*************
     * Variables *
@@ -55,7 +49,6 @@ contract L1ERC1155Gateway is
    /// @param _counterpart The address of L2ERC1155Gateway in L2.
    /// @param _messenger The address of L1ScrollMessenger.
    function initialize(address _counterpart, address _messenger) external initializer {
-        OwnableUpgradeable.__Ownable_init();
        ERC1155HolderUpgradeable.__ERC1155Holder_init();
        ERC1155ReceiverUpgradeable.__ERC1155Receiver_init();

@@ -177,9 +170,10 @@ contract L1ERC1155Gateway is
    function updateTokenMapping(address _l1Token, address _l2Token) external onlyOwner {
        require(_l2Token != address(0), "token address cannot be 0");

+        address _oldL2Token = tokenMapping[_l1Token];
        tokenMapping[_l1Token] = _l2Token;

-        emit UpdateTokenMapping(_l1Token, _l2Token);
+        emit UpdateTokenMapping(_l1Token, _oldL2Token, _l2Token);
    }

    /**********************
--- a/contracts/src/L1/gateways/L1ERC20Gateway.sol
+++ b/contracts/src/L1/gateways/L1ERC20Gateway.sol
@@ -2,14 +2,12 @@

 pragma solidity ^0.8.16;

-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";

 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
 import {IL1GatewayRouter} from "./IL1GatewayRouter.sol";

-import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
-
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IScrollMessenger} from "../../libraries/IScrollMessenger.sol";
 import {ScrollConstants} from "../../libraries/constants/ScrollConstants.sol";
@@ -19,7 +17,7 @@ import {IMessageDropCallback} from "../../libraries/callbacks/IMessageDropCallba
 // solhint-disable no-empty-blocks

 abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, ScrollGatewayBase {
-    using SafeERC20 for IERC20;
+    using SafeERC20Upgradeable for IERC20Upgradeable;

    /*************
     * Variables *
@@ -75,7 +73,7 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol

        // @note can possible trigger reentrant call to this contract or messenger,
        // but it seems not a big problem.
-        IERC20(_l1Token).safeTransfer(_to, _amount);
+        IERC20Upgradeable(_l1Token).safeTransfer(_to, _amount);

        _doCallback(_to, _data);

@@ -96,7 +94,7 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
        // do dome check for each custom gateway
        _beforeDropMessage(_token, _receiver, _amount);

-        IERC20(_token).safeTransfer(_receiver, _amount);
+        IERC20Upgradeable(_token).safeTransfer(_receiver, _amount);

        emit RefundERC20(_token, _receiver, _amount);
    }
@@ -154,9 +152,9 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
            _amount = IL1GatewayRouter(msg.sender).requestERC20(_from, _token, _amount);
        } else {
            // common practice to handle fee on transfer token.
-            uint256 _before = IERC20(_token).balanceOf(address(this));
-            IERC20(_token).safeTransferFrom(_from, address(this), _amount);
-            uint256 _after = IERC20(_token).balanceOf(address(this));
+            uint256 _before = IERC20Upgradeable(_token).balanceOf(address(this));
+            IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
+            uint256 _after = IERC20Upgradeable(_token).balanceOf(address(this));
            // no unchecked here, since some weird token may return arbitrary balance.
            _amount = _after - _before;
        }
--- a/contracts/src/L1/gateways/L1ERC721Gateway.sol
+++ b/contracts/src/L1/gateways/L1ERC721Gateway.sol
@@ -2,7 +2,6 @@

 pragma solidity =0.8.16;

-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import {ERC721HolderUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/utils/ERC721HolderUpgradeable.sol";

@@ -20,21 +19,16 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// NFT will be transfer to the recipient directly.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L1ERC721Gateway is
-    OwnableUpgradeable,
-    ERC721HolderUpgradeable,
-    ScrollGatewayBase,
-    IL1ERC721Gateway,
-    IMessageDropCallback
-{
+contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC721Gateway, IMessageDropCallback {
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC721 token is updated.
-    /// @param _l1Token The address of ERC721 token on layer 1.
-    /// @param _l2Token The address of corresponding ERC721 token on layer 2.
-    event UpdateTokenMapping(address _l1Token, address _l2Token);
+    /// @param l1Token The address of ERC721 token in layer 1.
+    /// @param oldL2Token The address of the old corresponding ERC721 token in layer 2.
+    /// @param newL2Token The address of the new corresponding ERC721 token in layer 2.
+    event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token);

    /*************
     * Variables *
@@ -55,7 +49,6 @@ contract L1ERC721Gateway is
    /// @param _counterpart The address of L2ERC721Gateway in L2.
    /// @param _messenger The address of L1ScrollMessenger.
    function initialize(address _counterpart, address _messenger) external initializer {
-        OwnableUpgradeable.__Ownable_init();
        ERC721HolderUpgradeable.__ERC721Holder_init();

        ScrollGatewayBase._initialize(_counterpart, address(0), _messenger);
@@ -173,9 +166,10 @@ contract L1ERC721Gateway is
    function updateTokenMapping(address _l1Token, address _l2Token) external onlyOwner {
        require(_l2Token != address(0), "token address cannot be 0");

+        address _oldL2Token = tokenMapping[_l1Token];
        tokenMapping[_l1Token] = _l2Token;

-        emit UpdateTokenMapping(_l1Token, _l2Token);
+        emit UpdateTokenMapping(_l1Token, _oldL2Token, _l2Token);
    }

    /**********************
--- a/contracts/src/L1/gateways/L1ETHGateway.sol
+++ b/contracts/src/L1/gateways/L1ETHGateway.sol
@@ -2,8 +2,6 @@

 pragma solidity =0.8.16;

-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-
 import {IL2ETHGateway} from "../../L2/gateways/IL2ETHGateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ETHGateway} from "./IL1ETHGateway.sol";
@@ -18,7 +16,7 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// finalize withdraw ETH from layer 2.
 /// @dev The deposited ETH tokens are held in this gateway. On finalizing withdraw, the corresponding
 /// ETH will be transfer to the recipient directly.
-contract L1ETHGateway is Initializable, ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback {
+contract L1ETHGateway is ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback {
    /***************
     * Constructor *
     ***************/
--- a/contracts/src/L1/gateways/L1GatewayRouter.sol
+++ b/contracts/src/L1/gateways/L1GatewayRouter.sol
@@ -6,8 +6,6 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";

-import {IScrollGateway} from "../../libraries/gateway/IScrollGateway.sol";
-import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ETHGateway} from "./IL1ETHGateway.sol";
 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
 import {IL1GatewayRouter} from "./IL1GatewayRouter.sol";
@@ -68,13 +66,13 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
        // it can be zero during initialization
        if (_defaultERC20Gateway != address(0)) {
            defaultERC20Gateway = _defaultERC20Gateway;
-            emit SetDefaultERC20Gateway(_defaultERC20Gateway);
+            emit SetDefaultERC20Gateway(address(0), _defaultERC20Gateway);
        }

        // it can be zero during initialization
        if (_ethGateway != address(0)) {
            ethGateway = _ethGateway;
-            emit SetETHGateway(_ethGateway);
+            emit SetETHGateway(address(0), _ethGateway);
        }
    }

@@ -225,17 +223,19 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
     ************************/

    /// @inheritdoc IL1GatewayRouter
-    function setETHGateway(address _ethGateway) external onlyOwner {
-        ethGateway = _ethGateway;
+    function setETHGateway(address _newEthGateway) external onlyOwner {
+        address _oldETHGateway = ethGateway;
+        ethGateway = _newEthGateway;

-        emit SetETHGateway(_ethGateway);
+        emit SetETHGateway(_oldETHGateway, _newEthGateway);
    }

    /// @inheritdoc IL1GatewayRouter
-    function setDefaultERC20Gateway(address _defaultERC20Gateway) external onlyOwner {
-        defaultERC20Gateway = _defaultERC20Gateway;
+    function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external onlyOwner {
+        address _oldDefaultERC20Gateway = defaultERC20Gateway;
+        defaultERC20Gateway = _newDefaultERC20Gateway;

-        emit SetDefaultERC20Gateway(_defaultERC20Gateway);
+        emit SetDefaultERC20Gateway(_oldDefaultERC20Gateway, _newDefaultERC20Gateway);
    }

    /// @inheritdoc IL1GatewayRouter
@@ -243,9 +243,10 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
        require(_tokens.length == _gateways.length, "length mismatch");

        for (uint256 i = 0; i < _tokens.length; i++) {
+            address _oldGateway = ERC20Gateway[_tokens[i]];
            ERC20Gateway[_tokens[i]] = _gateways[i];

-            emit SetERC20Gateway(_tokens[i], _gateways[i]);
+            emit SetERC20Gateway(_tokens[i], _oldGateway, _gateways[i]);
        }
    }
 }
--- a/contracts/src/L1/gateways/L1StandardERC20Gateway.sol
+++ b/contracts/src/L1/gateways/L1StandardERC20Gateway.sol
@@ -2,12 +2,9 @@

 pragma solidity =0.8.16;

-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
+import {ClonesUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
+import {IERC20MetadataUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";

-import {IERC20Metadata} from "../../interfaces/IERC20Metadata.sol";
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
@@ -21,9 +18,7 @@ import {L1ERC20Gateway} from "./L1ERC20Gateway.sol";
 /// @dev The deposited ERC20 tokens are held in this gateway. On finalizing withdraw, the corresponding
 /// token will be transfer to the recipient directly. Any ERC20 that requires non-standard functionality
 /// should use a separate gateway.
-contract L1StandardERC20Gateway is Initializable, ScrollGatewayBase, L1ERC20Gateway {
-    using SafeERC20 for IERC20;
-
+contract L1StandardERC20Gateway is L1ERC20Gateway {
    /*************
     * Variables *
     *************/
@@ -81,7 +76,7 @@ contract L1StandardERC20Gateway is Initializable, ScrollGatewayBase, L1ERC20Gate
        // we can calculate the l2 address directly.
        bytes32 _salt = keccak256(abi.encodePacked(counterpart, keccak256(abi.encodePacked(_l1Token))));

-        return Clones.predictDeterministicAddress(l2TokenImplementation, _salt, l2TokenFactory);
+        return ClonesUpgradeable.predictDeterministicAddress(l2TokenImplementation, _salt, l2TokenFactory);
    }

    /**********************
@@ -143,9 +138,9 @@ contract L1StandardERC20Gateway is Initializable, ScrollGatewayBase, L1ERC20Gate
            _l2Token = getL2ERC20Address(_token);

            // passing symbol/name/decimal in order to deploy in L2.
-            string memory _symbol = IERC20Metadata(_token).symbol();
-            string memory _name = IERC20Metadata(_token).name();
-            uint8 _decimals = IERC20Metadata(_token).decimals();
+            string memory _symbol = IERC20MetadataUpgradeable(_token).symbol();
+            string memory _name = IERC20MetadataUpgradeable(_token).name();
+            uint8 _decimals = IERC20MetadataUpgradeable(_token).decimals();
            _l2Data = abi.encode(true, abi.encode(_data, abi.encode(_symbol, _name, _decimals)));
        } else {
            _l2Data = abi.encode(false, _data);
--- a/contracts/src/L1/gateways/L1WETHGateway.sol
+++ b/contracts/src/L1/gateways/L1WETHGateway.sol
@@ -2,10 +2,6 @@

 pragma solidity =0.8.16;

-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-
 import {IWETH} from "../../interfaces/IWETH.sol";
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
@@ -21,9 +17,7 @@ import {L1ERC20Gateway} from "./L1ERC20Gateway.sol";
 /// as Ether and then the Ether will be sent to the `L1ScrollMessenger` contract.
 /// On finalizing withdraw, the Ether will be transfered from `L1ScrollMessenger`, then
 /// wrapped as WETH and finally transfer to recipient.
-contract L1WETHGateway is Initializable, ScrollGatewayBase, L1ERC20Gateway {
-    using SafeERC20 for IERC20;
-
+contract L1WETHGateway is L1ERC20Gateway {
    /*************
     * Constants *
     *************/
--- a/contracts/src/L1/rollup/L1MessageQueue.sol
+++ b/contracts/src/L1/rollup/L1MessageQueue.sol
@@ -24,12 +24,12 @@ contract L1MessageQueue is OwnableUpgradeable, IL1MessageQueue {
    /// @notice Emitted when owner updates gas oracle contract.
    /// @param _oldGasOracle The address of old gas oracle contract.
    /// @param _newGasOracle The address of new gas oracle contract.
-    event UpdateGasOracle(address _oldGasOracle, address _newGasOracle);
+    event UpdateGasOracle(address indexed _oldGasOracle, address indexed _newGasOracle);

    /// @notice Emitted when owner updates EnforcedTxGateway contract.
    /// @param _oldGateway The address of old EnforcedTxGateway contract.
    /// @param _newGateway The address of new EnforcedTxGateway contract.
-    event UpdateEnforcedTxGateway(address _oldGateway, address _newGateway);
+    event UpdateEnforcedTxGateway(address indexed _oldGateway, address indexed _newGateway);

    /// @notice Emitted when owner updates max gas limit.
    /// @param _oldMaxGasLimit The old max gas limit.
--- a/contracts/src/L1/rollup/L2GasPriceOracle.sol
+++ b/contracts/src/L1/rollup/L2GasPriceOracle.sol
@@ -19,8 +19,9 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
    event UpdateWhitelist(address _oldWhitelist, address _newWhitelist);

    /// @notice Emitted when current l2 base fee is updated.
-    /// @param l2BaseFee The current l2 base fee updated.
-    event L2BaseFeeUpdated(uint256 l2BaseFee);
+    /// @param oldL2BaseFee The original l2 base fee before update.
+    /// @param newL2BaseFee The current l2 base fee updated.
+    event L2BaseFeeUpdated(uint256 oldL2BaseFee, uint256 newL2BaseFee);

    /// @notice Emitted when intrinsic params are updated.
    /// @param txGas The intrinsic gas for transaction.
@@ -130,13 +131,14 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
    }

    /// @notice Allows the owner to modify the l2 base fee.
-    /// @param _l2BaseFee The new l2 base fee.
-    function setL2BaseFee(uint256 _l2BaseFee) external {
+    /// @param _newL2BaseFee The new l2 base fee.
+    function setL2BaseFee(uint256 _newL2BaseFee) external {
        require(whitelist.isSenderAllowed(msg.sender), "Not whitelisted sender");

-        l2BaseFee = _l2BaseFee;
+        uint256 _oldL2BaseFee = l2BaseFee;
+        l2BaseFee = _newL2BaseFee;

-        emit L2BaseFeeUpdated(_l2BaseFee);
+        emit L2BaseFeeUpdated(_oldL2BaseFee, _newL2BaseFee);
    }

    /************************
--- a/contracts/src/L1/rollup/ScrollChain.sol
+++ b/contracts/src/L1/rollup/ScrollChain.sol
@@ -3,6 +3,7 @@
 pragma solidity =0.8.16;

 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";

 import {IL1MessageQueue} from "./IL1MessageQueue.sol";
 import {IScrollChain} from "./IScrollChain.sol";
@@ -15,7 +16,7 @@ import {IRollupVerifier} from "../../libraries/verifier/IRollupVerifier.sol";

 /// @title ScrollChain
 /// @notice This contract maintains data for the Scroll rollup.
-contract ScrollChain is OwnableUpgradeable, IScrollChain {
+contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
    /**********
     * Events *
     **********/
@@ -33,7 +34,7 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
    /// @notice Emitted when the address of rollup verifier is updated.
    /// @param oldVerifier The address of old rollup verifier.
    /// @param newVerifier The address of new rollup verifier.
-    event UpdateVerifier(address oldVerifier, address newVerifier);
+    event UpdateVerifier(address indexed oldVerifier, address indexed newVerifier);

    /// @notice Emitted when the value of `maxNumL2TxInChunk` is updated.
    /// @param oldMaxNumL2TxInChunk The old value of `maxNumL2TxInChunk`.
@@ -165,7 +166,7 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
        bytes calldata _parentBatchHeader,
        bytes[] memory _chunks,
        bytes calldata _skippedL1MessageBitmap
-    ) external override OnlySequencer {
+    ) external override OnlySequencer whenNotPaused {
        require(_version == 0, "invalid version");

        // check whether the batch is empty
@@ -291,7 +292,7 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
        bytes32 _postStateRoot,
        bytes32 _withdrawRoot,
        bytes calldata _aggrProof
-    ) external override OnlyProver {
+    ) external override OnlyProver whenNotPaused {
        require(_prevStateRoot != bytes32(0), "previous state root is zero");
        require(_postStateRoot != bytes32(0), "new state root is zero");

@@ -355,24 +356,36 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
     * Restricted Functions *
     ************************/

-    /// @notice Update the status of sequencer.
-    /// @dev This function can only called by contract owner.
-    /// @param _account The address of account to update.
-    /// @param _status The status of the account to update.
-    function updateSequencer(address _account, bool _status) external onlyOwner {
-        isSequencer[_account] = _status;
+    /// @notice Add an account to the sequencer list.
+    /// @param _account The address of account to add.
+    function addSequencer(address _account) external onlyOwner {
+        isSequencer[_account] = true;

-        emit UpdateSequencer(_account, _status);
+        emit UpdateSequencer(_account, true);
    }

-    /// @notice Update the status of prover.
-    /// @dev This function can only called by contract owner.
-    /// @param _account The address of account to update.
-    /// @param _status The status of the account to update.
-    function updateProver(address _account, bool _status) external onlyOwner {
-        isProver[_account] = _status;
+    /// @notice Remove an account from the sequencer list.
+    /// @param _account The address of account to remove.
+    function removeSequencer(address _account) external onlyOwner {
+        isSequencer[_account] = false;

-        emit UpdateProver(_account, _status);
+        emit UpdateSequencer(_account, false);
+    }
+
+    /// @notice Add an account to the prover list.
+    /// @param _account The address of account to add.
+    function addProver(address _account) external onlyOwner {
+        isProver[_account] = true;
+
+        emit UpdateProver(_account, true);
+    }
+
+    /// @notice Add an account from the prover list.
+    /// @param _account The address of account to remove.
+    function removeProver(address _account) external onlyOwner {
+        isProver[_account] = false;
+
+        emit UpdateProver(_account, false);
    }

    /// @notice Update the address verifier contract.
@@ -393,6 +406,16 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
        emit UpdateMaxNumL2TxInChunk(_oldMaxNumL2TxInChunk, _maxNumL2TxInChunk);
    }

+    /// @notice Pause the contract
+    /// @param _status The pause status to update.
+    function setPause(bool _status) external onlyOwner {
+        if (_status) {
+            _pause();
+        } else {
+            _unpause();
+        }
+    }
+
    /**********************
     * Internal Functions *
     **********************/
--- a/contracts/src/L2/IL2ScrollMessenger.sol
+++ b/contracts/src/L2/IL2ScrollMessenger.sol
@@ -5,6 +5,15 @@ pragma solidity ^0.8.16;
 import {IScrollMessenger} from "../libraries/IScrollMessenger.sol";

 interface IL2ScrollMessenger is IScrollMessenger {
+    /**********
+     * Events *
+     **********/
+
+    /// @notice Emitted when the maximum number of times each message can fail in L2 is updated.
+    /// @param oldMaxFailedExecutionTimes The old maximum number of times each message can fail in L2.
+    /// @param newMaxFailedExecutionTimes The new maximum number of times each message can fail in L2.
+    event UpdateMaxFailedExecutionTimes(uint256 oldMaxFailedExecutionTimes, uint256 newMaxFailedExecutionTimes);
+
    /*****************************
     * Public Mutating Functions *
     *****************************/
--- a/contracts/src/L2/L2ScrollMessenger.sol
+++ b/contracts/src/L2/L2ScrollMessenger.sol
@@ -2,12 +2,8 @@

 pragma solidity =0.8.16;

-import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
-
 import {IL2ScrollMessenger} from "./IL2ScrollMessenger.sol";
 import {L2MessageQueue} from "./predeploys/L2MessageQueue.sol";
-import {IL1BlockContainer} from "./predeploys/IL1BlockContainer.sol";
-import {IL1GasPriceOracle} from "./predeploys/IL1GasPriceOracle.sol";

 import {PatriciaMerkleTrieVerifier} from "../libraries/verifier/PatriciaMerkleTrieVerifier.sol";
 import {ScrollConstants} from "../libraries/constants/ScrollConstants.sol";
@@ -26,15 +22,7 @@ import {ScrollMessengerBase} from "../libraries/ScrollMessengerBase.sol";
 ///
 /// @dev It should be a predeployed contract on layer 2 and should hold infinite amount
 /// of Ether (Specifically, `uint256(-1)`), which can be initialized in Genesis Block.
-contract L2ScrollMessenger is ScrollMessengerBase, PausableUpgradeable, IL2ScrollMessenger {
-    /**********
-     * Events *
-     **********/
-
-    /// @notice Emitted when the maximum number of times each message can fail in L2 is updated.
-    /// @param maxFailedExecutionTimes The new maximum number of times each message can fail in L2.
-    event UpdateMaxFailedExecutionTimes(uint256 maxFailedExecutionTimes);
-
+contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
    /*************
     * Constants *
     *************/
@@ -68,9 +56,8 @@ contract L2ScrollMessenger is ScrollMessengerBase, PausableUpgradeable, IL2Scrol
        messageQueue = _messageQueue;
    }

-    function initialize(address _counterpart, address _feeVault) external initializer {
-        PausableUpgradeable.__Pausable_init();
-        ScrollMessengerBase._initialize(_counterpart, _feeVault);
+    function initialize(address _counterpart) external initializer {
+        ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, address(0));

        maxFailedExecutionTimes = 3;
    }
@@ -122,26 +109,16 @@ contract L2ScrollMessenger is ScrollMessengerBase, PausableUpgradeable, IL2Scrol
     * Restricted Functions *
     ************************/

-    /// @notice Pause the contract
-    /// @dev This function can only called by contract owner.
-    /// @param _status The pause status to update.
-    function setPause(bool _status) external onlyOwner {
-        if (_status) {
-            _pause();
-        } else {
-            _unpause();
-        }
-    }
-
    /// @notice Update max failed execution times.
    /// @dev This function can only called by contract owner.
-    /// @param _maxFailedExecutionTimes The new max failed execution times.
-    function updateMaxFailedExecutionTimes(uint256 _maxFailedExecutionTimes) external onlyOwner {
-        require(_maxFailedExecutionTimes > 0, "maxFailedExecutionTimes cannot be zero");
+    /// @param _newMaxFailedExecutionTimes The new max failed execution times.
+    function updateMaxFailedExecutionTimes(uint256 _newMaxFailedExecutionTimes) external onlyOwner {
+        require(_newMaxFailedExecutionTimes > 0, "maxFailedExecutionTimes cannot be zero");

-        maxFailedExecutionTimes = _maxFailedExecutionTimes;
+        uint256 _oldMaxFailedExecutionTimes = maxFailedExecutionTimes;
+        maxFailedExecutionTimes = _newMaxFailedExecutionTimes;

-        emit UpdateMaxFailedExecutionTimes(_maxFailedExecutionTimes);
+        emit UpdateMaxFailedExecutionTimes(_oldMaxFailedExecutionTimes, _newMaxFailedExecutionTimes);
    }

    /**********************
--- a/contracts/src/L2/gateways/IL2GatewayRouter.sol
+++ b/contracts/src/L2/gateways/IL2GatewayRouter.sol
@@ -11,15 +11,18 @@ interface IL2GatewayRouter is IL2ETHGateway, IL2ERC20Gateway {
     **********/

    /// @notice Emitted when the address of ETH Gateway is updated.
-    /// @param ethGateway The address of new ETH Gateway.
-    event SetETHGateway(address indexed ethGateway);
+    /// @param oldETHGateway The address of the old ETH Gateway.
+    /// @param newEthGateway The address of the new ETH Gateway.
+    event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway);

    /// @notice Emitted when the address of default ERC20 Gateway is updated.
-    /// @param defaultERC20Gateway The address of new default ERC20 Gateway.
-    event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
+    /// @param oldDefaultERC20Gateway The address of the old default ERC20 Gateway.
+    /// @param newDefaultERC20Gateway The address of the new default ERC20 Gateway.
+    event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway);

    /// @notice Emitted when the `gateway` for `token` is updated.
    /// @param token The address of token updated.
-    /// @param gateway The corresponding address of gateway updated.
-    event SetERC20Gateway(address indexed token, address indexed gateway);
+    /// @param oldGateway The corresponding address of the old gateway.
+    /// @param newGateway The corresponding address of the new gateway.
+    event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway);
 }
--- a/contracts/src/L2/gateways/L2CustomERC20Gateway.sol
+++ b/contracts/src/L2/gateways/L2CustomERC20Gateway.sol
@@ -2,29 +2,27 @@

 pragma solidity =0.8.16;

-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-
 import {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
-import {IScrollERC20} from "../../libraries/token/IScrollERC20.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {IScrollERC20Upgradeable} from "../../libraries/token/IScrollERC20Upgradeable.sol";

 /// @title L2ERC20Gateway
 /// @notice The `L2ERC20Gateway` is used to withdraw custom ERC20 compatible tokens on layer 2 and
 /// finalize deposit the tokens from layer 1.
 /// @dev The withdrawn tokens tokens will be burned directly. On finalizing deposit, the corresponding
 /// tokens will be minted and transfered to the recipient.
-contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20Gateway {
+contract L2CustomERC20Gateway is L2ERC20Gateway {
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC20 token is updated.
-    /// @param _l2Token The address of corresponding ERC20 token on layer 2.
-    /// @param _l1Token The address of ERC20 token on layer 1.
-    event UpdateTokenMapping(address _l2Token, address _l1Token);
+    /// @param l2Token The address of corresponding ERC20 token in layer 2.
+    /// @param oldL1Token The address of the old corresponding ERC20 token in layer 1.
+    /// @param newL1Token The address of the new corresponding ERC20 token in layer 1.
+    event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token);

    /*************
     * Variables *
@@ -47,7 +45,6 @@ contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20G
        address _messenger
    ) external initializer {
        require(_router != address(0), "zero router address");
-        OwnableUpgradeable.__Ownable_init();

        ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
    }
@@ -83,7 +80,7 @@ contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20G
        require(_l1Token != address(0), "token address cannot be 0");
        require(_l1Token == tokenMapping[_l2Token], "l1 token mismatch");

-        IScrollERC20(_l2Token).mint(_to, _amount);
+        IScrollERC20Upgradeable(_l2Token).mint(_to, _amount);

        _doCallback(_to, _data);

@@ -100,9 +97,10 @@ contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20G
    function updateTokenMapping(address _l2Token, address _l1Token) external onlyOwner {
        require(_l1Token != address(0), "token address cannot be 0");

+        address _oldL1Token = tokenMapping[_l2Token];
        tokenMapping[_l2Token] = _l1Token;

-        emit UpdateTokenMapping(_l2Token, _l1Token);
+        emit UpdateTokenMapping(_l2Token, _oldL1Token, _l1Token);
    }

    /**********************
@@ -129,7 +127,7 @@ contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20G
        }

        // 2. Burn token.
-        IScrollERC20(_token).burn(_from, _amount);
+        IScrollERC20Upgradeable(_token).burn(_from, _amount);

        // 3. Generate message passed to L1StandardERC20Gateway.
        bytes memory _message = abi.encodeCall(
--- a/contracts/src/L2/gateways/L2ERC1155Gateway.sol
+++ b/contracts/src/L2/gateways/L2ERC1155Gateway.sol
@@ -2,14 +2,12 @@

 pragma solidity =0.8.16;

-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {IERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/IERC1155Upgradeable.sol";
 import {ERC1155HolderUpgradeable, ERC1155ReceiverUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155HolderUpgradeable.sol";

 import {IL2ERC1155Gateway} from "./IL2ERC1155Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC1155Gateway} from "../../L1/gateways/IL1ERC1155Gateway.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 import {IScrollERC1155} from "../../libraries/token/IScrollERC1155.sol";

 /// @title L2ERC1155Gateway
@@ -19,15 +17,16 @@ import {IScrollERC1155} from "../../libraries/token/IScrollERC1155.sol";
 /// NFT will be minted and transfered to the recipient.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L2ERC1155Gateway is OwnableUpgradeable, ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC1155Gateway {
+contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC1155Gateway {
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC1155 token is updated.
-    /// @param _l2Token The address of corresponding ERC1155 token on layer 2.
-    /// @param _l1Token The address of ERC1155 token on layer 1.
-    event UpdateTokenMapping(address _l2Token, address _l1Token);
+    /// @param l2Token The address of corresponding ERC1155 token in layer 2.
+    /// @param oldL1Token The address of the old corresponding ERC1155 token in layer 1.
+    /// @param newL1Token The address of the new corresponding ERC1155 token in layer 1.
+    event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token);

    /*************
     * Variables *
@@ -45,7 +44,6 @@ contract L2ERC1155Gateway is OwnableUpgradeable, ERC1155HolderUpgradeable, Scrol
    }

    function initialize(address _counterpart, address _messenger) external initializer {
-        OwnableUpgradeable.__Ownable_init();
        ERC1155HolderUpgradeable.__ERC1155Holder_init();
        ERC1155ReceiverUpgradeable.__ERC1155Receiver_init();

@@ -142,9 +140,10 @@ contract L2ERC1155Gateway is OwnableUpgradeable, ERC1155HolderUpgradeable, Scrol
    function updateTokenMapping(address _l2Token, address _l1Token) external onlyOwner {
        require(_l1Token != address(0), "token address cannot be 0");

+        address _oldL1Token = tokenMapping[_l2Token];
        tokenMapping[_l2Token] = _l1Token;

-        emit UpdateTokenMapping(_l2Token, _l1Token);
+        emit UpdateTokenMapping(_l2Token, _oldL1Token, _l1Token);
    }

    /**********************
--- a/contracts/src/L2/gateways/L2ERC20Gateway.sol
+++ b/contracts/src/L2/gateways/L2ERC20Gateway.sol
@@ -4,9 +4,11 @@ pragma solidity ^0.8.16;

 import {IL2ERC20Gateway} from "./IL2ERC20Gateway.sol";

+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+
 // solhint-disable no-empty-blocks

-abstract contract L2ERC20Gateway is IL2ERC20Gateway {
+abstract contract L2ERC20Gateway is ScrollGatewayBase, IL2ERC20Gateway {
    /*************
     * Variables *
     *************/
--- a/contracts/src/L2/gateways/L2ERC721Gateway.sol
+++ b/contracts/src/L2/gateways/L2ERC721Gateway.sol
@@ -2,14 +2,12 @@

 pragma solidity =0.8.16;

-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import {ERC721HolderUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/utils/ERC721HolderUpgradeable.sol";

 import {IL2ERC721Gateway} from "./IL2ERC721Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC721Gateway} from "../../L1/gateways/IL1ERC721Gateway.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 import {IScrollERC721} from "../../libraries/token/IScrollERC721.sol";

 /// @title L2ERC721Gateway
@@ -19,15 +17,16 @@ import {IScrollERC721} from "../../libraries/token/IScrollERC721.sol";
 /// NFT will be minted and transfered to the recipient.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L2ERC721Gateway is OwnableUpgradeable, ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC721Gateway {
+contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC721Gateway {
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC721 token is updated.
-    /// @param _l2Token The address of corresponding ERC721 token on layer 2.
-    /// @param _l1Token The address of ERC721 token on layer 1.
-    event UpdateTokenMapping(address _l2Token, address _l1Token);
+    /// @param l2Token The address of corresponding ERC721 token in layer 2.
+    /// @param oldL1Token The address of the old corresponding ERC721 token in layer 1.
+    /// @param newL1Token The address of the new corresponding ERC721 token in layer 1.
+    event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token);

    /*************
     * Variables *
@@ -45,7 +44,6 @@ contract L2ERC721Gateway is OwnableUpgradeable, ERC721HolderUpgradeable, ScrollG
    }

    function initialize(address _counterpart, address _messenger) external initializer {
-        OwnableUpgradeable.__Ownable_init();
        ERC721HolderUpgradeable.__ERC721Holder_init();

        ScrollGatewayBase._initialize(_counterpart, address(0), _messenger);
@@ -137,9 +135,10 @@ contract L2ERC721Gateway is OwnableUpgradeable, ERC721HolderUpgradeable, ScrollG
    function updateTokenMapping(address _l2Token, address _l1Token) external onlyOwner {
        require(_l1Token != address(0), "token address cannot be 0");

+        address _oldL1Token = tokenMapping[_l2Token];
        tokenMapping[_l2Token] = _l1Token;

-        emit UpdateTokenMapping(_l2Token, _l1Token);
+        emit UpdateTokenMapping(_l2Token, _oldL1Token, _l1Token);
    }

    /**********************
--- a/contracts/src/L2/gateways/L2ETHGateway.sol
+++ b/contracts/src/L2/gateways/L2ETHGateway.sol
@@ -2,8 +2,6 @@

 pragma solidity =0.8.16;

-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-
 import {IL1ETHGateway} from "../../L1/gateways/IL1ETHGateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL2ETHGateway} from "./IL2ETHGateway.sol";
@@ -15,7 +13,7 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// finalize deposit ETH from layer 1.
 /// @dev The ETH are not held in the gateway. The ETH will be sent to the `L2ScrollMessenger` contract.
 /// On finalizing deposit, the Ether will be transfered from `L2ScrollMessenger`, then transfer to recipient.
-contract L2ETHGateway is Initializable, ScrollGatewayBase, IL2ETHGateway {
+contract L2ETHGateway is ScrollGatewayBase, IL2ETHGateway {
    /***************
     * Constructor *
     ***************/
--- a/contracts/src/L2/gateways/L2GatewayRouter.sol
+++ b/contracts/src/L2/gateways/L2GatewayRouter.sol
@@ -7,9 +7,6 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own
 import {IL2GatewayRouter} from "./IL2GatewayRouter.sol";
 import {IL2ETHGateway} from "./IL2ETHGateway.sol";
 import {IL2ERC20Gateway} from "./IL2ERC20Gateway.sol";
-import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
-import {IL1ETHGateway} from "../../L1/gateways/IL1ETHGateway.sol";
-import {IScrollGateway} from "../../libraries/gateway/IScrollGateway.sol";

 /// @title L2GatewayRouter
 /// @notice The `L2GatewayRouter` is the main entry for withdrawing Ether and ERC20 tokens.
@@ -45,13 +42,13 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
        // it can be zero during initialization
        if (_defaultERC20Gateway != address(0)) {
            defaultERC20Gateway = _defaultERC20Gateway;
-            emit SetDefaultERC20Gateway(_defaultERC20Gateway);
+            emit SetDefaultERC20Gateway(address(0), _defaultERC20Gateway);
        }

        // it can be zero during initialization
        if (_ethGateway != address(0)) {
            ethGateway = _ethGateway;
-            emit SetETHGateway(_ethGateway);
+            emit SetETHGateway(address(0), _ethGateway);
        }
    }

@@ -182,20 +179,22 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {

    /// @notice Update the address of ETH gateway contract.
    /// @dev This function should only be called by contract owner.
-    /// @param _ethGateway The address to update.
-    function setETHGateway(address _ethGateway) external onlyOwner {
-        ethGateway = _ethGateway;
+    /// @param _newEthGateway The address to update.
+    function setETHGateway(address _newEthGateway) external onlyOwner {
+        address _oldEthGateway = ethGateway;
+        ethGateway = _newEthGateway;

-        emit SetETHGateway(_ethGateway);
+        emit SetETHGateway(_oldEthGateway, _newEthGateway);
    }

    /// @notice Update the address of default ERC20 gateway contract.
    /// @dev This function should only be called by contract owner.
-    /// @param _defaultERC20Gateway The address to update.
-    function setDefaultERC20Gateway(address _defaultERC20Gateway) external onlyOwner {
-        defaultERC20Gateway = _defaultERC20Gateway;
+    /// @param _newDefaultERC20Gateway The address to update.
+    function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external onlyOwner {
+        address _oldDefaultERC20Gateway = defaultERC20Gateway;
+        defaultERC20Gateway = _newDefaultERC20Gateway;

-        emit SetDefaultERC20Gateway(_defaultERC20Gateway);
+        emit SetDefaultERC20Gateway(_oldDefaultERC20Gateway, _newDefaultERC20Gateway);
    }

    /// @notice Update the mapping from token address to gateway address.
@@ -206,9 +205,10 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
        require(_tokens.length == _gateways.length, "length mismatch");

        for (uint256 i = 0; i < _tokens.length; i++) {
+            address _oldGateway = ERC20Gateway[_tokens[i]];
            ERC20Gateway[_tokens[i]] = _gateways[i];

-            emit SetERC20Gateway(_tokens[i], _gateways[i]);
+            emit SetERC20Gateway(_tokens[i], _oldGateway, _gateways[i]);
        }
    }
 }
--- a/contracts/src/L2/gateways/L2StandardERC20Gateway.sol
+++ b/contracts/src/L2/gateways/L2StandardERC20Gateway.sol
@@ -2,18 +2,15 @@

 pragma solidity =0.8.16;

-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+import {AddressUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";

 import {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {IScrollERC20} from "../../libraries/token/IScrollERC20.sol";
+import {IScrollERC20Upgradeable} from "../../libraries/token/IScrollERC20Upgradeable.sol";
 import {ScrollStandardERC20} from "../../libraries/token/ScrollStandardERC20.sol";
 import {IScrollStandardERC20Factory} from "../../libraries/token/IScrollStandardERC20Factory.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";

 /// @title L2StandardERC20Gateway
 /// @notice The `L2StandardERC20Gateway` is used to withdraw standard ERC20 tokens on layer 2 and
@@ -21,9 +18,8 @@ import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollG
 /// @dev The withdrawn ERC20 tokens will be burned directly. On finalizing deposit, the corresponding
 /// token will be minted and transfered to the recipient. Any ERC20 that requires non-standard functionality
 /// should use a separate gateway.
-contract L2StandardERC20Gateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
-    using SafeERC20 for IERC20;
-    using Address for address;
+contract L2StandardERC20Gateway is L2ERC20Gateway {
+    using AddressUpgradeable for address;

    /*************
     * Variables *
@@ -114,7 +110,7 @@ contract L2StandardERC20Gateway is Initializable, ScrollGatewayBase, L2ERC20Gate
            _deployL2Token(_deployData, _l1Token);
        }

-        IScrollERC20(_l2Token).mint(_to, _amount);
+        IScrollERC20Upgradeable(_l2Token).mint(_to, _amount);

        _doCallback(_to, _callData);

@@ -145,7 +141,7 @@ contract L2StandardERC20Gateway is Initializable, ScrollGatewayBase, L2ERC20Gate
        require(_l1Token != address(0), "no corresponding l1 token");

        // 2. Burn token.
-        IScrollERC20(_token).burn(_from, _amount);
+        IScrollERC20Upgradeable(_token).burn(_from, _amount);

        // 3. Generate message passed to L1StandardERC20Gateway.
        bytes memory _message = abi.encodeCall(
--- a/contracts/src/L2/gateways/L2WETHGateway.sol
+++ b/contracts/src/L2/gateways/L2WETHGateway.sol
@@ -2,15 +2,14 @@

 pragma solidity =0.8.16;

-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";

 import {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IWETH} from "../../interfaces/IWETH.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";

 /// @title L2WETHGateway
 /// @notice The `L2WETHGateway` contract is used to withdraw `WETH` token on layer 2 and
@@ -19,8 +18,8 @@ import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollG
 /// then the Ether will be sent to the `L2ScrollMessenger` contract.
 /// On finalizing deposit, the Ether will be transfered from `L2ScrollMessenger`, then
 /// wrapped as WETH and finally transfer to recipient.
-contract L2WETHGateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
-    using SafeERC20 for IERC20;
+contract L2WETHGateway is L2ERC20Gateway {
+    using SafeERC20Upgradeable for IERC20Upgradeable;

    /*************
     * Constants *
@@ -89,7 +88,7 @@ contract L2WETHGateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
        require(_amount == msg.value, "msg.value mismatch");

        IWETH(_l2Token).deposit{value: _amount}();
-        IERC20(_l2Token).safeTransfer(_to, _amount);
+        IERC20Upgradeable(_l2Token).safeTransfer(_to, _amount);

        _doCallback(_to, _data);

@@ -118,7 +117,7 @@ contract L2WETHGateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
        }

        // 2. Transfer token into this contract.
-        IERC20(_token).safeTransferFrom(_from, address(this), _amount);
+        IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
        IWETH(_token).withdraw(_amount);

        // 3. Generate message passed to L2StandardERC20Gateway.
--- a/contracts/src/L2/gateways/usdc/L2USDCGateway.sol
+++ b/contracts/src/L2/gateways/usdc/L2USDCGateway.sol
@@ -2,7 +2,6 @@

 pragma solidity =0.8.16;

-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";

@@ -17,7 +16,7 @@ import {L2ERC20Gateway} from "../L2ERC20Gateway.sol";
 /// @title L2USDCGateway
 /// @notice The `L2USDCGateway` contract is used to withdraw `USDC` token on layer 2 and
 /// finalize deposit `USDC` from layer 1.
-contract L2USDCGateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20Gateway {
+contract L2USDCGateway is L2ERC20Gateway {
    using SafeERC20Upgradeable for IERC20Upgradeable;

    /*************
@@ -56,8 +55,6 @@ contract L2USDCGateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20Gateway
    ) external initializer {
        require(_router != address(0), "zero router address");
        ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
-
-        OwnableUpgradeable.__Ownable_init();
    }

    /*************************
--- a/contracts/src/L2/predeploys/L1GasPriceOracle.sol
+++ b/contracts/src/L2/predeploys/L1GasPriceOracle.sol
@@ -5,7 +5,6 @@ pragma solidity =0.8.16;
 import {OwnableBase} from "../../libraries/common/OwnableBase.sol";
 import {IWhitelist} from "../../libraries/common/IWhitelist.sol";

-import {IL1BlockContainer} from "./IL1BlockContainer.sol";
 import {IL1GasPriceOracle} from "./IL1GasPriceOracle.sol";

 contract L1GasPriceOracle is OwnableBase, IL1GasPriceOracle {
--- a/contracts/src/interfaces/IERC20Metadata.sol
+++ b/contracts/src/interfaces/IERC20Metadata.sol
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.16;
-
-interface IERC20Metadata {
-    function symbol() external view returns (string memory);
-
-    function name() external view returns (string memory);
-
-    function decimals() external view returns (uint8);
-}
--- a/contracts/src/libraries/ScrollMessengerBase.sol
+++ b/contracts/src/libraries/ScrollMessengerBase.sol
@@ -3,13 +3,20 @@
 pragma solidity ^0.8.16;

 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
+import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";

 import {ScrollConstants} from "./constants/ScrollConstants.sol";
 import {IScrollMessenger} from "./IScrollMessenger.sol";

 // solhint-disable var-name-mixedcase

-abstract contract ScrollMessengerBase is OwnableUpgradeable, IScrollMessenger {
+abstract contract ScrollMessengerBase is
+    OwnableUpgradeable,
+    PausableUpgradeable,
+    ReentrancyGuardUpgradeable,
+    IScrollMessenger
+{
    /**********
     * Events *
     **********/
@@ -19,14 +26,6 @@ abstract contract ScrollMessengerBase is OwnableUpgradeable, IScrollMessenger {
    /// @param _newFeeVault The address of new fee vault contract.
    event UpdateFeeVault(address _oldFeeVault, address _newFeeVault);

-    /*************
-     * Constants *
-     *************/
-
-    // https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.5.0/contracts/security/ReentrancyGuard.sol
-    uint256 internal constant _NOT_ENTERED = 1;
-    uint256 internal constant _ENTERED = 2;
-
    /*************
     * Variables *
     *************/
@@ -40,31 +39,13 @@ abstract contract ScrollMessengerBase is OwnableUpgradeable, IScrollMessenger {
    /// @notice The address of fee vault, collecting cross domain messaging fee.
    address public feeVault;

-    // @note move to ScrollMessengerBase in next big refactor
-    /// @dev The status of for non-reentrant check.
-    uint256 private _lock_status;
-
    /// @dev The storage slots for future usage.
-    uint256[46] private __gap;
+    uint256[47] private __gap;

    /**********************
     * Function Modifiers *
     **********************/

-    modifier nonReentrant() {
-        // On the first call to nonReentrant, _notEntered will be true
-        require(_lock_status != _ENTERED, "ReentrancyGuard: reentrant call");
-
-        // Any calls to nonReentrant after this point will fail
-        _lock_status = _ENTERED;
-
-        _;
-
-        // By storing the original value once again, a refund is triggered (see
-        // https://eips.ethereum.org/EIPS/eip-2200)
-        _lock_status = _NOT_ENTERED;
-    }
-
    modifier notInExecution() {
        require(
            xDomainMessageSender == ScrollConstants.DEFAULT_XDOMAIN_MESSAGE_SENDER,
@@ -77,14 +58,18 @@ abstract contract ScrollMessengerBase is OwnableUpgradeable, IScrollMessenger {
     * Constructor *
     ***************/

-    function _initialize(address _counterpart, address _feeVault) internal {
+    function __ScrollMessengerBase_init(address _counterpart, address _feeVault) internal onlyInitializing {
        OwnableUpgradeable.__Ownable_init();
+        PausableUpgradeable.__Pausable_init();
+        ReentrancyGuardUpgradeable.__ReentrancyGuard_init();

        // initialize to a nonzero value
        xDomainMessageSender = ScrollConstants.DEFAULT_XDOMAIN_MESSAGE_SENDER;

        counterpart = _counterpart;
-        feeVault = _feeVault;
+        if (_feeVault != address(0)) {
+            feeVault = _feeVault;
+        }
    }

    // make sure only owner can send ether to messenger to avoid possible user fund loss.
@@ -104,6 +89,17 @@ abstract contract ScrollMessengerBase is OwnableUpgradeable, IScrollMessenger {
        emit UpdateFeeVault(_oldFeeVault, _newFeeVault);
    }

+    /// @notice Pause the contract
+    /// @dev This function can only called by contract owner.
+    /// @param _status The pause status to update.
+    function setPause(bool _status) external onlyOwner {
+        if (_status) {
+            _pause();
+        } else {
+            _unpause();
+        }
+    }
+
    /**********************
     * Internal Functions *
     **********************/
--- a/contracts/src/libraries/gateway/ScrollGatewayBase.sol
+++ b/contracts/src/libraries/gateway/ScrollGatewayBase.sol
@@ -2,20 +2,15 @@

 pragma solidity ^0.8.16;

+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
+
 import {IScrollGateway} from "./IScrollGateway.sol";
 import {IScrollMessenger} from "../IScrollMessenger.sol";
 import {IScrollGatewayCallback} from "../callbacks/IScrollGatewayCallback.sol";
 import {ScrollConstants} from "../constants/ScrollConstants.sol";

-abstract contract ScrollGatewayBase is IScrollGateway {
-    /*************
-     * Constants *
-     *************/
-
-    // https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.5.0/contracts/security/ReentrancyGuard.sol
-    uint256 private constant _NOT_ENTERED = 1;
-    uint256 private constant _ENTERED = 2;
-
+abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgradeable, IScrollGateway {
    /*************
     * Variables *
     *************/
@@ -29,35 +24,13 @@ abstract contract ScrollGatewayBase is IScrollGateway {
    /// @inheritdoc IScrollGateway
    address public override messenger;

-    /// @dev The status of for non-reentrant check.
-    uint256 private _status;
-
    /// @dev The storage slots for future usage.
-    uint256[46] private __gap;
+    uint256[47] private __gap;

    /**********************
     * Function Modifiers *
     **********************/

-    modifier nonReentrant() {
-        // On the first call to nonReentrant, _notEntered will be true
-        require(_status != _ENTERED, "ReentrancyGuard: reentrant call");
-
-        // Any calls to nonReentrant after this point will fail
-        _status = _ENTERED;
-
-        _;
-
-        // By storing the original value once again, a refund is triggered (see
-        // https://eips.ethereum.org/EIPS/eip-2200)
-        _status = _NOT_ENTERED;
-    }
-
-    modifier onlyMessenger() {
-        require(msg.sender == messenger, "only messenger can call");
-        _;
-    }
-
    modifier onlyCallByCounterpart() {
        address _messenger = messenger; // gas saving
        require(msg.sender == _messenger, "only messenger can call");
@@ -87,6 +60,9 @@ abstract contract ScrollGatewayBase is IScrollGateway {
        require(_counterpart != address(0), "zero counterpart address");
        require(_messenger != address(0), "zero messenger address");

+        ReentrancyGuardUpgradeable.__ReentrancyGuard_init();
+        OwnableUpgradeable.__Ownable_init();
+
        counterpart = _counterpart;
        messenger = _messenger;

@@ -94,9 +70,6 @@ abstract contract ScrollGatewayBase is IScrollGateway {
        if (_router != address(0)) {
            router = _router;
        }
-
-        // for reentrancy guard
-        _status = _NOT_ENTERED;
    }

    /**********************
--- a/contracts/src/libraries/token/ScrollStandardERC20.sol
+++ b/contracts/src/libraries/token/ScrollStandardERC20.sol
@@ -76,12 +76,7 @@ contract ScrollStandardERC20 is ERC20PermitUpgradeable, IScrollERC20Upgradeable
    }

    function isContract(address _addr) private view returns (bool hasCode) {
-        uint256 length;
-        // solhint-disable-next-line no-inline-assembly
-        assembly {
-            length := extcodesize(_addr)
-        }
-        return length > 0;
+        hasCode = _addr.code.length > 0;
    }

    /// @inheritdoc IScrollERC20Upgradeable
--- a/contracts/src/test/L1GatewayRouter.t.sol
+++ b/contracts/src/test/L1GatewayRouter.t.sol
@@ -20,9 +20,9 @@ import {TransferReentrantToken} from "./mocks/tokens/TransferReentrantToken.sol"

 contract L1GatewayRouterTest is L1GatewayTestBase {
    // from L1GatewayRouter
-    event SetETHGateway(address indexed ethGateway);
-    event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
-    event SetERC20Gateway(address indexed token, address indexed gateway);
+    event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway);
+    event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway);
+    event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway);

    ScrollStandardERC20 private template;
    ScrollStandardERC20Factory private factory;
@@ -94,8 +94,8 @@ contract L1GatewayRouterTest is L1GatewayTestBase {
        hevm.stopPrank();

        // set by owner, should succeed
-        hevm.expectEmit(true, false, false, true);
-        emit SetDefaultERC20Gateway(address(l1StandardERC20Gateway));
+        hevm.expectEmit(true, true, false, true);
+        emit SetDefaultERC20Gateway(address(0), address(l1StandardERC20Gateway));

        assertEq(address(0), router.getERC20Gateway(address(l1Token)));
        assertEq(address(0), router.defaultERC20Gateway());
@@ -121,8 +121,8 @@ contract L1GatewayRouterTest is L1GatewayTestBase {
        _tokens[0] = address(l1Token);
        _gateways[0] = address(l1StandardERC20Gateway);

-        hevm.expectEmit(true, true, false, true);
-        emit SetERC20Gateway(address(l1Token), address(l1StandardERC20Gateway));
+        hevm.expectEmit(true, true, true, true);
+        emit SetERC20Gateway(address(l1Token), address(0), address(l1StandardERC20Gateway));

        assertEq(address(0), router.getERC20Gateway(address(l1Token)));
        router.setERC20Gateway(_tokens, _gateways);
--- a/contracts/src/test/L1GatewayTestBase.t.sol
+++ b/contracts/src/test/L1GatewayTestBase.t.sol
@@ -101,8 +101,8 @@ abstract contract L1GatewayTestBase is DSTestPlus {
    }

    function prepareL2MessageRoot(bytes32 messageHash) internal {
-        rollup.updateSequencer(address(this), true);
-        rollup.updateProver(address(this), true);
+        rollup.addSequencer(address(this));
+        rollup.addProver(address(this));

        // import genesis batch
        bytes memory batchHeader0 = new bytes(89);
--- a/contracts/src/test/L1ScrollMessengerTest.t.sol
+++ b/contracts/src/test/L1ScrollMessengerTest.t.sol
@@ -16,7 +16,7 @@ import {L1GatewayTestBase} from "./L1GatewayTestBase.t.sol";

 contract L1ScrollMessengerTest is L1GatewayTestBase {
    event OnDropMessageCalled(bytes);
-    event UpdateMaxReplayTimes(uint256 maxReplayTimes);
+    event UpdateMaxReplayTimes(uint256 oldMaxReplayTimes, uint256 newMaxReplayTimes);

    function setUp() public {
        L1GatewayTestBase.setUpBase();
@@ -159,7 +159,7 @@ contract L1ScrollMessengerTest is L1GatewayTestBase {
        hevm.stopPrank();

        hevm.expectEmit(false, false, false, true);
-        emit UpdateMaxReplayTimes(_maxReplayTimes);
+        emit UpdateMaxReplayTimes(0, _maxReplayTimes);

        assertEq(l1Messenger.maxReplayTimes(), 0);
        l1Messenger.updateMaxReplayTimes(_maxReplayTimes);
--- a/contracts/src/test/L2GatewayRouter.t.sol
+++ b/contracts/src/test/L2GatewayRouter.t.sol
@@ -19,10 +19,10 @@ import {ScrollStandardERC20Factory} from "../libraries/token/ScrollStandardERC20
 import {L2GatewayTestBase} from "./L2GatewayTestBase.t.sol";

 contract L2GatewayRouterTest is L2GatewayTestBase {
-    // from L1GatewayRouter
-    event SetETHGateway(address indexed ethGateway);
-    event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
-    event SetERC20Gateway(address indexed token, address indexed gateway);
+    // from L2GatewayRouter
+    event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway);
+    event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway);
+    event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway);

    ScrollStandardERC20 private template;
    ScrollStandardERC20Factory private factory;
@@ -89,8 +89,8 @@ contract L2GatewayRouterTest is L2GatewayTestBase {
        hevm.stopPrank();

        // set by owner, should succeed
-        hevm.expectEmit(true, false, false, true);
-        emit SetDefaultERC20Gateway(address(l2StandardERC20Gateway));
+        hevm.expectEmit(true, true, false, true);
+        emit SetDefaultERC20Gateway(address(0), address(l2StandardERC20Gateway));

        assertEq(address(0), router.getERC20Gateway(address(l1Token)));
        assertEq(address(0), router.defaultERC20Gateway());
@@ -116,8 +116,8 @@ contract L2GatewayRouterTest is L2GatewayTestBase {
        _tokens[0] = address(l1Token);
        _gateways[0] = address(l2StandardERC20Gateway);

-        hevm.expectEmit(true, true, false, true);
-        emit SetERC20Gateway(address(l1Token), address(l2StandardERC20Gateway));
+        hevm.expectEmit(true, true, true, true);
+        emit SetERC20Gateway(address(l1Token), address(0), address(l2StandardERC20Gateway));

        assertEq(address(0), router.getERC20Gateway(address(l1Token)));
        router.setERC20Gateway(_tokens, _gateways);
--- a/contracts/src/test/L2GatewayTestBase.t.sol
+++ b/contracts/src/test/L2GatewayTestBase.t.sol
@@ -58,7 +58,7 @@ abstract contract L2GatewayTestBase is DSTestPlus {
        );

        // Initialize L2 contracts
-        l2Messenger.initialize(address(l1Messenger), feeVault);
+        l2Messenger.initialize(address(l1Messenger));
        l2MessageQueue.initialize(address(l2Messenger));
        l1GasOracle.updateWhitelist(address(whitelist));

--- a/contracts/src/test/L2ScrollMessenger.t.sol
+++ b/contracts/src/test/L2ScrollMessenger.t.sol
@@ -40,7 +40,7 @@ contract L2ScrollMessengerTest is DSTestPlus {
        );

        // Initialize L2 contracts
-        l2Messenger.initialize(address(l1Messenger), feeVault);
+        l2Messenger.initialize(address(l1Messenger));
        l2MessageQueue.initialize(address(l2Messenger));
        l1GasOracle.updateWhitelist(address(whitelist));
    }
--- a/contracts/src/test/ScrollChain.t.sol
+++ b/contracts/src/test/ScrollChain.t.sol
@@ -18,7 +18,7 @@ contract ScrollChainTest is DSTestPlus {
    // from ScrollChain
    event UpdateSequencer(address indexed account, bool status);
    event UpdateProver(address indexed account, bool status);
-    event UpdateVerifier(address oldVerifier, address newVerifier);
+    event UpdateVerifier(address indexed oldVerifier, address indexed newVerifier);
    event UpdateMaxNumL2TxInChunk(uint256 oldMaxNumL2TxInChunk, uint256 newMaxNumL2TxInChunk);

    event CommitBatch(uint256 indexed batchIndex, bytes32 indexed batchHash);
@@ -62,7 +62,7 @@ contract ScrollChainTest is DSTestPlus {
        hevm.expectRevert("caller not sequencer");
        rollup.commitBatch(0, batchHeader0, new bytes[](0), new bytes(0));

-        rollup.updateSequencer(address(this), true);
+        rollup.addSequencer(address(this));

        // invalid version, revert
        hevm.expectRevert("invalid version");
@@ -130,8 +130,8 @@ contract ScrollChainTest is DSTestPlus {
        hevm.expectRevert("caller not prover");
        rollup.finalizeBatchWithProof(new bytes(0), bytes32(0), bytes32(0), bytes32(0), new bytes(0));

-        rollup.updateProver(address(this), true);
-        rollup.updateSequencer(address(this), true);
+        rollup.addProver(address(this));
+        rollup.addSequencer(address(this));

        bytes memory batchHeader0 = new bytes(89);

@@ -218,8 +218,8 @@ contract ScrollChainTest is DSTestPlus {
    }

    function testCommitAndFinalizeWithL1Messages() public {
-        rollup.updateSequencer(address(this), true);
-        rollup.updateProver(address(this), true);
+        rollup.addSequencer(address(this));
+        rollup.addProver(address(this));

        // import 300 L1 messages
        for (uint256 i = 0; i < 300; i++) {
@@ -453,7 +453,7 @@ contract ScrollChainTest is DSTestPlus {
        rollup.revertBatch(new bytes(89), 1);
        hevm.stopPrank();

-        rollup.updateSequencer(address(this), true);
+        rollup.addSequencer(address(this));

        bytes memory batchHeader0 = new bytes(89);

@@ -518,11 +518,13 @@ contract ScrollChainTest is DSTestPlus {
        assertEq(uint256(rollup.committedBatches(2)), 0);
    }

-    function testUpdateSequencer(address _sequencer) public {
+    function testAddAndRemoveSequencer(address _sequencer) public {
        // set by non-owner, should revert
        hevm.startPrank(address(1));
        hevm.expectRevert("Ownable: caller is not the owner");
-        rollup.updateSequencer(_sequencer, true);
+        rollup.addSequencer(_sequencer);
+        hevm.expectRevert("Ownable: caller is not the owner");
+        rollup.removeSequencer(_sequencer);
        hevm.stopPrank();

        // change to random operator
@@ -530,20 +532,22 @@ contract ScrollChainTest is DSTestPlus {
        emit UpdateSequencer(_sequencer, true);

        assertBoolEq(rollup.isSequencer(_sequencer), false);
-        rollup.updateSequencer(_sequencer, true);
+        rollup.addSequencer(_sequencer);
        assertBoolEq(rollup.isSequencer(_sequencer), true);

        hevm.expectEmit(true, false, false, true);
        emit UpdateSequencer(_sequencer, false);
-        rollup.updateSequencer(_sequencer, false);
+        rollup.removeSequencer(_sequencer);
        assertBoolEq(rollup.isSequencer(_sequencer), false);
    }

-    function testUpdateProver(address _prover) public {
+    function testAddAndRemoveProver(address _prover) public {
        // set by non-owner, should revert
        hevm.startPrank(address(1));
        hevm.expectRevert("Ownable: caller is not the owner");
-        rollup.updateProver(_prover, true);
+        rollup.addProver(_prover);
+        hevm.expectRevert("Ownable: caller is not the owner");
+        rollup.removeProver(_prover);
        hevm.stopPrank();

        // change to random operator
@@ -551,15 +555,39 @@ contract ScrollChainTest is DSTestPlus {
        emit UpdateProver(_prover, true);

        assertBoolEq(rollup.isProver(_prover), false);
-        rollup.updateProver(_prover, true);
+        rollup.addProver(_prover);
        assertBoolEq(rollup.isProver(_prover), true);

        hevm.expectEmit(true, false, false, true);
        emit UpdateProver(_prover, false);
-        rollup.updateProver(_prover, false);
+        rollup.removeProver(_prover);
        assertBoolEq(rollup.isProver(_prover), false);
    }

+    function testSetPause() external {
+        rollup.addSequencer(address(this));
+        rollup.addProver(address(this));
+
+        // not owner, revert
+        hevm.startPrank(address(1));
+        hevm.expectRevert("Ownable: caller is not the owner");
+        rollup.setPause(false);
+        hevm.stopPrank();
+
+        // pause
+        rollup.setPause(true);
+        assertBoolEq(true, rollup.paused());
+
+        hevm.expectRevert("Pausable: paused");
+        rollup.commitBatch(0, new bytes(0), new bytes[](0), new bytes(0));
+        hevm.expectRevert("Pausable: paused");
+        rollup.finalizeBatchWithProof(new bytes(0), bytes32(0), bytes32(0), bytes32(0), new bytes(0));
+
+        // unpause
+        rollup.setPause(false);
+        assertBoolEq(false, rollup.paused());
+    }
+
    function testUpdateVerifier(address _newVerifier) public {
        // set by non-owner, should revert
        hevm.startPrank(address(1));
@@ -568,7 +596,7 @@ contract ScrollChainTest is DSTestPlus {
        hevm.stopPrank();

        // change to random operator
-        hevm.expectEmit(false, false, false, true);
+        hevm.expectEmit(true, true, false, true);
        emit UpdateVerifier(address(verifier), _newVerifier);

        assertEq(rollup.verifier(), address(verifier));
--- a/coordinator/README.md
+++ b/coordinator/README.md
@@ -37,7 +37,7 @@ make lint

 ## Configure

-The coordinator behavior can be configured using [`config.json`](config.json). Check the code comments under `ProverManagerConfig` in [`config/config.go`](config/config.go) for more details.
+The coordinator behavior can be configured using [`config.json`](config.json). Check the code comments under `ProverManager` in [`config/config.go`](config/config.go) for more details.


 ## Start
--- a/coordinator/client/client.go
+++ b/coordinator/client/client.go
@@ -1,51 +0,0 @@
-package client
-
-import (
-	"context"
-
-	"github.com/scroll-tech/go-ethereum"
-	"github.com/scroll-tech/go-ethereum/rpc"
-
-	"scroll-tech/common/types/message"
-)
-
-// Client defines typed wrappers for the Ethereum RPC API.
-type Client struct {
-	client *rpc.Client
-}
-
-// Dial connects a client to the given URL.
-func Dial(rawurl string) (*Client, error) {
-	return DialContext(context.Background(), rawurl)
-}
-
-// DialContext connects a client to the given URL with a given context.
-func DialContext(ctx context.Context, rawurl string) (*Client, error) {
-	c, err := rpc.DialContext(ctx, rawurl)
-	if err != nil {
-		return nil, err
-	}
-	return NewClient(c), nil
-}
-
-// NewClient creates a client that uses the given RPC client.
-func NewClient(c *rpc.Client) *Client {
-	return &Client{client: c}
-}
-
-// RequestToken generates token for prover
-func (c *Client) RequestToken(ctx context.Context, authMsg *message.AuthMsg) (string, error) {
-	var token string
-	err := c.client.CallContext(ctx, &token, "prover_requestToken", authMsg)
-	return token, err
-}
-
-// RegisterAndSubscribe subscribe prover and register, verified by sign data.
-func (c *Client) RegisterAndSubscribe(ctx context.Context, taskCh chan *message.TaskMsg, authMsg *message.AuthMsg) (ethereum.Subscription, error) {
-	return c.client.Subscribe(ctx, "prover", taskCh, "register", authMsg)
-}
-
-// SubmitProof get proof from prover.
-func (c *Client) SubmitProof(ctx context.Context, proof *message.ProofMsg) error {
-	return c.client.CallContext(ctx, nil, "prover_submitProof", proof)
-}
--- a/coordinator/cmd/app/app.go
+++ b/coordinator/cmd/app/app.go
@@ -2,13 +2,17 @@ package app

 import (
 	"context"
+	"errors"
 	"fmt"
+	"net/http"
 	"os"
 	"os/signal"
+	"time"

 	// enable the pprof
 	_ "net/http/pprof"

+	"github.com/gin-gonic/gin"
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"

@@ -20,7 +24,7 @@ import (
 	"scroll-tech/coordinator/internal/config"
 	"scroll-tech/coordinator/internal/controller/api"
 	"scroll-tech/coordinator/internal/controller/cron"
-	"scroll-tech/coordinator/internal/logic/provermanager"
+	"scroll-tech/coordinator/internal/route"
 )

 var app *cli.App
@@ -49,15 +53,12 @@ func action(ctx *cli.Context) error {
 	}

 	subCtx, cancel := context.WithCancel(ctx.Context)
-	db, err := database.InitDB(cfg.DBConfig)
+	db, err := database.InitDB(cfg.DB)
 	if err != nil {
 		log.Crit("failed to init db connection", "err", err)
 	}

 	proofCollector := cron.NewCollector(subCtx, db, cfg)
-
-	provermanager.InitProverManager(db)
-
 	defer func() {
 		proofCollector.Stop()
 		cancel()
@@ -66,34 +67,24 @@ func action(ctx *cli.Context) error {
 		}
 	}()

+	router := gin.Default()
+	api.InitController(cfg, db)
+	route.Route(router, cfg)
+	port := ctx.String(httpPortFlag.Name)
+	srv := &http.Server{
+		Addr:              fmt.Sprintf(":%s", port),
+		Handler:           router,
+		ReadHeaderTimeout: time.Minute,
+	}
+
 	// Start metrics server.
 	metrics.Serve(subCtx, ctx)

-	apis := api.RegisterAPIs(cfg, db)
-	// Register api and start rpc service.
-	if ctx.Bool(httpEnabledFlag.Name) {
-		handler, addr, err := utils.StartHTTPEndpoint(fmt.Sprintf("%s:%d", ctx.String(httpListenAddrFlag.Name), ctx.Int(httpPortFlag.Name)), apis)
-		if err != nil {
-			log.Crit("Could not start RPC api", "error", err)
+	go func() {
+		if runServerErr := srv.ListenAndServe(); err != nil && !errors.Is(runServerErr, http.ErrServerClosed) {
+			log.Crit("run coordinator http server failure", "error", runServerErr)
 		}
-		defer func() {
-			_ = handler.Shutdown(ctx.Context)
-			log.Info("HTTP endpoint closed", "url", fmt.Sprintf("http://%v/", addr))
-		}()
-		log.Info("HTTP endpoint opened", "url", fmt.Sprintf("http://%v/", addr))
-	}
-	// Register api and start ws service.
-	if ctx.Bool(wsEnabledFlag.Name) {
-		handler, addr, err := utils.StartWSEndpoint(fmt.Sprintf("%s:%d", ctx.String(wsListenAddrFlag.Name), ctx.Int(wsPortFlag.Name)), apis, cfg.ProverManagerConfig.CompressionLevel)
-		if err != nil {
-			log.Crit("Could not start WS api", "error", err)
-		}
-		defer func() {
-			_ = handler.Shutdown(ctx.Context)
-			log.Info("WS endpoint closed", "url", fmt.Sprintf("ws://%v/", addr))
-		}()
-		log.Info("WS endpoint opened", "url", fmt.Sprintf("ws://%v/", addr))
-	}
+	}()

 	// Catch CTRL-C to ensure a graceful shutdown.
 	interrupt := make(chan os.Signal, 1)
@@ -101,7 +92,17 @@ func action(ctx *cli.Context) error {

 	// Wait until the interrupt signal is received from an OS signal.
 	<-interrupt
+	log.Info("start shutdown coordinator server ...")

+	closeCtx, cancelExit := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancelExit()
+	if err = srv.Shutdown(closeCtx); err != nil {
+		log.Warn("shutdown coordinator server failure", "error", err)
+		return nil
+	}
+
+	<-closeCtx.Done()
+	log.Info("coordinator server exiting success")
 	return nil
 }

--- a/coordinator/cmd/app/mock_app.go
+++ b/coordinator/cmd/app/mock_app.go
@@ -18,7 +18,7 @@ import (
 )

 var (
-	wsStartPort int64 = 40000
+	httpStartPort int64 = 40000
 )

 // CoordinatorApp coordinator-test client manager.
@@ -29,7 +29,7 @@ type CoordinatorApp struct {

 	originFile      string
 	coordinatorFile string
-	WSPort          int64
+	HTTPPort        int64

 	args []string
 	docker.AppAPI
@@ -39,13 +39,13 @@ type CoordinatorApp struct {
 func NewCoordinatorApp(base *docker.App, file string) *CoordinatorApp {
 	coordinatorFile := fmt.Sprintf("/tmp/%d_coordinator-config.json", base.Timestamp)
 	port, _ := rand.Int(rand.Reader, big.NewInt(2000))
-	wsPort := port.Int64() + wsStartPort
+	httpPort := port.Int64() + httpStartPort
 	coordinatorApp := &CoordinatorApp{
 		base:            base,
 		originFile:      file,
 		coordinatorFile: coordinatorFile,
-		WSPort:          wsPort,
-		args:            []string{"--log.debug", "--config", coordinatorFile, "--ws", "--ws.port", strconv.Itoa(int(wsPort))},
+		HTTPPort:        httpPort,
+		args:            []string{"--log.debug", "--config", coordinatorFile, "--http", "--http.port", strconv.Itoa(int(httpPort))},
 	}
 	if err := coordinatorApp.MockConfig(true); err != nil {
 		panic(err)
@@ -67,9 +67,9 @@ func (c *CoordinatorApp) Free() {
 	_ = os.Remove(c.coordinatorFile)
 }

-// WSEndpoint returns ws endpoint.
-func (c *CoordinatorApp) WSEndpoint() string {
-	return fmt.Sprintf("ws://localhost:%d", c.WSPort)
+// HTTPEndpoint returns ws endpoint.
+func (c *CoordinatorApp) HTTPEndpoint() string {
+	return fmt.Sprintf("http://localhost:%d", c.HTTPPort)
 }

 // MockConfig creates a new coordinator config.
@@ -80,14 +80,17 @@ func (c *CoordinatorApp) MockConfig(store bool) error {
 		return err
 	}
 	// Reset prover manager config for manager test cases.
-	cfg.ProverManagerConfig = &coordinatorConfig.ProverManagerConfig{
-		ProversPerSession: 1,
-		Verifier:          &coordinatorConfig.VerifierConfig{MockMode: true},
-		CollectionTime:    1,
-		TokenTimeToLive:   1,
+	cfg.ProverManager = &coordinatorConfig.ProverManager{
+		ProversPerSession:  1,
+		Verifier:           &coordinatorConfig.VerifierConfig{MockMode: true},
+		CollectionTimeSec:  60,
+		SessionAttempts:    10,
+		MaxVerifierWorkers: 4,
 	}
-	cfg.DBConfig.DSN = base.DBImg.Endpoint()
-	cfg.L2Config.ChainID = 111
+	cfg.DB.DSN = base.DBImg.Endpoint()
+	cfg.L2.ChainID = 111
+	cfg.Auth.ChallengeExpireDurationSec = 1
+	cfg.Auth.LoginExpireDurationSec = 1
 	c.Config = cfg

 	if !store {
--- a/coordinator/conf/config.json
+++ b/coordinator/conf/config.json
@@ -1,25 +1,27 @@
 {
-  "prover_manager_config": {
-    "compression_level": 9,
+  "prover_manager": {
    "provers_per_session": 1,
-    "session_attempts": 2,
-    "collection_time": 180,
-    "token_time_to_live": 60,
+    "session_attempts": 5,
+    "collection_time_sec": 180,
    "verifier": {
      "mock_mode": true,
      "params_path": "",
      "assets_path": ""
    },
-    "max_verifier_workers": 10,
-    "order_session": "ASC"
+    "max_verifier_workers": 4
  },
-  "db_config": {
+  "db": {
    "driver_name": "postgres",
    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable",
    "maxOpenNum": 200,
    "maxIdleNum": 20
  },
-  "l2_config": {
+  "l2": {
    "chain_id": 111
+  },
+  "auth": {
+    "secret": "prover secret key",
+    "challenge_expire_duration_sec": 10,
+    "login_expire_duration_sec": 3600
  }
 }
--- a/coordinator/go.mod
+++ b/coordinator/go.mod
@@ -3,52 +3,67 @@ module scroll-tech/coordinator
 go 1.19

 require (
-	github.com/agiledragon/gomonkey/v2 v2.9.0
-	github.com/orcaman/concurrent-map v1.0.0
-	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/appleboy/gin-jwt/v2 v2.9.1
+	github.com/gin-gonic/gin v1.9.1
+	github.com/go-resty/resty/v2 v2.7.0
+	github.com/mitchellh/mapstructure v1.5.0
 	github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca
 	github.com/shopspring/decimal v1.3.1
 	github.com/stretchr/testify v1.8.3
 	github.com/urfave/cli/v2 v2.25.7
-	golang.org/x/sync v0.3.0
 	gorm.io/gorm v1.25.2
 )

 require (
+	github.com/bytedance/sonic v1.9.2 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.14.1 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	golang.org/x/arch v0.4.0 // indirect
+	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 )

 require (
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/gopherjs/gopherjs v1.17.2 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/iden3/go-iden3-crypto v0.0.15 // indirect
-	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/scroll-tech/zktrie v0.6.0 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/smartystreets/assertions v1.13.1 // indirect
-	github.com/smartystreets/goconvey v1.8.0
 	github.com/tklauser/go-sysconf v0.3.11 // indirect
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/crypto v0.11.0 // indirect
 	golang.org/x/sys v0.10.0 // indirect
-	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/coordinator/go.sum
+++ b/coordinator/go.sum
@@ -1,7 +1,9 @@
 github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
-github.com/agiledragon/gomonkey/v2 v2.9.0 h1:PDiKKybR596O6FHW+RVSG0Z7uGCBNbmbUXh3uCNQ7Hc=
-github.com/agiledragon/gomonkey/v2 v2.9.0/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
+github.com/appleboy/gin-jwt/v2 v2.9.1 h1:l29et8iLW6omcHltsOP6LLk4s3v4g2FbFs0koxGWVZs=
+github.com/appleboy/gin-jwt/v2 v2.9.1/go.mod h1:jwcPZJ92uoC9nOUTOKWoN/f6JZOgMSKlFSHw5/FrRUk=
+github.com/appleboy/gofight/v2 v2.1.2 h1:VOy3jow4vIK8BRQJoC/I9muxyYlJ2yb9ht2hZoS3rf4=
+github.com/appleboy/gofight/v2 v2.1.2/go.mod h1:frW+U1QZEdDgixycTj4CygQ48yLTUhplt43+Wczp3rw=
 github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
@@ -11,29 +13,62 @@ github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVa
 github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.9.2 h1:GDaNjuWSGu09guE9Oql0MSTNhNCLlWwO8y/xM5BzcbM=
+github.com/bytedance/sonic v1.9.2/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
-github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
+github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k=
+github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
+github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
+github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
+github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=
 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
-github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/iden3/go-iden3-crypto v0.0.15 h1:4MJYlrot1l31Fzlo2sF56u7EVFeHHJkxGXXZCtESgK4=
@@ -44,10 +79,15 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -55,16 +95,30 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
+github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY=
-github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
-github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
+github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
+github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
+github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -73,6 +127,8 @@ github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
@@ -86,51 +142,117 @@ github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKl
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
 github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.13.1 h1:Ef7KhSmjZcK6AVf9YbJdvPYG9avaF0ZxudX+ThRdWfU=
-github.com/smartystreets/assertions v1.13.1/go.mod h1:cXr/IwVfSo/RbCSPhoAPv73p3hlSdrBH/b3SdnW/LMY=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/smartystreets/goconvey v1.8.0 h1:Oi49ha/2MURE0WexF052Z0m+BNSGirfjg5RL+JXWq3w=
-github.com/smartystreets/goconvey v1.8.0/go.mod h1:EdX8jtrTIj26jmjCOVNMVSIYAtgexqXKHOXW2Dx9JLg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
+github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=
+github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
 github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
 github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
 github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
+github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
+github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
 github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
+golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
 golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
+golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
-gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
 gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
--- a/coordinator/internal/config/config.go
+++ b/coordinator/internal/config/config.go
@@ -2,50 +2,46 @@ package config

 import (
 	"encoding/json"
-	"errors"
 	"os"
 	"path/filepath"
-	"strings"

 	"scroll-tech/common/database"
 )

-const (
-	defaultNumberOfVerifierWorkers      = 10
-	defaultNumberOfSessionRetryAttempts = 2
-)
-
-// ProverManagerConfig loads sequencer configuration items.
-type ProverManagerConfig struct {
-	CompressionLevel int `json:"compression_level,omitempty"`
-	// asc or desc (default: asc)
-	OrderSession string `json:"order_session,omitempty"`
+// ProverManager loads sequencer configuration items.
+type ProverManager struct {
 	// The amount of provers to pick per proof generation session.
 	ProversPerSession uint8 `json:"provers_per_session"`
 	// Number of attempts that a session can be retried if previous attempts failed.
 	// Currently we only consider proving timeout as failure here.
-	SessionAttempts uint8 `json:"session_attempts,omitempty"`
+	SessionAttempts uint8 `json:"session_attempts"`
 	// Zk verifier config.
-	Verifier *VerifierConfig `json:"verifier,omitempty"`
-	// Proof collection time (in minutes).
-	CollectionTime int `json:"collection_time"`
-	// Token time to live (in seconds)
-	TokenTimeToLive int `json:"token_time_to_live"`
+	Verifier *VerifierConfig `json:"verifier"`
+	// Proof collection time (in seconds).
+	CollectionTimeSec int `json:"collection_time_sec"`
 	// Max number of workers in verifier worker pool
-	MaxVerifierWorkers int `json:"max_verifier_workers,omitempty"`
+	MaxVerifierWorkers int `json:"max_verifier_workers"`
 }

-// L2Config loads l2geth configuration items.
-type L2Config struct {
+// L2 loads l2geth configuration items.
+type L2 struct {
 	// l2geth chain_id.
 	ChainID uint64 `json:"chain_id"`
 }

+// Auth provides the auth of prover-stats-api
+type Auth struct {
+	Secret                     string `json:"secret"`
+	ChallengeExpireDurationSec int    `json:"challenge_expire_duration_sec"`
+	LoginExpireDurationSec     int    `json:"login_expire_duration_sec"`
+}
+
 // Config load configuration items.
 type Config struct {
-	ProverManagerConfig *ProverManagerConfig `json:"prover_manager_config"`
-	DBConfig            *database.Config     `json:"db_config"`
-	L2Config            *L2Config            `json:"l2_config"`
+	ProverManager *ProverManager   `json:"prover_manager"`
+	DB            *database.Config `json:"db"`
+	L2            *L2              `json:"l2"`
+	Auth          *Auth            `json:"auth"`
 }

 // VerifierConfig load zk verifier config.
@@ -68,19 +64,5 @@ func NewConfig(file string) (*Config, error) {
 		return nil, err
 	}

-	// Check prover's order session
-	order := strings.ToUpper(cfg.ProverManagerConfig.OrderSession)
-	if len(order) > 0 && !(order == "ASC" || order == "DESC") {
-		return nil, errors.New("prover config's order session is invalid")
-	}
-	cfg.ProverManagerConfig.OrderSession = order
-
-	if cfg.ProverManagerConfig.MaxVerifierWorkers == 0 {
-		cfg.ProverManagerConfig.MaxVerifierWorkers = defaultNumberOfVerifierWorkers
-	}
-	if cfg.ProverManagerConfig.SessionAttempts == 0 {
-		cfg.ProverManagerConfig.SessionAttempts = defaultNumberOfSessionRetryAttempts
-	}
-
 	return cfg, nil
 }
--- a/coordinator/internal/config/config_test.go
+++ b/coordinator/internal/config/config_test.go
@@ -12,29 +12,31 @@ import (

 func TestConfig(t *testing.T) {
 	configTemplate := `{
-		"prover_manager_config": {
-			"compression_level": 9,
+		"prover_manager": {
 			"provers_per_session": 1,
-			"session_attempts": %d,
-			"collection_time": 180,
-			"token_time_to_live": 60,
+			"session_attempts": 5,
+			"collection_time_sec": 180,
 			"verifier": {
 				"mock_mode": true,
 				"params_path": "",
 				"agg_vk_path": ""
 			},
-			"max_verifier_workers": %d,
-			"order_session": "%s"
+			"max_verifier_workers": 4
 		},
-		"db_config": {
+		"db": {
 			"driver_name": "postgres",
 			"dsn": "postgres://admin:123456@localhost/test?sslmode=disable",
 			"maxOpenNum": 200,
 			"maxIdleNum": 20
 		},
-		"l2_config": {
+		"l2": {
 			"chain_id": 111
-		}
+		},
+ 		"auth": {
+			"secret": "prover secret key",
+			"challenge_expire_duration_sec": 3600,
+			"login_expire_duration_sec": 3600
+  		}
 	}`

 	t.Run("Success Case", func(t *testing.T) {
@@ -44,8 +46,7 @@ func TestConfig(t *testing.T) {
 			assert.NoError(t, tmpFile.Close())
 			assert.NoError(t, os.Remove(tmpFile.Name()))
 		}()
-		config := fmt.Sprintf(configTemplate, defaultNumberOfSessionRetryAttempts, defaultNumberOfVerifierWorkers, "ASC")
-		_, err = tmpFile.WriteString(config)
+		_, err = tmpFile.WriteString(configTemplate)
 		assert.NoError(t, err)

 		cfg, err := NewConfig(tmpFile.Name())
@@ -86,52 +87,4 @@ func TestConfig(t *testing.T) {
 		_, err = NewConfig(tmpFile.Name())
 		assert.Error(t, err)
 	})
-
-	t.Run("Invalid Order Session", func(t *testing.T) {
-		tmpFile, err := os.CreateTemp("", "example")
-		assert.NoError(t, err)
-		defer func() {
-			assert.NoError(t, tmpFile.Close())
-			assert.NoError(t, os.Remove(tmpFile.Name()))
-		}()
-		config := fmt.Sprintf(configTemplate, defaultNumberOfSessionRetryAttempts, defaultNumberOfVerifierWorkers, "INVALID")
-		_, err = tmpFile.WriteString(config)
-		assert.NoError(t, err)
-
-		_, err = NewConfig(tmpFile.Name())
-		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "prover config's order session is invalid")
-	})
-
-	t.Run("Default MaxVerifierWorkers", func(t *testing.T) {
-		tmpFile, err := os.CreateTemp("", "example")
-		assert.NoError(t, err)
-		defer func() {
-			assert.NoError(t, tmpFile.Close())
-			assert.NoError(t, os.Remove(tmpFile.Name()))
-		}()
-		config := fmt.Sprintf(configTemplate, defaultNumberOfSessionRetryAttempts, 0, "ASC")
-		_, err = tmpFile.WriteString(config)
-		assert.NoError(t, err)
-
-		cfg, err := NewConfig(tmpFile.Name())
-		assert.NoError(t, err)
-		assert.Equal(t, defaultNumberOfVerifierWorkers, cfg.ProverManagerConfig.MaxVerifierWorkers)
-	})
-
-	t.Run("Default SessionAttempts", func(t *testing.T) {
-		tmpFile, err := os.CreateTemp("", "example")
-		assert.NoError(t, err)
-		defer func() {
-			assert.NoError(t, tmpFile.Close())
-			assert.NoError(t, os.Remove(tmpFile.Name()))
-		}()
-		config := fmt.Sprintf(configTemplate, 0, defaultNumberOfVerifierWorkers, "ASC")
-		_, err = tmpFile.WriteString(config)
-		assert.NoError(t, err)
-
-		cfg, err := NewConfig(tmpFile.Name())
-		assert.NoError(t, err)
-		assert.Equal(t, uint8(defaultNumberOfSessionRetryAttempts), cfg.ProverManagerConfig.SessionAttempts)
-	})
 }
--- a/coordinator/internal/controller/api/auth.go
+++ b/coordinator/internal/controller/api/auth.go
@@ -0,0 +1,93 @@
+package api
+
+import (
+	"fmt"
+
+	jwt "github.com/appleboy/gin-jwt/v2"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+
+	"scroll-tech/common/types/message"
+
+	"scroll-tech/coordinator/internal/logic/auth"
+	"scroll-tech/coordinator/internal/types"
+)
+
+// AuthController is login API
+type AuthController struct {
+	loginLogic *auth.LoginLogic
+}
+
+// NewAuthController returns an LoginController instance
+func NewAuthController(db *gorm.DB) *AuthController {
+	return &AuthController{
+		loginLogic: auth.NewLoginLogic(db),
+	}
+}
+
+// Login the api controller for login
+func (a *AuthController) Login(c *gin.Context) (interface{}, error) {
+	var login types.LoginParameter
+	if err := c.ShouldBind(&login); err != nil {
+		return "", fmt.Errorf("missing the public_key, err:%w", err)
+	}
+
+	// check login parameter's token is equal to bearer token, the Authorization must be existed
+	// if not exist, the jwt token will intercept it
+	brearToken := c.GetHeader("Authorization")
+	if brearToken != "Bearer "+login.Message.Challenge {
+		return "", fmt.Errorf("check challenge failure for the not equal challenge string")
+	}
+
+	// check the challenge is used, if used, return failure
+	if err := a.loginLogic.InsertChallengeString(c, login.Message.Challenge); err != nil {
+		return "", fmt.Errorf("login insert challenge string failure:%w", err)
+	}
+	return login, nil
+}
+
+// PayloadFunc returns jwt.MapClaims with {public key, prover name}.
+func (a *AuthController) PayloadFunc(data interface{}) jwt.MapClaims {
+	v, ok := data.(types.LoginParameter)
+	if !ok {
+		return jwt.MapClaims{}
+	}
+
+	// recover the public key
+	authMsg := message.AuthMsg{
+		Identity: &message.Identity{
+			Challenge:     v.Message.Challenge,
+			ProverName:    v.Message.ProverName,
+			ProverVersion: v.Message.ProverVersion,
+		},
+		Signature: v.Signature,
+	}
+
+	publicKey, err := authMsg.PublicKey()
+	if err != nil {
+		return jwt.MapClaims{}
+	}
+
+	return jwt.MapClaims{
+		types.PublicKey:     publicKey,
+		types.ProverName:    v.Message.ProverName,
+		types.ProverVersion: v.Message.ProverVersion,
+	}
+}
+
+// IdentityHandler replies to client for /login
+func (a *AuthController) IdentityHandler(c *gin.Context) interface{} {
+	claims := jwt.ExtractClaims(c)
+	if proverName, ok := claims[types.ProverName]; ok {
+		c.Set(types.ProverName, proverName)
+	}
+
+	if publicKey, ok := claims[types.PublicKey]; ok {
+		c.Set(types.PublicKey, publicKey)
+	}
+
+	if proverVersion, ok := claims[types.ProverVersion]; ok {
+		c.Set(types.ProverVersion, proverVersion)
+	}
+	return nil
+}
--- a/coordinator/internal/controller/api/controller.go
+++ b/coordinator/internal/controller/api/controller.go
@@ -0,0 +1,32 @@
+package api
+
+import (
+	"sync"
+
+	"gorm.io/gorm"
+
+	"scroll-tech/coordinator/internal/config"
+)
+
+var (
+	// GetTask the prover task controller
+	GetTask *GetTaskController
+	// SubmitProof the submit proof controller
+	SubmitProof *SubmitProofController
+	// HealthCheck the health check controller
+	HealthCheck *HealthCheckController
+	// Auth the auth controller
+	Auth *AuthController
+
+	initControllerOnce sync.Once
+)
+
+// InitController inits Controller with database
+func InitController(cfg *config.Config, db *gorm.DB) {
+	initControllerOnce.Do(func() {
+		Auth = NewAuthController(db)
+		HealthCheck = NewHealthCheckController()
+		GetTask = NewGetTaskController(cfg, db)
+		SubmitProof = NewSubmitProofController(cfg, db)
+	})
+}
--- a/coordinator/internal/controller/api/get_task.go
+++ b/coordinator/internal/controller/api/get_task.go
@@ -0,0 +1,86 @@
+package api
+
+import (
+	"fmt"
+	"math/rand"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+
+	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
+
+	"scroll-tech/coordinator/internal/config"
+	"scroll-tech/coordinator/internal/logic/provertask"
+	coordinatorType "scroll-tech/coordinator/internal/types"
+)
+
+// GetTaskController the get prover task api controller
+type GetTaskController struct {
+	proverTasks map[message.ProofType]provertask.ProverTask
+}
+
+// NewGetTaskController create a get prover task controller
+func NewGetTaskController(cfg *config.Config, db *gorm.DB) *GetTaskController {
+	chunkProverTask := provertask.NewChunkProverTask(cfg, db)
+	batchProverTask := provertask.NewBatchProverTask(cfg, db)
+
+	ptc := &GetTaskController{
+		proverTasks: make(map[message.ProofType]provertask.ProverTask),
+	}
+
+	ptc.proverTasks[message.ProofTypeChunk] = chunkProverTask
+	ptc.proverTasks[message.ProofTypeBatch] = batchProverTask
+
+	return ptc
+}
+
+// GetTasks get assigned chunk/batch task
+func (ptc *GetTaskController) GetTasks(ctx *gin.Context) {
+	var getTaskParameter coordinatorType.GetTaskParameter
+	if err := ctx.ShouldBind(&getTaskParameter); err != nil {
+		nerr := fmt.Errorf("prover tasks parameter invalid, err:%w", err)
+		coordinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
+		return
+	}
+
+	proofType := ptc.proofType(&getTaskParameter)
+	proverTask, isExist := ptc.proverTasks[proofType]
+	if !isExist {
+		nerr := fmt.Errorf("parameter wrong proof type")
+		coordinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
+		return
+	}
+
+	result, err := proverTask.Assign(ctx, &getTaskParameter)
+	if err != nil {
+		nerr := fmt.Errorf("return prover task err:%w", err)
+		coordinatorType.RenderJSON(ctx, types.ErrCoordinatorGetTaskFailure, nerr, nil)
+		return
+	}
+
+	if result == nil {
+		nerr := fmt.Errorf("get empty prover task")
+		coordinatorType.RenderJSON(ctx, types.ErrCoordinatorEmptyProofData, nerr, nil)
+		return
+	}
+
+	coordinatorType.RenderJSON(ctx, types.Success, nil, result)
+}
+
+func (ptc *GetTaskController) proofType(para *coordinatorType.GetTaskParameter) message.ProofType {
+	proofType := message.ProofType(para.TaskType)
+
+	proofTypes := []message.ProofType{
+		message.ProofTypeChunk,
+		message.ProofTypeBatch,
+	}
+
+	if proofType == message.ProofTypeUndefined {
+		rand.Shuffle(len(proofTypes), func(i, j int) {
+			proofTypes[i], proofTypes[j] = proofTypes[j], proofTypes[i]
+		})
+		proofType = proofTypes[0]
+	}
+	return proofType
+}
--- a/coordinator/internal/controller/api/health_check.go
+++ b/coordinator/internal/controller/api/health_check.go
@@ -0,0 +1,23 @@
+package api
+
+import (
+	"github.com/gin-gonic/gin"
+
+	ctypes "scroll-tech/common/types"
+
+	"scroll-tech/coordinator/internal/types"
+)
+
+// HealthCheckController is health check API
+type HealthCheckController struct {
+}
+
+// NewHealthCheckController returns an HealthCheckController instance
+func NewHealthCheckController() *HealthCheckController {
+	return &HealthCheckController{}
+}
+
+// HealthCheck the api controller for coordinator health check
+func (a *HealthCheckController) HealthCheck(c *gin.Context) {
+	types.RenderJSON(c, ctypes.Success, nil, nil)
+}
--- a/coordinator/internal/controller/api/prover.go
+++ b/coordinator/internal/controller/api/prover.go
@@ -1,115 +0,0 @@
-package api
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/patrickmn/go-cache"
-	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/scroll-tech/go-ethereum/rpc"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types/message"
-
-	"scroll-tech/coordinator/internal/config"
-	"scroll-tech/coordinator/internal/logic/proof"
-)
-
-// ProverController the prover api controller
-type ProverController struct {
-	tokenCache    *cache.Cache
-	proofReceiver *proof.ZKProofReceiver
-	taskWorker    *proof.TaskWorker
-}
-
-// NewProverController create a prover controller
-func NewProverController(cfg *config.ProverManagerConfig, db *gorm.DB) *ProverController {
-	return &ProverController{
-		proofReceiver: proof.NewZKProofReceiver(cfg, db),
-		taskWorker:    proof.NewTaskWorker(),
-		tokenCache:    cache.New(time.Duration(cfg.TokenTimeToLive)*time.Second, 1*time.Hour),
-	}
-}
-
-// RequestToken get request token of authMsg
-func (r *ProverController) RequestToken(authMsg *message.AuthMsg) (string, error) {
-	if ok, err := authMsg.Verify(); !ok {
-		if err != nil {
-			log.Error("failed to verify auth message", "error", err)
-		}
-		return "", errors.New("signature verification failed")
-	}
-	pubkey, err := authMsg.PublicKey()
-	if err != nil {
-		return "", fmt.Errorf("RequestToken auth msg public key error:%w", err)
-	}
-	if token, ok := r.tokenCache.Get(pubkey); ok {
-		return token.(string), nil
-	}
-	token, err := message.GenerateToken()
-	if err != nil {
-		return "", errors.New("token generation failed")
-	}
-	r.tokenCache.SetDefault(pubkey, token)
-	return token, nil
-}
-
-// VerifyToken verifies pubkey for token and expiration time
-func (r *ProverController) verifyToken(authMsg *message.AuthMsg) (bool, error) {
-	pubkey, err := authMsg.PublicKey()
-	if err != nil {
-		return false, fmt.Errorf("verify token auth msg public key error:%w", err)
-	}
-	// GetValue returns nil if value is expired
-	if token, ok := r.tokenCache.Get(pubkey); !ok || token != authMsg.Identity.Token {
-		return false, fmt.Errorf("failed to find corresponding token. prover name: %s prover pk: %s", authMsg.Identity.Name, pubkey)
-	}
-	return true, nil
-}
-
-// Register register api for prover
-func (r *ProverController) Register(ctx context.Context, authMsg *message.AuthMsg) (*rpc.Subscription, error) {
-	// Verify register message.
-	if ok, err := authMsg.Verify(); !ok {
-		if err != nil {
-			log.Error("failed to verify auth message", "error", err)
-		}
-		return nil, errors.New("signature verification failed")
-	}
-	// Lock here to avoid malicious prover message replay before cleanup of token
-	if ok, err := r.verifyToken(authMsg); !ok {
-		return nil, err
-	}
-	pubkey, err := authMsg.PublicKey()
-	if err != nil {
-		return nil, fmt.Errorf("register auth msg public key error:%w", err)
-	}
-	// prover successfully registered, remove token associated with this prover
-	r.tokenCache.Delete(pubkey)
-
-	rpcSub, err := r.taskWorker.AllocTaskWorker(ctx, authMsg)
-	if err != nil {
-		return rpcSub, err
-	}
-	return rpcSub, nil
-}
-
-// SubmitProof prover pull proof
-func (r *ProverController) SubmitProof(proof *message.ProofMsg) error {
-	// Verify the signature
-	if ok, err := proof.Verify(); !ok {
-		if err != nil {
-			log.Error("failed to verify proof message", "error", err)
-		}
-		return errors.New("auth signature verify fail")
-	}
-
-	err := r.proofReceiver.HandleZkProof(context.Background(), proof)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
--- a/coordinator/internal/controller/api/prover_test.go
+++ b/coordinator/internal/controller/api/prover_test.go
@@ -1,304 +0,0 @@
-package api
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"database/sql"
-	"errors"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/agiledragon/gomonkey/v2"
-	"github.com/scroll-tech/go-ethereum/crypto"
-	"github.com/scroll-tech/go-ethereum/rpc"
-	"github.com/smartystreets/goconvey/convey"
-	"github.com/stretchr/testify/assert"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types"
-	"scroll-tech/common/types/message"
-
-	"scroll-tech/coordinator/internal/config"
-	"scroll-tech/coordinator/internal/logic/proof"
-	"scroll-tech/coordinator/internal/logic/provermanager"
-	"scroll-tech/coordinator/internal/logic/verifier"
-	"scroll-tech/coordinator/internal/orm"
-	coordinatorType "scroll-tech/coordinator/internal/types"
-)
-
-func geneAuthMsg(t *testing.T) (*message.AuthMsg, *ecdsa.PrivateKey) {
-	authMsg := &message.AuthMsg{
-		Identity: &message.Identity{
-			Name: "prover_test1",
-		},
-	}
-	privKey, err := crypto.GenerateKey()
-	assert.NoError(t, err)
-	assert.NoError(t, authMsg.SignWithKey(privKey))
-	return authMsg, privKey
-}
-
-var proverController *ProverController
-
-func init() {
-	conf := &config.ProverManagerConfig{
-		TokenTimeToLive: 120,
-	}
-	conf.Verifier = &config.VerifierConfig{MockMode: true}
-	proverController = NewProverController(conf, nil)
-}
-
-func TestProver_RequestToken(t *testing.T) {
-	convey.Convey("auth msg verify failure", t, func() {
-		tmpAuthMsg := &message.AuthMsg{
-			Identity: &message.Identity{
-				Name: "prover_test_request_token",
-			},
-		}
-		token, err := proverController.RequestToken(tmpAuthMsg)
-		assert.Error(t, err)
-		assert.Empty(t, token)
-	})
-
-	convey.Convey("token has already been distributed", t, func() {
-		tmpAuthMsg, _ := geneAuthMsg(t)
-		key, err := tmpAuthMsg.PublicKey()
-		assert.NoError(t, err)
-		tokenCacheStored := "c393987bb791dd285dd3d8ffbd770ed1"
-		proverController.tokenCache.Set(key, tokenCacheStored, time.Hour)
-		token, err := proverController.RequestToken(tmpAuthMsg)
-		assert.NoError(t, err)
-		assert.Equal(t, token, tokenCacheStored)
-	})
-
-	convey.Convey("token generation failure", t, func() {
-		tmpAuthMsg, _ := geneAuthMsg(t)
-		patchGuard := gomonkey.ApplyFunc(message.GenerateToken, func() (string, error) {
-			return "", errors.New("token generation failed")
-		})
-		defer patchGuard.Reset()
-		token, err := proverController.RequestToken(tmpAuthMsg)
-		assert.Error(t, err)
-		assert.Empty(t, token)
-	})
-
-	convey.Convey("token generation success", t, func() {
-		tmpAuthMsg, _ := geneAuthMsg(t)
-		tokenCacheStored := "c393987bb791dd285dd3d8ffbd770ed1"
-		patchGuard := gomonkey.ApplyFunc(message.GenerateToken, func() (string, error) {
-			return tokenCacheStored, nil
-		})
-		defer patchGuard.Reset()
-		token, err := proverController.RequestToken(tmpAuthMsg)
-		assert.NoError(t, err)
-		assert.Equal(t, tokenCacheStored, token)
-	})
-}
-
-func TestProver_Register(t *testing.T) {
-	convey.Convey("auth msg verify failure", t, func() {
-		tmpAuthMsg := &message.AuthMsg{
-			Identity: &message.Identity{
-				Name: "prover_test_register",
-			},
-		}
-		subscription, err := proverController.Register(context.Background(), tmpAuthMsg)
-		assert.Error(t, err)
-		assert.Empty(t, subscription)
-	})
-
-	convey.Convey("verify token failure", t, func() {
-		tmpAuthMsg, _ := geneAuthMsg(t)
-		patchGuard := gomonkey.ApplyPrivateMethod(proverController, "verifyToken", func(tmpAuthMsg *message.AuthMsg) (bool, error) {
-			return false, errors.New("verify token failure")
-		})
-		defer patchGuard.Reset()
-		subscription, err := proverController.Register(context.Background(), tmpAuthMsg)
-		assert.Error(t, err)
-		assert.Empty(t, subscription)
-	})
-
-	convey.Convey("notifier failure", t, func() {
-		tmpAuthMsg, _ := geneAuthMsg(t)
-		patchGuard := gomonkey.ApplyPrivateMethod(proverController, "verifyToken", func(tmpAuthMsg *message.AuthMsg) (bool, error) {
-			return true, nil
-		})
-		defer patchGuard.Reset()
-		patchGuard.ApplyFunc(rpc.NotifierFromContext, func(ctx context.Context) (*rpc.Notifier, bool) {
-			return nil, false
-		})
-		subscription, err := proverController.Register(context.Background(), tmpAuthMsg)
-		assert.Error(t, err)
-		assert.Equal(t, err, rpc.ErrNotificationsUnsupported)
-		assert.Equal(t, *subscription, rpc.Subscription{})
-	})
-
-	convey.Convey("register failure", t, func() {
-		tmpAuthMsg, _ := geneAuthMsg(t)
-		patchGuard := gomonkey.ApplyPrivateMethod(proverController, "verifyToken", func(tmpAuthMsg *message.AuthMsg) (bool, error) {
-			return true, nil
-		})
-		defer patchGuard.Reset()
-
-		var taskWorker *proof.TaskWorker
-		patchGuard.ApplyPrivateMethod(taskWorker, "AllocTaskWorker", func(ctx context.Context, authMsg *message.AuthMsg) (*rpc.Subscription, error) {
-			return nil, errors.New("register error")
-		})
-		subscription, err := proverController.Register(context.Background(), tmpAuthMsg)
-		assert.Error(t, err)
-		assert.Empty(t, subscription)
-	})
-
-	convey.Convey("register success", t, func() {
-		tmpAuthMsg, _ := geneAuthMsg(t)
-		patchGuard := gomonkey.ApplyPrivateMethod(proverController, "verifyToken", func(tmpAuthMsg *message.AuthMsg) (bool, error) {
-			return true, nil
-		})
-		defer patchGuard.Reset()
-
-		var taskWorker *proof.TaskWorker
-		patchGuard.ApplyPrivateMethod(taskWorker, "AllocTaskWorker", func(ctx context.Context, authMsg *message.AuthMsg) (*rpc.Subscription, error) {
-			return nil, nil
-		})
-		_, err := proverController.Register(context.Background(), tmpAuthMsg)
-		assert.NoError(t, err)
-	})
-}
-
-func TestProver_SubmitProof(t *testing.T) {
-	tmpAuthMsg, prvKey := geneAuthMsg(t)
-	pubKey, err := tmpAuthMsg.PublicKey()
-	assert.NoError(t, err)
-
-	id := "provers_info_test"
-	tmpProof := &message.ProofMsg{
-		ProofDetail: &message.ProofDetail{
-			Type:       message.ProofTypeChunk,
-			ID:         id,
-			Status:     message.StatusOk,
-			ChunkProof: &message.ChunkProof{},
-		},
-	}
-	assert.NoError(t, tmpProof.Sign(prvKey))
-	proofPubKey, err := tmpProof.PublicKey()
-	assert.NoError(t, err)
-	assert.Equal(t, pubKey, proofPubKey)
-
-	var proverTaskOrm *orm.ProverTask
-	patchGuard := gomonkey.ApplyMethodFunc(proverTaskOrm, "GetProverTasks", func(ctx context.Context, fields map[string]interface{}, orderByList []string, offset, limit int) ([]orm.ProverTask, error) {
-		return nil, nil
-	})
-	defer patchGuard.Reset()
-
-	provermanager.InitProverManager(nil)
-
-	taskChan, err := provermanager.Manager.Register(context.Background(), pubKey, tmpAuthMsg.Identity)
-	assert.NotNil(t, taskChan)
-	assert.NoError(t, err)
-
-	convey.Convey("verify failure", t, func() {
-		var s *message.ProofMsg
-		patchGuard.ApplyMethodFunc(s, "Verify", func() (bool, error) {
-			return false, errors.New("proof verify error")
-		})
-		err = proverController.SubmitProof(tmpProof)
-		assert.Error(t, err)
-	})
-
-	var s *message.ProofMsg
-	patchGuard.ApplyMethodFunc(s, "Verify", func() (bool, error) {
-		return true, nil
-	})
-
-	var chunkOrm *orm.Chunk
-	patchGuard.ApplyMethodFunc(chunkOrm, "UpdateProofByHash", func(context.Context, string, *message.BatchProof, uint64, ...*gorm.DB) error {
-		return nil
-	})
-	patchGuard.ApplyMethodFunc(chunkOrm, "UpdateProvingStatus", func(ctx context.Context, hash string, status types.ProvingStatus, dbTX ...*gorm.DB) error {
-		return nil
-	})
-
-	var batchOrm *orm.Batch
-	patchGuard.ApplyMethodFunc(batchOrm, "UpdateProofByHash", func(ctx context.Context, hash string, proof *message.BatchProof, proofTimeSec uint64, dbTX ...*gorm.DB) error {
-		return nil
-	})
-	patchGuard.ApplyMethodFunc(batchOrm, "UpdateProvingStatus", func(ctx context.Context, hash string, status types.ProvingStatus, dbTX ...*gorm.DB) error {
-		return nil
-	})
-
-	convey.Convey("get none provers of prover task", t, func() {
-		patchGuard.ApplyMethodFunc(proverTaskOrm, "GetProverTaskByTaskIDAndPubKey", func(ctx context.Context, hash, pubKey string) (*orm.ProverTask, error) {
-			return nil, nil
-		})
-		tmpProof1 := &message.ProofMsg{
-			ProofDetail: &message.ProofDetail{
-				ID:         "10001",
-				Status:     message.StatusOk,
-				ChunkProof: &message.ChunkProof{},
-			},
-		}
-		privKey, err := crypto.GenerateKey()
-		assert.NoError(t, err)
-		tmpProof1.Sign(privKey)
-		_, err1 := tmpProof1.PublicKey()
-		assert.NoError(t, err1)
-		err2 := proverController.SubmitProof(tmpProof1)
-		fmt.Println(err2)
-		targetErr := fmt.Errorf("validator failure get none prover task for the proof")
-		assert.Equal(t, err2.Error(), targetErr.Error())
-	})
-
-	patchGuard.ApplyMethodFunc(proverTaskOrm, "GetProverTaskByTaskIDAndPubKey", func(ctx context.Context, hash, pubKey string) (*orm.ProverTask, error) {
-		now := time.Now()
-		s := &orm.ProverTask{
-			TaskID:          id,
-			ProverPublicKey: proofPubKey,
-			TaskType:        int16(message.ProofTypeChunk),
-			ProverName:      "provers_info_test",
-			ProvingStatus:   int16(types.ProverAssigned),
-			CreatedAt:       now,
-		}
-		return s, nil
-	})
-
-	patchGuard.ApplyMethodFunc(proverTaskOrm, "UpdateProverTaskProvingStatus", func(ctx context.Context, proofType message.ProofType, taskID string, pk string, status types.ProverProveStatus, dbTX ...*gorm.DB) error {
-		return nil
-	})
-
-	patchGuard.ApplyPrivateMethod(proverController.proofReceiver, "proofFailure", func(hash string, pubKey string, proofMsgType message.ProofType) {
-	})
-
-	convey.Convey("proof msg status is not ok", t, func() {
-		tmpProof.Status = message.StatusProofError
-		err1 := proverController.SubmitProof(tmpProof)
-		assert.NoError(t, err1)
-	})
-	tmpProof.Status = message.StatusOk
-
-	var db *gorm.DB
-	patchGuard.ApplyMethodFunc(db, "Transaction", func(fc func(tx *gorm.DB) error, opts ...*sql.TxOptions) (err error) {
-		return nil
-	})
-
-	var tmpVerifier *verifier.Verifier
-	convey.Convey("verifier proof failure", t, func() {
-		targetErr := errors.New("verify proof failure")
-		patchGuard.ApplyMethodFunc(tmpVerifier, "VerifyChunkProof", func(proof *message.ChunkProof) (bool, error) {
-			return false, targetErr
-		})
-		err1 := proverController.SubmitProof(tmpProof)
-		assert.Nil(t, err1)
-	})
-
-	patchGuard.ApplyMethodFunc(tmpVerifier, "VerifyChunkProof", func(proof *message.ChunkProof) (bool, error) {
-		return true, nil
-	})
-
-	patchGuard.ApplyPrivateMethod(proverController.proofReceiver, "closeProofTask", func(hash string, pubKey string, proofMsg *message.ProofMsg, proversInfo *coordinatorType.ProversInfo) error {
-		return nil
-	})
-
-	err1 := proverController.SubmitProof(tmpProof)
-	assert.Nil(t, err1)
-}
--- a/coordinator/internal/controller/api/routes.go
+++ b/coordinator/internal/controller/api/routes.go
@@ -1,30 +0,0 @@
-package api
-
-import (
-	"context"
-
-	"github.com/scroll-tech/go-ethereum/rpc"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types/message"
-
-	"scroll-tech/coordinator/internal/config"
-)
-
-// ProverAPI for provers inorder to register and submit proof
-type ProverAPI interface {
-	RequestToken(authMsg *message.AuthMsg) (string, error)
-	Register(ctx context.Context, authMsg *message.AuthMsg) (*rpc.Subscription, error)
-	SubmitProof(proof *message.ProofMsg) error
-}
-
-// RegisterAPIs register api for coordinator
-func RegisterAPIs(cfg *config.Config, db *gorm.DB) []rpc.API {
-	return []rpc.API{
-		{
-			Namespace: "prover",
-			Service:   ProverAPI(NewProverController(cfg.ProverManagerConfig, db)),
-			Public:    true,
-		},
-	}
-}
--- a/coordinator/internal/controller/api/submit_proof.go
+++ b/coordinator/internal/controller/api/submit_proof.go
@@ -0,0 +1,72 @@
+package api
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+
+	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
+
+	"scroll-tech/coordinator/internal/config"
+	"scroll-tech/coordinator/internal/logic/submitproof"
+	coodinatorType "scroll-tech/coordinator/internal/types"
+)
+
+// SubmitProofController the submit proof api controller
+type SubmitProofController struct {
+	submitProofReceiverLogic *submitproof.ProofReceiverLogic
+}
+
+// NewSubmitProofController create the submit proof api controller instance
+func NewSubmitProofController(cfg *config.Config, db *gorm.DB) *SubmitProofController {
+	return &SubmitProofController{
+		submitProofReceiverLogic: submitproof.NewSubmitProofReceiverLogic(cfg.ProverManager, db),
+	}
+}
+
+// SubmitProof prover submit the proof to coordinator
+func (spc *SubmitProofController) SubmitProof(ctx *gin.Context) {
+	var spp coodinatorType.SubmitProofParameter
+	if err := ctx.ShouldBind(&spp); err != nil {
+		nerr := fmt.Errorf("parameter invalid, err:%w", err)
+		coodinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
+		return
+	}
+
+	proofMsg := message.ProofMsg{
+		ProofDetail: &message.ProofDetail{
+			ID:     spp.TaskID,
+			Type:   message.ProofType(spp.TaskType),
+			Status: message.RespStatus(spp.Status),
+		},
+	}
+
+	switch message.ProofType(spp.TaskType) {
+	case message.ProofTypeChunk:
+		var tmpChunkProof message.ChunkProof
+		if err := json.Unmarshal([]byte(spp.Proof), &tmpChunkProof); err != nil {
+			nerr := fmt.Errorf("unmarshal parameter chunk proof invalid, err:%w", err)
+			coodinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
+			return
+		}
+		proofMsg.ChunkProof = &tmpChunkProof
+	case message.ProofTypeBatch:
+		var tmpBatchProof message.BatchProof
+		if err := json.Unmarshal([]byte(spp.Proof), &tmpBatchProof); err != nil {
+			nerr := fmt.Errorf("unmarshal parameter batch proof invalid, err:%w", err)
+			coodinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
+			return
+		}
+		proofMsg.BatchProof = &tmpBatchProof
+	}
+
+	if err := spc.submitProofReceiverLogic.HandleZkProof(ctx, &proofMsg); err != nil {
+		nerr := fmt.Errorf("handle zk proof failure, err:%w", err)
+		coodinatorType.RenderJSON(ctx, types.ErrCoordinatorHandleZkProofFailure, nerr, nil)
+		return
+	}
+	coodinatorType.RenderJSON(ctx, types.Success, nil, nil)
+}
--- a/coordinator/internal/controller/cron/collect_proof.go
+++ b/coordinator/internal/controller/cron/collect_proof.go
@@ -12,7 +12,6 @@ import (
 	"scroll-tech/common/types/message"

 	"scroll-tech/coordinator/internal/config"
-	"scroll-tech/coordinator/internal/logic/collector"
 	"scroll-tech/coordinator/internal/orm"
 )

@@ -22,11 +21,8 @@ type Collector struct {
 	db  *gorm.DB
 	ctx context.Context

-	stopRunChan     chan struct{}
 	stopTimeoutChan chan struct{}

-	collectors map[message.ProofType]collector.Collector
-
 	proverTaskOrm *orm.ProverTask
 	chunkOrm      *orm.Chunk
 	batchOrm      *orm.Batch
@@ -38,18 +34,12 @@ func NewCollector(ctx context.Context, db *gorm.DB, cfg *config.Config) *Collect
 		cfg:             cfg,
 		db:              db,
 		ctx:             ctx,
-		stopRunChan:     make(chan struct{}),
 		stopTimeoutChan: make(chan struct{}),
-		collectors:      make(map[message.ProofType]collector.Collector),
 		proverTaskOrm:   orm.NewProverTask(db),
 		chunkOrm:        orm.NewChunk(db),
 		batchOrm:        orm.NewBatch(db),
 	}

-	c.collectors[message.ProofTypeBatch] = collector.NewBatchProofCollector(cfg, db)
-	c.collectors[message.ProofTypeChunk] = collector.NewChunkProofCollector(cfg, db)
-
-	go c.run()
 	go c.timeoutProofTask()

 	log.Info("Start coordinator successfully.")
@@ -59,40 +49,9 @@ func NewCollector(ctx context.Context, db *gorm.DB, cfg *config.Config) *Collect

 // Stop all the collector
 func (c *Collector) Stop() {
-	c.stopRunChan <- struct{}{}
 	c.stopTimeoutChan <- struct{}{}
 }

-// run loop and cron collect
-func (c *Collector) run() {
-	defer func() {
-		if err := recover(); err != nil {
-			nerr := fmt.Errorf("collector panic error:%v", err)
-			log.Warn(nerr.Error())
-		}
-	}()
-
-	ticker := time.NewTicker(time.Second * 2)
-	for {
-		select {
-		case <-ticker.C:
-			for _, tmpCollector := range c.collectors {
-				if err := tmpCollector.Collect(c.ctx); err != nil {
-					log.Warn("collect data to prover failure", "collector name", tmpCollector.Name(), "error", err)
-				}
-			}
-		case <-c.ctx.Done():
-			if c.ctx.Err() != nil {
-				log.Error("manager context canceled with error", "error", c.ctx.Err())
-			}
-			return
-		case <-c.stopRunChan:
-			log.Info("the coordinator run loop exit")
-			return
-		}
-	}
-}
-
 // timeoutTask cron check the send task is timeout. if timeout reached, restore the
 // chunk/batch task to unassigned. then the batch/chunk collector can retry it.
 func (c *Collector) timeoutProofTask() {
@@ -114,7 +73,7 @@ func (c *Collector) timeoutProofTask() {
 			}

 			for _, assignedProverTask := range assignedProverTasks {
-				timeoutDuration := time.Duration(c.cfg.ProverManagerConfig.CollectionTime) * time.Minute
+				timeoutDuration := time.Duration(c.cfg.ProverManager.CollectionTimeSec) * time.Second
 				// here not update the block batch proving status failed, because the collector loop will check
 				// the attempt times. if reach the times, the collector will set the block batch proving status.
 				if time.Since(assignedProverTask.AssignedAt) >= timeoutDuration {
--- a/coordinator/internal/logic/auth/login.go
+++ b/coordinator/internal/logic/auth/login.go
@@ -0,0 +1,25 @@
+package auth
+
+import (
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+
+	"scroll-tech/coordinator/internal/orm"
+)
+
+// LoginLogic the auth logic
+type LoginLogic struct {
+	challengeOrm *orm.Challenge
+}
+
+// NewLoginLogic new a LoginLogic
+func NewLoginLogic(db *gorm.DB) *LoginLogic {
+	return &LoginLogic{
+		challengeOrm: orm.NewChallenge(db),
+	}
+}
+
+// InsertChallengeString insert and check the challenge string is existed
+func (l *LoginLogic) InsertChallengeString(ctx *gin.Context, challenge string) error {
+	return l.challengeOrm.InsertChallenge(ctx, challenge)
+}
--- a/coordinator/internal/logic/collector/batch_proof_collector.go
+++ b/coordinator/internal/logic/collector/batch_proof_collector.go
@@ -1,139 +0,0 @@
-package collector
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types"
-	"scroll-tech/common/types/message"
-	"scroll-tech/common/utils"
-
-	"scroll-tech/coordinator/internal/config"
-	"scroll-tech/coordinator/internal/logic/provermanager"
-	"scroll-tech/coordinator/internal/orm"
-	coordinatorType "scroll-tech/coordinator/internal/types"
-)
-
-// BatchProofCollector is collector implement for batch proof
-type BatchProofCollector struct {
-	BaseCollector
-}
-
-// NewBatchProofCollector new a batch collector
-func NewBatchProofCollector(cfg *config.Config, db *gorm.DB) *BatchProofCollector {
-	bp := &BatchProofCollector{
-		BaseCollector: BaseCollector{
-			db:            db,
-			cfg:           cfg,
-			chunkOrm:      orm.NewChunk(db),
-			batchOrm:      orm.NewBatch(db),
-			proverTaskOrm: orm.NewProverTask(db),
-		},
-	}
-	return bp
-}
-
-// Name return the batch proof collector name
-func (bp *BatchProofCollector) Name() string {
-	return BatchCollectorName
-}
-
-// Collect load and send batch tasks
-func (bp *BatchProofCollector) Collect(ctx context.Context) error {
-	batchTasks, err := bp.batchOrm.GetUnassignedBatches(ctx, 1)
-	if err != nil {
-		return fmt.Errorf("failed to get unassigned batch proving tasks, error:%w", err)
-	}
-
-	if len(batchTasks) == 0 {
-		return nil
-	}
-
-	if len(batchTasks) != 1 {
-		return fmt.Errorf("get unassigned batch proving task len not 1, batch tasks:%v", batchTasks)
-	}
-
-	batchTask := batchTasks[0]
-	log.Info("start batch proof generation session", "id", batchTask.Hash)
-
-	if provermanager.Manager.GetNumberOfIdleProvers(message.ProofTypeBatch) == 0 {
-		return fmt.Errorf("no idle common prover when starting proof generation session, id:%s", batchTask.Hash)
-	}
-
-	if !bp.checkAttemptsExceeded(batchTask.Hash, message.ProofTypeBatch) {
-		return fmt.Errorf("the batch task id:%s check attempts have reach the maximum", batchTask.Hash)
-	}
-
-	proverStatusList, err := bp.sendTask(ctx, batchTask.Hash)
-	if err != nil {
-		return fmt.Errorf("send batch task id:%s err:%w", batchTask.Hash, err)
-	}
-
-	transErr := bp.db.Transaction(func(tx *gorm.DB) error {
-		// Update session proving status as assigned.
-		if err = bp.batchOrm.UpdateProvingStatus(ctx, batchTask.Hash, types.ProvingTaskAssigned, tx); err != nil {
-			return fmt.Errorf("failed to update task status, id:%s, error:%w", batchTask.Hash, err)
-		}
-
-		for _, proverStatus := range proverStatusList {
-			proverTask := orm.ProverTask{
-				TaskID:          batchTask.Hash,
-				ProverPublicKey: proverStatus.PublicKey,
-				TaskType:        int16(message.ProofTypeBatch),
-				ProverName:      proverStatus.Name,
-				ProvingStatus:   int16(types.ProverAssigned),
-				FailureType:     int16(types.ProverTaskFailureTypeUndefined),
-				// here why need use UTC time. see scroll/common/databased/db.go
-				AssignedAt: utils.NowUTC(),
-			}
-
-			// Store session info.
-			if err = bp.proverTaskOrm.SetProverTask(ctx, &proverTask, tx); err != nil {
-				return fmt.Errorf("db set session info fail, session id:%s, error:%w", proverTask.TaskID, err)
-			}
-		}
-		return nil
-	})
-	return transErr
-}
-
-func (bp *BatchProofCollector) sendTask(ctx context.Context, hash string) ([]*coordinatorType.ProverStatus, error) {
-	// get chunks from db
-	chunks, err := bp.chunkOrm.GetChunksByBatchHash(ctx, hash)
-	if err != nil {
-		err = fmt.Errorf("failed to get chunk proofs for batch task id:%s err:%w ", hash, err)
-		return nil, err
-	}
-
-	taskDetail := &message.BatchTaskDetail{}
-	for _, chunk := range chunks {
-		chunkInfo := &message.ChunkInfo{
-			ChainID:       bp.cfg.L2Config.ChainID,
-			PrevStateRoot: common.HexToHash(chunk.ParentChunkStateRoot),
-			PostStateRoot: common.HexToHash(chunk.StateRoot),
-			WithdrawRoot:  common.HexToHash(chunk.WithdrawRoot),
-			DataHash:      common.HexToHash(chunk.Hash),
-			IsPadding:     false,
-		}
-		taskDetail.ChunkInfos = append(taskDetail.ChunkInfos, chunkInfo)
-
-		chunkProof := &message.ChunkProof{}
-		if err := json.Unmarshal(chunk.Proof, chunkProof); err != nil {
-			return nil, fmt.Errorf("json Unmarshal ChunkProof error: %w, chunk hash: %v", err, chunk.Hash)
-		}
-		taskDetail.ChunkProofs = append(taskDetail.ChunkProofs, chunkProof)
-	}
-
-	taskMsg := &message.TaskMsg{
-		ID:              hash,
-		Type:            message.ProofTypeBatch,
-		ChunkTaskDetail: nil,
-		BatchTaskDetail: taskDetail,
-	}
-	return bp.BaseCollector.sendTask(taskMsg)
-}
--- a/coordinator/internal/logic/collector/chunk_proof_collector.go
+++ b/coordinator/internal/logic/collector/chunk_proof_collector.go
@@ -1,122 +0,0 @@
-package collector
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types"
-	"scroll-tech/common/types/message"
-	"scroll-tech/common/utils"
-
-	"scroll-tech/coordinator/internal/config"
-	"scroll-tech/coordinator/internal/logic/provermanager"
-	"scroll-tech/coordinator/internal/orm"
-	coordinatorType "scroll-tech/coordinator/internal/types"
-)
-
-// ChunkProofCollector the chunk proof collector
-type ChunkProofCollector struct {
-	BaseCollector
-}
-
-// NewChunkProofCollector new a chunk proof collector
-func NewChunkProofCollector(cfg *config.Config, db *gorm.DB) *ChunkProofCollector {
-	cp := &ChunkProofCollector{
-		BaseCollector: BaseCollector{
-			db:            db,
-			cfg:           cfg,
-			chunkOrm:      orm.NewChunk(db),
-			blockOrm:      orm.NewL2Block(db),
-			proverTaskOrm: orm.NewProverTask(db),
-		},
-	}
-	return cp
-}
-
-// Name return a block batch collector name
-func (cp *ChunkProofCollector) Name() string {
-	return ChunkCollectorName
-}
-
-// Collect the chunk proof which need to prove
-func (cp *ChunkProofCollector) Collect(ctx context.Context) error {
-	// load and send chunk tasks
-	chunkTasks, err := cp.chunkOrm.GetUnassignedChunks(ctx, 1)
-	if err != nil {
-		return fmt.Errorf("failed to get unassigned chunk proving tasks, error:%w", err)
-	}
-
-	if len(chunkTasks) == 0 {
-		return nil
-	}
-
-	if len(chunkTasks) != 1 {
-		return fmt.Errorf("get unassigned chunk proving task len not 1, chunk tasks:%v", chunkTasks)
-	}
-
-	chunkTask := chunkTasks[0]
-
-	log.Info("start chunk generation session", "id", chunkTask.Hash)
-
-	if !cp.checkAttemptsExceeded(chunkTask.Hash, message.ProofTypeChunk) {
-		return fmt.Errorf("chunk proof hash id:%s check attempts have reach the maximum", chunkTask.Hash)
-	}
-
-	if provermanager.Manager.GetNumberOfIdleProvers(message.ProofTypeChunk) == 0 {
-		return fmt.Errorf("no idle chunk prover when starting proof generation session, id:%s", chunkTask.Hash)
-	}
-
-	proverStatusList, err := cp.sendTask(ctx, chunkTask.Hash)
-	if err != nil {
-		return fmt.Errorf("send task failure, id:%s error:%w", chunkTask.Hash, err)
-	}
-
-	transErr := cp.db.Transaction(func(tx *gorm.DB) error {
-		// Update session proving status as assigned.
-		if err = cp.chunkOrm.UpdateProvingStatus(ctx, chunkTask.Hash, types.ProvingTaskAssigned, tx); err != nil {
-			log.Error("failed to update task status", "id", chunkTask.Hash, "err", err)
-			return err
-		}
-
-		for _, proverStatus := range proverStatusList {
-			proverTask := orm.ProverTask{
-				TaskID:          chunkTask.Hash,
-				ProverPublicKey: proverStatus.PublicKey,
-				TaskType:        int16(message.ProofTypeChunk),
-				ProverName:      proverStatus.Name,
-				ProvingStatus:   int16(types.ProverAssigned),
-				FailureType:     int16(types.ProverTaskFailureTypeUndefined),
-				// here why need use UTC time. see scroll/common/databased/db.go
-				AssignedAt: utils.NowUTC(),
-			}
-			if err = cp.proverTaskOrm.SetProverTask(ctx, &proverTask, tx); err != nil {
-				return fmt.Errorf("db set session info fail, session id:%s , public key:%s, err:%w", chunkTask.Hash, proverStatus.PublicKey, err)
-			}
-		}
-		return nil
-	})
-	return transErr
-}
-
-func (cp *ChunkProofCollector) sendTask(ctx context.Context, hash string) ([]*coordinatorType.ProverStatus, error) {
-	// Get block hashes.
-	wrappedBlocks, wrappedErr := cp.blockOrm.GetL2BlocksByChunkHash(ctx, hash)
-	if wrappedErr != nil {
-		return nil, fmt.Errorf("failed to fetch wrapped blocks, batch hash:%s err:%w", hash, wrappedErr)
-	}
-	blockHashes := make([]common.Hash, len(wrappedBlocks))
-	for i, wrappedBlock := range wrappedBlocks {
-		blockHashes[i] = wrappedBlock.Header.Hash()
-	}
-	taskMsg := &message.TaskMsg{
-		ID:              hash,
-		Type:            message.ProofTypeChunk,
-		ChunkTaskDetail: &message.ChunkTaskDetail{BlockHashes: blockHashes},
-		BatchTaskDetail: nil,
-	}
-	return cp.BaseCollector.sendTask(taskMsg)
-}
--- a/coordinator/internal/logic/proof/task_worker.go
+++ b/coordinator/internal/logic/proof/task_worker.go
@@ -1,79 +0,0 @@
-package proof
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
-	"github.com/scroll-tech/go-ethereum/rpc"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/types/message"
-
-	"scroll-tech/coordinator/internal/logic/provermanager"
-)
-
-var coordinatorProversDisconnectsTotalCounter = gethMetrics.NewRegisteredCounter("coordinator/provers/disconnects/total", metrics.ScrollRegistry)
-
-// TaskWorker held the prover task connection
-type TaskWorker struct{}
-
-// NewTaskWorker create a task worker
-func NewTaskWorker() *TaskWorker {
-	return &TaskWorker{}
-}
-
-// AllocTaskWorker alloc a task worker goroutine
-func (t *TaskWorker) AllocTaskWorker(ctx context.Context, authMsg *message.AuthMsg) (*rpc.Subscription, error) {
-	notifier, supported := rpc.NotifierFromContext(ctx)
-	if !supported {
-		return &rpc.Subscription{}, rpc.ErrNotificationsUnsupported
-	}
-
-	pubKey, err := authMsg.PublicKey()
-	if err != nil {
-		return &rpc.Subscription{}, fmt.Errorf("AllocTaskWorker auth msg public key error:%w", err)
-	}
-
-	identity := authMsg.Identity
-
-	// create or get the prover message channel
-	taskCh, err := provermanager.Manager.Register(ctx, pubKey, identity)
-	if err != nil {
-		return &rpc.Subscription{}, err
-	}
-
-	rpcSub := notifier.CreateSubscription()
-
-	go t.worker(rpcSub, notifier, pubKey, identity, taskCh)
-
-	log.Info("prover register", "name", identity.Name, "pubKey", pubKey, "version", identity.Version)
-
-	return rpcSub, nil
-}
-
-// TODO worker add metrics
-func (t *TaskWorker) worker(rpcSub *rpc.Subscription, notifier *rpc.Notifier, pubKey string, identity *message.Identity, taskCh <-chan *message.TaskMsg) {
-	defer func() {
-		if err := recover(); err != nil {
-			log.Error("task worker subId:%d panic for:%v", err)
-		}
-
-		provermanager.Manager.FreeProver(pubKey)
-		log.Info("prover unregister", "name", identity.Name, "pubKey", pubKey)
-	}()
-
-	for {
-		select {
-		case task := <-taskCh:
-			notifier.Notify(rpcSub.ID, task) //nolint
-		case err := <-rpcSub.Err():
-			coordinatorProversDisconnectsTotalCounter.Inc(1)
-			log.Warn("client stopped the ws connection", "name", identity.Name, "pubkey", pubKey, "err", err)
-			return
-		case <-notifier.Closed():
-			return
-		}
-	}
-}
--- a/coordinator/internal/logic/provermanager/metrics.go
+++ b/coordinator/internal/logic/provermanager/metrics.go
@@ -1,60 +0,0 @@
-package provermanager
-
-import (
-	"time"
-
-	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
-)
-
-type proverMetrics struct {
-	proverProofsVerifiedSuccessTimeTimer   gethMetrics.Timer
-	proverProofsVerifiedFailedTimeTimer    gethMetrics.Timer
-	proverProofsGeneratedFailedTimeTimer   gethMetrics.Timer
-	proverProofsLastAssignedTimestampGauge gethMetrics.Gauge
-	proverProofsLastFinishedTimestampGauge gethMetrics.Gauge
-}
-
-func (r *proverManager) UpdateMetricProverProofsLastFinishedTimestampGauge(pk string) {
-	if node, ok := r.proverPool.Get(pk); ok {
-		rMs := node.(*proverNode).metrics
-		if rMs != nil {
-			rMs.proverProofsLastFinishedTimestampGauge.Update(time.Now().Unix())
-		}
-	}
-}
-
-func (r *proverManager) UpdateMetricProverProofsLastAssignedTimestampGauge(pk string) {
-	if node, ok := r.proverPool.Get(pk); ok {
-		rMs := node.(*proverNode).metrics
-		if rMs != nil {
-			rMs.proverProofsLastAssignedTimestampGauge.Update(time.Now().Unix())
-		}
-	}
-}
-
-func (r *proverManager) UpdateMetricProverProofsVerifiedSuccessTimeTimer(pk string, d time.Duration) {
-	if node, ok := r.proverPool.Get(pk); ok {
-		rMs := node.(*proverNode).metrics
-		if rMs != nil {
-			rMs.proverProofsVerifiedSuccessTimeTimer.Update(d)
-		}
-	}
-}
-
-func (r *proverManager) UpdateMetricProverProofsVerifiedFailedTimeTimer(pk string, d time.Duration) {
-	if node, ok := r.proverPool.Get(pk); ok {
-		rMs := node.(*proverNode).metrics
-		if rMs != nil {
-			rMs.proverProofsVerifiedFailedTimeTimer.Update(d)
-		}
-	}
-}
-
-func (r *proverManager) UpdateMetricProverProofsGeneratedFailedTimeTimer(pk string, d time.Duration) {
-	if node, ok := r.proverPool.Get(pk); ok {
-		rMs := node.(*proverNode).metrics
-		if rMs != nil {
-			rMs.proverProofsGeneratedFailedTimeTimer.Update(d)
-		}
-	}
-}
--- a/coordinator/internal/logic/provermanager/prover_manager.go
+++ b/coordinator/internal/logic/provermanager/prover_manager.go
@@ -1,203 +0,0 @@
-package provermanager
-
-import (
-	"context"
-	"crypto/rand"
-	"errors"
-	"fmt"
-	"math/big"
-	"sync"
-	"time"
-
-	cmap "github.com/orcaman/concurrent-map"
-	"github.com/scroll-tech/go-ethereum/log"
-	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/types"
-	"scroll-tech/common/types/message"
-
-	"scroll-tech/coordinator/internal/orm"
-)
-
-var (
-	once sync.Once
-	// Manager the global prover manager
-	Manager *proverManager
-)
-
-// ProverNode is the interface that controls the provers
-type proverNode struct {
-	// Prover name
-	Name string
-	// Prover type
-	Type message.ProofType
-	// Prover public key
-	PublicKey string
-	// Prover version
-	Version string
-
-	// task channel
-	taskChan chan *message.TaskMsg
-	// session id list which delivered to prover.
-	TaskIDs cmap.ConcurrentMap
-
-	// Time of message creation
-	registerTime time.Time
-
-	metrics *proverMetrics
-}
-
-type proverManager struct {
-	proverPool    cmap.ConcurrentMap
-	proverTaskOrm *orm.ProverTask
-}
-
-// InitProverManager init a prover manager
-func InitProverManager(db *gorm.DB) {
-	once.Do(func() {
-		Manager = &proverManager{
-			proverPool:    cmap.New(),
-			proverTaskOrm: orm.NewProverTask(db),
-		}
-	})
-}
-
-// Register the identity message to prover manager with the public key
-func (r *proverManager) Register(ctx context.Context, proverPublicKey string, identity *message.Identity) (<-chan *message.TaskMsg, error) {
-	node, ok := r.proverPool.Get(proverPublicKey)
-	if !ok {
-		taskIDs, err := r.reloadProverAssignedTasks(ctx, proverPublicKey)
-		if err != nil {
-			return nil, fmt.Errorf("register error:%w", err)
-		}
-
-		rMs := &proverMetrics{
-			proverProofsVerifiedSuccessTimeTimer:   gethMetrics.GetOrRegisterTimer(fmt.Sprintf("prover/proofs/verified/success/time/%s", proverPublicKey), metrics.ScrollRegistry),
-			proverProofsVerifiedFailedTimeTimer:    gethMetrics.GetOrRegisterTimer(fmt.Sprintf("prover/proofs/verified/failed/time/%s", proverPublicKey), metrics.ScrollRegistry),
-			proverProofsGeneratedFailedTimeTimer:   gethMetrics.GetOrRegisterTimer(fmt.Sprintf("prover/proofs/generated/failed/time/%s", proverPublicKey), metrics.ScrollRegistry),
-			proverProofsLastAssignedTimestampGauge: gethMetrics.GetOrRegisterGauge(fmt.Sprintf("prover/proofs/last/assigned/timestamp/%s", proverPublicKey), metrics.ScrollRegistry),
-			proverProofsLastFinishedTimestampGauge: gethMetrics.GetOrRegisterGauge(fmt.Sprintf("prover/proofs/last/finished/timestamp/%s", proverPublicKey), metrics.ScrollRegistry),
-		}
-		node = &proverNode{
-			Name:      identity.Name,
-			Type:      identity.ProverType,
-			Version:   identity.Version,
-			PublicKey: proverPublicKey,
-			TaskIDs:   *taskIDs,
-			taskChan:  make(chan *message.TaskMsg, 4),
-			metrics:   rMs,
-		}
-		r.proverPool.Set(proverPublicKey, node)
-	}
-	prover := node.(*proverNode)
-	// avoid reconnection too frequently.
-	if time.Since(prover.registerTime) < 60 {
-		log.Warn("prover reconnect too frequently", "prover_name", identity.Name, "prover_type", identity.ProverType, "public key", proverPublicKey)
-		return nil, fmt.Errorf("prover reconnect too frequently")
-	}
-	// update register time and status
-	prover.registerTime = time.Now()
-
-	return prover.taskChan, nil
-}
-
-func (r *proverManager) reloadProverAssignedTasks(ctx context.Context, proverPublicKey string) (*cmap.ConcurrentMap, error) {
-	var assignedProverTasks []orm.ProverTask
-	page := 0
-	limit := 100
-	for {
-		page++
-		whereFields := make(map[string]interface{})
-		whereFields["proving_status"] = int16(types.ProverAssigned)
-		orderBy := []string{"id asc"}
-		offset := (page - 1) * limit
-		batchAssignedProverTasks, err := r.proverTaskOrm.GetProverTasks(ctx, whereFields, orderBy, offset, limit)
-		if err != nil {
-			log.Warn("reloadProverAssignedTasks get all assigned failure", "error", err)
-			return nil, fmt.Errorf("reloadProverAssignedTasks error:%w", err)
-		}
-		if len(batchAssignedProverTasks) < limit {
-			break
-		}
-		assignedProverTasks = append(assignedProverTasks, batchAssignedProverTasks...)
-	}
-
-	taskIDs := cmap.New()
-	for _, assignedProverTask := range assignedProverTasks {
-		if assignedProverTask.ProverPublicKey == proverPublicKey && assignedProverTask.ProvingStatus == int16(types.ProverAssigned) {
-			taskIDs.Set(assignedProverTask.TaskID, struct{}{})
-		}
-	}
-	return &taskIDs, nil
-}
-
-// SendTask send the need proved message to prover
-func (r *proverManager) SendTask(proverType message.ProofType, msg *message.TaskMsg) (string, string, error) {
-	tmpProver := r.selectProver(proverType)
-	if tmpProver == nil {
-		return "", "", errors.New("selectProver returns nil")
-	}
-
-	select {
-	case tmpProver.taskChan <- msg:
-		tmpProver.TaskIDs.Set(msg.ID, struct{}{})
-	default:
-		err := fmt.Errorf("prover channel is full, proverName:%s, publicKey:%s", tmpProver.Name, tmpProver.PublicKey)
-		return "", "", err
-	}
-
-	r.UpdateMetricProverProofsLastAssignedTimestampGauge(tmpProver.PublicKey)
-
-	return tmpProver.PublicKey, tmpProver.Name, nil
-}
-
-// ExistTaskIDForProver check the task exist
-func (r *proverManager) ExistTaskIDForProver(pk string, id string) bool {
-	node, ok := r.proverPool.Get(pk)
-	if !ok {
-		return false
-	}
-	prover := node.(*proverNode)
-	return prover.TaskIDs.Has(id)
-}
-
-// FreeProver free the prover with the pk key
-func (r *proverManager) FreeProver(pk string) {
-	r.proverPool.Pop(pk)
-}
-
-// FreeTaskIDForProver free a task of the pk prover
-func (r *proverManager) FreeTaskIDForProver(pk string, id string) {
-	if node, ok := r.proverPool.Get(pk); ok {
-		prover := node.(*proverNode)
-		prover.TaskIDs.Pop(id)
-	}
-}
-
-// GetNumberOfIdleProvers return the count of idle provers.
-func (r *proverManager) GetNumberOfIdleProvers(proverType message.ProofType) (count int) {
-	for item := range r.proverPool.IterBuffered() {
-		prover := item.Val.(*proverNode)
-		if prover.TaskIDs.Count() == 0 && prover.Type == proverType {
-			count++
-		}
-	}
-	return count
-}
-
-func (r *proverManager) selectProver(proverType message.ProofType) *proverNode {
-	pubkeys := r.proverPool.Keys()
-	for len(pubkeys) > 0 {
-		idx, _ := rand.Int(rand.Reader, big.NewInt(int64(len(pubkeys))))
-		if val, ok := r.proverPool.Get(pubkeys[idx.Int64()]); ok {
-			rn := val.(*proverNode)
-			if rn.TaskIDs.Count() == 0 && rn.Type == proverType {
-				return rn
-			}
-		}
-		pubkeys[idx.Int64()], pubkeys = pubkeys[0], pubkeys[1:]
-	}
-	return nil
-}
--- a/coordinator/internal/logic/provertask/batch_prover_task.go
+++ b/coordinator/internal/logic/provertask/batch_prover_task.go
@@ -0,0 +1,151 @@
+package provertask
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/log"
+	"gorm.io/gorm"
+
+	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
+	"scroll-tech/common/utils"
+
+	"scroll-tech/coordinator/internal/config"
+	"scroll-tech/coordinator/internal/orm"
+	coordinatorType "scroll-tech/coordinator/internal/types"
+)
+
+// BatchProverTask is prover task implement for batch proof
+type BatchProverTask struct {
+	BaseProverTask
+}
+
+// NewBatchProverTask new a batch collector
+func NewBatchProverTask(cfg *config.Config, db *gorm.DB) *BatchProverTask {
+	bp := &BatchProverTask{
+		BaseProverTask: BaseProverTask{
+			db:            db,
+			cfg:           cfg,
+			chunkOrm:      orm.NewChunk(db),
+			batchOrm:      orm.NewBatch(db),
+			proverTaskOrm: orm.NewProverTask(db),
+		},
+	}
+	return bp
+}
+
+// Assign load and assign batch tasks
+func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinatorType.GetTaskParameter) (*coordinatorType.GetTaskSchema, error) {
+	publicKey, publicKeyExist := ctx.Get(coordinatorType.PublicKey)
+	if !publicKeyExist {
+		return nil, fmt.Errorf("get public key from contex failed")
+	}
+
+	proverName, proverNameExist := ctx.Get(coordinatorType.ProverName)
+	if !proverNameExist {
+		return nil, fmt.Errorf("get prover name from contex failed")
+	}
+
+	batchTasks, err := bp.batchOrm.UpdateUnassignedBatchReturning(ctx, 1)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get unassigned batch proving tasks, error:%w", err)
+	}
+
+	if len(batchTasks) == 0 {
+		return nil, nil
+	}
+
+	if len(batchTasks) != 1 {
+		return nil, fmt.Errorf("get unassigned batch proving task len not 1, batch tasks:%v", batchTasks)
+	}
+
+	batchTask := batchTasks[0]
+	log.Info("start batch proof generation session", "id", batchTask.Hash)
+
+	if !bp.checkAttemptsExceeded(batchTask.Hash, message.ProofTypeBatch) {
+		return nil, fmt.Errorf("the batch task id:%s check attempts have reach the maximum", batchTask.Hash)
+	}
+
+	proverTask := orm.ProverTask{
+		TaskID:          batchTask.Hash,
+		ProverPublicKey: publicKey.(string),
+		TaskType:        int16(message.ProofTypeBatch),
+		ProverName:      proverName.(string),
+		ProvingStatus:   int16(types.ProverAssigned),
+		FailureType:     int16(types.ProverTaskFailureTypeUndefined),
+		// here why need use UTC time. see scroll/common/databased/db.go
+		AssignedAt: utils.NowUTC(),
+	}
+
+	// Store session info.
+	if err = bp.proverTaskOrm.SetProverTask(ctx, &proverTask); err != nil {
+		bp.recoverProvingStatus(ctx, batchTask)
+		return nil, fmt.Errorf("db set session info fail, session id:%s, error:%w", proverTask.TaskID, err)
+	}
+
+	taskMsg, err := bp.formatProverTask(ctx, batchTask.Hash)
+	if err != nil {
+		bp.recoverProvingStatus(ctx, batchTask)
+		return nil, fmt.Errorf("format prover failure, id:%s error:%w", batchTask.Hash, err)
+	}
+
+	return taskMsg, nil
+}
+
+func (bp *BatchProverTask) formatProverTask(ctx context.Context, taskID string) (*coordinatorType.GetTaskSchema, error) {
+	// get chunk from db
+	chunks, err := bp.chunkOrm.GetChunksByBatchHash(ctx, taskID)
+	if err != nil {
+		err = fmt.Errorf("failed to get chunk proofs for batch task id:%s err:%w ", taskID, err)
+		return nil, err
+	}
+
+	var chunkProofs []*message.ChunkProof
+	var chunkInfos []*message.ChunkInfo
+	for _, chunk := range chunks {
+		var proof message.ChunkProof
+		if encodeErr := json.Unmarshal(chunk.Proof, &proof); encodeErr != nil {
+			return nil, fmt.Errorf("Chunk.GetProofsByBatchHash unmarshal proof error: %w, batch hash: %v, chunk hash: %v", encodeErr, taskID, chunk.Hash)
+		}
+		chunkProofs = append(chunkProofs, &proof)
+
+		chunkInfo := message.ChunkInfo{
+			ChainID:       bp.cfg.L2.ChainID,
+			PrevStateRoot: common.HexToHash(chunk.ParentChunkStateRoot),
+			PostStateRoot: common.HexToHash(chunk.StateRoot),
+			WithdrawRoot:  common.HexToHash(chunk.WithdrawRoot),
+			DataHash:      common.HexToHash(chunk.Hash),
+			IsPadding:     false,
+		}
+		chunkInfos = append(chunkInfos, &chunkInfo)
+	}
+
+	taskDetail := message.BatchTaskDetail{
+		ChunkInfos:  chunkInfos,
+		ChunkProofs: chunkProofs,
+	}
+
+	chunkProofsBytes, err := json.Marshal(taskDetail)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal chunk proofs, taskID:%s err:%w", taskID, err)
+	}
+
+	taskMsg := &coordinatorType.GetTaskSchema{
+		TaskID:   taskID,
+		TaskType: int(message.ProofTypeBatch),
+		TaskData: string(chunkProofsBytes),
+	}
+	return taskMsg, nil
+}
+
+// recoverProvingStatus if not return the batch task to prover success,
+// need recover the proving status to unassigned
+func (bp *BatchProverTask) recoverProvingStatus(ctx *gin.Context, batchTask *orm.Batch) {
+	if err := bp.batchOrm.UpdateProvingStatus(ctx, batchTask.Hash, types.ProvingTaskUnassigned); err != nil {
+		log.Warn("failed to recover batch proving status", "hash:", batchTask.Hash, "error", err)
+	}
+}
--- a/coordinator/internal/logic/provertask/chunk_prover_task.go
+++ b/coordinator/internal/logic/provertask/chunk_prover_task.go
@@ -0,0 +1,134 @@
+package provertask
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/log"
+	"gorm.io/gorm"
+
+	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
+	"scroll-tech/common/utils"
+
+	"scroll-tech/coordinator/internal/config"
+	"scroll-tech/coordinator/internal/orm"
+	coordinatorType "scroll-tech/coordinator/internal/types"
+)
+
+// ChunkProverTask the chunk prover task
+type ChunkProverTask struct {
+	BaseProverTask
+}
+
+// NewChunkProverTask new a chunk prover task
+func NewChunkProverTask(cfg *config.Config, db *gorm.DB) *ChunkProverTask {
+	cp := &ChunkProverTask{
+		BaseProverTask: BaseProverTask{
+			db:            db,
+			cfg:           cfg,
+			chunkOrm:      orm.NewChunk(db),
+			blockOrm:      orm.NewL2Block(db),
+			proverTaskOrm: orm.NewProverTask(db),
+		},
+	}
+	return cp
+}
+
+// Assign the chunk proof which need to prove
+func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinatorType.GetTaskParameter) (*coordinatorType.GetTaskSchema, error) {
+	publicKey, publicKeyExist := ctx.Get(coordinatorType.PublicKey)
+	if !publicKeyExist {
+		return nil, fmt.Errorf("get public key from contex failed")
+	}
+
+	proverName, proverNameExist := ctx.Get(coordinatorType.ProverName)
+	if !proverNameExist {
+		return nil, fmt.Errorf("get prover name from contex failed")
+	}
+
+	// load and send chunk tasks
+	chunkTasks, err := cp.chunkOrm.UpdateUnassignedChunkReturning(ctx, getTaskParameter.ProverHeight, 1)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get unassigned chunk proving tasks, error:%w", err)
+	}
+
+	if len(chunkTasks) == 0 {
+		return nil, nil
+	}
+
+	if len(chunkTasks) != 1 {
+		return nil, fmt.Errorf("get unassigned chunk proving task len not 1, chunk tasks:%v", chunkTasks)
+	}
+
+	chunkTask := chunkTasks[0]
+
+	log.Info("start chunk generation session", "id", chunkTask.Hash)
+
+	if !cp.checkAttemptsExceeded(chunkTask.Hash, message.ProofTypeChunk) {
+		return nil, fmt.Errorf("chunk proof hash id:%s check attempts have reach the maximum", chunkTask.Hash)
+	}
+
+	proverTask := orm.ProverTask{
+		TaskID:          chunkTask.Hash,
+		ProverPublicKey: publicKey.(string),
+		TaskType:        int16(message.ProofTypeChunk),
+		ProverName:      proverName.(string),
+		ProvingStatus:   int16(types.ProverAssigned),
+		FailureType:     int16(types.ProverTaskFailureTypeUndefined),
+		// here why need use UTC time. see scroll/common/databased/db.go
+		AssignedAt: utils.NowUTC(),
+	}
+	if err = cp.proverTaskOrm.SetProverTask(ctx, &proverTask); err != nil {
+		cp.recoverProvingStatus(ctx, chunkTask)
+		return nil, fmt.Errorf("db set session info fail, session id:%s , public key:%s, err:%w", chunkTask.Hash, publicKey, err)
+	}
+
+	taskMsg, err := cp.formatProverTask(ctx, chunkTask.Hash)
+	if err != nil {
+		cp.recoverProvingStatus(ctx, chunkTask)
+		return nil, fmt.Errorf("format prover task failure, id:%s error:%w", chunkTask.Hash, err)
+	}
+
+	return taskMsg, nil
+}
+
+func (cp *ChunkProverTask) formatProverTask(ctx context.Context, hash string) (*coordinatorType.GetTaskSchema, error) {
+	// Get block hashes.
+	wrappedBlocks, wrappedErr := cp.blockOrm.GetL2BlocksByChunkHash(ctx, hash)
+	if wrappedErr != nil || len(wrappedBlocks) == 0 {
+		return nil, fmt.Errorf("failed to fetch wrapped blocks, batch hash:%s err:%w", hash, wrappedErr)
+	}
+
+	blockHashes := make([]common.Hash, len(wrappedBlocks))
+	for i, wrappedBlock := range wrappedBlocks {
+		blockHashes[i] = wrappedBlock.Header.Hash()
+	}
+
+	taskDetail := message.ChunkTaskDetail{
+		BlockHashes: blockHashes,
+	}
+	blockHashesBytes, err := json.Marshal(taskDetail)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal block hashes hash:%s, err:%w", hash, err)
+	}
+
+	proverTaskSchema := &coordinatorType.GetTaskSchema{
+		TaskID:   hash,
+		TaskType: int(message.ProofTypeChunk),
+		TaskData: string(blockHashesBytes),
+	}
+
+	return proverTaskSchema, nil
+}
+
+// recoverProvingStatus if not return the batch task to prover success,
+// need recover the proving status to unassigned
+func (cp *ChunkProverTask) recoverProvingStatus(ctx *gin.Context, chunkTask *orm.Chunk) {
+	if err := cp.chunkOrm.UpdateProvingStatus(ctx, chunkTask.Hash, types.ProvingTaskUnassigned); err != nil {
+		log.Warn("failed to recover chunk proving status", "hash:", chunkTask.Hash, "error", err)
+	}
+}
--- a/coordinator/internal/logic/provertask/prover_task.go
+++ b/coordinator/internal/logic/provertask/prover_task.go
@@ -1,8 +1,9 @@
-package collector
+package provertask

 import (
 	"context"

+	"github.com/gin-gonic/gin"
 	"github.com/scroll-tech/go-ethereum/log"
 	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
 	"gorm.io/gorm"
@@ -12,28 +13,19 @@ import (
 	"scroll-tech/common/types/message"

 	"scroll-tech/coordinator/internal/config"
-	"scroll-tech/coordinator/internal/logic/provermanager"
 	"scroll-tech/coordinator/internal/orm"
 	coordinatorType "scroll-tech/coordinator/internal/types"
 )

-const (
-	// BatchCollectorName the name of batch collector
-	BatchCollectorName = "batch_collector"
-	// ChunkCollectorName the name of chunk collector
-	ChunkCollectorName = "chunk_collector"
-)
-
 var coordinatorSessionsTimeoutTotalCounter = gethMetrics.NewRegisteredCounter("coordinator/sessions/timeout/total", metrics.ScrollRegistry)

-// Collector the interface of a collector who send data to prover
-type Collector interface {
-	Name() string
-	Collect(ctx context.Context) error
+// ProverTask the interface of a collector who send data to prover
+type ProverTask interface {
+	Assign(ctx *gin.Context, getTaskParameter *coordinatorType.GetTaskParameter) (*coordinatorType.GetTaskSchema, error)
 }

-// BaseCollector a base collector which contain series functions
-type BaseCollector struct {
+// BaseProverTask a base prover task which contain series functions
+type BaseProverTask struct {
 	cfg *config.Config
 	ctx context.Context
 	db  *gorm.DB
@@ -45,7 +37,7 @@ type BaseCollector struct {
 }

 // checkAttempts use the count of prover task info to check the attempts
-func (b *BaseCollector) checkAttemptsExceeded(hash string, taskType message.ProofType) bool {
+func (b *BaseProverTask) checkAttemptsExceeded(hash string, taskType message.ProofType) bool {
 	whereFields := make(map[string]interface{})
 	whereFields["task_id"] = hash
 	whereFields["task_type"] = int16(taskType)
@@ -55,17 +47,11 @@ func (b *BaseCollector) checkAttemptsExceeded(hash string, taskType message.Proo
 		return true
 	}

-	if len(proverTasks) >= int(b.cfg.ProverManagerConfig.SessionAttempts) {
+	if len(proverTasks) >= int(b.cfg.ProverManager.SessionAttempts) {
 		coordinatorSessionsTimeoutTotalCounter.Inc(1)

 		log.Warn("proof generation prover task %s ended because reach the max attempts", hash)

-		for _, proverTask := range proverTasks {
-			if types.ProvingStatus(proverTask.ProvingStatus) == types.ProvingTaskFailed {
-				provermanager.Manager.FreeTaskIDForProver(proverTask.ProverPublicKey, hash)
-			}
-		}
-
 		transErr := b.db.Transaction(func(tx *gorm.DB) error {
 			switch message.ProofType(proverTasks[0].TaskType) {
 			case message.ProofTypeChunk:
@@ -89,29 +75,3 @@ func (b *BaseCollector) checkAttemptsExceeded(hash string, taskType message.Proo
 	}
 	return true
 }
-
-func (b *BaseCollector) sendTask(taskMsg *message.TaskMsg) ([]*coordinatorType.ProverStatus, error) {
-	var err error
-	var proverStatusList []*coordinatorType.ProverStatus
-	for i := uint8(0); i < b.cfg.ProverManagerConfig.ProversPerSession; i++ {
-		proverPubKey, proverName, sendErr := provermanager.Manager.SendTask(taskMsg.Type, taskMsg)
-		if sendErr != nil {
-			err = sendErr
-			continue
-		}
-
-		provermanager.Manager.UpdateMetricProverProofsLastAssignedTimestampGauge(proverPubKey)
-
-		proverStatus := &coordinatorType.ProverStatus{
-			PublicKey: proverPubKey,
-			Name:      proverName,
-			Status:    types.ProverAssigned,
-		}
-		proverStatusList = append(proverStatusList, proverStatus)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	return proverStatusList, nil
-}
--- a/coordinator/internal/logic/submitproof/proof_receiver.go
+++ b/coordinator/internal/logic/submitproof/proof_receiver.go
@@ -1,4 +1,4 @@
-package proof
+package submitproof

 import (
 	"context"
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"time"

+	"github.com/gin-gonic/gin"
 	"github.com/scroll-tech/go-ethereum/log"
 	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
 	"gorm.io/gorm"
@@ -15,9 +16,9 @@ import (
 	"scroll-tech/common/types/message"

 	"scroll-tech/coordinator/internal/config"
-	"scroll-tech/coordinator/internal/logic/provermanager"
 	"scroll-tech/coordinator/internal/logic/verifier"
 	"scroll-tech/coordinator/internal/orm"
+	coordinatorType "scroll-tech/coordinator/internal/types"
 )

 var (
@@ -37,25 +38,25 @@ var (
 	ErrValidatorFailureProverInfoHasProofValid = errors.New("validator failure prover task info has proof valid")
 )

-// ZKProofReceiver the proof receiver
-type ZKProofReceiver struct {
+// ProofReceiverLogic the proof receiver logic
+type ProofReceiverLogic struct {
 	chunkOrm      *orm.Chunk
 	batchOrm      *orm.Batch
 	proverTaskOrm *orm.ProverTask

 	db  *gorm.DB
-	cfg *config.ProverManagerConfig
+	cfg *config.ProverManager

 	verifier *verifier.Verifier
 }

-// NewZKProofReceiver create a proof receiver
-func NewZKProofReceiver(cfg *config.ProverManagerConfig, db *gorm.DB) *ZKProofReceiver {
+// NewSubmitProofReceiverLogic create a proof receiver logic
+func NewSubmitProofReceiverLogic(cfg *config.ProverManager, db *gorm.DB) *ProofReceiverLogic {
 	vf, err := verifier.NewVerifier(cfg.Verifier)
 	if err != nil {
 		panic("proof receiver new verifier failure")
 	}
-	return &ZKProofReceiver{
+	return &ProofReceiverLogic{
 		chunkOrm:      orm.NewChunk(db),
 		batchOrm:      orm.NewBatch(db),
 		proverTaskOrm: orm.NewProverTask(db),
@@ -70,9 +71,11 @@ func NewZKProofReceiver(cfg *config.ProverManagerConfig, db *gorm.DB) *ZKProofRe
 // HandleZkProof handle a ZkProof submitted from a prover.
 // For now only proving/verifying error will lead to setting status as skipped.
 // db/unmarshal errors will not because they are errors on the business logic side.
-func (m *ZKProofReceiver) HandleZkProof(ctx context.Context, proofMsg *message.ProofMsg) error {
-	pk, _ := proofMsg.PublicKey()
-	provermanager.Manager.UpdateMetricProverProofsLastFinishedTimestampGauge(pk)
+func (m *ProofReceiverLogic) HandleZkProof(ctx *gin.Context, proofMsg *message.ProofMsg) error {
+	pk := ctx.GetString(coordinatorType.PublicKey)
+	if len(pk) == 0 {
+		return fmt.Errorf("get public key from contex failed")
+	}

 	proverTask, err := m.proverTaskOrm.GetProverTaskByTaskIDAndPubKey(ctx, proofMsg.ID, pk)
 	if proverTask == nil || err != nil {
@@ -84,7 +87,7 @@ func (m *ZKProofReceiver) HandleZkProof(ctx context.Context, proofMsg *message.P
 		if errors.Is(err, ErrValidatorFailureProofMsgStatusNotOk) {
 			m.proofFailure(ctx, proofMsg.ID, pk, proofMsg.Type)
 		}
-		return nil
+		return err
 	}

 	proofTime := time.Since(proverTask.CreatedAt)
@@ -131,34 +134,32 @@ func (m *ZKProofReceiver) HandleZkProof(ctx context.Context, proofMsg *message.P
 	}

 	if verifyErr != nil || !success {
-		if verifyErr != nil {
-			// TODO: this is only a temp workaround for testnet, we should return err in real cases
-			log.Error("failed to verify zk proof", "proof id", proofMsg.ID, "prover pk", pk, "prove type",
-				proofMsg.Type, "proof time", proofTimeSec, "error", verifyErr)
-		}
 		m.proofFailure(ctx, proofMsg.ID, pk, proofMsg.Type)
-
-		// TODO: Prover needs to be slashed if proof is invalid.
 		coordinatorProofsVerifiedFailedTimeTimer.Update(proofTime)

-		provermanager.Manager.UpdateMetricProverProofsVerifiedFailedTimeTimer(pk, proofTime)
-
 		log.Info("proof verified by coordinator failed", "proof id", proofMsg.ID, "prover name", proverTask.ProverName,
 			"prover pk", pk, "prove type", proofMsg.Type, "proof time", proofTimeSec, "error", verifyErr)
-		return nil
+
+		if verifyErr == nil {
+			verifyErr = fmt.Errorf("verification succeeded and it's an invalid proof")
+		}
+		return verifyErr
 	}

+	log.Info("proof verified and valid", "proof id", proofMsg.ID, "prover name", proverTask.ProverName,
+		"prover pk", pk, "prove type", proofMsg.Type, "proof time", proofTimeSec)
+
 	if err := m.closeProofTask(ctx, proofMsg.ID, pk, proofMsg); err != nil {
 		m.proofRecover(ctx, proofMsg.ID, pk, proofMsg.Type)
+		return err
 	}

 	coordinatorProofsVerifiedSuccessTimeTimer.Update(proofTime)
-	provermanager.Manager.UpdateMetricProverProofsVerifiedSuccessTimeTimer(pk, proofTime)

 	return nil
 }

-func (m *ZKProofReceiver) checkAreAllChunkProofsReady(ctx context.Context, chunkHash string) error {
+func (m *ProofReceiverLogic) checkAreAllChunkProofsReady(ctx context.Context, chunkHash string) error {
 	batchHash, err := m.chunkOrm.GetChunkBatchHash(ctx, chunkHash)
 	if err != nil {
 		return err
@@ -177,7 +178,7 @@ func (m *ZKProofReceiver) checkAreAllChunkProofsReady(ctx context.Context, chunk
 	return nil
 }

-func (m *ZKProofReceiver) validator(proverTask *orm.ProverTask, pk string, proofMsg *message.ProofMsg) error {
+func (m *ProofReceiverLogic) validator(proverTask *orm.ProverTask, pk string, proofMsg *message.ProofMsg) error {
 	// Ensure this prover is eligible to participate in the prover task.
 	if types.ProverProveStatus(proverTask.ProvingStatus) == types.ProverProofValid {
 		// In order to prevent DoS attacks, it is forbidden to repeatedly submit valid proofs.
@@ -198,8 +199,6 @@ func (m *ZKProofReceiver) validator(proverTask *orm.ProverTask, pk string, proof
 	if proofMsg.Status != message.StatusOk {
 		coordinatorProofsGeneratedFailedTimeTimer.Update(proofTime)

-		provermanager.Manager.UpdateMetricProverProofsGeneratedFailedTimeTimer(pk, proofTime)
-
 		log.Info("proof generated by prover failed", "proof id", proofMsg.ID, "prover name", proverTask.ProverName,
 			"prover pk", pk, "prove type", proofMsg.Type, "proof time", proofTimeSec, "error", proofMsg.Error)
 		return ErrValidatorFailureProofMsgStatusNotOk
@@ -207,31 +206,29 @@ func (m *ZKProofReceiver) validator(proverTask *orm.ProverTask, pk string, proof
 	return nil
 }

-func (m *ZKProofReceiver) proofFailure(ctx context.Context, hash string, pubKey string, proofMsgType message.ProofType) {
+func (m *ProofReceiverLogic) proofFailure(ctx context.Context, hash string, pubKey string, proofMsgType message.ProofType) {
 	if err := m.updateProofStatus(ctx, hash, pubKey, proofMsgType, types.ProvingTaskFailed); err != nil {
 		log.Error("failed to updated proof status ProvingTaskFailed", "hash", hash, "pubKey", pubKey, "error", err)
 	}
 	coordinatorSessionsFailedTotalCounter.Inc(1)
 }

-func (m *ZKProofReceiver) proofRecover(ctx context.Context, hash string, pubKey string, proofMsgType message.ProofType) {
+func (m *ProofReceiverLogic) proofRecover(ctx context.Context, hash string, pubKey string, proofMsgType message.ProofType) {
 	if err := m.updateProofStatus(ctx, hash, pubKey, proofMsgType, types.ProvingTaskUnassigned); err != nil {
 		log.Error("failed to updated proof status ProvingTaskUnassigned", "hash", hash, "pubKey", pubKey, "error", err)
 	}
 }

-func (m *ZKProofReceiver) closeProofTask(ctx context.Context, hash string, pubKey string, proofMsg *message.ProofMsg) error {
+func (m *ProofReceiverLogic) closeProofTask(ctx context.Context, hash string, pubKey string, proofMsg *message.ProofMsg) error {
 	if err := m.updateProofStatus(ctx, hash, pubKey, proofMsg.Type, types.ProvingTaskVerified); err != nil {
 		log.Error("failed to updated proof status ProvingTaskVerified", "hash", hash, "pubKey", pubKey, "error", err)
 		return err
 	}
-
-	provermanager.Manager.FreeTaskIDForProver(pubKey, hash)
 	return nil
 }

 // UpdateProofStatus update the chunk/batch task and session info status
-func (m *ZKProofReceiver) updateProofStatus(ctx context.Context, hash string, proverPublicKey string, proofMsgType message.ProofType, status types.ProvingStatus) error {
+func (m *ProofReceiverLogic) updateProofStatus(ctx context.Context, hash string, proverPublicKey string, proofMsgType message.ProofType, status types.ProvingStatus) error {
 	// if the prover task failure type is SessionInfoFailureTimeout,
 	// just skip update the status because the proof result come too late.
 	if m.checkIsTimeoutFailure(ctx, hash, proverPublicKey) {
@@ -285,7 +282,7 @@ func (m *ZKProofReceiver) updateProofStatus(ctx context.Context, hash string, pr
 	return nil
 }

-func (m *ZKProofReceiver) checkIsTaskSuccess(ctx context.Context, hash string, proofType message.ProofType) bool {
+func (m *ProofReceiverLogic) checkIsTaskSuccess(ctx context.Context, hash string, proofType message.ProofType) bool {
 	var provingStatus types.ProvingStatus
 	var err error

@@ -305,7 +302,7 @@ func (m *ZKProofReceiver) checkIsTaskSuccess(ctx context.Context, hash string, p
 	return provingStatus == types.ProvingTaskVerified
 }

-func (m *ZKProofReceiver) checkIsTimeoutFailure(ctx context.Context, hash, proverPublicKey string) bool {
+func (m *ProofReceiverLogic) checkIsTimeoutFailure(ctx context.Context, hash, proverPublicKey string) bool {
 	proverTask, err := m.proverTaskOrm.GetProverTaskByTaskIDAndPubKey(ctx, hash, proverPublicKey)
 	if err != nil {
 		return false
--- a/coordinator/internal/middleware/challenge_jwt.go
+++ b/coordinator/internal/middleware/challenge_jwt.go
@@ -0,0 +1,50 @@
+package middleware
+
+import (
+	"crypto/rand"
+	"encoding/base64"
+	"time"
+
+	"github.com/gin-gonic/gin"
+
+	jwt "github.com/appleboy/gin-jwt/v2"
+	"github.com/scroll-tech/go-ethereum/log"
+
+	"scroll-tech/coordinator/internal/config"
+)
+
+// ChallengeMiddleware jwt challenge middleware
+func ChallengeMiddleware(conf *config.Config) *jwt.GinJWTMiddleware {
+	jwtMiddleware, err := jwt.New(&jwt.GinJWTMiddleware{
+		Authenticator: func(c *gin.Context) (interface{}, error) {
+			return nil, nil
+		},
+		PayloadFunc: func(data interface{}) jwt.MapClaims {
+			b := make([]byte, 32)
+			_, err := rand.Read(b)
+			if err != nil {
+				return jwt.MapClaims{}
+			}
+			return jwt.MapClaims{
+				"random": base64.URLEncoding.EncodeToString(b),
+			}
+		},
+		Unauthorized:  unauthorized,
+		Key:           []byte(conf.Auth.Secret),
+		Timeout:       time.Second * time.Duration(conf.Auth.ChallengeExpireDurationSec),
+		TokenLookup:   "header: Authorization, query: token, cookie: jwt",
+		TokenHeadName: "Bearer",
+		TimeFunc:      time.Now,
+		LoginResponse: loginResponse,
+	})
+
+	if err != nil {
+		log.Crit("new jwt middleware panic", "error", err)
+	}
+
+	if errInit := jwtMiddleware.MiddlewareInit(); errInit != nil {
+		log.Crit("init jwt middleware panic", "error", errInit)
+	}
+
+	return jwtMiddleware
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Péter Garamvölgyi	2c89343e03	handle failed proof in ProcessCommittedBatches	2023-08-06 22:39:20 +08:00
Xi Lin	f1073e7d13	refactor(contracts): OZ-L1-N03 Events Should Emit Old and New Value (#673 ) Co-authored-by: Péter Garamvölgyi <peter@scroll.io>	2023-08-06 14:18:13 +02:00
georgehao	816a3b4a15	fix(coordinator&prover): jwt token expired bug (#736 ) Co-authored-by: colinlyguo <colinlyguo@scroll.io>	2023-08-06 19:56:16 +08:00
HAOYUatHZ	11fac0330f	feat(coordinator): add log to valid proof result (#734 )	2023-08-06 17:36:02 +08:00
Xi Lin	e2185ffe20	refactor(contracts): OZ-L1-L03 Code Redundancy, OZ-L1-N15 Unused Imports and OZ-L2-N02 Unused Imports (#698 ) Co-authored-by: Péter Garamvölgyi <peter@scroll.io>	2023-08-06 10:21:18 +02:00
ChuhanJin	b0628b67ee	fix(bridge-history-api): fix txhashes api error (#732 ) Co-authored-by: Péter Garamvölgyi <peter@scroll.io>	2023-08-06 09:51:37 +02:00
Xi Lin	bb0a0d0d09	feat(contracts): better access control of the ScrollChain (#700 ) Co-authored-by: Péter Garamvölgyi <peter@scroll.io>	2023-08-06 09:43:39 +02:00
Péter Garamvölgyi	b977e5a62f	fix: handle importGenesisBatch in bridge-history calldata decoder (#731 )	2023-08-06 07:41:29 +02:00
Péter Garamvölgyi	1b77f9044a	fix(bridge-history): do not fail if all proofs in DB are empty (#730 )	2023-08-06 06:48:22 +02:00
Péter Garamvölgyi	46adbc7c0c	fix: update ScrollChain ABI (#729 )	2023-08-06 05:39:36 +02:00
HAOYUatHZ	9ee65119d8	feat(prover): make l2gethClient optional for batch_prover (#724 ) Co-authored-by: colinlyguo <colinlyguo@scroll.io> Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com> Co-authored-by: Péter Garamvölgyi <peter@scroll.io>	2023-08-06 04:26:27 +02:00
colin	fb1c800532	fix(coordinator & prover): bug fixes (#727 ) Co-authored-by: georgehao <haohongfan@gmail.com>	2023-08-06 04:11:47 +02:00
Steven	2baad2ecad	fix: upgrade libzkp with scroll-prover `v0.5.3` (#728 )	2023-08-06 06:14:59 +08:00
ChuhanJin	bdf2968771	fix(bridge-history-api): Fix cors (#726 )	2023-08-05 13:55:30 +02:00
Steven	4d09e13b0c	feat: upgrade libzkp to `v0.5.2` (#725 )	2023-08-05 19:29:26 +08:00
georgehao	a98a2ff4b5	feat(coordinator): fix login replay attack (#723 ) Co-authored-by: Péter Garamvölgyi <peter@scroll.io> Co-authored-by: colinlyguo <colinlyguo@scroll.io>	2023-08-05 10:58:59 +02:00
colin	2a0c7ae6b5	refactor(coordinator & prover): RESTful API (#696 ) Co-authored-by: georgehao <haohongfan@gmail.com> Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>	2023-08-05 08:27:07 +02:00