dkg.js 6.0.2 → 6.0.4

package/managers/asset-operations-manager.js

@@ -32,6 +32,76 @@ class AssetOperationsManager {
         this.inputService = services.inputService;
     }
 
+    /**
+     * Increases allowance for a set quantity of tokens.
+     * @async
+     * @param {number} tokenAmount - The amount of tokens to increase the allowance for.
+     * @param {Object} [options={}] - Additional options for increasing allowance - currently only blockchain option expected.
+     * @returns {Object} Object containing hash of blockchain transaction and status.
+     */
+    async increaseAllowance(tokenAmount, options = {}) {
+        const blockchain = this.inputService.getBlockchain(options);
+
+        this.validationService.validateIncreaseAllowance(blockchain);
+
+        const serviceAgreementV1Address = await this.blockchainService.getContractAddress(
+            'ServiceAgreementV1',
+            blockchain,
+        );
+
+        const receipt = await this.blockchainService.executeContractFunction(
+            'Token',
+            'increaseAllowance',
+            [serviceAgreementV1Address, tokenAmount],
+            blockchain,
+        );
+
+        return {
+            transactionHash: receipt.transactionHash,
+            status: receipt.status,
+        };
+    }
+
+    /**
+     * Decreases allowance for a set quantity of tokens.
+     * @async
+     * @param {number} tokenAmount - The amount of tokens to decrease the allowance for.
+     * @param {Object} [options={}] - Additional options for decreasing allowance - currently only blockchain option expected.
+     * @returns {Object} Object containing hash of blockchain transaction and status.
+     */
+    async decreaseAllowance(tokenAmount, options = {}) {
+        const blockchain = this.inputService.getBlockchain(options);
+
+        this.validationService.validateDecreaseAllowance(blockchain);
+
+        const serviceAgreementV1Address = await this.blockchainService.getContractAddress(
+            'ServiceAgreementV1',
+            blockchain,
+        );
+
+        const allowance = await this.blockchainService.callContractFunction(
+            'Token',
+            'allowance',
+            [blockchain.publicKey, serviceAgreementV1Address],
+            blockchain,
+        );
+
+        const receipt = await this.blockchainService.executeContractFunction(
+            'Token',
+            'decreaseAllowance',
+            [
+                serviceAgreementV1Address,
+                BigInt(tokenAmount) > BigInt(allowance) ? allowance : tokenAmount,
+            ], // So Error 'ERC20: decreased allowance below zero' is not emitted
+            blockchain,
+        );
+
+        return {
+            transactionHash: receipt.transactionHash,
+            status: receipt.status,
+        };
+    }
+
     /**
      * Creates a new asset.
      * @async
@@ -293,10 +363,10 @@ class AssetOperationsManager {
             getPublicOperationId,
         );
 
-        if(!getPublicOperationResult.data.assertion) {
+        if (!getPublicOperationResult.data.assertion) {
             return {
                 errorType: 'DKG_CLIENT_ERROR',
-                errorMessage: "Unable to find assertion on the network!",
+                errorMessage: 'Unable to find assertion on the network!',
             };
         }
 
@@ -378,7 +448,7 @@ class AssetOperationsManager {
                         authToken,
                         queryString,
                         QUERY_TYPES.CONSTRUCT,
-                        repository
+                        repository,
                     );
 
                     queryPrivateOperationResult = await this.nodeApiService.getOperationResult(
@@ -611,6 +681,7 @@ class AssetOperationsManager {
         );
         return {
             UAL,
+            publicAssertionId: publicAssertionId,
             operation: getOperationStatusObject(operationResult, operationId),
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dkg.js",
-    "version": "6.0.2",
+    "version": "6.0.4",
     "description": "Javascript library for interaction with the OriginTrail Decentralized Knowledge Graph",
     "main": "index.js",
     "scripts": {

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

@@ -143,16 +143,27 @@ class BlockchainServiceBase {
             blockchain,
         );
 
-        await this.executeContractFunction(
+        const allowance = await this.callContractFunction(
             'Token',
-            'increaseAllowance',
-            [serviceAgreementV1Address, requestData.tokenAmount],
+            'allowance',
+            [blockchain.publicKey, serviceAgreementV1Address],
             blockchain,
         );
 
-        stepHooks.afterHook({
-            status: OPERATIONS_STEP_STATUS.INCREASE_ALLOWANCE_COMPLETED,
-        });
+        let tokensNeeded = BigInt(requestData.tokenAmount) - BigInt(allowance);
+
+        if (tokensNeeded > 0) {
+            await this.executeContractFunction(
+                'Token',
+                'increaseAllowance',
+                [serviceAgreementV1Address, tokensNeeded],
+                blockchain,
+            );
+
+            stepHooks.afterHook({
+                status: OPERATIONS_STEP_STATUS.INCREASE_ALLOWANCE_COMPLETED,
+            });
+        }
 
         try {
             const receipt = await this.executeContractFunction(
@@ -173,12 +184,14 @@ class BlockchainServiceBase {
 
             return tokenId;
         } catch (e) {
-            await this.executeContractFunction(
-                'Token',
-                'decreaseAllowance',
-                [serviceAgreementV1Address, requestData.tokenAmount],
-                blockchain,
-            );
+            if (tokensNeeded > 0) {
+                await this.executeContractFunction(
+                    'Token',
+                    'decreaseAllowance',
+                    [serviceAgreementV1Address, tokensNeeded],
+                    blockchain,
+                );
+            }
             throw e;
         }
     }
@@ -197,13 +210,24 @@ class BlockchainServiceBase {
             blockchain,
         );
 
-        await this.executeContractFunction(
+        const allowance = await this.callContractFunction(
             'Token',
-            'increaseAllowance',
-            [serviceAgreementV1Address, tokenAmount],
+            'allowance',
+            [blockchain.publicKey, serviceAgreementV1Address],
             blockchain,
         );
 
+        let tokensNeeded = BigInt(tokenAmount) - BigInt(allowance);
+
+        if (tokensNeeded > 0) {
+            await this.executeContractFunction(
+                'Token',
+                'increaseAllowance',
+                [serviceAgreementV1Address, tokensNeeded],
+                blockchain,
+            );
+        }
+
         try {
             return this.executeContractFunction(
                 'ContentAsset',
@@ -219,12 +243,14 @@ class BlockchainServiceBase {
                 blockchain,
             );
         } catch (e) {
-            await this.executeContractFunction(
-                'Token',
-                'decreaseAllowance',
-                [serviceAgreementV1Address, tokenAmount],
-                blockchain,
-            );
+            if (tokensNeeded > 0) {
+                await this.executeContractFunction(
+                    'Token',
+                    'decreaseAllowance',
+                    [serviceAgreementV1Address, tokensNeeded],
+                    blockchain,
+                );
+            }
             throw e;
         }
     }

package/services/validation-service.js

@@ -1,4 +1,13 @@
-const { ASSET_STATES, CONTENT_TYPES, GRAPH_LOCATIONS, GRAPH_STATES, MAX_FILE_SIZE, OPERATIONS, GET_OUTPUT_FORMATS, QUERY_TYPES } = require('../constants.js');
+const {
+    ASSET_STATES,
+    CONTENT_TYPES,
+    GRAPH_LOCATIONS,
+    GRAPH_STATES,
+    MAX_FILE_SIZE,
+    OPERATIONS,
+    GET_OUTPUT_FORMATS,
+    QUERY_TYPES,
+} = require('../constants.js');
 const { nodeSupported } = require('./utilities.js');
 
 class ValidationService {
@@ -30,6 +39,14 @@ class ValidationService {
         this.validateAuthToken(authToken);
     }
 
+    validateIncreaseAllowance(blockchain) {
+        this.validateBlockchain(blockchain);
+    }
+
+    validateDecreaseAllowance(blockchain) {
+        this.validateBlockchain(blockchain);
+    }
+
     validateAssetCreate(
         content,
         blockchain,
@@ -44,7 +61,7 @@ class ValidationService {
         tokenAmount,
         authToken,
     ) {
-        this.validateContent(content)
+        this.validateContent(content);
         this.validateBlockchain(blockchain, OPERATIONS.PUBLISH);
         this.validateEndpoint(endpoint);
         this.validatePort(port);
@@ -98,7 +115,7 @@ class ValidationService {
         tokenAmount,
         authToken,
     ) {
-        this.validateContent(content)
+        this.validateContent(content);
         this.validateBlockchain(blockchain, OPERATIONS.UPDATE);
         this.validateEndpoint(endpoint);
         this.validatePort(port);
@@ -257,7 +274,7 @@ class ValidationService {
 
         const validContentTypes = Object.values(CONTENT_TYPES);
         if (!validContentTypes.includes(contentType))
-          throw Error(`Invalid content visibility! Available parameters: ${validContentTypes}`)
+            throw Error(`Invalid content visibility! Available parameters: ${validContentTypes}`);
     }
 
     validateEpochsNum(epochsNum) {