From 38551c4eebda68de073497a097cf66b1d14e6c22 Mon Sep 17 00:00:00 2001 From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Date: Sat, 2 Sep 2023 15:42:01 +0800 Subject: [PATCH] refactor: rename `bridge` to `rollup` (#644) Co-authored-by: HAOYUatHZ --- .github/workflows/integration.yaml | 2 +- .github/workflows/{bridge.yml => rollup.yml} | 34 ++++---- Makefile | 6 +- README.md | 6 +- bridge/cmd/event_watcher/main.go | 7 -- bridge/cmd/gas_oracle/main.go | 7 -- bridge/cmd/rollup_relayer/main.go | 7 -- .../controller/relayer/l1_relayer_metrics.go | 54 ------------ .../controller/relayer/l2_relayer_metrics.go | 84 ------------------- build/dockerfiles/coordinator.Dockerfile | 2 +- build/dockerfiles/db_cli.Dockerfile | 2 +- build/dockerfiles/event_watcher.Dockerfile | 4 +- build/dockerfiles/gas_oracle.Dockerfile | 4 +- build/dockerfiles/prover-stats-api.Dockerfile | 2 +- build/dockerfiles/rollup_relayer.Dockerfile | 4 +- build/run_tests.sh | 2 +- codecov.yml | 2 +- common/version/version.go | 2 +- go.work | 2 +- {bridge => rollup}/.gitignore | 0 {bridge => rollup}/Makefile | 8 +- {bridge => rollup}/README.md | 6 +- {bridge => rollup}/abi/bridge_abi.go | 0 {bridge => rollup}/abi/bridge_abi_test.go | 0 {bridge => rollup}/abi/build_abi.sh | 0 .../cmd/event_watcher/app/app.go | 4 +- rollup/cmd/event_watcher/main.go | 7 ++ {bridge => rollup}/cmd/gas_oracle/app/app.go | 8 +- rollup/cmd/gas_oracle/main.go | 7 ++ {bridge => rollup}/cmd/mock_app.go | 34 ++++---- .../cmd/rollup_relayer/app/app.go | 8 +- rollup/cmd/rollup_relayer/main.go | 7 ++ {bridge => rollup}/conf/config.json | 0 {bridge => rollup}/coverage.sh | 0 {bridge => rollup}/go.mod | 2 +- {bridge => rollup}/go.sum | 0 {bridge => rollup}/internal/config/config.go | 0 .../internal/config/config_test.go | 2 +- {bridge => rollup}/internal/config/l1.go | 0 {bridge => rollup}/internal/config/l2.go | 0 {bridge => rollup}/internal/config/relayer.go | 0 .../internal/controller/relayer/common.go | 0 .../internal/controller/relayer/l1_relayer.go | 14 ++-- .../controller/relayer/l1_relayer_metrics.go | 54 ++++++++++++ .../controller/relayer/l1_relayer_test.go | 4 +- .../internal/controller/relayer/l2_relayer.go | 32 +++---- .../controller/relayer/l2_relayer_metrics.go | 84 +++++++++++++++++++ .../controller/relayer/l2_relayer_test.go | 4 +- .../controller/relayer/relayer_test.go | 2 +- .../internal/controller/sender/estimategas.go | 0 .../internal/controller/sender/metrics.go | 28 +++---- .../internal/controller/sender/sender.go | 4 +- .../internal/controller/sender/sender_test.go | 2 +- .../controller/watcher/batch_proposer.go | 26 +++--- .../controller/watcher/batch_proposer_test.go | 4 +- .../controller/watcher/chunk_proposer.go | 28 +++---- .../controller/watcher/chunk_proposer_test.go | 4 +- .../internal/controller/watcher/common.go | 0 .../internal/controller/watcher/l1_watcher.go | 6 +- .../controller/watcher/l1_watcher_metrics.go | 14 ++-- .../controller/watcher/l1_watcher_test.go | 6 +- .../internal/controller/watcher/l2_watcher.go | 10 +-- .../controller/watcher/l2_watcher_metrics.go | 20 ++--- .../controller/watcher/l2_watcher_test.go | 10 +-- .../controller/watcher/watcher_test.go | 2 +- {bridge => rollup}/internal/orm/batch.go | 0 {bridge => rollup}/internal/orm/chunk.go | 0 {bridge => rollup}/internal/orm/l1_block.go | 0 {bridge => rollup}/internal/orm/l1_message.go | 0 {bridge => rollup}/internal/orm/l2_block.go | 0 {bridge => rollup}/internal/orm/orm_test.go | 0 .../internal/utils/confirmation.go | 0 .../internal/utils/confirmation_test.go | 0 {bridge => rollup}/internal/utils/utils.go | 2 +- .../internal/utils/utils_test.go | 0 {bridge => rollup}/mock_bridge/.gitignore | 0 .../mock_bridge/MockBridgeL1.sol | 0 .../mock_bridge/MockBridgeL2.sol | 0 .../testdata/blockTrace_02.json | 0 .../testdata/blockTrace_03.json | 0 {bridge => rollup}/tests/bridge_test.go | 20 ++--- {bridge => rollup}/tests/gas_oracle_test.go | 10 +-- .../tests/process_start_test.go | 22 ++--- {bridge => rollup}/tests/rollup_test.go | 12 +-- tests/integration-test/contracts_test.go | 2 +- tests/integration-test/integration_test.go | 8 +- 86 files changed, 380 insertions(+), 380 deletions(-) rename .github/workflows/{bridge.yml => rollup.yml} (84%) delete mode 100644 bridge/cmd/event_watcher/main.go delete mode 100644 bridge/cmd/gas_oracle/main.go delete mode 100644 bridge/cmd/rollup_relayer/main.go delete mode 100644 bridge/internal/controller/relayer/l1_relayer_metrics.go delete mode 100644 bridge/internal/controller/relayer/l2_relayer_metrics.go rename {bridge => rollup}/.gitignore (100%) rename {bridge => rollup}/Makefile (83%) rename {bridge => rollup}/README.md (92%) rename {bridge => rollup}/abi/bridge_abi.go (100%) rename {bridge => rollup}/abi/bridge_abi_test.go (100%) rename {bridge => rollup}/abi/build_abi.sh (100%) rename {bridge => rollup}/cmd/event_watcher/app/app.go (97%) create mode 100644 rollup/cmd/event_watcher/main.go rename {bridge => rollup}/cmd/gas_oracle/app/app.go (95%) create mode 100644 rollup/cmd/gas_oracle/main.go rename {bridge => rollup}/cmd/mock_app.go (73%) rename {bridge => rollup}/cmd/rollup_relayer/app/app.go (95%) create mode 100644 rollup/cmd/rollup_relayer/main.go rename {bridge => rollup}/conf/config.json (100%) rename {bridge => rollup}/coverage.sh (100%) rename {bridge => rollup}/go.mod (99%) rename {bridge => rollup}/go.sum (100%) rename {bridge => rollup}/internal/config/config.go (100%) rename {bridge => rollup}/internal/config/config_test.go (95%) rename {bridge => rollup}/internal/config/l1.go (100%) rename {bridge => rollup}/internal/config/l2.go (100%) rename {bridge => rollup}/internal/config/relayer.go (100%) rename {bridge => rollup}/internal/controller/relayer/common.go (100%) rename {bridge => rollup}/internal/controller/relayer/l1_relayer.go (93%) create mode 100644 rollup/internal/controller/relayer/l1_relayer_metrics.go rename {bridge => rollup}/internal/controller/relayer/l1_relayer_test.go (98%) rename {bridge => rollup}/internal/controller/relayer/l2_relayer.go (96%) create mode 100644 rollup/internal/controller/relayer/l2_relayer_metrics.go rename {bridge => rollup}/internal/controller/relayer/l2_relayer_test.go (99%) rename {bridge => rollup}/internal/controller/relayer/relayer_test.go (98%) rename {bridge => rollup}/internal/controller/sender/estimategas.go (100%) rename {bridge => rollup}/internal/controller/sender/metrics.go (84%) rename {bridge => rollup}/internal/controller/sender/sender.go (99%) rename {bridge => rollup}/internal/controller/sender/sender_test.go (99%) rename {bridge => rollup}/internal/controller/watcher/batch_proposer.go (93%) rename {bridge => rollup}/internal/controller/watcher/batch_proposer_test.go (96%) rename {bridge => rollup}/internal/controller/watcher/chunk_proposer.go (93%) rename {bridge => rollup}/internal/controller/watcher/chunk_proposer_test.go (96%) rename {bridge => rollup}/internal/controller/watcher/common.go (100%) rename {bridge => rollup}/internal/controller/watcher/l1_watcher.go (99%) rename {bridge => rollup}/internal/controller/watcher/l1_watcher_metrics.go (83%) rename {bridge => rollup}/internal/controller/watcher/l1_watcher_test.go (99%) rename {bridge => rollup}/internal/controller/watcher/l2_watcher.go (97%) rename {bridge => rollup}/internal/controller/watcher/l2_watcher_metrics.go (71%) rename {bridge => rollup}/internal/controller/watcher/l2_watcher_test.go (97%) rename {bridge => rollup}/internal/controller/watcher/watcher_test.go (98%) rename {bridge => rollup}/internal/orm/batch.go (100%) rename {bridge => rollup}/internal/orm/chunk.go (100%) rename {bridge => rollup}/internal/orm/l1_block.go (100%) rename {bridge => rollup}/internal/orm/l1_message.go (100%) rename {bridge => rollup}/internal/orm/l2_block.go (100%) rename {bridge => rollup}/internal/orm/orm_test.go (100%) rename {bridge => rollup}/internal/utils/confirmation.go (100%) rename {bridge => rollup}/internal/utils/confirmation_test.go (100%) rename {bridge => rollup}/internal/utils/utils.go (98%) rename {bridge => rollup}/internal/utils/utils_test.go (100%) rename {bridge => rollup}/mock_bridge/.gitignore (100%) rename {bridge => rollup}/mock_bridge/MockBridgeL1.sol (100%) rename {bridge => rollup}/mock_bridge/MockBridgeL2.sol (100%) rename {bridge => rollup}/testdata/blockTrace_02.json (100%) rename {bridge => rollup}/testdata/blockTrace_03.json (100%) rename {bridge => rollup}/tests/bridge_test.go (86%) rename {bridge => rollup}/tests/gas_oracle_test.go (94%) rename {bridge => rollup}/tests/process_start_test.go (64%) rename {bridge => rollup}/tests/rollup_test.go (95%) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index d05919f07..a7653c949 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -36,7 +36,7 @@ jobs: - name: Build prerequisites run: | make dev_docker - make -C bridge mock_abi + make -C rollup mock_abi make -C common/bytecode all - name: Run integration tests run: | diff --git a/.github/workflows/bridge.yml b/.github/workflows/rollup.yml similarity index 84% rename from .github/workflows/bridge.yml rename to .github/workflows/rollup.yml index b3bd7979e..90bea40eb 100644 --- a/.github/workflows/bridge.yml +++ b/.github/workflows/rollup.yml @@ -1,4 +1,4 @@ -name: Bridge +name: Rollup on: push: @@ -8,11 +8,11 @@ on: - develop - alpha paths: - - 'bridge/**' + - 'rollup/**' - 'common/**' - '!common/version/version.go' - 'database/**' - - '.github/workflows/bridge.yml' + - '.github/workflows/rollup.yml' pull_request: types: - opened @@ -20,11 +20,11 @@ on: - synchronize - ready_for_review paths: - - 'bridge/**' + - 'rollup/**' - 'common/**' - '!common/version/version.go' - 'database/**' - - '.github/workflows/bridge.yml' + - '.github/workflows/rollup.yml' jobs: check: @@ -46,7 +46,7 @@ jobs: - name: Install Geth Tools uses: gacts/install-geth-tools@v1 - name: Lint - working-directory: 'bridge' + working-directory: 'rollup' run: | rm -rf $HOME/.cache/golangci-lint make mock_abi @@ -64,14 +64,14 @@ jobs: - name: Install goimports run: go install golang.org/x/tools/cmd/goimports - name: Run goimports lint - run: goimports -local scroll-tech/bridge/ -w . - working-directory: 'bridge' + run: goimports -local scroll-tech/rollup/ -w . + working-directory: 'rollup' - name: Run go mod tidy run: go mod tidy - working-directory: 'bridge' + working-directory: 'rollup' # If there are any diffs from goimports or go mod tidy, fail. - name: Verify no changes from goimports and go mod tidy - working-directory: 'bridge' + working-directory: 'rollup' run: | if [ -n "$(git status --porcelain)" ]; then exit 1 @@ -97,13 +97,13 @@ jobs: - name: Build prerequisites run: | make dev_docker - make -C bridge mock_abi - - name: Build bridge binaries - working-directory: 'bridge' + make -C rollup mock_abi + - name: Build rollup binaries + working-directory: 'rollup' run: | - make bridge_bins - - name: Test bridge packages - working-directory: 'bridge' + make rollup_bins + - name: Test rollup packages + working-directory: 'rollup' run: | go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic ./... - name: Upload coverage reports to Codecov @@ -111,7 +111,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: - flags: bridge + flags: rollup # docker-build: # if: github.event.pull_request.draft == false # runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 0f2802718..f675d70cc 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ help: ## Display this help message awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' lint: ## The code's format and security checks. - make -C bridge lint + make -C rollup lint make -C common lint make -C coordinator lint make -C database lint @@ -17,7 +17,7 @@ lint: ## The code's format and security checks. update: ## update dependencies go work sync - cd $(PWD)/bridge/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy + cd $(PWD)/rollup/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy cd $(PWD)/bridge-history-api/ && go get -u github.com/ethereum/go-ethereum@latest && go mod tidy cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy @@ -25,7 +25,7 @@ update: ## update dependencies cd $(PWD)/prover/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy cd $(PWD)/prover-stats-api/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy cd $(PWD)/tests/integration-test/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy - goimports -local $(PWD)/bridge/ -w . + goimports -local $(PWD)/rollup/ -w . goimports -local $(PWD)/bridge-history-api/ -w . goimports -local $(PWD)/common/ -w . goimports -local $(PWD)/coordinator/ -w . diff --git a/README.md b/README.md index 60fd5a8c7..5385b3bb1 100644 --- a/README.md +++ b/README.md @@ -15,14 +15,14 @@ docker pull postgres make dev_docker ``` -## Testing Bridge & Coordinator +## Testing Rollup & Coordinator ### For Non-Apple Silicon (M1/M2) Macs Run the tests using the following commands: ```bash -go test -v -race -covermode=atomic scroll-tech/bridge/... +go test -v -race -covermode=atomic scroll-tech/rollup/... go test -tags="mock_verifier" -v -race -covermode=atomic scroll-tech/coordinator/... go test -v -race -covermode=atomic scroll-tech/database/... go test -v -race -covermode=atomic scroll-tech/common/... @@ -55,7 +55,7 @@ This command runs a Docker container named `scroll_test_container` from the `scr Once the Docker container is running, execute the tests using the following commands: ```bash -go test -v -race -covermode=atomic scroll-tech/bridge/... +go test -v -race -covermode=atomic scroll-tech/rollup/... go test -tags="mock_verifier" -v -race -covermode=atomic scroll-tech/coordinator/... go test -v -race -covermode=atomic scroll-tech/database/... go test -v -race -covermode=atomic scroll-tech/common/... diff --git a/bridge/cmd/event_watcher/main.go b/bridge/cmd/event_watcher/main.go deleted file mode 100644 index 7a29b61fd..000000000 --- a/bridge/cmd/event_watcher/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "scroll-tech/bridge/cmd/event_watcher/app" - -func main() { - app.Run() -} diff --git a/bridge/cmd/gas_oracle/main.go b/bridge/cmd/gas_oracle/main.go deleted file mode 100644 index 18950bf81..000000000 --- a/bridge/cmd/gas_oracle/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "scroll-tech/bridge/cmd/gas_oracle/app" - -func main() { - app.Run() -} diff --git a/bridge/cmd/rollup_relayer/main.go b/bridge/cmd/rollup_relayer/main.go deleted file mode 100644 index 8503d4a6d..000000000 --- a/bridge/cmd/rollup_relayer/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "scroll-tech/bridge/cmd/rollup_relayer/app" - -func main() { - app.Run() -} diff --git a/bridge/internal/controller/relayer/l1_relayer_metrics.go b/bridge/internal/controller/relayer/l1_relayer_metrics.go deleted file mode 100644 index c5243a17d..000000000 --- a/bridge/internal/controller/relayer/l1_relayer_metrics.go +++ /dev/null @@ -1,54 +0,0 @@ -package relayer - -import ( - "sync" - - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promauto" -) - -type l1RelayerMetrics struct { - bridgeL1RelayedMsgsTotal prometheus.Counter - bridgeL1RelayedMsgsFailureTotal prometheus.Counter - bridgeL1RelayerGasPriceOraclerRunTotal prometheus.Counter - bridgeL1RelayerLastGasPrice prometheus.Gauge - bridgeL1MsgsRelayedConfirmedTotal prometheus.Counter - bridgeL1GasOraclerConfirmedTotal prometheus.Counter -} - -var ( - initL1RelayerMetricOnce sync.Once - l1RelayerMetric *l1RelayerMetrics -) - -func initL1RelayerMetrics(reg prometheus.Registerer) *l1RelayerMetrics { - initL1RelayerMetricOnce.Do(func() { - l1RelayerMetric = &l1RelayerMetrics{ - bridgeL1RelayedMsgsTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer1_msg_relayed_total", - Help: "The total number of the l1 relayed message.", - }), - bridgeL1RelayedMsgsFailureTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer1_msg_relayed_failure_total", - Help: "The total number of the l1 relayed failure message.", - }), - bridgeL1MsgsRelayedConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer1_relayed_confirmed_total", - Help: "The total number of layer1 relayed confirmed", - }), - bridgeL1RelayerGasPriceOraclerRunTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer1_gas_price_oracler_total", - Help: "The total number of layer1 gas price oracler run total", - }), - bridgeL1RelayerLastGasPrice: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_layer1_gas_price_latest_gas_price", - Help: "The latest gas price of bridge relayer l1", - }), - bridgeL1GasOraclerConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer1_gas_oracler_confirmed_total", - Help: "The total number of layer1 relayed confirmed", - }), - } - }) - return l1RelayerMetric -} diff --git a/bridge/internal/controller/relayer/l2_relayer_metrics.go b/bridge/internal/controller/relayer/l2_relayer_metrics.go deleted file mode 100644 index 109a8ec27..000000000 --- a/bridge/internal/controller/relayer/l2_relayer_metrics.go +++ /dev/null @@ -1,84 +0,0 @@ -package relayer - -import ( - "sync" - - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promauto" -) - -type l2RelayerMetrics struct { - bridgeL2RelayerProcessPendingBatchTotal prometheus.Counter - bridgeL2RelayerProcessPendingBatchSuccessTotal prometheus.Counter - bridgeL2RelayerGasPriceOraclerRunTotal prometheus.Counter - bridgeL2RelayerLastGasPrice prometheus.Gauge - bridgeL2RelayerProcessCommittedBatchesTotal prometheus.Counter - bridgeL2RelayerProcessCommittedBatchesFinalizedTotal prometheus.Counter - bridgeL2RelayerProcessCommittedBatchesFinalizedSuccessTotal prometheus.Counter - bridgeL2BatchesCommittedConfirmedTotal prometheus.Counter - bridgeL2BatchesFinalizedConfirmedTotal prometheus.Counter - bridgeL2BatchesGasOraclerConfirmedTotal prometheus.Counter - bridgeL2ChainMonitorLatestFailedCall prometheus.Counter - bridgeL2ChainMonitorLatestFailedBatchStatus prometheus.Counter -} - -var ( - initL2RelayerMetricOnce sync.Once - l2RelayerMetric *l2RelayerMetrics -) - -func initL2RelayerMetrics(reg prometheus.Registerer) *l2RelayerMetrics { - initL2RelayerMetricOnce.Do(func() { - l2RelayerMetric = &l2RelayerMetrics{ - bridgeL2RelayerProcessPendingBatchTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_process_pending_batch_total", - Help: "The total number of layer2 process pending batch", - }), - bridgeL2RelayerProcessPendingBatchSuccessTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_process_pending_batch_success_total", - Help: "The total number of layer2 process pending success batch", - }), - bridgeL2RelayerGasPriceOraclerRunTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_gas_price_oracler_total", - Help: "The total number of layer2 gas price oracler run total", - }), - bridgeL2RelayerLastGasPrice: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_layer2_gas_price_latest_gas_price", - Help: "The latest gas price of bridge relayer l2", - }), - bridgeL2RelayerProcessCommittedBatchesTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_process_committed_batches_total", - Help: "The total number of layer2 process committed batches run total", - }), - bridgeL2RelayerProcessCommittedBatchesFinalizedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_process_committed_batches_finalized_total", - Help: "The total number of layer2 process committed batches finalized total", - }), - bridgeL2RelayerProcessCommittedBatchesFinalizedSuccessTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_process_committed_batches_finalized_success_total", - Help: "The total number of layer2 process committed batches finalized success total", - }), - bridgeL2BatchesCommittedConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_process_committed_batches_confirmed_total", - Help: "The total number of layer2 process committed batches confirmed total", - }), - bridgeL2BatchesFinalizedConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_process_finalized_batches_confirmed_total", - Help: "The total number of layer2 process finalized batches confirmed total", - }), - bridgeL2BatchesGasOraclerConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_process_gras_oracler_confirmed_total", - Help: "The total number of layer2 process finalized batches confirmed total", - }), - bridgeL2ChainMonitorLatestFailedCall: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_chain_monitor_latest_failed_batch_call", - Help: "The total number of failed call chain_monitor api", - }), - bridgeL2ChainMonitorLatestFailedBatchStatus: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_layer2_chain_monitor_latest_failed_batch_status", - Help: "The total number of failed batch status get from chain_monitor", - }), - } - }) - return l2RelayerMetric -} diff --git a/build/dockerfiles/coordinator.Dockerfile b/build/dockerfiles/coordinator.Dockerfile index 2be24d217..4dfc25936 100644 --- a/build/dockerfiles/coordinator.Dockerfile +++ b/build/dockerfiles/coordinator.Dockerfile @@ -20,7 +20,7 @@ RUN find ./ | grep libzktrie.so | xargs -I{} cp {} /app/target/release/ FROM scrolltech/go-rust-builder:go-1.19-rust-nightly-2022-12-10 as base WORKDIR /src COPY go.work* ./ -COPY ./bridge/go.* ./bridge/ +COPY ./rollup/go.* ./rollup/ COPY ./common/go.* ./common/ COPY ./coordinator/go.* ./coordinator/ COPY ./database/go.* ./database/ diff --git a/build/dockerfiles/db_cli.Dockerfile b/build/dockerfiles/db_cli.Dockerfile index 53f1c42bb..e7c2bf22d 100644 --- a/build/dockerfiles/db_cli.Dockerfile +++ b/build/dockerfiles/db_cli.Dockerfile @@ -3,7 +3,7 @@ FROM scrolltech/go-alpine-builder:1.19 as base WORKDIR /src COPY go.work* ./ -COPY ./bridge/go.* ./bridge/ +COPY ./rollup/go.* ./rollup/ COPY ./common/go.* ./common/ COPY ./coordinator/go.* ./coordinator/ COPY ./database/go.* ./database/ diff --git a/build/dockerfiles/event_watcher.Dockerfile b/build/dockerfiles/event_watcher.Dockerfile index 95dcc3a92..8db495076 100644 --- a/build/dockerfiles/event_watcher.Dockerfile +++ b/build/dockerfiles/event_watcher.Dockerfile @@ -3,7 +3,7 @@ FROM scrolltech/go-alpine-builder:1.19 as base WORKDIR /src COPY go.work* ./ -COPY ./bridge/go.* ./bridge/ +COPY ./rollup/go.* ./rollup/ COPY ./common/go.* ./common/ COPY ./coordinator/go.* ./coordinator/ COPY ./database/go.* ./database/ @@ -18,7 +18,7 @@ FROM base as builder RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ - cd /src/bridge/cmd/event_watcher/ && go build -v -p 4 -o /bin/event_watcher + cd /src/rollup/cmd/event_watcher/ && go build -v -p 4 -o /bin/event_watcher # Pull event_watcher into a second stage deploy alpine container FROM alpine:latest diff --git a/build/dockerfiles/gas_oracle.Dockerfile b/build/dockerfiles/gas_oracle.Dockerfile index 7023e6090..0011b95d9 100644 --- a/build/dockerfiles/gas_oracle.Dockerfile +++ b/build/dockerfiles/gas_oracle.Dockerfile @@ -3,7 +3,7 @@ FROM scrolltech/go-alpine-builder:1.19 as base WORKDIR /src COPY go.work* ./ -COPY ./bridge/go.* ./bridge/ +COPY ./rollup/go.* ./rollup/ COPY ./common/go.* ./common/ COPY ./coordinator/go.* ./coordinator/ COPY ./database/go.* ./database/ @@ -18,7 +18,7 @@ FROM base as builder RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ - cd /src/bridge/cmd/gas_oracle/ && go build -v -p 4 -o /bin/gas_oracle + cd /src/rollup/cmd/gas_oracle/ && go build -v -p 4 -o /bin/gas_oracle # Pull gas_oracle into a second stage deploy alpine container FROM alpine:latest diff --git a/build/dockerfiles/prover-stats-api.Dockerfile b/build/dockerfiles/prover-stats-api.Dockerfile index d6a50ead3..53020c399 100644 --- a/build/dockerfiles/prover-stats-api.Dockerfile +++ b/build/dockerfiles/prover-stats-api.Dockerfile @@ -3,7 +3,7 @@ FROM scrolltech/go-alpine-builder:1.19 as base WORKDIR /src COPY go.work* ./ -COPY ./bridge/go.* ./bridge/ +COPY ./rollup/go.* ./rollup/ COPY ./common/go.* ./common/ COPY ./coordinator/go.* ./coordinator/ COPY ./database/go.* ./database/ diff --git a/build/dockerfiles/rollup_relayer.Dockerfile b/build/dockerfiles/rollup_relayer.Dockerfile index 43cd6f42f..1a51f2366 100644 --- a/build/dockerfiles/rollup_relayer.Dockerfile +++ b/build/dockerfiles/rollup_relayer.Dockerfile @@ -3,7 +3,7 @@ FROM scrolltech/go-alpine-builder:1.19 as base WORKDIR /src COPY go.work* ./ -COPY ./bridge/go.* ./bridge/ +COPY ./rollup/go.* ./rollup/ COPY ./common/go.* ./common/ COPY ./coordinator/go.* ./coordinator/ COPY ./database/go.* ./database/ @@ -18,7 +18,7 @@ FROM base as builder RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ - cd /src/bridge/cmd/rollup_relayer/ && go build -v -p 4 -o /bin/rollup_relayer + cd /src/rollup/cmd/rollup_relayer/ && go build -v -p 4 -o /bin/rollup_relayer # Pull rollup_relayer into a second stage deploy alpine container FROM alpine:latest diff --git a/build/run_tests.sh b/build/run_tests.sh index 02f5b949c..f6b9ec007 100755 --- a/build/run_tests.sh +++ b/build/run_tests.sh @@ -3,7 +3,7 @@ set -uex profile_name=$1 -exclude_dirs=("scroll-tech/bridge/cmd" "scroll-tech/bridge/tests" "scroll-tech/bridge/mock_bridge" "scroll-tech/coordinator/cmd" "scroll-tech/coordinator/internal/logic/verifier") +exclude_dirs=("scroll-tech/rollup/cmd" "scroll-tech/rollup/tests" "scroll-tech/rollup/mock_bridge" "scroll-tech/coordinator/cmd" "scroll-tech/coordinator/internal/logic/verifier") all_packages=$(go list ./... | grep -v "^scroll-tech/${profile_name}$") coverpkg="scroll-tech/${profile_name}" diff --git a/codecov.yml b/codecov.yml index c5337bfb8..26ed42752 100644 --- a/codecov.yml +++ b/codecov.yml @@ -6,7 +6,7 @@ flag_management: default_rules: carryforward: true individual_flags: - - name: bridge + - name: rollup statuses: - type: project target: auto diff --git a/common/version/version.go b/common/version/version.go index 8d868a9ec..3c9990b23 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.2.16" +var tag = "v4.2.17" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/go.work b/go.work index 1a02e21f4..020c6c5f3 100644 --- a/go.work +++ b/go.work @@ -1,7 +1,7 @@ go 1.19 use ( - ./bridge + ./rollup ./bridge-history-api ./common ./coordinator diff --git a/bridge/.gitignore b/rollup/.gitignore similarity index 100% rename from bridge/.gitignore rename to rollup/.gitignore diff --git a/bridge/Makefile b/rollup/Makefile similarity index 83% rename from bridge/Makefile rename to rollup/Makefile index 76796b007..e01f60891 100644 --- a/bridge/Makefile +++ b/rollup/Makefile @@ -1,13 +1,13 @@ -.PHONY: mock_abi bridge_bins event_watcher gas_oracle rollup_relayer test lint clean docker +.PHONY: mock_abi rollup_bins event_watcher gas_oracle rollup_relayer test lint clean docker IMAGE_VERSION=latest REPO_ROOT_DIR=./.. mock_abi: - cd .. && go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol ./bridge/mock_bridge/MockBridgeL1.sol --pkg mock_bridge --out ./bridge/mock_bridge/MockBridgeL1.go - cd .. && go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol ./bridge/mock_bridge/MockBridgeL2.sol --pkg mock_bridge --out ./bridge/mock_bridge/MockBridgeL2.go + cd .. && go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol ./rollup/mock_bridge/MockBridgeL1.sol --pkg mock_bridge --out ./rollup/mock_bridge/MockBridgeL1.go + cd .. && go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol ./rollup/mock_bridge/MockBridgeL2.sol --pkg mock_bridge --out ./rollup/mock_bridge/MockBridgeL2.go -bridge_bins: ## Builds the Bridge bins. +rollup_bins: ## Builds the Rollup bins. go build -o $(PWD)/build/bin/event_watcher ./cmd/event_watcher/ go build -o $(PWD)/build/bin/gas_oracle ./cmd/gas_oracle/ go build -o $(PWD)/build/bin/rollup_relayer ./cmd/rollup_relayer/ diff --git a/bridge/README.md b/rollup/README.md similarity index 92% rename from bridge/README.md rename to rollup/README.md index ac0c1e758..162341653 100644 --- a/bridge/README.md +++ b/rollup/README.md @@ -1,6 +1,6 @@ -# Bridge +# Rollup -This repo contains the Scroll bridge. +This repo contains the Scroll rollup. ## Dependency @@ -15,7 +15,7 @@ go install -v github.com/scroll-tech/go-ethereum/cmd/abigen ```bash make clean make mock_abi -make bridge_bins +make rollup_bins ``` ## Start diff --git a/bridge/abi/bridge_abi.go b/rollup/abi/bridge_abi.go similarity index 100% rename from bridge/abi/bridge_abi.go rename to rollup/abi/bridge_abi.go diff --git a/bridge/abi/bridge_abi_test.go b/rollup/abi/bridge_abi_test.go similarity index 100% rename from bridge/abi/bridge_abi_test.go rename to rollup/abi/bridge_abi_test.go diff --git a/bridge/abi/build_abi.sh b/rollup/abi/build_abi.sh similarity index 100% rename from bridge/abi/build_abi.sh rename to rollup/abi/build_abi.sh diff --git a/bridge/cmd/event_watcher/app/app.go b/rollup/cmd/event_watcher/app/app.go similarity index 97% rename from bridge/cmd/event_watcher/app/app.go rename to rollup/cmd/event_watcher/app/app.go index bb877a213..aa5633e3f 100644 --- a/bridge/cmd/event_watcher/app/app.go +++ b/rollup/cmd/event_watcher/app/app.go @@ -17,8 +17,8 @@ import ( "scroll-tech/common/utils" "scroll-tech/common/version" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/controller/watcher" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/controller/watcher" ) var app *cli.App diff --git a/rollup/cmd/event_watcher/main.go b/rollup/cmd/event_watcher/main.go new file mode 100644 index 000000000..098c6421b --- /dev/null +++ b/rollup/cmd/event_watcher/main.go @@ -0,0 +1,7 @@ +package main + +import "scroll-tech/rollup/cmd/event_watcher/app" + +func main() { + app.Run() +} diff --git a/bridge/cmd/gas_oracle/app/app.go b/rollup/cmd/gas_oracle/app/app.go similarity index 95% rename from bridge/cmd/gas_oracle/app/app.go rename to rollup/cmd/gas_oracle/app/app.go index e35e6b6a0..ea8038a60 100644 --- a/bridge/cmd/gas_oracle/app/app.go +++ b/rollup/cmd/gas_oracle/app/app.go @@ -17,10 +17,10 @@ import ( "scroll-tech/common/utils" "scroll-tech/common/version" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/controller/relayer" - "scroll-tech/bridge/internal/controller/watcher" - butils "scroll-tech/bridge/internal/utils" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/controller/relayer" + "scroll-tech/rollup/internal/controller/watcher" + butils "scroll-tech/rollup/internal/utils" ) var app *cli.App diff --git a/rollup/cmd/gas_oracle/main.go b/rollup/cmd/gas_oracle/main.go new file mode 100644 index 000000000..440b45177 --- /dev/null +++ b/rollup/cmd/gas_oracle/main.go @@ -0,0 +1,7 @@ +package main + +import "scroll-tech/rollup/cmd/gas_oracle/app" + +func main() { + app.Run() +} diff --git a/bridge/cmd/mock_app.go b/rollup/cmd/mock_app.go similarity index 73% rename from bridge/cmd/mock_app.go rename to rollup/cmd/mock_app.go index e0fb2ac51..c186e5a33 100644 --- a/bridge/cmd/mock_app.go +++ b/rollup/cmd/mock_app.go @@ -11,7 +11,7 @@ import ( "scroll-tech/common/docker" "scroll-tech/common/utils" - "scroll-tech/bridge/internal/config" + "scroll-tech/rollup/internal/config" ) // MockApp mockApp-test client manager. @@ -22,29 +22,29 @@ type MockApp struct { mockApps map[utils.MockAppName]docker.AppAPI originFile string - bridgeFile string + rollupFile string args []string } -// NewBridgeApp return a new bridgeApp manager, name mush be one them. -func NewBridgeApp(base *docker.App, file string) *MockApp { +// NewRollupApp return a new rollupApp manager, name mush be one them. +func NewRollupApp(base *docker.App, file string) *MockApp { - bridgeFile := fmt.Sprintf("/tmp/%d_bridge-config.json", base.Timestamp) - bridgeApp := &MockApp{ + rollupFile := fmt.Sprintf("/tmp/%d_rollup-config.json", base.Timestamp) + rollupApp := &MockApp{ base: base, mockApps: make(map[utils.MockAppName]docker.AppAPI), originFile: file, - bridgeFile: bridgeFile, - args: []string{"--log.debug", "--config", bridgeFile}, + rollupFile: rollupFile, + args: []string{"--log.debug", "--config", rollupFile}, } - if err := bridgeApp.MockConfig(true); err != nil { + if err := rollupApp.MockConfig(true); err != nil { panic(err) } - return bridgeApp + return rollupApp } -// RunApp run bridge-test child process by multi parameters. +// RunApp run rollup-test child process by multi parameters. func (b *MockApp) RunApp(t *testing.T, name utils.MockAppName, args ...string) { if !(name == utils.EventWatcherApp || name == utils.GasOracleApp || @@ -72,16 +72,16 @@ func (b *MockApp) WaitExit() { b.mockApps = make(map[utils.MockAppName]docker.AppAPI) } -// Free stop and release bridge mocked apps. +// Free stop and release rollup mocked apps. func (b *MockApp) Free() { b.WaitExit() - _ = os.Remove(b.bridgeFile) + _ = os.Remove(b.rollupFile) } -// MockConfig creates a new bridge config. +// MockConfig creates a new rollup config. func (b *MockApp) MockConfig(store bool) error { base := b.base - // Load origin bridge config file. + // Load origin rollup config file. cfg, err := config.NewConfig(b.originFile) if err != nil { return err @@ -97,10 +97,10 @@ func (b *MockApp) MockConfig(store bool) error { if !store { return nil } - // Store changed bridge config into a temp file. + // Store changed rollup config into a temp file. data, err := json.Marshal(b.Config) if err != nil { return err } - return os.WriteFile(b.bridgeFile, data, 0600) + return os.WriteFile(b.rollupFile, data, 0600) } diff --git a/bridge/cmd/rollup_relayer/app/app.go b/rollup/cmd/rollup_relayer/app/app.go similarity index 95% rename from bridge/cmd/rollup_relayer/app/app.go rename to rollup/cmd/rollup_relayer/app/app.go index 640c75278..dca210a32 100644 --- a/bridge/cmd/rollup_relayer/app/app.go +++ b/rollup/cmd/rollup_relayer/app/app.go @@ -17,10 +17,10 @@ import ( "scroll-tech/common/utils" "scroll-tech/common/version" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/controller/relayer" - "scroll-tech/bridge/internal/controller/watcher" - butils "scroll-tech/bridge/internal/utils" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/controller/relayer" + "scroll-tech/rollup/internal/controller/watcher" + butils "scroll-tech/rollup/internal/utils" ) var app *cli.App diff --git a/rollup/cmd/rollup_relayer/main.go b/rollup/cmd/rollup_relayer/main.go new file mode 100644 index 000000000..ffe2d3a65 --- /dev/null +++ b/rollup/cmd/rollup_relayer/main.go @@ -0,0 +1,7 @@ +package main + +import "scroll-tech/rollup/cmd/rollup_relayer/app" + +func main() { + app.Run() +} diff --git a/bridge/conf/config.json b/rollup/conf/config.json similarity index 100% rename from bridge/conf/config.json rename to rollup/conf/config.json diff --git a/bridge/coverage.sh b/rollup/coverage.sh similarity index 100% rename from bridge/coverage.sh rename to rollup/coverage.sh diff --git a/bridge/go.mod b/rollup/go.mod similarity index 99% rename from bridge/go.mod rename to rollup/go.mod index 60361a395..f576892cf 100644 --- a/bridge/go.mod +++ b/rollup/go.mod @@ -1,4 +1,4 @@ -module scroll-tech/bridge +module scroll-tech/rollup go 1.19 diff --git a/bridge/go.sum b/rollup/go.sum similarity index 100% rename from bridge/go.sum rename to rollup/go.sum diff --git a/bridge/internal/config/config.go b/rollup/internal/config/config.go similarity index 100% rename from bridge/internal/config/config.go rename to rollup/internal/config/config.go diff --git a/bridge/internal/config/config_test.go b/rollup/internal/config/config_test.go similarity index 95% rename from bridge/internal/config/config_test.go rename to rollup/internal/config/config_test.go index d62b78d83..02addcf1e 100644 --- a/bridge/internal/config/config_test.go +++ b/rollup/internal/config/config_test.go @@ -18,7 +18,7 @@ func TestConfig(t *testing.T) { data, err := json.Marshal(cfg) assert.NoError(t, err) - tmpJSON := fmt.Sprintf("/tmp/%d_bridge_config.json", time.Now().Nanosecond()) + tmpJSON := fmt.Sprintf("/tmp/%d_rollup_config.json", time.Now().Nanosecond()) defer func() { if _, err = os.Stat(tmpJSON); err == nil { assert.NoError(t, os.Remove(tmpJSON)) diff --git a/bridge/internal/config/l1.go b/rollup/internal/config/l1.go similarity index 100% rename from bridge/internal/config/l1.go rename to rollup/internal/config/l1.go diff --git a/bridge/internal/config/l2.go b/rollup/internal/config/l2.go similarity index 100% rename from bridge/internal/config/l2.go rename to rollup/internal/config/l2.go diff --git a/bridge/internal/config/relayer.go b/rollup/internal/config/relayer.go similarity index 100% rename from bridge/internal/config/relayer.go rename to rollup/internal/config/relayer.go diff --git a/bridge/internal/controller/relayer/common.go b/rollup/internal/controller/relayer/common.go similarity index 100% rename from bridge/internal/controller/relayer/common.go rename to rollup/internal/controller/relayer/common.go diff --git a/bridge/internal/controller/relayer/l1_relayer.go b/rollup/internal/controller/relayer/l1_relayer.go similarity index 93% rename from bridge/internal/controller/relayer/l1_relayer.go rename to rollup/internal/controller/relayer/l1_relayer.go index d513a1051..54570d1ce 100644 --- a/bridge/internal/controller/relayer/l1_relayer.go +++ b/rollup/internal/controller/relayer/l1_relayer.go @@ -14,10 +14,10 @@ import ( "scroll-tech/common/types" - bridgeAbi "scroll-tech/bridge/abi" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/controller/sender" - "scroll-tech/bridge/internal/orm" + bridgeAbi "scroll-tech/rollup/abi" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/controller/sender" + "scroll-tech/rollup/internal/orm" ) // Layer1Relayer is responsible for @@ -80,7 +80,7 @@ func NewLayer1Relayer(ctx context.Context, db *gorm.DB, cfg *config.RelayerConfi // ProcessGasPriceOracle imports gas price to layer2 func (r *Layer1Relayer) ProcessGasPriceOracle() { - r.metrics.bridgeL1RelayerGasPriceOraclerRunTotal.Inc() + r.metrics.rollupL1RelayerGasPriceOraclerRunTotal.Inc() latestBlockHeight, err := r.l1BlockOrm.GetLatestL1BlockHeight(r.ctx) if err != nil { log.Warn("Failed to fetch latest L1 block height from db", "err", err) @@ -125,7 +125,7 @@ func (r *Layer1Relayer) ProcessGasPriceOracle() { return } r.lastGasPrice = block.BaseFee - r.metrics.bridgeL1RelayerLastGasPrice.Set(float64(r.lastGasPrice)) + r.metrics.rollupL1RelayerLastGasPrice.Set(float64(r.lastGasPrice)) log.Info("Update l1 base fee", "txHash", hash.String(), "baseFee", baseFee) } } @@ -137,7 +137,7 @@ func (r *Layer1Relayer) handleConfirmLoop(ctx context.Context) { case <-ctx.Done(): return case cfm := <-r.gasOracleSender.ConfirmChan(): - r.metrics.bridgeL1GasOraclerConfirmedTotal.Inc() + r.metrics.rollupL1GasOraclerConfirmedTotal.Inc() if !cfm.IsSuccessful { // @discuss: maybe make it pending again? err := r.l1BlockOrm.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleFailed, cfm.TxHash.String()) diff --git a/rollup/internal/controller/relayer/l1_relayer_metrics.go b/rollup/internal/controller/relayer/l1_relayer_metrics.go new file mode 100644 index 000000000..5c9f96acd --- /dev/null +++ b/rollup/internal/controller/relayer/l1_relayer_metrics.go @@ -0,0 +1,54 @@ +package relayer + +import ( + "sync" + + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" +) + +type l1RelayerMetrics struct { + rollupL1RelayedMsgsTotal prometheus.Counter + rollupL1RelayedMsgsFailureTotal prometheus.Counter + rollupL1RelayerGasPriceOraclerRunTotal prometheus.Counter + rollupL1RelayerLastGasPrice prometheus.Gauge + rollupL1MsgsRelayedConfirmedTotal prometheus.Counter + rollupL1GasOraclerConfirmedTotal prometheus.Counter +} + +var ( + initL1RelayerMetricOnce sync.Once + l1RelayerMetric *l1RelayerMetrics +) + +func initL1RelayerMetrics(reg prometheus.Registerer) *l1RelayerMetrics { + initL1RelayerMetricOnce.Do(func() { + l1RelayerMetric = &l1RelayerMetrics{ + rollupL1RelayedMsgsTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer1_msg_relayed_total", + Help: "The total number of the l1 relayed message.", + }), + rollupL1RelayedMsgsFailureTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer1_msg_relayed_failure_total", + Help: "The total number of the l1 relayed failure message.", + }), + rollupL1MsgsRelayedConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer1_relayed_confirmed_total", + Help: "The total number of layer1 relayed confirmed", + }), + rollupL1RelayerGasPriceOraclerRunTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer1_gas_price_oracler_total", + Help: "The total number of layer1 gas price oracler run total", + }), + rollupL1RelayerLastGasPrice: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ + Name: "rollup_layer1_gas_price_latest_gas_price", + Help: "The latest gas price of rollup relayer l1", + }), + rollupL1GasOraclerConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer1_gas_oracler_confirmed_total", + Help: "The total number of layer1 relayed confirmed", + }), + } + }) + return l1RelayerMetric +} diff --git a/bridge/internal/controller/relayer/l1_relayer_test.go b/rollup/internal/controller/relayer/l1_relayer_test.go similarity index 98% rename from bridge/internal/controller/relayer/l1_relayer_test.go rename to rollup/internal/controller/relayer/l1_relayer_test.go index e4c3530bb..17c5a28e9 100644 --- a/bridge/internal/controller/relayer/l1_relayer_test.go +++ b/rollup/internal/controller/relayer/l1_relayer_test.go @@ -18,8 +18,8 @@ import ( "scroll-tech/database/migrate" - "scroll-tech/bridge/internal/controller/sender" - "scroll-tech/bridge/internal/orm" + "scroll-tech/rollup/internal/controller/sender" + "scroll-tech/rollup/internal/orm" ) func setupL1RelayerDB(t *testing.T) *gorm.DB { diff --git a/bridge/internal/controller/relayer/l2_relayer.go b/rollup/internal/controller/relayer/l2_relayer.go similarity index 96% rename from bridge/internal/controller/relayer/l2_relayer.go rename to rollup/internal/controller/relayer/l2_relayer.go index e6ccc22e1..74397d011 100644 --- a/bridge/internal/controller/relayer/l2_relayer.go +++ b/rollup/internal/controller/relayer/l2_relayer.go @@ -20,10 +20,10 @@ import ( "scroll-tech/common/types" - bridgeAbi "scroll-tech/bridge/abi" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/controller/sender" - "scroll-tech/bridge/internal/orm" + bridgeAbi "scroll-tech/rollup/abi" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/controller/sender" + "scroll-tech/rollup/internal/orm" ) // Layer2Relayer is responsible for @@ -264,7 +264,7 @@ func (r *Layer2Relayer) commitGenesisBatch(batchHash string, batchHeader []byte, // ProcessGasPriceOracle imports gas price to layer1 func (r *Layer2Relayer) ProcessGasPriceOracle() { - r.metrics.bridgeL2RelayerGasPriceOraclerRunTotal.Inc() + r.metrics.rollupL2RelayerGasPriceOraclerRunTotal.Inc() batch, err := r.batchOrm.GetLatestBatch(r.ctx) if batch == nil || err != nil { log.Error("Failed to GetLatestBatch", "batch", batch, "err", err) @@ -302,7 +302,7 @@ func (r *Layer2Relayer) ProcessGasPriceOracle() { return } r.lastGasPrice = suggestGasPriceUint64 - r.metrics.bridgeL2RelayerLastGasPrice.Set(float64(r.lastGasPrice)) + r.metrics.rollupL2RelayerLastGasPrice.Set(float64(r.lastGasPrice)) log.Info("Update l2 gas price", "txHash", hash.String(), "GasPrice", suggestGasPrice) } } @@ -317,7 +317,7 @@ func (r *Layer2Relayer) ProcessPendingBatches() { return } for _, batch := range pendingBatches { - r.metrics.bridgeL2RelayerProcessPendingBatchTotal.Inc() + r.metrics.rollupL2RelayerProcessPendingBatchTotal.Inc() // get current header and parent header. currentBatchHeader, err := types.DecodeBatchHeader(batch.BatchHeader) if err != nil { @@ -400,7 +400,7 @@ func (r *Layer2Relayer) ProcessPendingBatches() { log.Error("UpdateCommitTxHashAndRollupStatus failed", "hash", batch.Hash, "index", batch.Index, "err", err) return } - r.metrics.bridgeL2RelayerProcessPendingBatchSuccessTotal.Inc() + r.metrics.rollupL2RelayerProcessPendingBatchSuccessTotal.Inc() r.processingCommitment.Store(txID, batch.Hash) log.Info("Sent the commitBatch tx to layer1", "batch index", batch.Index, "batch hash", batch.Hash, "tx hash", txHash.Hex()) } @@ -424,7 +424,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() { return } - r.metrics.bridgeL2RelayerProcessCommittedBatchesTotal.Inc() + r.metrics.rollupL2RelayerProcessCommittedBatchesTotal.Inc() batch := batches[0] hash := batch.Hash @@ -435,17 +435,17 @@ func (r *Layer2Relayer) ProcessCommittedBatches() { return case types.ProvingTaskVerified: log.Info("Start to roll up zk proof", "hash", hash) - r.metrics.bridgeL2RelayerProcessCommittedBatchesFinalizedTotal.Inc() + r.metrics.rollupL2RelayerProcessCommittedBatchesFinalizedTotal.Inc() // Check batch status before send `finalizeBatchWithProof` tx. //batchStatus, err := r.getBatchStatusByIndex(batch.Index) //if err != nil { - // r.metrics.bridgeL2ChainMonitorLatestFailedCall.Inc() + // r.metrics.rollupL2ChainMonitorLatestFailedCall.Inc() // log.Warn("failed to get batch status, please check chain_monitor api server", "batch_index", batch.Index, "err", err) // return //} //if !batchStatus { - // r.metrics.bridgeL2ChainMonitorLatestFailedBatchStatus.Inc() + // r.metrics.rollupL2ChainMonitorLatestFailedBatchStatus.Inc() // log.Error("the batch status is not right, stop finalize batch and check the reason", "batch_index", batch.Index) // return //} @@ -524,7 +524,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() { "tx hash", finalizeTxHash.String(), "err", err) } r.processingFinalization.Store(txID, hash) - r.metrics.bridgeL2RelayerProcessCommittedBatchesFinalizedSuccessTotal.Inc() + r.metrics.rollupL2RelayerProcessCommittedBatchesFinalizedSuccessTotal.Inc() case types.ProvingTaskFailed: // We were unable to prove this batch. There are two possibilities: @@ -592,7 +592,7 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) { "batch hash", batchHash.(string), "tx hash", confirmation.TxHash.String(), "err", err) } - r.metrics.bridgeL2BatchesCommittedConfirmedTotal.Inc() + r.metrics.rollupL2BatchesCommittedConfirmedTotal.Inc() r.processingCommitment.Delete(confirmation.ID) } @@ -614,7 +614,7 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) { "batch hash", batchHash.(string), "tx hash", confirmation.TxHash.String(), "err", err) } - r.metrics.bridgeL2BatchesFinalizedConfirmedTotal.Inc() + r.metrics.rollupL2BatchesFinalizedConfirmedTotal.Inc() r.processingFinalization.Delete(confirmation.ID) } log.Info("transaction confirmed in layer1", "type", transactionType, "confirmation", confirmation) @@ -630,7 +630,7 @@ func (r *Layer2Relayer) handleConfirmLoop(ctx context.Context) { case confirmation := <-r.finalizeSender.ConfirmChan(): r.handleConfirmation(confirmation) case cfm := <-r.gasOracleSender.ConfirmChan(): - r.metrics.bridgeL2BatchesGasOraclerConfirmedTotal.Inc() + r.metrics.rollupL2BatchesGasOraclerConfirmedTotal.Inc() if !cfm.IsSuccessful { // @discuss: maybe make it pending again? err := r.batchOrm.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleFailed, cfm.TxHash.String()) diff --git a/rollup/internal/controller/relayer/l2_relayer_metrics.go b/rollup/internal/controller/relayer/l2_relayer_metrics.go new file mode 100644 index 000000000..012a167f8 --- /dev/null +++ b/rollup/internal/controller/relayer/l2_relayer_metrics.go @@ -0,0 +1,84 @@ +package relayer + +import ( + "sync" + + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" +) + +type l2RelayerMetrics struct { + rollupL2RelayerProcessPendingBatchTotal prometheus.Counter + rollupL2RelayerProcessPendingBatchSuccessTotal prometheus.Counter + rollupL2RelayerGasPriceOraclerRunTotal prometheus.Counter + rollupL2RelayerLastGasPrice prometheus.Gauge + rollupL2RelayerProcessCommittedBatchesTotal prometheus.Counter + rollupL2RelayerProcessCommittedBatchesFinalizedTotal prometheus.Counter + rollupL2RelayerProcessCommittedBatchesFinalizedSuccessTotal prometheus.Counter + rollupL2BatchesCommittedConfirmedTotal prometheus.Counter + rollupL2BatchesFinalizedConfirmedTotal prometheus.Counter + rollupL2BatchesGasOraclerConfirmedTotal prometheus.Counter + rollupL2ChainMonitorLatestFailedCall prometheus.Counter + rollupL2ChainMonitorLatestFailedBatchStatus prometheus.Counter +} + +var ( + initL2RelayerMetricOnce sync.Once + l2RelayerMetric *l2RelayerMetrics +) + +func initL2RelayerMetrics(reg prometheus.Registerer) *l2RelayerMetrics { + initL2RelayerMetricOnce.Do(func() { + l2RelayerMetric = &l2RelayerMetrics{ + rollupL2RelayerProcessPendingBatchTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_process_pending_batch_total", + Help: "The total number of layer2 process pending batch", + }), + rollupL2RelayerProcessPendingBatchSuccessTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_process_pending_batch_success_total", + Help: "The total number of layer2 process pending success batch", + }), + rollupL2RelayerGasPriceOraclerRunTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_gas_price_oracler_total", + Help: "The total number of layer2 gas price oracler run total", + }), + rollupL2RelayerLastGasPrice: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ + Name: "rollup_layer2_gas_price_latest_gas_price", + Help: "The latest gas price of rollup relayer l2", + }), + rollupL2RelayerProcessCommittedBatchesTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_process_committed_batches_total", + Help: "The total number of layer2 process committed batches run total", + }), + rollupL2RelayerProcessCommittedBatchesFinalizedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_process_committed_batches_finalized_total", + Help: "The total number of layer2 process committed batches finalized total", + }), + rollupL2RelayerProcessCommittedBatchesFinalizedSuccessTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_process_committed_batches_finalized_success_total", + Help: "The total number of layer2 process committed batches finalized success total", + }), + rollupL2BatchesCommittedConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_process_committed_batches_confirmed_total", + Help: "The total number of layer2 process committed batches confirmed total", + }), + rollupL2BatchesFinalizedConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_process_finalized_batches_confirmed_total", + Help: "The total number of layer2 process finalized batches confirmed total", + }), + rollupL2BatchesGasOraclerConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_process_gras_oracler_confirmed_total", + Help: "The total number of layer2 process finalized batches confirmed total", + }), + rollupL2ChainMonitorLatestFailedCall: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_chain_monitor_latest_failed_batch_call", + Help: "The total number of failed call chain_monitor api", + }), + rollupL2ChainMonitorLatestFailedBatchStatus: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_layer2_chain_monitor_latest_failed_batch_status", + Help: "The total number of failed batch status get from chain_monitor", + }), + } + }) + return l2RelayerMetric +} diff --git a/bridge/internal/controller/relayer/l2_relayer_test.go b/rollup/internal/controller/relayer/l2_relayer_test.go similarity index 99% rename from bridge/internal/controller/relayer/l2_relayer_test.go rename to rollup/internal/controller/relayer/l2_relayer_test.go index deb7f1470..b2a368d49 100644 --- a/bridge/internal/controller/relayer/l2_relayer_test.go +++ b/rollup/internal/controller/relayer/l2_relayer_test.go @@ -22,8 +22,8 @@ import ( "scroll-tech/database/migrate" - "scroll-tech/bridge/internal/controller/sender" - "scroll-tech/bridge/internal/orm" + "scroll-tech/rollup/internal/controller/sender" + "scroll-tech/rollup/internal/orm" ) func setupL2RelayerDB(t *testing.T) *gorm.DB { diff --git a/bridge/internal/controller/relayer/relayer_test.go b/rollup/internal/controller/relayer/relayer_test.go similarity index 98% rename from bridge/internal/controller/relayer/relayer_test.go rename to rollup/internal/controller/relayer/relayer_test.go index 3c1e0788b..86c1b8e68 100644 --- a/bridge/internal/controller/relayer/relayer_test.go +++ b/rollup/internal/controller/relayer/relayer_test.go @@ -13,7 +13,7 @@ import ( "scroll-tech/common/docker" "scroll-tech/common/types" - "scroll-tech/bridge/internal/config" + "scroll-tech/rollup/internal/config" ) var ( diff --git a/bridge/internal/controller/sender/estimategas.go b/rollup/internal/controller/sender/estimategas.go similarity index 100% rename from bridge/internal/controller/sender/estimategas.go rename to rollup/internal/controller/sender/estimategas.go diff --git a/bridge/internal/controller/sender/metrics.go b/rollup/internal/controller/sender/metrics.go similarity index 84% rename from bridge/internal/controller/sender/metrics.go rename to rollup/internal/controller/sender/metrics.go index c77406d50..f93ed4cb2 100644 --- a/bridge/internal/controller/sender/metrics.go +++ b/rollup/internal/controller/sender/metrics.go @@ -33,59 +33,59 @@ func initSenderMetrics(reg prometheus.Registerer) *senderMetrics { initSenderMetricOnce.Do(func() { sm = &senderMetrics{ sendTransactionTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ - Name: "bridge_sender_send_transaction_total", + Name: "rollup_sender_send_transaction_total", Help: "The total number of sending transaction.", }, []string{"service", "name"}), sendTransactionFailureFullTx: promauto.With(reg).NewGaugeVec(prometheus.GaugeOpts{ - Name: "bridge_sender_send_transaction_full_tx_failure_total", + Name: "rollup_sender_send_transaction_full_tx_failure_total", Help: "The total number of sending transaction failure for full size tx.", }, []string{"service", "name"}), sendTransactionFailureRepeatTransaction: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ - Name: "bridge_sender_send_transaction_repeat_transaction_failure_total", + Name: "rollup_sender_send_transaction_repeat_transaction_failure_total", Help: "The total number of sending transaction failure for repeat transaction.", }, []string{"service", "name"}), sendTransactionFailureGetFee: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ - Name: "bridge_sender_send_transaction_get_fee_failure_total", + Name: "rollup_sender_send_transaction_get_fee_failure_total", Help: "The total number of sending transaction failure for getting fee.", }, []string{"service", "name"}), sendTransactionFailureSendTx: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ - Name: "bridge_sender_send_transaction_send_tx_failure_total", + Name: "rollup_sender_send_transaction_send_tx_failure_total", Help: "The total number of sending transaction failure for sending tx.", }, []string{"service", "name"}), resubmitTransactionTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ - Name: "bridge_sender_send_transaction_resubmit_send_transaction_total", + Name: "rollup_sender_send_transaction_resubmit_send_transaction_total", Help: "The total number of resubmit transaction.", }, []string{"service", "name"}), currentPendingTxsNum: promauto.With(reg).NewGaugeVec(prometheus.GaugeOpts{ - Name: "bridge_sender_pending_tx_count", + Name: "rollup_sender_pending_tx_count", Help: "The pending tx count in the sender.", }, []string{"service", "name"}), currentGasFeeCap: promauto.With(reg).NewGaugeVec(prometheus.GaugeOpts{ - Name: "bridge_sender_gas_fee_cap", + Name: "rollup_sender_gas_fee_cap", Help: "The gas fee of current transaction.", }, []string{"service", "name"}), currentGasTipCap: promauto.With(reg).NewGaugeVec(prometheus.GaugeOpts{ - Name: "bridge_sender_gas_tip_cap", + Name: "rollup_sender_gas_tip_cap", Help: "The gas tip of current transaction.", }, []string{"service", "name"}), currentGasPrice: promauto.With(reg).NewGaugeVec(prometheus.GaugeOpts{ - Name: "bridge_sender_gas_price_cap", + Name: "rollup_sender_gas_price_cap", Help: "The gas price of current transaction.", }, []string{"service", "name"}), currentGasLimit: promauto.With(reg).NewGaugeVec(prometheus.GaugeOpts{ - Name: "bridge_sender_gas_limit", + Name: "rollup_sender_gas_limit", Help: "The gas limit of current transaction.", }, []string{"service", "name"}), currentNonce: promauto.With(reg).NewGaugeVec(prometheus.GaugeOpts{ - Name: "bridge_sender_nonce", + Name: "rollup_sender_nonce", Help: "The nonce of current transaction.", }, []string{"service", "name"}), senderCheckPendingTransactionTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ - Name: "bridge_sender_check_pending_transaction_total", + Name: "rollup_sender_check_pending_transaction_total", Help: "The total number of check pending transaction.", }, []string{"service", "name"}), senderCheckBalancerTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{ - Name: "bridge_sender_check_balancer_total", + Name: "rollup_sender_check_balancer_total", Help: "The total number of check balancer.", }, []string{"service", "name"}), } diff --git a/bridge/internal/controller/sender/sender.go b/rollup/internal/controller/sender/sender.go similarity index 99% rename from bridge/internal/controller/sender/sender.go rename to rollup/internal/controller/sender/sender.go index 8a336e4bc..fc2ea955b 100644 --- a/bridge/internal/controller/sender/sender.go +++ b/rollup/internal/controller/sender/sender.go @@ -18,8 +18,8 @@ import ( "github.com/scroll-tech/go-ethereum/ethclient" "github.com/scroll-tech/go-ethereum/log" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/utils" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/utils" ) const ( diff --git a/bridge/internal/controller/sender/sender_test.go b/rollup/internal/controller/sender/sender_test.go similarity index 99% rename from bridge/internal/controller/sender/sender_test.go rename to rollup/internal/controller/sender/sender_test.go index a81b88a18..dc94a6b01 100644 --- a/bridge/internal/controller/sender/sender_test.go +++ b/rollup/internal/controller/sender/sender_test.go @@ -19,7 +19,7 @@ import ( "scroll-tech/common/docker" - "scroll-tech/bridge/internal/config" + "scroll-tech/rollup/internal/config" ) const TXBatch = 50 diff --git a/bridge/internal/controller/watcher/batch_proposer.go b/rollup/internal/controller/watcher/batch_proposer.go similarity index 93% rename from bridge/internal/controller/watcher/batch_proposer.go rename to rollup/internal/controller/watcher/batch_proposer.go index 0baa64e0d..e1ccc5b7b 100644 --- a/bridge/internal/controller/watcher/batch_proposer.go +++ b/rollup/internal/controller/watcher/batch_proposer.go @@ -12,8 +12,8 @@ import ( "scroll-tech/common/types" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/orm" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/orm" ) // BatchProposer proposes batches based on available unbatched chunks. @@ -63,39 +63,39 @@ func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, db * gasCostIncreaseMultiplier: cfg.GasCostIncreaseMultiplier, batchProposerCircleTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_batch_circle_total", + Name: "rollup_propose_batch_circle_total", Help: "Total number of propose batch total.", }), proposeBatchFailureTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_batch_failure_circle_total", + Name: "rollup_propose_batch_failure_circle_total", Help: "Total number of propose batch total.", }), proposeBatchUpdateInfoTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_batch_update_info_total", + Name: "rollup_propose_batch_update_info_total", Help: "Total number of propose batch update info total.", }), proposeBatchUpdateInfoFailureTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_batch_update_info_failure_total", + Name: "rollup_propose_batch_update_info_failure_total", Help: "Total number of propose batch update info failure total.", }), totalL1CommitGas: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_propose_batch_total_l1_commit_gas", + Name: "rollup_propose_batch_total_l1_commit_gas", Help: "The total l1 commit gas", }), totalL1CommitCalldataSize: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_propose_batch_total_l1_call_data_size", + Name: "rollup_propose_batch_total_l1_call_data_size", Help: "The total l1 call data size", }), batchChunksNum: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_propose_batch_chunks_number", + Name: "rollup_propose_batch_chunks_number", Help: "The number of chunks in the batch", }), batchFirstBlockTimeoutReached: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_batch_first_block_timeout_reached_total", + Name: "rollup_propose_batch_first_block_timeout_reached_total", Help: "Total times of batch's first block timeout reached", }), batchChunksProposeNotEnoughTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_batch_chunks_propose_not_enough_total", + Name: "rollup_propose_batch_chunks_propose_not_enough_total", Help: "Total number of batch chunk propose not enough", }), } @@ -122,7 +122,7 @@ func (p *BatchProposer) updateBatchInfoInDB(dbChunks []*orm.Chunk, batchMeta *ty if numChunks <= 0 { return nil } - chunks, err := p.dbChunksToBridgeChunks(dbChunks) + chunks, err := p.dbChunksToRollupChunks(dbChunks) if err != nil { return err } @@ -269,7 +269,7 @@ func (p *BatchProposer) proposeBatchChunks() ([]*orm.Chunk, *types.BatchMeta, er return nil, nil, nil } -func (p *BatchProposer) dbChunksToBridgeChunks(dbChunks []*orm.Chunk) ([]*types.Chunk, error) { +func (p *BatchProposer) dbChunksToRollupChunks(dbChunks []*orm.Chunk) ([]*types.Chunk, error) { chunks := make([]*types.Chunk, len(dbChunks)) for i, c := range dbChunks { wrappedBlocks, err := p.l2BlockOrm.GetL2BlocksInRange(p.ctx, c.StartBlockNumber, c.EndBlockNumber) diff --git a/bridge/internal/controller/watcher/batch_proposer_test.go b/rollup/internal/controller/watcher/batch_proposer_test.go similarity index 96% rename from bridge/internal/controller/watcher/batch_proposer_test.go rename to rollup/internal/controller/watcher/batch_proposer_test.go index 689b7cf50..69467f11a 100644 --- a/bridge/internal/controller/watcher/batch_proposer_test.go +++ b/rollup/internal/controller/watcher/batch_proposer_test.go @@ -9,8 +9,8 @@ import ( "scroll-tech/common/database" "scroll-tech/common/types" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/orm" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/orm" ) // TODO: Add unit tests that the limits are enforced correctly. diff --git a/bridge/internal/controller/watcher/chunk_proposer.go b/rollup/internal/controller/watcher/chunk_proposer.go similarity index 93% rename from bridge/internal/controller/watcher/chunk_proposer.go rename to rollup/internal/controller/watcher/chunk_proposer.go index 2c8098258..42a45253f 100644 --- a/bridge/internal/controller/watcher/chunk_proposer.go +++ b/rollup/internal/controller/watcher/chunk_proposer.go @@ -14,8 +14,8 @@ import ( "scroll-tech/common/types" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/orm" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/orm" ) // maxNumBlockPerChunk is the maximum number of blocks we allow per chunk. @@ -98,51 +98,51 @@ func NewChunkProposer(ctx context.Context, cfg *config.ChunkProposerConfig, db * gasCostIncreaseMultiplier: cfg.GasCostIncreaseMultiplier, chunkProposerCircleTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_chunk_circle_total", + Name: "rollup_propose_chunk_circle_total", Help: "Total number of propose chunk total.", }), proposeChunkFailureTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_chunk_failure_circle_total", + Name: "rollup_propose_chunk_failure_circle_total", Help: "Total number of propose chunk failure total.", }), proposeChunkUpdateInfoTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_chunk_update_info_total", + Name: "rollup_propose_chunk_update_info_total", Help: "Total number of propose chunk update info total.", }), proposeChunkUpdateInfoFailureTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_chunk_update_info_failure_total", + Name: "rollup_propose_chunk_update_info_failure_total", Help: "Total number of propose chunk update info failure total.", }), chunkTxNum: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_propose_chunk_tx_num", + Name: "rollup_propose_chunk_tx_num", Help: "The chunk tx num", }), chunkEstimateL1CommitGas: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_propose_chunk_estimate_l1_commit_gas", + Name: "rollup_propose_chunk_estimate_l1_commit_gas", Help: "The chunk estimate l1 commit gas", }), totalL1CommitCalldataSize: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_propose_chunk_total_l1_commit_call_data_size", + Name: "rollup_propose_chunk_total_l1_commit_call_data_size", Help: "The total l1 commit call data size", }), totalTxGasUsed: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_propose_chunk_total_tx_gas_used", + Name: "rollup_propose_chunk_total_tx_gas_used", Help: "The total tx gas used", }), maxTxConsumption: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_propose_chunk_max_tx_consumption", + Name: "rollup_propose_chunk_max_tx_consumption", Help: "The max tx consumption", }), chunkBlocksNum: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_propose_chunk_chunk_block_number", + Name: "rollup_propose_chunk_chunk_block_number", Help: "The number of blocks in the chunk", }), chunkFirstBlockTimeoutReached: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_chunk_first_block_timeout_reached_total", + Name: "rollup_propose_chunk_first_block_timeout_reached_total", Help: "Total times of chunk's first block timeout reached", }), chunkBlocksProposeNotEnoughTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_propose_chunk_blocks_propose_not_enough_total", + Name: "rollup_propose_chunk_blocks_propose_not_enough_total", Help: "Total number of chunk block propose not enough", }), } diff --git a/bridge/internal/controller/watcher/chunk_proposer_test.go b/rollup/internal/controller/watcher/chunk_proposer_test.go similarity index 96% rename from bridge/internal/controller/watcher/chunk_proposer_test.go rename to rollup/internal/controller/watcher/chunk_proposer_test.go index 7057ac2dd..6899d07e4 100644 --- a/bridge/internal/controller/watcher/chunk_proposer_test.go +++ b/rollup/internal/controller/watcher/chunk_proposer_test.go @@ -9,8 +9,8 @@ import ( "scroll-tech/common/database" "scroll-tech/common/types" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/orm" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/orm" ) // TODO: Add unit tests that the limits are enforced correctly. diff --git a/bridge/internal/controller/watcher/common.go b/rollup/internal/controller/watcher/common.go similarity index 100% rename from bridge/internal/controller/watcher/common.go rename to rollup/internal/controller/watcher/common.go diff --git a/bridge/internal/controller/watcher/l1_watcher.go b/rollup/internal/controller/watcher/l1_watcher.go similarity index 99% rename from bridge/internal/controller/watcher/l1_watcher.go rename to rollup/internal/controller/watcher/l1_watcher.go index 4ad6f2126..820e578a8 100644 --- a/bridge/internal/controller/watcher/l1_watcher.go +++ b/rollup/internal/controller/watcher/l1_watcher.go @@ -17,9 +17,9 @@ import ( "scroll-tech/common/types" - bridgeAbi "scroll-tech/bridge/abi" - "scroll-tech/bridge/internal/orm" - "scroll-tech/bridge/internal/utils" + bridgeAbi "scroll-tech/rollup/abi" + "scroll-tech/rollup/internal/orm" + "scroll-tech/rollup/internal/utils" ) type rollupEvent struct { diff --git a/bridge/internal/controller/watcher/l1_watcher_metrics.go b/rollup/internal/controller/watcher/l1_watcher_metrics.go similarity index 83% rename from bridge/internal/controller/watcher/l1_watcher_metrics.go rename to rollup/internal/controller/watcher/l1_watcher_metrics.go index 4de1f0d08..c01c63418 100644 --- a/bridge/internal/controller/watcher/l1_watcher_metrics.go +++ b/rollup/internal/controller/watcher/l1_watcher_metrics.go @@ -26,31 +26,31 @@ func initL1WatcherMetrics(reg prometheus.Registerer) *l1WatcherMetrics { initL1WatcherMetricOnce.Do(func() { l1WatcherMetric = &l1WatcherMetrics{ l1WatcherFetchBlockHeaderTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_l1_watcher_fetch_block_header_total", + Name: "rollup_l1_watcher_fetch_block_header_total", Help: "The total number of l1 watcher fetch block header total", }), l1WatcherFetchBlockHeaderProcessedBlockHeight: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_l1_watcher_fetch_block_header_processed_block_height", + Name: "rollup_l1_watcher_fetch_block_header_processed_block_height", Help: "The current processed block height of l1 watcher fetch block header", }), l1WatcherFetchContractEventTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_l1_watcher_fetch_block_contract_event_total", + Name: "rollup_l1_watcher_fetch_block_contract_event_total", Help: "The total number of l1 watcher fetch contract event total", }), l1WatcherFetchContractEventSuccessTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_l1_watcher_fetch_block_contract_event_success_total", + Name: "rollup_l1_watcher_fetch_block_contract_event_success_total", Help: "The total number of l1 watcher fetch contract event success total", }), l1WatcherFetchContractEventProcessedBlockHeight: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_l1_watcher_fetch_block_contract_event_processed_block_height", + Name: "rollup_l1_watcher_fetch_block_contract_event_processed_block_height", Help: "The current processed block height of l1 watcher fetch contract event", }), l1WatcherFetchContractEventSentEventsTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_l1_watcher_fetch_block_contract_event_sent_event_total", + Name: "rollup_l1_watcher_fetch_block_contract_event_sent_event_total", Help: "The current processed block height of l1 watcher fetch contract sent event", }), l1WatcherFetchContractEventRollupEventsTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_l1_watcher_fetch_block_contract_event_rollup_event_total", + Name: "rollup_l1_watcher_fetch_block_contract_event_rollup_event_total", Help: "The current processed block height of l1 watcher fetch contract rollup event", }), } diff --git a/bridge/internal/controller/watcher/l1_watcher_test.go b/rollup/internal/controller/watcher/l1_watcher_test.go similarity index 99% rename from bridge/internal/controller/watcher/l1_watcher_test.go rename to rollup/internal/controller/watcher/l1_watcher_test.go index 0edff4e17..ffeb18faa 100644 --- a/bridge/internal/controller/watcher/l1_watcher_test.go +++ b/rollup/internal/controller/watcher/l1_watcher_test.go @@ -20,9 +20,9 @@ import ( "scroll-tech/common/database" commonTypes "scroll-tech/common/types" - bridgeAbi "scroll-tech/bridge/abi" - "scroll-tech/bridge/internal/orm" - "scroll-tech/bridge/internal/utils" + bridgeAbi "scroll-tech/rollup/abi" + "scroll-tech/rollup/internal/orm" + "scroll-tech/rollup/internal/utils" ) func setupL1Watcher(t *testing.T) (*L1WatcherClient, *gorm.DB) { diff --git a/bridge/internal/controller/watcher/l2_watcher.go b/rollup/internal/controller/watcher/l2_watcher.go similarity index 97% rename from bridge/internal/controller/watcher/l2_watcher.go rename to rollup/internal/controller/watcher/l2_watcher.go index 231d020ec..8cd5cd00a 100644 --- a/bridge/internal/controller/watcher/l2_watcher.go +++ b/rollup/internal/controller/watcher/l2_watcher.go @@ -19,9 +19,9 @@ import ( "scroll-tech/common/types" - bridgeAbi "scroll-tech/bridge/abi" - "scroll-tech/bridge/internal/orm" - "scroll-tech/bridge/internal/utils" + bridgeAbi "scroll-tech/rollup/abi" + "scroll-tech/rollup/internal/orm" + "scroll-tech/rollup/internal/utils" ) // L2WatcherClient provide APIs which support others to subscribe to various event from l2geth @@ -116,7 +116,7 @@ func (w *L2WatcherClient) TryFetchRunningMissingBlocks(blockHeight uint64) { return } w.metrics.fetchRunningMissingBlocksHeight.Set(float64(to)) - w.metrics.bridgeL2BlocksFetchedGap.Set(float64(blockHeight - to)) + w.metrics.rollupL2BlocksFetchedGap.Set(float64(blockHeight - to)) } } @@ -246,7 +246,7 @@ func (w *L2WatcherClient) FetchContractEvent() { } relayedMessageCount := int64(len(relayedMessageEvents)) - w.metrics.bridgeL2MsgsRelayedEventsTotal.Add(float64(relayedMessageCount)) + w.metrics.rollupL2MsgsRelayedEventsTotal.Add(float64(relayedMessageCount)) log.Info("L2 events types", "RelayedMessageCount", relayedMessageCount) // Update relayed message first to make sure we don't forget to update submited message. diff --git a/bridge/internal/controller/watcher/l2_watcher_metrics.go b/rollup/internal/controller/watcher/l2_watcher_metrics.go similarity index 71% rename from bridge/internal/controller/watcher/l2_watcher_metrics.go rename to rollup/internal/controller/watcher/l2_watcher_metrics.go index 156e27581..627382349 100644 --- a/bridge/internal/controller/watcher/l2_watcher_metrics.go +++ b/rollup/internal/controller/watcher/l2_watcher_metrics.go @@ -12,8 +12,8 @@ type l2WatcherMetrics struct { fetchRunningMissingBlocksHeight prometheus.Gauge fetchContractEventTotal prometheus.Counter fetchContractEventHeight prometheus.Gauge - bridgeL2MsgsRelayedEventsTotal prometheus.Counter - bridgeL2BlocksFetchedGap prometheus.Gauge + rollupL2MsgsRelayedEventsTotal prometheus.Counter + rollupL2BlocksFetchedGap prometheus.Gauge } var ( @@ -25,27 +25,27 @@ func initL2WatcherMetrics(reg prometheus.Registerer) *l2WatcherMetrics { initL2WatcherMetricOnce.Do(func() { l2WatcherMetric = &l2WatcherMetrics{ fetchRunningMissingBlocksTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_l2_watcher_fetch_running_missing_blocks_total", + Name: "rollup_l2_watcher_fetch_running_missing_blocks_total", Help: "The total number of l2 watcher fetch running missing blocks", }), fetchRunningMissingBlocksHeight: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_l2_watcher_fetch_running_missing_blocks_height", + Name: "rollup_l2_watcher_fetch_running_missing_blocks_height", Help: "The total number of l2 watcher fetch running missing blocks height", }), fetchContractEventTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_l2_watcher_fetch_contract_events_total", + Name: "rollup_l2_watcher_fetch_contract_events_total", Help: "The total number of l2 watcher fetch contract events", }), fetchContractEventHeight: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_l2_watcher_fetch_contract_height", + Name: "rollup_l2_watcher_fetch_contract_height", Help: "The total number of l2 watcher fetch contract height", }), - bridgeL2MsgsRelayedEventsTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Name: "bridge_l2_watcher_msg_relayed_events_total", + rollupL2MsgsRelayedEventsTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{ + Name: "rollup_l2_watcher_msg_relayed_events_total", Help: "The total number of l2 watcher msg relayed event", }), - bridgeL2BlocksFetchedGap: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ - Name: "bridge_l2_watcher_blocks_fetched_gap", + rollupL2BlocksFetchedGap: promauto.With(reg).NewGauge(prometheus.GaugeOpts{ + Name: "rollup_l2_watcher_blocks_fetched_gap", Help: "The gap of l2 fetch", }), } diff --git a/bridge/internal/controller/watcher/l2_watcher_test.go b/rollup/internal/controller/watcher/l2_watcher_test.go similarity index 97% rename from bridge/internal/controller/watcher/l2_watcher_test.go rename to rollup/internal/controller/watcher/l2_watcher_test.go index 4ecb4059d..305b5555e 100644 --- a/bridge/internal/controller/watcher/l2_watcher_test.go +++ b/rollup/internal/controller/watcher/l2_watcher_test.go @@ -24,11 +24,11 @@ import ( "scroll-tech/common/database" cutils "scroll-tech/common/utils" - bridgeAbi "scroll-tech/bridge/abi" - "scroll-tech/bridge/internal/controller/sender" - "scroll-tech/bridge/internal/orm" - "scroll-tech/bridge/internal/utils" - "scroll-tech/bridge/mock_bridge" + bridgeAbi "scroll-tech/rollup/abi" + "scroll-tech/rollup/internal/controller/sender" + "scroll-tech/rollup/internal/orm" + "scroll-tech/rollup/internal/utils" + "scroll-tech/rollup/mock_bridge" ) func setupL2Watcher(t *testing.T) (*L2WatcherClient, *gorm.DB) { diff --git a/bridge/internal/controller/watcher/watcher_test.go b/rollup/internal/controller/watcher/watcher_test.go similarity index 98% rename from bridge/internal/controller/watcher/watcher_test.go rename to rollup/internal/controller/watcher/watcher_test.go index cd22a02ca..85d89c698 100644 --- a/bridge/internal/controller/watcher/watcher_test.go +++ b/rollup/internal/controller/watcher/watcher_test.go @@ -15,7 +15,7 @@ import ( "scroll-tech/database/migrate" - "scroll-tech/bridge/internal/config" + "scroll-tech/rollup/internal/config" ) var ( diff --git a/bridge/internal/orm/batch.go b/rollup/internal/orm/batch.go similarity index 100% rename from bridge/internal/orm/batch.go rename to rollup/internal/orm/batch.go diff --git a/bridge/internal/orm/chunk.go b/rollup/internal/orm/chunk.go similarity index 100% rename from bridge/internal/orm/chunk.go rename to rollup/internal/orm/chunk.go diff --git a/bridge/internal/orm/l1_block.go b/rollup/internal/orm/l1_block.go similarity index 100% rename from bridge/internal/orm/l1_block.go rename to rollup/internal/orm/l1_block.go diff --git a/bridge/internal/orm/l1_message.go b/rollup/internal/orm/l1_message.go similarity index 100% rename from bridge/internal/orm/l1_message.go rename to rollup/internal/orm/l1_message.go diff --git a/bridge/internal/orm/l2_block.go b/rollup/internal/orm/l2_block.go similarity index 100% rename from bridge/internal/orm/l2_block.go rename to rollup/internal/orm/l2_block.go diff --git a/bridge/internal/orm/orm_test.go b/rollup/internal/orm/orm_test.go similarity index 100% rename from bridge/internal/orm/orm_test.go rename to rollup/internal/orm/orm_test.go diff --git a/bridge/internal/utils/confirmation.go b/rollup/internal/utils/confirmation.go similarity index 100% rename from bridge/internal/utils/confirmation.go rename to rollup/internal/utils/confirmation.go diff --git a/bridge/internal/utils/confirmation_test.go b/rollup/internal/utils/confirmation_test.go similarity index 100% rename from bridge/internal/utils/confirmation_test.go rename to rollup/internal/utils/confirmation_test.go diff --git a/bridge/internal/utils/utils.go b/rollup/internal/utils/utils.go similarity index 98% rename from bridge/internal/utils/utils.go rename to rollup/internal/utils/utils.go index ba1cbd44f..2728ccb10 100644 --- a/bridge/internal/utils/utils.go +++ b/rollup/internal/utils/utils.go @@ -9,7 +9,7 @@ import ( "github.com/scroll-tech/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/crypto" - bridgeAbi "scroll-tech/bridge/abi" + bridgeAbi "scroll-tech/rollup/abi" ) // Keccak2 compute the keccack256 of two concatenations of bytes32 diff --git a/bridge/internal/utils/utils_test.go b/rollup/internal/utils/utils_test.go similarity index 100% rename from bridge/internal/utils/utils_test.go rename to rollup/internal/utils/utils_test.go diff --git a/bridge/mock_bridge/.gitignore b/rollup/mock_bridge/.gitignore similarity index 100% rename from bridge/mock_bridge/.gitignore rename to rollup/mock_bridge/.gitignore diff --git a/bridge/mock_bridge/MockBridgeL1.sol b/rollup/mock_bridge/MockBridgeL1.sol similarity index 100% rename from bridge/mock_bridge/MockBridgeL1.sol rename to rollup/mock_bridge/MockBridgeL1.sol diff --git a/bridge/mock_bridge/MockBridgeL2.sol b/rollup/mock_bridge/MockBridgeL2.sol similarity index 100% rename from bridge/mock_bridge/MockBridgeL2.sol rename to rollup/mock_bridge/MockBridgeL2.sol diff --git a/bridge/testdata/blockTrace_02.json b/rollup/testdata/blockTrace_02.json similarity index 100% rename from bridge/testdata/blockTrace_02.json rename to rollup/testdata/blockTrace_02.json diff --git a/bridge/testdata/blockTrace_03.json b/rollup/testdata/blockTrace_03.json similarity index 100% rename from bridge/testdata/blockTrace_03.json rename to rollup/testdata/blockTrace_03.json diff --git a/bridge/tests/bridge_test.go b/rollup/tests/bridge_test.go similarity index 86% rename from bridge/tests/bridge_test.go rename to rollup/tests/bridge_test.go index 50d4e8031..34a6ba6d6 100644 --- a/bridge/tests/bridge_test.go +++ b/rollup/tests/bridge_test.go @@ -20,13 +20,13 @@ import ( "scroll-tech/database/migrate" - bcmd "scroll-tech/bridge/cmd" - "scroll-tech/bridge/mock_bridge" + bcmd "scroll-tech/rollup/cmd" + "scroll-tech/rollup/mock_bridge" ) var ( base *docker.App - bridgeApp *bcmd.MockApp + rollupApp *bcmd.MockApp // clients l1Client *ethclient.Client @@ -58,8 +58,8 @@ func setupDB(t *testing.T) *gorm.DB { func TestMain(m *testing.M) { base = docker.NewDockerApp() - bridgeApp = bcmd.NewBridgeApp(base, "../conf/config.json") - defer bridgeApp.Free() + rollupApp = bcmd.NewRollupApp(base, "../conf/config.json") + defer rollupApp.Free() defer base.Free() m.Run() } @@ -73,16 +73,16 @@ func setupEnv(t *testing.T) { l2Client, err = base.L2Client() assert.NoError(t, err) - l1Cfg, l2Cfg := bridgeApp.Config.L1Config, bridgeApp.Config.L2Config + l1Cfg, l2Cfg := rollupApp.Config.L1Config, rollupApp.Config.L2Config l1Cfg.Confirmations = 0 l1Cfg.RelayerConfig.SenderConfig.Confirmations = 0 l2Cfg.Confirmations = 0 l2Cfg.RelayerConfig.SenderConfig.Confirmations = 0 - l1Auth, err = bind.NewKeyedTransactorWithChainID(bridgeApp.Config.L2Config.RelayerConfig.CommitSenderPrivateKey, base.L1gethImg.ChainID()) + l1Auth, err = bind.NewKeyedTransactorWithChainID(rollupApp.Config.L2Config.RelayerConfig.CommitSenderPrivateKey, base.L1gethImg.ChainID()) assert.NoError(t, err) - l2Auth, err = bind.NewKeyedTransactorWithChainID(bridgeApp.Config.L1Config.RelayerConfig.GasOracleSenderPrivateKey, base.L2gethImg.ChainID()) + l2Auth, err = bind.NewKeyedTransactorWithChainID(rollupApp.Config.L1Config.RelayerConfig.GasOracleSenderPrivateKey, base.L2gethImg.ChainID()) assert.NoError(t, err) } @@ -113,7 +113,7 @@ func prepareContracts(t *testing.T) { scrollChainAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx) assert.NoError(t, err) - l1Config, l2Config := bridgeApp.Config.L1Config, bridgeApp.Config.L2Config + l1Config, l2Config := rollupApp.Config.L1Config, rollupApp.Config.L2Config l1Config.ScrollChainContractAddress = scrollChainAddress l2Config.RelayerConfig.RollupContractAddress = scrollChainAddress @@ -121,7 +121,7 @@ func prepareContracts(t *testing.T) { func TestFunction(t *testing.T) { setupEnv(t) - srv, err := mockChainMonitorServer(bridgeApp.Config.L2Config.RelayerConfig.ChainMonitor.BaseURL) + srv, err := mockChainMonitorServer(rollupApp.Config.L2Config.RelayerConfig.ChainMonitor.BaseURL) assert.NoError(t, err) defer srv.Close() diff --git a/bridge/tests/gas_oracle_test.go b/rollup/tests/gas_oracle_test.go similarity index 94% rename from bridge/tests/gas_oracle_test.go rename to rollup/tests/gas_oracle_test.go index b2b145cc0..176b57cab 100644 --- a/bridge/tests/gas_oracle_test.go +++ b/rollup/tests/gas_oracle_test.go @@ -12,9 +12,9 @@ import ( "scroll-tech/common/database" "scroll-tech/common/types" - "scroll-tech/bridge/internal/controller/relayer" - "scroll-tech/bridge/internal/controller/watcher" - "scroll-tech/bridge/internal/orm" + "scroll-tech/rollup/internal/controller/relayer" + "scroll-tech/rollup/internal/controller/watcher" + "scroll-tech/rollup/internal/orm" ) func testImportL1GasPrice(t *testing.T) { @@ -23,7 +23,7 @@ func testImportL1GasPrice(t *testing.T) { prepareContracts(t) - l1Cfg := bridgeApp.Config.L1Config + l1Cfg := rollupApp.Config.L1Config // Create L1Relayer l1Relayer, err := relayer.NewLayer1Relayer(context.Background(), db, l1Cfg.RelayerConfig, nil) @@ -66,7 +66,7 @@ func testImportL2GasPrice(t *testing.T) { defer database.CloseDB(db) prepareContracts(t) - l2Cfg := bridgeApp.Config.L2Config + l2Cfg := rollupApp.Config.L2Config l2Relayer, err := relayer.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig, false, nil) assert.NoError(t, err) diff --git a/bridge/tests/process_start_test.go b/rollup/tests/process_start_test.go similarity index 64% rename from bridge/tests/process_start_test.go rename to rollup/tests/process_start_test.go index 65bf33cd5..58fe9eef9 100644 --- a/bridge/tests/process_start_test.go +++ b/rollup/tests/process_start_test.go @@ -6,9 +6,9 @@ import ( "strconv" "testing" - _ "scroll-tech/bridge/cmd/event_watcher/app" - _ "scroll-tech/bridge/cmd/gas_oracle/app" - _ "scroll-tech/bridge/cmd/rollup_relayer/app" + _ "scroll-tech/rollup/cmd/event_watcher/app" + _ "scroll-tech/rollup/cmd/gas_oracle/app" + _ "scroll-tech/rollup/cmd/rollup_relayer/app" "scroll-tech/common/database" cutils "scroll-tech/common/utils" @@ -20,11 +20,11 @@ func testProcessStart(t *testing.T) { db := setupDB(t) defer database.CloseDB(db) - bridgeApp.RunApp(t, cutils.EventWatcherApp) - bridgeApp.RunApp(t, cutils.GasOracleApp) - bridgeApp.RunApp(t, cutils.RollupRelayerApp) + rollupApp.RunApp(t, cutils.EventWatcherApp) + rollupApp.RunApp(t, cutils.GasOracleApp) + rollupApp.RunApp(t, cutils.RollupRelayerApp) - bridgeApp.WaitExit() + rollupApp.WaitExit() } func testProcessStartEnableMetrics(t *testing.T) { @@ -34,17 +34,17 @@ func testProcessStartEnableMetrics(t *testing.T) { port, err := rand.Int(rand.Reader, big.NewInt(2000)) assert.NoError(t, err) svrPort := strconv.FormatInt(port.Int64()+50000, 10) - bridgeApp.RunApp(t, cutils.EventWatcherApp, "--metrics", "--metrics.addr", "localhost", "--metrics.port", svrPort) + rollupApp.RunApp(t, cutils.EventWatcherApp, "--metrics", "--metrics.addr", "localhost", "--metrics.port", svrPort) port, err = rand.Int(rand.Reader, big.NewInt(2000)) assert.NoError(t, err) svrPort = strconv.FormatInt(port.Int64()+50000, 10) - bridgeApp.RunApp(t, cutils.GasOracleApp, "--metrics", "--metrics.addr", "localhost", "--metrics.port", svrPort) + rollupApp.RunApp(t, cutils.GasOracleApp, "--metrics", "--metrics.addr", "localhost", "--metrics.port", svrPort) port, err = rand.Int(rand.Reader, big.NewInt(2000)) assert.NoError(t, err) svrPort = strconv.FormatInt(port.Int64()+50000, 10) - bridgeApp.RunApp(t, cutils.RollupRelayerApp, "--metrics", "--metrics.addr", "localhost", "--metrics.port", svrPort) + rollupApp.RunApp(t, cutils.RollupRelayerApp, "--metrics", "--metrics.addr", "localhost", "--metrics.port", svrPort) - bridgeApp.WaitExit() + rollupApp.WaitExit() } diff --git a/bridge/tests/rollup_test.go b/rollup/tests/rollup_test.go similarity index 95% rename from bridge/tests/rollup_test.go rename to rollup/tests/rollup_test.go index ac10dddd4..62a62b5f3 100644 --- a/bridge/tests/rollup_test.go +++ b/rollup/tests/rollup_test.go @@ -14,10 +14,10 @@ import ( "scroll-tech/common/types/message" "scroll-tech/common/utils" - "scroll-tech/bridge/internal/config" - "scroll-tech/bridge/internal/controller/relayer" - "scroll-tech/bridge/internal/controller/watcher" - "scroll-tech/bridge/internal/orm" + "scroll-tech/rollup/internal/config" + "scroll-tech/rollup/internal/controller/relayer" + "scroll-tech/rollup/internal/controller/watcher" + "scroll-tech/rollup/internal/orm" ) func testCommitBatchAndFinalizeBatch(t *testing.T) { @@ -27,12 +27,12 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) { prepareContracts(t) // Create L2Relayer - l2Cfg := bridgeApp.Config.L2Config + l2Cfg := rollupApp.Config.L2Config l2Relayer, err := relayer.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig, false, nil) assert.NoError(t, err) // Create L1Watcher - l1Cfg := bridgeApp.Config.L1Config + l1Cfg := rollupApp.Config.L1Config l1Watcher := watcher.NewL1WatcherClient(context.Background(), l1Client, 0, l1Cfg.Confirmations, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db, nil) // add some blocks to db diff --git a/tests/integration-test/contracts_test.go b/tests/integration-test/contracts_test.go index f5a09d654..3d1be7d4f 100644 --- a/tests/integration-test/contracts_test.go +++ b/tests/integration-test/contracts_test.go @@ -63,7 +63,7 @@ func TestGreeter(t *testing.T) { l2Cli, err := base.L2Client() assert.Nil(t, err) - auth, err := bind.NewKeyedTransactorWithChainID(bridgeApp.Config.L2Config.RelayerConfig.CommitSenderPrivateKey, base.L2gethImg.ChainID()) + auth, err := bind.NewKeyedTransactorWithChainID(rollupApp.Config.L2Config.RelayerConfig.CommitSenderPrivateKey, base.L2gethImg.ChainID()) assert.NoError(t, err) token, err := greeter.NewGreeter(greeterAddress, l2Cli) diff --git a/tests/integration-test/integration_test.go b/tests/integration-test/integration_test.go index 386d0339d..996b04c0e 100644 --- a/tests/integration-test/integration_test.go +++ b/tests/integration-test/integration_test.go @@ -25,19 +25,19 @@ import ( "scroll-tech/common/utils" "scroll-tech/common/version" - bcmd "scroll-tech/bridge/cmd" + bcmd "scroll-tech/rollup/cmd" ) var ( base *docker.App - bridgeApp *bcmd.MockApp + rollupApp *bcmd.MockApp ) func TestMain(m *testing.M) { base = docker.NewDockerApp() - bridgeApp = bcmd.NewBridgeApp(base, "../../bridge/conf/config.json") + rollupApp = bcmd.NewRollupApp(base, "../../rollup/conf/config.json") m.Run() - bridgeApp.Free() + rollupApp.Free() base.Free() }