tweak and bump version

Co-authored-by: colinlyguo <colinlyguo@scroll.io>

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

bridge-history-api/internal/route/route.go

@@ -15,7 +15,6 @@ 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,
 	}))

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(), Layer2Msg).First(&result).Error
+	err := c.db.WithContext(ctx).Model(&CrossMsg{}).Where("layer2_hash = ? AND msg_type = ?", l2Hash.String(), Layer1Msg).First(&result).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, nil

bridge-history-api/orm/l2_sent_msg.go

@@ -2,7 +2,6 @@ package orm
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
@@ -103,9 +102,6 @@ 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)
 	}

bridge-history-api/utils/utils.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"bytes"
 	"context"
 	"encoding/binary"
 	"errors"
@@ -75,14 +76,6 @@ 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{}
@@ -117,3 +110,48 @@ 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
+}

bridge-history-api/utils/utils_test.go

@@ -1,6 +1,7 @@
 package utils_test
 
 import (
+	"os"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -33,11 +34,31 @@ func TestGetBatchRangeFromCalldataV2(t *testing.T) {
 	assert.Equal(t, start, uint64(10))
 	assert.Equal(t, finish, uint64(20))
 	assert.Equal(t, batchIndex, uint64(2))
-
-	// genesis batch
-	batchIndex, start, finish, err = utils.GetBatchRangeFromCalldataV2(common.Hex2Bytes("3fdeecb200000000000000000000000000000000000000000000000000000000000000402dcb5308098d24a37fc1487a229fcedb09fa4343ede39cbad365bc925535bb09000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000c252bc9780c4d83cf11f14b8cd03c92c4d18ce07710ba836d31d12da216c8330000000000000000000000000000000000000000000000000000000000000000000000000000000"))
-	assert.NoError(t, err)
-	assert.Equal(t, start, uint64(0))
-	assert.Equal(t, finish, uint64(0))
-	assert.Equal(t, batchIndex, uint64(0))
+}
+
+func TestGetBatchRangeFromCalldataV1(t *testing.T) {
+	calldata, err := os.ReadFile("../testdata/commit-batches-0x3095e91db7ba4a6fbf4654d607db322e58ff5579c502219c8024acaea74cf311.txt")
+	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))
 }

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("2c32d4ae151744d0bf0b9464a3e897a1d17ed2f1af71f7c9a75f12ce0d28238f"))
-	assert.Equal(L1FinalizeBatchEventSignature, common.HexToHash("26ba82f907317eedc97d0cbef23de76a43dd6edb563bdb6e9407645b950a7a2d"))
+	assert.Equal(L1CommitBatchEventSignature, common.HexToHash("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
+	assert.Equal(L1FinalizeBatchEventSignature, common.HexToHash("9d3058a3cb9739a2527f22dd9a4138065844037d3004254952e2458d808cc364"))
 
 	assert.Equal(L1QueueTransactionEventSignature, common.HexToHash("69cfcb8e6d4192b8aba9902243912587f37e550d75c1fa801491fce26717f37e"))
 

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(uint256 indexed batchIndex, bytes32 indexed batchHash);
+  event CommitBatch(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(uint256 indexed batchIndex, bytes32 indexed batchHash, bytes32 stateRoot, bytes32 withdrawRoot);
+  event FinalizeBatch(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,17 +138,6 @@ 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)
@@ -180,29 +169,18 @@ contract MockBridgeL1 {
     }
     bytes32 _batchHash = BatchHeaderV0Codec.computeBatchHash(batchPtr, 89);
     committedBatches[0] = _batchHash;
-    emit CommitBatch(parentBatchIndex + 1, _batchHash);
+    emit CommitBatch(_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(batchIndex, _batchHash, postStateRoot, withdrawRoot);
+    emit FinalizeBatch(_batchHash, postStateRoot, withdrawRoot);
   }
 
   /**********************

common/cmd/cmd.go

@@ -83,9 +83,7 @@ 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(strings.ToLower(out), "error") ||
-		strings.Contains(strings.ToLower(out), "warning") ||
-		strings.Contains(strings.ToLower(out), "info") {
+	} 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{}) {

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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 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.3#337089ac40bac756d88b9ae30a3be1f82538b216"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.1#15aac6e1484a42f723098fbc9d8783f374e7e90a"
 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#12c306ec57849921e690221b10b8a08189868d4a"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#f8bdcbee60348e5c996c04f19ff30522e6b276b0"
 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#12c306ec57849921e690221b10b8a08189868d4a"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#f8bdcbee60348e5c996c04f19ff30522e6b276b0"
 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.3#337089ac40bac756d88b9ae30a3be1f82538b216"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.1#15aac6e1484a42f723098fbc9d8783f374e7e90a"
 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?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
  "array-init",
  "bus-mapping",

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.3" }
-types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.3" }
+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" }
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }
 
 log = "0.4"
@@ -33,6 +33,8 @@ once_cell = "1.8.0"
 
 [profile.test]
 opt-level = 3
+# debug-assertions = true
 
 [profile.release]
 opt-level = 3
+# debug-assertions = true

common/types/message/message.go

@@ -33,7 +33,7 @@ func (r ProofType) String() string {
 	case ProofTypeBatch:
 		return "proof type batch"
 	default:
-		return fmt.Sprintf("illegal proof type: %d", r)
+		return "illegal proof type"
 	}
 }
 
@@ -60,8 +60,6 @@ type AuthMsg struct {
 type Identity struct {
 	// 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"`
 }

common/types/message/message_test.go

@@ -15,9 +15,8 @@ func TestAuthMessageSignAndVerify(t *testing.T) {
 
 	authMsg := &AuthMsg{
 		Identity: &Identity{
-			Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzgxNzUsIm9yaWdfaWF0IjoxNjkxMDM0NTc1fQ.HybBMsEJFhyZqtIa2iVcHUP7CEFttf708jmTMAImAWA",
-			ProverName:    "test",
-			ProverVersion: "v1.0.0",
+			Challenge:  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzgxNzUsIm9yaWdfaWF0IjoxNjkxMDM0NTc1fQ.HybBMsEJFhyZqtIa2iVcHUP7CEFttf708jmTMAImAWA",
+			ProverName: "test",
 		},
 	}
 	assert.NoError(t, authMsg.SignWithKey(privkey))
@@ -46,15 +45,14 @@ func TestGenerateToken(t *testing.T) {
 
 func TestIdentityHash(t *testing.T) {
 	identity := &Identity{
-		Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzM0MTksIm9yaWdfaWF0IjoxNjkxMDI5ODE5fQ.EhkLZsj__rNPVC3ZDYBtvdh0nB8mmM_Hl82hObaIWOs",
-		ProverName:    "test",
-		ProverVersion: "v1.0.0",
+		Challenge:  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzM0MTksIm9yaWdfaWF0IjoxNjkxMDI5ODE5fQ.EhkLZsj__rNPVC3ZDYBtvdh0nB8mmM_Hl82hObaIWOs",
+		ProverName: "test",
 	}
 
 	hash, err := identity.Hash()
 	assert.NoError(t, err)
 
-	expectedHash := "83f5e0ad023e9c1de639ab07b9b4cb972ec9dbbd2524794c533a420a5b137721"
+	expectedHash := "7373bb57ab7c01307d86fec55e088e00c526d82d9d1303fa4a189ff6ea95fbe2"
 	assert.Equal(t, expectedHash, hex.EncodeToString(hash))
 }
 
@@ -118,7 +116,7 @@ func TestProveTypeString(t *testing.T) {
 	assert.Equal(t, "proof type batch", proofTypeBatch.String())
 
 	illegalProof := ProofType(3)
-	assert.Equal(t, "illegal proof type: 3", illegalProof.String())
+	assert.Equal(t, "illegal proof type", illegalProof.String())
 }
 
 func TestProofMsgPublicKey(t *testing.T) {

common/version/version.go

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

contracts/docs/apis/L1StandardERC20Gateway.md

@@ -214,34 +214,6 @@ 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
@@ -259,22 +231,6 @@ 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
@@ -337,23 +293,6 @@ 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

contracts/docs/apis/L1WETHGateway.md

@@ -212,34 +212,6 @@ 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
@@ -257,22 +229,6 @@ 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
@@ -335,23 +291,6 @@ 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

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) external nonpayable
+function initialize(address _counterpart, address _feeVault) external nonpayable
 ```
 
 
@@ -59,6 +59,7 @@ function initialize(address _counterpart) external nonpayable
 | Name | Type | Description |
 |---|---|---|
 | _counterpart | address | undefined |
+| _feeVault | address | undefined |
 
 ### isL1MessageExecuted
 

contracts/docs/apis/L2StandardERC20Gateway.md

@@ -128,34 +128,6 @@ 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
@@ -190,22 +162,6 @@ 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
@@ -304,23 +260,6 @@ 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

contracts/docs/apis/L2WETHGateway.md

@@ -161,34 +161,6 @@ 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
@@ -206,22 +178,6 @@ 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
@@ -320,23 +276,6 @@ 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

contracts/integration-test/ScrollChain.spec.ts

@@ -1,6 +1,7 @@
 /* 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";
 
@@ -27,7 +28,7 @@ describe("ScrollChain", async () => {
     await chain.deployed();
 
     await chain.initialize(queue.address, constants.AddressZero, 44);
-    await chain.addSequencer(deployer.address);
+    await chain.updateSequencer(deployer.address, true);
     await queue.initialize(
       constants.AddressZero,
       chain.address,

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).addSequencer(L1_ROLLUP_OPERATOR_ADDR);
-        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).addProver(L1_ROLLUP_OPERATOR_ADDR);
+        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).updateSequencer(L1_ROLLUP_OPERATOR_ADDR, true);
+        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).updateProver(L1_ROLLUP_OPERATOR_ADDR, true);
 
         // initialize L2GasPriceOracle
         L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).initialize(

contracts/scripts/foundry/InitializeL2BridgeContracts.s.sol

@@ -65,7 +65,10 @@ 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);
+        L2ScrollMessenger(payable(L2_SCROLL_MESSENGER_PROXY_ADDR)).initialize(
+            L1_SCROLL_MESSENGER_PROXY_ADDR,
+            L2_TX_FEE_VAULT_ADDR
+        );
 
         // initialize L2GatewayRouter
         L2GatewayRouter(L2_GATEWAY_ROUTER_PROXY_ADDR).initialize(

contracts/src/L1/L1ScrollMessenger.sol

@@ -2,12 +2,15 @@
 
 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";
@@ -25,7 +28,7 @@ import {IMessageDropCallback} from "../libraries/callbacks/IMessageDropCallback.
 ///
 /// @dev All deposited Ether (including `WETH` deposited throng `L1WETHGateway`) will locked in
 /// this contract.
-contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
+contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1ScrollMessenger {
     /***********
      * Structs *
      ***********/
@@ -94,7 +97,8 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
         address _rollup,
         address _messageQueue
     ) public initializer {
-        ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, _feeVault);
+        PausableUpgradeable.__Pausable_init();
+        ScrollMessengerBase._initialize(_counterpart, _feeVault);
 
         rollup = _rollup;
         messageQueue = _messageQueue;
@@ -291,6 +295,17 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
      * 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.

contracts/src/L1/gateways/L1CustomERC20Gateway.sol

@@ -2,6 +2,7 @@
 
 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 +18,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 L1ERC20Gateway {
+contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20Gateway {
     using SafeERC20Upgradeable for IERC20Upgradeable;
 
     /**********
@@ -55,6 +56,7 @@ contract L1CustomERC20Gateway is L1ERC20Gateway {
     ) external initializer {
         require(_router != address(0), "zero router address");
 
+        OwnableUpgradeable.__Ownable_init();
         ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
     }
 

contracts/src/L1/gateways/L1ERC1155Gateway.sol

@@ -2,6 +2,7 @@
 
 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";
 
@@ -19,7 +20,13 @@ 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 ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC1155Gateway, IMessageDropCallback {
+contract L1ERC1155Gateway is
+    OwnableUpgradeable,
+    ERC1155HolderUpgradeable,
+    ScrollGatewayBase,
+    IL1ERC1155Gateway,
+    IMessageDropCallback
+{
     /**********
      * Events *
      **********/
@@ -48,6 +55,7 @@ contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC
     /// @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();
 

contracts/src/L1/gateways/L1ERC20Gateway.sol

@@ -2,12 +2,14 @@
 
 pragma solidity ^0.8.16;
 
-import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.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";
@@ -17,7 +19,7 @@ import {IMessageDropCallback} from "../../libraries/callbacks/IMessageDropCallba
 // solhint-disable no-empty-blocks
 
 abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, ScrollGatewayBase {
-    using SafeERC20Upgradeable for IERC20Upgradeable;
+    using SafeERC20 for IERC20;
 
     /*************
      * Variables *
@@ -73,7 +75,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.
-        IERC20Upgradeable(_l1Token).safeTransfer(_to, _amount);
+        IERC20(_l1Token).safeTransfer(_to, _amount);
 
         _doCallback(_to, _data);
 
@@ -94,7 +96,7 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
         // do dome check for each custom gateway
         _beforeDropMessage(_token, _receiver, _amount);
 
-        IERC20Upgradeable(_token).safeTransfer(_receiver, _amount);
+        IERC20(_token).safeTransfer(_receiver, _amount);
 
         emit RefundERC20(_token, _receiver, _amount);
     }
@@ -152,9 +154,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 = IERC20Upgradeable(_token).balanceOf(address(this));
-            IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
-            uint256 _after = IERC20Upgradeable(_token).balanceOf(address(this));
+            uint256 _before = IERC20(_token).balanceOf(address(this));
+            IERC20(_token).safeTransferFrom(_from, address(this), _amount);
+            uint256 _after = IERC20(_token).balanceOf(address(this));
             // no unchecked here, since some weird token may return arbitrary balance.
             _amount = _after - _before;
         }

contracts/src/L1/gateways/L1ERC721Gateway.sol

@@ -2,6 +2,7 @@
 
 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";
 
@@ -19,7 +20,13 @@ 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 ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC721Gateway, IMessageDropCallback {
+contract L1ERC721Gateway is
+    OwnableUpgradeable,
+    ERC721HolderUpgradeable,
+    ScrollGatewayBase,
+    IL1ERC721Gateway,
+    IMessageDropCallback
+{
     /**********
      * Events *
      **********/
@@ -48,6 +55,7 @@ contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC72
     /// @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);

contracts/src/L1/gateways/L1ETHGateway.sol

@@ -2,6 +2,8 @@
 
 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";
@@ -16,7 +18,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 ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback {
+contract L1ETHGateway is Initializable, ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback {
     /***************
      * Constructor *
      ***************/

contracts/src/L1/gateways/L1GatewayRouter.sol

@@ -6,6 +6,8 @@ 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";

contracts/src/L1/gateways/L1StandardERC20Gateway.sol

@@ -2,9 +2,12 @@
 
 pragma solidity =0.8.16;
 
-import {ClonesUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
-import {IERC20MetadataUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
+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 {IERC20Metadata} from "../../interfaces/IERC20Metadata.sol";
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
@@ -18,7 +21,9 @@ 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 L1ERC20Gateway {
+contract L1StandardERC20Gateway is Initializable, ScrollGatewayBase, L1ERC20Gateway {
+    using SafeERC20 for IERC20;
+
     /*************
      * Variables *
      *************/
@@ -76,7 +81,7 @@ contract L1StandardERC20Gateway is L1ERC20Gateway {
         // we can calculate the l2 address directly.
         bytes32 _salt = keccak256(abi.encodePacked(counterpart, keccak256(abi.encodePacked(_l1Token))));
 
-        return ClonesUpgradeable.predictDeterministicAddress(l2TokenImplementation, _salt, l2TokenFactory);
+        return Clones.predictDeterministicAddress(l2TokenImplementation, _salt, l2TokenFactory);
     }
 
     /**********************
@@ -138,9 +143,9 @@ contract L1StandardERC20Gateway is L1ERC20Gateway {
             _l2Token = getL2ERC20Address(_token);
 
             // passing symbol/name/decimal in order to deploy in L2.
-            string memory _symbol = IERC20MetadataUpgradeable(_token).symbol();
-            string memory _name = IERC20MetadataUpgradeable(_token).name();
-            uint8 _decimals = IERC20MetadataUpgradeable(_token).decimals();
+            string memory _symbol = IERC20Metadata(_token).symbol();
+            string memory _name = IERC20Metadata(_token).name();
+            uint8 _decimals = IERC20Metadata(_token).decimals();
             _l2Data = abi.encode(true, abi.encode(_data, abi.encode(_symbol, _name, _decimals)));
         } else {
             _l2Data = abi.encode(false, _data);

contracts/src/L1/gateways/L1WETHGateway.sol

@@ -2,6 +2,10 @@
 
 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";
@@ -17,7 +21,9 @@ 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 L1ERC20Gateway {
+contract L1WETHGateway is Initializable, ScrollGatewayBase, L1ERC20Gateway {
+    using SafeERC20 for IERC20;
+
     /*************
      * Constants *
      *************/

contracts/src/L1/rollup/ScrollChain.sol

@@ -3,7 +3,6 @@
 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";
@@ -16,7 +15,7 @@ import {IRollupVerifier} from "../../libraries/verifier/IRollupVerifier.sol";
 
 /// @title ScrollChain
 /// @notice This contract maintains data for the Scroll rollup.
-contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
+contract ScrollChain is OwnableUpgradeable, IScrollChain {
     /**********
      * Events *
      **********/
@@ -166,7 +165,7 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
         bytes calldata _parentBatchHeader,
         bytes[] memory _chunks,
         bytes calldata _skippedL1MessageBitmap
-    ) external override OnlySequencer whenNotPaused {
+    ) external override OnlySequencer {
         require(_version == 0, "invalid version");
 
         // check whether the batch is empty
@@ -292,7 +291,7 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
         bytes32 _postStateRoot,
         bytes32 _withdrawRoot,
         bytes calldata _aggrProof
-    ) external override OnlyProver whenNotPaused {
+    ) external override OnlyProver {
         require(_prevStateRoot != bytes32(0), "previous state root is zero");
         require(_postStateRoot != bytes32(0), "new state root is zero");
 
@@ -356,36 +355,24 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
      * Restricted Functions *
      ************************/
 
-    /// @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;
+    /// @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;
 
-        emit UpdateSequencer(_account, true);
+        emit UpdateSequencer(_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;
+    /// @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;
 
-        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);
+        emit UpdateProver(_account, _status);
     }
 
     /// @notice Update the address verifier contract.
@@ -406,16 +393,6 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, 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 *
      **********************/

contracts/src/L2/L2ScrollMessenger.sol

@@ -2,8 +2,12 @@
 
 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";
@@ -22,7 +26,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, IL2ScrollMessenger {
+contract L2ScrollMessenger is ScrollMessengerBase, PausableUpgradeable, IL2ScrollMessenger {
     /**********
      * Events *
      **********/
@@ -64,8 +68,9 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
         messageQueue = _messageQueue;
     }
 
-    function initialize(address _counterpart) external initializer {
-        ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, address(0));
+    function initialize(address _counterpart, address _feeVault) external initializer {
+        PausableUpgradeable.__Pausable_init();
+        ScrollMessengerBase._initialize(_counterpart, _feeVault);
 
         maxFailedExecutionTimes = 3;
     }
@@ -117,6 +122,17 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
      * 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.

contracts/src/L2/gateways/L2CustomERC20Gateway.sol

@@ -2,18 +2,21 @@
 
 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} from "../../libraries/gateway/ScrollGatewayBase.sol";
-import {IScrollERC20Upgradeable} from "../../libraries/token/IScrollERC20Upgradeable.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {IScrollERC20} from "../../libraries/token/IScrollERC20.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 L2ERC20Gateway {
+contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20Gateway {
     /**********
      * Events *
      **********/
@@ -44,6 +47,7 @@ contract L2CustomERC20Gateway is L2ERC20Gateway {
         address _messenger
     ) external initializer {
         require(_router != address(0), "zero router address");
+        OwnableUpgradeable.__Ownable_init();
 
         ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
     }
@@ -79,7 +83,7 @@ contract L2CustomERC20Gateway is L2ERC20Gateway {
         require(_l1Token != address(0), "token address cannot be 0");
         require(_l1Token == tokenMapping[_l2Token], "l1 token mismatch");
 
-        IScrollERC20Upgradeable(_l2Token).mint(_to, _amount);
+        IScrollERC20(_l2Token).mint(_to, _amount);
 
         _doCallback(_to, _data);
 
@@ -125,7 +129,7 @@ contract L2CustomERC20Gateway is L2ERC20Gateway {
         }
 
         // 2. Burn token.
-        IScrollERC20Upgradeable(_token).burn(_from, _amount);
+        IScrollERC20(_token).burn(_from, _amount);
 
         // 3. Generate message passed to L1StandardERC20Gateway.
         bytes memory _message = abi.encodeCall(

contracts/src/L2/gateways/L2ERC1155Gateway.sol

@@ -2,12 +2,14 @@
 
 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} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
 import {IScrollERC1155} from "../../libraries/token/IScrollERC1155.sol";
 
 /// @title L2ERC1155Gateway
@@ -17,7 +19,7 @@ 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 ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC1155Gateway {
+contract L2ERC1155Gateway is OwnableUpgradeable, ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC1155Gateway {
     /**********
      * Events *
      **********/
@@ -43,6 +45,7 @@ contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC
     }
 
     function initialize(address _counterpart, address _messenger) external initializer {
+        OwnableUpgradeable.__Ownable_init();
         ERC1155HolderUpgradeable.__ERC1155Holder_init();
         ERC1155ReceiverUpgradeable.__ERC1155Receiver_init();
 

contracts/src/L2/gateways/L2ERC20Gateway.sol

@@ -4,11 +4,9 @@ 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 ScrollGatewayBase, IL2ERC20Gateway {
+abstract contract L2ERC20Gateway is IL2ERC20Gateway {
     /*************
      * Variables *
      *************/

contracts/src/L2/gateways/L2ERC721Gateway.sol

@@ -2,12 +2,14 @@
 
 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} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
 import {IScrollERC721} from "../../libraries/token/IScrollERC721.sol";
 
 /// @title L2ERC721Gateway
@@ -17,7 +19,7 @@ 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 ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC721Gateway {
+contract L2ERC721Gateway is OwnableUpgradeable, ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC721Gateway {
     /**********
      * Events *
      **********/
@@ -43,6 +45,7 @@ contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC72
     }
 
     function initialize(address _counterpart, address _messenger) external initializer {
+        OwnableUpgradeable.__Ownable_init();
         ERC721HolderUpgradeable.__ERC721Holder_init();
 
         ScrollGatewayBase._initialize(_counterpart, address(0), _messenger);

contracts/src/L2/gateways/L2ETHGateway.sol

@@ -2,6 +2,8 @@
 
 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";
@@ -13,7 +15,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 ScrollGatewayBase, IL2ETHGateway {
+contract L2ETHGateway is Initializable, ScrollGatewayBase, IL2ETHGateway {
     /***************
      * Constructor *
      ***************/

contracts/src/L2/gateways/L2GatewayRouter.sol

@@ -7,6 +7,9 @@ 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.

contracts/src/L2/gateways/L2StandardERC20Gateway.sol

@@ -2,15 +2,18 @@
 
 pragma solidity =0.8.16;
 
-import {AddressUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
+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 {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {IScrollERC20Upgradeable} from "../../libraries/token/IScrollERC20Upgradeable.sol";
+import {IScrollERC20} from "../../libraries/token/IScrollERC20.sol";
 import {ScrollStandardERC20} from "../../libraries/token/ScrollStandardERC20.sol";
 import {IScrollStandardERC20Factory} from "../../libraries/token/IScrollStandardERC20Factory.sol";
-import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
 
 /// @title L2StandardERC20Gateway
 /// @notice The `L2StandardERC20Gateway` is used to withdraw standard ERC20 tokens on layer 2 and
@@ -18,8 +21,9 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// @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 L2ERC20Gateway {
-    using AddressUpgradeable for address;
+contract L2StandardERC20Gateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
+    using SafeERC20 for IERC20;
+    using Address for address;
 
     /*************
      * Variables *
@@ -110,7 +114,7 @@ contract L2StandardERC20Gateway is L2ERC20Gateway {
             _deployL2Token(_deployData, _l1Token);
         }
 
-        IScrollERC20Upgradeable(_l2Token).mint(_to, _amount);
+        IScrollERC20(_l2Token).mint(_to, _amount);
 
         _doCallback(_to, _callData);
 
@@ -141,7 +145,7 @@ contract L2StandardERC20Gateway is L2ERC20Gateway {
         require(_l1Token != address(0), "no corresponding l1 token");
 
         // 2. Burn token.
-        IScrollERC20Upgradeable(_token).burn(_from, _amount);
+        IScrollERC20(_token).burn(_from, _amount);
 
         // 3. Generate message passed to L1StandardERC20Gateway.
         bytes memory _message = abi.encodeCall(

contracts/src/L2/gateways/L2WETHGateway.sol

@@ -2,14 +2,15 @@
 
 pragma solidity =0.8.16;
 
-import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
+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 {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} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
 
 /// @title L2WETHGateway
 /// @notice The `L2WETHGateway` contract is used to withdraw `WETH` token on layer 2 and
@@ -18,8 +19,8 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// 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 L2ERC20Gateway {
-    using SafeERC20Upgradeable for IERC20Upgradeable;
+contract L2WETHGateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
+    using SafeERC20 for IERC20;
 
     /*************
      * Constants *
@@ -88,7 +89,7 @@ contract L2WETHGateway is L2ERC20Gateway {
         require(_amount == msg.value, "msg.value mismatch");
 
         IWETH(_l2Token).deposit{value: _amount}();
-        IERC20Upgradeable(_l2Token).safeTransfer(_to, _amount);
+        IERC20(_l2Token).safeTransfer(_to, _amount);
 
         _doCallback(_to, _data);
 
@@ -117,7 +118,7 @@ contract L2WETHGateway is L2ERC20Gateway {
         }
 
         // 2. Transfer token into this contract.
-        IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
+        IERC20(_token).safeTransferFrom(_from, address(this), _amount);
         IWETH(_token).withdraw(_amount);
 
         // 3. Generate message passed to L2StandardERC20Gateway.

contracts/src/L2/gateways/usdc/L2USDCGateway.sol

@@ -2,6 +2,7 @@
 
 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";
 
@@ -16,7 +17,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 L2ERC20Gateway {
+contract L2USDCGateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20Gateway {
     using SafeERC20Upgradeable for IERC20Upgradeable;
 
     /*************
@@ -55,6 +56,8 @@ contract L2USDCGateway is L2ERC20Gateway {
     ) external initializer {
         require(_router != address(0), "zero router address");
         ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
+
+        OwnableUpgradeable.__Ownable_init();
     }
 
     /*************************

contracts/src/L2/predeploys/L1GasPriceOracle.sol

@@ -5,6 +5,7 @@ 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 {

contracts/src/interfaces/IERC20Metadata.sol

@@ -0,0 +1,11 @@
+// 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);
+}

contracts/src/libraries/ScrollMessengerBase.sol

@@ -3,20 +3,13 @@
 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,
-    PausableUpgradeable,
-    ReentrancyGuardUpgradeable,
-    IScrollMessenger
-{
+abstract contract ScrollMessengerBase is OwnableUpgradeable, IScrollMessenger {
     /**********
      * Events *
      **********/
@@ -26,6 +19,14 @@ abstract contract ScrollMessengerBase is
     /// @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 *
      *************/
@@ -39,13 +40,31 @@ abstract contract ScrollMessengerBase is
     /// @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[47] private __gap;
+    uint256[46] 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,
@@ -58,18 +77,14 @@ abstract contract ScrollMessengerBase is
      * Constructor *
      ***************/
 
-    function __ScrollMessengerBase_init(address _counterpart, address _feeVault) internal onlyInitializing {
+    function _initialize(address _counterpart, address _feeVault) internal {
         OwnableUpgradeable.__Ownable_init();
-        PausableUpgradeable.__Pausable_init();
-        ReentrancyGuardUpgradeable.__ReentrancyGuard_init();
 
         // initialize to a nonzero value
         xDomainMessageSender = ScrollConstants.DEFAULT_XDOMAIN_MESSAGE_SENDER;
 
         counterpart = _counterpart;
-        if (_feeVault != address(0)) {
-            feeVault = _feeVault;
-        }
+        feeVault = _feeVault;
     }
 
     // make sure only owner can send ether to messenger to avoid possible user fund loss.
@@ -89,17 +104,6 @@ abstract contract ScrollMessengerBase is
         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 *
      **********************/

contracts/src/libraries/gateway/ScrollGatewayBase.sol

@@ -2,15 +2,20 @@
 
 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 ReentrancyGuardUpgradeable, OwnableUpgradeable, IScrollGateway {
+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;
+
     /*************
      * Variables *
      *************/
@@ -24,13 +29,35 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
     /// @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[47] private __gap;
+    uint256[46] 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");
@@ -60,9 +87,6 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
         require(_counterpart != address(0), "zero counterpart address");
         require(_messenger != address(0), "zero messenger address");
 
-        ReentrancyGuardUpgradeable.__ReentrancyGuard_init();
-        OwnableUpgradeable.__Ownable_init();
-
         counterpart = _counterpart;
         messenger = _messenger;
 
@@ -70,6 +94,9 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
         if (_router != address(0)) {
             router = _router;
         }
+
+        // for reentrancy guard
+        _status = _NOT_ENTERED;
     }
 
     /**********************

contracts/src/libraries/token/ScrollStandardERC20.sol

@@ -76,7 +76,12 @@ contract ScrollStandardERC20 is ERC20PermitUpgradeable, IScrollERC20Upgradeable
     }
 
     function isContract(address _addr) private view returns (bool hasCode) {
-        hasCode = _addr.code.length > 0;
+        uint256 length;
+        // solhint-disable-next-line no-inline-assembly
+        assembly {
+            length := extcodesize(_addr)
+        }
+        return length > 0;
     }
 
     /// @inheritdoc IScrollERC20Upgradeable

contracts/src/test/L1GatewayTestBase.t.sol

@@ -101,8 +101,8 @@ abstract contract L1GatewayTestBase is DSTestPlus {
     }
 
     function prepareL2MessageRoot(bytes32 messageHash) internal {
-        rollup.addSequencer(address(this));
-        rollup.addProver(address(this));
+        rollup.updateSequencer(address(this), true);
+        rollup.updateProver(address(this), true);
 
         // import genesis batch
         bytes memory batchHeader0 = new bytes(89);

contracts/src/test/L2GatewayTestBase.t.sol

@@ -58,7 +58,7 @@ abstract contract L2GatewayTestBase is DSTestPlus {
         );
 
         // Initialize L2 contracts
-        l2Messenger.initialize(address(l1Messenger));
+        l2Messenger.initialize(address(l1Messenger), feeVault);
         l2MessageQueue.initialize(address(l2Messenger));
         l1GasOracle.updateWhitelist(address(whitelist));
 

contracts/src/test/L2ScrollMessenger.t.sol

@@ -40,7 +40,7 @@ contract L2ScrollMessengerTest is DSTestPlus {
         );
 
         // Initialize L2 contracts
-        l2Messenger.initialize(address(l1Messenger));
+        l2Messenger.initialize(address(l1Messenger), feeVault);
         l2MessageQueue.initialize(address(l2Messenger));
         l1GasOracle.updateWhitelist(address(whitelist));
     }

contracts/src/test/ScrollChain.t.sol

@@ -62,7 +62,7 @@ contract ScrollChainTest is DSTestPlus {
         hevm.expectRevert("caller not sequencer");
         rollup.commitBatch(0, batchHeader0, new bytes[](0), new bytes(0));
 
-        rollup.addSequencer(address(this));
+        rollup.updateSequencer(address(this), true);
 
         // 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.addProver(address(this));
-        rollup.addSequencer(address(this));
+        rollup.updateProver(address(this), true);
+        rollup.updateSequencer(address(this), true);
 
         bytes memory batchHeader0 = new bytes(89);
 
@@ -218,8 +218,8 @@ contract ScrollChainTest is DSTestPlus {
     }
 
     function testCommitAndFinalizeWithL1Messages() public {
-        rollup.addSequencer(address(this));
-        rollup.addProver(address(this));
+        rollup.updateSequencer(address(this), true);
+        rollup.updateProver(address(this), true);
 
         // 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.addSequencer(address(this));
+        rollup.updateSequencer(address(this), true);
 
         bytes memory batchHeader0 = new bytes(89);
 
@@ -518,13 +518,11 @@ contract ScrollChainTest is DSTestPlus {
         assertEq(uint256(rollup.committedBatches(2)), 0);
     }
 
-    function testAddAndRemoveSequencer(address _sequencer) public {
+    function testUpdateSequencer(address _sequencer) public {
         // set by non-owner, should revert
         hevm.startPrank(address(1));
         hevm.expectRevert("Ownable: caller is not the owner");
-        rollup.addSequencer(_sequencer);
-        hevm.expectRevert("Ownable: caller is not the owner");
-        rollup.removeSequencer(_sequencer);
+        rollup.updateSequencer(_sequencer, true);
         hevm.stopPrank();
 
         // change to random operator
@@ -532,22 +530,20 @@ contract ScrollChainTest is DSTestPlus {
         emit UpdateSequencer(_sequencer, true);
 
         assertBoolEq(rollup.isSequencer(_sequencer), false);
-        rollup.addSequencer(_sequencer);
+        rollup.updateSequencer(_sequencer, true);
         assertBoolEq(rollup.isSequencer(_sequencer), true);
 
         hevm.expectEmit(true, false, false, true);
         emit UpdateSequencer(_sequencer, false);
-        rollup.removeSequencer(_sequencer);
+        rollup.updateSequencer(_sequencer, false);
         assertBoolEq(rollup.isSequencer(_sequencer), false);
     }
 
-    function testAddAndRemoveProver(address _prover) public {
+    function testUpdateProver(address _prover) public {
         // set by non-owner, should revert
         hevm.startPrank(address(1));
         hevm.expectRevert("Ownable: caller is not the owner");
-        rollup.addProver(_prover);
-        hevm.expectRevert("Ownable: caller is not the owner");
-        rollup.removeProver(_prover);
+        rollup.updateProver(_prover, true);
         hevm.stopPrank();
 
         // change to random operator
@@ -555,39 +551,15 @@ contract ScrollChainTest is DSTestPlus {
         emit UpdateProver(_prover, true);
 
         assertBoolEq(rollup.isProver(_prover), false);
-        rollup.addProver(_prover);
+        rollup.updateProver(_prover, true);
         assertBoolEq(rollup.isProver(_prover), true);
 
         hevm.expectEmit(true, false, false, true);
         emit UpdateProver(_prover, false);
-        rollup.removeProver(_prover);
+        rollup.updateProver(_prover, false);
         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));

coordinator/cmd/app/mock_app.go

@@ -81,16 +81,12 @@ func (c *CoordinatorApp) MockConfig(store bool) error {
 	}
 	// Reset prover manager config for manager test cases.
 	cfg.ProverManager = &coordinatorConfig.ProverManager{
-		ProversPerSession:  1,
-		Verifier:           &coordinatorConfig.VerifierConfig{MockMode: true},
-		CollectionTimeSec:  60,
-		SessionAttempts:    10,
-		MaxVerifierWorkers: 4,
+		ProversPerSession: 1,
+		Verifier:          &coordinatorConfig.VerifierConfig{MockMode: true},
+		CollectionTimeSec: 60,
 	}
 	cfg.DB.DSN = base.DBImg.Endpoint()
 	cfg.L2.ChainID = 111
-	cfg.Auth.ChallengeExpireDurationSec = 1
-	cfg.Auth.LoginExpireDurationSec = 1
 	c.Config = cfg
 
 	if !store {

coordinator/conf/config.json

@@ -1,14 +1,14 @@
 {
   "prover_manager": {
     "provers_per_session": 1,
-    "session_attempts": 5,
+    "session_attempts": 2,
     "collection_time_sec": 180,
     "verifier": {
       "mock_mode": true,
       "params_path": "",
       "assets_path": ""
     },
-    "max_verifier_workers": 4
+    "max_verifier_workers": 10
   },
   "db": {
     "driver_name": "postgres",
@@ -21,7 +21,7 @@
   },
   "auth": {
     "secret": "prover secret key",
-    "challenge_expire_duration_sec": 10,
+    "challenge_expire_duration_sec": 3600,
     "login_expire_duration_sec": 3600
   }
 }

coordinator/internal/config/config.go

@@ -16,7 +16,7 @@ type ProverManager struct {
 	// Currently we only consider proving timeout as failure here.
 	SessionAttempts uint8 `json:"session_attempts"`
 	// Zk verifier config.
-	Verifier *VerifierConfig `json:"verifier"`
+	Verifier *VerifierConfig `json:"verifier,omitempty"`
 	// Proof collection time (in seconds).
 	CollectionTimeSec int `json:"collection_time_sec"`
 	// Max number of workers in verifier worker pool
@@ -33,7 +33,7 @@ type L2 struct {
 type Auth struct {
 	Secret                     string `json:"secret"`
 	ChallengeExpireDurationSec int    `json:"challenge_expire_duration_sec"`
-	LoginExpireDurationSec     int    `json:"login_expire_duration_sec"`
+	LoginExpireDurationSec     int    `json:"token_expire_duration_sec"`
 }
 
 // Config load configuration items.

coordinator/internal/config/config_test.go

@@ -14,14 +14,14 @@ func TestConfig(t *testing.T) {
 	configTemplate := `{
 		"prover_manager": {
 			"provers_per_session": 1,
-			"session_attempts": 5,
+			"session_attempts": %d,
 			"collection_time_sec": 180,
 			"verifier": {
 				"mock_mode": true,
 				"params_path": "",
 				"agg_vk_path": ""
 			},
-			"max_verifier_workers": 4
+			"max_verifier_workers": %d
 		},
 		"db": {
 			"driver_name": "postgres",
@@ -46,7 +46,8 @@ func TestConfig(t *testing.T) {
 			assert.NoError(t, tmpFile.Close())
 			assert.NoError(t, os.Remove(tmpFile.Name()))
 		}()
-		_, err = tmpFile.WriteString(configTemplate)
+		config := fmt.Sprintf(configTemplate, defaultNumberOfSessionRetryAttempts, defaultNumberOfVerifierWorkers)
+		_, err = tmpFile.WriteString(config)
 		assert.NoError(t, err)
 
 		cfg, err := NewConfig(tmpFile.Name())
@@ -87,4 +88,36 @@ func TestConfig(t *testing.T) {
 		_, err = NewConfig(tmpFile.Name())
 		assert.Error(t, err)
 	})
+
+	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)
+		_, err = tmpFile.WriteString(config)
+		assert.NoError(t, err)
+
+		cfg, err := NewConfig(tmpFile.Name())
+		assert.NoError(t, err)
+		assert.Equal(t, defaultNumberOfVerifierWorkers, cfg.ProverManager.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)
+		_, err = tmpFile.WriteString(config)
+		assert.NoError(t, err)
+
+		cfg, err := NewConfig(tmpFile.Name())
+		assert.NoError(t, err)
+		assert.Equal(t, uint8(defaultNumberOfSessionRetryAttempts), cfg.ProverManager.SessionAttempts)
+	})
 }

coordinator/internal/controller/api/auth.go

@@ -31,16 +31,8 @@ func (a *AuthController) Login(c *gin.Context) (interface{}, error) {
 	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 {
+	if err := a.loginLogic.InsertChallengeString(c, login.Signature); err != nil {
 		return "", fmt.Errorf("login insert challenge string failure:%w", err)
 	}
 	return login, nil
@@ -56,9 +48,8 @@ func (a *AuthController) PayloadFunc(data interface{}) jwt.MapClaims {
 	// recover the public key
 	authMsg := message.AuthMsg{
 		Identity: &message.Identity{
-			Challenge:     v.Message.Challenge,
-			ProverName:    v.Message.ProverName,
-			ProverVersion: v.Message.ProverVersion,
+			Challenge:  v.Message.Challenge,
+			ProverName: v.Message.ProverName,
 		},
 		Signature: v.Signature,
 	}
@@ -69,9 +60,8 @@ func (a *AuthController) PayloadFunc(data interface{}) jwt.MapClaims {
 	}
 
 	return jwt.MapClaims{
-		types.PublicKey:     publicKey,
-		types.ProverName:    v.Message.ProverName,
-		types.ProverVersion: v.Message.ProverVersion,
+		types.PublicKey:  publicKey,
+		types.ProverName: v.Message.ProverName,
 	}
 }
 
@@ -85,9 +75,5 @@ func (a *AuthController) IdentityHandler(c *gin.Context) interface{} {
 	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
 }

coordinator/internal/logic/auth/login.go

@@ -20,6 +20,6 @@ func NewLoginLogic(db *gorm.DB) *LoginLogic {
 }
 
 // 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)
+func (l *LoginLogic) InsertChallengeString(ctx *gin.Context, signature string) error {
+	return l.challengeOrm.InsertChallenge(ctx, signature)
 }

coordinator/internal/logic/submitproof/proof_receiver.go

@@ -87,7 +87,7 @@ func (m *ProofReceiverLogic) HandleZkProof(ctx *gin.Context, proofMsg *message.P
 		if errors.Is(err, ErrValidatorFailureProofMsgStatusNotOk) {
 			m.proofFailure(ctx, proofMsg.ID, pk, proofMsg.Type)
 		}
-		return err
+		return nil
 	}
 
 	proofTime := time.Since(proverTask.CreatedAt)
@@ -134,24 +134,23 @@ func (m *ProofReceiverLogic) HandleZkProof(ctx *gin.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)
 
 		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)
-
-		if verifyErr == nil {
-			verifyErr = fmt.Errorf("verification succeeded and it's an invalid proof")
-		}
-		return verifyErr
+		return nil
 	}
 
-	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)

coordinator/internal/orm/chunk.go

@@ -343,11 +343,8 @@ func (o *Chunk) UpdateBatchHashInRange(ctx context.Context, startIndex uint64, e
 
 // UpdateUnassignedChunkReturning update the unassigned batch which end_block_number <= height and return the update record
 func (o *Chunk) UpdateUnassignedChunkReturning(ctx context.Context, height, limit int) ([]*Chunk, error) {
-	if height <= 0 {
-		return nil, errors.New("Chunk.UpdateUnassignedBatchReturning error: height must be larger than zero")
-	}
 	if limit < 0 {
-		return nil, errors.New("Chunk.UpdateUnassignedBatchReturning error: limit must not be smaller than zero")
+		return nil, errors.New("limit must not be smaller than zero")
 	}
 	if limit == 0 {
 		return nil, nil

coordinator/internal/route/route.go

@@ -17,8 +17,6 @@ func Route(router *gin.Engine, cfg *config.Config) {
 func v1(router *gin.RouterGroup, conf *config.Config) {
 	r := router.Group("/v1")
 
-	r.GET("/health", api.HealthCheck.HealthCheck)
-
 	challengeMiddleware := middleware.ChallengeMiddleware(conf)
 	r.GET("/challenge", challengeMiddleware.LoginHandler)
 
@@ -28,6 +26,7 @@ func v1(router *gin.RouterGroup, conf *config.Config) {
 	// need jwt token api
 	r.Use(loginMiddleware.MiddlewareFunc())
 	{
+		r.GET("/healthz", api.HealthCheck.HealthCheck)
 		r.POST("/get_task", api.GetTask.GetTasks)
 		r.POST("/submit_proof", api.SubmitProof.SubmitProof)
 	}

coordinator/internal/types/auth.go

@@ -7,15 +7,12 @@ const (
 	PublicKey = "public_key"
 	// ProverName the prover name key for context
 	ProverName = "prover_name"
-	// ProverVersion the prover version for context
-	ProverVersion = "prover_version"
 )
 
 // Message the login message struct
 type Message struct {
-	Challenge     string `form:"challenge" json:"challenge" binding:"required"`
-	ProverVersion string `form:"prover_version" json:"prover_version" binding:"required"`
-	ProverName    string `form:"prover_name" json:"prover_name" binding:"required"`
+	Challenge  string `form:"challenge" json:"challenge" binding:"required"`
+	ProverName string `form:"prover_name" json:"prover_name" binding:"required"`
 }
 
 // LoginParameter for /login api

coordinator/internal/types/get_task.go

@@ -2,8 +2,9 @@ package types
 
 // GetTaskParameter for ProverTasks request parameter
 type GetTaskParameter struct {
-	ProverHeight int `form:"prover_height" json:"prover_height"`
-	TaskType     int `form:"task_type" json:"task_type"`
+	ProverVersion string `form:"prover_version" json:"prover_version" binding:"required"`
+	ProverHeight  int    `form:"prover_height" json:"prover_height" binding:"required"`
+	TaskType      int    `form:"task_type" json:"task_type"`
 }
 
 // GetTaskSchema the schema data return to prover for get prover task

coordinator/internal/types/provers_info.go

@@ -0,0 +1,21 @@
+package types
+
+import (
+	"scroll-tech/common/types"
+	"scroll-tech/common/types/message"
+)
+
+// ProversInfo is assigned provers info of a task (session)
+type ProversInfo struct {
+	ID               string            `json:"id"`
+	ProverStatusList []*ProverStatus   `json:"provers"`
+	StartTimestamp   int64             `json:"start_timestamp"`
+	ProveType        message.ProofType `json:"prove_type,omitempty"`
+}
+
+// ProverStatus is the prover name and prover prove status
+type ProverStatus struct {
+	PublicKey string                  `json:"public_key"`
+	Name      string                  `json:"name"`
+	Status    types.ProverProveStatus `json:"status"`
+}

coordinator/test/api_test.go

@@ -101,8 +101,6 @@ func setupCoordinator(t *testing.T, proversPerSession uint8, coordinatorURL stri
 			assert.NoError(t, runErr)
 		}
 	}()
-	time.Sleep(time.Second * 2)
-
 	return proofCollector, srv
 }
 
@@ -172,7 +170,9 @@ func testHandshake(t *testing.T) {
 	}()
 
 	chunkProver := newMockProver(t, "prover_chunk_test", coordinatorURL, message.ProofTypeChunk)
-	assert.True(t, chunkProver.healthCheckSuccess(t))
+	token := chunkProver.connectToCoordinator(t)
+	assert.NotEmpty(t, token)
+	assert.True(t, chunkProver.healthCheck(t, token, types.Success))
 }
 
 func testFailedHandshake(t *testing.T) {
@@ -181,17 +181,21 @@ func testFailedHandshake(t *testing.T) {
 	proofCollector, httpHandler := setupCoordinator(t, 1, coordinatorURL)
 	defer func() {
 		proofCollector.Stop()
+		assert.NoError(t, httpHandler.Shutdown(context.Background()))
 	}()
 
 	// Try to perform handshake without token
 	chunkProver := newMockProver(t, "prover_chunk_test", coordinatorURL, message.ProofTypeChunk)
-	assert.True(t, chunkProver.healthCheckSuccess(t))
+	token := chunkProver.connectToCoordinator(t)
+	assert.NotEmpty(t, token)
+	assert.True(t, chunkProver.healthCheck(t, token, types.Success))
 
-	// Try to perform handshake with server shutdown
-	assert.NoError(t, httpHandler.Shutdown(context.Background()))
-	time.Sleep(time.Second)
+	// Try to perform handshake with timeouted token
 	batchProver := newMockProver(t, "prover_batch_test", coordinatorURL, message.ProofTypeBatch)
-	assert.True(t, batchProver.healthCheckFailure(t))
+	token = chunkProver.connectToCoordinator(t)
+	assert.NotEmpty(t, token)
+	<-time.After(time.Duration(tokenTimeout+1) * time.Second)
+	assert.True(t, batchProver.healthCheck(t, token, types.ErrJWTTokenExpired))
 }
 
 func testValidProof(t *testing.T) {
@@ -231,7 +235,7 @@ func testValidProof(t *testing.T) {
 		}
 		proverTask := provers[i].getProverTask(t, proofType)
 		assert.NotNil(t, proverTask)
-		provers[i].submitProof(t, proverTask, proofStatus, types.Success)
+		provers[i].submitProof(t, proverTask, proofStatus)
 	}
 
 	// verify proof status
@@ -292,7 +296,7 @@ func testInvalidProof(t *testing.T) {
 		provers[i] = newMockProver(t, "prover_test"+strconv.Itoa(i), coordinatorURL, proofType)
 		proverTask := provers[i].getProverTask(t, proofType)
 		assert.NotNil(t, proverTask)
-		provers[i].submitProof(t, proverTask, verifiedFailed, types.ErrCoordinatorHandleZkProofFailure)
+		provers[i].submitProof(t, proverTask, verifiedFailed)
 	}
 
 	// verify proof status
@@ -353,7 +357,7 @@ func testProofGeneratedFailed(t *testing.T) {
 		provers[i] = newMockProver(t, "prover_test"+strconv.Itoa(i), coordinatorURL, proofType)
 		proverTask := provers[i].getProverTask(t, proofType)
 		assert.NotNil(t, proverTask)
-		provers[i].submitProof(t, proverTask, generatedFailed, types.ErrCoordinatorHandleZkProofFailure)
+		provers[i].submitProof(t, proverTask, generatedFailed)
 	}
 
 	// verify proof status
@@ -427,12 +431,12 @@ func testTimeoutProof(t *testing.T) {
 	chunkProver2 := newMockProver(t, "prover_test"+strconv.Itoa(2), coordinatorURL, message.ProofTypeChunk)
 	proverChunkTask2 := chunkProver2.getProverTask(t, message.ProofTypeChunk)
 	assert.NotNil(t, proverChunkTask2)
-	chunkProver2.submitProof(t, proverChunkTask2, verifiedSuccess, types.Success)
+	chunkProver2.submitProof(t, proverChunkTask2, verifiedSuccess)
 
 	batchProver2 := newMockProver(t, "prover_test"+strconv.Itoa(3), coordinatorURL, message.ProofTypeBatch)
 	proverBatchTask2 := batchProver2.getProverTask(t, message.ProofTypeBatch)
 	assert.NotNil(t, proverBatchTask2)
-	batchProver2.submitProof(t, proverBatchTask2, verifiedSuccess, types.Success)
+	batchProver2.submitProof(t, proverBatchTask2, verifiedSuccess)
 
 	// verify proof status, it should be verified now, because second prover sent valid proof
 	chunkProofStatus2, err := chunkOrm.GetProvingStatusByHash(context.Background(), dbChunk.Hash)

coordinator/test/mock_prover.go

@@ -76,15 +76,14 @@ func (r *mockProver) challenge(t *testing.T) string {
 func (r *mockProver) login(t *testing.T, challengeString string) string {
 	authMsg := message.AuthMsg{
 		Identity: &message.Identity{
-			Challenge:     challengeString,
-			ProverName:    "test",
-			ProverVersion: "v1.0.0",
+			Challenge:  challengeString,
+			ProverName: "test",
 		},
 	}
 	assert.NoError(t, authMsg.SignWithKey(r.privKey))
 
-	body := fmt.Sprintf("{\"message\":{\"challenge\":\"%s\",\"prover_name\":\"%s\", \"prover_version\":\"%s\"},\"signature\":\"%s\"}",
-		authMsg.Identity.Challenge, authMsg.Identity.ProverName, authMsg.Identity.ProverVersion, authMsg.Signature)
+	body := fmt.Sprintf("{\"message\":{\"challenge\":\"%s\",\"prover_name\":\"%s\"},\"signature\":\"%s\"}",
+		authMsg.Identity.Challenge, authMsg.Identity.ProverName, authMsg.Signature)
 
 	var result types.Response
 	client := resty.New()
@@ -108,27 +107,17 @@ func (r *mockProver) login(t *testing.T, challengeString string) string {
 	return loginData.Token
 }
 
-func (r *mockProver) healthCheckSuccess(t *testing.T) bool {
+func (r *mockProver) healthCheck(t *testing.T, token string, errCode int) bool {
 	var result types.Response
 	client := resty.New()
 	resp, err := client.R().
+		SetHeader("Content-Type", "application/json").
+		SetHeader("Authorization", fmt.Sprintf("Bearer %s", token)).
 		SetResult(&result).
-		Get("http://" + r.coordinatorURL + "/coordinator/v1/health")
+		Get("http://" + r.coordinatorURL + "/coordinator/v1/healthz")
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, resp.StatusCode())
-	assert.Equal(t, ctypes.Success, result.ErrCode)
-	return true
-}
-
-func (r *mockProver) healthCheckFailure(t *testing.T) bool {
-	var result types.Response
-	client := resty.New()
-	resp, err := client.R().
-		SetResult(&result).
-		Get("http://" + r.coordinatorURL + "/coordinator/v1/health")
-	assert.Error(t, err)
-	assert.Equal(t, 0, resp.StatusCode())
-	assert.Equal(t, 0, result.ErrCode)
+	assert.Equal(t, errCode, result.ErrCode)
 	return true
 }
 
@@ -148,7 +137,7 @@ func (r *mockProver) getProverTask(t *testing.T, proofType message.ProofType) *t
 	resp, err := client.R().
 		SetHeader("Content-Type", "application/json").
 		SetHeader("Authorization", fmt.Sprintf("Bearer %s", token)).
-		SetBody(map[string]interface{}{"prover_height": 100, "task_type": int(proofType)}).
+		SetBody(map[string]interface{}{"prover_version": "v1.0.0", "prover_height": 100, "task_type": int(proofType)}).
 		SetResult(&result).
 		Post("http://" + r.coordinatorURL + "/coordinator/v1/get_task")
 	assert.NoError(t, err)
@@ -161,7 +150,7 @@ func (r *mockProver) getProverTask(t *testing.T, proofType message.ProofType) *t
 	return &result.Data
 }
 
-func (r *mockProver) submitProof(t *testing.T, proverTaskSchema *types.GetTaskSchema, proofStatus proofStatus, errCode int) {
+func (r *mockProver) submitProof(t *testing.T, proverTaskSchema *types.GetTaskSchema, proofStatus proofStatus) {
 	proof := &message.ProofMsg{
 		ProofDetail: &message.ProofDetail{
 			ID:         proverTaskSchema.TaskID,
@@ -216,5 +205,5 @@ func (r *mockProver) submitProof(t *testing.T, proverTaskSchema *types.GetTaskSc
 		Post("http://" + r.coordinatorURL + "/coordinator/v1/submit_proof")
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, resp.StatusCode())
-	assert.Equal(t, errCode, result.ErrCode)
+	assert.Equal(t, ctypes.Success, result.ErrCode)
 }

prover/client/client.go

@@ -14,7 +14,6 @@ import (
 
 	"scroll-tech/common/types"
 	"scroll-tech/common/types/message"
-	"scroll-tech/common/version"
 )
 
 // CoordinatorClient is a client used for interacting with the Coordinator service.
@@ -66,9 +65,8 @@ func (c *CoordinatorClient) Login(ctx context.Context) error {
 	// Prepare and sign the login request
 	authMsg := &message.AuthMsg{
 		Identity: &message.Identity{
-			ProverVersion: version.Version,
-			ProverName:    c.proverName,
-			Challenge:     challengeResult.Data.Token,
+			ProverName: c.proverName,
+			Challenge:  challengeResult.Data.Token,
 		},
 	}
 
@@ -80,23 +78,19 @@ func (c *CoordinatorClient) Login(ctx context.Context) error {
 	// Login to coordinator
 	loginReq := &LoginRequest{
 		Message: struct {
-			Challenge     string `json:"challenge"`
-			ProverName    string `json:"prover_name"`
-			ProverVersion string `json:"prover_version"`
+			Challenge  string `json:"challenge"`
+			ProverName string `json:"prover_name"`
 		}{
-			Challenge:     authMsg.Identity.Challenge,
-			ProverName:    authMsg.Identity.ProverName,
-			ProverVersion: authMsg.Identity.ProverVersion,
+			Challenge:  authMsg.Identity.Challenge,
+			ProverName: authMsg.Identity.ProverName,
 		},
 		Signature: authMsg.Signature,
 	}
 
-	// store JWT token for login requests
-	c.client.SetAuthToken(challengeResult.Data.Token)
-
 	var loginResult LoginResponse
 	loginResp, err := c.client.R().
 		SetHeader("Content-Type", "application/json").
+		SetHeader("Authorization", fmt.Sprintf("Bearer %s", challengeResult.Data.Token)).
 		SetBody(loginReq).
 		SetResult(&loginResult).
 		Post("/coordinator/v1/login")
@@ -138,11 +132,10 @@ func (c *CoordinatorClient) GetTask(ctx context.Context, req *GetTaskRequest) (*
 	}
 
 	if result.ErrCode == types.ErrJWTTokenExpired {
-		log.Info("JWT expired, attempting to re-login")
+		log.Debug("JWT expired, attempting to re-login")
 		if err := c.Login(ctx); err != nil {
 			return nil, fmt.Errorf("JWT expired, re-login failed: %v", err)
 		}
-		log.Info("re-login success")
 		return c.GetTask(ctx, req)
 	}
 	if result.ErrCode != types.Success {
@@ -171,11 +164,10 @@ func (c *CoordinatorClient) SubmitProof(ctx context.Context, req *SubmitProofReq
 	}
 
 	if result.ErrCode == types.ErrJWTTokenExpired {
-		log.Info("JWT expired, attempting to re-login")
+		log.Debug("JWT expired, attempting to re-login")
 		if err := c.Login(ctx); err != nil {
 			return fmt.Errorf("JWT expired, re-login failed: %v", err)
 		}
-		log.Info("re-login success")
 		return c.SubmitProof(ctx, req)
 	}
 	if result.ErrCode != types.Success {

prover/client/types.go

@@ -17,9 +17,8 @@ type ChallengeResponse struct {
 // LoginRequest defines the request structure for login API
 type LoginRequest struct {
 	Message struct {
-		Challenge     string `json:"challenge"`
-		ProverName    string `json:"prover_name"`
-		ProverVersion string `json:"prover_version"`
+		Challenge  string `json:"challenge"`
+		ProverName string `json:"prover_name"`
 	} `json:"message"`
 	Signature string `json:"signature"`
 }
@@ -36,8 +35,9 @@ type LoginResponse struct {
 
 // GetTaskRequest defines the request structure for GetTask API
 type GetTaskRequest struct {
-	TaskType     message.ProofType `json:"task_type"`
-	ProverHeight uint64            `json:"prover_height,omitempty"`
+	ProverVersion string            `json:"prover_version"`
+	ProverHeight  uint64            `json:"prover_height"`
+	TaskType      message.ProofType `json:"task_type"`
 }
 
 // GetTaskResponse defines the response structure for GetTask API

prover/config.json

@@ -1,20 +1,19 @@
 {
-    "prover_name": "prover-1",
+    "prover_name": "my_prover",
     "keystore_path": "keystore.json",
     "keystore_password": "prover-pwd",
-    "db_path": "unique-db-path-for-prover-1",
+    "db_path": "bbolt_db",
     "core": {
-        "params_path": "params",
-        "proof_type": 2
+        "params_path": "params"
     },
     "coordinator": {
-        "base_url": "http://localhost:8555",
+        "base_url": "https://coordinator/v1",
         "retry_count": 10,
         "retry_wait_time_sec": 10,
         "connection_timeout_sec": 30
     },
     "l2geth": {
-        "endpoint": "http://localhost:9999",
+        "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
         "confirmations": "0x1"
     }
 }

prover/config/config.go

@@ -19,13 +19,13 @@ type Config struct {
 	Core             *ProverCoreConfig  `json:"core"`
 	DBPath           string             `json:"db_path"`
 	Coordinator      *CoordinatorConfig `json:"coordinator"`
-	L2Geth           *L2GethConfig      `json:"l2geth,omitempty"` // only for chunk_prover
+	L2Geth           *L2GethConfig      `json:"l2geth"`
 }
 
 // ProverCoreConfig load zk prover config.
 type ProverCoreConfig struct {
 	ParamsPath string            `json:"params_path"`
-	ProofType  message.ProofType `json:"proof_type,omitempty"` // 1: chunk prover (default type), 2: batch prover
+	ProofType  message.ProofType `json:"prove_type,omitempty"` // 0: chunk prover (default type), 1: batch prover
 	DumpDir    string            `json:"dump_dir,omitempty"`
 }
 

prover/core/prover_test.go

@@ -1,6 +1,5 @@
 //go:build ffi
 
-// go test -v -race -gcflags="-l" -ldflags="-s=false" -tags ffi ./...
 package core_test
 
 import (
@@ -13,7 +12,6 @@ import (
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
 
-	scrollTypes "scroll-tech/common/types"
 	"scroll-tech/common/types/message"
 
 	"scroll-tech/prover/config"
@@ -49,32 +47,6 @@ func TestFFI(t *testing.T) {
 	as.NoError(err)
 	t.Log("Converted to chunk infos")
 
-	wrappedBlock1 := &scrollTypes.WrappedBlock{
-		Header:       chunkTrace1[0].Header,
-		Transactions: chunkTrace1[0].Transactions,
-		WithdrawRoot: chunkTrace1[0].WithdrawTrieRoot,
-	}
-	chunk1 := &scrollTypes.Chunk{Blocks: []*scrollTypes.WrappedBlock{wrappedBlock1}}
-	chunkHash1, err := chunk1.Hash(0)
-	as.NoError(err)
-	as.Equal(chunkInfo1.PostStateRoot, wrappedBlock1.Header.Root)
-	as.Equal(chunkInfo1.WithdrawRoot, wrappedBlock1.WithdrawRoot)
-	as.Equal(chunkInfo1.DataHash, chunkHash1)
-	t.Log("Successful to check chunk info 1")
-
-	wrappedBlock2 := &scrollTypes.WrappedBlock{
-		Header:       chunkTrace2[0].Header,
-		Transactions: chunkTrace2[0].Transactions,
-		WithdrawRoot: chunkTrace2[0].WithdrawTrieRoot,
-	}
-	chunk2 := &scrollTypes.Chunk{Blocks: []*scrollTypes.WrappedBlock{wrappedBlock2}}
-	chunkHash2, err := chunk2.Hash(chunk1.NumL1Messages(0))
-	as.NoError(err)
-	as.Equal(chunkInfo2.PostStateRoot, wrappedBlock2.Header.Root)
-	as.Equal(chunkInfo2.WithdrawRoot, wrappedBlock2.WithdrawRoot)
-	as.Equal(chunkInfo2.DataHash, chunkHash2)
-	t.Log("Successful to check chunk info 2")
-
 	chunkProof1, err := chunkProverCore.ProveChunk("chunk_proof1", chunkTrace1)
 	as.NoError(err)
 	t.Log("Generated and dumped chunk proof 1")

prover/prover.go

@@ -24,6 +24,7 @@ import (
 
 	"scroll-tech/common/types/message"
 	"scroll-tech/common/utils"
+	"scroll-tech/common/version"
 )
 
 var (
@@ -36,8 +37,8 @@ type Prover struct {
 	ctx               context.Context
 	cfg               *config.Config
 	coordinatorClient *client.CoordinatorClient
+	l2GethClient      *ethclient.Client
 	stack             *store.Stack
-	l2GethClient      *ethclient.Client // only applicable for a chunk_prover
 	proverCore        *core.ProverCore
 
 	isClosed int64
@@ -60,16 +61,10 @@ func NewProver(ctx context.Context, cfg *config.Config) (*Prover, error) {
 		return nil, err
 	}
 
-	var l2GethClient *ethclient.Client
-	if cfg.Core.ProofType == message.ProofTypeChunk {
-		if cfg.L2Geth == nil || cfg.L2Geth.Endpoint == "" {
-			return nil, errors.New("Missing l2geth config for chunk prover")
-		}
-		// Connect l2geth node. Only applicable for a chunk_prover.
-		l2GethClient, err = ethclient.DialContext(ctx, cfg.L2Geth.Endpoint)
-		if err != nil {
-			return nil, err
-		}
+	// Collect geth node.
+	l2GethClient, err := ethclient.DialContext(ctx, cfg.L2Geth.Endpoint)
+	if err != nil {
+		return nil, err
 	}
 
 	// Create prover_core instance
@@ -151,13 +146,6 @@ func (r *Prover) proveAndSubmit() error {
 		}
 	}
 
-	defer func() {
-		err = r.stack.Delete(task.Task.ID)
-		if err != nil {
-			log.Error("prover stack pop failed!", "err", err)
-		}
-	}()
-
 	var proofMsg *message.ProofDetail
 	if task.Times <= 2 {
 		// If panic times <= 2, try to proof the task.
@@ -166,37 +154,45 @@ func (r *Prover) proveAndSubmit() error {
 		}
 
 		log.Info("start to prove task", "task-type", task.Task.Type, "task-id", task.Task.ID)
-		proofMsg, err = r.prove(task)
-		if err != nil { // handling error from prove
-			return fmt.Errorf("failed to prove task, task-type: %v, err: %v", task.Task.Type, err)
+		proofMsg = r.prove(task)
+	} else {
+		// when the prover has more than 3 times panic,
+		// it will omit to prove the task, submit StatusProofError and then Delete the task.
+		proofMsg = &message.ProofDetail{
+			Status: message.StatusProofError,
+			Error:  "zk proving panic",
+			ID:     task.Task.ID,
+			Type:   task.Task.Type,
 		}
-
-		return r.submitProof(proofMsg)
 	}
 
-	// when the prover has more than 3 times panic,
-	// it will omit to prove the task, submit StatusProofError and then Delete the task.
-	return fmt.Errorf("zk proving panic for task, task-type: %v, task-id: %v", task.Task.Type, task.Task.ID)
+	defer func() {
+		err = r.stack.Delete(task.Task.ID)
+		if err != nil {
+			log.Error("prover stack pop failed!", "err", err)
+		}
+	}()
+
+	return r.submitProof(proofMsg)
 }
 
 // fetchTaskFromCoordinator fetches a new task from the server
 func (r *Prover) fetchTaskFromCoordinator() (*store.ProvingTask, error) {
-	// prepare the request
-	req := &client.GetTaskRequest{
-		TaskType: r.Type(),
+	// get the latest confirmed block number
+	latestBlockNumber, err := putils.GetLatestConfirmedBlockNumber(r.ctx, r.l2GethClient, r.cfg.L2Geth.Confirmations)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch latest confirmed block number: %v", err)
 	}
 
-	if req.TaskType == message.ProofTypeChunk {
-		// get the latest confirmed block number
-		latestBlockNumber, err := putils.GetLatestConfirmedBlockNumber(r.ctx, r.l2GethClient, r.cfg.L2Geth.Confirmations)
-		if err != nil {
-			return nil, fmt.Errorf("failed to fetch latest confirmed block number: %v", err)
-		}
+	if latestBlockNumber == 0 {
+		return nil, fmt.Errorf("omit to prove task of the genesis block, latestBlockNumber: %v", latestBlockNumber)
+	}
 
-		if latestBlockNumber == 0 {
-			return nil, fmt.Errorf("omit to prove task of the genesis block, latestBlockNumber: %v", latestBlockNumber)
-		}
-		req.ProverHeight = latestBlockNumber
+	// prepare the request
+	req := &client.GetTaskRequest{
+		ProverVersion: version.Version,
+		ProverHeight:  latestBlockNumber,
+		TaskType:      r.Type(),
 	}
 
 	// send the request
@@ -244,9 +240,8 @@ func (r *Prover) fetchTaskFromCoordinator() (*store.ProvingTask, error) {
 	return provingTask, nil
 }
 
-// prove function tries to prove a task. It returns an error if the proof fails.
-func (r *Prover) prove(task *store.ProvingTask) (*message.ProofDetail, error) {
-	detail := &message.ProofDetail{
+func (r *Prover) prove(task *store.ProvingTask) (detail *message.ProofDetail) {
+	detail = &message.ProofDetail{
 		ID:     task.Task.ID,
 		Type:   task.Task.Type,
 		Status: message.StatusOk,
@@ -256,28 +251,30 @@ func (r *Prover) prove(task *store.ProvingTask) (*message.ProofDetail, error) {
 	case message.ProofTypeChunk:
 		proof, err := r.proveChunk(task)
 		if err != nil {
+			log.Error("prove chunk failed!", "task-id", task.Task.ID, "err", err)
 			detail.Status = message.StatusProofError
 			detail.Error = err.Error()
-			return detail, err
+			return
 		}
 		detail.ChunkProof = proof
-		log.Info("prove chunk success", "task-id", task.Task.ID)
-		return detail, nil
+		log.Info("prove chunk successfully!", "task-id", task.Task.ID)
+		return
 
 	case message.ProofTypeBatch:
 		proof, err := r.proveBatch(task)
 		if err != nil {
+			log.Error("prove batch failed!", "task-id", task.Task.ID, "err", err)
 			detail.Status = message.StatusProofError
 			detail.Error = err.Error()
-			return detail, err
+			return
 		}
 		detail.BatchProof = proof
-		log.Info("prove batch success", "task-id", task.Task.ID)
-		return detail, nil
+		log.Info("prove batch successfully!", "task-id", task.Task.ID)
+		return
 
 	default:
-		err := fmt.Errorf("invalid task type: %v", task.Task.Type)
-		return detail, err
+		log.Error("invalid task type", "task-id", task.Task.ID, "task-type", task.Task.Type)
+		return
 	}
 }
 
@@ -287,7 +284,7 @@ func (r *Prover) proveChunk(task *store.ProvingTask) (*message.ChunkProof, error
 	}
 	traces, err := r.getSortedTracesByHashes(task.Task.ChunkTaskDetail.BlockHashes)
 	if err != nil {
-		return nil, fmt.Errorf("get traces from eth node failed, block hashes: %v, err: %v", task.Task.ChunkTaskDetail.BlockHashes, err)
+		return nil, fmt.Errorf("get traces from eth node failed, block hashes: %v", task.Task.ChunkTaskDetail.BlockHashes)
 	}
 	return r.proverCore.ProveChunk(task.Task.ID, traces)
 }

tests/integration-test/integration_test.go

@@ -129,23 +129,3 @@ func TestCoordinatorProverInteraction(t *testing.T) {
 	batchProverApp.WaitExit()
 	coordinatorApp.WaitExit()
 }
-
-func TestProverReLogin(t *testing.T) {
-	// Start postgres docker containers.
-	base.RunL2Geth(t)
-	base.RunDBImage(t)
-
-	assert.NoError(t, migrate.ResetDB(base.DBClient(t)))
-
-	// Run coordinator app.
-	coordinatorApp.RunApp(t) // login timeout: 1 sec
-
-	// Run prover app.
-	chunkProverApp.RunAppWithExpectedResult(t, "re-login success") // chunk prover login.
-	batchProverApp.RunAppWithExpectedResult(t, "re-login success") // batch prover login.
-
-	// Free apps.
-	chunkProverApp.WaitExit()
-	batchProverApp.WaitExit()
-	coordinatorApp.WaitExit()
-}