From 87a7a0134b08b1f2f5f01bc4fe1dcbcfe6d155c8 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 22 Aug 2024 15:42:06 +0300
Subject: [PATCH 01/64] Created AccessList contract.

---
 src/contracts/AccessList.ts | 119 ++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 src/contracts/AccessList.ts

diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
new file mode 100644
index 000000000..6950e4efe
--- /dev/null
+++ b/src/contracts/AccessList.ts
@@ -0,0 +1,119 @@
+import { Signer } from 'ethers'
+import AccessList from '@oceanprotocol/contracts/artifacts/contracts/accesslists/AccessList.sol/AccessList.json'
+import { sendTx } from '../utils'
+import { AbiItem, ReceiptOrEstimate } from '../@types'
+import { Config } from '../config'
+import { SmartContract } from './SmartContract'
+
+export class AccessList extends SmartContract {
+  public abiEnterprise: AbiItem[]
+
+  getDefaultAbi() {
+    return AccessList.abi as AbiItem[]
+  }
+
+  /**
+   * Instantiate AccessList class
+   * @param {Signer} signer The signer object.
+   * @param {string | number} [network] Network id or name
+   * @param {Config} [config] The configuration object.
+   * @param {AbiItem[]} [abi] ABI array of the smart contract
+   * @param {AbiItem[]} abiEnterprise Enterprise ABI array of the smart contract
+   */
+  constructor(
+    signer: Signer,
+    network?: string | number,
+    config?: Config,
+    abi?: AbiItem[],
+    abiEnterprise?: AbiItem[]
+  ) {
+    super(signer, network, config, abi)
+    this.abiEnterprise = abiEnterprise || (AccessList.abi as AbiItem[])
+  }
+
+  /**
+   * Get Token Uri
+   * @return {Promise<string>} Token URI
+   */
+  public async getTokenUri(accessListAddress: string): Promise<string> {
+    const accessListContract = this.getContract(accessListAddress)
+    return await accessListContract.tokenURI()
+  }
+
+  /**
+   * Mint ERC721 contract
+   * @param {String} accessListAddress AccessList contract address
+   * @param {String} user Minter address
+   * @param {String} tokenUri tokenURI
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
+  public async mint<G extends boolean = false>(
+    accessListAddress: string,
+    user: string,
+    tokenUri: string,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    const accessListContract = this.getContract(accessListAddress)
+    const estGas = await accessListContract.estimateGas.mint(user, tokenUri)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      accessListContract.mint,
+      user,
+      tokenUri
+    )
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+
+  /**
+   * Batch Mint ERC721 contract
+   * @param {String} accessListAddress AccessList contract address
+   * @param {String} users Minter addresses
+   * @param {String} tokenUris tokenURI
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
+  public async batchMint<G extends boolean = false>(
+    accessListAddress: string,
+    users: Array<string>,
+    tokenUris: Array<string>,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    const accessListContract = this.getContract(accessListAddress)
+    const estGas = await accessListContract.estimateGas.batchMint(users, tokenUris)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      accessListContract.batchMint,
+      users,
+      tokenUris
+    )
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+
+  public async burn<G extends boolean = false>(
+    accessListAddress: string,
+    tokenId: number,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    const accessListContract = this.getContract(accessListAddress)
+    const estGas = await accessListContract.estimateGas.burn(tokenId)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      accessListContract.burn,
+      tokenId
+    )
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+}

From a460ed92131939feb6ca7e29aceb0a3ec53ac894 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Mon, 26 Aug 2024 11:12:34 +0300
Subject: [PATCH 02/64] Created new Datatoken4 template.

---
 src/contracts/AccessList.ts |   2 +-
 src/contracts/Datatoken4.ts | 117 ++++++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 src/contracts/Datatoken4.ts

diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index 6950e4efe..218429b4c 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -5,7 +5,7 @@ import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { Config } from '../config'
 import { SmartContract } from './SmartContract'
 
-export class AccessList extends SmartContract {
+export class AccessListContract extends SmartContract {
   public abiEnterprise: AbiItem[]
 
   getDefaultAbi() {
diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
new file mode 100644
index 000000000..8b06d236e
--- /dev/null
+++ b/src/contracts/Datatoken4.ts
@@ -0,0 +1,117 @@
+import { Datatoken } from './Datatoken'
+import { Signer } from 'ethers'
+import ERC20Template4 from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template4.sol/ERC20Template4.json'
+import { AbiItem, ReceiptOrEstimate } from '../@types'
+import { AccessListContract } from './AccessList'
+import { Config } from '../config'
+import { sendTx } from '../utils'
+
+export class Datatoken4 extends Datatoken {
+  public accessList: AccessListContract
+  getDefaultAbi() {
+    return ERC20Template4.abi as AbiItem[]
+  }
+
+  /**
+   * Instantiate Datatoken class
+   * @param {Signer} signer The signer object.
+   * @param {string | number} [network] Network id or name
+   * @param {Config} [config] The configuration object.
+   * @param {AbiItem[]} [abi] ABI array of the smart contract
+   */
+  constructor(
+    signer: Signer,
+    network?: string | number,
+    config?: Config,
+    abi?: AbiItem[]
+  ) {
+    super(signer, network, config, abi)
+    this.accessList = new AccessListContract(this.signer)
+  }
+
+  /**
+   * getAllowListContract - It returns the current allowList contract address
+   * @param dtAddress datatoken address
+   * @return {Promise<string>}
+   */
+  public async getAllowListContract(dtAddress: string): Promise<string> {
+    const dtContract = this.getContract(dtAddress)
+    const allowList = await dtContract.getAllowListContract()
+    return allowList
+  }
+
+  /**
+   * getDenyListContract - It returns the current denyList contract address
+   * @param dtAddress datatoken address
+   * @return {Promise<string>}
+   */
+  public async getDenyListContract(dtAddress: string): Promise<string> {
+    const dtContract = this.getContract(dtAddress)
+    const denyList = await dtContract.getDenyListContract()
+    return denyList
+  }
+
+  /** setAllowListContract
+   * This function allows to set another address for allowListContract, only by datatoken deployer
+   * only DatatokenDeployer can succeed
+   * @param {String} dtAddress Datatoken address
+   * @param {String} address User address
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
+  public async setAllowListContract<G extends boolean = false>(
+    dtAddress: string,
+    address: string,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    if (!(await this.isDatatokenDeployer(dtAddress, address))) {
+      throw new Error(`User is not Datatoken Deployer`)
+    }
+
+    const dtContract = this.getContract(dtAddress)
+    const estGas = await dtContract.estimateGas.setAllowListContract(address)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      dtContract.setAllowListContract,
+      address
+    )
+
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+
+  /** setDenyListContract
+   * This function allows to set another address for allowListContract, only by datatoken deployer
+   * only DatatokenDeployer can succeed
+   * @param {String} dtAddress Datatoken address
+   * @param {String} address User address
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
+  public async setDenyListContract<G extends boolean = false>(
+    dtAddress: string,
+    address: string,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    if (!(await this.isDatatokenDeployer(dtAddress, address))) {
+      throw new Error(`User is not Datatoken Deployer`)
+    }
+
+    const dtContract = this.getContract(dtAddress)
+    const estGas = await dtContract.estimateGas.setDenyListContract(address)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      dtContract.setDenyListContract,
+      address
+    )
+
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+}

From fdcad34c91ca1e243f8afecffcff5177c07f4b29 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Mon, 26 Aug 2024 15:59:55 +0300
Subject: [PATCH 03/64] set file object fc.

---
 src/contracts/Datatoken4.ts | 47 +++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index 8b06d236e..6e5b4b60f 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -1,5 +1,6 @@
+/* eslint-disable lines-between-class-members */
 import { Datatoken } from './Datatoken'
-import { Signer } from 'ethers'
+import { Bytes, Signer } from 'ethers'
 import ERC20Template4 from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template4.sol/ERC20Template4.json'
 import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { AccessListContract } from './AccessList'
@@ -55,16 +56,18 @@ export class Datatoken4 extends Datatoken {
    * This function allows to set another address for allowListContract, only by datatoken deployer
    * only DatatokenDeployer can succeed
    * @param {String} dtAddress Datatoken address
-   * @param {String} address User address
+   * @param {String} address Contract address
+   * @param {String} consumer User address
    * @param {Boolean} estimateGas if True, return gas estimate
    * @return {Promise<ReceiptOrEstimate>} transactionId
    */
   public async setAllowListContract<G extends boolean = false>(
     dtAddress: string,
     address: string,
+    consumer: string,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
-    if (!(await this.isDatatokenDeployer(dtAddress, address))) {
+    if (!(await this.isDatatokenDeployer(dtAddress, consumer))) {
       throw new Error(`User is not Datatoken Deployer`)
     }
 
@@ -87,16 +90,18 @@ export class Datatoken4 extends Datatoken {
    * This function allows to set another address for allowListContract, only by datatoken deployer
    * only DatatokenDeployer can succeed
    * @param {String} dtAddress Datatoken address
-   * @param {String} address User address
+   * @param {String} address Contract address
+   * @param {String} consumer User address
    * @param {Boolean} estimateGas if True, return gas estimate
    * @return {Promise<ReceiptOrEstimate>} transactionId
    */
   public async setDenyListContract<G extends boolean = false>(
     dtAddress: string,
     address: string,
+    consumer: string,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
-    if (!(await this.isDatatokenDeployer(dtAddress, address))) {
+    if (!(await this.isDatatokenDeployer(dtAddress, consumer))) {
       throw new Error(`User is not Datatoken Deployer`)
     }
 
@@ -112,6 +117,38 @@ export class Datatoken4 extends Datatoken {
       address
     )
 
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+  /** setFileObject
+   * This function allows to set file object in ecnrypted format, only by datatoken deployer
+   * only DatatokenDeployer can succeed
+   * @param {String} dtAddress Datatoken address
+   * @param {String} address User address
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
+  public async setFileObject<G extends boolean = false>(
+    dtAddress: string,
+    address: string,
+    fileObject: Bytes,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    if (!(await this.isDatatokenDeployer(dtAddress, address))) {
+      throw new Error(`User is not Datatoken Deployer`)
+    }
+
+    const dtContract = this.getContract(dtAddress)
+    const estGas = await dtContract.estimateGas.setFileObject(fileObject)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      dtContract.setFileObject,
+      fileObject
+    )
+
     return <ReceiptOrEstimate<G>>trxReceipt
   }
 }

From 5b40e64aea4d7b2b486efb6e6fe755ed063d5255 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Mon, 26 Aug 2024 16:41:48 +0300
Subject: [PATCH 04/64] integrated datatoken 4 contract.

---
 src/contracts/Datatoken4.ts | 90 +++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index 6e5b4b60f..570256436 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -151,4 +151,94 @@ export class Datatoken4 extends Datatoken {
 
     return <ReceiptOrEstimate<G>>trxReceipt
   }
+
+  /** addConsumer
+   * This function allows to add consumer
+   * only DatatokenDeployer can succeed
+   * @param {String} dtAddress Datatoken address
+   * @param {String} consumer User address
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
+  public async addConsumer<G extends boolean = false>(
+    dtAddress: string,
+    consumer: string,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    const dtContract = this.getContract(dtAddress)
+    const estGas = await dtContract.estimateGas.addConsumer(consumer)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      dtContract.addConsumer,
+      consumer
+    )
+
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+
+  /** checkConsumer
+   * This function allows to add consumer
+   * only DatatokenDeployer can succeed
+   * @param {String} dtAddress Datatoken address
+   * @param {Number} serviceId Service Identifier
+   * @param {String} consumer User address
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
+  public async checkConsumer<G extends boolean = false>(
+    dtAddress: string,
+    serviceId: number,
+    consumer: string,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    const dtContract = this.getContract(dtAddress)
+    const estGas = await dtContract.estimateGas.checkConsumer(serviceId, consumer)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      dtContract.checkConsumer,
+      serviceId,
+      consumer
+    )
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+
+  /**
+   * getFileObject - It returns the consumer's file object encrypted format.
+   * @param {String} dtAddress datatoken address
+   * @param {Number} serviceId - service identifier
+   * @param {String} providerAddress
+   * @param {Bytes} providerSignature
+   * @param {Bytes} consumerData
+   * @param {Bytes} consumerSignature
+   * @param {String} consumerAddress
+   * @return {Promise<string>}
+   */
+  public async getFileObject(
+    dtAddress: string,
+    serviceId: number,
+    providerAddress: string,
+    providerSignature: Bytes,
+    consumerData: Bytes,
+    consumerSignature: Bytes,
+    consumerAddress: string
+  ): Promise<Bytes> {
+    const dtContract = this.getContract(dtAddress)
+    const fileObject = await dtContract.getFileObject(
+      serviceId,
+      providerAddress,
+      providerSignature,
+      consumerData,
+      consumerSignature,
+      consumerAddress
+    )
+    return fileObject
+  }
 }

From 25a42c8e65d335cb3954638bd4a6c9867fa015c5 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Mon, 2 Sep 2024 15:30:34 +0300
Subject: [PATCH 05/64] install new version of ocean contracts.

---
 package-lock.json | 15 ++++++++-------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 87b25d160..1ec32f488 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "3.3.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@oceanprotocol/contracts": "^2.0.3",
+        "@oceanprotocol/contracts": "^2.1.0",
         "cross-fetch": "^4.0.0",
         "crypto-js": "^4.1.1",
         "decimal.js": "^10.4.1",
@@ -2971,9 +2971,10 @@
       }
     },
     "node_modules/@oceanprotocol/contracts": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.0.3.tgz",
-      "integrity": "sha512-D2YtlsgmhBuSmF/Ue8zMWPtXNiB4zgW09NjUQzvDFrloUo0a7yC8r8L84LrVniw+0Nmly/PhLcdm8i018yc34g=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.1.0.tgz",
+      "integrity": "sha512-kBEeaIkGkTDBoMf4+BIA7MfBAdKLrIxijFp7aoc+Nub6QoRlV4GagWrPFEHhVZBpimy9Gf58u6H4P5EdqC2sFw==",
+      "license": "Apache-2.0"
     },
     "node_modules/@octokit/auth-token": {
       "version": "3.0.3",
@@ -19726,9 +19727,9 @@
       }
     },
     "@oceanprotocol/contracts": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.0.3.tgz",
-      "integrity": "sha512-D2YtlsgmhBuSmF/Ue8zMWPtXNiB4zgW09NjUQzvDFrloUo0a7yC8r8L84LrVniw+0Nmly/PhLcdm8i018yc34g=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.1.0.tgz",
+      "integrity": "sha512-kBEeaIkGkTDBoMf4+BIA7MfBAdKLrIxijFp7aoc+Nub6QoRlV4GagWrPFEHhVZBpimy9Gf58u6H4P5EdqC2sFw=="
     },
     "@octokit/auth-token": {
       "version": "3.0.3",
diff --git a/package.json b/package.json
index 0870c151f..3d31a392b 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "web3": "^1.8.0"
   },
   "dependencies": {
-    "@oceanprotocol/contracts": "^2.0.3",
+    "@oceanprotocol/contracts": "^2.1.0",
     "cross-fetch": "^4.0.0",
     "crypto-js": "^4.1.1",
     "decimal.js": "^10.4.1",

From e59d565b176294e5808bdeddea9c1abae798bdbd Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Mon, 2 Sep 2024 15:45:47 +0300
Subject: [PATCH 06/64] added sapphire sdk + remove private functions.

---
 package-lock.json           | 280 ++++++++++++++++++++++++++++++++++--
 package.json                |   1 +
 src/contracts/Datatoken4.ts |  58 --------
 3 files changed, 267 insertions(+), 72 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ec32f488..5638390f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "version": "3.3.1",
       "license": "Apache-2.0",
       "dependencies": {
+        "@oasisprotocol/sapphire-paratime": "^1.3.2",
         "@oceanprotocol/contracts": "^2.1.0",
         "cross-fetch": "^4.0.0",
         "crypto-js": "^4.1.1",
@@ -61,6 +62,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@adraffy/ens-normalize": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz",
+      "integrity": "sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==",
+      "license": "MIT"
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -2911,6 +2918,30 @@
       "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==",
       "dev": true
     },
+    "node_modules/@noble/curves": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz",
+      "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==",
+      "license": "MIT",
+      "dependencies": {
+        "@noble/hashes": "1.3.2"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@noble/curves/node_modules/@noble/hashes": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz",
+      "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@noble/hashes": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.2.tgz",
@@ -2970,6 +3001,109 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@oasisprotocol/deoxysii": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/@oasisprotocol/deoxysii/-/deoxysii-0.0.5.tgz",
+      "integrity": "sha512-a6wYPjk8ALDIiQW/971AKOTSTY1qSdld+Y05F44gVZvlb3FOyHfgbIxXm7CZnUG1A+jK49g5SCWYP+V3/Tc75Q==",
+      "license": "MIT",
+      "dependencies": {
+        "bsaes": "0.0.2",
+        "uint32": "^0.2.1"
+      }
+    },
+    "node_modules/@oasisprotocol/sapphire-paratime": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@oasisprotocol/sapphire-paratime/-/sapphire-paratime-1.3.2.tgz",
+      "integrity": "sha512-98EQ2BrT0942B0VY50PKcJ6xmUAcz71y8OBMizP6oBJIh0+ogw/z3r5z4veJitMXM4zQbh5wOFaS9eOcKWX5FA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@noble/hashes": "1.3.2",
+        "@oasisprotocol/deoxysii": "0.0.5",
+        "cborg": "1.10.2",
+        "ethers": "6.10.0",
+        "tweetnacl": "1.0.3",
+        "type-fest": "2.19.0"
+      }
+    },
+    "node_modules/@oasisprotocol/sapphire-paratime/node_modules/@noble/hashes": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz",
+      "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@oasisprotocol/sapphire-paratime/node_modules/aes-js": {
+      "version": "4.0.0-beta.5",
+      "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz",
+      "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==",
+      "license": "MIT"
+    },
+    "node_modules/@oasisprotocol/sapphire-paratime/node_modules/ethers": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.10.0.tgz",
+      "integrity": "sha512-nMNwYHzs6V1FR3Y4cdfxSQmNgZsRj1RiTU25JwvnJLmyzw9z3SKxNc2XKDuiXXo/v9ds5Mp9m6HBabgYQQ26tA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/ethers-io/"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@adraffy/ens-normalize": "1.10.0",
+        "@noble/curves": "1.2.0",
+        "@noble/hashes": "1.3.2",
+        "@types/node": "18.15.13",
+        "aes-js": "4.0.0-beta.5",
+        "tslib": "2.4.0",
+        "ws": "8.5.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@oasisprotocol/sapphire-paratime/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@oasisprotocol/sapphire-paratime/node_modules/ws": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@oceanprotocol/contracts": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.1.0.tgz",
@@ -3566,9 +3700,10 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.15.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
+      "version": "18.15.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
+      "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==",
+      "license": "MIT"
     },
     "node_modules/@types/node-fetch": {
       "version": "3.0.3",
@@ -4855,6 +4990,15 @@
         "safe-buffer": "^5.1.2"
       }
     },
+    "node_modules/bsaes": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/bsaes/-/bsaes-0.0.2.tgz",
+      "integrity": "sha512-iVxJFMOvCUG85sX2UVpZ9IgvH6Jjc5xpd/W8pALvFE7zfCqHkV7hW3M2XZtpg9biPS0K4Eka96bbNNgLohcpgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "uint32": "^0.2.1"
+      }
+    },
     "node_modules/btoa": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
@@ -5069,6 +5213,15 @@
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
+    "node_modules/cborg": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/cborg/-/cborg-1.10.2.tgz",
+      "integrity": "sha512-b3tFPA9pUr2zCUiCfRd2+wok2/LBSNUMKOuRRok+WlvvAgEt/PlbgPTsZUcwCOs53IJvLgTp0eotwtosE6njug==",
+      "license": "Apache-2.0",
+      "bin": {
+        "cborg": "cli.js"
+      }
+    },
     "node_modules/chai": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
@@ -16265,8 +16418,7 @@
     "node_modules/tslib": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
+      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
     },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
@@ -16282,8 +16434,7 @@
     "node_modules/tweetnacl": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
-      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
-      "dev": true
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
     },
     "node_modules/tweetnacl-util": {
       "version": "0.15.1",
@@ -16432,6 +16583,12 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/uint32": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/uint32/-/uint32-0.2.1.tgz",
+      "integrity": "sha512-d3i8kc/4s1CFW5g3FctmF1Bu2GVXGBMTn82JY2BW0ZtTtI8pRx1YWGPCFBwRF4uYVSJ7ua4y+qYEPqS+x+3w7Q==",
+      "license": "Do, what You want"
+    },
     "node_modules/ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
@@ -17753,6 +17910,11 @@
       "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
       "dev": true
     },
+    "@adraffy/ens-normalize": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz",
+      "integrity": "sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q=="
+    },
     "@babel/code-frame": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -19688,6 +19850,21 @@
       "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==",
       "dev": true
     },
+    "@noble/curves": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz",
+      "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==",
+      "requires": {
+        "@noble/hashes": "1.3.2"
+      },
+      "dependencies": {
+        "@noble/hashes": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz",
+          "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ=="
+        }
+      }
+    },
     "@noble/hashes": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.2.tgz",
@@ -19726,6 +19903,65 @@
         "fastq": "^1.6.0"
       }
     },
+    "@oasisprotocol/deoxysii": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/@oasisprotocol/deoxysii/-/deoxysii-0.0.5.tgz",
+      "integrity": "sha512-a6wYPjk8ALDIiQW/971AKOTSTY1qSdld+Y05F44gVZvlb3FOyHfgbIxXm7CZnUG1A+jK49g5SCWYP+V3/Tc75Q==",
+      "requires": {
+        "bsaes": "0.0.2",
+        "uint32": "^0.2.1"
+      }
+    },
+    "@oasisprotocol/sapphire-paratime": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@oasisprotocol/sapphire-paratime/-/sapphire-paratime-1.3.2.tgz",
+      "integrity": "sha512-98EQ2BrT0942B0VY50PKcJ6xmUAcz71y8OBMizP6oBJIh0+ogw/z3r5z4veJitMXM4zQbh5wOFaS9eOcKWX5FA==",
+      "requires": {
+        "@noble/hashes": "1.3.2",
+        "@oasisprotocol/deoxysii": "0.0.5",
+        "cborg": "1.10.2",
+        "ethers": "6.10.0",
+        "tweetnacl": "1.0.3",
+        "type-fest": "2.19.0"
+      },
+      "dependencies": {
+        "@noble/hashes": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz",
+          "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ=="
+        },
+        "aes-js": {
+          "version": "4.0.0-beta.5",
+          "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz",
+          "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q=="
+        },
+        "ethers": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.10.0.tgz",
+          "integrity": "sha512-nMNwYHzs6V1FR3Y4cdfxSQmNgZsRj1RiTU25JwvnJLmyzw9z3SKxNc2XKDuiXXo/v9ds5Mp9m6HBabgYQQ26tA==",
+          "requires": {
+            "@adraffy/ens-normalize": "1.10.0",
+            "@noble/curves": "1.2.0",
+            "@noble/hashes": "1.3.2",
+            "@types/node": "18.15.13",
+            "aes-js": "4.0.0-beta.5",
+            "tslib": "2.4.0",
+            "ws": "8.5.0"
+          }
+        },
+        "type-fest": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="
+        },
+        "ws": {
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+          "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+          "requires": {}
+        }
+      }
+    },
     "@oceanprotocol/contracts": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.1.0.tgz",
@@ -20203,9 +20439,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.15.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
+      "version": "18.15.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
+      "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q=="
     },
     "@types/node-fetch": {
       "version": "3.0.3",
@@ -21165,6 +21401,14 @@
         "safe-buffer": "^5.1.2"
       }
     },
+    "bsaes": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/bsaes/-/bsaes-0.0.2.tgz",
+      "integrity": "sha512-iVxJFMOvCUG85sX2UVpZ9IgvH6Jjc5xpd/W8pALvFE7zfCqHkV7hW3M2XZtpg9biPS0K4Eka96bbNNgLohcpgQ==",
+      "requires": {
+        "uint32": "^0.2.1"
+      }
+    },
     "btoa": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
@@ -21314,6 +21558,11 @@
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
+    "cborg": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/cborg/-/cborg-1.10.2.tgz",
+      "integrity": "sha512-b3tFPA9pUr2zCUiCfRd2+wok2/LBSNUMKOuRRok+WlvvAgEt/PlbgPTsZUcwCOs53IJvLgTp0eotwtosE6njug=="
+    },
     "chai": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
@@ -29773,8 +30022,7 @@
     "tslib": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
+      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
     },
     "tunnel-agent": {
       "version": "0.6.0",
@@ -29787,8 +30035,7 @@
     "tweetnacl": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
-      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
-      "dev": true
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
     },
     "tweetnacl-util": {
       "version": "0.15.1",
@@ -29893,6 +30140,11 @@
       "dev": true,
       "optional": true
     },
+    "uint32": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/uint32/-/uint32-0.2.1.tgz",
+      "integrity": "sha512-d3i8kc/4s1CFW5g3FctmF1Bu2GVXGBMTn82JY2BW0ZtTtI8pRx1YWGPCFBwRF4uYVSJ7ua4y+qYEPqS+x+3w7Q=="
+    },
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
diff --git a/package.json b/package.json
index 3d31a392b..5d2599823 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "web3": "^1.8.0"
   },
   "dependencies": {
+    "@oasisprotocol/sapphire-paratime": "^1.3.2",
     "@oceanprotocol/contracts": "^2.1.0",
     "cross-fetch": "^4.0.0",
     "crypto-js": "^4.1.1",
diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index 570256436..7ca29dde5 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -152,64 +152,6 @@ export class Datatoken4 extends Datatoken {
     return <ReceiptOrEstimate<G>>trxReceipt
   }
 
-  /** addConsumer
-   * This function allows to add consumer
-   * only DatatokenDeployer can succeed
-   * @param {String} dtAddress Datatoken address
-   * @param {String} consumer User address
-   * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
-   */
-  public async addConsumer<G extends boolean = false>(
-    dtAddress: string,
-    consumer: string,
-    estimateGas?: G
-  ): Promise<ReceiptOrEstimate<G>> {
-    const dtContract = this.getContract(dtAddress)
-    const estGas = await dtContract.estimateGas.addConsumer(consumer)
-    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
-
-    const trxReceipt = await sendTx(
-      estGas,
-      this.signer,
-      this.config?.gasFeeMultiplier,
-      dtContract.addConsumer,
-      consumer
-    )
-
-    return <ReceiptOrEstimate<G>>trxReceipt
-  }
-
-  /** checkConsumer
-   * This function allows to add consumer
-   * only DatatokenDeployer can succeed
-   * @param {String} dtAddress Datatoken address
-   * @param {Number} serviceId Service Identifier
-   * @param {String} consumer User address
-   * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
-   */
-  public async checkConsumer<G extends boolean = false>(
-    dtAddress: string,
-    serviceId: number,
-    consumer: string,
-    estimateGas?: G
-  ): Promise<ReceiptOrEstimate<G>> {
-    const dtContract = this.getContract(dtAddress)
-    const estGas = await dtContract.estimateGas.checkConsumer(serviceId, consumer)
-    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
-
-    const trxReceipt = await sendTx(
-      estGas,
-      this.signer,
-      this.config?.gasFeeMultiplier,
-      dtContract.checkConsumer,
-      serviceId,
-      consumer
-    )
-    return <ReceiptOrEstimate<G>>trxReceipt
-  }
-
   /**
    * getFileObject - It returns the consumer's file object encrypted format.
    * @param {String} dtAddress datatoken address

From a1e8179e5e2ed94fc631b4aa71c5870d5507bbeb Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 3 Sep 2024 12:33:07 +0300
Subject: [PATCH 07/64] tweaks of template4.

---
 src/contracts/Datatoken4.ts | 38 ++++++-------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index 7ca29dde5..7416aeb04 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -6,9 +6,11 @@ import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { AccessListContract } from './AccessList'
 import { Config } from '../config'
 import { sendTx } from '../utils'
+import * as sapphire from '@oasisprotocol/sapphire-paratime'
 
 export class Datatoken4 extends Datatoken {
   public accessList: AccessListContract
+  public fileObject: Bytes
   getDefaultAbi() {
     return ERC20Template4.abi as AbiItem[]
   }
@@ -22,12 +24,16 @@ export class Datatoken4 extends Datatoken {
    */
   constructor(
     signer: Signer,
+    fileObject: Bytes,
     network?: string | number,
     config?: Config,
     abi?: AbiItem[]
   ) {
     super(signer, network, config, abi)
+    // Wrap signer's address for encrypted data tx
+    this.signer = sapphire.wrap(signer)
     this.accessList = new AccessListContract(this.signer)
+    this.fileObject = fileObject
   }
 
   /**
@@ -151,36 +157,4 @@ export class Datatoken4 extends Datatoken {
 
     return <ReceiptOrEstimate<G>>trxReceipt
   }
-
-  /**
-   * getFileObject - It returns the consumer's file object encrypted format.
-   * @param {String} dtAddress datatoken address
-   * @param {Number} serviceId - service identifier
-   * @param {String} providerAddress
-   * @param {Bytes} providerSignature
-   * @param {Bytes} consumerData
-   * @param {Bytes} consumerSignature
-   * @param {String} consumerAddress
-   * @return {Promise<string>}
-   */
-  public async getFileObject(
-    dtAddress: string,
-    serviceId: number,
-    providerAddress: string,
-    providerSignature: Bytes,
-    consumerData: Bytes,
-    consumerSignature: Bytes,
-    consumerAddress: string
-  ): Promise<Bytes> {
-    const dtContract = this.getContract(dtAddress)
-    const fileObject = await dtContract.getFileObject(
-      serviceId,
-      providerAddress,
-      providerSignature,
-      consumerData,
-      consumerSignature,
-      consumerAddress
-    )
-    return fileObject
-  }
 }

From 243cadb212a7868c64a7db64a6e3863c011673d5 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 3 Sep 2024 12:34:13 +0300
Subject: [PATCH 08/64] wrap signer on access list contract.

---
 src/contracts/AccessList.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index 218429b4c..7d80be246 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -4,6 +4,7 @@ import { sendTx } from '../utils'
 import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { Config } from '../config'
 import { SmartContract } from './SmartContract'
