Merge branch 'main' of https://github.com/ten-protocol/go-ten into in…

…itiate-bridge-deployment
ten-protocol · Aug 7, 2024 · 46629ea · 46629ea
2 parents 3633047 + 475b705
commit 46629ea
Show file tree

Hide file tree

Showing 234 changed files with 6,957 additions and 2,705 deletions.
diff --git a/.github/workflows/build-gateway-lib.yml b/.github/workflows/build-gateway-lib.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       # Check out the repository
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Set up Node.js
       - name: Set up Node.js

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -14,9 +14,9 @@ jobs:
   build:
     runs-on: self-hosted
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21.8
 
@@ -57,7 +57,7 @@ jobs:
         run: go test --failfast -v ./... -count=1 -timeout 5m
 
       - name: Store simulation logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: ci-logs

diff --git a/.github/workflows/deploy-gateway-lib.yml b/.github/workflows/deploy-gateway-lib.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       # Check out the repository
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Set up Node.js
       - name: Set up Node.js

diff --git a/.github/workflows/hardhat-pr-check.yml b/.github/workflows/hardhat-pr-check.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 18

diff --git a/.github/workflows/manual-deploy-dexynth-gateway.yml b/.github/workflows/manual-deploy-dexynth-gateway.yml
@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "GitHub Variables = ${{ toJSON(vars) }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: 'Extract branch name'
         shell: bash
@@ -138,4 +138,5 @@ jobs:
               --log-opt max-file=3 --log-opt max-size=10m \
               ${{ vars.DOCKER_BUILD_TAG_GATEWAY_DEXYNTH }} \
               -host=0.0.0.0 -port=8080 -portWS=81 -nodeHost=${{ vars.L2_RPC_URL_VALIDATOR_DEXYNTH }} -verbose=true \
-              -logPath=sys_out -dbType=mariaDB -dbConnectionURL="obscurouser:${{ secrets.OBSCURO_GATEWAY_MARIADB_USER_PWD }}@tcp(obscurogateway-mariadb-${{  github.event.inputs.testnet_type }}.uksouth.cloudapp.azure.com:3306)/ogdb"'
+              -logPath=sys_out -dbType=mariaDB -dbConnectionURL="obscurouser:${{ secrets.OBSCURO_GATEWAY_MARIADB_USER_PWD }}@tcp(obscurogateway-mariadb-${{  github.event.inputs.testnet_type }}.uksouth.cloudapp.azure.com:3306)/ogdb" \
+              -rateLimitUserComputeTime=${{ vars.GATEWAY_RATE_LIMIT_USER_COMPUTE_TIME }} -rateLimitWindow=${{ vars.GATEWAY_RATE_LIMIT_WINDOW }} -maxConcurrentRequestsPerUser=${{ vars.GATEWAY_MAX_CONCURRENT_REQUESTS_PER_USER }} '
diff --git a/.github/workflows/manual-deploy-obscuro-gateway-database.yml b/.github/workflows/manual-deploy-obscuro-gateway-database.yml
@@ -27,7 +27,7 @@ jobs:
         run: |
           echo "GitHub Variables = ${{ toJSON(vars) }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: 'Extract branch name'
         shell: bash

diff --git a/.github/workflows/manual-deploy-obscuro-gateway.yml b/.github/workflows/manual-deploy-obscuro-gateway.yml
@@ -27,7 +27,7 @@ jobs:
         run: |
           echo "GitHub Variables = ${{ toJSON(vars) }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: 'Extract branch name'
         shell: bash
@@ -137,7 +137,8 @@ jobs:
             && cd /home/obscuro/go-obscuro/ \
             && docker run -d -p 80:80 -p 81:81 --name ${{ github.event.inputs.testnet_type }}-OG-${{ GITHUB.RUN_NUMBER }} \
               -e OBSCURO_GATEWAY_VERSION="${{ GITHUB.RUN_NUMBER }}-${{ GITHUB.SHA }}" \
