dkg.js 8.0.7 → 8.0.8

package/README.md

@@ -1,6 +1,6 @@
 <a name="readme-top"></a>
 
-___
+---
 
 <br />
 <div align="center">
@@ -15,7 +15,7 @@ ___
     </br>
     <a href="https://docs.origintrail.io/">OriginTrail Docs</a>
     ·
-    <a href="https://github.com/OriginTrail/dkg.js/examples/demo.js">View Demo</a>
+    <a href="https://github.com/OriginTrail/dkg.js/blob/v8/develop/examples/demo.js">View Demo</a>
     ·
     <a href="https://github.com/OriginTrail/dkg.js/issues">Report Bug</a>
     ·
@@ -52,7 +52,7 @@ ___
   </ol>
 </details>
 
-___
+---
 
 <br/>
 
@@ -62,6 +62,7 @@ ___
 <summary>
 
 ### **What is the Decentralized Knowledge Graph?**
+
 </summary>
 
 <br/>
@@ -71,17 +72,19 @@ ___
 </div>
 
 OriginTrail Decentralized Knowledge Graph (DKG), hosted on the OriginTrail Decentralized Network (ODN) as trusted knowledge infrastructure, is shared global Knowledge Graph of Knowledge Assets. Running on the basis of the permissionless multi-chain OriginTrail protocol, it combines blockchains and knowledge graph technology to enable trusted AI applications based on key W3C standards.
+
 </details>
 
 <details open>
 <summary>
 
 ### **The OriginTrail DKG Architecture**
+
 </summary>
 
 <br/>
 
-The OriginTrail tech stack is a three layer structure, consisting of the multi-chain consensus layer (OriginTrail layer 1, running on multiple blockchains), the Decentralized Knowledge Graph layer (OriginTrail Layer 2, hosted on the ODN) and Trusted Knowledge applications in the application layer. 
+The OriginTrail tech stack is a three layer structure, consisting of the multi-chain consensus layer (OriginTrail layer 1, running on multiple blockchains), the Decentralized Knowledge Graph layer (OriginTrail Layer 2, hosted on the ODN) and Trusted Knowledge applications in the application layer.
 
 <div align="center">
     <img src="images/dkg-architecture.png" alt="DKG Architecture" width="400">
@@ -89,13 +92,15 @@ The OriginTrail tech stack is a three layer structure, consisting of the multi-c
 
 Further, the architecture differentiates between **the public, replicated knowledge graph** shared by all network nodes according to the protocol, and **private Knowledge graphs** hosted separately by each of the OriginTrail nodes.
 