+import * as sapphire from '@oasisprotocol/sapphire-paratime'
 
 export class AccessListContract extends SmartContract {
   public abiEnterprise: AbiItem[]
@@ -28,6 +29,7 @@ export class AccessListContract extends SmartContract {
     abiEnterprise?: AbiItem[]
   ) {
     super(signer, network, config, abi)
+    this.signer = sapphire.wrap(signer)
     this.abiEnterprise = abiEnterprise || (AccessList.abi as AbiItem[])
   }
 

From 8cfbeae0ced3c13c7754cdcdb403b6a18d28478d Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 3 Sep 2024 13:49:44 +0300
Subject: [PATCH 09/64] Added minimum gas fees for sapphire networks. Send
 function.

---
 src/contracts/Datatoken4.ts |  8 ++++----
 src/utils/ContractUtils.ts  | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index 7416aeb04..2993734ef 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -85,7 +85,7 @@ export class Datatoken4 extends Datatoken {
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      dtContract.setAllowListContract,
+      dtContract.functions.setAllowListContract,
       address
     )
 
@@ -119,7 +119,7 @@ export class Datatoken4 extends Datatoken {
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      dtContract.setDenyListContract,
+      dtContract.functions.setDenyListContract,
       address
     )
 
@@ -144,14 +144,14 @@ export class Datatoken4 extends Datatoken {
     }
 
     const dtContract = this.getContract(dtAddress)
-    const estGas = await dtContract.estimateGas.setFileObject(fileObject)
+    const estGas = await dtContract.estimateGas.setFilesObject(fileObject)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
 
     const trxReceipt = await sendTx(
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      dtContract.setFileObject,
+      dtContract.functions.setFilesObject,
       fileObject
     )
 
diff --git a/src/utils/ContractUtils.ts b/src/utils/ContractUtils.ts
index fa4e18b42..f1243538f 100644
--- a/src/utils/ContractUtils.ts
+++ b/src/utils/ContractUtils.ts
@@ -5,9 +5,12 @@ import { LoggerInstance, minAbi } from '.'
 
 const MIN_GAS_FEE_POLYGON = 30000000000 // minimum recommended 30 gwei polygon main and mumbai fees
 const MIN_GAS_FEE_SEPOLIA = 4000000000 // minimum 4 gwei for eth sepolia testnet
+const MIN_GAS_FEE_SAPPHIRE = 10000000000 // recommended for mainnet and testnet 10 gwei
 const POLYGON_NETWORK_ID = 137
 const MUMBAI_NETWORK_ID = 80001
 const SEPOLIA_NETWORK_ID = 11155111
+const SAPPHIRE_TESTNET_NETWORK_ID = 23295
+const SAPPHIRE_MAINNET_NETWORK_ID = 23294
 
 export function setContractDefaults(contract: Contract, config: Config): Contract {
   // TO DO - since ethers does not provide this
@@ -139,6 +142,10 @@ export async function sendTx(
           : chainId === SEPOLIA_NETWORK_ID &&
             Number(aggressiveFeePriorityFeePerGas) < MIN_GAS_FEE_SEPOLIA
           ? MIN_GAS_FEE_SEPOLIA
+          : (chainId === SAPPHIRE_MAINNET_NETWORK_ID ||
+              chainId === SAPPHIRE_TESTNET_NETWORK_ID) &&
+            Number(aggressiveFeePriorityFeePerGas) < MIN_GAS_FEE_SAPPHIRE
+          ? MIN_GAS_FEE_SAPPHIRE
           : Number(aggressiveFeePriorityFeePerGas),
 
       maxFeePerGas:
@@ -148,6 +155,10 @@ export async function sendTx(
           : chainId === SEPOLIA_NETWORK_ID &&
             Number(aggressiveFeePerGas) < MIN_GAS_FEE_SEPOLIA
           ? MIN_GAS_FEE_SEPOLIA
+          : (chainId === SAPPHIRE_MAINNET_NETWORK_ID ||
+              chainId === SAPPHIRE_TESTNET_NETWORK_ID) &&
+            Number(aggressiveFeePerGas) < MIN_GAS_FEE_SAPPHIRE
+          ? MIN_GAS_FEE_SAPPHIRE
           : Number(aggressiveFeePerGas)
     }
   } else {

From f751cc270b24cd292d0f50cde2d96f483e8e72c5 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 3 Sep 2024 13:56:35 +0300
Subject: [PATCH 10/64] Convert to contract functions. Remove abiEnterprise.

---
 src/contracts/AccessList.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index 7d80be246..d65424733 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -25,12 +25,11 @@ export class AccessListContract extends SmartContract {
     signer: Signer,
     network?: string | number,
     config?: Config,
-    abi?: AbiItem[],
-    abiEnterprise?: AbiItem[]
+    abi?: AbiItem[]
   ) {
     super(signer, network, config, abi)
     this.signer = sapphire.wrap(signer)
-    this.abiEnterprise = abiEnterprise || (AccessList.abi as AbiItem[])
+    this.abi = abi || this.getDefaultAbi()
   }
 
   /**
@@ -64,7 +63,7 @@ export class AccessListContract extends SmartContract {
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.mint,
+      accessListContract.functions.mint,
       user,
       tokenUri
     )
@@ -93,7 +92,7 @@ export class AccessListContract extends SmartContract {
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.batchMint,
+      accessListContract.functions.batchMint,
       users,
       tokenUris
     )
@@ -113,7 +112,7 @@ export class AccessListContract extends SmartContract {
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.burn,
+      accessListContract.functions.burn,
       tokenId
     )
     return <ReceiptOrEstimate<G>>trxReceipt

From 47500b073f977b13b9f1c49c28363f5bb8551dea Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 4 Sep 2024 10:53:26 +0300
Subject: [PATCH 11/64] Upgraded contracts v2.2.0.

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5638390f6..eab20cd33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@oasisprotocol/sapphire-paratime": "^1.3.2",
-        "@oceanprotocol/contracts": "^2.1.0",
+        "@oceanprotocol/contracts": "^2.2.0",
         "cross-fetch": "^4.0.0",
         "crypto-js": "^4.1.1",
         "decimal.js": "^10.4.1",
@@ -3105,9 +3105,9 @@
       }
     },
     "node_modules/@oceanprotocol/contracts": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.1.0.tgz",
-      "integrity": "sha512-kBEeaIkGkTDBoMf4+BIA7MfBAdKLrIxijFp7aoc+Nub6QoRlV4GagWrPFEHhVZBpimy9Gf58u6H4P5EdqC2sFw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.2.0.tgz",
+      "integrity": "sha512-QhewXdtTebycRSZEdkAdvJkSMMnGZyxldlw2eX4VOJto8wymyNdxuhjL/tiaZ5xO7SS5BqURricx9170hfh2kQ==",
       "license": "Apache-2.0"
     },
     "node_modules/@octokit/auth-token": {
@@ -19963,9 +19963,9 @@
       }
     },
     "@oceanprotocol/contracts": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.1.0.tgz",
-      "integrity": "sha512-kBEeaIkGkTDBoMf4+BIA7MfBAdKLrIxijFp7aoc+Nub6QoRlV4GagWrPFEHhVZBpimy9Gf58u6H4P5EdqC2sFw=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.2.0.tgz",
+      "integrity": "sha512-QhewXdtTebycRSZEdkAdvJkSMMnGZyxldlw2eX4VOJto8wymyNdxuhjL/tiaZ5xO7SS5BqURricx9170hfh2kQ=="
     },
     "@octokit/auth-token": {
       "version": "3.0.3",
diff --git a/package.json b/package.json
index 5d2599823..52fea7de2 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "@oasisprotocol/sapphire-paratime": "^1.3.2",
-    "@oceanprotocol/contracts": "^2.1.0",
+    "@oceanprotocol/contracts": "^2.2.0",
     "cross-fetch": "^4.0.0",
     "crypto-js": "^4.1.1",
     "decimal.js": "^10.4.1",

From 9695585be118b135309b3ebc45024f4c7bb17b64 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 4 Sep 2024 15:04:51 +0300
Subject: [PATCH 12/64] Integrated Access List factory. Created tests.

---
 src/@types/NFTFactory.ts           |   9 ++
 src/contracts/AccessListFactory.ts | 132 +++++++++++++++++++++++++++++
 test/config.ts                     |  13 +++
 test/scripts/sapphireTest.ts       |  41 +++++++++
 4 files changed, 195 insertions(+)
 create mode 100644 src/contracts/AccessListFactory.ts
 create mode 100644 test/scripts/sapphireTest.ts

diff --git a/src/@types/NFTFactory.ts b/src/@types/NFTFactory.ts
index 5e20ac9da..23d6b0f03 100644
--- a/src/@types/NFTFactory.ts
+++ b/src/@types/NFTFactory.ts
@@ -21,3 +21,12 @@ export interface NftCreateData {
   transferable: boolean
   owner: string
 }
+
+export interface AccessListData {
+  name: string
+  symbol: string
+  tokenURI: string[]
+  transferable: boolean
+  owner: string
+  user: string[]
+}
diff --git a/src/contracts/AccessListFactory.ts b/src/contracts/AccessListFactory.ts
new file mode 100644
index 000000000..a2e54fc16
--- /dev/null
+++ b/src/contracts/AccessListFactory.ts
@@ -0,0 +1,132 @@
+import { BigNumber, Signer } from 'ethers'
+import { Config } from '../config'
+import AccessListFactory from '@oceanprotocol/contracts/artifacts/contracts/accesslists/AccessListFactory.sol/AccessListFactory.json'
+import { generateDtName, sendTx, getEventFromTx, ZERO_ADDRESS } from '../utils'
+import { AbiItem, AccessListData, ReceiptOrEstimate } from '../@types'
+import { SmartContractWithAddress } from './SmartContractWithAddress'
+import * as sapphire from '@oasisprotocol/sapphire-paratime'
+
+/**
+ * Provides an interface for Access List Factory contract
+ */
+export class AccesslistFactory extends SmartContractWithAddress {
+  getDefaultAbi() {
+    return AccessListFactory.abi as AbiItem[]
+  }
+
+  /**
+   * Instantiate AccessListFactory class
+   * @param {string} address The factory contract address.
+   * @param {Signer} signer The signer object.
+   * @param {string | number} [network] Network id or name
+   * @param {Config} [config] The configuration object.
+   * @param {AbiItem[]} [abi] ABI array of the smart contract
+   */
+  constructor(
+    address: string,
+    signer: Signer,
+    network?: string | number,
+    config?: Config,
+    abi?: AbiItem[]
+  ) {
+    super(address, signer, network, config, abi)
+    this.signer = sapphire.wrap(signer)
+    this.abi = abi || this.getDefaultAbi()
+  }
+
+  /**
+   * Create new Access List Contract
+   * @param {AccessListData} listData The data needed to create an NFT.
+   * @param {Boolean} [estimateGas] if True, return gas estimate
+   * @return {Promise<string|BigNumber>} The transaction hash or the gas estimate.
+   */
+  public async deployAccessListContract<G extends boolean = false>(
+    listData: AccessListData,
+    estimateGas?: G
+  ): Promise<G extends false ? string : BigNumber> {
+    if (!listData.name || !listData.symbol) {
+      const { name, symbol } = generateDtName()
+      listData.name = name
+      listData.symbol = symbol
+    }
+    if (!listData.transferable) listData.transferable = true
+    const estGas = await this.contract.estimateGas.deployAccessListContract(
+      listData.name,
+      listData.symbol,
+      listData.transferable,
+      listData.owner,
+      listData.user,
+      listData.tokenURI
+    )
+    if (estimateGas) return <G extends false ? string : BigNumber>estGas
+    // Invoke createToken function of the contract
+    const tx = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      this.contract.functions.deployAccessListContract,
+      listData.name,
+      listData.symbol,
+      listData.transferable,
+      listData.owner,
+      listData.user,
+      listData.tokenURI
+    )
+    const trxReceipt = await tx.wait()
+    const events = getEventFromTx(trxReceipt, 'NewAccessList')
+    return events.args[0]
+  }
+
+  /**
+   *  Get Factory Owner
+   * @return {Promise<string>} Factory Owner address
+   */
+  public async getOwner(): Promise<string> {
+    const owner = await this.contract.owner()
+    return owner
+  }
+
+  /**
+   *  Is a list contract soul bound?
+   * @param {String} contractAddress list contract address
+   * @return {Promise<boolean>} is soulbound?
+   */
+  public async isSoulbound(contractAddress: string): Promise<boolean> {
+    const isSoulbound = await this.contract.isSoulBound(contractAddress)
+    return isSoulbound
+  }
+
+  /**
+   * changeTemplateAddress - only factory Owner
+   * @param {String} owner caller address
+   * @param {Number} templateAddress address of the template we want to change
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} current token template count
+   */
+  public async changeTemplateAddress<G extends boolean = false>(
+    owner: string,
+    templateAddress: string,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    if ((await this.getOwner()) !== owner) {
+      throw new Error(`Caller is not Factory Owner`)
+    }
+
+    if (templateAddress === ZERO_ADDRESS) {
+      throw new Error(`Template address cannot be ZERO address`)
+    }
+
+    const estGas = await this.contract.estimateGas.changeTemplateAddress(templateAddress)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      this.contract.functions.changeTemplateAddress,
+      templateAddress
+    )
+
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+}
diff --git a/test/config.ts b/test/config.ts
index 628c5e3fa..0dd4aa507 100644
--- a/test/config.ts
+++ b/test/config.ts
@@ -48,3 +48,16 @@ export const getAddresses = () => {
   )
   return data.development
 }
+
+export const getAddressesForSapphire = (testnet: boolean) => {
+  const data = JSON.parse(
+    // eslint-disable-next-line security/detect-non-literal-fs-filename
+    fs.readFileSync(
+      process.env.ADDRESS_FILE ||
+        `${homedir}/.ocean/ocean-contracts/artifacts/address.json`,
+      'utf8'
+    )
+  )
+  if (testnet) return data.oasis_saphire_testnet
+  return data.oasis_saphire
+}
diff --git a/test/scripts/sapphireTest.ts b/test/scripts/sapphireTest.ts
new file mode 100644
index 000000000..683b55282
--- /dev/null
+++ b/test/scripts/sapphireTest.ts
@@ -0,0 +1,41 @@
+import * as sapphire from '@oasisprotocol/sapphire-paratime'
+import { ethers, Signer } from 'ethers'
+import { getAddressesForSapphire } from '../config'
+import { AccesslistFactory } from '../../src/contracts/AccessListFactory'
+import { AccessListContract } from '../../src/contracts/AccessList'
+import { AccessListData } from '../../src/@types'
+import { ZERO_ADDRESS } from '../../src'
+import { assert } from 'console'
+
+describe('Sapphire tests', async () => {
+  const provider = sapphire.wrap(
+    ethers.getDefaultProvider(sapphire.NETWORKS.testnet.defaultGateway)
+  )
+  const wallet = new ethers.Wallet(process.env.PRIVATE_KEY, provider)
+
+  const addresses = await getAddressesForSapphire(true)
+  const listData: AccessListData = {
+    name: 'ListName',
+    symbol: 'ListSymbol',
+    tokenURI: ['https://oceanprotocol.com/nft/'],
+    transferable: true,
+    owner: await wallet.getAddress(),
+    user: [await wallet.getAddress(), ZERO_ADDRESS]
+  }
+  let factoryContract: AccesslistFactory
+  let listAddress: string
+  let accessListToken: AccessListContract
+
+  it('Create Access List factory', () => {
+    factoryContract = new AccesslistFactory(addresses.AccessListFactory, wallet, 23295)
+    assert(factoryContract !== null, 'factory not created')
+  })
+
+  it('Create Access List contract', async () => {
+    listData.owner = await wallet.getAddress()
+    listAddress = await factoryContract.deployAccessListContract(listData)
+    assert(listAddress !== null)
+    console.log('list address: ', listAddress)
+    accessListToken = new AccessListContract(wallet, 23295)
+  })
+})

From fc985b9e10766209fb2082f50dde1e981b587d54 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 4 Sep 2024 15:05:40 +0300
Subject: [PATCH 13/64] Rename file.

---
 test/scripts/{sapphireTest.ts => sapphireTest.test.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/scripts/{sapphireTest.ts => sapphireTest.test.ts} (100%)

diff --git a/test/scripts/sapphireTest.ts b/test/scripts/sapphireTest.test.ts
similarity index 100%
rename from test/scripts/sapphireTest.ts
rename to test/scripts/sapphireTest.test.ts

From ab9898dbaa07f65bfd3487e743181b7b6bfda29b Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 4 Sep 2024 15:51:35 +0300
Subject: [PATCH 14/64] Add script for testing sapphire functionality.

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 52fea7de2..9bcc23e4e 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "changelog": "auto-changelog -p",
     "prepublishOnly": "npm run build",
     "mocha": "TS_NODE_PROJECT='./test/tsconfig.json' mocha --config=test/.mocharc.json --node-env=test --exit",
+    "test:sapphire": "npm run mocha -- 'test/scripts/sapphireTest.test.ts'",
     "test": "npm run lint && npm run test:unit:cover && npm run test:integration:cover",
     "test:unit": "npm run mocha -- 'test/unit/**/*.test.ts'",
     "test:integration": "npm run mocha --  'test/integration/**/*.test.ts'",

From 8e636e5d3a360c7e320c37b44d1103a70e43770c Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 4 Sep 2024 16:17:28 +0300
Subject: [PATCH 15/64] Remove sapphire sdk from accesslist contract.

---
 src/contracts/AccessList.ts        | 2 --
 src/contracts/AccessListFactory.ts | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index d65424733..303295820 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -4,7 +4,6 @@ import { sendTx } from '../utils'
 import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { Config } from '../config'
 import { SmartContract } from './SmartContract'
-import * as sapphire from '@oasisprotocol/sapphire-paratime'
 
 export class AccessListContract extends SmartContract {
   public abiEnterprise: AbiItem[]
@@ -28,7 +27,6 @@ export class AccessListContract extends SmartContract {
     abi?: AbiItem[]
   ) {
     super(signer, network, config, abi)
-    this.signer = sapphire.wrap(signer)
     this.abi = abi || this.getDefaultAbi()
   }
 
diff --git a/src/contracts/AccessListFactory.ts b/src/contracts/AccessListFactory.ts
index a2e54fc16..f74d0f4a4 100644
--- a/src/contracts/AccessListFactory.ts
+++ b/src/contracts/AccessListFactory.ts
@@ -4,7 +4,6 @@ import AccessListFactory from '@oceanprotocol/contracts/artifacts/contracts/acce
 import { generateDtName, sendTx, getEventFromTx, ZERO_ADDRESS } from '../utils'
 import { AbiItem, AccessListData, ReceiptOrEstimate } from '../@types'
 import { SmartContractWithAddress } from './SmartContractWithAddress'
-import * as sapphire from '@oasisprotocol/sapphire-paratime'
 
 /**
  * Provides an interface for Access List Factory contract
@@ -30,7 +29,6 @@ export class AccesslistFactory extends SmartContractWithAddress {
     abi?: AbiItem[]
   ) {
     super(address, signer, network, config, abi)
-    this.signer = sapphire.wrap(signer)
     this.abi = abi || this.getDefaultAbi()
   }
 

From 0924a7183a747ab4685b04640064d7dbe62d1463 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 4 Sep 2024 16:39:50 +0300
Subject: [PATCH 16/64] Added new functions to access list contract.

---
 package.json                |  2 +-
 src/contracts/AccessList.ts | 83 +++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9bcc23e4e..9a2e425a5 100644
--- a/package.json
+++ b/package.json
@@ -28,12 +28,12 @@
     "changelog": "auto-changelog -p",
     "prepublishOnly": "npm run build",
     "mocha": "TS_NODE_PROJECT='./test/tsconfig.json' mocha --config=test/.mocharc.json --node-env=test --exit",
-    "test:sapphire": "npm run mocha -- 'test/scripts/sapphireTest.test.ts'",
     "test": "npm run lint && npm run test:unit:cover && npm run test:integration:cover",
     "test:unit": "npm run mocha -- 'test/unit/**/*.test.ts'",
     "test:integration": "npm run mocha --  'test/integration/**/*.test.ts'",
     "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
     "test:integration:cover": "nyc --report-dir coverage/integration --no-clean npm run test:integration",
+    "test:sapphire": "npm run mocha -- 'test/scripts/sapphireTest.test.ts'",
     "create:guide": "./scripts/createCodeExamples.sh test/integration/CodeExamples.test.ts",
     "create:guidec2d": "./scripts/createCodeExamples.sh test/integration/ComputeExamples.test.ts",
     "commit:guides": "./scripts/commitChanges.sh",
diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index 303295820..84a101f8b 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -39,6 +39,33 @@ export class AccessListContract extends SmartContract {
     return await accessListContract.tokenURI()
   }
 
+  /**
+   * Get Owner
+   * @return {Promise<string>} Owner
+   */
+  public async getOwner(accessListAddress: string): Promise<string> {
+    const accessListContract = this.getContract(accessListAddress)
+    return await accessListContract.owner()
+  }
+
+  /**
+   * Get Name of Access list
+   * @return {Promise<string>} Name
+   */
+  public async getName(accessListAddress: string): Promise<string> {
+    const accessListContract = this.getContract(accessListAddress)
+    return await accessListContract.name()
+  }
+
+  /**
+   * Get Symbol of Access list
+   * @return {Promise<string>} Symbol
+   */
+  public async getSymbol(accessListAddress: string): Promise<string> {
+    const accessListContract = this.getContract(accessListAddress)
+    return await accessListContract.symbol()
+  }
+
   /**
    * Mint ERC721 contract
    * @param {String} accessListAddress AccessList contract address
@@ -97,6 +124,13 @@ export class AccessListContract extends SmartContract {
     return <ReceiptOrEstimate<G>>trxReceipt
   }
 
+  /**
+   * Burn Access List
+   * @param {String} accessListAddress AccessList contract address
+   * @param {Number} tokenId token ID
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
   public async burn<G extends boolean = false>(
     accessListAddress: string,
     tokenId: number,
@@ -115,4 +149,53 @@ export class AccessListContract extends SmartContract {
     )
     return <ReceiptOrEstimate<G>>trxReceipt
   }
+
+  /**
+   * Transfer Ownership of an access list, called by owner of access list
+   * @param {String} accessListAddress AccessList contract address
+   * @param {Number} newOwner new owner of the access list
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
+  public async transferOwnership<G extends boolean = false>(
+    accessListAddress: string,
+    newOwner: string,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    const accessListContract = this.getContract(accessListAddress)
+    const estGas = await accessListContract.estimateGas.transferOwnership(newOwner)
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      accessListContract.functions.transferOwnership,
+      newOwner
+    )
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
+
+  /**
+   * Renounce Ownership of an access list, called by owner of access list
+   * @param {String} accessListAddress AccessList contract address
+   * @param {Boolean} estimateGas if True, return gas estimate
+   * @return {Promise<ReceiptOrEstimate>} transactionId
+   */
+  public async renounceOwnership<G extends boolean = false>(
+    accessListAddress: string,
+    estimateGas?: G
+  ): Promise<ReceiptOrEstimate<G>> {
+    const accessListContract = this.getContract(accessListAddress)
+    const estGas = await accessListContract.estimateGas.renounceOwnership()
+    if (estimateGas) return <ReceiptOrEstimate<G>>estGas
+
+    const trxReceipt = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      accessListContract.functions.renounceOwnership
+    )
+    return <ReceiptOrEstimate<G>>trxReceipt
+  }
 }

From 65f5aaaf357bd54b684259f8c85d8443dbda8886 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 4 Sep 2024 16:51:48 +0300
Subject: [PATCH 17/64] Remove script.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9a2e425a5..040743fb2 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "test:integration": "npm run mocha --  'test/integration/**/*.test.ts'",
     "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
     "test:integration:cover": "nyc --report-dir coverage/integration --no-clean npm run test:integration",
-    "test:sapphire": "npm run mocha -- 'test/scripts/sapphireTest.test.ts'",
+    // "test:sapphire": "npm run mocha -- 'test/scripts/sapphireTest.test.ts'",
     "create:guide": "./scripts/createCodeExamples.sh test/integration/CodeExamples.test.ts",
     "create:guidec2d": "./scripts/createCodeExamples.sh test/integration/ComputeExamples.test.ts",
     "commit:guides": "./scripts/commitChanges.sh",

From 7653cc2527b7de78f488434845a364a88ea567b4 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 4 Sep 2024 17:16:36 +0300
Subject: [PATCH 18/64] Remove script.

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 040743fb2..52fea7de2 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
     "test:integration": "npm run mocha --  'test/integration/**/*.test.ts'",
     "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
     "test:integration:cover": "nyc --report-dir coverage/integration --no-clean npm run test:integration",
-    // "test:sapphire": "npm run mocha -- 'test/scripts/sapphireTest.test.ts'",
     "create:guide": "./scripts/createCodeExamples.sh test/integration/CodeExamples.test.ts",
     "create:guidec2d": "./scripts/createCodeExamples.sh test/integration/ComputeExamples.test.ts",
     "commit:guides": "./scripts/commitChanges.sh",

From cec7a2692c9bd2b91a5132e10878d331703a436d Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 5 Sep 2024 12:59:07 +0300
Subject: [PATCH 19/64] Increase timeout to the tests.

---
 test/integration/PublishEditConsume.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index c140f6076..40874cd7e 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -392,7 +392,7 @@ describe('Publish consume test', async () => {
       providerUrl
     )
     assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
-  }).timeout(40000)
+  }).timeout(60000)
 
   it('Should download the datasets files', async () => {
     const urlDownloadUrl = await ProviderInstance.getDownloadUrl(

From f336192c7aaa9ffaa1992f3c4c4982bdf4d4b0f4 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 5 Sep 2024 13:38:30 +0300
Subject: [PATCH 20/64] Added js script. Modified gitignore.

---
 .gitignore                        |  3 +-
 test/scripts/sapphireTest.js      | 65 +++++++++++++++++++++++++++++++
 test/scripts/sapphireTest.test.ts | 41 -------------------
 3 files changed, 67 insertions(+), 42 deletions(-)
 create mode 100644 test/scripts/sapphireTest.js
 delete mode 100644 test/scripts/sapphireTest.test.ts

diff --git a/.gitignore b/.gitignore
index 822ec977e..6792b3df3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,8 @@ dist/
 .nyc_output/
 coverage/
 doc/
-test/**/*.js
+test/unit/*.js
+test/integration/*.js
 src/**/*.js
 
 src/metadata\.json
diff --git a/test/scripts/sapphireTest.js b/test/scripts/sapphireTest.js
new file mode 100644
index 000000000..bf1b777c8
--- /dev/null
+++ b/test/scripts/sapphireTest.js
@@ -0,0 +1,65 @@
+import * as sapphire from '@oasisprotocol/sapphire-paratime'
+import { ethers, Signer } from 'ethers'
+import { getAddressesForSapphire } from '../config'
+import { AccesslistFactory } from '../../src/contracts/AccessListFactory'
+import { AccessListContract } from '../../src/contracts/AccessList'
+import { AccessListData } from '../../src/@types'
+import { ZERO_ADDRESS } from '../../src'
+import { assert } from 'console'
+
+const provider = sapphire.wrap(
+  ethers.getDefaultProvider(sapphire.NETWORKS.testnet.defaultGateway)
+)
+const wallet = new ethers.Wallet(process.env.PRIVATE_KEY, provider)
+
+const addresses = await getAddressesForSapphire(true)
+const listData = {
+  name: 'ListName',
+  symbol: 'ListSymbol',
+  tokenURI: ['https://oceanprotocol.com/nft/'],
+  transferable: true,
+  owner: await wallet.getAddress(),
+  user: [await wallet.getAddress(), ZERO_ADDRESS]
+}
+
+const factoryContract = new AccesslistFactory(addresses.AccessListFactory, wallet, 23295)
+assert(factoryContract !== null, 'factory not created')
+
+listData.owner = await wallet.getAddress()
+const listAddress = await factoryContract.deployAccessListContract(listData)
+assert(listAddress !== null)
+console.log('list address: ', listAddress)
+const accessListToken = new AccessListContract(wallet, 23295)
+
+// describe('Sapphire tests', async () => {
+//   const provider = sapphire.wrap(
+//     ethers.getDefaultProvider(sapphire.NETWORKS.testnet.defaultGateway)
+//   )
+//   const wallet = new ethers.Wallet(process.env.PRIVATE_KEY, provider)
+
+//   const addresses = await getAddressesForSapphire(true)
+//   const listData = {
+//     name: 'ListName',
+//     symbol: 'ListSymbol',
+//     tokenURI: ['https://oceanprotocol.com/nft/'],
+//     transferable: true,
+//     owner: await wallet.getAddress(),
+//     user: [await wallet.getAddress(), ZERO_ADDRESS]
+//   }
+//   let factoryContract
+//   let listAddress
+//   let accessListToken
+
+//   it('Create Access List factory', () => {
+//     factoryContract = new AccesslistFactory(addresses.AccessListFactory, wallet, 23295)
+//     assert(factoryContract !== null, 'factory not created')
+//   })
+
+//   it('Create Access List contract', async () => {
+//     listData.owner = await wallet.getAddress()
+//     listAddress = await factoryContract.deployAccessListContract(listData)
+//     assert(listAddress !== null)
+//     console.log('list address: ', listAddress)
+//     accessListToken = new AccessListContract(wallet, 23295)
+//   })
+// })
diff --git a/test/scripts/sapphireTest.test.ts b/test/scripts/sapphireTest.test.ts
deleted file mode 100644
index 683b55282..000000000
--- a/test/scripts/sapphireTest.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import * as sapphire from '@oasisprotocol/sapphire-paratime'
-import { ethers, Signer } from 'ethers'
-import { getAddressesForSapphire } from '../config'
-import { AccesslistFactory } from '../../src/contracts/AccessListFactory'
-import { AccessListContract } from '../../src/contracts/AccessList'
-import { AccessListData } from '../../src/@types'
-import { ZERO_ADDRESS } from '../../src'
-import { assert } from 'console'
-
-describe('Sapphire tests', async () => {
-  const provider = sapphire.wrap(
-    ethers.getDefaultProvider(sapphire.NETWORKS.testnet.defaultGateway)
-  )
-  const wallet = new ethers.Wallet(process.env.PRIVATE_KEY, provider)
-
-  const addresses = await getAddressesForSapphire(true)
-  const listData: AccessListData = {
-    name: 'ListName',
-    symbol: 'ListSymbol',
-    tokenURI: ['https://oceanprotocol.com/nft/'],
-    transferable: true,
-    owner: await wallet.getAddress(),
-    user: [await wallet.getAddress(), ZERO_ADDRESS]
-  }
-  let factoryContract: AccesslistFactory
-  let listAddress: string
-  let accessListToken: AccessListContract
-
-  it('Create Access List factory', () => {
-    factoryContract = new AccesslistFactory(addresses.AccessListFactory, wallet, 23295)
-    assert(factoryContract !== null, 'factory not created')
-  })
-
-  it('Create Access List contract', async () => {
-    listData.owner = await wallet.getAddress()
-    listAddress = await factoryContract.deployAccessListContract(listData)
-    assert(listAddress !== null)
-    console.log('list address: ', listAddress)
-    accessListToken = new AccessListContract(wallet, 23295)
-  })
-})

From 59bdf3d60872511127393d16260fc63d258bb3cf Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 5 Sep 2024 16:33:52 +0300
Subject: [PATCH 21/64] Install tsx, added oasis testnet into config helpers.

---
 test/scripts/sapphireTest.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/test/scripts/sapphireTest.js b/test/scripts/sapphireTest.js
index bf1b777c8..4a03f457b 100644
--- a/test/scripts/sapphireTest.js
+++ b/test/scripts/sapphireTest.js
@@ -1,10 +1,9 @@
 import * as sapphire from '@oasisprotocol/sapphire-paratime'
+import addresses from '@oceanprotocol/contracts/addresses/address.json'
 import { ethers, Signer } from 'ethers'
-import { getAddressesForSapphire } from '../config'
-import { AccesslistFactory } from '../../src/contracts/AccessListFactory'
-import { AccessListContract } from '../../src/contracts/AccessList'
-import { AccessListData } from '../../src/@types'
-import { ZERO_ADDRESS } from '../../src'
+import { AccesslistFactory } from '../../src/contracts/AccessListFactory.ts'
+import { AccessListContract } from '../../src/contracts/AccessList.ts'
+import { ZERO_ADDRESS } from '../../src/utils/Constants.ts'
 import { assert } from 'console'
 
 const provider = sapphire.wrap(
@@ -12,7 +11,8 @@ const provider = sapphire.wrap(
 )
 const wallet = new ethers.Wallet(process.env.PRIVATE_KEY, provider)
 
-const addresses = await getAddressesForSapphire(true)
+const addrs = addresses.oasis_saphire_testnet
+console.log(`addrs: ${JSON.stringify(addrs)}`)
 const listData = {
   name: 'ListName',
   symbol: 'ListSymbol',
@@ -22,7 +22,11 @@ const listData = {
   user: [await wallet.getAddress(), ZERO_ADDRESS]
 }
 
-const factoryContract = new AccesslistFactory(addresses.AccessListFactory, wallet, 23295)
+const factoryContract = new AccesslistFactory(
+  addrs.AccessListFactory,
+  wallet,
+  addrs.chainId
+)
 assert(factoryContract !== null, 'factory not created')
 
 listData.owner = await wallet.getAddress()

From e8d4749d4b4977255fc2521b4db7a536a73f7724 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 5 Sep 2024 16:39:28 +0300
Subject: [PATCH 22/64] Modified provider signature.

---
 package-lock.json          | 679 ++++++++++++++++++++++++++++++++++++-
 package.json               |   4 +-
 src/config/ConfigHelper.ts |   9 +
 src/services/Provider.ts   |   4 +-
 4 files changed, 685 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eab20cd33..09979300b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,8 @@
         "cross-fetch": "^4.0.0",
         "crypto-js": "^4.1.1",
         "decimal.js": "^10.4.1",
-        "ethers": "^5.7.2"
+        "ethers": "^5.7.2",
+        "tsx": "^4.19.0"
       },
       "devDependencies": {
         "@truffle/hdwallet-provider": "^2.0.14",
@@ -1937,6 +1938,390 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
+      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
+      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
+      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
+      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
+      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
+      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
+      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
+      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
+      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
+      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
+      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
+      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
+      "cpu": [
+        "mips64el"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
+      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
+      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
+      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
+      "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
+      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
+      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
+      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
+      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -6587,6 +6972,45 @@
         "ext": "^1.1.2"
       }
     },
+    "node_modules/esbuild": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz",
+      "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.23.1",
+        "@esbuild/android-arm": "0.23.1",
+        "@esbuild/android-arm64": "0.23.1",
+        "@esbuild/android-x64": "0.23.1",
+        "@esbuild/darwin-arm64": "0.23.1",
+        "@esbuild/darwin-x64": "0.23.1",
+        "@esbuild/freebsd-arm64": "0.23.1",
+        "@esbuild/freebsd-x64": "0.23.1",
+        "@esbuild/linux-arm": "0.23.1",
+        "@esbuild/linux-arm64": "0.23.1",
+        "@esbuild/linux-ia32": "0.23.1",
+        "@esbuild/linux-loong64": "0.23.1",
+        "@esbuild/linux-mips64el": "0.23.1",
+        "@esbuild/linux-ppc64": "0.23.1",
+        "@esbuild/linux-riscv64": "0.23.1",
+        "@esbuild/linux-s390x": "0.23.1",
+        "@esbuild/linux-x64": "0.23.1",
+        "@esbuild/netbsd-x64": "0.23.1",
+        "@esbuild/openbsd-arm64": "0.23.1",
+        "@esbuild/openbsd-x64": "0.23.1",
+        "@esbuild/sunos-x64": "0.23.1",
+        "@esbuild/win32-arm64": "0.23.1",
+        "@esbuild/win32-ia32": "0.23.1",
+        "@esbuild/win32-x64": "0.23.1"
+      }
+    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -8796,11 +9220,11 @@
       "dev": true
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -8969,6 +9393,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-tsconfig": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz",
+      "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==",
+      "license": "MIT",
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
     "node_modules/get-uri": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
@@ -14920,6 +15356,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
     "node_modules/responselike": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
@@ -16420,6 +16865,25 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
       "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
     },
+    "node_modules/tsx": {
+      "version": "4.19.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.0.tgz",
+      "integrity": "sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg==",
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "~0.23.0",
+        "get-tsconfig": "^4.7.5"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -19226,6 +19690,150 @@
         "@jridgewell/trace-mapping": "0.3.9"
       }
     },
+    "@esbuild/aix-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
+      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
+      "optional": true
+    },
+    "@esbuild/android-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
+      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
+      "optional": true
+    },
+    "@esbuild/android-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
+      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
+      "optional": true
+    },
+    "@esbuild/android-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
+      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
+      "optional": true
+    },
+    "@esbuild/darwin-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
+      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
+      "optional": true
+    },
+    "@esbuild/darwin-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
+      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
+      "optional": true
+    },
+    "@esbuild/freebsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
+      "optional": true
+    },
+    "@esbuild/freebsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
+      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
+      "optional": true
+    },
+    "@esbuild/linux-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
+      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
+      "optional": true
+    },
+    "@esbuild/linux-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
+      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
+      "optional": true
+    },
+    "@esbuild/linux-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
+      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
+      "optional": true
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
+      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
+      "optional": true
+    },
+    "@esbuild/linux-mips64el": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
+      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
+      "optional": true
+    },
+    "@esbuild/linux-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
+      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
+      "optional": true
+    },
+    "@esbuild/linux-riscv64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
+      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
+      "optional": true
+    },
+    "@esbuild/linux-s390x": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
+      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
+      "optional": true
+    },
+    "@esbuild/linux-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
+      "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==",
+      "optional": true
+    },
+    "@esbuild/netbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
+      "optional": true
+    },
+    "@esbuild/openbsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
+      "optional": true
+    },
+    "@esbuild/openbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
+      "optional": true
+    },
+    "@esbuild/sunos-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
+      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
+      "optional": true
+    },
+    "@esbuild/win32-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
+      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
+      "optional": true
+    },
+    "@esbuild/win32-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
+      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
+      "optional": true
+    },
+    "@esbuild/win32-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
+      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
+      "optional": true
+    },
     "@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -22619,6 +23227,37 @@
         "ext": "^1.1.2"
       }
     },
+    "esbuild": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz",
+      "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==",
+      "requires": {
+        "@esbuild/aix-ppc64": "0.23.1",
+        "@esbuild/android-arm": "0.23.1",
+        "@esbuild/android-arm64": "0.23.1",
+        "@esbuild/android-x64": "0.23.1",
+        "@esbuild/darwin-arm64": "0.23.1",
+        "@esbuild/darwin-x64": "0.23.1",
+        "@esbuild/freebsd-arm64": "0.23.1",
+        "@esbuild/freebsd-x64": "0.23.1",
+        "@esbuild/linux-arm": "0.23.1",
+        "@esbuild/linux-arm64": "0.23.1",
+        "@esbuild/linux-ia32": "0.23.1",
+        "@esbuild/linux-loong64": "0.23.1",
+        "@esbuild/linux-mips64el": "0.23.1",
+        "@esbuild/linux-ppc64": "0.23.1",
+        "@esbuild/linux-riscv64": "0.23.1",
+        "@esbuild/linux-s390x": "0.23.1",
+        "@esbuild/linux-x64": "0.23.1",
+        "@esbuild/netbsd-x64": "0.23.1",
+        "@esbuild/openbsd-arm64": "0.23.1",
+        "@esbuild/openbsd-x64": "0.23.1",
+        "@esbuild/sunos-x64": "0.23.1",
+        "@esbuild/win32-arm64": "0.23.1",
+        "@esbuild/win32-ia32": "0.23.1",
+        "@esbuild/win32-x64": "0.23.1"
+      }
+    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -24363,10 +25002,9 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "optional": true
     },
     "ftp": {
@@ -24492,6 +25130,14 @@
         "get-intrinsic": "^1.1.1"
       }
     },
+    "get-tsconfig": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz",
+      "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==",
+      "requires": {
+        "resolve-pkg-maps": "^1.0.0"
+      }
+    },
     "get-uri": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