-              --log-opt max-file=3 --log-opt max-size=10m \
-              ${{ vars.DOCKER_BUILD_TAG_GATEWAY }} \
-              -host=0.0.0.0 -port=8080 -portWS=81 -nodeHost=${{ vars.L2_RPC_URL_VALIDATOR }} -verbose=true \
-              -logPath=sys_out -dbType=mariaDB -dbConnectionURL="obscurouser:${{ secrets.OBSCURO_GATEWAY_MARIADB_USER_PWD }}@tcp(obscurogateway-mariadb-${{  github.event.inputs.testnet_type }}.uksouth.cloudapp.azure.com:3306)/ogdb"'
+               --log-opt max-file=3 --log-opt max-size=10m \
+               ${{ vars.DOCKER_BUILD_TAG_GATEWAY }} \
+               -host=0.0.0.0 -port=8080 -portWS=81 -nodeHost=${{ vars.L2_RPC_URL_VALIDATOR }} -verbose=true \
+               -logPath=sys_out -dbType=mariaDB -dbConnectionURL="obscurouser:${{ secrets.OBSCURO_GATEWAY_MARIADB_USER_PWD }}@tcp(obscurogateway-mariadb-${{  github.event.inputs.testnet_type }}.uksouth.cloudapp.azure.com:3306)/ogdb" \
+               -rateLimitUserComputeTime=${{ vars.GATEWAY_RATE_LIMIT_USER_COMPUTE_TIME }} -rateLimitWindow=${{ vars.GATEWAY_RATE_LIMIT_WINDOW }} -maxConcurrentRequestsPerUser=${{ vars.GATEWAY_MAX_CONCURRENT_REQUESTS_PER_USER }} '
diff --git a/.github/workflows/manual-deploy-ten-gateway-frontend.yml b/.github/workflows/manual-deploy-ten-gateway-frontend.yml
@@ -37,7 +37,7 @@ jobs:
           echo "Selected Testnet Type: ${{ matrix.testnet_type }}"
           echo "Gateway API URL: ${{ matrix.GATEWAY_API_URL }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: 'Extract branch name'
         shell: bash

diff --git a/.github/workflows/manual-deploy-ten-scan.yml b/.github/workflows/manual-deploy-ten-scan.yml
@@ -27,7 +27,7 @@ jobs:
         run: |
           echo "GitHub Variables = ${{ toJSON(vars) }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Set up Docker"
         uses: docker/setup-buildx-action@v1

diff --git a/.github/workflows/manual-deploy-testnet-faucet.yml b/.github/workflows/manual-deploy-testnet-faucet.yml
@@ -43,7 +43,7 @@ jobs:
       - run: echo "Workflow_dispatch inputs ${{ github.event.inputs.testnet_type }}"
       - run: echo "Workflow_call inputs     ${{ inputs.testnet_type }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: 'Set up Docker'
         uses: docker/setup-buildx-action@v1

diff --git a/.github/workflows/manual-deploy-testnet-l1.yml b/.github/workflows/manual-deploy-testnet-l1.yml
@@ -39,7 +39,7 @@ jobs:
         run: |
           echo "GitHub Variables = ${{ toJSON(vars) }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: 'Set up Docker'
         uses: docker/setup-buildx-action@v1

diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml
@@ -47,9 +47,9 @@ jobs:
         run: |
           echo "GitHub Variables = ${{ toJSON(vars) }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.21.8
 
@@ -124,7 +124,7 @@ jobs:
             done
 
       - name: 'Upload L1 deployer container logs'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: deploy-l1-artifacts
           path: |
