dkg.js 8.0.2 → 8.0.4

package/index.cjs

@@ -586,15 +586,15 @@ class AssetOperationsManager {
 
         this.validationService.validateIncreaseAllowance(blockchain);
 
-        const serviceAgreementV1Address = await this.blockchainService.getContractAddress(
-            'ServiceAgreementV1',
+        const knowledgeCollectionAddress = await this.blockchainService.getContractAddress(
+            'KnowledgeCollection',
             blockchain,
         );
 
         const receipt = await this.blockchainService.executeContractFunction(
             'Token',
             'increaseAllowance',
-            [serviceAgreementV1Address, tokenAmount],
+            [knowledgeCollectionAddress, tokenAmount],
             blockchain,
         );
 
@@ -655,15 +655,15 @@ class AssetOperationsManager {
     async getCurrentAllowance(options = {}) {
         const blockchain = this.inputService.getBlockchain(options);
 
-        const serviceAgreementV1Address = await this.blockchainService.getContractAddress(
-            'ServiceAgreementV1',
+        const knowledgeCollectionAddress = await this.blockchainService.getContractAddress(
+            'KnowledgeCollection',
             blockchain,
         );
 
         const allowance = await this.blockchainService.callContractFunction(
             'Token',
             'allowance',
-            [blockchain.publicKey, serviceAgreementV1Address],
+            [blockchain.publicKey, knowledgeCollectionAddress],
             blockchain,
         );
 
@@ -698,6 +698,18 @@ class AssetOperationsManager {
         return left;
     }
 
+    manualJoinSignature({ r, s, v }) {
+        // Remove the "0x" prefix from r and s
+        const rNoPrefix = r.replace(/^0x/, '');
+        const sNoPrefix = s.replace(/^0x/, '');
+
+        // Convert v to a 2-digit hex string (e.g. "1b" or "1c")
+        // If v is already 27 or 28, this should work fine.
+        const vHex = Number(v).toString(16).padStart(2, '0');
+
+        return '0x' + rNoPrefix + sNoPrefix + vHex;
+    }
+
     /**
      * Creates a new knowledge collection.
      * @async
@@ -849,7 +861,6 @@ class AssetOperationsManager {
             hashFunctionId,
             minimumNumberOfNodeReplications,
         );
-
         const publishOperationResult = await this.nodeApiService.getOperationResult(
             endpoint,
             port,
@@ -883,12 +894,28 @@ class AssetOperationsManager {
         const identityIds = [];
         const r = [];
         const vs = [];
+        await Promise.all(
+            signatures.map(async (signature) => {
+                try {
+                    const signerAddress = ethers.ethers.recoverAddress(
+                        ethers.hashMessage(ethers.getBytes(datasetRoot)),
+                        signature,
+                    );
 
-        signatures.forEach((signature) => {
-            identityIds.push(signature.identityId);
-            r.push(signature.r);
-            vs.push(signature.vs);
-        });
+                    let keyIsOperationalWallet;
+                    keyIsOperationalWallet = await this.blockchainService.keyIsOperationalWallet(
+                        blockchain,
+                        signature.identityId,
+                        signerAddress,
+                    );
+                    if (keyIsOperationalWallet) {
+                        identityIds.push(signature.identityId);
+                        r.push(signature.r);
+                        vs.push(signature.vs);
+                    }
+                } catch {}
+            }),
+        );
 
         let estimatedPublishingCost;
         if (tokenAmount) {
@@ -4246,6 +4273,21 @@ class BlockchainServiceBase {
         return this.callContractFunction('Chronos', 'epochLength', [], blockchain);
     }
 
+    async keyIsOperationalWallet(blockchain, identityId, signer) {
+        const result = await this.callContractFunction(
+            'IdentityStorage',
+            'keyHasPurpose',
+            [
+                identityId,
+                ethers.solidityPackedKeccak256(['address'], [signer]),
+                2, // IdentityLib.OPERATIONAL_KEY
+            ],
+            blockchain,
+        );
+
+        return result;
+    }
+
     convertToWei(ether) {
         return Web3.utils.toWei(ether.toString(), 'ether');
     }

package/managers/asset-operations-manager.js

@@ -1,5 +1,5 @@
 import { kaTools, kcTools } from 'assertion-tools';
-import { ethers } from 'ethers';
+import { ethers, hashMessage, getBytes } from 'ethers';
 import {
     deriveUAL,
     getOperationStatusObject,
@@ -168,15 +168,15 @@ export default class AssetOperationsManager {
 
         this.validationService.validateIncreaseAllowance(blockchain);
 
-        const serviceAgreementV1Address = await this.blockchainService.getContractAddress(
-            'ServiceAgreementV1',
+        const knowledgeCollectionAddress = await this.blockchainService.getContractAddress(
+            'KnowledgeCollection',
             blockchain,
         );
 
         const receipt = await this.blockchainService.executeContractFunction(
             'Token',
             'increaseAllowance',
-            [serviceAgreementV1Address, tokenAmount],
+            [knowledgeCollectionAddress, tokenAmount],
             blockchain,
         );
 
@@ -237,15 +237,15 @@ export default class AssetOperationsManager {
     async getCurrentAllowance(options = {}) {
         const blockchain = this.inputService.getBlockchain(options);
 
-        const serviceAgreementV1Address = await this.blockchainService.getContractAddress(
-            'ServiceAgreementV1',
+        const knowledgeCollectionAddress = await this.blockchainService.getContractAddress(
+            'KnowledgeCollection',
             blockchain,
         );
 
         const allowance = await this.blockchainService.callContractFunction(
             'Token',
             'allowance',
-            [blockchain.publicKey, serviceAgreementV1Address],
+            [blockchain.publicKey, knowledgeCollectionAddress],
             blockchain,
         );
 
@@ -280,6 +280,18 @@ export default class AssetOperationsManager {
         return left;
     }
 
+    manualJoinSignature({ r, s, v }) {
+        // Remove the "0x" prefix from r and s
+        const rNoPrefix = r.replace(/^0x/, '');
+        const sNoPrefix = s.replace(/^0x/, '');
+
+        // Convert v to a 2-digit hex string (e.g. "1b" or "1c")
+        // If v is already 27 or 28, this should work fine.
+        const vHex = Number(v).toString(16).padStart(2, '0');
+
+        return '0x' + rNoPrefix + sNoPrefix + vHex;
+    }
+
     /**
      * Creates a new knowledge collection.
      * @async
@@ -431,7 +443,6 @@ export default class AssetOperationsManager {
             hashFunctionId,
             minimumNumberOfNodeReplications,
         );
-
         const publishOperationResult = await this.nodeApiService.getOperationResult(
             endpoint,
             port,
@@ -465,12 +476,28 @@ export default class AssetOperationsManager {
         const identityIds = [];
         const r = [];
         const vs = [];
+        await Promise.all(
+            signatures.map(async (signature) => {
+                try {
+                    const signerAddress = ethers.recoverAddress(
+                        hashMessage(getBytes(datasetRoot)),
+                        signature,
+                    );
 
-        signatures.forEach((signature) => {
-            identityIds.push(signature.identityId);
-            r.push(signature.r);
-            vs.push(signature.vs);
-        });
+                    let keyIsOperationalWallet;
+                    keyIsOperationalWallet = await this.blockchainService.keyIsOperationalWallet(
+                        blockchain,
+                        signature.identityId,
+                        signerAddress,
+                    );
+                    if (keyIsOperationalWallet) {
+                        identityIds.push(signature.identityId);
+                        r.push(signature.r);
+                        vs.push(signature.vs);
+                    }
+                } catch {}
+            }),
+        );
 
         let estimatedPublishingCost;
         if (tokenAmount) {

package/package.json

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

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

@@ -2,6 +2,7 @@
 /* eslint-disable no-await-in-loop */
 import Web3 from 'web3';
 import axios from 'axios';
+import { solidityPackedKeccak256 } from 'ethers';
 import { createRequire } from 'module';
 import {
     OPERATIONS_STEP_STATUS,
@@ -1185,6 +1186,21 @@ export default class BlockchainServiceBase {
         return this.callContractFunction('Chronos', 'epochLength', [], blockchain);
     }
 
+    async keyIsOperationalWallet(blockchain, identityId, signer) {
+        const result = await this.callContractFunction(
+            'IdentityStorage',
+            'keyHasPurpose',
+            [
+                identityId,
+                solidityPackedKeccak256(['address'], [signer]),
+                2, // IdentityLib.OPERATIONAL_KEY
+            ],
+            blockchain,
+        );
+
+        return result;
+    }
+
     convertToWei(ether) {
         return Web3.utils.toWei(ether.toString(), 'ether');
     }