@@ -28862,6 +29508,11 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
+    "resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw=="
+    },
     "responselike": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
@@ -30024,6 +30675,16 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
       "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
     },
+    "tsx": {
+      "version": "4.19.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.0.tgz",
+      "integrity": "sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg==",
+      "requires": {
+        "esbuild": "~0.23.0",
+        "fsevents": "~2.3.3",
+        "get-tsconfig": "^4.7.5"
+      }
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
diff --git a/package.json b/package.json
index 52fea7de2..3d7eafe93 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
 {
+  "type": "module",
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
   "version": "3.3.1",
@@ -58,7 +59,8 @@
     "cross-fetch": "^4.0.0",
     "crypto-js": "^4.1.1",
     "decimal.js": "^10.4.1",
-    "ethers": "^5.7.2"
+    "ethers": "^5.7.2",
+    "tsx": "^4.19.0"
   },
   "devDependencies": {
     "@truffle/hdwallet-provider": "^2.0.14",
diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts
index 8e64c526c..f991f8178 100644
--- a/src/config/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -155,6 +155,15 @@ export const configHelperNetworks: Config[] = [
     subgraphUri: 'https://v4.subgraph.sapphire-mainnet.oceanprotocol.com/',
     explorerUri: 'https://explorer.oasis.io/mainnet/sapphire/',
     gasFeeMultiplier: 1
+  },
+  {
+    ...configHelperNetworksBase,
+    chainId: 23295,
+    network: 'oasis_saphire_testnet',
+    nodeUri: 'https://testnet.sapphire.oasis.dev',
+    subgraphUri: 'https://v4.subgraph.sapphire-testnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
+    explorerUri: 'https://explorer.oasis.io/testnet/sapphire/',
+    gasFeeMultiplier: 1
   }
 ]
 
diff --git a/src/services/Provider.ts b/src/services/Provider.ts
index 27cb40aa1..8af79101d 100644
--- a/src/services/Provider.ts
+++ b/src/services/Provider.ts
@@ -127,7 +127,9 @@ export class Provider {
     const messageHashBytes = ethers.utils.arrayify(consumerMessage)
     const chainId = await signer.getChainId()
     try {
-      return await signer.signMessage(messageHashBytes)
+      return await (signer as providers.JsonRpcSigner)._legacySignMessage(
+        messageHashBytes
+      )
     } catch (error) {
       LoggerInstance.error('Sign provider message error: ', error)
       if (chainId === 8996) {

From e2004b6ea450697870513171b8bc8b1d023c5427 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Fri, 6 Sep 2024 12:36:36 +0300
Subject: [PATCH 23/64] fix lint.

---
 src/config/ConfigHelper.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts
index f991f8178..84e48c069 100644
--- a/src/config/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -161,7 +161,8 @@ export const configHelperNetworks: Config[] = [
     chainId: 23295,
     network: 'oasis_saphire_testnet',
     nodeUri: 'https://testnet.sapphire.oasis.dev',
-    subgraphUri: 'https://v4.subgraph.sapphire-testnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
+    subgraphUri:
+      'https://v4.subgraph.sapphire-testnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
     explorerUri: 'https://explorer.oasis.io/testnet/sapphire/',
     gasFeeMultiplier: 1
   }

From 2bca54e5cefe4cd332f36cd0c581a3dd8447b478 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Fri, 6 Sep 2024 12:43:52 +0300
Subject: [PATCH 24/64] Fix type module.

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 3d7eafe93..858113b9f 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,4 @@
 {
-  "type": "module",
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
   "version": "3.3.1",

From c2c41e26f0141572a5dfda262712896e4bcb44f4 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Fri, 6 Sep 2024 15:24:58 +0300
Subject: [PATCH 25/64] commented ordering other assets different than URL.

---
 test/integration/PublishEditConsume.test.ts | 88 ++++++++++-----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index 40874cd7e..5c3654a4a 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -349,50 +349,50 @@ describe('Publish consume test', async () => {
     )
     assert(urlOrderTx, 'Ordering url dataset failed.')
 
-    arwaveOrderTx = await orderAsset(
-      resolvedArweaveAssetDdo.id,
-      resolvedArweaveAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedArweaveAssetDdo.services[0].id,
-      0,
-      datatoken,
-      providerUrl
-    )
-    assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
-
-    onchainOrderTx = await orderAsset(
-      resolvedOnchainAssetDdo.id,
-      resolvedOnchainAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedOnchainAssetDdo.services[0].id,
-      0,
-      datatoken,
-      providerUrl
-    )
-    assert(onchainOrderTx, 'Ordering onchain dataset failed.')
-
-    ipfsOrderTx = await orderAsset(
-      resolvedIpfsAssetDdo.id,
-      resolvedIpfsAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedIpfsAssetDdo.services[0].id,
-      0,
-      datatoken,
-      providerUrl
-    )
-    assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
-
-    grapqlOrderTx = await orderAsset(
-      resolvedGraphqlAssetDdo.id,
-      resolvedGraphqlAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedGraphqlAssetDdo.services[0].id,
-      0,
-      datatoken,
-      providerUrl
-    )
-    assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
-  }).timeout(60000)
+    // arwaveOrderTx = await orderAsset(
+    //   resolvedArweaveAssetDdo.id,
+    //   resolvedArweaveAssetDdo.services[0].datatokenAddress,
+    //   await consumerAccount.getAddress(),
+    //   resolvedArweaveAssetDdo.services[0].id,
+    //   0,
+    //   datatoken,
+    //   providerUrl
+    // )
+    // assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
+
+    // onchainOrderTx = await orderAsset(
+    //   resolvedOnchainAssetDdo.id,
+    //   resolvedOnchainAssetDdo.services[0].datatokenAddress,
+    //   await consumerAccount.getAddress(),
+    //   resolvedOnchainAssetDdo.services[0].id,
+    //   0,
+    //   datatoken,
+    //   providerUrl
+    // )
+    // assert(onchainOrderTx, 'Ordering onchain dataset failed.')
+
+    // ipfsOrderTx = await orderAsset(
+    //   resolvedIpfsAssetDdo.id,
+    //   resolvedIpfsAssetDdo.services[0].datatokenAddress,
+    //   await consumerAccount.getAddress(),
+    //   resolvedIpfsAssetDdo.services[0].id,
+    //   0,
+    //   datatoken,
+    //   providerUrl
+    // )
+    // assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
+
+    // grapqlOrderTx = await orderAsset(
+    //   resolvedGraphqlAssetDdo.id,
+    //   resolvedGraphqlAssetDdo.services[0].datatokenAddress,
+    //   await consumerAccount.getAddress(),
+    //   resolvedGraphqlAssetDdo.services[0].id,
+    //   0,
+    //   datatoken,
+    //   providerUrl
+    // )
+    // assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
+  }).timeout(40000)
 
   it('Should download the datasets files', async () => {
     const urlDownloadUrl = await ProviderInstance.getDownloadUrl(

From 54b7731fb6466cd8f00810b61fd9eee5c44ddcad Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Fri, 6 Sep 2024 16:14:18 +0300
Subject: [PATCH 26/64] Added check for file object for template index.

---
 README.md                                |  15 +
 package-lock.json                        | 666 +----------------------
 package.json                             |   4 +-
 src/contracts/NFT.ts                     |  50 +-
 test/scripts/SapphireIntegration.test.ts |  96 ++++
 test/scripts/sapphireTest.js             |  69 ---
 6 files changed, 151 insertions(+), 749 deletions(-)
 create mode 100644 test/scripts/SapphireIntegration.test.ts
 delete mode 100644 test/scripts/sapphireTest.js

diff --git a/README.md b/README.md
index 0e9dc1441..c17116247 100644
--- a/README.md
+++ b/README.md
@@ -128,6 +128,21 @@ npm run test:integration
 npm run test:integration:cover
 ```
 
+### Sapphire Integration Tests
+
+Currently, there is used Oasis Sapphire Test network, please export the `PRIVATE_KEY` before testing.
+
+```bash
+export PRIVATE_KEY='0x<YOUR_PRIVATE_KEY>'
+```
+
+Then, you can execute the tests individually with:
+
+```bash
+npm run test:sapphire
+```
+
+
 > Note: On macOS, changes to the `provider`, `metadataCache` and `subgraph` URLs are required, as their default `barge` IPs can not be accessed due to network constraints on macOS. Instead use `http://127.0.0.1` for each direct call to the mentioned services, but keep the internal `provider` URL (`http://172.15.0.4:8030`) hardcoded inside all DDO's `serviceEndpoint`, and when calling `nft.setMetadata()`.
 
 ## 🛳 Production
diff --git a/package-lock.json b/package-lock.json
index 09979300b..b86360868 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,8 +14,7 @@
         "cross-fetch": "^4.0.0",
         "crypto-js": "^4.1.1",
         "decimal.js": "^10.4.1",
-        "ethers": "^5.7.2",
-        "tsx": "^4.19.0"
+        "ethers": "^5.7.2"
       },
       "devDependencies": {
         "@truffle/hdwallet-provider": "^2.0.14",
@@ -1938,390 +1937,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
-      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
-      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
-      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
-      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
-      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
-      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
-      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
-      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
-      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
-      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
-      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
-      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
-      "cpu": [
-        "loong64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
-      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
-      "cpu": [
-        "mips64el"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
-      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
-      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
-      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
-      "cpu": [
-        "s390x"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
-      "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
-      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
-      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
-      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
-      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
-      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
-      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
-      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -6972,45 +6587,6 @@
         "ext": "^1.1.2"
       }
     },
-    "node_modules/esbuild": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz",
-      "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.23.1",
-        "@esbuild/android-arm": "0.23.1",
-        "@esbuild/android-arm64": "0.23.1",
-        "@esbuild/android-x64": "0.23.1",
-        "@esbuild/darwin-arm64": "0.23.1",
-        "@esbuild/darwin-x64": "0.23.1",
-        "@esbuild/freebsd-arm64": "0.23.1",
-        "@esbuild/freebsd-x64": "0.23.1",
-        "@esbuild/linux-arm": "0.23.1",
-        "@esbuild/linux-arm64": "0.23.1",
-        "@esbuild/linux-ia32": "0.23.1",
-        "@esbuild/linux-loong64": "0.23.1",
-        "@esbuild/linux-mips64el": "0.23.1",
-        "@esbuild/linux-ppc64": "0.23.1",
-        "@esbuild/linux-riscv64": "0.23.1",
-        "@esbuild/linux-s390x": "0.23.1",
-        "@esbuild/linux-x64": "0.23.1",
-        "@esbuild/netbsd-x64": "0.23.1",
-        "@esbuild/openbsd-arm64": "0.23.1",
-        "@esbuild/openbsd-x64": "0.23.1",
-        "@esbuild/sunos-x64": "0.23.1",
-        "@esbuild/win32-arm64": "0.23.1",
-        "@esbuild/win32-ia32": "0.23.1",
-        "@esbuild/win32-x64": "0.23.1"
-      }
-    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -9223,6 +8799,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -9393,18 +8970,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-tsconfig": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz",
-      "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==",
-      "license": "MIT",
-      "dependencies": {
-        "resolve-pkg-maps": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
-      }
-    },
     "node_modules/get-uri": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
@@ -15356,15 +14921,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/resolve-pkg-maps": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
-      }
-    },
     "node_modules/responselike": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
@@ -16865,25 +16421,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
       "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
     },
-    "node_modules/tsx": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.0.tgz",
-      "integrity": "sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg==",
-      "license": "MIT",
-      "dependencies": {
-        "esbuild": "~0.23.0",
-        "get-tsconfig": "^4.7.5"
-      },
-      "bin": {
-        "tsx": "dist/cli.mjs"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      }
-    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -19690,150 +19227,6 @@
         "@jridgewell/trace-mapping": "0.3.9"
       }
     },
-    "@esbuild/aix-ppc64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
-      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
-      "optional": true
-    },
-    "@esbuild/android-arm": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
-      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
-      "optional": true
-    },
-    "@esbuild/android-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
-      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
-      "optional": true
-    },
-    "@esbuild/android-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
-      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
-      "optional": true
-    },
-    "@esbuild/darwin-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
-      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
-      "optional": true
-    },
-    "@esbuild/darwin-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
-      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
-      "optional": true
-    },
-    "@esbuild/freebsd-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
-      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
-      "optional": true
-    },
-    "@esbuild/freebsd-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
-      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
-      "optional": true
-    },
-    "@esbuild/linux-arm": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
-      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
-      "optional": true
-    },
-    "@esbuild/linux-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
-      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
-      "optional": true
-    },
-    "@esbuild/linux-ia32": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
-      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
-      "optional": true
-    },
-    "@esbuild/linux-loong64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
-      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
-      "optional": true
-    },
-    "@esbuild/linux-mips64el": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
-      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
-      "optional": true
-    },
-    "@esbuild/linux-ppc64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
-      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
-      "optional": true
-    },
-    "@esbuild/linux-riscv64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
-      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
-      "optional": true
-    },
-    "@esbuild/linux-s390x": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
-      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
-      "optional": true
-    },
-    "@esbuild/linux-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
-      "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==",
-      "optional": true
-    },
-    "@esbuild/netbsd-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
-      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
-      "optional": true
-    },
-    "@esbuild/openbsd-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
-      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
-      "optional": true
-    },
-    "@esbuild/openbsd-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
-      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
-      "optional": true
-    },
-    "@esbuild/sunos-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
-      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
-      "optional": true
-    },
-    "@esbuild/win32-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
-      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
-      "optional": true
-    },
-    "@esbuild/win32-ia32": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
-      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
-      "optional": true
-    },
-    "@esbuild/win32-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
-      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
-      "optional": true
-    },
     "@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -23227,37 +22620,6 @@
         "ext": "^1.1.2"
       }
     },
-    "esbuild": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz",
-      "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==",
-      "requires": {
-        "@esbuild/aix-ppc64": "0.23.1",
-        "@esbuild/android-arm": "0.23.1",
-        "@esbuild/android-arm64": "0.23.1",
-        "@esbuild/android-x64": "0.23.1",
-        "@esbuild/darwin-arm64": "0.23.1",
-        "@esbuild/darwin-x64": "0.23.1",
-        "@esbuild/freebsd-arm64": "0.23.1",
-        "@esbuild/freebsd-x64": "0.23.1",
-        "@esbuild/linux-arm": "0.23.1",
-        "@esbuild/linux-arm64": "0.23.1",
-        "@esbuild/linux-ia32": "0.23.1",
-        "@esbuild/linux-loong64": "0.23.1",
-        "@esbuild/linux-mips64el": "0.23.1",
-        "@esbuild/linux-ppc64": "0.23.1",
-        "@esbuild/linux-riscv64": "0.23.1",
-        "@esbuild/linux-s390x": "0.23.1",
-        "@esbuild/linux-x64": "0.23.1",
-        "@esbuild/netbsd-x64": "0.23.1",
-        "@esbuild/openbsd-arm64": "0.23.1",
-        "@esbuild/openbsd-x64": "0.23.1",
-        "@esbuild/sunos-x64": "0.23.1",
-        "@esbuild/win32-arm64": "0.23.1",
-        "@esbuild/win32-ia32": "0.23.1",
-        "@esbuild/win32-x64": "0.23.1"
-      }
-    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -25005,6 +24367,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "optional": true
     },
     "ftp": {
@@ -25130,14 +24493,6 @@
         "get-intrinsic": "^1.1.1"
       }
     },
-    "get-tsconfig": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz",
-      "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==",
-      "requires": {
-        "resolve-pkg-maps": "^1.0.0"
-      }
-    },
     "get-uri": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
@@ -29508,11 +28863,6 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "resolve-pkg-maps": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw=="
-    },
     "responselike": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
@@ -30675,16 +30025,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
       "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
     },
-    "tsx": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.0.tgz",
-      "integrity": "sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg==",
-      "requires": {
-        "esbuild": "~0.23.0",
-        "fsevents": "~2.3.3",
-        "get-tsconfig": "^4.7.5"
-      }
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
diff --git a/package.json b/package.json
index 858113b9f..922e662d8 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "mocha": "TS_NODE_PROJECT='./test/tsconfig.json' mocha --config=test/.mocharc.json --node-env=test --exit",
     "test": "npm run lint && npm run test:unit:cover && npm run test:integration:cover",
     "test:unit": "npm run mocha -- 'test/unit/**/*.test.ts'",
+    "test:sapphire": "npm run mocha -- 'test/scripts/**/*.test.ts'",
     "test:integration": "npm run mocha --  'test/integration/**/*.test.ts'",
     "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
     "test:integration:cover": "nyc --report-dir coverage/integration --no-clean npm run test:integration",
@@ -58,8 +59,7 @@
     "cross-fetch": "^4.0.0",
     "crypto-js": "^4.1.1",
     "decimal.js": "^10.4.1",
