Integrated with KCs

examples/demo.js

@@ -80,57 +80,57 @@ function divider() {
     console.log('======================== NODE INFO RECEIVED');
     console.log(nodeInfo);
 
-    divider();
+    // divider();
 
-    console.time('Publish (1 replication, 3 finalizations)')
-    const result0 = await DkgClient.asset.create(content, {
-        epochsNum: 2,
-        tokenAmount: '100',
-        minimumNumberOfFinalizationConfirmations: 3,
-        minimumNumberOfNodeReplications: 1,
-    });
-    console.timeEnd('Publish (1 replication, 3 finalizations)')
+    // console.time('Publish (1 replication, 3 finalizations)')
+    // const result0 = await DkgClient.asset.create(content, {
+    //     epochsNum: 2,
+    //     tokenAmount: '100',
+    //     minimumNumberOfFinalizationConfirmations: 3,
+    //     minimumNumberOfNodeReplications: 1,
+    // });
+    // console.timeEnd('Publish (1 replication, 3 finalizations)')
 
-    console.log(JSON.stringify(result0));
+    // console.log(JSON.stringify(result0));
 
-    divider();
+    // divider();
 
-    console.time('Publish (1 replication, 1 finalization)')
-    const result1 = await DkgClient.asset.create(content, {
-        epochsNum: 2,
-        tokenAmount: '100',
-        minimumNumberOfFinalizationConfirmations: 1,
-        minimumNumberOfNodeReplications: 1,
-    });
-    console.timeEnd('Publish (1 replication, 1 finalization)')
+    // console.time('Publish (1 replication, 1 finalization)')
+    // const result1 = await DkgClient.asset.create(content, {
+    //     epochsNum: 2,
+    //     tokenAmount: '100',
+    //     minimumNumberOfFinalizationConfirmations: 1,
+    //     minimumNumberOfNodeReplications: 1,
+    // });
+    // console.timeEnd('Publish (1 replication, 1 finalization)')
 
-    console.log(JSON.stringify(result1));
+    // console.log(JSON.stringify(result1));
 
     divider();
 
     console.time('Publish (3 replications, 3 finalizations)')
     const result2 = await DkgClient.asset.create(content, {
         epochsNum: 2,
-        tokenAmount: '100',
+        tokenAmount: '100000000000',
         minimumNumberOfFinalizationConfirmations: 3,
         minimumNumberOfNodeReplications: 3,
     });
     console.timeEnd('Publish (3 replications, 3 finalizations)')
 
-    console.log(JSON.stringify(result2));
+    console.log(result2);
 
-    divider();
+    // divider();
 
-    console.time('Publish (5 replications, 5 finalizations)')
-    const result3 = await DkgClient.asset.create(content, {
-        epochsNum: 2,
-        tokenAmount: '100',
-        minimumNumberOfFinalizationConfirmations: 5,
-        minimumNumberOfNodeReplications: 5,
-    });
-    console.timeEnd('Publish (5 replications, 5 finalizations)')
+    // console.time('Publish (5 replications, 5 finalizations)')
+    // const result3 = await DkgClient.asset.create(content, {
+    //     epochsNum: 2,
+    //     tokenAmount: '100',
+    //     minimumNumberOfFinalizationConfirmations: 5,
+    //     minimumNumberOfNodeReplications: 5,
+    // });
+    // console.timeEnd('Publish (5 replications, 5 finalizations)')
 
-    console.log(JSON.stringify(result3));
+    // console.log(JSON.stringify(result3));
 
     // divider();
 

managers/asset-operations-manager.js

@@ -418,7 +418,7 @@ export default class AssetOperationsManager {
         const datasetRoot = kcTools.calculateMerkleRoot(dataset.public);
 
         const contentAssetStorageAddress = await this.blockchainService.getContractAddress(
-            'ContentAssetStorage',
+            'KnowledgeCollectionStorage',
             blockchain,
         );
 
@@ -459,19 +459,16 @@ export default class AssetOperationsManager {
 
         const {
             identityId: publisherNodeIdentityId,
-            signer: publisherNodeSigner,
             r: publisherNodeR,
             vs: publisherNodeVS,
         } = publishOperationResult.data.publisherNodeSignature;
 
         const identityIds = [];
-        const signers = [];
         const r = [];
         const vs = [];
 
         signatures.forEach((signature) => {
             identityIds.push(signature.identityId);
-            signers.push(signature.signer);
             r.push(signature.r);
             vs.push(signature.vs);
         });
@@ -480,13 +477,14 @@ export default class AssetOperationsManager {
             tokenAmount ??
             (await this.blockchainService.getStakeWeightedAverageAsk()) * epochsNum * datasetSize;
 
-        let tokenId;
+        let knowledgeCollectionId;
         let mintKnowledgeAssetReceipt;
 
         if (paranetUAL == null) {
-            ({ tokenId, receipt: mintKnowledgeAssetReceipt } =
+            ({ knowledgeCollectionId, receipt: mintKnowledgeAssetReceipt } =
                 await this.blockchainService.createKnowledgeCollection(
                     {
+                        publishOperationId,
                         merkleRoot: datasetRoot,
                         knowledgeAssetsAmount: kcTools.countDistinctSubjects(dataset.public),
                         byteSize: datasetSize,
@@ -496,11 +494,9 @@ export default class AssetOperationsManager {
                         tokenAmount: estimatedPublishingCost,
                         paymaster: payer,
                         publisherNodeIdentityId,
-                        publisherNodeSigner,
                         publisherNodeR,
                         publisherNodeVS,
                         identityIds,
-                        signers,
                         r,
                         vs,
                     },
@@ -511,7 +507,7 @@ export default class AssetOperationsManager {
                 ));
         } else {
             const { contract: paranetKaContract, tokenId: paranetTokenId } = resolveUAL(paranetUAL);
-            ({ tokenId, receipt: mintKnowledgeAssetReceipt } =
+            ({ knowledgeCollectionId, receipt: mintKnowledgeAssetReceipt } =
                 await this.blockchainService.createKnowledgeCollection(
                     {
                         merkleRoot: datasetRoot,
@@ -523,11 +519,9 @@ export default class AssetOperationsManager {
                         tokenAmount: estimatedPublishingCost,
                         paymaster: payer,
                         publisherNodeIdentityId,
-                        publisherNodeSigner,
                         publisherNodeR,
                         publisherNodeVS,
                         identityIds,
-                        signers,
                         r,
                         vs,
                     },
@@ -538,7 +532,7 @@ export default class AssetOperationsManager {
                 ));
         }
 
-        const UAL = deriveUAL(blockchain.name, contentAssetStorageAddress, tokenId);
+        const UAL = deriveUAL(blockchain.name, contentAssetStorageAddress, knowledgeCollectionId);
 
         let finalityStatusResult = 0;
         if (minimumNumberOfFinalizationConfirmations > 0) {

package.json

@@ -32,7 +32,7 @@
     "dependencies": {
         "assertion-tools": "^8.0.0-gamma.1",
         "axios": "^0.27.2",
-        "dkg-evm-module": "^8.0.2-alpha.0",
+        "dkg-evm-module": "^8.0.3-gamma.7",
         "ethers": "^6.1.0",
         "jsonld": "^8.1.0",
         "web3": "^1.7.3"

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

@@ -24,6 +24,7 @@ const ParanetNeuroIncentivesPoolAbi = require('dkg-evm-module/abi/ParanetNeuroIn
 const ParanetKnowledgeMinersRegistryAbi = require('dkg-evm-module/abi/ParanetKnowledgeMinersRegistry.json');
 const IdentityStorageAbi = require('dkg-evm-module/abi/IdentityStorage.json');
 const KnowledgeCollectionAbi = require('dkg-evm-module/abi/KnowledgeCollection.json');
+const KnowledgeCollectionLibAbi = require('dkg-evm-module/abi/KnowledgeCollectionLib.json');
 
 // const ShardingTableStorageAbi = require('dkg-evm-module/abi/ShardingTableStorage.sol.json');
 
@@ -47,6 +48,7 @@ export default class BlockchainServiceBase {
         this.abis.ParanetKnowledgeMinersRegistry = ParanetKnowledgeMinersRegistryAbi;
         this.abis.IdentityStorage = IdentityStorageAbi;
         this.abis.KnowledgeCollection = KnowledgeCollectionAbi;
+        this.abis.KnowledgeCollectionLib = KnowledgeCollectionLibAbi;
         // this.abis.ShardingTableStorageAbi = ShardingTableStorageAbi;
 
         this.abis.ContentAsset.filter((obj) => obj.type === 'event').forEach((event) => {
@@ -323,7 +325,7 @@ export default class BlockchainServiceBase {
             this[blockchain.name].contractAddresses[blockchain.hubContract][contractName] =
                 await this.callContractFunction(
                     'Hub',
-                    contractName.includes('AssetStorage')
+                    contractName.includes('AssetStorage') || contractName.includes('CollectionStorage')
                         ? 'getAssetStorageAddress'
                         : 'getContractAddress',
                     [contractName],
@@ -460,7 +462,7 @@ export default class BlockchainServiceBase {
                 receipt = await this.executeContractFunction(
                     'KnowledgeCollection',
                     'createKnowledgeCollection',
-                    [Object.values(requestData)],
+                    [...Object.values(requestData)],
                     blockchain,
                 );
             } else {
@@ -472,16 +474,16 @@ export default class BlockchainServiceBase {
                 );
             }
 
-            let { tokenId } = await this.decodeEventLogs(receipt, 'AssetMinted', blockchain);
+            let { id } = await this.decodeEventLogs(receipt, 'KnowledgeCollectionCreated', blockchain);
 
-            tokenId = parseInt(tokenId, 10);
+            id = parseInt(id, 10);
 
             stepHooks.afterHook({
                 status: OPERATIONS_STEP_STATUS.CREATE_ASSET_COMPLETED,
-                data: { tokenId },
+                data: { id },
             });
 
-            return { tokenId, receipt };
+            return { knowledgeCollectionId: id, receipt };
         } catch (error) {
             if (allowanceIncreased) {
                 await this.executeContractFunction(

services/blockchain-service/implementations/node-blockchain-service.js

@@ -10,7 +10,7 @@ export default class NodeBlockchainService extends BlockchainServiceBase {
         this.config = config;
         this.events = {};
 
-        this.abis.ContentAsset.filter((obj) => obj.type === 'event').forEach((event) => {
+        this.abis.KnowledgeCollectionLib.filter((obj) => obj.type === 'event').forEach((event) => {
             const concatInputs = event.inputs.map((input) => input.internalType);
 
             this.events[event.name] = {

services/input-service.js

@@ -6,6 +6,7 @@ import {
     LOW_BID_SUGGESTION,
     PARANET_NODES_ACCESS_POLICY,
     PARANET_MINERS_ACCESS_POLICY,
+    ZERO_ADDRESS,
 } from '../constants.js';
 
 export default class InputService {
@@ -333,7 +334,7 @@ export default class InputService {
     }
 
     getPayer(options) {
-        return options.payer ?? this.config.payer ?? null;
+        return options.payer ?? this.config.payer ?? ZERO_ADDRESS;
     }
 
     getMinimumNumberOfFinalizationConfirmations(options) {