dkg.js 6.1.2 → 6.2.1

package/managers/network-operations-manager.js

@@ -14,27 +14,35 @@ class NetworkOperationsManager {
      * @returns {BigInt} Suggested bid for publishing Knowledge Asset with given parameters.
      */
     async getBidSuggestion(publicAssertionId, sizeInBytes, options = {}) {
-        const { blockchain, endpoint, port, epochsNum, hashFunctionId, authToken } =
-            this.inputService.getBidSuggestionArguments(options);
+        const {
+            blockchain,
+            endpoint,
+            port,
+            epochsNum,
+            hashFunctionId,
+            authToken,
+            bidSuggestionRange,
+        } = this.inputService.getBidSuggestionArguments(options);
 
         const contentAssetStorageAddress = await this.blockchainService.getContractAddress(
             'ContentAssetStorage',
             blockchain,
         );
 
-        return BigInt(
-            await this.nodeApiService.getBidSuggestion(
-                endpoint,
-                port,
-                authToken,
-                blockchain.name,
-                epochsNum,
-                sizeInBytes,
-                contentAssetStorageAddress,
-                publicAssertionId,
-                hashFunctionId,
-            ),
+        const response = await this.nodeApiService.getBidSuggestion(
+            endpoint,
+            port,
+            authToken,
+            blockchain.name,
+            epochsNum,
+            sizeInBytes,
+            contentAssetStorageAddress,
+            publicAssertionId,
+            hashFunctionId,
+            bidSuggestionRange,
         );
+
+        return typeof response === 'string' ? BigInt(response) : response;
     }
 }
 module.exports = NetworkOperationsManager;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dkg.js",
-    "version": "6.1.2",
+    "version": "6.2.1",
     "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,9 @@
-const { DEFAULT_PARAMETERS, BLOCKCHAINS } = require('../constants');
+const {
+    DEFAULT_PARAMETERS,
+    DEFAULT_PROXIMITY_SCORE_FUNCTIONS_PAIR_IDS,
+    BLOCKCHAINS,
+    LOW_BID_SUGGESTION,
+} = require('../constants');
 
 class InputService {
     constructor(config = {}) {
@@ -13,6 +18,7 @@ class InputService {
             epochsNum: this.getEpochsNum(options),
             hashFunctionId: this.getHashFunctionId(options),
             authToken: this.getAuthToken(options),
+            bidSuggestionRange: this.getBidSuggestionRange(options),
         };
     }
 
@@ -150,11 +156,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) {
@@ -196,6 +202,10 @@ class InputService {
     getAuthToken(options) {
         return options.auth?.token ?? this.config?.auth?.token ?? null;
     }
+
+    getBidSuggestionRange(options) {
+        return options.bidSuggestionRange ?? LOW_BID_SUGGESTION;
+    }
 }
 
 module.exports = InputService;

package/services/node-api-service/implementations/http-service.js

@@ -31,19 +31,24 @@ class HttpService {
         contentAssetStorageAddress,
         firstAssertionId,
         hashFunctionId,
+        bidSuggestionRange,
     ) {
         try {
+            const params = {
+                blockchain,
+                epochsNumber,
+                assertionSize,
+                contentAssetStorageAddress,
+                firstAssertionId,
+                hashFunctionId,
+            };
+            if (bidSuggestionRange != null) {
+                params.bidSuggestionRange = bidSuggestionRange;
+            }
             const response = await axios({
                 method: 'get',
                 url: `${endpoint}:${port}/bid-suggestion`,
-                params: {
-                    blockchain,
-                    epochsNumber,
-                    assertionSize,
-                    contentAssetStorageAddress,
-                    firstAssertionId,
-                    hashFunctionId,
-                },
+                params,
                 headers: this.prepareRequestConfig(authToken),
             });
 

package/services/validation-service.js

@@ -7,6 +7,7 @@ const {
     OPERATIONS,
     GET_OUTPUT_FORMATS,
     QUERY_TYPES,
+    BID_SUGGESTION_RANGE_ENUM,
 } = require('../constants.js');
 const { nodeSupported } = require('./utilities.js');
 
@@ -402,5 +403,17 @@ class ValidationService {
         this.validateRequiredParam('newOwner', newOwner);
         this.validateParamType('newOwner', newOwner, 'string');
     }
+
+    validateGetBidSuggestion(bidSuggestionRange) {
+        this.validateBidSuggestionRange(bidSuggestionRange);
+    }
+
+    validateBidSuggestionRange(bidSuggestionRange) {
+        if (!BID_SUGGESTION_RANGE_ENUM.includes(bidSuggestionRange)) {
+            throw Error(
+                `Invalid bidSuggestionRange parametar: supported parametars ${BID_SUGGESTION_RANGE_ENUM}`,
+            );
+        }
+    }
 }
 module.exports = ValidationService;