Merge branch 'main' into prover/feat/libdecompressor-abuseeth

Consensys · Oct 17, 2024 · 8534b5c · 8534b5c
2 parents 9866b5d + f53e2d1
commit 8534b5c
Show file tree

Hide file tree

Showing 110 changed files with 5,777 additions and 5,541 deletions.
diff --git a/.github/workflows/postman-build-and-publish.yml b/.github/workflows/postman-build-and-publish.yml
@@ -71,7 +71,11 @@ jobs:
           push: true
           tags: |
             ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }}-${{ env.UNTESTED_TAG_SUFFIX }}
-          cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache,mode=max
+          cache-from: |
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-amd64,platform=linux/amd64
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-arm64,platform=linux/arm64
+          cache-to: |
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-amd64,mode=max,platform=linux/amd64
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-arm64,mode=max,platform=linux/arm64
           build-args: |
             NATIVE_LIBS_RELEASE_TAG=blob-libs-v1.0.1
diff --git a/Makefile b/Makefile
@@ -81,7 +81,7 @@ deploy-linea-rollup:
 		LINEA_ROLLUP_RATE_LIMIT_PERIOD=86400 \
 		LINEA_ROLLUP_RATE_LIMIT_AMOUNT=1000000000000000000000 \
 		LINEA_ROLLUP_GENESIS_TIMESTAMP=1683325137 \
-		npx hardhat deploy --no-compile --network zkevm_dev --tags PlonkVerifier,LineaRollup
+		npx hardhat deploy --no-compile --network zkevm_dev --tags PlonkVerifier,LineaRollupV5
 
 deploy-l2messageservice:
 		# WARNING: FOR LOCAL DEV ONLY - DO NOT REUSE THESE KEYS ELSEWHERE

diff --git a/config/coordinator/coordinator-local-dev.config.overrides.toml b/config/coordinator/coordinator-local-dev.config.overrides.toml
@@ -38,15 +38,12 @@ non-canonical-raw-traces-directory = "tmp/local/traces/raw-non-canonical"
 [state-manager]
 endpoints=["http://127.0.0.1:8998/"]
 
-[dynamic-gas-price-service]
-geth-gas-price-update-recipients=[
-  "http://127.0.0.1:8645",
-  "http://127.0.0.1:8845"
-]
-besu-gas-price-update-recipients=[
-  "http://127.0.0.1:8545/"
-]
-extra-data-update-recipient="http://127.0.0.1:8545/"
+[l2-network-gas-pricing.extra-data-pricing-propagation]
+extra-data-update-recipient = "http://127.0.0.1:8545/"
+
+[l2-network-gas-pricing.json-rpc-pricing-propagation]
+geth-gas-price-update-recipients = ["http://127.0.0.1:8845"]
+besu-gas-price-update-recipients = []
 
 [l1]
 rpc-endpoint="http://127.0.0.1:8445"