-**Anyone can run an OriginTrail node and become part of the ODN, contributing  to the network capacity and hosting the OriginTrail DKG. The OriginTrail node is the ultimate data service for data and knowledge intensive Web3 applications and is used as the key backbone for trusted AI applications (see https://chatdkg.ai)**
+**Anyone can run an OriginTrail node and become part of the ODN, contributing to the network capacity and hosting the OriginTrail DKG. The OriginTrail node is the ultimate data service for data and knowledge intensive Web3 applications and is used as the key backbone for trusted AI applications (see https://chatdkg.ai)**
+
 </details>
 
 <details open>
 <summary>
 
 ### **What is a Knowledge Asset?**
+
 </summary>
 
 <br/>
@@ -107,15 +112,16 @@ Further, the architecture differentiates between **the public, replicated knowle
 **Knowledge Asset is the new, AI‑ready resource for the Internet**
 
 Knowledge Assets are verifiable containers of structured knowledge that live on the OriginTrail DKG and provide:
-- **Discoverability - UAL is the new URL**. Uniform Asset Locators (UALs, based on the W3C Decentralized Identifiers) are a new Web3 knowledge identifier (extensions of the Uniform Resource Locators - URLs) which identify a specific piece of knowledge and make it easy to find and connect with other Knowledge Assets.
-- **Ownership - NFTs enable ownership**. Each Knowledge Asset contains an NFT token that enables ownership, knowledge asset administration and market mechanisms.
-- **Verifiability - On-chain information origin and verifiable trail**. The blockchain tech increases trust, security, transparency, and the traceability of information.
 
+-   **Discoverability - UAL is the new URL**. Uniform Asset Locators (UALs, based on the W3C Decentralized Identifiers) are a new Web3 knowledge identifier (extensions of the Uniform Resource Locators - URLs) which identify a specific piece of knowledge and make it easy to find and connect with other Knowledge Assets.
+-   **Ownership - NFTs enable ownership**. Each Knowledge Asset contains an NFT token that enables ownership, knowledge asset administration and market mechanisms.
+-   **Verifiability - On-chain information origin and verifiable trail**. The blockchain tech increases trust, security, transparency, and the traceability of information.
 
 By their nature, Knowledge Assets are semantic resources (following the W3C Semantic Web set of standards), and through their symbolic representations inherently AI ready. See more at https://chatdkg.ai
 <br/>
 
 **Discover Knowledge Assets with the DKG Explorer:**
+
 <div align="center">
     <table>
         <tr>
@@ -147,7 +153,6 @@ By their nature, Knowledge Assets are semantic resources (following the W3C Sema
     </table>
 </div>
 
-
 </details>
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
@@ -155,16 +160,17 @@ By their nature, Knowledge Assets are semantic resources (following the W3C Sema
 
 ## 🚀 Getting Started
 
-___
+---
 
 ### Prerequisites
 
-- **Node.js** >= 16.0.0
-- **npm** >= 8.0.0
+-   **Node.js** >= 16.0.0
+-   **npm** >= 8.0.0
 
 In order to use in the local environment, make sure to [run the local DKG network](https://github.com/OriginTrail/ot-node?tab=readme-ov-file#local-network-setup).
 
-___
+---
+
 <br/>
 
 ### Installation
@@ -172,11 +178,13 @@ ___
 <br/>
 
 Install the SDK:
+
 ```bash
 npm install dkg.js
 ```
 
-Now you can run a demo example file (requires the local DKG network running): 
+Now you can run a demo example file (requires the local DKG network running):
+
 ```bash
 node examples/demo.js
 ```
@@ -246,4 +254,4 @@ Don't forget to give the project a star! Thanks again!
   </a>
 </div>
 
-___
+---

package/examples/demo.js

@@ -60,25 +60,21 @@ function divider() {
 
     divider();
 
-    console.time('Publish (1 replication, 3 finalizations)');
     const create_result = await DkgClient.asset.create(content, {
         epochsNum: 2,
         minimumNumberOfFinalizationConfirmations: 3,
         minimumNumberOfNodeReplications: 1,
     });
-    console.timeEnd('Publish (1 replication, 3 finalizations)');
 
     console.log(JSON.stringify(create_result));
 
     divider();
 
-    console.time('get');
     const get_result = await DkgClient.asset.get(create_result.UAL, {
         contentType: 'all',
     });
     console.log('======================== ASSET GET');
     console.log(get_result);
-    console.timeEnd('get');
 
     divider();
 
@@ -87,15 +83,14 @@ function divider() {
     console.log(publishFinalityResult);
 
     divider();
-
     const queryOperationResult = await DkgClient.graph.query(
         `
-        PREFIX SCHEMA: <http://schema.org/>
+        PREFIX schema: <http://schema.org/>
         SELECT ?s ?stateName
-            WHERE {
-                ?s schema:state ?stateName .
+        WHERE {
+            ?s schema:state ?stateName .
             }
-        `,
+            `,
         'SELECT',
     );
     console.log('======================== ASSET QUERY');

package/examples/paranet-demo.js

@@ -108,7 +108,7 @@ function divider() {
     console.log(incentivesPoolStorageAddressResult);
     divider();
 
-    // Fund the incentives pool storage contract
+    // Fund the incentives pool storage contract - Works on DEVELOPMENT ONLY
     const web3 = await DkgClient.blockchain.getWeb3Instance();
     const incentivesAmount = web3.utils.toWei('100', 'ether');
     const txHash = await web3.eth.sendTransaction({
@@ -251,7 +251,6 @@ function divider() {
     console.log(
         '======================== IS MINER : ',
         await DkgClient.paranet.isKnowledgeMiner(paranetUAL, {
-            roleAddress: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
             incentivesPoolName: incentivesPoolOptions.incentivesPoolName,
         }),
     );

package/managers/graph-operations-manager.js

@@ -1,15 +1,10 @@
-import { kaTools, kcTools } from 'assertion-tools';
+import { kaTools } from 'assertion-tools';
 import { ethers } from 'ethers';
 import {
     OPERATIONS,
-    CHUNK_BYTE_SIZE,
-    OPERATION_STATUSES,
     PRIVATE_RESOURCE_PREDICATE,
     PRIVATE_HASH_SUBJECT_PREFIX,
 } from '../constants.js';
-import { getOperationStatusObject, deriveUAL } from '../services/utilities.js';
-import emptyHooks from '../util/empty-hooks.js';
-
 export default class GraphOperationsManager {
     constructor(services) {
         this.nodeApiService = services.nodeApiService;
@@ -41,7 +36,7 @@ export default class GraphOperationsManager {
             repository,
         );
 
-        const operationId = await this.nodeApiService.query(
+        return this.nodeApiService.query(
             endpoint,
             port,
             authToken,
@@ -50,16 +45,6 @@ export default class GraphOperationsManager {
             paranetUAL,
             repository,
         );
-
-        return this.nodeApiService.getOperationResult(
-            endpoint,
-            port,
-            authToken,
-            OPERATIONS.QUERY,
-            maxNumberOfRetries,
-            frequency,
-            operationId,
-        );
     }
 
     generatePrivateRepresentation(privateSubject) {

package/package.json

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

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

@@ -30,6 +30,7 @@ const KnowledgeCollectionAbi = require('dkg-evm-module/abi/KnowledgeCollection.j
 const KnowledgeCollectionStorageAbi = require('dkg-evm-module/abi/KnowledgeCollectionStorage.json');
 const AskStorageAbi = require('dkg-evm-module/abi/AskStorage.json');
 const ChronosAbi = require('dkg-evm-module/abi/Chronos.json');
+const IERC20ExtendedAbi = require('dkg-evm-module/abi/IERC20Extended.json');
 
 export default class BlockchainServiceBase {
     constructor(config = {}) {
@@ -50,6 +51,7 @@ export default class BlockchainServiceBase {
         this.abis.AskStorage = AskStorageAbi;
         this.abis.Chronos = ChronosAbi;
         this.abis.ParanetStagingRegistry = ParanetStagingRegistryAbi;
+        this.abis.IERC20Extended = IERC20ExtendedAbi;
         this.abis.KnowledgeCollectionStorage.filter((obj) => obj.type === 'event').forEach(
             (event) => {
                 const concatInputs = event.inputs.map((input) => input.internalType);
@@ -1073,7 +1075,7 @@ export default class BlockchainServiceBase {
 
         await this.setIncentivesPool(incentivesPoolAddress, blockchain);
 
-        return this.executeContractFunction(
+        return this.callContractFunction(
             'ParanetIncentivesPool',
             'paranetIncentivesPoolStorage',
             [],
@@ -1215,18 +1217,8 @@ export default class BlockchainServiceBase {
             incentivesPoolStorageAddress: options.incentivesPoolStorageAddress,
         });
 
-        console.log('Incentives Pool Address:', incentivesPoolAddress);
-
         await this.setIncentivesPool(incentivesPoolAddress, blockchain);
 
-        // Add debug logs for contract instance
-        const contractInstance = await this.getContractInstance(
-            'ParanetIncentivesPool',
-            blockchain,
-        );
-        console.log('Contract Instance Address:', contractInstance.options.address);
-        console.log('Available Methods:', Object.keys(contractInstance.methods));
-
         return this.callContractFunction(
             'ParanetIncentivesPool',
             'isKnowledgeMiner',
@@ -1401,16 +1393,21 @@ export default class BlockchainServiceBase {
     async adjustEmissionMultiplier(rewardTokenAddress, tracToTokenEmissionMultiplier, blockchain) {
         if (rewardTokenAddress !== ZERO_ADDRESS) {
             // Create contract instance for ERC20 token
-            const tokenContract = new blockchain.web3.eth.Contract(
+            await this.ensureBlockchainInfo(blockchain);
+            const web3Instance = await this.getWeb3Instance(blockchain);
+            const tokenContract = new web3Instance.eth.Contract(
                 this.abis.IERC20Extended,
                 rewardTokenAddress,
             );
 
             try {
                 const decimals = await tokenContract.methods.decimals().call();
-                return (BigInt(tracToTokenEmissionMultiplier) * BigInt(10)) ** BigInt(decimals);
+                return BigInt(tracToTokenEmissionMultiplier) * BigInt(10) ** BigInt(decimals);
             } catch (error) {
-                throw new Error('ERC20 token is missing decimals function');
+                console.log(
+                    'ERC20 token is missing decimals function, adding 18 decimals as default',
+                );
+                return BigInt(tracToTokenEmissionMultiplier) * BigInt(10) ** BigInt(18);
             }
         } else {
             // Neuroweb chains use 12 decimals

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

@@ -130,11 +130,11 @@ export default class HttpService {
         try {
             const response = await axios({
                 method: 'post',
-                url: `${this.getBaseUrl(endpoint, port)}/query`,
+                url: `${this.getBaseUrl(endpoint, port)}/direct-query`,
                 data: { query, type, repository, paranetUAL },
                 headers: this.prepareRequestConfig(authToken),
             });
-            return response.data.operationId;
+            return response.data;
         } catch (error) {
             throw Error(`Unable to query: ${error.message}`);
         }