dkg.js 6.1.2 → 6.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dkg.js",
-    "version": "6.1.2",
+    "version": "6.2.0",
     "description": "Javascript library for interaction with the OriginTrail Decentralized Knowledge Graph",
     "main": "index.js",
     "scripts": {
@@ -31,7 +31,7 @@
     "dependencies": {
         "assertion-tools": "^2.1.0",
         "axios": "^0.27.2",
-        "dkg-evm-module": "^4.1.0",
+        "dkg-evm-module": "^4.2.4",
         "ethers": "^6.1.0",
         "jsonld": "^8.1.0",
         "web3": "^1.7.3"

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

@@ -8,7 +8,7 @@ const ContentAssetStorageAbi = require('dkg-evm-module/abi/ContentAssetStorage.j
 const UnfinalizedStateStorageAbi = require('dkg-evm-module/abi/UnfinalizedStateStorage.json');
 const ContentAssetAbi = require('dkg-evm-module/abi/ContentAsset.json');
 const TokenAbi = require('dkg-evm-module/abi/Token.json');
-const { OPERATIONS_STEP_STATUS } = require('../../constants');
+const { OPERATIONS_STEP_STATUS, DEFAULT_GAS_PRICE } = require('../../constants');
 const emptyHooks = require('../../util/empty-hooks.js');
 
 class BlockchainServiceBase {
@@ -64,15 +64,25 @@ class BlockchainServiceBase {
                     gasPrice = Math.round(response.data.average * 1e9);
                 }
             } else {
-                gasPrice = Web3.utils.toWei('100', 'Gwei');
+                gasPrice = Web3.utils.toWei(
+                    blockchain.name.startsWith('otp')
+                        ? DEFAULT_GAS_PRICE.OTP
+                        : DEFAULT_GAS_PRICE.GNOSIS,
+                    'Gwei',
+                );
             }
             return gasPrice;
         } catch (error) {
             // eslint-disable-next-line no-console
             console.warn(
-                `Failed to fetch the gas price from the network: ${error}. Using default value: 100 Gwei.`,
+                `Failed to fetch the gas price from the network: ${error}. Using default value: 2 Gwei.`,
+            );
+            return Web3.utils.toWei(
+                blockchain.name.startsWith('otp')
+                    ? DEFAULT_GAS_PRICE.OTP
+                    : DEFAULT_GAS_PRICE.GNOSIS,
+                'Gwei',
             );
-            return Web3.utils.toWei('100', 'Gwei');
         }
     }
 
@@ -531,22 +541,38 @@ class BlockchainServiceBase {
 
     async getGasPrice(blockchain) {
         const web3Instance = await this.getWeb3Instance(blockchain);
-        let gasPrice;
-
-        if (blockchain.name.startsWith('otp')) {
-            gasPrice = await web3Instance.eth.getGasPrice();
-        } else if (blockchain.name.startsWith('gnosis')) {
-            const response = await axios.get(blockchain.gasPriceOracleLink);
-            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);
+        try {
+            let gasPrice;
+            if (blockchain.name.startsWith('otp')) {
+                gasPrice = await web3Instance.eth.getGasPrice();
+            } else if (blockchain.name.startsWith('gnosis')) {
+                const response = await axios.get(blockchain.gasPriceOracleLink);
+                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);
+                }
+            } else {
+                gasPrice = Web3.utils.toWei(
+                    blockchain.name.startsWith('otp')
+                        ? DEFAULT_GAS_PRICE.OTP
+                        : DEFAULT_GAS_PRICE.GNOSIS,
+                    'Gwei',
+                );
             }
-        } else {
-            gasPrice = Web3.utils.toWei('100', 'Gwei');
+            return gasPrice;
+        } catch (error) {
+            // eslint-disable-next-line no-console
+            console.warn(
+                `Failed to fetch the gas price from the network: ${error}. Using default value: 2 Gwei.`,
+            );
+            return Web3.utils.toWei(
+                blockchain.name.startsWith('otp')
+                    ? DEFAULT_GAS_PRICE.OTP
+                    : DEFAULT_GAS_PRICE.GNOSIS,
+                'Gwei',
+            );
         }
-
-        return gasPrice;
     }
 
     async getWalletBalances(blockchain) {

package/services/input-service.js

@@ -1,4 +1,8 @@
-const { DEFAULT_PARAMETERS, BLOCKCHAINS } = require('../constants');
+const {
+    DEFAULT_PARAMETERS,
+    DEFAULT_PROXIMITY_SCORE_FUNCTIONS_PAIR_IDS,
+    BLOCKCHAINS,
+} = require('../constants');
 
 class InputService {
     constructor(config = {}) {
@@ -150,11 +154,11 @@ class InputService {
     }
 
     getScoreFunctionId(options) {
-        return (
-            options.scoreFunctionId ??
-            this.config.scoreFunctionId ??
-            DEFAULT_PARAMETERS.SCORE_FUNCTION_ID
-        );
+        const environment =
+            options.environment ?? this.config.environment ?? DEFAULT_PARAMETERS.ENVIRONMENT;
+        const blockchainName = this.getBlockchain(options).name;
+
+        return DEFAULT_PROXIMITY_SCORE_FUNCTIONS_PAIR_IDS[environment][blockchainName];
     }
 
     getEpochsNum(options) {