Merged origin/main.

ten-protocol · Sep 28, 2023 · 949e09e · 949e09e
2 parents b203c38 + 1eb404c
commit 949e09e
Show file tree

Hide file tree

Showing 32 changed files with 1,718 additions and 104 deletions.
diff --git a/.github/workflows/manual-deploy-obscuro-gateway-database.yml b/.github/workflows/manual-deploy-obscuro-gateway-database.yml
@@ -14,6 +14,7 @@ on:
         options:
           - 'dev-testnet'
           - 'testnet'
+          - 'sepolia-testnet'
 
 jobs:
   build-and-deploy:
@@ -41,6 +42,13 @@ jobs:
           echo "RESOURCE_STARTING_NAME=dev-testnet" >> $GITHUB_ENV
           echo "RESOURCE_TAG_NAME=obscurogatewaydbdevtestnetlatest" >> $GITHUB_ENV
 
+      - name: 'Set Obscuro Gateway variables for sepolia-testnet'
+        if: ${{ github.event.inputs.testnet_type == 'sepolia-testnet' }}
+        run: |
+          echo "OBSCURO_GATEWAY_DB_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/obscuro_gateway_mariadb_sepolia_testnet:latest" >> $GITHUB_ENV
+          echo "RESOURCE_STARTING_NAME=sepolia-testnet" >> $GITHUB_ENV
+          echo "RESOURCE_TAG_NAME=obscurogatewaydbsepoliatestnetlatest" >> $GITHUB_ENV
+
 
       - name: 'Login via Azure CLI'
         uses: azure/login@v1

diff --git a/.github/workflows/manual-deploy-obscuro-gateway.yml b/.github/workflows/manual-deploy-obscuro-gateway.yml
@@ -14,6 +14,7 @@ on:
         options:
           - 'dev-testnet'
           - 'testnet'
+          - 'sepolia-testnet'
 
 jobs:
   build-and-deploy:
@@ -46,6 +47,13 @@ jobs:
           echo "RESOURCE_STARTING_NAME=dev-testnet" >> $GITHUB_ENV
           echo "RESOURCE_TAG_NAME=obscurogatewaydevtestnetlatest" >> $GITHUB_ENV
 
+      - name: 'Set Obscuro Gateway variables for sepolia-testnet'
+        if: ${{ github.event.inputs.testnet_type == 'sepolia-testnet' }}
+        run: |
+          echo "OBSCURO_GATEWAY_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/obscuro_gateway_sepolia_testnet:latest" >> $GITHUB_ENV
+          echo "OBSCURO_GATEWAY_NODE_HOST=erpc.sepolia-testnet.obscu.ro" >> $GITHUB_ENV
+          echo "RESOURCE_STARTING_NAME=sepolia-testnet" >> $GITHUB_ENV
+          echo "RESOURCE_TAG_NAME=obscurogatewaysepoliatestnetlatest" >> $GITHUB_ENV
 
       - name: 'Login to Azure docker registry'
         uses: azure/docker-login@v1
@@ -130,6 +138,7 @@ jobs:
                datadog/agent:latest \
             && cd /home/obscuro/go-obscuro/ \
             && docker run -d -p 80:80 -p 81:81 --name ${{env.RESOURCE_STARTING_NAME}}-OG-${{ GITHUB.RUN_NUMBER }} \
+              -e OBSCURO_GATEWAY_VERSION="${{ GITHUB.RUN_NUMBER }}-${{ GITHUB.SHA }}" \
                ${{ env.OBSCURO_GATEWAY_BUILD_TAG }} \
                ./wallet_extension_linux -host=0.0.0.0 -port=80 -portWS=81 -nodeHost=${{ env.OBSCURO_GATEWAY_NODE_HOST }} \
                -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"'
diff --git a/.github/workflows/manual-deploy-obscuro-scan-2.yml b/.github/workflows/manual-deploy-obscuro-scan-2.yml
@@ -69,7 +69,7 @@ jobs:
           name: ${{ github.event.inputs.testnet_type }}-fe-obscuro-scan
           location: 'uksouth'
           restart-policy: 'Never'
-          environment-variables: VITE_APIHOSTADDRESS=http://${{ github.event.inputs.testnet_type }}-api-obscuro-scan.uksouth.azurecontainer.io
+          environment-variables: VITE_APIHOSTADDRESS=http://${{ github.event.inputs.testnet_type }}-api-obscuro-scan.uksouth.azurecontainer.io VITE_FE_VERSION=${{ GITHUB.RUN_NUMBER }}-${{ GITHUB.SHA }}
           command-line: npm run serve-prod
           ports: '80'
           cpu: 2

diff --git a/contracts/generated/ConstantSupplyERC20/ConstantSupplyERC20.go b/contracts/generated/ConstantSupplyERC20/ConstantSupplyERC20.go
diff --git a/contracts/generated/CrossChainMessenger/CrossChainMessenger.go b/contracts/generated/CrossChainMessenger/CrossChainMessenger.go
diff --git a/contracts/generated/EthereumBridge/EthereumBridge.go b/contracts/generated/EthereumBridge/EthereumBridge.go