-    "ethers": "^5.7.2",
-    "tsx": "^4.19.0"
+    "ethers": "^5.7.2"
   },
   "devDependencies": {
     "@truffle/hdwallet-provider": "^2.0.14",
diff --git a/src/contracts/NFT.ts b/src/contracts/NFT.ts
index 03ffa0fc7..ddd886809 100644
--- a/src/contracts/NFT.ts
+++ b/src/contracts/NFT.ts
@@ -1,4 +1,4 @@
-import { BigNumber, ethers } from 'ethers'
+import { BigNumber, ethers, providers } from 'ethers'
 import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
 import { generateDtName, sendTx, getEventFromTx } from '../utils'
 import {
@@ -43,6 +43,7 @@ export class Nft extends SmartContract {
     name?: string,
     symbol?: string,
     templateIndex?: number,
+    filesObject?: string,
     estimateGas?: G
   ): Promise<G extends false ? string : BigNumber> {
     if ((await this.getNftPermissions(nftAddress, address)).deployERC20 !== true) {
@@ -70,20 +71,39 @@ export class Nft extends SmartContract {
     )
     if (estimateGas) return <G extends false ? string : BigNumber>estGas
 
-    const tx = await sendTx(
-      estGas,
-      this.signer,
-      this.config?.gasFeeMultiplier,
-      nftContract.createERC20,
-      templateIndex,
-      [name, symbol],
-      [minter, paymentCollector, mpFeeAddress, feeToken],
-      [
-        await this.amountToUnits(null, cap, 18),
-        await this.amountToUnits(null, feeAmount, 18)
-      ],
-      []
-    )
+    let tx: providers.TransactionResponse
+    if (templateIndex === 4) {
+      tx = await sendTx(
+        estGas,
+        this.signer,
+        this.config?.gasFeeMultiplier,
+        nftContract.createERC20,
+        templateIndex,
+        [name, symbol],
+        [minter, paymentCollector, mpFeeAddress, feeToken],
+        [
+          await this.amountToUnits(null, cap, 18),
+          await this.amountToUnits(null, feeAmount, 18)
+        ],
+        [ethers.utils.toUtf8Bytes(filesObject)]
+      )
+    } else {
+      tx = await sendTx(
+        estGas,
+        this.signer,
+        this.config?.gasFeeMultiplier,
+        nftContract.createERC20,
+        templateIndex,
+        [name, symbol],
+        [minter, paymentCollector, mpFeeAddress, feeToken],
+        [
+          await this.amountToUnits(null, cap, 18),
+          await this.amountToUnits(null, feeAmount, 18)
+        ],
+        []
+      )
+    }
+    console.log(`tx: ${tx}`)
     const trxReceipt = await tx.wait()
     // console.log('trxReceipt =', trxReceipt)
     const event = getEventFromTx(trxReceipt, 'TokenCreated')
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
new file mode 100644
index 000000000..278d091c4
--- /dev/null
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -0,0 +1,96 @@
+import * as sapphire from '@oasisprotocol/sapphire-paratime'
+import addresses from '@oceanprotocol/contracts/addresses/address.json'
+import { ethers } from 'ethers'
+import { AccesslistFactory } from '../../src/contracts/AccessListFactory'
+import { AccessListContract } from '../../src/contracts/AccessList'
+import { NftFactory } from '../../src/contracts/NFTFactory'
+import { ZERO_ADDRESS } from '../../src/utils/Constants'
+import { assert } from 'console'
+import { AccessListData, Nft, NftCreateData } from '../../src'
+
+describe('Sapphire tests', async () => {
+  const provider = sapphire.wrap(
+    ethers.getDefaultProvider(sapphire.NETWORKS.testnet.defaultGateway)
+  )
+  const wallet = new ethers.Wallet(process.env.PRIVATE_KEY, provider)
+  const walletWrapped = sapphire.wrap(
+    new ethers.Wallet(process.env.PRIVATE_KEY, provider)
+  )
+
+  const addrs: any = addresses.oasis_saphire_testnet
+  const listData: AccessListData = {
+    name: 'ListName',
+    symbol: 'ListSymbol',
+    tokenURI: ['https://oceanprotocol.com/nft/'],
+    transferable: true,
+    owner: await wallet.getAddress(),
+    user: [await wallet.getAddress(), ZERO_ADDRESS]
+  }
+  const nftData: NftCreateData = {
+    name: 'NFTName',
+    symbol: 'NFTSymbol',
+    templateIndex: 1,
+    tokenURI: 'https://oceanprotocol.com/nft/',
+    transferable: true,
+    owner: null
+  }
+
+  let factoryContract: any
+  let listAddress: string
+  let accessListToken: any
+
+  let nftFactory: any
+  let nftAddress: string
+  let nftToken: any
+
+  let datatokenAddress: string
+
+  const filesObject: any = [
+    {
+      url: 'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
+      contentType: 'text/js',
+      encoding: 'UTF-8'
+    }
+  ]
+
+  it('Create Access List factory', () => {
+    factoryContract = new AccesslistFactory(addrs.AccessListFactory, wallet, 23295)
+    assert(factoryContract !== null, 'factory not created')
+  })
+
+  it('Create Access List contract', async () => {
+    listData.owner = await wallet.getAddress()
+    listAddress = await factoryContract.deployAccessListContract(listData)
+    assert(listAddress !== null)
+    console.log('list address: ', listAddress)
+    accessListToken = new AccessListContract(wallet, 23295)
+  })
+  it('Create ERC721 factory', () => {
+    nftFactory = new NftFactory(addrs.ERC721Factory, wallet, 23295)
+    assert(factoryContract !== null, 'factory not created')
+  })
+
+  it('Create ERC721 contract', async () => {
+    nftData.owner = await wallet.getAddress()
+    nftAddress = await (nftFactory as NftFactory).createNFT(nftData)
+    console.log('nftAddress: ', nftAddress)
+    nftToken = new Nft(wallet, 23295)
+  })
+  it('Create Datatoken4 contract', async () => {
+    datatokenAddress = await (nftToken as Nft).createDatatoken(
+      nftAddress,
+      await walletWrapped.getAddress(),
+      await walletWrapped.getAddress(),
+      await walletWrapped.getAddress(),
+      await walletWrapped.getAddress(),
+      ZERO_ADDRESS,
+      '0',
+      '10000',
+      'ERC20T4',
+      'ERC20DT1Symbol',
+      4,
+      JSON.stringify(filesObject)
+    )
+    assert(datatokenAddress, 'datatoken not created.')
+  })
+})
diff --git a/test/scripts/sapphireTest.js b/test/scripts/sapphireTest.js
deleted file mode 100644
index 4a03f457b..000000000
--- a/test/scripts/sapphireTest.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import * as sapphire from '@oasisprotocol/sapphire-paratime'
-import addresses from '@oceanprotocol/contracts/addresses/address.json'
-import { ethers, Signer } from 'ethers'
-import { AccesslistFactory } from '../../src/contracts/AccessListFactory.ts'
-import { AccessListContract } from '../../src/contracts/AccessList.ts'
-import { ZERO_ADDRESS } from '../../src/utils/Constants.ts'
-import { assert } from 'console'
-
-const provider = sapphire.wrap(
-  ethers.getDefaultProvider(sapphire.NETWORKS.testnet.defaultGateway)
-)
-const wallet = new ethers.Wallet(process.env.PRIVATE_KEY, provider)
-
-const addrs = addresses.oasis_saphire_testnet
-console.log(`addrs: ${JSON.stringify(addrs)}`)
-const listData = {
-  name: 'ListName',
-  symbol: 'ListSymbol',
-  tokenURI: ['https://oceanprotocol.com/nft/'],
-  transferable: true,
-  owner: await wallet.getAddress(),
-  user: [await wallet.getAddress(), ZERO_ADDRESS]
-}
-
-const factoryContract = new AccesslistFactory(
-  addrs.AccessListFactory,
-  wallet,
-  addrs.chainId
-)
-assert(factoryContract !== null, 'factory not created')
-
-listData.owner = await wallet.getAddress()
-const listAddress = await factoryContract.deployAccessListContract(listData)
-assert(listAddress !== null)
-console.log('list address: ', listAddress)
-const accessListToken = new AccessListContract(wallet, 23295)
-
-// describe('Sapphire tests', async () => {
-//   const provider = sapphire.wrap(
-//     ethers.getDefaultProvider(sapphire.NETWORKS.testnet.defaultGateway)
-//   )
-//   const wallet = new ethers.Wallet(process.env.PRIVATE_KEY, provider)
-
-//   const addresses = await getAddressesForSapphire(true)
-//   const listData = {
-//     name: 'ListName',
-//     symbol: 'ListSymbol',
-//     tokenURI: ['https://oceanprotocol.com/nft/'],
-//     transferable: true,
-//     owner: await wallet.getAddress(),
-//     user: [await wallet.getAddress(), ZERO_ADDRESS]
-//   }
-//   let factoryContract
-//   let listAddress
-//   let accessListToken
-
-//   it('Create Access List factory', () => {
-//     factoryContract = new AccesslistFactory(addresses.AccessListFactory, wallet, 23295)
-//     assert(factoryContract !== null, 'factory not created')
-//   })
-
-//   it('Create Access List contract', async () => {
-//     listData.owner = await wallet.getAddress()
-//     listAddress = await factoryContract.deployAccessListContract(listData)
-//     assert(listAddress !== null)
-//     console.log('list address: ', listAddress)
-//     accessListToken = new AccessListContract(wallet, 23295)
-//   })
-// })

From 4125959f9d0cbab7ed103bd06e964085b0a60250 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Mon, 9 Sep 2024 12:50:08 +0300
Subject: [PATCH 27/64] fix deploy erc20 template 4 test.

---
 src/contracts/NFT.ts                     | 60 +++++++++++-------------
 test/scripts/SapphireIntegration.test.ts | 14 +++---
 2 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/src/contracts/NFT.ts b/src/contracts/NFT.ts
index ddd886809..a6810f555 100644
--- a/src/contracts/NFT.ts
+++ b/src/contracts/NFT.ts
@@ -44,6 +44,9 @@ export class Nft extends SmartContract {
     symbol?: string,
     templateIndex?: number,
     filesObject?: string,
+    accessListContract?: string,
+    allowAccessList?: string,
+    denyAccessList?: string,
     estimateGas?: G
   ): Promise<G extends false ? string : BigNumber> {
     if ((await this.getNftPermissions(nftAddress, address)).deployERC20 !== true) {
@@ -71,41 +74,32 @@ export class Nft extends SmartContract {
     )
     if (estimateGas) return <G extends false ? string : BigNumber>estGas
 
-    let tx: providers.TransactionResponse
-    if (templateIndex === 4) {
-      tx = await sendTx(
-        estGas,
-        this.signer,
-        this.config?.gasFeeMultiplier,
-        nftContract.createERC20,
-        templateIndex,
-        [name, symbol],
-        [minter, paymentCollector, mpFeeAddress, feeToken],
-        [
-          await this.amountToUnits(null, cap, 18),
-          await this.amountToUnits(null, feeAmount, 18)
-        ],
-        [ethers.utils.toUtf8Bytes(filesObject)]
-      )
-    } else {
-      tx = await sendTx(
-        estGas,
-        this.signer,
-        this.config?.gasFeeMultiplier,
-        nftContract.createERC20,
-        templateIndex,
-        [name, symbol],
-        [minter, paymentCollector, mpFeeAddress, feeToken],
-        [
-          await this.amountToUnits(null, cap, 18),
-          await this.amountToUnits(null, feeAmount, 18)
-        ],
-        []
-      )
+    const addresses = [minter, paymentCollector, mpFeeAddress, feeToken]
+    if (accessListContract) {
+      addresses.push(accessListContract)
+      if (allowAccessList) {
+        addresses.push(allowAccessList)
+      }
+      if (denyAccessList) {
+        addresses.push(denyAccessList)
+      }
     }
-    console.log(`tx: ${tx}`)
+
+    const tx = await sendTx(
+      estGas,
+      this.signer,
+      this.config?.gasFeeMultiplier,
+      nftContract.functions.createERC20,
+      templateIndex,
+      [name, symbol],
+      addresses,
+      [
+        await this.amountToUnits(null, cap, 18),
+        await this.amountToUnits(null, feeAmount, 18)
+      ],
+      filesObject ? [ethers.utils.toUtf8Bytes(filesObject)] : []
+    )
     const trxReceipt = await tx.wait()
-    // console.log('trxReceipt =', trxReceipt)
     const event = getEventFromTx(trxReceipt, 'TokenCreated')
     return event?.args[0]
   }
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index 278d091c4..6e9d6c0f5 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -80,16 +80,18 @@ describe('Sapphire tests', async () => {
     datatokenAddress = await (nftToken as Nft).createDatatoken(
       nftAddress,
       await walletWrapped.getAddress(),
-      await walletWrapped.getAddress(),
-      await walletWrapped.getAddress(),
-      await walletWrapped.getAddress(),
+      await wallet.getAddress(),
+      await wallet.getAddress(),
+      await wallet.getAddress(),
       ZERO_ADDRESS,
       '0',
-      '10000',
+      '100000',
       'ERC20T4',
       'ERC20DT1Symbol',
-      4,
-      JSON.stringify(filesObject)
+      1,
+      JSON.stringify(filesObject),
+      addrs.AccessListFactory,
+      listAddress
     )
     assert(datatokenAddress, 'datatoken not created.')
   })

From f97666c8a35528e1147aed1d017a28a2edf5c75f Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 11 Sep 2024 12:30:07 +0300
Subject: [PATCH 28/64] Calculate index function. Fix review.

---
 src/@types/NFTFactory.ts                 |  9 ---
 src/contracts/AccessList.ts              | 10 +--
 src/contracts/AccessListFactory.ts       | 43 ++++++------
 src/contracts/Datatoken4.ts              | 22 ++++--
 src/contracts/NFT.ts                     | 30 +++++++-
 src/utils/Asset.ts                       | 87 ++++++++++++++++++++++++
 test/config.ts                           | 13 ----
 test/scripts/SapphireIntegration.test.ts | 67 ++++++++++++++----
 8 files changed, 217 insertions(+), 64 deletions(-)
 create mode 100644 src/utils/Asset.ts

diff --git a/src/@types/NFTFactory.ts b/src/@types/NFTFactory.ts
index 23d6b0f03..5e20ac9da 100644
--- a/src/@types/NFTFactory.ts
+++ b/src/@types/NFTFactory.ts
@@ -21,12 +21,3 @@ export interface NftCreateData {
   transferable: boolean
   owner: string
 }
-
-export interface AccessListData {
-  name: string
-  symbol: string
-  tokenURI: string[]
-  transferable: boolean
-  owner: string
-  user: string[]
-}
diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index 84a101f8b..9a9b4767c 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -34,9 +34,9 @@ export class AccessListContract extends SmartContract {
    * Get Token Uri
    * @return {Promise<string>} Token URI
    */
-  public async getTokenUri(accessListAddress: string): Promise<string> {
+  public async getTokenUri(accessListAddress: string, tokenId: number): Promise<string> {
     const accessListContract = this.getContract(accessListAddress)
-    return await accessListContract.tokenURI()
+    return await accessListContract.tokenURI(tokenId)
   }
 
   /**
@@ -67,7 +67,7 @@ export class AccessListContract extends SmartContract {
   }
 
   /**
-   * Mint ERC721 contract
+   * Add address to access list
    * @param {String} accessListAddress AccessList contract address
    * @param {String} user Minter address
    * @param {String} tokenUri tokenURI
@@ -96,7 +96,7 @@ export class AccessListContract extends SmartContract {
   }
 
   /**
-   * Batch Mint ERC721 contract
+   * Batch add addresses to the access list
    * @param {String} accessListAddress AccessList contract address
    * @param {String} users Minter addresses
    * @param {String} tokenUris tokenURI
@@ -125,7 +125,7 @@ export class AccessListContract extends SmartContract {
   }
 
   /**
-   * Burn Access List
+   * Delete address from access list
    * @param {String} accessListAddress AccessList contract address
    * @param {Number} tokenId token ID
    * @param {Boolean} estimateGas if True, return gas estimate
diff --git a/src/contracts/AccessListFactory.ts b/src/contracts/AccessListFactory.ts
index f74d0f4a4..54ff92f24 100644
--- a/src/contracts/AccessListFactory.ts
+++ b/src/contracts/AccessListFactory.ts
@@ -2,7 +2,7 @@ import { BigNumber, Signer } from 'ethers'
 import { Config } from '../config'
 import AccessListFactory from '@oceanprotocol/contracts/artifacts/contracts/accesslists/AccessListFactory.sol/AccessListFactory.json'
 import { generateDtName, sendTx, getEventFromTx, ZERO_ADDRESS } from '../utils'
-import { AbiItem, AccessListData, ReceiptOrEstimate } from '../@types'
+import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { SmartContractWithAddress } from './SmartContractWithAddress'
 
 /**
@@ -39,22 +39,27 @@ export class AccesslistFactory extends SmartContractWithAddress {
    * @return {Promise<string|BigNumber>} The transaction hash or the gas estimate.
    */
   public async deployAccessListContract<G extends boolean = false>(
-    listData: AccessListData,
+    nameAccessList: string,
+    symbolAccessLis: string,
+    tokenURI: string[],
+    transferable: boolean,
+    owner: string,
+    user: string[],
     estimateGas?: G
   ): Promise<G extends false ? string : BigNumber> {
-    if (!listData.name || !listData.symbol) {
+    if (!nameAccessList || !symbolAccessLis) {
       const { name, symbol } = generateDtName()
-      listData.name = name
-      listData.symbol = symbol
+      nameAccessList = name
+      symbolAccessLis = symbol
     }
-    if (!listData.transferable) listData.transferable = true
+    if (!transferable) transferable = true
     const estGas = await this.contract.estimateGas.deployAccessListContract(
-      listData.name,
-      listData.symbol,
-      listData.transferable,
-      listData.owner,
-      listData.user,
-      listData.tokenURI
+      nameAccessList,
+      symbolAccessLis,
+      transferable,
+      owner,
+      user,
+      tokenURI
     )
     if (estimateGas) return <G extends false ? string : BigNumber>estGas
     // Invoke createToken function of the contract
@@ -62,13 +67,13 @@ export class AccesslistFactory extends SmartContractWithAddress {
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      this.contract.functions.deployAccessListContract,
-      listData.name,
-      listData.symbol,
-      listData.transferable,
-      listData.owner,
-      listData.user,
-      listData.tokenURI
+      this.contract.deployAccessListContract,
+      nameAccessList,
+      symbolAccessLis,
+      transferable,
+      owner,
+      user,
+      tokenURI
     )
     const trxReceipt = await tx.wait()
     const events = getEventFromTx(trxReceipt, 'NewAccessList')
diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index 2993734ef..682fd3b3b 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -1,6 +1,6 @@
 /* eslint-disable lines-between-class-members */
 import { Datatoken } from './Datatoken'
-import { Bytes, Signer } from 'ethers'
+import { Bytes, Signer, ethers } from 'ethers'
 import ERC20Template4 from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template4.sol/ERC20Template4.json'
 import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { AccessListContract } from './AccessList'
@@ -30,9 +30,10 @@ export class Datatoken4 extends Datatoken {
     abi?: AbiItem[]
   ) {
     super(signer, network, config, abi)
+    this.accessList = new AccessListContract(this.signer)
+    this.abi = this.getDefaultAbi()
     // Wrap signer's address for encrypted data tx
     this.signer = sapphire.wrap(signer)
-    this.accessList = new AccessListContract(this.signer)
     this.fileObject = fileObject
   }
 
@@ -41,8 +42,21 @@ export class Datatoken4 extends Datatoken {
    * @param dtAddress datatoken address
    * @return {Promise<string>}
    */
-  public async getAllowListContract(dtAddress: string): Promise<string> {
-    const dtContract = this.getContract(dtAddress)
+  public async getAllowlistContract(dtAddress: string): Promise<string> {
+    const dtContract = this.getContract(dtAddress, this.getDefaultAbi())
+    // const dtContract = new ethers.Contract(dtAddress, ERC20Template4.abi, this.signer)
+    // const factory = new ethers.ContractFactory(
+    //   ERC20Template4.abi,
+    //   ERC20Template4.bytecode,
+    //   this.signer
+    // )
+
+    // const contract = await factory.deploy()
+
+    // await contract.deployed()
+    // contract.attach(dtAddress)
+
+    console.log(await dtContract.getId())
     const allowList = await dtContract.getAllowListContract()
     return allowList
   }
diff --git a/src/contracts/NFT.ts b/src/contracts/NFT.ts
index a6810f555..505c698f9 100644
--- a/src/contracts/NFT.ts
+++ b/src/contracts/NFT.ts
@@ -1,4 +1,4 @@
-import { BigNumber, ethers, providers } from 'ethers'
+import { BigNumber, ethers, Signer } from 'ethers'
 import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
 import { generateDtName, sendTx, getEventFromTx } from '../utils'
 import {
@@ -9,6 +9,10 @@ import {
   AbiItem
 } from '../@types'
 import { SmartContract } from './SmartContract'
+import {
+  calculateActiveTemplateIndex,
+  getOceanArtifactsAdressesByChainId
+} from '../utils/Asset'
 
 export class Nft extends SmartContract {
   getDefaultAbi() {
@@ -84,12 +88,19 @@ export class Nft extends SmartContract {
         addresses.push(denyAccessList)
       }
     }
+    const { chainId } = await nftContract.provider.getNetwork()
+    const artifacts = getOceanArtifactsAdressesByChainId(chainId)
+    templateIndex = await calculateActiveTemplateIndex(
+      nftContract.signer as Signer,
+      artifacts.ERC721Factory,
+      4
+    )
 
     const tx = await sendTx(
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      nftContract.functions.createERC20,
+      nftContract.createERC20,
       templateIndex,
       [name, symbol],
       addresses,
@@ -782,4 +793,19 @@ export class Nft extends SmartContract {
     const data = await nftContract.tokenURI(id)
     return data
   }
+
+  /**
+   * Is datatoken deployed?
+   * @param {string} nftAddress - The address of the NFT.
+   * @param {string} datatokenAddress - The datatoken address.
+   * @returns {Promise<boolean>}
+   */
+  public async isDatatokenDeployed(
+    nftAddress: string,
+    datatokenAddress: string
+  ): Promise<boolean> {
+    const nftContract = this.getContract(nftAddress)
+    const data = await nftContract.isDeployed(datatokenAddress)
+    return data
+  }
 }
diff --git a/src/utils/Asset.ts b/src/utils/Asset.ts
new file mode 100644
index 000000000..9eb8e24ec
--- /dev/null
+++ b/src/utils/Asset.ts
@@ -0,0 +1,87 @@
+import { ethers, Signer } from 'ethers'
+
+import { NftFactory } from '../contracts/NFTFactory'
+// eslint-disable-next-line import/no-named-default
+import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/interfaces/IERC20Template.sol/IERC20Template.json'
+import fs from 'fs'
+// eslint-disable-next-line import/no-named-default
+import { default as addrs } from '@oceanprotocol/contracts/addresses/address.json'
+
+/**
+ * Get the artifacts address from the address.json file
+ * either from the env or from the ocean-contracts dir
+ * @returns data or null
+ */
+export function getOceanArtifactsAdresses(): any {
+  try {
+    if (process.env.ADDRESS_FILE) {
+      // eslint-disable-next-line security/detect-non-literal-fs-filename
+      const data = fs.readFileSync(process.env.ADDRESS_FILE, 'utf8')
+      return JSON.parse(data)
+    }
+    return addrs
+  } catch (error) {
+    return addrs
+  }
+}
+
+export function getOceanArtifactsAdressesByChainId(chain: number): any {
+  try {
+    // eslint-disable-next-line security/detect-non-literal-fs-filename
+    const data = getOceanArtifactsAdresses()
+    if (data) {
+      const networks = Object.keys(data)
+      for (const network of networks) {
+        if (data[network].chainId === chain) {
+          return data[network]
+        }
+      }
+    }
+  } catch (error) {
+    console.error(error)
+  }
+  return null
+}
+
+/**
+ * Use this function to accurately calculate the template index, and also checking if the template is active
+ * @param owner the signer account
+ * @param nftContractAddress the nft contract address, usually artifactsAddresses.ERC721Factory
+ * @param template the template ID or template address (from smart contract getId() function)
+ * @returns index of the template on the list
+ */
+export async function calculateActiveTemplateIndex(
+  owner: Signer,
+  nftContractAddress: string, // addresses.ERC721Factory,
+  template: string | number
+): Promise<number> {
+  // is an ID number?
+  const isTemplateID = typeof template === 'number'
+
+  const factoryERC721 = new NftFactory(nftContractAddress, owner)
+  const currentTokenCount = await factoryERC721.getCurrentTokenTemplateCount()
+  for (let i = 1; i <= currentTokenCount; i++) {
+    const tokenTemplate = await factoryERC721.getTokenTemplate(i)
+
+    const erc20Template = new ethers.Contract(
+      tokenTemplate.templateAddress,
+      ERC20Template.abi,
+      owner
+    )
+
+    // check for ID
+    if (isTemplateID) {
+      const id = await erc20Template.connect(owner).getId()
+      if (tokenTemplate.isActive && id.toString() === template.toString()) {
+        return i
+      }
+    } else if (
+      tokenTemplate.isActive &&
+      tokenTemplate.templateAddress === template.toString()
+    ) {
+      return i
+    }
+  }
+  // if nothing is found it returns -1
+  return -1
+}
diff --git a/test/config.ts b/test/config.ts
index 0dd4aa507..628c5e3fa 100644
--- a/test/config.ts
+++ b/test/config.ts
@@ -48,16 +48,3 @@ export const getAddresses = () => {
   )
   return data.development
 }
-
-export const getAddressesForSapphire = (testnet: boolean) => {
-  const data = JSON.parse(
-    // eslint-disable-next-line security/detect-non-literal-fs-filename
-    fs.readFileSync(
-      process.env.ADDRESS_FILE ||
-        `${homedir}/.ocean/ocean-contracts/artifacts/address.json`,
-      'utf8'
-    )
-  )
-  if (testnet) return data.oasis_saphire_testnet
-  return data.oasis_saphire
-}
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index 6e9d6c0f5..aa47b1a32 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -1,12 +1,14 @@
 import * as sapphire from '@oasisprotocol/sapphire-paratime'
 import addresses from '@oceanprotocol/contracts/addresses/address.json'
-import { ethers } from 'ethers'
+import { ethers, Signer } from 'ethers'
 import { AccesslistFactory } from '../../src/contracts/AccessListFactory'
 import { AccessListContract } from '../../src/contracts/AccessList'
 import { NftFactory } from '../../src/contracts/NFTFactory'
 import { ZERO_ADDRESS } from '../../src/utils/Constants'
 import { assert } from 'console'
-import { AccessListData, Nft, NftCreateData } from '../../src'
+import { Datatoken4 } from '../../src/contracts/Datatoken4'
+import { AbiItem, Config, Nft, NftCreateData } from '../../src'
+import ERC20Template4 from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template4.sol/ERC20Template4.json'
 
 describe('Sapphire tests', async () => {
   const provider = sapphire.wrap(
@@ -18,14 +20,6 @@ describe('Sapphire tests', async () => {
   )
 
   const addrs: any = addresses.oasis_saphire_testnet
-  const listData: AccessListData = {
-    name: 'ListName',
-    symbol: 'ListSymbol',
-    tokenURI: ['https://oceanprotocol.com/nft/'],
-    transferable: true,
-    owner: await wallet.getAddress(),
-    user: [await wallet.getAddress(), ZERO_ADDRESS]
-  }
   const nftData: NftCreateData = {
     name: 'NFTName',
     symbol: 'NFTSymbol',
@@ -44,6 +38,7 @@ describe('Sapphire tests', async () => {
   let nftToken: any
 
   let datatokenAddress: string
+  let datatoken: any
 
   const filesObject: any = [
     {
@@ -53,14 +48,35 @@ describe('Sapphire tests', async () => {
     }
   ]
 
+  const config: Config = {
+    chainId: 23295,
+    network: 'oasis_saphire_testnet',
+    nodeUri: 'https://testnet.sapphire.oasis.dev',
+    subgraphUri:
+      'https://v4.subgraph.sapphire-testnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
+    explorerUri: 'https://explorer.oasis.io/testnet/sapphire/',
+    gasFeeMultiplier: 1,
+    oceanTokenSymbol: 'OCEAN',
+    transactionPollingTimeout: 2,
+    transactionBlockTimeout: 3,
+    transactionConfirmationBlocks: 1,
+    web3Provider: provider
+  }
+
   it('Create Access List factory', () => {
     factoryContract = new AccesslistFactory(addrs.AccessListFactory, wallet, 23295)
     assert(factoryContract !== null, 'factory not created')
   })
 
   it('Create Access List contract', async () => {
-    listData.owner = await wallet.getAddress()
-    listAddress = await factoryContract.deployAccessListContract(listData)
+    listAddress = await (factoryContract as AccesslistFactory).deployAccessListContract(
+      'AllowList',
+      'ALLOW',
+      ['https://oceanprotocol.com/nft/'],
+      true,
+      await wallet.getAddress(),
+      [await wallet.getAddress(), ZERO_ADDRESS]
+    )
     assert(listAddress !== null)
     console.log('list address: ', listAddress)
     accessListToken = new AccessListContract(wallet, 23295)
@@ -94,5 +110,32 @@ describe('Sapphire tests', async () => {
       listAddress
     )
     assert(datatokenAddress, 'datatoken not created.')
+    console.log('datatoken: ', datatokenAddress)
+  })
+  it('Get Allow Access List', async () => {
+    datatoken = new Datatoken4(
+      wallet,
+      ethers.utils.toUtf8Bytes(JSON.stringify(filesObject)),
+      23295,
+      config,
+      ERC20Template4.abi as AbiItem[]
+    )
+    assert(
+      (await (nftToken as Nft).isDatatokenDeployed(nftAddress, datatokenAddress)) ===
+        true,
+      'datatoken not deployed'
+    )
+    // assert(
+    //   (await (datatoken as Datatoken4).getAllowlistContract(datatokenAddress)) ===
+    //     listAddress,
+    //   'no access list attached to datatoken.'
+    // )
+    const address = await wallet.getAddress()
+    console.log(
+      await (datatoken as Datatoken4).isDatatokenDeployer(datatokenAddress, address)
+    )
+    console.log(await (datatoken as Datatoken4).getAllowlistContract(datatokenAddress))
+
+    console.log(await (datatoken as Datatoken4).getId(datatokenAddress))
   })
 })

From b287294ca6493a455ccc3b2dee09da65a2122eeb Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 11 Sep 2024 13:12:57 +0300
Subject: [PATCH 29/64] Change to this.signer.

---
 src/contracts/NFT.ts                     | 4 +++-
 test/scripts/SapphireIntegration.test.ts | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/contracts/NFT.ts b/src/contracts/NFT.ts
index 505c698f9..418de55d2 100644
--- a/src/contracts/NFT.ts
+++ b/src/contracts/NFT.ts
@@ -91,11 +91,13 @@ export class Nft extends SmartContract {
     const { chainId } = await nftContract.provider.getNetwork()
     const artifacts = getOceanArtifactsAdressesByChainId(chainId)
     templateIndex = await calculateActiveTemplateIndex(
-      nftContract.signer as Signer,
+      this.signer,
       artifacts.ERC721Factory,
       4
     )
 
+    console.log(`templateIndex: `, templateIndex)
+
     const tx = await sendTx(
       estGas,
       this.signer,
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index aa47b1a32..9df8bbbb3 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -107,7 +107,8 @@ describe('Sapphire tests', async () => {
       1,
       JSON.stringify(filesObject),
       addrs.AccessListFactory,
-      listAddress
+      listAddress,
+      ZERO_ADDRESS
     )
     assert(datatokenAddress, 'datatoken not created.')
     console.log('datatoken: ', datatokenAddress)

From fe18febc82240f0716a8288b2b948e10f78b7b71 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 11 Sep 2024 13:17:40 +0300
Subject: [PATCH 30/64] Uncommented orders.

---
 test/integration/PublishEditConsume.test.ts | 86 ++++++++++-----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index 5c3654a4a..c140f6076 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -349,49 +349,49 @@ describe('Publish consume test', async () => {
     )
     assert(urlOrderTx, 'Ordering url dataset failed.')
 
-    // arwaveOrderTx = await orderAsset(
-    //   resolvedArweaveAssetDdo.id,
-    //   resolvedArweaveAssetDdo.services[0].datatokenAddress,
-    //   await consumerAccount.getAddress(),
-    //   resolvedArweaveAssetDdo.services[0].id,
-    //   0,
-    //   datatoken,
-    //   providerUrl
-    // )
-    // assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
-
-    // onchainOrderTx = await orderAsset(
-    //   resolvedOnchainAssetDdo.id,
-    //   resolvedOnchainAssetDdo.services[0].datatokenAddress,
-    //   await consumerAccount.getAddress(),
-    //   resolvedOnchainAssetDdo.services[0].id,
-    //   0,
-    //   datatoken,
-    //   providerUrl
-    // )
-    // assert(onchainOrderTx, 'Ordering onchain dataset failed.')
-
-    // ipfsOrderTx = await orderAsset(
-    //   resolvedIpfsAssetDdo.id,
-    //   resolvedIpfsAssetDdo.services[0].datatokenAddress,
-    //   await consumerAccount.getAddress(),
-    //   resolvedIpfsAssetDdo.services[0].id,
-    //   0,
-    //   datatoken,
-    //   providerUrl
-    // )
-    // assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
-
-    // grapqlOrderTx = await orderAsset(
-    //   resolvedGraphqlAssetDdo.id,
-    //   resolvedGraphqlAssetDdo.services[0].datatokenAddress,
-    //   await consumerAccount.getAddress(),
-    //   resolvedGraphqlAssetDdo.services[0].id,
-    //   0,
-    //   datatoken,
-    //   providerUrl
-    // )
-    // assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
+    arwaveOrderTx = await orderAsset(
+      resolvedArweaveAssetDdo.id,
+      resolvedArweaveAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedArweaveAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
+
+    onchainOrderTx = await orderAsset(
+      resolvedOnchainAssetDdo.id,
+      resolvedOnchainAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedOnchainAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(onchainOrderTx, 'Ordering onchain dataset failed.')
+
+    ipfsOrderTx = await orderAsset(
+      resolvedIpfsAssetDdo.id,
+      resolvedIpfsAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedIpfsAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
+
+    grapqlOrderTx = await orderAsset(
+      resolvedGraphqlAssetDdo.id,
+      resolvedGraphqlAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedGraphqlAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
   }).timeout(40000)
 
   it('Should download the datasets files', async () => {

From 874226c2bfcb0af0a335d9f278f0c17200de448c Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 11 Sep 2024 13:23:10 +0300
Subject: [PATCH 31/64] Upgrade Github actions.

---
 .github/workflows/ci.yml      | 20 ++++++++++----------
 .github/workflows/publish.yml |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce32863f0..4275573da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,11 +35,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -71,7 +71,7 @@ jobs:
           ls -la "$HOME/.ocean/ocean-contracts/artifacts/"
       - run: npm run build:metadata
       - run: npm run test:unit:cover
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: coverage/
@@ -81,11 +81,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -143,7 +143,7 @@ jobs:
         run: docker logs ocean_aquarius_1 && docker logs ocean_provider_1 && docker logs ocean_provider2_1 && docker logs ocean_computetodata_1
         if: ${{ failure() }}
       - name: Upload coverage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: coverage/
@@ -159,11 +159,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -180,7 +180,7 @@ jobs:
     if: ${{ success() && github.actor != 'dependabot[bot]' }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: coverage
 
@@ -197,7 +197,7 @@ jobs:
     needs: [test_unit, test_integration]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 91684ab5c..6bbfe6c72 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -12,7 +12,7 @@ jobs:
       NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
           registry-url: https://registry.npmjs.org/

From 7b84b3cce04ca2b184e444d8e4fee9954b48b30b Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 11 Sep 2024 13:34:01 +0300
Subject: [PATCH 32/64] Condition for calculation of template index.

---
 src/contracts/NFT.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/contracts/NFT.ts b/src/contracts/NFT.ts
index 418de55d2..c8aa8c23e 100644
--- a/src/contracts/NFT.ts
+++ b/src/contracts/NFT.ts
@@ -66,6 +66,17 @@ export class Nft extends SmartContract {
     // Create 721contract object
     const nftContract = this.getContract(nftAddress)
 
+    const { chainId } = await nftContract.provider.getNetwork()
+    const artifacts = getOceanArtifactsAdressesByChainId(chainId)
+    if (filesObject) {
+      templateIndex = await calculateActiveTemplateIndex(
+        this.signer,
+        artifacts.ERC721Factory,
+        4
+      )
+    } else {
+      templateIndex = 1
+    }
     const estGas = await nftContract.estimateGas.createERC20(
       templateIndex,
       [name, symbol],
@@ -88,13 +99,6 @@ export class Nft extends SmartContract {
         addresses.push(denyAccessList)
       }
     }
-    const { chainId } = await nftContract.provider.getNetwork()
-    const artifacts = getOceanArtifactsAdressesByChainId(chainId)
-    templateIndex = await calculateActiveTemplateIndex(
-      this.signer,
-      artifacts.ERC721Factory,
-      4
-    )
 
     console.log(`templateIndex: `, templateIndex)
 

From da25e3205b23015a80eddbcaa6075d937b73f770 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 11 Sep 2024 14:34:17 +0300
Subject: [PATCH 33/64] Specify ABI in the tests.

---
 src/contracts/NFT.ts                        |  2 --
 test/integration/PublishEditConsume.test.ts | 10 ++++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/contracts/NFT.ts b/src/contracts/NFT.ts
index c8aa8c23e..81c7eca09 100644
--- a/src/contracts/NFT.ts
+++ b/src/contracts/NFT.ts
@@ -74,8 +74,6 @@ export class Nft extends SmartContract {
         artifacts.ERC721Factory,
         4
       )
-    } else {
-      templateIndex = 1
     }
     const estGas = await nftContract.estimateGas.createERC20(
       templateIndex,
diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index c140f6076..1f8702572 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -11,8 +11,9 @@ import {
   transfer,
   amountToUnits
 } from '../../src'
-import { Files, Smartcontract } from '../../src/@types'
+import { AbiItem, Files, Smartcontract } from '../../src/@types'
 import { createAsset, orderAsset, updateAssetMetadata } from './helpers'
+import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
 
 let config: Config
 
@@ -336,7 +337,12 @@ describe('Publish consume test', async () => {
   })
 
   it('Should order the datasets', async () => {
-    datatoken = new Datatoken(consumerAccount, config.chainId)
+    datatoken = new Datatoken(
+      consumerAccount,
+      config.chainId,
+      config,
+      ERC20Template.abi as AbiItem[]
+    )
 
     urlOrderTx = await orderAsset(
       resolvedUrlAssetDdo.id,

From 73988cdc3d835db6a2646ac8e2d7b2738701bab6 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 11 Sep 2024 15:34:40 +0300
Subject: [PATCH 34/64] Test w soulbound contracts.

---
 src/contracts/AccessList.ts              |  4 ++--
 src/contracts/AccessListFactory.ts       | 22 ++++++++++++++++------
 src/contracts/NFT.ts                     |  5 +++--
 test/scripts/SapphireIntegration.test.ts | 11 +++++++----
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index 9a9b4767c..000719445 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -170,7 +170,7 @@ export class AccessListContract extends SmartContract {
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.functions.transferOwnership,
+      accessListContract.transferOwnership,
       newOwner
     )
     return <ReceiptOrEstimate<G>>trxReceipt
@@ -194,7 +194,7 @@ export class AccessListContract extends SmartContract {
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.functions.renounceOwnership
+      accessListContract.renounceOwnership
     )
     return <ReceiptOrEstimate<G>>trxReceipt
   }
diff --git a/src/contracts/AccessListFactory.ts b/src/contracts/AccessListFactory.ts
index 54ff92f24..f44df52cc 100644
--- a/src/contracts/AccessListFactory.ts
+++ b/src/contracts/AccessListFactory.ts
@@ -40,22 +40,22 @@ export class AccesslistFactory extends SmartContractWithAddress {
    */
   public async deployAccessListContract<G extends boolean = false>(
     nameAccessList: string,
-    symbolAccessLis: string,
+    symbolAccessList: string,
     tokenURI: string[],
     transferable: boolean,
     owner: string,
     user: string[],
     estimateGas?: G
   ): Promise<G extends false ? string : BigNumber> {
-    if (!nameAccessList || !symbolAccessLis) {
+    if (!nameAccessList || !symbolAccessList) {
       const { name, symbol } = generateDtName()
       nameAccessList = name
-      symbolAccessLis = symbol
+      symbolAccessList = symbol
     }
-    if (!transferable) transferable = true
+    if (!transferable) transferable = false
     const estGas = await this.contract.estimateGas.deployAccessListContract(
       nameAccessList,
-      symbolAccessLis,
+      symbolAccessList,
       transferable,
       owner,
       user,
@@ -69,7 +69,7 @@ export class AccesslistFactory extends SmartContractWithAddress {
       this.config?.gasFeeMultiplier,
       this.contract.deployAccessListContract,
       nameAccessList,
-      symbolAccessLis,
+      symbolAccessList,
       transferable,
       owner,
       user,
@@ -99,6 +99,16 @@ export class AccesslistFactory extends SmartContractWithAddress {
     return isSoulbound
   }
 
+  /**
+   *  Is a list contract deployed?
+   * @param {String} contractAddress list contract address
+   * @return {Promise<boolean>} is deployed?
+   */
+  public async isDeployed(contractAddress: string): Promise<boolean> {
+    const isDeployed = await this.contract.isDeployed(contractAddress)
+    return isDeployed
+  }
+
   /**
    * changeTemplateAddress - only factory Owner
    * @param {String} owner caller address
diff --git a/src/contracts/NFT.ts b/src/contracts/NFT.ts
index 81c7eca09..1ed3e2e6e 100644
--- a/src/contracts/NFT.ts
+++ b/src/contracts/NFT.ts
@@ -89,9 +89,9 @@ export class Nft extends SmartContract {
 
     const addresses = [minter, paymentCollector, mpFeeAddress, feeToken]
     if (accessListContract) {
-      addresses.push(accessListContract)
+      addresses.push(accessListContract.toLowerCase())
       if (allowAccessList) {
-        addresses.push(allowAccessList)
+        addresses.push(allowAccessList.toLowerCase())
       }
       if (denyAccessList) {
         addresses.push(denyAccessList)
@@ -99,6 +99,7 @@ export class Nft extends SmartContract {
     }
 
     console.log(`templateIndex: `, templateIndex)
+    console.log(`addresses: `, addresses)
 
     const tx = await sendTx(
       estGas,
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index 9df8bbbb3..abce4be66 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -1,6 +1,6 @@
 import * as sapphire from '@oasisprotocol/sapphire-paratime'
 import addresses from '@oceanprotocol/contracts/addresses/address.json'
-import { ethers, Signer } from 'ethers'
+import { ethers } from 'ethers'
 import { AccesslistFactory } from '../../src/contracts/AccessListFactory'
 import { AccessListContract } from '../../src/contracts/AccessList'
 import { NftFactory } from '../../src/contracts/NFTFactory'
@@ -73,13 +73,17 @@ describe('Sapphire tests', async () => {
       'AllowList',
       'ALLOW',
       ['https://oceanprotocol.com/nft/'],
-      true,
+      false,
       await wallet.getAddress(),
       [await wallet.getAddress(), ZERO_ADDRESS]
     )
     assert(listAddress !== null)
     console.log('list address: ', listAddress)
     accessListToken = new AccessListContract(wallet, 23295)
+    console.log(
+      'deployed?: ',
+      await (factoryContract as AccesslistFactory).isDeployed(listAddress)
+    )
   })
   it('Create ERC721 factory', () => {
     nftFactory = new NftFactory(addrs.ERC721Factory, wallet, 23295)
@@ -107,8 +111,7 @@ describe('Sapphire tests', async () => {
       1,
       JSON.stringify(filesObject),
       addrs.AccessListFactory,
-      listAddress,
-      ZERO_ADDRESS
+      listAddress
     )
     assert(datatokenAddress, 'datatoken not created.')
     console.log('datatoken: ', datatokenAddress)

From 5e96dda805b23490f5b3914fa24086688d899a24 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 11 Sep 2024 16:00:26 +0300
Subject: [PATCH 35/64] Fixed wallet address for test.

---
 src/contracts/AccessListFactory.ts       |  3 +--
 src/contracts/Datatoken4.ts              | 15 +-----------
 test/scripts/SapphireIntegration.test.ts | 31 +++++++++++-------------
 3 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/src/contracts/AccessListFactory.ts b/src/contracts/AccessListFactory.ts
index f44df52cc..f0a00ee93 100644
--- a/src/contracts/AccessListFactory.ts
+++ b/src/contracts/AccessListFactory.ts
@@ -42,7 +42,7 @@ export class AccesslistFactory extends SmartContractWithAddress {
     nameAccessList: string,
     symbolAccessList: string,
     tokenURI: string[],
-    transferable: boolean,
+    transferable: boolean = false,
     owner: string,
     user: string[],
     estimateGas?: G
@@ -52,7 +52,6 @@ export class AccesslistFactory extends SmartContractWithAddress {
       nameAccessList = name
       symbolAccessList = symbol
     }
-    if (!transferable) transferable = false
     const estGas = await this.contract.estimateGas.deployAccessListContract(
       nameAccessList,
       symbolAccessList,
diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index 682fd3b3b..ab2c24ef6 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -44,19 +44,6 @@ export class Datatoken4 extends Datatoken {
    */
   public async getAllowlistContract(dtAddress: string): Promise<string> {
     const dtContract = this.getContract(dtAddress, this.getDefaultAbi())
-    // const dtContract = new ethers.Contract(dtAddress, ERC20Template4.abi, this.signer)
-    // const factory = new ethers.ContractFactory(
-    //   ERC20Template4.abi,
-    //   ERC20Template4.bytecode,
-    //   this.signer
-    // )
-
-    // const contract = await factory.deploy()
-
-    // await contract.deployed()
-    // contract.attach(dtAddress)
-
-    console.log(await dtContract.getId())
     const allowList = await dtContract.getAllowListContract()
     return allowList
   }
@@ -67,7 +54,7 @@ export class Datatoken4 extends Datatoken {
    * @return {Promise<string>}
    */
   public async getDenyListContract(dtAddress: string): Promise<string> {
-    const dtContract = this.getContract(dtAddress)
+    const dtContract = this.getContract(dtAddress, this.getDefaultAbi())
     const denyList = await dtContract.getDenyListContract()
     return denyList
   }
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index abce4be66..fee64c0b0 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -80,9 +80,9 @@ describe('Sapphire tests', async () => {
     assert(listAddress !== null)
     console.log('list address: ', listAddress)
     accessListToken = new AccessListContract(wallet, 23295)
-    console.log(
-      'deployed?: ',
-      await (factoryContract as AccesslistFactory).isDeployed(listAddress)
+    assert(
+      (await (factoryContract as AccesslistFactory).isDeployed(listAddress)) === true,
+      'access list not deployed'
     )
   })
   it('Create ERC721 factory', () => {
@@ -93,13 +93,12 @@ describe('Sapphire tests', async () => {
   it('Create ERC721 contract', async () => {
     nftData.owner = await wallet.getAddress()
     nftAddress = await (nftFactory as NftFactory).createNFT(nftData)
-    console.log('nftAddress: ', nftAddress)
     nftToken = new Nft(wallet, 23295)
   })
   it('Create Datatoken4 contract', async () => {
     datatokenAddress = await (nftToken as Nft).createDatatoken(
       nftAddress,
-      await walletWrapped.getAddress(),
+      await wallet.getAddress(),
       await wallet.getAddress(),
       await wallet.getAddress(),
       await wallet.getAddress(),
@@ -114,9 +113,14 @@ describe('Sapphire tests', async () => {
       listAddress
     )
     assert(datatokenAddress, 'datatoken not created.')
-    console.log('datatoken: ', datatokenAddress)
   })
   it('Get Allow Access List', async () => {
+    const address = await wallet.getAddress()
+    assert(
+      (await (datatoken as Datatoken4).isDatatokenDeployer(datatokenAddress, address)) ===
+        true,
+      'no ERC20 deployer'
+    )
     datatoken = new Datatoken4(
       wallet,
       ethers.utils.toUtf8Bytes(JSON.stringify(filesObject)),
@@ -129,17 +133,10 @@ describe('Sapphire tests', async () => {
         true,
       'datatoken not deployed'
     )
-    // assert(
-    //   (await (datatoken as Datatoken4).getAllowlistContract(datatokenAddress)) ===
-    //     listAddress,
-    //   'no access list attached to datatoken.'
-    // )
-    const address = await wallet.getAddress()
-    console.log(
-      await (datatoken as Datatoken4).isDatatokenDeployer(datatokenAddress, address)
+    assert(
+      (await (datatoken as Datatoken4).getAllowlistContract(datatokenAddress)) ===
+        listAddress,
+      'no access list attached to datatoken.'
     )
-    console.log(await (datatoken as Datatoken4).getAllowlistContract(datatokenAddress))
-
-    console.log(await (datatoken as Datatoken4).getId(datatokenAddress))
   })
 })

From 2670863853368842db4cd62f79d26063291967c6 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Wed, 11 Sep 2024 16:26:08 +0300
Subject: [PATCH 36/64] Add deny list check.

---
 src/contracts/Datatoken4.ts              |  2 +-
 src/contracts/NFT.ts                     |  9 +++++----
 test/scripts/SapphireIntegration.test.ts | 20 +++++++++++++-------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index ab2c24ef6..be302c584 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -53,7 +53,7 @@ export class Datatoken4 extends Datatoken {
    * @param dtAddress datatoken address
    * @return {Promise<string>}
    */
-  public async getDenyListContract(dtAddress: string): Promise<string> {
+  public async getDenylistContract(dtAddress: string): Promise<string> {
     const dtContract = this.getContract(dtAddress, this.getDefaultAbi())
     const denyList = await dtContract.getDenyListContract()
     return denyList
diff --git a/src/contracts/NFT.ts b/src/contracts/NFT.ts
index 1ed3e2e6e..d9a42c013 100644
--- a/src/contracts/NFT.ts
+++ b/src/contracts/NFT.ts
@@ -1,6 +1,6 @@
 import { BigNumber, ethers, Signer } from 'ethers'
 import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
-import { generateDtName, sendTx, getEventFromTx } from '../utils'
+import { generateDtName, sendTx, getEventFromTx, ZERO_ADDRESS } from '../utils'
 import {
   MetadataProof,
   MetadataAndTokenURI,
@@ -92,15 +92,16 @@ export class Nft extends SmartContract {
       addresses.push(accessListContract.toLowerCase())
       if (allowAccessList) {
         addresses.push(allowAccessList.toLowerCase())
+      } else {
+        addresses.push(ZERO_ADDRESS)
       }
       if (denyAccessList) {
         addresses.push(denyAccessList)
+      } else {
+        addresses.push(ZERO_ADDRESS)
       }
     }
 
-    console.log(`templateIndex: `, templateIndex)
-    console.log(`addresses: `, addresses)
-
     const tx = await sendTx(
       estGas,
       this.signer,
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index fee64c0b0..88ab446a4 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -78,7 +78,6 @@ describe('Sapphire tests', async () => {
       [await wallet.getAddress(), ZERO_ADDRESS]
     )
     assert(listAddress !== null)
-    console.log('list address: ', listAddress)
     accessListToken = new AccessListContract(wallet, 23295)
     assert(
       (await (factoryContract as AccesslistFactory).isDeployed(listAddress)) === true,
@@ -116,18 +115,18 @@ describe('Sapphire tests', async () => {
   })
   it('Get Allow Access List', async () => {
     const address = await wallet.getAddress()
-    assert(
-      (await (datatoken as Datatoken4).isDatatokenDeployer(datatokenAddress, address)) ===
-        true,
-      'no ERC20 deployer'
-    )
     datatoken = new Datatoken4(
-      wallet,
+      walletWrapped,
       ethers.utils.toUtf8Bytes(JSON.stringify(filesObject)),
       23295,
       config,
       ERC20Template4.abi as AbiItem[]
     )
+    assert(
+      (await (datatoken as Datatoken4).isDatatokenDeployer(datatokenAddress, address)) ===
+        true,
+      'no ERC20 deployer'
+    )
     assert(
       (await (nftToken as Nft).isDatatokenDeployed(nftAddress, datatokenAddress)) ===
         true,
@@ -139,4 +138,11 @@ describe('Sapphire tests', async () => {
       'no access list attached to datatoken.'
     )
   })
+  it('Get Deny Access List', async () => {
+    assert(
+      (await (datatoken as Datatoken4).getDenylistContract(datatokenAddress)) ===
+        ZERO_ADDRESS,
+      'no access list attached to datatoken.'
+    )
+  })
 })

From f88cdb0907fa4f2f8e85be4349885a39409ef7fa Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 12 Sep 2024 00:22:26 +0300
Subject: [PATCH 37/64] Store access list address within the constructor. Added
 tests.

---
 src/contracts/AccessList.ts              | 73 +++++++++++-------------
 src/contracts/Datatoken4.ts              |  3 +-
 test/scripts/SapphireIntegration.test.ts | 59 ++++++++++++++++++-
 3 files changed, 92 insertions(+), 43 deletions(-)

diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index 000719445..f66a91626 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -3,9 +3,9 @@ import AccessList from '@oceanprotocol/contracts/artifacts/contracts/accesslists
 import { sendTx } from '../utils'
 import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { Config } from '../config'
-import { SmartContract } from './SmartContract'
+import { SmartContractWithAddress } from './SmartContractWithAddress'
 
-export class AccessListContract extends SmartContract {
+export class AccessListContract extends SmartContractWithAddress {
   public abiEnterprise: AbiItem[]
 
   getDefaultAbi() {
@@ -14,6 +14,7 @@ export class AccessListContract extends SmartContract {
 
   /**
    * Instantiate AccessList class
+   * @param {string} address The contract address.
    * @param {Signer} signer The signer object.
    * @param {string | number} [network] Network id or name
    * @param {Config} [config] The configuration object.
@@ -21,12 +22,13 @@ export class AccessListContract extends SmartContract {
    * @param {AbiItem[]} abiEnterprise Enterprise ABI array of the smart contract
    */
   constructor(
+    address: string,
     signer: Signer,
     network?: string | number,
     config?: Config,
     abi?: AbiItem[]
   ) {
-    super(signer, network, config, abi)
+    super(address, signer, network, config, abi)
     this.abi = abi || this.getDefaultAbi()
   }
 
@@ -34,61 +36,64 @@ export class AccessListContract extends SmartContract {
    * Get Token Uri
    * @return {Promise<string>} Token URI
    */
-  public async getTokenUri(accessListAddress: string, tokenId: number): Promise<string> {
-    const accessListContract = this.getContract(accessListAddress)
-    return await accessListContract.tokenURI(tokenId)
+  public async getTokenUri(tokenId: number): Promise<string> {
+    return await this.contract.tokenURI(tokenId)
   }
 
   /**
    * Get Owner
    * @return {Promise<string>} Owner
    */
-  public async getOwner(accessListAddress: string): Promise<string> {
-    const accessListContract = this.getContract(accessListAddress)
-    return await accessListContract.owner()
+  public async getOwner(): Promise<string> {
+    return await this.contract.owner()
   }
 
   /**
    * Get Name of Access list
    * @return {Promise<string>} Name
    */
-  public async getName(accessListAddress: string): Promise<string> {
-    const accessListContract = this.getContract(accessListAddress)
-    return await accessListContract.name()
+  public async getName(): Promise<string> {
+    return await this.contract.name()
   }
 
   /**
    * Get Symbol of Access list
    * @return {Promise<string>} Symbol
    */
-  public async getSymbol(accessListAddress: string): Promise<string> {
-    const accessListContract = this.getContract(accessListAddress)
-    return await accessListContract.symbol()
+  public async getSymbol(): Promise<string> {
+    return await this.contract.symbol()
+  }
+
+  /**
+   * Get Address Balance for access list token
+   * @param {String} address user adress
+   * @return {Promise<String>} balance  Number of datatokens. Will be converted from wei
+   */
+  public async balance(address: string): Promise<string> {
+    const balance = await this.contract.balanceOf(address)
+    return await this.unitsToAmount(null, balance, 18)
   }
 
   /**
    * Add address to access list
-   * @param {String} accessListAddress AccessList contract address
    * @param {String} user Minter address
    * @param {String} tokenUri tokenURI
    * @param {Boolean} estimateGas if True, return gas estimate
    * @return {Promise<ReceiptOrEstimate>} transactionId
    */
   public async mint<G extends boolean = false>(
-    accessListAddress: string,
     user: string,
     tokenUri: string,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
-    const accessListContract = this.getContract(accessListAddress)
-    const estGas = await accessListContract.estimateGas.mint(user, tokenUri)
+    const estGas = await this.contract.estimateGas.mint(user, tokenUri)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
 
     const trxReceipt = await sendTx(
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.functions.mint,
+      this.contract.mint,
       user,
       tokenUri
     )
@@ -97,27 +102,24 @@ export class AccessListContract extends SmartContract {
 
   /**
    * Batch add addresses to the access list
-   * @param {String} accessListAddress AccessList contract address
    * @param {String} users Minter addresses
    * @param {String} tokenUris tokenURI
    * @param {Boolean} estimateGas if True, return gas estimate
    * @return {Promise<ReceiptOrEstimate>} transactionId
    */
   public async batchMint<G extends boolean = false>(
-    accessListAddress: string,
     users: Array<string>,
     tokenUris: Array<string>,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
-    const accessListContract = this.getContract(accessListAddress)
-    const estGas = await accessListContract.estimateGas.batchMint(users, tokenUris)
+    const estGas = await this.contract.estimateGas.batchMint(users, tokenUris)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
 
     const trxReceipt = await sendTx(
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.functions.batchMint,
+      this.contract.batchMint,
       users,
       tokenUris
     )
@@ -126,25 +128,22 @@ export class AccessListContract extends SmartContract {
 
   /**
    * Delete address from access list
-   * @param {String} accessListAddress AccessList contract address
    * @param {Number} tokenId token ID
    * @param {Boolean} estimateGas if True, return gas estimate
    * @return {Promise<ReceiptOrEstimate>} transactionId
    */
   public async burn<G extends boolean = false>(
-    accessListAddress: string,
     tokenId: number,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
-    const accessListContract = this.getContract(accessListAddress)
-    const estGas = await accessListContract.estimateGas.burn(tokenId)
+    const estGas = await this.contract.estimateGas.burn(tokenId)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
 
     const trxReceipt = await sendTx(
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.functions.burn,
+      this.contract.burn,
       tokenId
     )
     return <ReceiptOrEstimate<G>>trxReceipt
@@ -152,25 +151,22 @@ export class AccessListContract extends SmartContract {
 
   /**
    * Transfer Ownership of an access list, called by owner of access list
-   * @param {String} accessListAddress AccessList contract address
    * @param {Number} newOwner new owner of the access list
    * @param {Boolean} estimateGas if True, return gas estimate
    * @return {Promise<ReceiptOrEstimate>} transactionId
    */
   public async transferOwnership<G extends boolean = false>(
-    accessListAddress: string,
     newOwner: string,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
-    const accessListContract = this.getContract(accessListAddress)
-    const estGas = await accessListContract.estimateGas.transferOwnership(newOwner)
+    const estGas = await this.contract.estimateGas.transferOwnership(newOwner)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
 
     const trxReceipt = await sendTx(
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.transferOwnership,
+      this.contract.transferOwnership,
       newOwner
     )
     return <ReceiptOrEstimate<G>>trxReceipt
@@ -178,23 +174,20 @@ export class AccessListContract extends SmartContract {
 
   /**
    * Renounce Ownership of an access list, called by owner of access list
-   * @param {String} accessListAddress AccessList contract address
    * @param {Boolean} estimateGas if True, return gas estimate
    * @return {Promise<ReceiptOrEstimate>} transactionId
    */
   public async renounceOwnership<G extends boolean = false>(
-    accessListAddress: string,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
-    const accessListContract = this.getContract(accessListAddress)
-    const estGas = await accessListContract.estimateGas.renounceOwnership()
+    const estGas = await this.contract.estimateGas.renounceOwnership()
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
 
     const trxReceipt = await sendTx(
       estGas,
       this.signer,
       this.config?.gasFeeMultiplier,
-      accessListContract.renounceOwnership
+      this.contract.renounceOwnership
     )
     return <ReceiptOrEstimate<G>>trxReceipt
   }
diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index be302c584..da8c068c8 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -1,6 +1,6 @@
 /* eslint-disable lines-between-class-members */
 import { Datatoken } from './Datatoken'
-import { Bytes, Signer, ethers } from 'ethers'
+import { Bytes, Signer } from 'ethers'
 import ERC20Template4 from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template4.sol/ERC20Template4.json'
 import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { AccessListContract } from './AccessList'
@@ -30,7 +30,6 @@ export class Datatoken4 extends Datatoken {
     abi?: AbiItem[]
   ) {
     super(signer, network, config, abi)
-    this.accessList = new AccessListContract(this.signer)
     this.abi = this.getDefaultAbi()
     // Wrap signer's address for encrypted data tx
     this.signer = sapphire.wrap(signer)
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index 88ab446a4..81af8f6dc 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -19,6 +19,8 @@ describe('Sapphire tests', async () => {
     new ethers.Wallet(process.env.PRIVATE_KEY, provider)
   )
 
+  const consumer = new ethers.Wallet(process.env.PRIVATE_KEY_CONSUMER, provider)
+
   const addrs: any = addresses.oasis_saphire_testnet
   const nftData: NftCreateData = {
     name: 'NFTName',
@@ -31,7 +33,9 @@ describe('Sapphire tests', async () => {
 
   let factoryContract: any
   let listAddress: string
+  let denyListAddress: string
   let accessListToken: any
+  let denyAccessListToken: any
 
   let nftFactory: any
   let nftAddress: string
@@ -78,7 +82,7 @@ describe('Sapphire tests', async () => {
       [await wallet.getAddress(), ZERO_ADDRESS]
     )
     assert(listAddress !== null)
-    accessListToken = new AccessListContract(wallet, 23295)
+    accessListToken = new AccessListContract(listAddress, wallet, 23295)
     assert(
       (await (factoryContract as AccesslistFactory).isDeployed(listAddress)) === true,
       'access list not deployed'
@@ -145,4 +149,57 @@ describe('Sapphire tests', async () => {
       'no access list attached to datatoken.'
     )
   })
+  it('Create Deny Access List', async () => {
+    denyListAddress = await (
+      factoryContract as AccesslistFactory
+    ).deployAccessListContract(
+      'DenyList',
+      'DENY',
+      ['https://oceanprotocol.com/nft/'],
+      false,
+      await consumer.getAddress(),
+      [await consumer.getAddress(), ZERO_ADDRESS]
+    )
+    assert(denyListAddress !== null, 'deny list not created')
+    assert(
+      (await (factoryContract as AccesslistFactory).isDeployed(denyListAddress)) === true,
+      'access list not deployed'
+    )
+  })
+  it('setDenyList for ERC20 Template 4', async () => {
+    const tx = await (datatoken as Datatoken4).setDenyListContract(
+      datatokenAddress,
+      denyListAddress,
+      await wallet.getAddress()
+    )
+    await tx.wait()
+    assert(
+      (await (datatoken as Datatoken4).getDenylistContract(datatokenAddress)) ===
+        denyListAddress,
+      'no access list attached to datatoken.'
+    )
+  })
+  it('delete address from deny list', async () => {
+    denyAccessListToken = new AccessListContract(denyListAddress, wallet, 23295)
+    const tx = await (denyAccessListToken as AccessListContract).burn(4)
+    await tx.wait()
+    assert(
+      (await (datatoken as Datatoken4).getDenylistContract(datatokenAddress)) ===
+        ZERO_ADDRESS,
+      'no access list attached to datatoken.'
+    )
+  })
+  it('add address from allow list', async () => {
+    const tx = await (accessListToken as AccessListContract).mint(
+      await consumer.getAddress(),
+      'https://oceanprotocol.com/nft/'
+    )
+    await tx.wait()
+    assert(
+      ((await (accessListToken as AccessListContract).balance(
+        await consumer.getAddress()
+      )) === '1.0',
+      'address of consumer not added.')
+    )
+  })
 })

From 6fe2e0ba499b2cf3d80ee3d5a99a46df813a3094 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 12 Sep 2024 12:54:28 +0300
Subject: [PATCH 38/64] add debug log.

---
 test/integration/helpers.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/helpers.ts b/test/integration/helpers.ts
index e3e097c81..fbbf9267a 100644
--- a/test/integration/helpers.ts
+++ b/test/integration/helpers.ts
@@ -192,6 +192,7 @@ export async function orderAsset(
     providerData: initializeData.providerFee.providerData,
     validUntil: initializeData.providerFee.validUntil
   }
+  console.log('provider fee: ', providerFees)
 
   // make the payment
   const tx = await datatoken.startOrder(

From 2fdaed9f4bd0894e9ce44b2eaeb2b4449e2361c9 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 12 Sep 2024 14:18:37 +0300
Subject: [PATCH 39/64] Create new datatoken for consumer.

---
 test/integration/PublishEditConsume.test.ts | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index 1f8702572..b45214c29 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -19,6 +19,7 @@ let config: Config
 
 let aquarius: Aquarius
 let datatoken: Datatoken
+let datatokenConsumer: Datatoken
 let providerUrl: string
 let consumerAccount: Signer
 let publisherAccount: Signer
@@ -337,12 +338,7 @@ describe('Publish consume test', async () => {
   })
 
   it('Should order the datasets', async () => {
-    datatoken = new Datatoken(
-      consumerAccount,
-      config.chainId,
-      config,
-      ERC20Template.abi as AbiItem[]
-    )
+    datatokenConsumer = new Datatoken(consumerAccount, config.chainId)
 
     urlOrderTx = await orderAsset(
       resolvedUrlAssetDdo.id,
@@ -350,7 +346,7 @@ describe('Publish consume test', async () => {
       await consumerAccount.getAddress(),
       resolvedUrlAssetDdo.services[0].id,
       0,
-      datatoken,
+      datatokenConsumer,
       providerUrl
     )
     assert(urlOrderTx, 'Ordering url dataset failed.')
@@ -361,7 +357,7 @@ describe('Publish consume test', async () => {
       await consumerAccount.getAddress(),
       resolvedArweaveAssetDdo.services[0].id,
       0,
-      datatoken,
+      datatokenConsumer,
       providerUrl
     )
     assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
@@ -372,7 +368,7 @@ describe('Publish consume test', async () => {
       await consumerAccount.getAddress(),
       resolvedOnchainAssetDdo.services[0].id,
       0,
-      datatoken,
+      datatokenConsumer,
       providerUrl
     )
     assert(onchainOrderTx, 'Ordering onchain dataset failed.')
@@ -383,7 +379,7 @@ describe('Publish consume test', async () => {
       await consumerAccount.getAddress(),
       resolvedIpfsAssetDdo.services[0].id,
       0,
-      datatoken,
+      datatokenConsumer,
       providerUrl
     )
     assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
@@ -394,7 +390,7 @@ describe('Publish consume test', async () => {
       await consumerAccount.getAddress(),
       resolvedGraphqlAssetDdo.services[0].id,
       0,
-      datatoken,
+      datatokenConsumer,
       providerUrl
     )
     assert(grapqlOrderTx, 'Ordering graphql dataset failed.')

From 74ddb7064b63b7339b367426cc754be26c1f7e36 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 12 Sep 2024 16:17:25 +0300
Subject: [PATCH 40/64] distinguish coverage reports.

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4275573da..079f0040d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,7 +73,7 @@ jobs:
       - run: npm run test:unit:cover
       - uses: actions/upload-artifact@v4
         with:
-          name: coverage
+          name: coverage-unit
           path: coverage/
 
   test_integration:
@@ -145,7 +145,7 @@ jobs:
       - name: Upload coverage
         uses: actions/upload-artifact@v4
         with:
-          name: coverage
+          name: coverage-integration
           path: coverage/
 
   build:

From 42bbd15dfe315add71df38de023f5f0e22276dc5 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 12 Sep 2024 16:39:57 +0300
Subject: [PATCH 41/64] Fix coverage download report.

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 079f0040d..560effb24 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -182,7 +182,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v4
         with:
-          name: coverage
+          name: coverage-unit
+      - uses: actions/download-artifact@v4
+        with:
+          name: coverage-integration
 
       - uses: paambaati/codeclimate-action@v2.7.5
         env:

From 76c2539a46d129d1d501ff715cd4eabc57a72aa7 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Fri, 13 Sep 2024 13:41:10 +0300
Subject: [PATCH 42/64] cleanup. added tests.

---
 test/integration/helpers.ts              |  1 -
 test/scripts/SapphireIntegration.test.ts | 22 ++++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/test/integration/helpers.ts b/test/integration/helpers.ts
index fbbf9267a..e3e097c81 100644
--- a/test/integration/helpers.ts
+++ b/test/integration/helpers.ts
@@ -192,7 +192,6 @@ export async function orderAsset(
     providerData: initializeData.providerFee.providerData,
     validUntil: initializeData.providerFee.validUntil
   }
-  console.log('provider fee: ', providerFees)
 
   // make the payment
   const tx = await datatoken.startOrder(
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index 81af8f6dc..3e3d0c548 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -179,8 +179,21 @@ describe('Sapphire tests', async () => {
       'no access list attached to datatoken.'
     )
   })
-  it('delete address from deny list', async () => {
+  it('add address from deny list', async () => {
     denyAccessListToken = new AccessListContract(denyListAddress, wallet, 23295)
+    const tx = await (denyAccessListToken as AccessListContract).mint(
+      await consumer.getAddress(),
+      'https://oceanprotocol.com/nft/'
+    )
+    await tx.wait()
+    assert(
+      ((await (denyAccessListToken as AccessListContract).balance(
+        await consumer.getAddress()
+      )) === '1.0',
+      'address of consumer not added.')
+    )
+  })
+  it('delete address from deny list', async () => {
     const tx = await (denyAccessListToken as AccessListContract).burn(4)
     await tx.wait()
     assert(
@@ -189,7 +202,7 @@ describe('Sapphire tests', async () => {
       'no access list attached to datatoken.'
     )
   })
-  it('add address from allow list', async () => {
+  it('add address to allow list', async () => {
     const tx = await (accessListToken as AccessListContract).mint(
       await consumer.getAddress(),
       'https://oceanprotocol.com/nft/'
@@ -202,4 +215,9 @@ describe('Sapphire tests', async () => {
       'address of consumer not added.')
     )
   })
+  it('add address from allow list', async () => {
+    accessListToken = new AccessListContract(listAddress, consumer, 23295)
+    const tokenUri = await (accessListToken as AccessListContract).getTokenUri(4)
+    assert(tokenUri === 'https://oceanprotocol.com/nft/', 'token uri not present.')
+  })
 })

From c3f50bcb8d2040abc218fb3a2e70248f237072e4 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Sun, 15 Sep 2024 17:31:48 +0300
Subject: [PATCH 43/64] fix tests.

---
 src/contracts/AccessList.ts              |  8 ++++++
 test/scripts/SapphireIntegration.test.ts | 34 +++++++++++++++++-------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index f66a91626..9ebfb50cb 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -48,6 +48,14 @@ export class AccessListContract extends SmartContractWithAddress {
     return await this.contract.owner()
   }
 
+  /**
+   * Get Id
+   * @return {Promise<string>} Id
+   */
+  public async getId(): Promise<number> {
+    return await this.contract.getId()
+  }
+
   /**
    * Get Name of Access list
    * @return {Promise<string>} Name
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index 3e3d0c548..276e5a873 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -9,6 +9,7 @@ import { assert } from 'console'
 import { Datatoken4 } from '../../src/contracts/Datatoken4'
 import { AbiItem, Config, Nft, NftCreateData } from '../../src'
 import ERC20Template4 from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template4.sol/ERC20Template4.json'
+import { getEventFromTx } from '../../src/utils'
 
 describe('Sapphire tests', async () => {
   const provider = sapphire.wrap(
@@ -44,6 +45,8 @@ describe('Sapphire tests', async () => {
   let datatokenAddress: string
   let datatoken: any
 
+  let tokenIdAddressAdded: number
+
   const filesObject: any = [
     {
       url: 'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
@@ -157,8 +160,8 @@ describe('Sapphire tests', async () => {
       'DENY',
       ['https://oceanprotocol.com/nft/'],
       false,
-      await consumer.getAddress(),
-      [await consumer.getAddress(), ZERO_ADDRESS]
+      await wallet.getAddress(),
+      [await wallet.getAddress(), ZERO_ADDRESS]
     )
     assert(denyListAddress !== null, 'deny list not created')
     assert(
@@ -182,32 +185,43 @@ describe('Sapphire tests', async () => {
   it('add address from deny list', async () => {
     denyAccessListToken = new AccessListContract(denyListAddress, wallet, 23295)
     const tx = await (denyAccessListToken as AccessListContract).mint(
-      await consumer.getAddress(),
+      await wallet.getAddress(),
       'https://oceanprotocol.com/nft/'
     )
-    await tx.wait()
+    const txReceipt = await tx.wait()
+    const event = getEventFromTx(txReceipt, 'AddressAdded')
+    tokenIdAddressAdded = event.args[1]
+    assert(event, 'Cannot find AddressAdded event')
     assert(
       ((await (denyAccessListToken as AccessListContract).balance(
-        await consumer.getAddress()
+        await wallet.getAddress()
       )) === '1.0',
       'address of consumer not added.')
     )
   })
   it('delete address from deny list', async () => {
-    const tx = await (denyAccessListToken as AccessListContract).burn(4)
+    const tx = await (denyAccessListToken as AccessListContract).burn(tokenIdAddressAdded)
     await tx.wait()
     assert(
       (await (datatoken as Datatoken4).getDenylistContract(datatokenAddress)) ===
-        ZERO_ADDRESS,
+        denyListAddress,
       'no access list attached to datatoken.'
     )
+    assert(
+      ((await (denyAccessListToken as AccessListContract).balance(
+        await wallet.getAddress()
+      )) === '0.0',
+      'address of consumer not removed.')
+    )
   })
   it('add address to allow list', async () => {
     const tx = await (accessListToken as AccessListContract).mint(
       await consumer.getAddress(),
       'https://oceanprotocol.com/nft/'
     )
-    await tx.wait()
+    const txReceipt = await tx.wait()
+    const event = getEventFromTx(txReceipt, 'AddressAdded')
+    tokenIdAddressAdded = event.args[1]
     assert(
       ((await (accessListToken as AccessListContract).balance(
         await consumer.getAddress()
@@ -217,7 +231,9 @@ describe('Sapphire tests', async () => {
   })
   it('add address from allow list', async () => {
     accessListToken = new AccessListContract(listAddress, consumer, 23295)
-    const tokenUri = await (accessListToken as AccessListContract).getTokenUri(4)
+    const tokenUri = await (accessListToken as AccessListContract).getTokenUri(
+      tokenIdAddressAdded
+    )
     assert(tokenUri === 'https://oceanprotocol.com/nft/', 'token uri not present.')
   })
 })

From 4b1f4c4236c61484ed5d61068977cbf10a9a258a Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Mon, 16 Sep 2024 12:15:24 +0300
Subject: [PATCH 44/64] Remove unused imports.

---
 src/contracts/NFT.ts                        | 2 +-
 test/integration/PublishEditConsume.test.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/contracts/NFT.ts b/src/contracts/NFT.ts
index d9a42c013..a951192a0 100644
--- a/src/contracts/NFT.ts
+++ b/src/contracts/NFT.ts
@@ -1,4 +1,4 @@
-import { BigNumber, ethers, Signer } from 'ethers'
+import { BigNumber, ethers } from 'ethers'
 import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
 import { generateDtName, sendTx, getEventFromTx, ZERO_ADDRESS } from '../utils'
 import {
diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index b45214c29..3f8a911d4 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -11,9 +11,8 @@ import {
   transfer,
   amountToUnits
 } from '../../src'
-import { AbiItem, Files, Smartcontract } from '../../src/@types'
+import { Files, Smartcontract } from '../../src/@types'
 import { createAsset, orderAsset, updateAssetMetadata } from './helpers'
-import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
 
 let config: Config
 

From c6f5657d517f00e7936709510bc387c7a49d1bd5 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Mon, 16 Sep 2024 12:37:58 +0300
Subject: [PATCH 45/64] Increase timeout.

---
 test/integration/PublishEditConsume.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index 3f8a911d4..5c9c779ef 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -393,7 +393,7 @@ describe('Publish consume test', async () => {
       providerUrl
     )
     assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
-  }).timeout(40000)
+  }).timeout(70000)
 
   it('Should download the datasets files', async () => {
     const urlDownloadUrl = await ProviderInstance.getDownloadUrl(

From a3d83465d099237bccce2e4d3591be0cc0592246 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Mon, 16 Sep 2024 13:47:03 +0300
Subject: [PATCH 46/64] Added test with encrypted tx.

---
 src/contracts/Datatoken4.ts              | 18 ++++++++++++------
 test/scripts/SapphireIntegration.test.ts | 23 ++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index da8c068c8..e1e7330af 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -36,6 +36,10 @@ export class Datatoken4 extends Datatoken {
     this.fileObject = fileObject
   }
 
+  public setFileObj(fileObj: Bytes): void {
+    this.fileObject = fileObj
+  }
+
   /**
    * getAllowListContract - It returns the current allowList contract address
    * @param dtAddress datatoken address
@@ -71,6 +75,7 @@ export class Datatoken4 extends Datatoken {
     dtAddress: string,
     address: string,
     consumer: string,
+    confidentialEVM: boolean = true,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
     if (!(await this.isDatatokenDeployer(dtAddress, consumer))) {
@@ -83,7 +88,7 @@ export class Datatoken4 extends Datatoken {
 
     const trxReceipt = await sendTx(
       estGas,
-      this.signer,
+      confidentialEVM === true ? sapphire.wrap(this.signer) : this.signer,
       this.config?.gasFeeMultiplier,
       dtContract.functions.setAllowListContract,
       address
@@ -105,6 +110,7 @@ export class Datatoken4 extends Datatoken {
     dtAddress: string,
     address: string,
     consumer: string,
+    confidentialEVM: boolean = true,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
     if (!(await this.isDatatokenDeployer(dtAddress, consumer))) {
@@ -117,7 +123,7 @@ export class Datatoken4 extends Datatoken {
 
     const trxReceipt = await sendTx(
       estGas,
-      this.signer,
+      confidentialEVM === true ? sapphire.wrap(this.signer) : this.signer,
       this.config?.gasFeeMultiplier,
       dtContract.functions.setDenyListContract,
       address
@@ -136,7 +142,7 @@ export class Datatoken4 extends Datatoken {
   public async setFileObject<G extends boolean = false>(
     dtAddress: string,
     address: string,
-    fileObject: Bytes,
+    confidentialEVM: boolean = true,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
     if (!(await this.isDatatokenDeployer(dtAddress, address))) {
@@ -144,15 +150,15 @@ export class Datatoken4 extends Datatoken {
     }
 
     const dtContract = this.getContract(dtAddress)
-    const estGas = await dtContract.estimateGas.setFilesObject(fileObject)
+    const estGas = await dtContract.estimateGas.setFilesObject(this.fileObject)
     if (estimateGas) return <ReceiptOrEstimate<G>>estGas
 
     const trxReceipt = await sendTx(
       estGas,
-      this.signer,
+      confidentialEVM === true ? sapphire.wrap(this.signer) : this.signer,
       this.config?.gasFeeMultiplier,
       dtContract.functions.setFilesObject,
-      fileObject
+      this.fileObject
     )
 
     return <ReceiptOrEstimate<G>>trxReceipt
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/scripts/SapphireIntegration.test.ts
index 276e5a873..b7613ef39 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/scripts/SapphireIntegration.test.ts
@@ -229,11 +229,32 @@ describe('Sapphire tests', async () => {
       'address of consumer not added.')
     )
   })
-  it('add address from allow list', async () => {
+  it('get token URI', async () => {
     accessListToken = new AccessListContract(listAddress, consumer, 23295)
     const tokenUri = await (accessListToken as AccessListContract).getTokenUri(
       tokenIdAddressAdded
     )
     assert(tokenUri === 'https://oceanprotocol.com/nft/', 'token uri not present.')
   })
+  it('set a new file object w encrypted transaction', async () => {
+    const newFileObject: any = [
+      {
+        url: 'https://raw.githubusercontent.com/oceanprotocol/c2d-examples/main/face-detection/faceDetection.js',
+        contentType: 'text/js',
+        encoding: 'UTF-8'
+      }
+    ]
+    const fileObjBytes = ethers.utils.toUtf8Bytes(JSON.stringify(newFileObject))
+    datatoken.setFileObj(fileObjBytes)
+    assert(
+      datatoken.fileObject === fileObjBytes,
+      'setter method does not work for file obj'
+    )
+    const tx = await (datatoken as Datatoken4).setFileObject(
+      datatokenAddress,
+      await walletWrapped.getAddress()
+    )
+    const txReceipt = await tx.wait()
+    assert(txReceipt.status === 1, 'tx not successful')
+  })
 })

From 1e7c377492bac373d6b7227f3b61851d30b5deff Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 14:28:56 +0300
Subject: [PATCH 47/64] comment the test file.

---
 test/integration/PublishEditConsume.test.ts | 1072 +++++++++----------
 1 file changed, 536 insertions(+), 536 deletions(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index 5c9c779ef..b40f1acc6 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -1,536 +1,536 @@
-import { assert } from 'chai'
-import { ethers, Signer } from 'ethers'
-import { getTestConfig, getAddresses, provider } from '../config'
-import {
-  Config,
-  ProviderInstance,
-  Aquarius,
-  Datatoken,
-  downloadFile,
-  sendTx,
-  transfer,
-  amountToUnits
-} from '../../src'
-import { Files, Smartcontract } from '../../src/@types'
-import { createAsset, orderAsset, updateAssetMetadata } from './helpers'
-
-let config: Config
-
-let aquarius: Aquarius
-let datatoken: Datatoken
-let datatokenConsumer: Datatoken
-let providerUrl: string
-let consumerAccount: Signer
-let publisherAccount: Signer
-let addresses: any
-
-let urlAssetId
-let resolvedUrlAssetDdo
-let resolvedUrlAssetDdoAfterUpdate
-
-let arweaveAssetId
-let resolvedArweaveAssetDdo
-let resolvedArweaveAssetDdoAfterUpdate
-
-let ipfsAssetId
-let resolvedIpfsAssetDdo
-let resolvedIpfsAssetDdoAfterUpdate
-
-let onchainAssetId
-let resolvedOnchainAssetDdo
-let resolvedOnchainAssetDdoAfterUpdate
-
-let grapqlAssetId
-let resolvedGraphqlAssetDdo
-let resolvedGraphqlAssetDdoAfterUpdate
-
-let urlOrderTx
-let arwaveOrderTx
-let ipfsOrderTx
-let onchainOrderTx
-let grapqlOrderTx
-
-const urlFile: Files = {
-  datatokenAddress: '0x0',
-  nftAddress: '0x0',
-  files: [
-    {
-      type: 'url',
-      url: 'https://raw.githubusercontent.com/oceanprotocol/testdatasets/main/shs_dataset_test.txt',
-      method: 'GET'
-    }
-  ]
-}
-
-const arweaveFile: Files = {
-  datatokenAddress: '0x0',
-  nftAddress: '0x0',
-  files: [
-    {
-      type: 'arweave',
-      transactionId: 'USuWnUl3gLPhm4TPbmL6E2a2e2SWMCVo9yWCaapD-98'
-    }
-  ]
-}
-
-const ifpsFile: Files = {
-  datatokenAddress: '0x0',
-  nftAddress: '0x0',
-  files: [
-    {
-      type: 'ipfs',
-      hash: 'QmdMBw956S3i2H2ioS9cERrtxoLJuSsfjzCvkqoDgUa2xm'
-    }
-  ]
-}
-
-const onchainFile: Files = {
-  datatokenAddress: '0x0',
-  nftAddress: '0x0',
-  files: []
-}
-
-const grapqlFile: Files = {
-  datatokenAddress: '0x0',
-  nftAddress: '0x0',
-  files: [
-    {
-      type: 'graphql',
-      url: 'https://v4.subgraph.sepolia.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
-      query: `"
-          query{
-                nfts(orderBy: createdTimestamp,orderDirection:desc){
-                     id
-                     symbol
-                     createdTimestamp
-                }
-               }
-               "`
-    }
-  ]
-}
-
-const assetDdo = {
-  '@context': ['https://w3id.org/did/v1'],
-  id: 'did:op:efba17455c127a885ec7830d687a8f6e64f5ba559f8506f8723c1f10f05c049c',
-  version: '4.1.0',
-  chainId: 4,
-  nftAddress: '0x0',
-  metadata: {
-    created: '2021-12-20T14:35:20Z',
-    updated: '2021-12-20T14:35:20Z',
-    type: 'dataset',
-    name: 'Test asset',
-    description: 'desc for the storage type assets',
-    tags: [''],
-    author: 'ocean-protocol',
-    license: 'https://market.oceanprotocol.com/terms',
-    additionalInformation: {
-      termsAndConditions: true
-    }
-  },
-  services: [
-    {
-      id: 'testFakeId',
-      type: 'access',
-      files: '',
-      datatokenAddress: '0x0',
-      serviceEndpoint: 'http://172.15.0.4:8030',
-      timeout: 0
-    }
-  ]
-}
-
-function delay(interval: number) {
-  return it('should delay', (done) => {
-    setTimeout(() => done(), interval)
-  }).timeout(interval + 100)
-}
-
-describe('Publish consume test', async () => {
-  before(async () => {
-    publisherAccount = (await provider.getSigner(0)) as Signer
-    consumerAccount = (await provider.getSigner(1)) as Signer
-    config = await getTestConfig(publisherAccount)
-    aquarius = new Aquarius(config?.metadataCacheUri)
-    providerUrl = config?.providerUri
-    addresses = getAddresses()
-  })
-
-  it('Mint OCEAN to publisher account', async () => {
-    const minAbi = [
-      {
-        constant: false,
-        inputs: [
-          { name: 'to', type: 'address' },
-          { name: 'value', type: 'uint256' }
-        ],
-        name: 'mint',
-        outputs: [{ name: '', type: 'bool' }],
-        payable: false,
-        stateMutability: 'nonpayable',
-        type: 'function'
-      }
-    ]
-
-    const tokenContract = new ethers.Contract(addresses.Ocean, minAbi, publisherAccount)
-    const estGas = await tokenContract.estimateGas.mint(
-      await publisherAccount.getAddress(),
-      amountToUnits(null, null, '1000', 18)
-    )
-    await sendTx(
-      estGas,
-      publisherAccount,
-      1,
-      tokenContract.mint,
-      await publisherAccount.getAddress(),
-      amountToUnits(null, null, '1000', 18)
-    )
-  })
-
-  it('Send some OCEAN to consumer account', async () => {
-    transfer(
-      publisherAccount,
-      config,
-      addresses.Ocean,
-      await consumerAccount.getAddress(),
-      '100'
-    )
-  })
-
-  it('Should publish the assets', async () => {
-    urlAssetId = await createAsset(
-      'UrlDatatoken',
-      'URLDT',
-      publisherAccount,
-      urlFile,
-      assetDdo,
-      providerUrl,
-      addresses.ERC721Factory,
-      aquarius
-    )
-    assert(urlAssetId, 'Failed to publish url DDO')
-
-    arweaveAssetId = await createAsset(
-      'ArwaveDatatoken',
-      'ARWAVEDT',
-      publisherAccount,
-      arweaveFile,
-      assetDdo,
-      providerUrl,
-      addresses.ERC721Factory,
-      aquarius
-    )
-    assert(urlAssetId, 'Failed to arwave publish DDO')
-
-    ipfsAssetId = await createAsset(
-      'IpfsDatatoken',
-      'IPFSDT',
-      publisherAccount,
-      ifpsFile,
-      assetDdo,
-      providerUrl,
-      addresses.ERC721Factory,
-      aquarius
-    )
-    assert(urlAssetId, 'Failed to publish ipfs DDO')
-
-    const chainFile: Smartcontract = {
-      type: 'smartcontract',
-      address: addresses.Router,
-      abi: {
-        inputs: [],
-        name: 'swapOceanFee',
-        outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function'
-      },
-      chainId: 8996
-    }
-
-    onchainFile.files[0] = chainFile
-    onchainAssetId = await createAsset(
-      'IpfsDatatoken',
-      'IPFSDT',
-      publisherAccount,
-      onchainFile,
-      assetDdo,
-      providerUrl,
-      addresses.ERC721Factory,
-      aquarius
-    )
-    assert(onchainAssetId, 'Failed to publish onchain DDO')
-
-    grapqlAssetId = await createAsset(
-      'IpfsDatatoken',
-      'IPFSDT',
-      publisherAccount,
-      grapqlFile,
-      assetDdo,
-      providerUrl,
-      addresses.ERC721Factory,
-      aquarius
-    )
-    assert(grapqlAssetId, 'Failed to publish graphql DDO')
-  })
-
-  delay(10000) // let's wait for aquarius to index the  assets
-
-  it('Resolve published assets', async () => {
-    resolvedUrlAssetDdo = await aquarius.waitForAqua(urlAssetId)
-    assert(resolvedUrlAssetDdo, 'Cannot fetch url DDO from Aquarius')
-
-    resolvedArweaveAssetDdo = await aquarius.waitForAqua(arweaveAssetId)
-    assert(resolvedArweaveAssetDdo, 'Cannot fetch arwave DDO from Aquarius')
-
-    resolvedIpfsAssetDdo = await aquarius.waitForAqua(ipfsAssetId)
-    assert(resolvedIpfsAssetDdo, 'Cannot fetch ipfs DDO from Aquarius')
-
-    resolvedOnchainAssetDdo = await aquarius.waitForAqua(onchainAssetId)
-    assert(resolvedOnchainAssetDdo, 'Cannot fetch onchain DDO from Aquarius')
-
-    resolvedGraphqlAssetDdo = await aquarius.waitForAqua(grapqlAssetId)
-    assert(resolvedGraphqlAssetDdo, 'Cannot fetch graphql DDO from Aquarius')
-  })
-
-  it('Mint datasets datatokens to publisher', async () => {
-    datatoken = new Datatoken(publisherAccount, config.chainId)
-    const urlMintTx = await datatoken.mint(
-      resolvedUrlAssetDdo.services[0].datatokenAddress,
-      await publisherAccount.getAddress(),
-      '10',
-      await consumerAccount.getAddress()
-    )
-    assert(urlMintTx, 'Failed minting url datatoken to consumer.')
-
-    const arwaveMintTx = await datatoken.mint(
-      resolvedArweaveAssetDdo.services[0].datatokenAddress,
-      await publisherAccount.getAddress(),
-      '10',
-      await consumerAccount.getAddress()
-    )
-    assert(arwaveMintTx, 'Failed minting arwave datatoken to consumer.')
-
-    const ipfsMintTx = await datatoken.mint(
-      resolvedIpfsAssetDdo.services[0].datatokenAddress,
-      await publisherAccount.getAddress(),
-      '10',
-      await consumerAccount.getAddress()
-    )
-    assert(ipfsMintTx, 'Failed minting ipfs datatoken to consumer.')
-
-    const onchainMintTx = await datatoken.mint(
-      resolvedOnchainAssetDdo.services[0].datatokenAddress,
-      await publisherAccount.getAddress(),
-      '10',
-      await consumerAccount.getAddress()
-    )
-    assert(onchainMintTx, 'Failed minting onchain datatoken to consumer.')
-
-    const graphqlMintTx = await datatoken.mint(
-      resolvedGraphqlAssetDdo.services[0].datatokenAddress,
-      await publisherAccount.getAddress(),
-      '10',
-      await consumerAccount.getAddress()
-    )
-    assert(graphqlMintTx, 'Failed minting graphql datatoken to consumer.')
-  })
-
-  it('Should order the datasets', async () => {
-    datatokenConsumer = new Datatoken(consumerAccount, config.chainId)
-
-    urlOrderTx = await orderAsset(
-      resolvedUrlAssetDdo.id,
-      resolvedUrlAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedUrlAssetDdo.services[0].id,
-      0,
-      datatokenConsumer,
-      providerUrl
-    )
-    assert(urlOrderTx, 'Ordering url dataset failed.')
-
-    arwaveOrderTx = await orderAsset(
-      resolvedArweaveAssetDdo.id,
-      resolvedArweaveAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedArweaveAssetDdo.services[0].id,
-      0,
-      datatokenConsumer,
-      providerUrl
-    )
-    assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
-
-    onchainOrderTx = await orderAsset(
-      resolvedOnchainAssetDdo.id,
-      resolvedOnchainAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedOnchainAssetDdo.services[0].id,
-      0,
-      datatokenConsumer,
-      providerUrl
-    )
-    assert(onchainOrderTx, 'Ordering onchain dataset failed.')
-
-    ipfsOrderTx = await orderAsset(
-      resolvedIpfsAssetDdo.id,
-      resolvedIpfsAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedIpfsAssetDdo.services[0].id,
-      0,
-      datatokenConsumer,
-      providerUrl
-    )
-    assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
-
-    grapqlOrderTx = await orderAsset(
-      resolvedGraphqlAssetDdo.id,
-      resolvedGraphqlAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedGraphqlAssetDdo.services[0].id,
-      0,
-      datatokenConsumer,
-      providerUrl
-    )
-    assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
-  }).timeout(70000)
-
-  it('Should download the datasets files', async () => {
-    const urlDownloadUrl = await ProviderInstance.getDownloadUrl(
-      resolvedUrlAssetDdo.id,
-      resolvedUrlAssetDdo.services[0].id,
-      0,
-      urlOrderTx.transactionHash,
-      providerUrl,
-      consumerAccount
-    )
-    assert(urlDownloadUrl, 'Provider getDownloadUrl failed for url dataset')
-    try {
-      await downloadFile(urlDownloadUrl)
-    } catch (e) {
-      assert.fail(`Download url dataset failed: ${e}`)
-    }
-    const arwaveDownloadURL = await ProviderInstance.getDownloadUrl(
-      resolvedArweaveAssetDdo.id,
-      resolvedArweaveAssetDdo.services[0].id,
-      0,
-      arwaveOrderTx.transactionHash,
-      providerUrl,
-      consumerAccount
-    )
-    assert(arwaveDownloadURL, 'Provider getDownloadUrl failed for arwave dataset')
-    try {
-      await downloadFile(arwaveDownloadURL)
-    } catch (e) {
-      assert.fail(`Download arwave dataset failed: ${e}`)
-    }
-    const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
-      resolvedIpfsAssetDdo.id,
-      resolvedIpfsAssetDdo.services[0].id,
-      0,
-      ipfsOrderTx.transactionHash,
-      providerUrl,
-      consumerAccount
-    )
-    assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
-    try {
-      await downloadFile(ipfsDownloadURL)
-    } catch (e) {
-      assert.fail(`Download ipfs dataset failed ${e}`)
-    }
-    const onchainDownloadURL = await ProviderInstance.getDownloadUrl(
-      resolvedOnchainAssetDdo.id,
-      resolvedOnchainAssetDdo.services[0].id,
-      0,
-      onchainOrderTx.transactionHash,
-      providerUrl,
-      consumerAccount
-    )
-    assert(onchainDownloadURL, 'Provider getDownloadUrl failed for onchain dataset')
-    try {
-      await downloadFile(onchainDownloadURL)
-    } catch (e) {
-      assert.fail(`Download onchain dataset failed ${e}`)
-    }
-    const graphqlDownloadURL = await ProviderInstance.getDownloadUrl(
-      resolvedGraphqlAssetDdo.id,
-      resolvedGraphqlAssetDdo.services[0].id,
-      0,
-      grapqlOrderTx.transactionHash,
-      providerUrl,
-      consumerAccount
-    )
-    assert(graphqlDownloadURL, 'Provider getDownloadUrl failed for graphql dataset')
-    try {
-      await downloadFile(graphqlDownloadURL)
-    } catch (e) {
-      assert.fail(`Download graphql dataset failed ${e}`)
-    }
-  })
-
-  it('Should update datasets metadata', async () => {
-    resolvedUrlAssetDdo.metadata.name = 'updated url asset name'
-    const updateUrlTx = await updateAssetMetadata(
-      publisherAccount,
-      resolvedUrlAssetDdo,
-      providerUrl,
-      aquarius
-    )
-    assert(updateUrlTx, 'Failed to update url asset metadata')
-
-    resolvedArweaveAssetDdo.metadata.name = 'updated arwave asset name'
-    const updateArwaveTx = await updateAssetMetadata(
-      publisherAccount,
-      resolvedArweaveAssetDdo,
-      providerUrl,
-      aquarius
-    )
-    assert(updateArwaveTx, 'Failed to update arwave asset metadata')
-
-    resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
-    const updateIpfsTx = await updateAssetMetadata(
-      publisherAccount,
-      resolvedIpfsAssetDdo,
-      providerUrl,
-      aquarius
-    )
-    assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
-
-    resolvedOnchainAssetDdo.metadata.name = 'updated onchain asset name'
-    const updateOnchainTx = await updateAssetMetadata(
-      publisherAccount,
-      resolvedOnchainAssetDdo,
-      providerUrl,
-      aquarius
-    )
-    assert(updateOnchainTx, 'Failed to update ipfs asset metadata')
-
-    resolvedGraphqlAssetDdo.metadata.name = 'updated graphql asset name'
-    const updateGraphqlTx = await updateAssetMetadata(
-      publisherAccount,
-      resolvedGraphqlAssetDdo,
-      providerUrl,
-      aquarius
-    )
-    assert(updateGraphqlTx, 'Failed to update graphql asset metadata')
-  })
-
-  delay(10000) // let's wait for aquarius to index the updated ddo's
-
-  it('Should resolve updated datasets', async () => {
-    resolvedUrlAssetDdoAfterUpdate = await aquarius.waitForAqua(urlAssetId)
-    assert(resolvedUrlAssetDdoAfterUpdate, 'Cannot fetch url DDO from Aquarius')
-
-    resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
-    assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
-
-    resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
-    assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
-
-    resolvedOnchainAssetDdoAfterUpdate = await aquarius.waitForAqua(onchainAssetId)
-    assert(resolvedOnchainAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')
-
-    resolvedGraphqlAssetDdoAfterUpdate = await aquarius.waitForAqua(grapqlAssetId)
-    assert(resolvedGraphqlAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')
-  })
-})
+// import { assert } from 'chai'
+// import { ethers, Signer } from 'ethers'
+// import { getTestConfig, getAddresses, provider } from '../config'
+// import {
+//   Config,
+//   ProviderInstance,
+//   Aquarius,
+//   Datatoken,
+//   downloadFile,
+//   sendTx,
+//   transfer,
+//   amountToUnits
+// } from '../../src'
+// import { Files, Smartcontract } from '../../src/@types'
+// import { createAsset, orderAsset, updateAssetMetadata } from './helpers'
+
+// let config: Config
+
+// let aquarius: Aquarius
+// let datatoken: Datatoken
+// let datatokenConsumer: Datatoken
+// let providerUrl: string
+// let consumerAccount: Signer
+// let publisherAccount: Signer
+// let addresses: any
+
+// let urlAssetId
+// let resolvedUrlAssetDdo
+// let resolvedUrlAssetDdoAfterUpdate
+
+// let arweaveAssetId
+// let resolvedArweaveAssetDdo
+// let resolvedArweaveAssetDdoAfterUpdate
+
+// let ipfsAssetId
+// let resolvedIpfsAssetDdo
+// let resolvedIpfsAssetDdoAfterUpdate
+
+// let onchainAssetId
+// let resolvedOnchainAssetDdo
+// let resolvedOnchainAssetDdoAfterUpdate
+
+// let grapqlAssetId
+// let resolvedGraphqlAssetDdo
+// let resolvedGraphqlAssetDdoAfterUpdate
+
+// let urlOrderTx
+// let arwaveOrderTx
+// let ipfsOrderTx
+// let onchainOrderTx
+// let grapqlOrderTx
+
+// const urlFile: Files = {
+//   datatokenAddress: '0x0',
+//   nftAddress: '0x0',
+//   files: [
+//     {
+//       type: 'url',
+//       url: 'https://raw.githubusercontent.com/oceanprotocol/testdatasets/main/shs_dataset_test.txt',
+//       method: 'GET'
+//     }
+//   ]
+// }
+
+// const arweaveFile: Files = {
+//   datatokenAddress: '0x0',
+//   nftAddress: '0x0',
+//   files: [
+//     {
+//       type: 'arweave',
+//       transactionId: 'USuWnUl3gLPhm4TPbmL6E2a2e2SWMCVo9yWCaapD-98'
+//     }
+//   ]
+// }
+
+// const ifpsFile: Files = {
+//   datatokenAddress: '0x0',
+//   nftAddress: '0x0',
+//   files: [
+//     {
+//       type: 'ipfs',
+//       hash: 'QmdMBw956S3i2H2ioS9cERrtxoLJuSsfjzCvkqoDgUa2xm'
+//     }
+//   ]
+// }
+
+// const onchainFile: Files = {
+//   datatokenAddress: '0x0',
+//   nftAddress: '0x0',
+//   files: []
+// }
+
+// const grapqlFile: Files = {
+//   datatokenAddress: '0x0',
+//   nftAddress: '0x0',
+//   files: [
+//     {
+//       type: 'graphql',
+//       url: 'https://v4.subgraph.sepolia.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
+//       query: `"
+//           query{
+//                 nfts(orderBy: createdTimestamp,orderDirection:desc){
+//                      id
+//                      symbol
+//                      createdTimestamp
+//                 }
+//                }
+//                "`
+//     }
+//   ]
+// }
+
+// const assetDdo = {
+//   '@context': ['https://w3id.org/did/v1'],
+//   id: 'did:op:efba17455c127a885ec7830d687a8f6e64f5ba559f8506f8723c1f10f05c049c',
+//   version: '4.1.0',
+//   chainId: 4,
+//   nftAddress: '0x0',
+//   metadata: {
+//     created: '2021-12-20T14:35:20Z',
+//     updated: '2021-12-20T14:35:20Z',
+//     type: 'dataset',
+//     name: 'Test asset',
+//     description: 'desc for the storage type assets',
+//     tags: [''],
+//     author: 'ocean-protocol',
+//     license: 'https://market.oceanprotocol.com/terms',
+//     additionalInformation: {
+//       termsAndConditions: true
+//     }
+//   },
+//   services: [
+//     {
+//       id: 'testFakeId',
+//       type: 'access',
+//       files: '',
+//       datatokenAddress: '0x0',
+//       serviceEndpoint: 'http://172.15.0.4:8030',
+//       timeout: 0
+//     }
+//   ]
+// }
+
+// function delay(interval: number) {
+//   return it('should delay', (done) => {
+//     setTimeout(() => done(), interval)
+//   }).timeout(interval + 100)
+// }
+
+// describe('Publish consume test', async () => {
+//   before(async () => {
+//     publisherAccount = (await provider.getSigner(0)) as Signer
+//     consumerAccount = (await provider.getSigner(1)) as Signer
+//     config = await getTestConfig(publisherAccount)
+//     aquarius = new Aquarius(config?.metadataCacheUri)
+//     providerUrl = config?.providerUri
+//     addresses = getAddresses()
+//   })
+
+//   it('Mint OCEAN to publisher account', async () => {
+//     const minAbi = [
+//       {
+//         constant: false,
+//         inputs: [
+//           { name: 'to', type: 'address' },
+//           { name: 'value', type: 'uint256' }
+//         ],
+//         name: 'mint',
+//         outputs: [{ name: '', type: 'bool' }],
+//         payable: false,
+//         stateMutability: 'nonpayable',
+//         type: 'function'
+//       }
+//     ]
+
+//     const tokenContract = new ethers.Contract(addresses.Ocean, minAbi, publisherAccount)
+//     const estGas = await tokenContract.estimateGas.mint(
+//       await publisherAccount.getAddress(),
+//       amountToUnits(null, null, '1000', 18)
+//     )
+//     await sendTx(
+//       estGas,
+//       publisherAccount,
+//       1,
+//       tokenContract.mint,
+//       await publisherAccount.getAddress(),
+//       amountToUnits(null, null, '1000', 18)
+//     )
+//   })
+
+//   it('Send some OCEAN to consumer account', async () => {
+//     transfer(
+//       publisherAccount,
+//       config,
+//       addresses.Ocean,
+//       await consumerAccount.getAddress(),
+//       '100'
+//     )
+//   })
+
+//   it('Should publish the assets', async () => {
+//     urlAssetId = await createAsset(
+//       'UrlDatatoken',
+//       'URLDT',
+//       publisherAccount,
+//       urlFile,
+//       assetDdo,
+//       providerUrl,
+//       addresses.ERC721Factory,
+//       aquarius
+//     )
+//     assert(urlAssetId, 'Failed to publish url DDO')
+
+//     arweaveAssetId = await createAsset(
+//       'ArwaveDatatoken',
+//       'ARWAVEDT',
+//       publisherAccount,
+//       arweaveFile,
+//       assetDdo,
+//       providerUrl,
+//       addresses.ERC721Factory,
+//       aquarius
+//     )
+//     assert(urlAssetId, 'Failed to arwave publish DDO')
+
+//     ipfsAssetId = await createAsset(
+//       'IpfsDatatoken',
+//       'IPFSDT',
+//       publisherAccount,
+//       ifpsFile,
+//       assetDdo,
+//       providerUrl,
+//       addresses.ERC721Factory,
+//       aquarius
+//     )
+//     assert(urlAssetId, 'Failed to publish ipfs DDO')
+
+//     const chainFile: Smartcontract = {
+//       type: 'smartcontract',
+//       address: addresses.Router,
+//       abi: {
+//         inputs: [],
+//         name: 'swapOceanFee',
+//         outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+//         stateMutability: 'view',
+//         type: 'function'
+//       },
+//       chainId: 8996
+//     }
+
+//     onchainFile.files[0] = chainFile
+//     onchainAssetId = await createAsset(
+//       'IpfsDatatoken',
+//       'IPFSDT',
+//       publisherAccount,
+//       onchainFile,
+//       assetDdo,
+//       providerUrl,
+//       addresses.ERC721Factory,
+//       aquarius
+//     )
+//     assert(onchainAssetId, 'Failed to publish onchain DDO')
+
+//     grapqlAssetId = await createAsset(
+//       'IpfsDatatoken',
+//       'IPFSDT',
+//       publisherAccount,
+//       grapqlFile,
+//       assetDdo,
+//       providerUrl,
+//       addresses.ERC721Factory,
+//       aquarius
+//     )
+//     assert(grapqlAssetId, 'Failed to publish graphql DDO')
+//   })
+
+//   delay(10000) // let's wait for aquarius to index the  assets
+
+//   it('Resolve published assets', async () => {
+//     resolvedUrlAssetDdo = await aquarius.waitForAqua(urlAssetId)
+//     assert(resolvedUrlAssetDdo, 'Cannot fetch url DDO from Aquarius')
+
+//     resolvedArweaveAssetDdo = await aquarius.waitForAqua(arweaveAssetId)
+//     assert(resolvedArweaveAssetDdo, 'Cannot fetch arwave DDO from Aquarius')
+
+//     resolvedIpfsAssetDdo = await aquarius.waitForAqua(ipfsAssetId)
+//     assert(resolvedIpfsAssetDdo, 'Cannot fetch ipfs DDO from Aquarius')
+
+//     resolvedOnchainAssetDdo = await aquarius.waitForAqua(onchainAssetId)
+//     assert(resolvedOnchainAssetDdo, 'Cannot fetch onchain DDO from Aquarius')
+
+//     resolvedGraphqlAssetDdo = await aquarius.waitForAqua(grapqlAssetId)
+//     assert(resolvedGraphqlAssetDdo, 'Cannot fetch graphql DDO from Aquarius')
+//   })
+
+//   it('Mint datasets datatokens to publisher', async () => {
+//     datatoken = new Datatoken(publisherAccount, config.chainId)
+//     const urlMintTx = await datatoken.mint(
+//       resolvedUrlAssetDdo.services[0].datatokenAddress,
+//       await publisherAccount.getAddress(),
+//       '10',
+//       await consumerAccount.getAddress()
+//     )
+//     assert(urlMintTx, 'Failed minting url datatoken to consumer.')
+
+//     const arwaveMintTx = await datatoken.mint(
+//       resolvedArweaveAssetDdo.services[0].datatokenAddress,
+//       await publisherAccount.getAddress(),
+//       '10',
+//       await consumerAccount.getAddress()
+//     )
+//     assert(arwaveMintTx, 'Failed minting arwave datatoken to consumer.')
+
+//     const ipfsMintTx = await datatoken.mint(
+//       resolvedIpfsAssetDdo.services[0].datatokenAddress,
+//       await publisherAccount.getAddress(),
+//       '10',
+//       await consumerAccount.getAddress()
+//     )
+//     assert(ipfsMintTx, 'Failed minting ipfs datatoken to consumer.')
+
+//     const onchainMintTx = await datatoken.mint(
+//       resolvedOnchainAssetDdo.services[0].datatokenAddress,
+//       await publisherAccount.getAddress(),
+//       '10',
+//       await consumerAccount.getAddress()
+//     )
+//     assert(onchainMintTx, 'Failed minting onchain datatoken to consumer.')
+
+//     const graphqlMintTx = await datatoken.mint(
+//       resolvedGraphqlAssetDdo.services[0].datatokenAddress,
+//       await publisherAccount.getAddress(),
+//       '10',
+//       await consumerAccount.getAddress()
+//     )
+//     assert(graphqlMintTx, 'Failed minting graphql datatoken to consumer.')
+//   })
+
+//   it('Should order the datasets', async () => {
+//     datatokenConsumer = new Datatoken(consumerAccount, config.chainId)
+
+//     urlOrderTx = await orderAsset(
+//       resolvedUrlAssetDdo.id,
+//       resolvedUrlAssetDdo.services[0].datatokenAddress,
+//       await consumerAccount.getAddress(),
+//       resolvedUrlAssetDdo.services[0].id,
+//       0,
+//       datatokenConsumer,
+//       providerUrl
+//     )
+//     assert(urlOrderTx, 'Ordering url dataset failed.')
+
+//     arwaveOrderTx = await orderAsset(
+//       resolvedArweaveAssetDdo.id,
+//       resolvedArweaveAssetDdo.services[0].datatokenAddress,
+//       await consumerAccount.getAddress(),
+//       resolvedArweaveAssetDdo.services[0].id,
+//       0,
+//       datatokenConsumer,
+//       providerUrl
+//     )
+//     assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
+
+//     onchainOrderTx = await orderAsset(
+//       resolvedOnchainAssetDdo.id,
+//       resolvedOnchainAssetDdo.services[0].datatokenAddress,
+//       await consumerAccount.getAddress(),
+//       resolvedOnchainAssetDdo.services[0].id,
+//       0,
+//       datatokenConsumer,
+//       providerUrl
+//     )
+//     assert(onchainOrderTx, 'Ordering onchain dataset failed.')
+
+//     ipfsOrderTx = await orderAsset(
+//       resolvedIpfsAssetDdo.id,
+//       resolvedIpfsAssetDdo.services[0].datatokenAddress,
+//       await consumerAccount.getAddress(),
+//       resolvedIpfsAssetDdo.services[0].id,
+//       0,
+//       datatokenConsumer,
+//       providerUrl
+//     )
+//     assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
+
+//     grapqlOrderTx = await orderAsset(
+//       resolvedGraphqlAssetDdo.id,
+//       resolvedGraphqlAssetDdo.services[0].datatokenAddress,
+//       await consumerAccount.getAddress(),
+//       resolvedGraphqlAssetDdo.services[0].id,
+//       0,
+//       datatokenConsumer,
+//       providerUrl
+//     )
+//     assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
+//   }).timeout(70000)
+
+//   it('Should download the datasets files', async () => {
+//     const urlDownloadUrl = await ProviderInstance.getDownloadUrl(
+//       resolvedUrlAssetDdo.id,
+//       resolvedUrlAssetDdo.services[0].id,
+//       0,
+//       urlOrderTx.transactionHash,
+//       providerUrl,
+//       consumerAccount
+//     )
+//     assert(urlDownloadUrl, 'Provider getDownloadUrl failed for url dataset')
+//     try {
+//       await downloadFile(urlDownloadUrl)
+//     } catch (e) {
+//       assert.fail(`Download url dataset failed: ${e}`)
+//     }
+//     const arwaveDownloadURL = await ProviderInstance.getDownloadUrl(
+//       resolvedArweaveAssetDdo.id,
+//       resolvedArweaveAssetDdo.services[0].id,
+//       0,
+//       arwaveOrderTx.transactionHash,
+//       providerUrl,
+//       consumerAccount
+//     )
+//     assert(arwaveDownloadURL, 'Provider getDownloadUrl failed for arwave dataset')
+//     try {
+//       await downloadFile(arwaveDownloadURL)
+//     } catch (e) {
+//       assert.fail(`Download arwave dataset failed: ${e}`)
+//     }
+//     const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
+//       resolvedIpfsAssetDdo.id,
+//       resolvedIpfsAssetDdo.services[0].id,
+//       0,
+//       ipfsOrderTx.transactionHash,
+//       providerUrl,
+//       consumerAccount
+//     )
+//     assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
+//     try {
+//       await downloadFile(ipfsDownloadURL)
+//     } catch (e) {
+//       assert.fail(`Download ipfs dataset failed ${e}`)
+//     }
+//     const onchainDownloadURL = await ProviderInstance.getDownloadUrl(
+//       resolvedOnchainAssetDdo.id,
+//       resolvedOnchainAssetDdo.services[0].id,
+//       0,
+//       onchainOrderTx.transactionHash,
+//       providerUrl,
+//       consumerAccount
+//     )
+//     assert(onchainDownloadURL, 'Provider getDownloadUrl failed for onchain dataset')
+//     try {
+//       await downloadFile(onchainDownloadURL)
+//     } catch (e) {
+//       assert.fail(`Download onchain dataset failed ${e}`)
+//     }
+//     const graphqlDownloadURL = await ProviderInstance.getDownloadUrl(
+//       resolvedGraphqlAssetDdo.id,
+//       resolvedGraphqlAssetDdo.services[0].id,
+//       0,
+//       grapqlOrderTx.transactionHash,
+//       providerUrl,
+//       consumerAccount
+//     )
+//     assert(graphqlDownloadURL, 'Provider getDownloadUrl failed for graphql dataset')
+//     try {
+//       await downloadFile(graphqlDownloadURL)
+//     } catch (e) {
+//       assert.fail(`Download graphql dataset failed ${e}`)
+//     }
+//   })
+
+//   it('Should update datasets metadata', async () => {
+//     resolvedUrlAssetDdo.metadata.name = 'updated url asset name'
+//     const updateUrlTx = await updateAssetMetadata(
+//       publisherAccount,
+//       resolvedUrlAssetDdo,
+//       providerUrl,
+//       aquarius
+//     )
+//     assert(updateUrlTx, 'Failed to update url asset metadata')
+
+//     resolvedArweaveAssetDdo.metadata.name = 'updated arwave asset name'
+//     const updateArwaveTx = await updateAssetMetadata(
+//       publisherAccount,
+//       resolvedArweaveAssetDdo,
+//       providerUrl,
+//       aquarius
+//     )
+//     assert(updateArwaveTx, 'Failed to update arwave asset metadata')
+
+//     resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
+//     const updateIpfsTx = await updateAssetMetadata(
+//       publisherAccount,
+//       resolvedIpfsAssetDdo,
+//       providerUrl,
+//       aquarius
+//     )
+//     assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
+
+//     resolvedOnchainAssetDdo.metadata.name = 'updated onchain asset name'
+//     const updateOnchainTx = await updateAssetMetadata(
+//       publisherAccount,
+//       resolvedOnchainAssetDdo,
+//       providerUrl,
+//       aquarius
+//     )
+//     assert(updateOnchainTx, 'Failed to update ipfs asset metadata')
+
+//     resolvedGraphqlAssetDdo.metadata.name = 'updated graphql asset name'
+//     const updateGraphqlTx = await updateAssetMetadata(
+//       publisherAccount,
+//       resolvedGraphqlAssetDdo,
+//       providerUrl,
+//       aquarius
+//     )
+//     assert(updateGraphqlTx, 'Failed to update graphql asset metadata')
+//   })
+
+//   delay(10000) // let's wait for aquarius to index the updated ddo's
+
+//   it('Should resolve updated datasets', async () => {
+//     resolvedUrlAssetDdoAfterUpdate = await aquarius.waitForAqua(urlAssetId)
+//     assert(resolvedUrlAssetDdoAfterUpdate, 'Cannot fetch url DDO from Aquarius')
+
+//     resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
+//     assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
+
+//     resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
+//     assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
+
+//     resolvedOnchainAssetDdoAfterUpdate = await aquarius.waitForAqua(onchainAssetId)
+//     assert(resolvedOnchainAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')
+
+//     resolvedGraphqlAssetDdoAfterUpdate = await aquarius.waitForAqua(grapqlAssetId)
+//     assert(resolvedGraphqlAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')
+//   })
+// })

From f871aff5e3f5f60ca3d19c3b2b9951dad2926289 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 14:54:30 +0300
Subject: [PATCH 48/64] Add test back + add ABI.

---
 src/contracts/Datatoken.ts                  |    2 +-
 test/integration/PublishEditConsume.test.ts | 1071 +++++++++----------
 2 files changed, 536 insertions(+), 537 deletions(-)

diff --git a/src/contracts/Datatoken.ts b/src/contracts/Datatoken.ts
index b95f8a07b..609581ae2 100644
--- a/src/contracts/Datatoken.ts
+++ b/src/contracts/Datatoken.ts
@@ -502,7 +502,7 @@ export class Datatoken extends SmartContract {
     consumeMarketFee?: ConsumeMarketFee,
     estimateGas?: G
   ): Promise<ReceiptOrEstimate<G>> {
-    const dtContract = this.getContract(dtAddress)
+    const dtContract = this.getContract(dtAddress, this.abi)
     if (!consumeMarketFee) {
       consumeMarketFee = {
         consumeMarketFeeAddress: ZERO_ADDRESS,
diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index b40f1acc6..602ece380 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -1,536 +1,535 @@
-// import { assert } from 'chai'
-// import { ethers, Signer } from 'ethers'
-// import { getTestConfig, getAddresses, provider } from '../config'
-// import {
-//   Config,
-//   ProviderInstance,
-//   Aquarius,
-//   Datatoken,
-//   downloadFile,
-//   sendTx,
-//   transfer,
-//   amountToUnits
-// } from '../../src'
-// import { Files, Smartcontract } from '../../src/@types'
-// import { createAsset, orderAsset, updateAssetMetadata } from './helpers'
-
-// let config: Config
-
-// let aquarius: Aquarius
-// let datatoken: Datatoken
-// let datatokenConsumer: Datatoken
-// let providerUrl: string
-// let consumerAccount: Signer
-// let publisherAccount: Signer
-// let addresses: any
-
-// let urlAssetId
-// let resolvedUrlAssetDdo
-// let resolvedUrlAssetDdoAfterUpdate
-
-// let arweaveAssetId
-// let resolvedArweaveAssetDdo
-// let resolvedArweaveAssetDdoAfterUpdate
-
-// let ipfsAssetId
-// let resolvedIpfsAssetDdo
-// let resolvedIpfsAssetDdoAfterUpdate
-
-// let onchainAssetId
-// let resolvedOnchainAssetDdo
-// let resolvedOnchainAssetDdoAfterUpdate
-
-// let grapqlAssetId
-// let resolvedGraphqlAssetDdo
-// let resolvedGraphqlAssetDdoAfterUpdate
-
-// let urlOrderTx
-// let arwaveOrderTx
-// let ipfsOrderTx
-// let onchainOrderTx
-// let grapqlOrderTx
-
-// const urlFile: Files = {
-//   datatokenAddress: '0x0',
-//   nftAddress: '0x0',
-//   files: [
-//     {
-//       type: 'url',
-//       url: 'https://raw.githubusercontent.com/oceanprotocol/testdatasets/main/shs_dataset_test.txt',
-//       method: 'GET'
-//     }
-//   ]
-// }
-
-// const arweaveFile: Files = {
-//   datatokenAddress: '0x0',
-//   nftAddress: '0x0',
-//   files: [
-//     {
-//       type: 'arweave',
-//       transactionId: 'USuWnUl3gLPhm4TPbmL6E2a2e2SWMCVo9yWCaapD-98'
-//     }
-//   ]
-// }
-
-// const ifpsFile: Files = {
-//   datatokenAddress: '0x0',
-//   nftAddress: '0x0',
-//   files: [
-//     {
-//       type: 'ipfs',
-//       hash: 'QmdMBw956S3i2H2ioS9cERrtxoLJuSsfjzCvkqoDgUa2xm'
-//     }
-//   ]
-// }
-
-// const onchainFile: Files = {
-//   datatokenAddress: '0x0',
-//   nftAddress: '0x0',
-//   files: []
-// }
-
-// const grapqlFile: Files = {
-//   datatokenAddress: '0x0',
-//   nftAddress: '0x0',
-//   files: [
-//     {
-//       type: 'graphql',
-//       url: 'https://v4.subgraph.sepolia.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
-//       query: `"
-//           query{
-//                 nfts(orderBy: createdTimestamp,orderDirection:desc){
-//                      id
-//                      symbol
-//                      createdTimestamp
-//                 }
-//                }
-//                "`
-//     }
-//   ]
-// }
-
-// const assetDdo = {
-//   '@context': ['https://w3id.org/did/v1'],
-//   id: 'did:op:efba17455c127a885ec7830d687a8f6e64f5ba559f8506f8723c1f10f05c049c',
-//   version: '4.1.0',
-//   chainId: 4,
-//   nftAddress: '0x0',
-//   metadata: {
-//     created: '2021-12-20T14:35:20Z',
-//     updated: '2021-12-20T14:35:20Z',
-//     type: 'dataset',
-//     name: 'Test asset',
-//     description: 'desc for the storage type assets',
-//     tags: [''],
-//     author: 'ocean-protocol',
-//     license: 'https://market.oceanprotocol.com/terms',
-//     additionalInformation: {
-//       termsAndConditions: true
-//     }
-//   },
-//   services: [
-//     {
-//       id: 'testFakeId',
-//       type: 'access',
-//       files: '',
-//       datatokenAddress: '0x0',
-//       serviceEndpoint: 'http://172.15.0.4:8030',
-//       timeout: 0
-//     }
-//   ]
-// }
-
-// function delay(interval: number) {
-//   return it('should delay', (done) => {
-//     setTimeout(() => done(), interval)
-//   }).timeout(interval + 100)
-// }
-
-// describe('Publish consume test', async () => {
-//   before(async () => {
-//     publisherAccount = (await provider.getSigner(0)) as Signer
-//     consumerAccount = (await provider.getSigner(1)) as Signer
-//     config = await getTestConfig(publisherAccount)
-//     aquarius = new Aquarius(config?.metadataCacheUri)
-//     providerUrl = config?.providerUri
-//     addresses = getAddresses()
-//   })
-
-//   it('Mint OCEAN to publisher account', async () => {
-//     const minAbi = [
-//       {
-//         constant: false,
-//         inputs: [
-//           { name: 'to', type: 'address' },
-//           { name: 'value', type: 'uint256' }
-//         ],
-//         name: 'mint',
-//         outputs: [{ name: '', type: 'bool' }],
-//         payable: false,
-//         stateMutability: 'nonpayable',
-//         type: 'function'
-//       }
-//     ]
-
-//     const tokenContract = new ethers.Contract(addresses.Ocean, minAbi, publisherAccount)
-//     const estGas = await tokenContract.estimateGas.mint(
-//       await publisherAccount.getAddress(),
-//       amountToUnits(null, null, '1000', 18)
-//     )
-//     await sendTx(
-//       estGas,
-//       publisherAccount,
-//       1,
-//       tokenContract.mint,
-//       await publisherAccount.getAddress(),
-//       amountToUnits(null, null, '1000', 18)
-//     )
-//   })
-
-//   it('Send some OCEAN to consumer account', async () => {
-//     transfer(
-//       publisherAccount,
-//       config,
-//       addresses.Ocean,
-//       await consumerAccount.getAddress(),
-//       '100'
-//     )
-//   })
-
-//   it('Should publish the assets', async () => {
-//     urlAssetId = await createAsset(
-//       'UrlDatatoken',
-//       'URLDT',
-//       publisherAccount,
-//       urlFile,
-//       assetDdo,
-//       providerUrl,
-//       addresses.ERC721Factory,
-//       aquarius
-//     )
-//     assert(urlAssetId, 'Failed to publish url DDO')
-
-//     arweaveAssetId = await createAsset(
-//       'ArwaveDatatoken',
-//       'ARWAVEDT',
-//       publisherAccount,
-//       arweaveFile,
-//       assetDdo,
-//       providerUrl,
-//       addresses.ERC721Factory,
-//       aquarius
-//     )
-//     assert(urlAssetId, 'Failed to arwave publish DDO')
-
-//     ipfsAssetId = await createAsset(
-//       'IpfsDatatoken',
-//       'IPFSDT',
-//       publisherAccount,
-//       ifpsFile,
-//       assetDdo,
-//       providerUrl,
-//       addresses.ERC721Factory,
-//       aquarius
-//     )
-//     assert(urlAssetId, 'Failed to publish ipfs DDO')
-
-//     const chainFile: Smartcontract = {
-//       type: 'smartcontract',
-//       address: addresses.Router,
-//       abi: {
-//         inputs: [],
-//         name: 'swapOceanFee',
-//         outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
-//         stateMutability: 'view',
-//         type: 'function'
-//       },
-//       chainId: 8996
-//     }
-
-//     onchainFile.files[0] = chainFile
-//     onchainAssetId = await createAsset(
-//       'IpfsDatatoken',
-//       'IPFSDT',
-//       publisherAccount,
-//       onchainFile,
-//       assetDdo,
-//       providerUrl,
-//       addresses.ERC721Factory,
-//       aquarius
-//     )
-//     assert(onchainAssetId, 'Failed to publish onchain DDO')
-
-//     grapqlAssetId = await createAsset(
-//       'IpfsDatatoken',
-//       'IPFSDT',
-//       publisherAccount,
-//       grapqlFile,
-//       assetDdo,
-//       providerUrl,
-//       addresses.ERC721Factory,
-//       aquarius
-//     )
-//     assert(grapqlAssetId, 'Failed to publish graphql DDO')
-//   })
-
-//   delay(10000) // let's wait for aquarius to index the  assets
-
-//   it('Resolve published assets', async () => {
-//     resolvedUrlAssetDdo = await aquarius.waitForAqua(urlAssetId)
-//     assert(resolvedUrlAssetDdo, 'Cannot fetch url DDO from Aquarius')
-
-//     resolvedArweaveAssetDdo = await aquarius.waitForAqua(arweaveAssetId)
-//     assert(resolvedArweaveAssetDdo, 'Cannot fetch arwave DDO from Aquarius')
-
-//     resolvedIpfsAssetDdo = await aquarius.waitForAqua(ipfsAssetId)
-//     assert(resolvedIpfsAssetDdo, 'Cannot fetch ipfs DDO from Aquarius')
-
-//     resolvedOnchainAssetDdo = await aquarius.waitForAqua(onchainAssetId)
-//     assert(resolvedOnchainAssetDdo, 'Cannot fetch onchain DDO from Aquarius')
-
-//     resolvedGraphqlAssetDdo = await aquarius.waitForAqua(grapqlAssetId)
-//     assert(resolvedGraphqlAssetDdo, 'Cannot fetch graphql DDO from Aquarius')
-//   })
-
-//   it('Mint datasets datatokens to publisher', async () => {
-//     datatoken = new Datatoken(publisherAccount, config.chainId)
-//     const urlMintTx = await datatoken.mint(
-//       resolvedUrlAssetDdo.services[0].datatokenAddress,
-//       await publisherAccount.getAddress(),
-//       '10',
-//       await consumerAccount.getAddress()
-//     )
-//     assert(urlMintTx, 'Failed minting url datatoken to consumer.')
-
-//     const arwaveMintTx = await datatoken.mint(
-//       resolvedArweaveAssetDdo.services[0].datatokenAddress,
-//       await publisherAccount.getAddress(),
-//       '10',
-//       await consumerAccount.getAddress()
-//     )
-//     assert(arwaveMintTx, 'Failed minting arwave datatoken to consumer.')
-
-//     const ipfsMintTx = await datatoken.mint(
-//       resolvedIpfsAssetDdo.services[0].datatokenAddress,
-//       await publisherAccount.getAddress(),
-//       '10',
-//       await consumerAccount.getAddress()
-//     )
-//     assert(ipfsMintTx, 'Failed minting ipfs datatoken to consumer.')
-
-//     const onchainMintTx = await datatoken.mint(
-//       resolvedOnchainAssetDdo.services[0].datatokenAddress,
-//       await publisherAccount.getAddress(),
-//       '10',
-//       await consumerAccount.getAddress()
-//     )
-//     assert(onchainMintTx, 'Failed minting onchain datatoken to consumer.')
-
-//     const graphqlMintTx = await datatoken.mint(
-//       resolvedGraphqlAssetDdo.services[0].datatokenAddress,
-//       await publisherAccount.getAddress(),
-//       '10',
-//       await consumerAccount.getAddress()
-//     )
-//     assert(graphqlMintTx, 'Failed minting graphql datatoken to consumer.')
-//   })
-
-//   it('Should order the datasets', async () => {
-//     datatokenConsumer = new Datatoken(consumerAccount, config.chainId)
-
-//     urlOrderTx = await orderAsset(
-//       resolvedUrlAssetDdo.id,
-//       resolvedUrlAssetDdo.services[0].datatokenAddress,
-//       await consumerAccount.getAddress(),
-//       resolvedUrlAssetDdo.services[0].id,
-//       0,
-//       datatokenConsumer,
-//       providerUrl
-//     )
-//     assert(urlOrderTx, 'Ordering url dataset failed.')
-
-//     arwaveOrderTx = await orderAsset(
-//       resolvedArweaveAssetDdo.id,
-//       resolvedArweaveAssetDdo.services[0].datatokenAddress,
-//       await consumerAccount.getAddress(),
-//       resolvedArweaveAssetDdo.services[0].id,
-//       0,
-//       datatokenConsumer,
-//       providerUrl
-//     )
-//     assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
-
-//     onchainOrderTx = await orderAsset(
-//       resolvedOnchainAssetDdo.id,
-//       resolvedOnchainAssetDdo.services[0].datatokenAddress,
-//       await consumerAccount.getAddress(),
-//       resolvedOnchainAssetDdo.services[0].id,
-//       0,
-//       datatokenConsumer,
-//       providerUrl
-//     )
-//     assert(onchainOrderTx, 'Ordering onchain dataset failed.')
-
-//     ipfsOrderTx = await orderAsset(
-//       resolvedIpfsAssetDdo.id,
-//       resolvedIpfsAssetDdo.services[0].datatokenAddress,
-//       await consumerAccount.getAddress(),
-//       resolvedIpfsAssetDdo.services[0].id,
-//       0,
-//       datatokenConsumer,
-//       providerUrl
-//     )
-//     assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
-
-//     grapqlOrderTx = await orderAsset(
-//       resolvedGraphqlAssetDdo.id,
-//       resolvedGraphqlAssetDdo.services[0].datatokenAddress,
-//       await consumerAccount.getAddress(),
-//       resolvedGraphqlAssetDdo.services[0].id,
-//       0,
-//       datatokenConsumer,
-//       providerUrl
-//     )
-//     assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
-//   }).timeout(70000)
-
-//   it('Should download the datasets files', async () => {
-//     const urlDownloadUrl = await ProviderInstance.getDownloadUrl(
-//       resolvedUrlAssetDdo.id,
-//       resolvedUrlAssetDdo.services[0].id,
-//       0,
-//       urlOrderTx.transactionHash,
-//       providerUrl,
-//       consumerAccount
-//     )
-//     assert(urlDownloadUrl, 'Provider getDownloadUrl failed for url dataset')
-//     try {
-//       await downloadFile(urlDownloadUrl)
-//     } catch (e) {
-//       assert.fail(`Download url dataset failed: ${e}`)
-//     }
-//     const arwaveDownloadURL = await ProviderInstance.getDownloadUrl(
-//       resolvedArweaveAssetDdo.id,
-//       resolvedArweaveAssetDdo.services[0].id,
-//       0,
-//       arwaveOrderTx.transactionHash,
-//       providerUrl,
-//       consumerAccount
-//     )
-//     assert(arwaveDownloadURL, 'Provider getDownloadUrl failed for arwave dataset')
-//     try {
-//       await downloadFile(arwaveDownloadURL)
-//     } catch (e) {
-//       assert.fail(`Download arwave dataset failed: ${e}`)
-//     }
-//     const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
-//       resolvedIpfsAssetDdo.id,
-//       resolvedIpfsAssetDdo.services[0].id,
-//       0,
-//       ipfsOrderTx.transactionHash,
-//       providerUrl,
-//       consumerAccount
-//     )
-//     assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
-//     try {
-//       await downloadFile(ipfsDownloadURL)
-//     } catch (e) {
-//       assert.fail(`Download ipfs dataset failed ${e}`)
-//     }
-//     const onchainDownloadURL = await ProviderInstance.getDownloadUrl(
-//       resolvedOnchainAssetDdo.id,
-//       resolvedOnchainAssetDdo.services[0].id,
-//       0,
-//       onchainOrderTx.transactionHash,
-//       providerUrl,
-//       consumerAccount
-//     )
-//     assert(onchainDownloadURL, 'Provider getDownloadUrl failed for onchain dataset')
-//     try {
-//       await downloadFile(onchainDownloadURL)
-//     } catch (e) {
-//       assert.fail(`Download onchain dataset failed ${e}`)
-//     }
-//     const graphqlDownloadURL = await ProviderInstance.getDownloadUrl(
-//       resolvedGraphqlAssetDdo.id,
-//       resolvedGraphqlAssetDdo.services[0].id,
-//       0,
-//       grapqlOrderTx.transactionHash,
-//       providerUrl,
-//       consumerAccount
-//     )
-//     assert(graphqlDownloadURL, 'Provider getDownloadUrl failed for graphql dataset')
-//     try {
-//       await downloadFile(graphqlDownloadURL)
-//     } catch (e) {
-//       assert.fail(`Download graphql dataset failed ${e}`)
-//     }
-//   })
-
-//   it('Should update datasets metadata', async () => {
-//     resolvedUrlAssetDdo.metadata.name = 'updated url asset name'
-//     const updateUrlTx = await updateAssetMetadata(
-//       publisherAccount,
-//       resolvedUrlAssetDdo,
-//       providerUrl,
-//       aquarius
-//     )
-//     assert(updateUrlTx, 'Failed to update url asset metadata')
-
-//     resolvedArweaveAssetDdo.metadata.name = 'updated arwave asset name'
-//     const updateArwaveTx = await updateAssetMetadata(
-//       publisherAccount,
-//       resolvedArweaveAssetDdo,
-//       providerUrl,
-//       aquarius
-//     )
-//     assert(updateArwaveTx, 'Failed to update arwave asset metadata')
-
-//     resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
-//     const updateIpfsTx = await updateAssetMetadata(
-//       publisherAccount,
-//       resolvedIpfsAssetDdo,
-//       providerUrl,
-//       aquarius
-//     )
-//     assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
-
-//     resolvedOnchainAssetDdo.metadata.name = 'updated onchain asset name'
-//     const updateOnchainTx = await updateAssetMetadata(
-//       publisherAccount,
-//       resolvedOnchainAssetDdo,
-//       providerUrl,
-//       aquarius
-//     )
-//     assert(updateOnchainTx, 'Failed to update ipfs asset metadata')
-
-//     resolvedGraphqlAssetDdo.metadata.name = 'updated graphql asset name'
-//     const updateGraphqlTx = await updateAssetMetadata(
-//       publisherAccount,
-//       resolvedGraphqlAssetDdo,
-//       providerUrl,
-//       aquarius
-//     )
-//     assert(updateGraphqlTx, 'Failed to update graphql asset metadata')
-//   })
-
-//   delay(10000) // let's wait for aquarius to index the updated ddo's
-
-//   it('Should resolve updated datasets', async () => {
-//     resolvedUrlAssetDdoAfterUpdate = await aquarius.waitForAqua(urlAssetId)
-//     assert(resolvedUrlAssetDdoAfterUpdate, 'Cannot fetch url DDO from Aquarius')
-
-//     resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
-//     assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
-
-//     resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
-//     assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
-
-//     resolvedOnchainAssetDdoAfterUpdate = await aquarius.waitForAqua(onchainAssetId)
-//     assert(resolvedOnchainAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')
-
-//     resolvedGraphqlAssetDdoAfterUpdate = await aquarius.waitForAqua(grapqlAssetId)
-//     assert(resolvedGraphqlAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')
-//   })
-// })
+import { assert } from 'chai'
+import { ethers, Signer } from 'ethers'
+import { getTestConfig, getAddresses, provider } from '../config'
+import {
+  Config,
+  ProviderInstance,
+  Aquarius,
+  Datatoken,
+  downloadFile,
+  sendTx,
+  transfer,
+  amountToUnits
+} from '../../src'
+import { Files, Smartcontract } from '../../src/@types'
+import { createAsset, orderAsset, updateAssetMetadata } from './helpers'
+
+let config: Config
+
+let aquarius: Aquarius
+let datatoken: Datatoken
+let providerUrl: string
+let consumerAccount: Signer
+let publisherAccount: Signer
+let addresses: any
+
+let urlAssetId
+let resolvedUrlAssetDdo
+let resolvedUrlAssetDdoAfterUpdate
+
+let arweaveAssetId
+let resolvedArweaveAssetDdo
+let resolvedArweaveAssetDdoAfterUpdate
+
+let ipfsAssetId
+let resolvedIpfsAssetDdo
+let resolvedIpfsAssetDdoAfterUpdate
+
+let onchainAssetId
+let resolvedOnchainAssetDdo
+let resolvedOnchainAssetDdoAfterUpdate
+
+let grapqlAssetId
+let resolvedGraphqlAssetDdo
+let resolvedGraphqlAssetDdoAfterUpdate
+
+let urlOrderTx
+let arwaveOrderTx
+let ipfsOrderTx
+let onchainOrderTx
+let grapqlOrderTx
+
+const urlFile: Files = {
+  datatokenAddress: '0x0',
+  nftAddress: '0x0',
+  files: [
+    {
+      type: 'url',
+      url: 'https://raw.githubusercontent.com/oceanprotocol/testdatasets/main/shs_dataset_test.txt',
+      method: 'GET'
+    }
+  ]
+}
+
+const arweaveFile: Files = {
+  datatokenAddress: '0x0',
+  nftAddress: '0x0',
+  files: [
+    {
+      type: 'arweave',
+      transactionId: 'USuWnUl3gLPhm4TPbmL6E2a2e2SWMCVo9yWCaapD-98'
+    }
+  ]
+}
+
+const ifpsFile: Files = {
+  datatokenAddress: '0x0',
+  nftAddress: '0x0',
+  files: [
+    {
+      type: 'ipfs',
+      hash: 'QmdMBw956S3i2H2ioS9cERrtxoLJuSsfjzCvkqoDgUa2xm'
+    }
+  ]
+}
+
+const onchainFile: Files = {
+  datatokenAddress: '0x0',
+  nftAddress: '0x0',
+  files: []
+}
+
+const grapqlFile: Files = {
+  datatokenAddress: '0x0',
+  nftAddress: '0x0',
+  files: [
+    {
+      type: 'graphql',
+      url: 'https://v4.subgraph.sepolia.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
+      query: `"
+          query{
+                nfts(orderBy: createdTimestamp,orderDirection:desc){
+                     id
+                     symbol
+                     createdTimestamp
+                }
+               }
+               "`
+    }
+  ]
+}
+
+const assetDdo = {
+  '@context': ['https://w3id.org/did/v1'],
+  id: 'did:op:efba17455c127a885ec7830d687a8f6e64f5ba559f8506f8723c1f10f05c049c',
+  version: '4.1.0',
+  chainId: 4,
+  nftAddress: '0x0',
+  metadata: {
+    created: '2021-12-20T14:35:20Z',
+    updated: '2021-12-20T14:35:20Z',
+    type: 'dataset',
+    name: 'Test asset',
+    description: 'desc for the storage type assets',
+    tags: [''],
+    author: 'ocean-protocol',
+    license: 'https://market.oceanprotocol.com/terms',
+    additionalInformation: {
+      termsAndConditions: true
+    }
+  },
+  services: [
+    {
+      id: 'testFakeId',
+      type: 'access',
+      files: '',
+      datatokenAddress: '0x0',
+      serviceEndpoint: 'http://172.15.0.4:8030',
+      timeout: 0
+    }
+  ]
+}
+
+function delay(interval: number) {
+  return it('should delay', (done) => {
+    setTimeout(() => done(), interval)
+  }).timeout(interval + 100)
+}
+
+describe('Publish consume test', async () => {
+  before(async () => {
+    publisherAccount = (await provider.getSigner(0)) as Signer
+    consumerAccount = (await provider.getSigner(1)) as Signer
+    config = await getTestConfig(publisherAccount)
+    aquarius = new Aquarius(config?.metadataCacheUri)
+    providerUrl = config?.providerUri
+    addresses = getAddresses()
+  })
+
+  it('Mint OCEAN to publisher account', async () => {
+    const minAbi = [
+      {
+        constant: false,
+        inputs: [
+          { name: 'to', type: 'address' },
+          { name: 'value', type: 'uint256' }
+        ],
+        name: 'mint',
+        outputs: [{ name: '', type: 'bool' }],
+        payable: false,
+        stateMutability: 'nonpayable',
+        type: 'function'
+      }
+    ]
+
+    const tokenContract = new ethers.Contract(addresses.Ocean, minAbi, publisherAccount)
+    const estGas = await tokenContract.estimateGas.mint(
+      await publisherAccount.getAddress(),
+      amountToUnits(null, null, '1000', 18)
+    )
+    await sendTx(
+      estGas,
+      publisherAccount,
+      1,
+      tokenContract.mint,
+      await publisherAccount.getAddress(),
+      amountToUnits(null, null, '1000', 18)
+    )
+  })
+
+  it('Send some OCEAN to consumer account', async () => {
+    transfer(
+      publisherAccount,
+      config,
+      addresses.Ocean,
+      await consumerAccount.getAddress(),
+      '100'
+    )
+  })
+
+  it('Should publish the assets', async () => {
+    urlAssetId = await createAsset(
+      'UrlDatatoken',
+      'URLDT',
+      publisherAccount,
+      urlFile,
+      assetDdo,
+      providerUrl,
+      addresses.ERC721Factory,
+      aquarius
+    )
+    assert(urlAssetId, 'Failed to publish url DDO')
+
+    arweaveAssetId = await createAsset(
+      'ArwaveDatatoken',
+      'ARWAVEDT',
+      publisherAccount,
+      arweaveFile,
+      assetDdo,
+      providerUrl,
+      addresses.ERC721Factory,
+      aquarius
+    )
+    assert(urlAssetId, 'Failed to arwave publish DDO')
+
+    ipfsAssetId = await createAsset(
+      'IpfsDatatoken',
+      'IPFSDT',
+      publisherAccount,
+      ifpsFile,
+      assetDdo,
+      providerUrl,
+      addresses.ERC721Factory,
+      aquarius
+    )
+    assert(urlAssetId, 'Failed to publish ipfs DDO')
+
+    const chainFile: Smartcontract = {
+      type: 'smartcontract',
+      address: addresses.Router,
+      abi: {
+        inputs: [],
+        name: 'swapOceanFee',
+        outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+        stateMutability: 'view',
+        type: 'function'
+      },
+      chainId: 8996
+    }
+
+    onchainFile.files[0] = chainFile
+    onchainAssetId = await createAsset(
+      'IpfsDatatoken',
+      'IPFSDT',
+      publisherAccount,
+      onchainFile,
+      assetDdo,
+      providerUrl,
+      addresses.ERC721Factory,
+      aquarius
+    )
+    assert(onchainAssetId, 'Failed to publish onchain DDO')
+
+    grapqlAssetId = await createAsset(
+      'IpfsDatatoken',
+      'IPFSDT',
+      publisherAccount,
+      grapqlFile,
+      assetDdo,
+      providerUrl,
+      addresses.ERC721Factory,
+      aquarius
+    )
+    assert(grapqlAssetId, 'Failed to publish graphql DDO')
+  })
+
+  delay(10000) // let's wait for aquarius to index the  assets
+
+  it('Resolve published assets', async () => {
+    resolvedUrlAssetDdo = await aquarius.waitForAqua(urlAssetId)
+    assert(resolvedUrlAssetDdo, 'Cannot fetch url DDO from Aquarius')
+
+    resolvedArweaveAssetDdo = await aquarius.waitForAqua(arweaveAssetId)
+    assert(resolvedArweaveAssetDdo, 'Cannot fetch arwave DDO from Aquarius')
+
+    resolvedIpfsAssetDdo = await aquarius.waitForAqua(ipfsAssetId)
+    assert(resolvedIpfsAssetDdo, 'Cannot fetch ipfs DDO from Aquarius')
+
+    resolvedOnchainAssetDdo = await aquarius.waitForAqua(onchainAssetId)
+    assert(resolvedOnchainAssetDdo, 'Cannot fetch onchain DDO from Aquarius')
+
+    resolvedGraphqlAssetDdo = await aquarius.waitForAqua(grapqlAssetId)
+    assert(resolvedGraphqlAssetDdo, 'Cannot fetch graphql DDO from Aquarius')
+  })
+
+  it('Mint datasets datatokens to publisher', async () => {
+    datatoken = new Datatoken(publisherAccount, config.chainId)
+    const urlMintTx = await datatoken.mint(
+      resolvedUrlAssetDdo.services[0].datatokenAddress,
+      await publisherAccount.getAddress(),
+      '10',
+      await consumerAccount.getAddress()
+    )
+    assert(urlMintTx, 'Failed minting url datatoken to consumer.')
+
+    const arwaveMintTx = await datatoken.mint(
+      resolvedArweaveAssetDdo.services[0].datatokenAddress,
+      await publisherAccount.getAddress(),
+      '10',
+      await consumerAccount.getAddress()
+    )
+    assert(arwaveMintTx, 'Failed minting arwave datatoken to consumer.')
+
+    const ipfsMintTx = await datatoken.mint(
+      resolvedIpfsAssetDdo.services[0].datatokenAddress,
+      await publisherAccount.getAddress(),
+      '10',
+      await consumerAccount.getAddress()
+    )
+    assert(ipfsMintTx, 'Failed minting ipfs datatoken to consumer.')
+
+    const onchainMintTx = await datatoken.mint(
+      resolvedOnchainAssetDdo.services[0].datatokenAddress,
+      await publisherAccount.getAddress(),
+      '10',
+      await consumerAccount.getAddress()
+    )
+    assert(onchainMintTx, 'Failed minting onchain datatoken to consumer.')
+
+    const graphqlMintTx = await datatoken.mint(
+      resolvedGraphqlAssetDdo.services[0].datatokenAddress,
+      await publisherAccount.getAddress(),
+      '10',
+      await consumerAccount.getAddress()
+    )
+    assert(graphqlMintTx, 'Failed minting graphql datatoken to consumer.')
+  })
+
+  it('Should order the datasets', async () => {
+    datatoken = new Datatoken(consumerAccount, config.chainId)
+
+    urlOrderTx = await orderAsset(
+      resolvedUrlAssetDdo.id,
+      resolvedUrlAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedUrlAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(urlOrderTx, 'Ordering url dataset failed.')
+
+    arwaveOrderTx = await orderAsset(
+      resolvedArweaveAssetDdo.id,
+      resolvedArweaveAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedArweaveAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
+
+    onchainOrderTx = await orderAsset(
+      resolvedOnchainAssetDdo.id,
+      resolvedOnchainAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedOnchainAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(onchainOrderTx, 'Ordering onchain dataset failed.')
+
+    ipfsOrderTx = await orderAsset(
+      resolvedIpfsAssetDdo.id,
+      resolvedIpfsAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedIpfsAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
+
+    grapqlOrderTx = await orderAsset(
+      resolvedGraphqlAssetDdo.id,
+      resolvedGraphqlAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedGraphqlAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
+  }).timeout(70000)
+
+  it('Should download the datasets files', async () => {
+    const urlDownloadUrl = await ProviderInstance.getDownloadUrl(
+      resolvedUrlAssetDdo.id,
+      resolvedUrlAssetDdo.services[0].id,
+      0,
+      urlOrderTx.transactionHash,
+      providerUrl,
+      consumerAccount
+    )
+    assert(urlDownloadUrl, 'Provider getDownloadUrl failed for url dataset')
+    try {
+      await downloadFile(urlDownloadUrl)
+    } catch (e) {
+      assert.fail(`Download url dataset failed: ${e}`)
+    }
+    const arwaveDownloadURL = await ProviderInstance.getDownloadUrl(
+      resolvedArweaveAssetDdo.id,
+      resolvedArweaveAssetDdo.services[0].id,
+      0,
+      arwaveOrderTx.transactionHash,
+      providerUrl,
+      consumerAccount
+    )
+    assert(arwaveDownloadURL, 'Provider getDownloadUrl failed for arwave dataset')
+    try {
+      await downloadFile(arwaveDownloadURL)
+    } catch (e) {
+      assert.fail(`Download arwave dataset failed: ${e}`)
+    }
+    const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
+      resolvedIpfsAssetDdo.id,
+      resolvedIpfsAssetDdo.services[0].id,
+      0,
+      ipfsOrderTx.transactionHash,
+      providerUrl,
+      consumerAccount
+    )
+    assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
+    try {
+      await downloadFile(ipfsDownloadURL)
+    } catch (e) {
+      assert.fail(`Download ipfs dataset failed ${e}`)
+    }
+    const onchainDownloadURL = await ProviderInstance.getDownloadUrl(
+      resolvedOnchainAssetDdo.id,
+      resolvedOnchainAssetDdo.services[0].id,
+      0,
+      onchainOrderTx.transactionHash,
+      providerUrl,
+      consumerAccount
+    )
+    assert(onchainDownloadURL, 'Provider getDownloadUrl failed for onchain dataset')
+    try {
+      await downloadFile(onchainDownloadURL)
+    } catch (e) {
+      assert.fail(`Download onchain dataset failed ${e}`)
+    }
+    const graphqlDownloadURL = await ProviderInstance.getDownloadUrl(
+      resolvedGraphqlAssetDdo.id,
+      resolvedGraphqlAssetDdo.services[0].id,
+      0,
+      grapqlOrderTx.transactionHash,
+      providerUrl,
+      consumerAccount
+    )
+    assert(graphqlDownloadURL, 'Provider getDownloadUrl failed for graphql dataset')
+    try {
+      await downloadFile(graphqlDownloadURL)
+    } catch (e) {
+      assert.fail(`Download graphql dataset failed ${e}`)
+    }
+  })
+
+  it('Should update datasets metadata', async () => {
+    resolvedUrlAssetDdo.metadata.name = 'updated url asset name'
+    const updateUrlTx = await updateAssetMetadata(
+      publisherAccount,
+      resolvedUrlAssetDdo,
+      providerUrl,
+      aquarius
+    )
+    assert(updateUrlTx, 'Failed to update url asset metadata')
+
+    resolvedArweaveAssetDdo.metadata.name = 'updated arwave asset name'
+    const updateArwaveTx = await updateAssetMetadata(
+      publisherAccount,
+      resolvedArweaveAssetDdo,
+      providerUrl,
+      aquarius
+    )
+    assert(updateArwaveTx, 'Failed to update arwave asset metadata')
+
+    resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
+    const updateIpfsTx = await updateAssetMetadata(
+      publisherAccount,
+      resolvedIpfsAssetDdo,
+      providerUrl,
+      aquarius
+    )
+    assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
+
+    resolvedOnchainAssetDdo.metadata.name = 'updated onchain asset name'
+    const updateOnchainTx = await updateAssetMetadata(
+      publisherAccount,
+      resolvedOnchainAssetDdo,
+      providerUrl,
+      aquarius
+    )
+    assert(updateOnchainTx, 'Failed to update ipfs asset metadata')
+
+    resolvedGraphqlAssetDdo.metadata.name = 'updated graphql asset name'
+    const updateGraphqlTx = await updateAssetMetadata(
+      publisherAccount,
+      resolvedGraphqlAssetDdo,
+      providerUrl,
+      aquarius
+    )
+    assert(updateGraphqlTx, 'Failed to update graphql asset metadata')
+  })
+
+  delay(10000) // let's wait for aquarius to index the updated ddo's
+
+  it('Should resolve updated datasets', async () => {
+    resolvedUrlAssetDdoAfterUpdate = await aquarius.waitForAqua(urlAssetId)
+    assert(resolvedUrlAssetDdoAfterUpdate, 'Cannot fetch url DDO from Aquarius')
+
+    resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
+    assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
+
+    resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
+    assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
+
+    resolvedOnchainAssetDdoAfterUpdate = await aquarius.waitForAqua(onchainAssetId)
+    assert(resolvedOnchainAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')
+
+    resolvedGraphqlAssetDdoAfterUpdate = await aquarius.waitForAqua(grapqlAssetId)
+    assert(resolvedGraphqlAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')
+  })
+})

From 81ec8c4aa33f98d1ed7e44a75d78c40552428c51 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 15:12:21 +0300
Subject: [PATCH 49/64] added debug log.

---
 src/contracts/Datatoken.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/contracts/Datatoken.ts b/src/contracts/Datatoken.ts
index 609581ae2..f2eb8d908 100644
--- a/src/contracts/Datatoken.ts
+++ b/src/contracts/Datatoken.ts
@@ -529,6 +529,7 @@ export class Datatoken extends SmartContract {
       providerFees,
       consumeMarketFee
     )
+    console.log(`trxReceipt: `, trxReceipt)
     return <ReceiptOrEstimate<G>>trxReceipt
   }
 

From b3694a2a4e3cbb2244c8857cb25bbd6d69412701 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 16:13:18 +0300
Subject: [PATCH 50/64] increase timeout.

---
 test/integration/PublishEditConsume.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index 602ece380..e939fe5e7 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -392,7 +392,7 @@ describe('Publish consume test', async () => {
       providerUrl
     )
     assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
-  }).timeout(70000)
+  }).timeout(200000)
 
   it('Should download the datasets files', async () => {
     const urlDownloadUrl = await ProviderInstance.getDownloadUrl(

From badeacb6a9cf15779d7bd11ae19f52347a1cc891 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 16:29:56 +0300
Subject: [PATCH 51/64] Comment tests with external services.

---
 test/integration/PublishEditConsume.test.ts | 138 ++++++++++----------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index e939fe5e7..b869a4a5f 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -349,16 +349,16 @@ describe('Publish consume test', async () => {
     )
     assert(urlOrderTx, 'Ordering url dataset failed.')
 
-    arwaveOrderTx = await orderAsset(
-      resolvedArweaveAssetDdo.id,
-      resolvedArweaveAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedArweaveAssetDdo.services[0].id,
-      0,
-      datatoken,
-      providerUrl
-    )
-    assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
+    // arwaveOrderTx = await orderAsset(
+    //   resolvedArweaveAssetDdo.id,
+    //   resolvedArweaveAssetDdo.services[0].datatokenAddress,
+    //   await consumerAccount.getAddress(),
+    //   resolvedArweaveAssetDdo.services[0].id,
+    //   0,
+    //   datatoken,
+    //   providerUrl
+    // )
+    // assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
 
     onchainOrderTx = await orderAsset(
       resolvedOnchainAssetDdo.id,
@@ -371,15 +371,15 @@ describe('Publish consume test', async () => {
     )
     assert(onchainOrderTx, 'Ordering onchain dataset failed.')
 
-    ipfsOrderTx = await orderAsset(
-      resolvedIpfsAssetDdo.id,
-      resolvedIpfsAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedIpfsAssetDdo.services[0].id,
-      0,
-      datatoken,
-      providerUrl
-    )
+    // ipfsOrderTx = await orderAsset(
+    //   resolvedIpfsAssetDdo.id,
+    //   resolvedIpfsAssetDdo.services[0].datatokenAddress,
+    //   await consumerAccount.getAddress(),
+    //   resolvedIpfsAssetDdo.services[0].id,
+    //   0,
+    //   datatoken,
+    //   providerUrl
+    // )
     assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
 
     grapqlOrderTx = await orderAsset(
@@ -392,7 +392,7 @@ describe('Publish consume test', async () => {
       providerUrl
     )
     assert(grapqlOrderTx, 'Ordering graphql dataset failed.')
-  }).timeout(200000)
+  }).timeout(40000)
 
   it('Should download the datasets files', async () => {
     const urlDownloadUrl = await ProviderInstance.getDownloadUrl(
@@ -409,34 +409,34 @@ describe('Publish consume test', async () => {
     } catch (e) {
       assert.fail(`Download url dataset failed: ${e}`)
     }
-    const arwaveDownloadURL = await ProviderInstance.getDownloadUrl(
-      resolvedArweaveAssetDdo.id,
-      resolvedArweaveAssetDdo.services[0].id,
-      0,
-      arwaveOrderTx.transactionHash,
-      providerUrl,
-      consumerAccount
-    )
-    assert(arwaveDownloadURL, 'Provider getDownloadUrl failed for arwave dataset')
-    try {
-      await downloadFile(arwaveDownloadURL)
-    } catch (e) {
-      assert.fail(`Download arwave dataset failed: ${e}`)
-    }
-    const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
-      resolvedIpfsAssetDdo.id,
-      resolvedIpfsAssetDdo.services[0].id,
-      0,
-      ipfsOrderTx.transactionHash,
-      providerUrl,
-      consumerAccount
-    )
-    assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
-    try {
-      await downloadFile(ipfsDownloadURL)
-    } catch (e) {
-      assert.fail(`Download ipfs dataset failed ${e}`)
-    }
+    // const arwaveDownloadURL = await ProviderInstance.getDownloadUrl(
+    //   resolvedArweaveAssetDdo.id,
+    //   resolvedArweaveAssetDdo.services[0].id,
+    //   0,
+    //   arwaveOrderTx.transactionHash,
+    //   providerUrl,
+    //   consumerAccount
+    // )
+    // assert(arwaveDownloadURL, 'Provider getDownloadUrl failed for arwave dataset')
+    // try {
+    //   await downloadFile(arwaveDownloadURL)
+    // } catch (e) {
+    //   assert.fail(`Download arwave dataset failed: ${e}`)
+    // }
+    // const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
+    //   resolvedIpfsAssetDdo.id,
+    //   resolvedIpfsAssetDdo.services[0].id,
+    //   0,
+    //   ipfsOrderTx.transactionHash,
+    //   providerUrl,
+    //   consumerAccount
+    // )
+    // assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
+    // try {
+    //   await downloadFile(ipfsDownloadURL)
+    // } catch (e) {
+    //   assert.fail(`Download ipfs dataset failed ${e}`)
+    // }
     const onchainDownloadURL = await ProviderInstance.getDownloadUrl(
       resolvedOnchainAssetDdo.id,
       resolvedOnchainAssetDdo.services[0].id,
@@ -477,23 +477,23 @@ describe('Publish consume test', async () => {
     )
     assert(updateUrlTx, 'Failed to update url asset metadata')
 
-    resolvedArweaveAssetDdo.metadata.name = 'updated arwave asset name'
-    const updateArwaveTx = await updateAssetMetadata(
-      publisherAccount,
-      resolvedArweaveAssetDdo,
-      providerUrl,
-      aquarius
-    )
-    assert(updateArwaveTx, 'Failed to update arwave asset metadata')
-
-    resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
-    const updateIpfsTx = await updateAssetMetadata(
-      publisherAccount,
-      resolvedIpfsAssetDdo,
-      providerUrl,
-      aquarius
-    )
-    assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
+    // resolvedArweaveAssetDdo.metadata.name = 'updated arwave asset name'
+    // const updateArwaveTx = await updateAssetMetadata(
+    //   publisherAccount,
+    //   resolvedArweaveAssetDdo,
+    //   providerUrl,
+    //   aquarius
+    // )
+    // assert(updateArwaveTx, 'Failed to update arwave asset metadata')
+
+    // resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
+    // const updateIpfsTx = await updateAssetMetadata(
+    //   publisherAccount,
+    //   resolvedIpfsAssetDdo,
+    //   providerUrl,
+    //   aquarius
+    // )
+    // assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
 
     resolvedOnchainAssetDdo.metadata.name = 'updated onchain asset name'
     const updateOnchainTx = await updateAssetMetadata(
@@ -520,11 +520,11 @@ describe('Publish consume test', async () => {
     resolvedUrlAssetDdoAfterUpdate = await aquarius.waitForAqua(urlAssetId)
     assert(resolvedUrlAssetDdoAfterUpdate, 'Cannot fetch url DDO from Aquarius')
 
-    resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
-    assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
+    // resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
+    // assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
 
-    resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
-    assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
+    // resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
+    // assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
 
     resolvedOnchainAssetDdoAfterUpdate = await aquarius.waitForAqua(onchainAssetId)
     assert(resolvedOnchainAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')

From c1b5a486bf4045c8b211ef55b4b8568686caf535 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 17:04:32 +0300
Subject: [PATCH 52/64] fix graphql URL.

---
 test/integration/PublishEditConsume.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index b869a4a5f..38666c606 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -95,7 +95,7 @@ const grapqlFile: Files = {
   files: [
     {
       type: 'graphql',
-      url: 'https://v4.subgraph.sepolia.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
+      url: 'https://v4.subgraph.sepolia.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql',
       query: `"
           query{
                 nfts(orderBy: createdTimestamp,orderDirection:desc){
@@ -380,7 +380,7 @@ describe('Publish consume test', async () => {
     //   datatoken,
     //   providerUrl
     // )
-    assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
+    // assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
 
     grapqlOrderTx = await orderAsset(
       resolvedGraphqlAssetDdo.id,

From b6120610d2e60b121a45096b97a1311ab0fb2338 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 17:17:48 +0300
Subject: [PATCH 53/64] Insert arweave.

---
 test/integration/PublishEditConsume.test.ts | 68 ++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index 38666c606..311d37162 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -349,16 +349,16 @@ describe('Publish consume test', async () => {
     )
     assert(urlOrderTx, 'Ordering url dataset failed.')
 
-    // arwaveOrderTx = await orderAsset(
-    //   resolvedArweaveAssetDdo.id,
-    //   resolvedArweaveAssetDdo.services[0].datatokenAddress,
-    //   await consumerAccount.getAddress(),
-    //   resolvedArweaveAssetDdo.services[0].id,
-    //   0,
-    //   datatoken,
-    //   providerUrl
-    // )
-    // assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
+    arwaveOrderTx = await orderAsset(
+      resolvedArweaveAssetDdo.id,
+      resolvedArweaveAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedArweaveAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
 
     onchainOrderTx = await orderAsset(
       resolvedOnchainAssetDdo.id,
@@ -409,20 +409,20 @@ describe('Publish consume test', async () => {
     } catch (e) {
       assert.fail(`Download url dataset failed: ${e}`)
     }
-    // const arwaveDownloadURL = await ProviderInstance.getDownloadUrl(
-    //   resolvedArweaveAssetDdo.id,
-    //   resolvedArweaveAssetDdo.services[0].id,
-    //   0,
-    //   arwaveOrderTx.transactionHash,
-    //   providerUrl,
-    //   consumerAccount
-    // )
-    // assert(arwaveDownloadURL, 'Provider getDownloadUrl failed for arwave dataset')
-    // try {
-    //   await downloadFile(arwaveDownloadURL)
-    // } catch (e) {
-    //   assert.fail(`Download arwave dataset failed: ${e}`)
-    // }
+    const arwaveDownloadURL = await ProviderInstance.getDownloadUrl(
+      resolvedArweaveAssetDdo.id,
+      resolvedArweaveAssetDdo.services[0].id,
+      0,
+      arwaveOrderTx.transactionHash,
+      providerUrl,
+      consumerAccount
+    )
+    assert(arwaveDownloadURL, 'Provider getDownloadUrl failed for arwave dataset')
+    try {
+      await downloadFile(arwaveDownloadURL)
+    } catch (e) {
+      assert.fail(`Download arwave dataset failed: ${e}`)
+    }
     // const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
     //   resolvedIpfsAssetDdo.id,
     //   resolvedIpfsAssetDdo.services[0].id,
@@ -477,14 +477,14 @@ describe('Publish consume test', async () => {
     )
     assert(updateUrlTx, 'Failed to update url asset metadata')
 
-    // resolvedArweaveAssetDdo.metadata.name = 'updated arwave asset name'
-    // const updateArwaveTx = await updateAssetMetadata(
-    //   publisherAccount,
-    //   resolvedArweaveAssetDdo,
-    //   providerUrl,
-    //   aquarius
-    // )
-    // assert(updateArwaveTx, 'Failed to update arwave asset metadata')
+    resolvedArweaveAssetDdo.metadata.name = 'updated arwave asset name'
+    const updateArwaveTx = await updateAssetMetadata(
+      publisherAccount,
+      resolvedArweaveAssetDdo,
+      providerUrl,
+      aquarius
+    )
+    assert(updateArwaveTx, 'Failed to update arwave asset metadata')
 
     // resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
     // const updateIpfsTx = await updateAssetMetadata(
@@ -520,8 +520,8 @@ describe('Publish consume test', async () => {
     resolvedUrlAssetDdoAfterUpdate = await aquarius.waitForAqua(urlAssetId)
     assert(resolvedUrlAssetDdoAfterUpdate, 'Cannot fetch url DDO from Aquarius')
 
-    // resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
-    // assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
+    resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
+    assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
 
     // resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
     // assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')

From 62c3d56084363962c5a43c922cf7424a2a0eca32 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 17:35:49 +0300
Subject: [PATCH 54/64] Insert ipfs.

---
 test/integration/PublishEditConsume.test.ts | 68 ++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index 311d37162..59d239bbc 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -371,16 +371,16 @@ describe('Publish consume test', async () => {
     )
     assert(onchainOrderTx, 'Ordering onchain dataset failed.')
 
-    // ipfsOrderTx = await orderAsset(
-    //   resolvedIpfsAssetDdo.id,
-    //   resolvedIpfsAssetDdo.services[0].datatokenAddress,
-    //   await consumerAccount.getAddress(),
-    //   resolvedIpfsAssetDdo.services[0].id,
-    //   0,
-    //   datatoken,
-    //   providerUrl
-    // )
-    // assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
+    ipfsOrderTx = await orderAsset(
+      resolvedIpfsAssetDdo.id,
+      resolvedIpfsAssetDdo.services[0].datatokenAddress,
+      await consumerAccount.getAddress(),
+      resolvedIpfsAssetDdo.services[0].id,
+      0,
+      datatoken,
+      providerUrl
+    )
+    assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
 
     grapqlOrderTx = await orderAsset(
       resolvedGraphqlAssetDdo.id,
@@ -423,20 +423,20 @@ describe('Publish consume test', async () => {
     } catch (e) {
       assert.fail(`Download arwave dataset failed: ${e}`)
     }
-    // const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
-    //   resolvedIpfsAssetDdo.id,
-    //   resolvedIpfsAssetDdo.services[0].id,
-    //   0,
-    //   ipfsOrderTx.transactionHash,
-    //   providerUrl,
-    //   consumerAccount
-    // )
-    // assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
-    // try {
-    //   await downloadFile(ipfsDownloadURL)
-    // } catch (e) {
-    //   assert.fail(`Download ipfs dataset failed ${e}`)
-    // }
+    const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
+      resolvedIpfsAssetDdo.id,
+      resolvedIpfsAssetDdo.services[0].id,
+      0,
+      ipfsOrderTx.transactionHash,
+      providerUrl,
+      consumerAccount
+    )
+    assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
+    try {
+      await downloadFile(ipfsDownloadURL)
+    } catch (e) {
+      assert.fail(`Download ipfs dataset failed ${e}`)
+    }
     const onchainDownloadURL = await ProviderInstance.getDownloadUrl(
       resolvedOnchainAssetDdo.id,
       resolvedOnchainAssetDdo.services[0].id,
@@ -486,14 +486,14 @@ describe('Publish consume test', async () => {
     )
     assert(updateArwaveTx, 'Failed to update arwave asset metadata')
 
-    // resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
-    // const updateIpfsTx = await updateAssetMetadata(
-    //   publisherAccount,
-    //   resolvedIpfsAssetDdo,
-    //   providerUrl,
-    //   aquarius
-    // )
-    // assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
+    resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
+    const updateIpfsTx = await updateAssetMetadata(
+      publisherAccount,
+      resolvedIpfsAssetDdo,
+      providerUrl,
+      aquarius
+    )
+    assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
 
     resolvedOnchainAssetDdo.metadata.name = 'updated onchain asset name'
     const updateOnchainTx = await updateAssetMetadata(
@@ -523,8 +523,8 @@ describe('Publish consume test', async () => {
     resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
     assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
 
-    // resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
-    // assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
+    resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
+    assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
 
     resolvedOnchainAssetDdoAfterUpdate = await aquarius.waitForAqua(onchainAssetId)
     assert(resolvedOnchainAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')

From fb1f02d3e89b62b6f582beea184775a63d1eddb9 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 17:58:57 +0300
Subject: [PATCH 55/64] cleanup. mention ipfs issue.

---
 src/contracts/Datatoken.ts                  |  1 -
 test/integration/PublishEditConsume.test.ts | 92 +++++++++++----------
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/contracts/Datatoken.ts b/src/contracts/Datatoken.ts
index f2eb8d908..609581ae2 100644
--- a/src/contracts/Datatoken.ts
+++ b/src/contracts/Datatoken.ts
@@ -529,7 +529,6 @@ export class Datatoken extends SmartContract {
       providerFees,
       consumeMarketFee
     )
-    console.log(`trxReceipt: `, trxReceipt)
     return <ReceiptOrEstimate<G>>trxReceipt
   }
 
diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index 59d239bbc..9cf1daa34 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -33,7 +33,7 @@ let resolvedArweaveAssetDdoAfterUpdate
 
 let ipfsAssetId
 let resolvedIpfsAssetDdo
-let resolvedIpfsAssetDdoAfterUpdate
+// let resolvedIpfsAssetDdoAfterUpdate
 
 let onchainAssetId
 let resolvedOnchainAssetDdo
@@ -45,7 +45,7 @@ let resolvedGraphqlAssetDdoAfterUpdate
 
 let urlOrderTx
 let arwaveOrderTx
-let ipfsOrderTx
+// let ipfsOrderTx
 let onchainOrderTx
 let grapqlOrderTx
 
@@ -310,13 +310,13 @@ describe('Publish consume test', async () => {
     )
     assert(arwaveMintTx, 'Failed minting arwave datatoken to consumer.')
 
-    const ipfsMintTx = await datatoken.mint(
-      resolvedIpfsAssetDdo.services[0].datatokenAddress,
-      await publisherAccount.getAddress(),
-      '10',
-      await consumerAccount.getAddress()
-    )
-    assert(ipfsMintTx, 'Failed minting ipfs datatoken to consumer.')
+    // const ipfsMintTx = await datatoken.mint(
+    //   resolvedIpfsAssetDdo.services[0].datatokenAddress,
+    //   await publisherAccount.getAddress(),
+    //   '10',
+    //   await consumerAccount.getAddress()
+    // )
+    // assert(ipfsMintTx, 'Failed minting ipfs datatoken to consumer.')
 
     const onchainMintTx = await datatoken.mint(
       resolvedOnchainAssetDdo.services[0].datatokenAddress,
@@ -371,16 +371,17 @@ describe('Publish consume test', async () => {
     )
     assert(onchainOrderTx, 'Ordering onchain dataset failed.')
 
-    ipfsOrderTx = await orderAsset(
-      resolvedIpfsAssetDdo.id,
-      resolvedIpfsAssetDdo.services[0].datatokenAddress,
-      await consumerAccount.getAddress(),
-      resolvedIpfsAssetDdo.services[0].id,
-      0,
-      datatoken,
-      providerUrl
-    )
-    assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
+    // To be fixed in #1849
+    // ipfsOrderTx = await orderAsset(
+    //   resolvedIpfsAssetDdo.id,
+    //   resolvedIpfsAssetDdo.services[0].datatokenAddress,
+    //   await consumerAccount.getAddress(),
+    //   resolvedIpfsAssetDdo.services[0].id,
+    //   0,
+    //   datatoken,
+    //   providerUrl
+    // )
+    // assert(ipfsOrderTx, 'Ordering ipfs dataset failed.')
 
     grapqlOrderTx = await orderAsset(
       resolvedGraphqlAssetDdo.id,
@@ -423,20 +424,21 @@ describe('Publish consume test', async () => {
     } catch (e) {
       assert.fail(`Download arwave dataset failed: ${e}`)
     }
-    const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
-      resolvedIpfsAssetDdo.id,
-      resolvedIpfsAssetDdo.services[0].id,
-      0,
-      ipfsOrderTx.transactionHash,
-      providerUrl,
-      consumerAccount
-    )
-    assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
-    try {
-      await downloadFile(ipfsDownloadURL)
-    } catch (e) {
-      assert.fail(`Download ipfs dataset failed ${e}`)
-    }
+    // To be fixed in #1849
+    // const ipfsDownloadURL = await ProviderInstance.getDownloadUrl(
+    //   resolvedIpfsAssetDdo.id,
+    //   resolvedIpfsAssetDdo.services[0].id,
+    //   0,
+    //   ipfsOrderTx.transactionHash,
+    //   providerUrl,
+    //   consumerAccount
+    // )
+    // assert(ipfsDownloadURL, 'Provider getDownloadUrl failed for ipfs dataset')
+    // try {
+    //   await downloadFile(ipfsDownloadURL)
+    // } catch (e) {
+    //   assert.fail(`Download ipfs dataset failed ${e}`)
+    // }
     const onchainDownloadURL = await ProviderInstance.getDownloadUrl(
       resolvedOnchainAssetDdo.id,
       resolvedOnchainAssetDdo.services[0].id,
@@ -485,15 +487,15 @@ describe('Publish consume test', async () => {
       aquarius
     )
     assert(updateArwaveTx, 'Failed to update arwave asset metadata')
-
-    resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
-    const updateIpfsTx = await updateAssetMetadata(
-      publisherAccount,
-      resolvedIpfsAssetDdo,
-      providerUrl,
-      aquarius
-    )
-    assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
+    // To be fixed in #1849
+    // resolvedIpfsAssetDdo.metadata.name = 'updated ipfs asset name'
+    // const updateIpfsTx = await updateAssetMetadata(
+    //   publisherAccount,
+    //   resolvedIpfsAssetDdo,
+    //   providerUrl,
+    //   aquarius
+    // )
+    // assert(updateIpfsTx, 'Failed to update ipfs asset metadata')
 
     resolvedOnchainAssetDdo.metadata.name = 'updated onchain asset name'
     const updateOnchainTx = await updateAssetMetadata(
@@ -522,9 +524,9 @@ describe('Publish consume test', async () => {
 
     resolvedArweaveAssetDdoAfterUpdate = await aquarius.waitForAqua(arweaveAssetId)
     assert(resolvedArweaveAssetDdoAfterUpdate, 'Cannot fetch arwave DDO from Aquarius')
-
-    resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
-    assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
+    // To be fixed in #1849
+    // resolvedIpfsAssetDdoAfterUpdate = await aquarius.waitForAqua(ipfsAssetId)
+    // assert(resolvedIpfsAssetDdoAfterUpdate, 'Cannot fetch ipfs DDO from Aquarius')
 
     resolvedOnchainAssetDdoAfterUpdate = await aquarius.waitForAqua(onchainAssetId)
     assert(resolvedOnchainAssetDdoAfterUpdate, 'Cannot fetch onchain DDO from Aquarius')

From 58298e4bbbf82efc5d5441acd7f247fa0beb4a9a Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 17 Sep 2024 18:21:39 +0300
Subject: [PATCH 56/64] Fixes. Added getFilesObject back.

---
 src/contracts/Datatoken4.ts | 32 ++++++++++++++++++++++++++++++++
 src/services/Provider.ts    |  4 +---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index e1e7330af..9707690fa 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -163,4 +163,36 @@ export class Datatoken4 extends Datatoken {
 
     return <ReceiptOrEstimate<G>>trxReceipt
   }
+
+  /**
+   * getFileObject - It returns the consumer's file object encrypted format.
+   * @param {String} dtAddress datatoken address
+   * @param {Number} serviceId - service identifier
+   * @param {String} providerAddress
+   * @param {Bytes} providerSignature
+   * @param {Bytes} consumerData
+   * @param {Bytes} consumerSignature
+   * @param {String} consumerAddress
+   * @return {Promise<string>}
+   */
+  public async getFileObject(
+    dtAddress: string,
+    serviceId: number,
+    providerAddress: string,
+    providerSignature: Bytes,
+    consumerData: Bytes,
+    consumerSignature: Bytes,
+    consumerAddress: string
+  ): Promise<Bytes> {
+    const dtContract = this.getContract(dtAddress, this.getDefaultAbi())
+    const fileObject = await dtContract.getFileObject(
+      serviceId,
+      providerAddress,
+      providerSignature,
+      consumerData,
+      consumerSignature,
+      consumerAddress
+    )
+    return fileObject
+  }
 }
diff --git a/src/services/Provider.ts b/src/services/Provider.ts
index 8af79101d..27cb40aa1 100644
--- a/src/services/Provider.ts
+++ b/src/services/Provider.ts
@@ -127,9 +127,7 @@ export class Provider {
     const messageHashBytes = ethers.utils.arrayify(consumerMessage)
     const chainId = await signer.getChainId()
     try {
-      return await (signer as providers.JsonRpcSigner)._legacySignMessage(
-        messageHashBytes
-      )
+      return await signer.signMessage(messageHashBytes)
     } catch (error) {
       LoggerInstance.error('Sign provider message error: ', error)
       if (chainId === 8996) {

From ae1e79f9621ca0758cb866554f49098855a60198 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 19 Sep 2024 12:08:10 +0300
Subject: [PATCH 57/64] fix review.

---
 .gitignore                                    |  3 +-
 package.json                                  |  4 +--
 src/config/ConfigHelper.ts                    |  2 +-
 src/contracts/AccessList.ts                   | 10 +++---
 src/contracts/AccessListFactory.ts            | 36 ++++++++++---------
 src/contracts/Datatoken4.ts                   |  8 ++---
 .../Sapphire.test.ts}                         |  2 +-
 7 files changed, 34 insertions(+), 31 deletions(-)
 rename test/{scripts/SapphireIntegration.test.ts => integration/Sapphire.test.ts} (99%)

diff --git a/.gitignore b/.gitignore
index 6792b3df3..822ec977e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,7 @@ dist/
 .nyc_output/
 coverage/
 doc/
-test/unit/*.js
-test/integration/*.js
+test/**/*.js
 src/**/*.js
 
 src/metadata\.json
diff --git a/package.json b/package.json
index 922e662d8..024787392 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "mocha": "TS_NODE_PROJECT='./test/tsconfig.json' mocha --config=test/.mocharc.json --node-env=test --exit",
     "test": "npm run lint && npm run test:unit:cover && npm run test:integration:cover",
     "test:unit": "npm run mocha -- 'test/unit/**/*.test.ts'",
-    "test:sapphire": "npm run mocha -- 'test/scripts/**/*.test.ts'",
-    "test:integration": "npm run mocha --  'test/integration/**/*.test.ts'",
+    "test:sapphire": "npm run mocha -- 'test/integration/Sapphire.test.ts'",
+    "test:integration": "npm run mocha --  'test/integration/**/*.test.ts' --exclude 'test/integration/Sapphire.test.ts'",
     "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
     "test:integration:cover": "nyc --report-dir coverage/integration --no-clean npm run test:integration",
     "create:guide": "./scripts/createCodeExamples.sh test/integration/CodeExamples.test.ts",
diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts
index 84e48c069..70802b2d7 100644
--- a/src/config/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -159,7 +159,7 @@ export const configHelperNetworks: Config[] = [
   {
     ...configHelperNetworksBase,
     chainId: 23295,
-    network: 'oasis_saphire_testnet',
+    network: 'oasis_sapphire_testnet',
     nodeUri: 'https://testnet.sapphire.oasis.dev',
     subgraphUri:
       'https://v4.subgraph.sapphire-testnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
diff --git a/src/contracts/AccessList.ts b/src/contracts/AccessList.ts
index 9ebfb50cb..3dad79665 100644
--- a/src/contracts/AccessList.ts
+++ b/src/contracts/AccessList.ts
@@ -87,7 +87,7 @@ export class AccessListContract extends SmartContractWithAddress {
    * @param {String} user Minter address
    * @param {String} tokenUri tokenURI
    * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
+   * @return {Promise<ReceiptOrEstimate>} returns the transaction receipt or the estimateGas value
    */
   public async mint<G extends boolean = false>(
     user: string,
@@ -113,7 +113,7 @@ export class AccessListContract extends SmartContractWithAddress {
    * @param {String} users Minter addresses
    * @param {String} tokenUris tokenURI
    * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
+   * @return {Promise<ReceiptOrEstimate>} returns the transaction receipt or the estimateGas value
    */
   public async batchMint<G extends boolean = false>(
     users: Array<string>,
@@ -138,7 +138,7 @@ export class AccessListContract extends SmartContractWithAddress {
    * Delete address from access list
    * @param {Number} tokenId token ID
    * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
+   * @return {Promise<ReceiptOrEstimate>} returns the transaction receipt or the estimateGas value
    */
   public async burn<G extends boolean = false>(
     tokenId: number,
@@ -161,7 +161,7 @@ export class AccessListContract extends SmartContractWithAddress {
    * Transfer Ownership of an access list, called by owner of access list
    * @param {Number} newOwner new owner of the access list
    * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
+   * @return {Promise<ReceiptOrEstimate>} returns the transaction receipt or the estimateGas value
    */
   public async transferOwnership<G extends boolean = false>(
     newOwner: string,
@@ -183,7 +183,7 @@ export class AccessListContract extends SmartContractWithAddress {
   /**
    * Renounce Ownership of an access list, called by owner of access list
    * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
+   * @return {Promise<ReceiptOrEstimate>} returns the transaction receipt or the estimateGas value
    */
   public async renounceOwnership<G extends boolean = false>(
     estimateGas?: G
diff --git a/src/contracts/AccessListFactory.ts b/src/contracts/AccessListFactory.ts
index f0a00ee93..8fc8fe61d 100644
--- a/src/contracts/AccessListFactory.ts
+++ b/src/contracts/AccessListFactory.ts
@@ -62,21 +62,25 @@ export class AccesslistFactory extends SmartContractWithAddress {
     )
     if (estimateGas) return <G extends false ? string : BigNumber>estGas
     // Invoke createToken function of the contract
-    const tx = await sendTx(
-      estGas,
-      this.signer,
-      this.config?.gasFeeMultiplier,
-      this.contract.deployAccessListContract,
-      nameAccessList,
-      symbolAccessList,
-      transferable,
-      owner,
-      user,
-      tokenURI
-    )
-    const trxReceipt = await tx.wait()
-    const events = getEventFromTx(trxReceipt, 'NewAccessList')
-    return events.args[0]
+    try {
+      const tx = await sendTx(
+        estGas,
+        this.signer,
+        this.config?.gasFeeMultiplier,
+        this.contract.deployAccessListContract,
+        nameAccessList,
+        symbolAccessList,
+        transferable,
+        owner,
+        user,
+        tokenURI
+      )
+      const trxReceipt = await tx.wait()
+      const events = getEventFromTx(trxReceipt, 'NewAccessList')
+      return events.args[0]
+    } catch (e) {
+      console.error(`Creation of AccessList failed: ${e}`)
+    }
   }
 
   /**
@@ -113,7 +117,7 @@ export class AccesslistFactory extends SmartContractWithAddress {
    * @param {String} owner caller address
    * @param {Number} templateAddress address of the template we want to change
    * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} current token template count
+   * @return {Promise<ReceiptOrEstimate>} returns the transaction receipt or the estimateGas value, current token template count
    */
   public async changeTemplateAddress<G extends boolean = false>(
     owner: string,
diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index 9707690fa..7b11626b9 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -69,7 +69,7 @@ export class Datatoken4 extends Datatoken {
    * @param {String} address Contract address
    * @param {String} consumer User address
    * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
+   * @return {Promise<ReceiptOrEstimate>} returns the transaction receipt or the estimateGas value
    */
   public async setAllowListContract<G extends boolean = false>(
     dtAddress: string,
@@ -104,7 +104,7 @@ export class Datatoken4 extends Datatoken {
    * @param {String} address Contract address
    * @param {String} consumer User address
    * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
+   * @return {Promise<ReceiptOrEstimate>} returns the transaction receipt or the estimateGas value
    */
   public async setDenyListContract<G extends boolean = false>(
     dtAddress: string,
@@ -137,7 +137,7 @@ export class Datatoken4 extends Datatoken {
    * @param {String} dtAddress Datatoken address
    * @param {String} address User address
    * @param {Boolean} estimateGas if True, return gas estimate
-   * @return {Promise<ReceiptOrEstimate>} transactionId
+   * @return {Promise<ReceiptOrEstimate>} returns the transaction receipt or the estimateGas value
    */
   public async setFileObject<G extends boolean = false>(
     dtAddress: string,
@@ -173,7 +173,7 @@ export class Datatoken4 extends Datatoken {
    * @param {Bytes} consumerData
    * @param {Bytes} consumerSignature
    * @param {String} consumerAddress
-   * @return {Promise<string>}
+   * @return {Promise<Bytes>} returns file object
    */
   public async getFileObject(
     dtAddress: string,
diff --git a/test/scripts/SapphireIntegration.test.ts b/test/integration/Sapphire.test.ts
similarity index 99%
rename from test/scripts/SapphireIntegration.test.ts
rename to test/integration/Sapphire.test.ts
index b7613ef39..663f62f4f 100644
--- a/test/scripts/SapphireIntegration.test.ts
+++ b/test/integration/Sapphire.test.ts
@@ -57,7 +57,7 @@ describe('Sapphire tests', async () => {
 
   const config: Config = {
     chainId: 23295,
-    network: 'oasis_saphire_testnet',
+    network: 'oasis_sapphire_testnet',
     nodeUri: 'https://testnet.sapphire.oasis.dev',
     subgraphUri:
       'https://v4.subgraph.sapphire-testnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',

From f595defadfbc3fddf3499401595bba06f2c4977f Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 19 Sep 2024 12:53:16 +0300
Subject: [PATCH 58/64] replace srv id w srv index.

---
 src/contracts/Datatoken4.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index 7b11626b9..e22f644cd 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -167,7 +167,7 @@ export class Datatoken4 extends Datatoken {
   /**
    * getFileObject - It returns the consumer's file object encrypted format.
    * @param {String} dtAddress datatoken address
-   * @param {Number} serviceId - service identifier
+   * @param {Number} serviceIndex - service index
    * @param {String} providerAddress
    * @param {Bytes} providerSignature
    * @param {Bytes} consumerData
@@ -177,7 +177,7 @@ export class Datatoken4 extends Datatoken {
    */
   public async getFileObject(
     dtAddress: string,
-    serviceId: number,
+    serviceIndex: number,
     providerAddress: string,
     providerSignature: Bytes,
     consumerData: Bytes,
@@ -186,7 +186,7 @@ export class Datatoken4 extends Datatoken {
   ): Promise<Bytes> {
     const dtContract = this.getContract(dtAddress, this.getDefaultAbi())
     const fileObject = await dtContract.getFileObject(
-      serviceId,
+      serviceIndex,
       providerAddress,
       providerSignature,
       consumerData,

From 2da79faf8254d5b0798cce07af0b9983651e2cb1 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 19 Sep 2024 12:59:02 +0300
Subject: [PATCH 59/64] Fix doc.

---
 src/contracts/AccessListFactory.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/contracts/AccessListFactory.ts b/src/contracts/AccessListFactory.ts
index 8fc8fe61d..866504df6 100644
--- a/src/contracts/AccessListFactory.ts
+++ b/src/contracts/AccessListFactory.ts
@@ -34,7 +34,12 @@ export class AccesslistFactory extends SmartContractWithAddress {
 
   /**
    * Create new Access List Contract
-   * @param {AccessListData} listData The data needed to create an NFT.
+   * @param {string} nameAccessList The name for access list.
+   * @param {string} symbolAccessList The symbol for access list.
+   * @param {string[]} tokenURI Token URIs list.
+   * @param {boolean} transferable Default false, to be soulbound.
+   * @param {string} owner Owner of the access list.
+   * @param {string[]} user Users of the access lists as addresses.
    * @param {Boolean} [estimateGas] if True, return gas estimate
    * @return {Promise<string|BigNumber>} The transaction hash or the gas estimate.
    */

From 15aaddb9a81d1bef1c38fa368130a2b64a3d3539 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 19 Sep 2024 15:51:26 +0300
Subject: [PATCH 60/64] Remove wrap call from constructor.

---
 src/contracts/Datatoken4.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/contracts/Datatoken4.ts b/src/contracts/Datatoken4.ts
index e22f644cd..4700b9611 100644
--- a/src/contracts/Datatoken4.ts
+++ b/src/contracts/Datatoken4.ts
@@ -31,8 +31,6 @@ export class Datatoken4 extends Datatoken {
   ) {
     super(signer, network, config, abi)
     this.abi = this.getDefaultAbi()
-    // Wrap signer's address for encrypted data tx
-    this.signer = sapphire.wrap(signer)
     this.fileObject = fileObject
   }
 

From 9584d3250e7f6b162bc8cacb4a969db7b9ff6f16 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Thu, 19 Sep 2024 15:53:24 +0300
Subject: [PATCH 61/64] Modify README.

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c17116247..cd862473f 100644
--- a/README.md
+++ b/README.md
@@ -130,10 +130,11 @@ npm run test:integration:cover
 
 ### Sapphire Integration Tests
 
-Currently, there is used Oasis Sapphire Test network, please export the `PRIVATE_KEY` before testing.
-
+We are currently using the live Oasis Sapphire Test network for the integration tests.
+Please export the `PRIVATE_KEY` and `PRIVATE_KEY_CONSUMER` before running the tests.
 ```bash
 export PRIVATE_KEY='0x<YOUR_PRIVATE_KEY>'
+export PRIVATE_KEY_CONSUMER='0x<YOUR_CONSUMER_PRIVATE_KEY>'
 ```
 
 Then, you can execute the tests individually with:

From c88123a1a817834a3936f44adeab3bb28a57a592 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 24 Sep 2024 11:30:54 +0300
Subject: [PATCH 62/64] Added check for tx.

---
 src/contracts/AccessListFactory.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/contracts/AccessListFactory.ts b/src/contracts/AccessListFactory.ts
index 866504df6..383baf456 100644
--- a/src/contracts/AccessListFactory.ts
+++ b/src/contracts/AccessListFactory.ts
@@ -80,6 +80,12 @@ export class AccesslistFactory extends SmartContractWithAddress {
         user,
         tokenURI
       )
+      if (!tx || tx.status !== 1) {
+        const e =
+          'Tx for deploying new access list does not exist or status is not successful.'
+        console.error(e)
+        throw e
+      }
       const trxReceipt = await tx.wait()
       const events = getEventFromTx(trxReceipt, 'NewAccessList')
       return events.args[0]

From 54e15f8760f0c1102662f3213e5738610131443d Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 24 Sep 2024 11:34:58 +0300
Subject: [PATCH 63/64] fix check.

---
 src/contracts/AccessListFactory.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/contracts/AccessListFactory.ts b/src/contracts/AccessListFactory.ts
index 383baf456..73d27505d 100644
--- a/src/contracts/AccessListFactory.ts
+++ b/src/contracts/AccessListFactory.ts
@@ -80,9 +80,8 @@ export class AccesslistFactory extends SmartContractWithAddress {
         user,
         tokenURI
       )
-      if (!tx || tx.status !== 1) {
-        const e =
-          'Tx for deploying new access list does not exist or status is not successful.'
+      if (!tx) {
+        const e = 'Tx for deploying new access list was not processed on chain.'
         console.error(e)
         throw e
       }

From 27aa6bb6c6807306e4ed87fc51c3919301a5f118 Mon Sep 17 00:00:00 2001
From: mariacarmina <mariacarmina.cretu@gmail.com>
Date: Tue, 24 Sep 2024 12:17:42 +0300
Subject: [PATCH 64/64] remove duplicate test.

---
 test/integration/PublishEditConsume.test.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/test/integration/PublishEditConsume.test.ts b/test/integration/PublishEditConsume.test.ts
index ef3ec8722..e2cc5e42f 100644
--- a/test/integration/PublishEditConsume.test.ts
+++ b/test/integration/PublishEditConsume.test.ts
@@ -369,17 +369,6 @@ describe('Publish consume test', async () => {
     assert(arwaveOrderTx, 'Ordering arwave dataset failed.')
   }).timeout(40000)
 
-  onchainOrderTx = await orderAsset(
-    resolvedOnchainAssetDdo.id,
-    resolvedOnchainAssetDdo.services[0].datatokenAddress,
-    await consumerAccount.getAddress(),
-    resolvedOnchainAssetDdo.services[0].id,
-    0,
-    datatoken,
-    providerUrl
-  )
-  assert(onchainOrderTx, 'Ordering onchain dataset failed.')
-
   // To be fixed in #1849
   // ipfsOrderTx = await orderAsset(
   //   resolvedIpfsAssetDdo.id,