feat: support deploy plonk verifier contract (#195)

* feat: support deploy plonk verifier * lint * update CI actions
scroll-tech · Oct 22, 2024 · 901989c · 901989c
1 parent 8365399
commit 901989c
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 17 deletions.
diff --git a/.github/workflows/lint-test-charts.yml b/.github/workflows/lint-test-charts.yml
@@ -29,7 +29,7 @@ jobs:
         uses: helm/[email protected]
 
       - name: Setup scroll-sdk values
-        run: cd charts/scroll-sdk && docker run --rm -t -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.18
+        run: cd charts/scroll-sdk && docker run --rm -t -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-50c2661f6d3a40c34cc5b4fffbd0d7ba59d3dbae
 
       - name: Helm registry login
         run: |

diff --git a/.github/workflows/publish-chart.yaml b/.github/workflows/publish-chart.yaml
@@ -129,7 +129,7 @@ jobs:
         uses: helm/[email protected]
 
       - name: Setup scroll-sdk values
-        run: cd charts/scroll-sdk && docker run --rm -t -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.18
+        run: cd charts/scroll-sdk && docker run --rm -t -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-50c2661f6d3a40c34cc5b4fffbd0d7ba59d3dbae
 
       - name: Helm registry login
         run: |

diff --git a/.github/workflows/publish-dev-chart.yaml b/.github/workflows/publish-dev-chart.yaml
@@ -131,7 +131,7 @@ jobs:
         uses: helm/[email protected]
 
       - name: Setup scroll-sdk values
-        run: cd charts/scroll-sdk && docker run --rm -t -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-v0.0.18
+        run: cd charts/scroll-sdk && docker run --rm -t -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-50c2661f6d3a40c34cc5b4fffbd0d7ba59d3dbae
 
       - name: Helm registry login
         run: |

diff --git a/charts/contracts/Chart.yaml b/charts/contracts/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: contracts helm charts
 name: contracts
-version: 0.0.14
+version: 0.0.15
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:

diff --git a/charts/contracts/README.md b/charts/contracts/README.md
@@ -1,6 +1,6 @@
 # contracts
 
-![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
+![Version: 0.0.15](https://img.shields.io/badge/Version-0.0.15-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
 
 contracts helm charts
 
@@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0`
 | envFrom[0].configMapRef.name | string | `"contracts-deployment-env"` |  |
 | global.isStandalone | bool | `false` |  |
 | image.repository | string | `"scrolltech/scroll-stack-contracts"` |  |
-| image.tag | string | `"deploy-aa80925c5c4cacd62a35380a5ec081a6865621eb"` |  |
+| image.tag | string | `"deploy-50c2661f6d3a40c34cc5b4fffbd0d7ba59d3dbae"` |  |
 | scrollConfig | string | `"{}\n"` |  |
 | scrollConfigContracts | string | `"{}\n"` |  |
 

diff --git a/charts/contracts/values.yaml b/charts/contracts/values.yaml
@@ -4,7 +4,7 @@ global:
 
 image:
   repository: scrolltech/scroll-stack-contracts
-  tag: deploy-aa80925c5c4cacd62a35380a5ec081a6865621eb
+  tag: deploy-50c2661f6d3a40c34cc5b4fffbd0d7ba59d3dbae
 
 envFrom:
   - configMapRef:

diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: scroll helm charts to deploy scroll sdk
 name: scroll-sdk
-version: 0.0.50
+version: 0.0.51
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 maintainers:
@@ -42,7 +42,7 @@ dependencies:
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: chain-monitor.enabled
   - name: contracts
-    version: 0.0.14
+    version: 0.0.15
     repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm"
     condition: contracts.enabled
   - name: coordinator-api

diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md
@@ -1,6 +1,6 @@
 # scroll-sdk
 
-![Version: 0.0.50](https://img.shields.io/badge/Version-0.0.50-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
+![Version: 0.0.51](https://img.shields.io/badge/Version-0.0.51-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
 
 scroll helm charts to deploy scroll sdk
 
@@ -30,7 +30,7 @@ Kubernetes: `>=1.22.0-0`
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-api | 0.0.7 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.11 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | chain-monitor | 0.0.9 |
-| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.0.14 |
+| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.0.15 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-api | 0.0.9 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-cron | 0.0.7 |
 | oci://ghcr.io/scroll-tech/scroll-sdk/helm | frontends | 0.0.9 |

diff --git a/charts/scroll-sdk/config.toml b/charts/scroll-sdk/config.toml
@@ -93,11 +93,11 @@ DEPLOYMENT_SALT = "devnetSalt-000"
 
 # contracts deployed outside this script
 L1_FEE_VAULT_ADDR = "0x0000000000000000000000000000000000000001"
-L1_PLONK_VERIFIER_ADDR = "0x0000000000000000000000000000000000000001"
 
 [contracts.overrides]
 
 # L1_WETH = "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14"
+# L1_PLONK_VERIFIER = "0x4e59b44847b379578588920cA78FbF26c0B4956C"
 
 L2_MESSAGE_QUEUE = "0x5300000000000000000000000000000000000000"
 L1_GAS_PRICE_ORACLE = "0x5300000000000000000000000000000000000002"

diff --git a/devnet/Makefile b/devnet/Makefile
@@ -2,19 +2,19 @@
 ARCH_ARM64 := $(shell if [ "$$(uname -m)" = "arm64" ] || [ "$$(uname -m)" = "aarch64" ]; then echo "-arm64"; else echo ""; fi)
 ARCH_OTHER := $(shell if [ "$$(uname -m)" != "arm64" ] && [ "$$(uname -m)" != "aarch64" ]; then echo "scroll-"; else echo ""; fi)
 NAMESPACE ?= default
-L2_IMAGE_TAG := $(ARCH_OTHER)v5.7.11$(ARCH_ARM64)
+L2_IMAGE_TAG := $(ARCH_OTHER)v5.7.21$(ARCH_ARM64)
 L1_RPC_HOST := l1-devnet.scrollsdk
 
 bootstrap:
 		echo "Pulling helm chart..."
-		helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.50
+		helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.51
 		echo "Extracting helm chart..."
 		tar -xvf *.tgz
 		$(MAKE) config
 
 config:
 		echo "Creating configuration files..."
-		cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-aa80925c5c4cacd62a35380a5ec081a6865621eb
+		cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-50c2661f6d3a40c34cc5b4fffbd0d7ba59d3dbae
 		echo "Creating env files..."
 		./create-env-files.sh scroll-sdk
 		./prepare-config-files.sh

diff --git a/examples/config.toml.example b/examples/config.toml.example
@@ -96,16 +96,17 @@ DEPLOYMENT_SALT = "salt-000"
 
 # contracts deployed outside this script
 L1_FEE_VAULT_ADDR = "0x0000000000000000000000000000000000000001"
-L1_PLONK_VERIFIER_ADDR = "0x0000000000000000000000000000000000000001"
 
 [contracts.overrides]
 
+# L1_WETH = "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14"
+# L1_PLONK_VERIFIER = "0x4e59b44847b379578588920cA78FbF26c0B4956C"
+
 L2_MESSAGE_QUEUE = "0x5300000000000000000000000000000000000000"
 L1_GAS_PRICE_ORACLE = "0x5300000000000000000000000000000000000002"
 L2_WHITELIST = "0x5300000000000000000000000000000000000003"
 L2_WETH = "0x5300000000000000000000000000000000000004"
 L2_TX_FEE_VAULT = "0x5300000000000000000000000000000000000005"
-# L1_WETH = "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14"
 
 
 [coordinator]