Merge remote-tracking branch 'origin/main' into matt/fix-contract-add…

…ress-set
ten-protocol · Feb 12, 2024 · 9585387 · 9585387
2 parents 96e73cf + 3f487cb
commit 9585387
Show file tree

Hide file tree

Showing 84 changed files with 7,967 additions and 1,621 deletions.
diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml
@@ -251,36 +251,6 @@ jobs:
                -l1_chain_id=${{ vars.L1_CHAIN_ID }} \
                start'
 
-
-  update-loadbalancer:
-    needs:
-      - build
-      - deploy
-    runs-on: ubuntu-latest
-    environment:
-      name: ${{ github.event.inputs.testnet_type }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: 'Login via Azure CLI'
-        uses: azure/login@v1
-        with:
-          creds: ${{ secrets.AZURE_CREDENTIALS }}
-
-      - name: 'Remove existing backend nodes from the load balancer'
-        run: ./.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh ${{ github.event.inputs.testnet_type }}
-
-      - name: 'Add load balancer address pool to the IP configuration'
-        uses: azure/CLI@v1
-        with:
-          inlineScript: |
-            az network nic ip-config address-pool add \
-              --address-pool ${{ github.event.inputs.testnet_type }}-backend-pool \
-              --ip-config-name ipconfig${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }} \
-              --nic-name ${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }}VMNic \
-              --resource-group Testnet \
-              --lb-name ${{ github.event.inputs.testnet_type }}-loadbalancer
-
   check-obscuro-is-healthy:
     needs:
       - build
@@ -337,6 +307,34 @@ jobs:
             deploy-l2-contracts.out
           retention-days: 7
 
+  update-loadbalancer:
+    needs:
+      - check-obscuro-is-healthy
+    runs-on: ubuntu-latest
+    environment:
+      name: ${{ github.event.inputs.testnet_type }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: 'Login via Azure CLI'
+        uses: azure/login@v1
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      - name: 'Remove existing backend nodes from the load balancer'
+        run: ./.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh ${{ github.event.inputs.testnet_type }}
+
+      - name: 'Add load balancer address pool to the IP configuration'
+        uses: azure/CLI@v1
+        with:
+          inlineScript: |
+            az network nic ip-config address-pool add \
+              --address-pool ${{ github.event.inputs.testnet_type }}-backend-pool \
+              --ip-config-name ipconfig${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }} \
+              --nic-name ${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }}VMNic \
+              --resource-group Testnet \
+              --lb-name ${{ github.event.inputs.testnet_type }}-loadbalancer
+
   deploy-faucet:
     name: 'Trigger Faucet deployment for dev- / testnet on a new deployment'
     uses: ./.github/workflows/manual-deploy-testnet-faucet.yml

diff --git a/.github/workflows/manual-deploy-testnet-validator.yml b/.github/workflows/manual-deploy-testnet-validator.yml
@@ -194,8 +194,7 @@ jobs:
 #
 #  update-loadbalancer:
 #    needs:
-#      - build
-#      - deploy
+#      - check-obscuro-is-healthy
 #    runs-on: ubuntu-latest
 #    environment:
 #      name: ${{ github.event.inputs.testnet_type }}

diff --git a/.github/workflows/manual-upgrade-testnet-l2.yml b/.github/workflows/manual-upgrade-testnet-l2.yml
@@ -171,6 +171,7 @@ jobs:
               -host_p2p_port=10000 \
               -enclave_docker_image=${{ vars.L2_ENCLAVE_DOCKER_BUILD_TAG }} \
               -host_docker_image=${{ vars.L2_HOST_DOCKER_BUILD_TAG }} \
+              -is_debug_namespace_enabled=true \
               -log_level=${{ github.event.inputs.log_level }} \
               -batch_interval=${{ vars.L2_BATCH_INTERVAL }} \
               -max_batch_interval=${{ vars.L2_MAX_BATCH_INTERVAL }} \

diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,33 @@
 
 # Oct 2024-01-15 (v0.21.0)
 * A list of the PRs merged in this release is as below;
+    * `cc3b1048` Upgrade oz libraries (#1707)
+    * `0a573d75` Deploy scripts: enable debug api on upgrades (#1780)
+    * `f8b3b76c` Geth: cherry pick emergency geth upgrade from release branch #1771 (#1772)
+    * `3da65b55` Upped batch size limit (#1775)
+    * `3322ad9e` Fix for desync issue (#1778)
+    * `7927b17e` Tweak caching (#1777)
+    * `9ae2825e` Add estimate optimisation that geth added (#1776)
+    * `22b397de` Logging: use terminal format with full hashes (#1770)
+    * `b69bb7f9` Introduce enclaveid as identifier (#1760)
+    * `6a7b5f54` Add maxdbpoolsize for edglessdb (#1767)
+    * `42d9a38b` Add basic file logging in the gateway (#1763)
+    * `634a5b79` Host: drop transactions received when enclave not ready (#1762)
+    * `26d7db4f` [ghaction] reorder deploy l2 jobs (#1758)
+    * `0789f261` Fix health indicator bug (#1759)
+    * `9c81010b` Add log-level to launcher + fix trace debug (#1757)
+    * `2019eac0` Use fast cspring for encrypting responses (#1753)
+    * `206dbffc` [gas mechanics] implement gas history; migrate to arbitrum gas model (#1714)
+    * `0fe01b4e` Mempool perf fix (#1752)
+    * `843d6cbb` 2 validators deploy (#1750)
+    * `dcf96c93` Ten gateway use http instead of ws (#1743)
+    * `b49b4c0d` Loggers: use log format rather than terminal format for files (#1751)
+    * `01980954` Remove old docs (#1749)
+    * `7f0ad72b` Refactor testnet status update  (#1748)
+    * `3ba9d7c2` Host: fix bug causing unnecessary multiplier on l1 gas fees (#1747)
+    * `bdce4a85` Statedb revert to snapshot for ignored batches (#1742)
+    * `16173af2` Update and simplify local testnet startup docs (#1745)
+    * `7c1ebad2` Update of prs so far for a v0.21 release (#1744)
     * `cdc02ebe` Adding batch timestamp to the public tx api (#1740)
     * `a41bff9e` Fix the enclave stream reconnect (#1741)
     * `f72e986c` Host: small cache of blocks by hash (#1738)

diff --git a/contracts/deployment_scripts/testnet/layer2/001_whitelist_tokens.ts b/contracts/deployment_scripts/testnet/layer2/001_whitelist_tokens.ts
@@ -97,12 +97,12 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
         setTimeout(fail, 30_000)
         const messageBusContract = (await hre.ethers.getContractAt('MessageBus', '0x526c84529b2b8c11f57d93d3f5537aca3aecef9b'));
         const gasLimit = await messageBusContract.estimateGas.verifyMessageFinalized(messages[1], {
-            maxFeePerGas: 2,
+            maxFeePerGas: 1000000001,
         })
         try {
             while (await messageBusContract.callStatic.verifyMessageFinalized(messages[1], {
-                maxFeePerGas: 2,
-                gasLimit: gasLimit.mul(2),
+                maxFeePerGas: 1000000001,
+                gasLimit: gasLimit.add(gasLimit.div(2)),
                 from: l2Accounts.deployer
             }) != true) {
                 console.log(`Messages not stored on L2 yet, retrying...`);