Merge pull request #252 from OriginTrail/add-auto-merge-workflow

Add auto merge workflow

Author: Bojan131

.github/workflows/auto-merge-main-to-Test_Publish_Query.yml

@@ -4,9 +4,15 @@ on:
   push:
     branches:
       - v8/develop
+  pull_request:
+    branches:
+      - v8/develop
+    types:
+      - closed
 
 jobs:
   merge-develop-into-feature:
+    if: github.event.pull_request.merged == true || github.event_name == 'push'
     runs-on: ubuntu-latest
 
     steps:
@@ -25,7 +31,8 @@ jobs:
         run: git fetch origin v8/develop
 
       - name: Merge v8/develop into Test_Publish_Query
-        run: git merge origin/v8/develop --no-edit || true
+        run: |
+          git merge origin/v8/develop --no-edit || echo "Merge failed but continuing"
 
       - name: Push updated branch
         run: git push origin HEAD:Test_Publish_Query

.gitignore

@@ -13,3 +13,7 @@ kg-example.json
 
 client-d-n.html
 client-d-n.js
+assets
+mainnet_base.html
+mainnet_base.json
+mochawesome-report

index.cjs

@@ -3445,8 +3445,8 @@ class BlockchainServiceBase {
     async getGnosisGasPrice(blockchain) {
         try {
             const response = await axios.get(blockchain.gasPriceOracleLink);
-            const averageGasPrice = Number(response?.data?.average) * 1e9;
-            return averageGasPrice || DEFAULT_GAS_PRICE_WEI.GNOSIS;
+            const fastGasPrice = Number(response?.data?.fast) * 1e9;
+            return fastGasPrice || DEFAULT_GAS_PRICE_WEI.GNOSIS;
         } catch (error) {
             console.warn(`Failed to fetch gas price from Gnosis oracle: ${error}`);
             return DEFAULT_GAS_PRICE_WEI.GNOSIS;
@@ -4613,7 +4613,7 @@ class BlockchainServiceBase {
                 if (blockchain.name.split(':')[1] === '100') {
                     gasPrice = Number(response.result, 10);
                 } else if (blockchain.name.split(':')[1] === '10200') {
-                    gasPrice = Math.round(response.data.average * 1e9);
+                    gasPrice = Math.round((response.data.fast) * 1e9);
                 }
             } else {
                 gasPrice = Web3.utils.toWei(

services/blockchain-service/blockchain-service-base.js

@@ -140,8 +140,8 @@ export default class BlockchainServiceBase {
     async getGnosisGasPrice(blockchain) {
         try {
             const response = await axios.get(blockchain.gasPriceOracleLink);
-            const averageGasPrice = Number(response?.data?.average) * 1e9;
-            return averageGasPrice || DEFAULT_GAS_PRICE_WEI.GNOSIS;
+            const fastGasPrice = Number(response?.data?.fast) * 1e9;
+            return fastGasPrice || DEFAULT_GAS_PRICE_WEI.GNOSIS;
         } catch (error) {
             console.warn(`Failed to fetch gas price from Gnosis oracle: ${error}`);
             return DEFAULT_GAS_PRICE_WEI.GNOSIS;
@@ -1308,7 +1308,7 @@ export default class BlockchainServiceBase {
                 if (blockchain.name.split(':')[1] === '100') {
                     gasPrice = Number(response.result, 10);
                 } else if (blockchain.name.split(':')[1] === '10200') {
-                    gasPrice = Math.round(response.data.average * 1e9);
+                    gasPrice = Math.round((response.data.fast) * 1e9);
                 }
             } else {
                 gasPrice = Web3.utils.toWei(