integration tests publish all methods (#1197)

* added pool fixed rate and dispenser publish

* add validate method update publish tests

* update tests asset metadata

* update validate method

* fix lint

* update validate ussage

* send metadata to validate as object and removed some console logs

* fixed validate method update publish all tests

* fix validate aqua method

* update provider url

* update service timeout and add doc for validate method

* add MetadataProofs

Co-authored-by: alexcos20 <[email protected]>

package.json

@@ -32,6 +32,7 @@
     "test:nftDt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Nft.test.ts'",
     "test:factory": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NftFactory.test.ts'",
     "test:router": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Router.test.ts'",
+    "test:publishAll": "mocha --config=test/integration/.mocharc.json --node-env=test --exit 'test/integration/PublishFlows.test.ts'",
     "test:unit": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/**/*.test.ts'",
     "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
     "test:integration": "mocha --config=test/integration/.mocharc.json --node-env=test --exit 'test/integration/**/*.test.ts'",

src/@types/DDO/Metadata.ts

@@ -131,3 +131,16 @@ export interface Metadata {
    */
   additionalInformation?: any
 }
+
+export interface MetadataProof {
+  validatorAddress?: string
+  r?: string
+  s?: string
+  v?: number
+}
+export interface ValidateMetadata {
+  valid: Boolean
+  errors?: Object
+  hash?: string
+  proof?: MetadataProof
+}

src/@types/DDO/Service.ts

@@ -121,9 +121,9 @@ export interface Service {
 
   /**
    * Describing how long the service can be used after consumption is initiated.
-   * @type {string}
+   * @type {number}
    */
-  timeout: string
+  timeout: number
 
   /**
    * Service friendly name

src/aquarius/Aquarius.ts

@@ -1,5 +1,6 @@
 import { LoggerInstance } from '../utils'
-import { Asset, DDO } from '../@types/'
+import { Asset, DDO, Metadata, ValidateMetadata } from '../@types/'
+import { json } from 'stream/consumers'
 
 export class Aquarius {
   public aquariusURL
@@ -43,9 +44,9 @@ export class Aquarius {
 
   /**
    * Blocks until Aqua will cache the did (or the update for that did) or timeouts
+   * @param {string} fetchMethod fetch client instance
    * @param  {string} did DID of the asset.
    * @param  {string} txid used when the did exists and we expect an update with that txid.
-   * @param {string} fetchMethod fetch client instance
    * @return {Promise<DDO>} DDO of the asset.
    */
   public async waitForAqua(fetchMethod: any, did: string, txid?: string): Promise<Asset> {
@@ -69,6 +70,42 @@ export class Aquarius {
     } while (tries < 100)
     return null
   }
+
+  /**
+   * Validate DDO content
+   * @param {string} fetchMethod fetch client instance
+   * @param  {DDO} ddo DID Descriptor Object content.
+   * @return {Promise<ValidateMetadata>}.
+   */
+  public async validate(fetchMethod: any, ddo: DDO): Promise<ValidateMetadata> {
+    const status: ValidateMetadata = {
+      valid: false
+    }
+    let jsonResponse
+    try {
+      const path = this.aquariusURL + '/api/aquarius/assets/ddo/validate'
+      const response = await fetchMethod('POST', path, JSON.stringify(ddo), {
+        'Content-Type': 'application/octet-stream'
+      })
+      jsonResponse = await response.json()
+      if (response.status === 200) {
+        status.valid = true
+        status.hash = jsonResponse.hash
+        status.proof = {
+          validatorAddress: jsonResponse.publicKey,
+          r: jsonResponse.r[0],
+          s: jsonResponse.s[0],
+          v: jsonResponse.v
+        }
+      } else {
+        status.errors = jsonResponse
+        LoggerInstance.error('validate Metadata failed:', response.status, status.errors)
+      }
+    } catch (error) {
+      LoggerInstance.error('Error validating metadata: ', error)
+    }
+    return status
+  }
 }
 
 export default Aquarius

src/tokens/NFT.ts

@@ -4,6 +4,7 @@ import { TransactionReceipt } from 'web3-eth'
 import defaultNftAbi from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
 import { LoggerInstance, getFairGasPrice, generateDtName } from '../utils'
 import { Contract } from 'web3-eth-contract'
+import { MetadataProof } from '../../src/@types'
 
 /**
  * ERC721 ROLES
@@ -912,6 +913,7 @@ export class Nft {
     flags: string,
     data: string,
     metadataHash: string,
+    metadataProofs?: MetadataProof[],
     contractInstance?: Contract
   ): Promise<any> {
     const nftContract =
@@ -928,7 +930,7 @@ export class Nft {
           flags,
           data,
           metadataHash,
-          []
+          metadataProofs
         )
         .estimateGas({ from: metadataUpdater }, (err, estGas) =>
           err ? gasLimitDefault : estGas
@@ -955,14 +957,14 @@ export class Nft {
     metaDataDecryptorAddress: string,
     flags: string,
     data: string,
-    metadataHash: string
+    metadataHash: string,
+    metadataProofs?: MetadataProof[]
   ): Promise<TransactionReceipt> {
     const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
-
+    if (!metadataProofs) metadataProofs = []
     if (!(await this.getNftPermissions(nftAddress, address)).updateMetadata) {
       throw new Error(`Caller is not Metadata updater`)
     }
-
     const estGas = await this.estGasSetMetadata(
       nftAddress,
       address,
@@ -972,6 +974,7 @@ export class Nft {
       flags,
       data,
       metadataHash,
+      metadataProofs,
       nftContract
     )
     const trxReceipt = await nftContract.methods
@@ -982,7 +985,7 @@ export class Nft {
         flags,
         data,
         metadataHash,
-        []
+        metadataProofs
       )
       .send({
         from: address,