@@ -224,6 +224,9 @@ jobs:
             --command-id RunShellScript \
             --scripts 'mkdir -p /home/obscuro \
             && git clone --depth 1 -b ${{ env.BRANCH_NAME }} https://github.com/ten-protocol/go-ten.git /home/obscuro/go-obscuro \
+            && cp /home/obscuro/go-obscuro/tools/edbconnect/edb-connect.sh /home/obscurouser/edb-connect.sh \
+            && chown obscurouser:obscurouser /home/obscurouser/edb-connect.sh \
+            && chmod u+x /home/obscurouser/edb-connect.sh \
             && docker network create --driver bridge node_network || true \
             && docker run -d --name datadog-agent \
                --network node_network \
@@ -272,7 +275,7 @@ jobs:
     environment:
       name: ${{ github.event.inputs.testnet_type }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Wait until obscuro node is healthy"
         shell: bash
@@ -289,7 +292,7 @@ jobs:
     environment:
       name: ${{ github.event.inputs.testnet_type }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: 'Deploy L2 contracts'
         id: deployL2Contracts
@@ -313,7 +316,7 @@ jobs:
           docker logs `docker ps -aqf "name=hh-l2-deployer"` > deploy-l2-contracts.out 2>&1
 
       - name: 'Upload L2 deployer container logs'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: deploy-l2-artifacts
           path: |
@@ -327,7 +330,7 @@ jobs:
     environment:
       name: ${{ github.event.inputs.testnet_type }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: 'Login via Azure CLI'
         uses: azure/login@v1

diff --git a/.github/workflows/manual-deploy-testnet-validator.yml b/.github/workflows/manual-deploy-testnet-validator.yml
@@ -73,9 +73,9 @@ jobs:
         run: |
           echo "GitHub Variables = ${{ toJSON(vars) }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.21.8
 
@@ -201,7 +201,7 @@ jobs:
 #    environment:
 #      name: ${{ github.event.inputs.testnet_type }}
 #    steps:
-#      - uses: actions/checkout@v3
+#      - uses: actions/checkout@v4
 #
 #      - name: 'Login via Azure CLI'
 #        uses: azure/login@v1
@@ -230,7 +230,7 @@ jobs:
     environment:
       name: ${{ github.event.inputs.testnet_type }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Wait until obscuro node is healthy"
         shell: bash

diff --git a/.github/workflows/manual-recover-network-funds.yml b/.github/workflows/manual-recover-network-funds.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           echo "GitHub Variables = ${{ toJSON(vars) }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: 'Login to Azure docker registry'
         uses: azure/docker-login@v1
@@ -65,7 +65,7 @@ jobs:
           docker logs `docker ps -aqf "name=recover-funds"` > recover-funds.out 2>&1
 
       - name: 'Upload container logs on failure'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: recover-funds

diff --git a/.github/workflows/manual-upgrade-testnet-l2.yml b/.github/workflows/manual-upgrade-testnet-l2.yml
@@ -43,9 +43,9 @@ jobs:
       VM_BUILD_NUMBER: ${{ steps.outputVars.outputs.VM_BUILD_NUMBER }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.21.8
 
@@ -188,7 +188,7 @@ jobs:
     environment:
       name: ${{ github.event.inputs.testnet_type }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Wait until obscuro node is healthy"
         shell: bash

diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,43 @@
 ---
 # Ten Testnet Change Log
 
+# July 2024-07-03 (v0.25.0)
+* This is an L2 deployment release meaning state will be lost in order to upgrade the network. Any dApps on the
+  network will need to be redeployed. The release predominantly addresses performance improvements for large numbers
+  of transactions in the network, and for event log queries. 
+* A full list of the PRs merged in this release is as below;
+  * `ef0bf45e` Fix for xchain messages (#1973)
+  * `0dc7d5c5` Fix for integration test (#1971)
+  * `186bc2c3` Host db performance fixes (#1969)
+  * `c0ea9b43` Bundle submission rework (#1966)
+  * `0b01bfd1` Assets fix and clear console warnings (#1959)
+  * `ddff74a5` Update db schema (#1967)
+  * `e1c91243` Rework event logs and transaction database schema (#1961)
+  * `291a698d` Add db query tool (#1963)
+  * `b1af061b` Initiate bridge deployment (#1965)
+  * `95f35150` Initiate bridge deployment (#1960)
+  * `447ff489` Placeholder commit for new gh action workflow (#1964)
+  * `9d6e7747` Fix for startup (#1962)
+  * `b537d2e6` Add indexed events (#1954)
+  * `c6e5a48f` Adds log constraints to docker containers not instantiated by the go client (#1956)
+  * `85e6cd0d` Ignore empty l1 head status from enclave (#1955)
+  * `a9485fef` Fixes for ethereum bridge and json representation of batch header (#1953)
+  * `e6453082` Deploy separate ten gateway for dexynth (#1949)
+  * `b8935c31` Network tests: util func for l1 transfers (#1948)
+  * `0f3d42bf` Network tests: start gateway synchronously to fix race (#1947)
+  * `9cee2fd4` Increase max message size grpc config (#1946)
+  * `c0bf4086` Small mem pool fixes (#1943)
+  * `b335bd1e` Avoid spamming stuck l1 transactions (#1941)
+  * `99a8aeee` Fix panic on uninitialised mem pool (#1940)
+  * `1daffac0` Replace health-check db query (#1938)
+  * `a880b169` Hardcode response to client version request (#1937)
+  * `5780140e` Check conversions (#1936)
+  * `b97d0b93` Fix flakyness errors (#1927)
+  * `6e432a1a` Add net_version support and test (#1934)
+  * `4f39832e` Fixing log spam (#1931)
+  * `f8b86b52` Fix log spam (#1929)
+  * `762dfef9` Fix for interval (#1926)
+
 # May 2024-05-20 (v0.24.0)
 * This is an L2 deployment release meaning state will be lost in order to upgrade the network. Any dApps on the 
 network will need to be redeployed. High level changes made in the release include;

diff --git a/contracts/deployment_scripts/testnet/layer2/001_whitelist_tokens.ts b/contracts/deployment_scripts/testnet/layer2/001_whitelist_tokens.ts
@@ -54,7 +54,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     const topic = hre.ethers.id(eventSignature)
 
     // Get the interface for the event in order to convert it to cross chain message.
-    let eventIface = new hre.ethers.Interface([ `event LogMessagePublished(address indexed,uint64,uint32,uint32,bytes,uint8)`]);
+    let eventIface = new hre.ethers.Interface([ `event LogMessagePublished(address,uint64,uint32,uint32,bytes,uint8)`]);
 
     // This function converts the logs from transaction receipts into cross chain messages
     function getXChainMessages(result: Receipt) {