# This is a combination of 19 commits.

# This is the 1st commit message:

feat: add monitor metrics (#262)

Co-authored-by: colinlyguo <[email protected]>
Co-authored-by: maskpp <[email protected]>
Co-authored-by: HAOYUatHZ <[email protected]>
Co-authored-by: Péter Garamvölgyi <[email protected]>
# This is the commit message #2:

refactor(bridge): remove layer1 client in in layer1 relayer constructor (#274)

Co-authored-by: vincent <[email protected]>
Co-authored-by: HAOYUatHZ <[email protected]>
# This is the commit message #3:

fix: add gas multiplier (#275)


# This is the commit message #4:

feat(libzkp): use dylib instead of staticlib  (#266)

Co-authored-by: maskpp <[email protected]>
Co-authored-by: HAOYUatHZ <[email protected]>
Co-authored-by: colin <[email protected]>
Co-authored-by: colinlyguo <[email protected]>
# This is the commit message #5:

Revert "fix: add gas multiplier (#275)" (#279)


# This is the commit message #6:

build: add nightly-2022-12-10 rust-related builder image (#282)


# This is the commit message #7:

fix(bridge): compatible with DynamicFeeTxType not supported chain (#280)

Co-authored-by: colinlyguo <[email protected]>
# This is the commit message #8:

feat(contract): enable whitelist relayer (#272)

Co-authored-by: Péter Garamvölgyi <[email protected]>
Co-authored-by: HAOYUatHZ <[email protected]>
# This is the commit message #9:

perf(bridge): execute relayer loops independently (#258)

Co-authored-by: colin <[email protected]>
Co-authored-by: HAOYUatHZ <[email protected]>
# This is the commit message #10:

feat(bridge): confirm block based on "safe" and "finalized" tags (#265)


# This is the commit message #11:

feat: allow to override L2 deployment when address is provided (#293)


# This is the commit message #12:

feat(contracts): Add fee vault (#223)


# This is the commit message #13:

feat(confirmations): Upgrade confirm (#291)


# This is the commit message #14:

feat(coordinator): Enable set ws compression level. (#292)


# This is the commit message #15:

feat(roller&coordinator): upgrade lizkp to zkevm-0215 version (#281)

Co-authored-by: HAOYUatHZ <[email protected]>
Co-authored-by: HAOYUatHZ <[email protected]>
Co-authored-by: xinran chen <[email protected]>
Co-authored-by: Ubuntu <[email protected]>
# This is the commit message #16:

build: update version to `alpha-v1.0` (#301)


# This is the commit message #17:

feat: import genesis batch during startup (#299)

Co-authored-by: HAOYUatHZ <[email protected]>
# This is the commit message #18:

feat(contracts): new bridge contracts (#288)

Co-authored-by: Haichen Shen <[email protected]>
Co-authored-by: Thegaram <[email protected]>
Co-authored-by: colin <[email protected]>
# This is the commit message #19:

chore: upgrade l2geth dependency for trace type (#304)

Author: colinlyguo

.github/workflows/common.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly-2022-08-23
+        toolchain: nightly-2022-12-10
         override: true
         components: rustfmt, clippy
     - name: Install Go

.github/workflows/coordinator.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly-2022-08-23
+        toolchain: nightly-2022-12-10
         override: true
         components: rustfmt, clippy
     - name: Install Go

.github/workflows/roller.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly-2022-08-23
+        toolchain: nightly-2022-12-10
         override: true
         components: rustfmt, clippy
     - name: Install Go
@@ -42,6 +42,8 @@ jobs:
     - name: Test
       run: |
         make roller
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./prover/lib
+        export CHAIN_ID=534353
         go test -v ./...
   check:
     runs-on: ubuntu-latest

.gitignore

@@ -3,6 +3,7 @@ assets/params*
 assets/seed
 coverage.txt
 build/bin
+*.integration.txt
 
 # misc
 sftp-config.json

Jenkinsfile

@@ -13,6 +13,8 @@ pipeline {
     environment {
         GO111MODULE = 'on'
         PATH="/home/ubuntu/.cargo/bin:$PATH"
+        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./coordinator/verifier/lib"
+        CHAIN_ID='534353'
         // LOG_DOCKER = 'true'
     }
     stages {

Makefile

@@ -1,5 +1,7 @@
 .PHONY: check update dev_docker clean
 
+ZKP_VERSION=release-1220
+
 help: ## Display this help message
 	@grep -h \
 		-E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
@@ -29,5 +31,15 @@ dev_docker: ## build docker images for development/testing usages
 	docker build -t scroll_l1geth ./common/docker/l1geth/
 	docker build -t scroll_l2geth ./common/docker/l2geth/
 
+test_zkp: ## Test zkp prove and verify, roller/prover generates the proof and coordinator/verifier verifies it
+	mkdir -p test_params
+	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params19 -O ./test_params/params19
+	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params26 -O ./test_params/params26
+	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_seed -O test_seed
+	rm -rf ./roller/assets/test_params && mv test_params ./roller/assets/ && mv test_seed ./roller/assets/
+	cd ./roller && make test-gpu-prover
+	rm -rf ./coordinator/assets/test_params && mv ./roller/assets/test_params ./coordinator/assets/ && mv ./roller/assets/agg_proof ./coordinator/assets/
+	cd ./coordinator && make test-gpu-verifier
+
 clean: ## Empty out the bin folder
 	@rm -rf build/bin

bridge/cmd/app/app.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"os/signal"
@@ -10,6 +11,7 @@ import (
 
 	"scroll-tech/database"
 
+	"scroll-tech/common/metrics"
 	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
@@ -49,7 +51,10 @@ func action(ctx *cli.Context) error {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
 	}
 
-	// init db connection
+	// Start metrics server.
+	metrics.Serve(context.Background(), ctx)
+
+	// Init db connection.
 	var ormFactory database.OrmFactory
 	if ormFactory, err = database.NewOrmFactory(cfg.DBConfig); err != nil {
 		log.Crit("failed to init db connection", "err", err)

bridge/config.json

@@ -1,6 +1,6 @@
 {
   "l1_config": {
-    "confirmations": 6,
+    "confirmations": "0x6",
     "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
     "l1_messenger_address": "0x0000000000000000000000000000000000000000",
     "rollup_contract_address": "0x0000000000000000000000000000000000000000",
@@ -11,11 +11,11 @@
         "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
         "check_pending_time": 3,
         "escalate_blocks": 100,
-        "confirmations": 1,
+        "confirmations": "0x1",
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
         "max_gas_price": 10000000000,
-        "tx_type": "AccessListTx",
+        "tx_type": "LegacyTx",
         "min_balance": 100000000000000000000
       },
       "message_sender_private_keys": [
@@ -24,7 +24,7 @@
     }
   },
   "l2_config": {
-    "confirmations": 1,
+    "confirmations": "0x1",
     "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
     "l2_messenger_address": "0x0000000000000000000000000000000000000000",
     "relayer_config": {
@@ -34,11 +34,11 @@
         "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
         "check_pending_time": 10,
         "escalate_blocks": 100,
-        "confirmations": 6,
+        "confirmations": "0x6",
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
         "max_gas_price": 10000000000,
-        "tx_type": "DynamicFeeTx",
+        "tx_type": "LegacyTx",
         "min_balance": 100000000000000000000
       },
       "message_sender_private_keys": [

bridge/config/l1_config.go

@@ -1,11 +1,14 @@
 package config
 
-import "github.com/scroll-tech/go-ethereum/common"
+import (
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/rpc"
+)
 
 // L1Config loads l1eth configuration items.
 type L1Config struct {
 	// Confirmations block height confirmations number.
-	Confirmations uint64 `json:"confirmations"`
+	Confirmations rpc.BlockNumber `json:"confirmations"`
 	// l1 eth node url.
 	Endpoint string `json:"endpoint"`
 	// The start height to sync event from layer 1

bridge/config/l2_config.go

@@ -3,13 +3,15 @@ package config
 import (
 	"encoding/json"
 
+	"github.com/scroll-tech/go-ethereum/rpc"
+
 	"github.com/scroll-tech/go-ethereum/common"
 )
 
 // L2Config loads l2geth configuration items.
 type L2Config struct {
 	// Confirmations block height confirmations number.
-	Confirmations uint64 `json:"confirmations"`
+	Confirmations rpc.BlockNumber `json:"confirmations"`
 	// l2geth node url.
 	Endpoint string `json:"endpoint"`
 	// The messenger contract address deployed on layer 2 chain.