From 91460b9cf5d3efe46b3f0c6ec9d5a48fe0e9e36f Mon Sep 17 00:00:00 2001
From: Alex Coseru <alex.coseru@gmail.com>
Date: Fri, 24 Nov 2023 15:12:21 +0200
Subject: [PATCH 01/13] bump contracts & add optimism (#1786)

* bump contracts

* fix contracts

* add optimism

* use upcoming barge

* update fre tests

* make sure all fres are withMint
---
 .github/workflows/ci.yml              |  2 +
 package-lock.json                     | 14 ++---
 package.json                          |  2 +-
 src/config/ConfigHelper.ts            | 18 +++++++
 test/integration/PublishFlows.test.ts |  2 +-
 test/unit/FixedRateExchange.test.ts   | 77 ++++++++++++---------------
 test/unit/NftFactory.test.ts          |  2 +-
 test/unit/Router.test.ts              |  2 +-
 8 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf43932ea..0667037b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,6 +55,7 @@ jobs:
         with:
           repository: 'oceanprotocol/barge'
           path: 'barge'
+          ref: feature/bump_contracts_and_subgraph
 
       - name: Run Ganache with Barge
         working-directory: ${{ github.workspace }}/barge
@@ -103,6 +104,7 @@ jobs:
         with:
           repository: 'oceanprotocol/barge'
           path: 'barge'
+          ref: feature/bump_contracts_and_subgraph
 
       - name: Login to Docker Hub
         if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }}
diff --git a/package-lock.json b/package-lock.json
index a90e75886..cd484bdcc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "3.1.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@oceanprotocol/contracts": "^1.1.14",
+        "@oceanprotocol/contracts": "^2.0.3",
         "cross-fetch": "^4.0.0",
         "crypto-js": "^4.1.1",
         "decimal.js": "^10.4.1",
@@ -2963,9 +2963,9 @@
       }
     },
     "node_modules/@oceanprotocol/contracts": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.1.14.tgz",
-      "integrity": "sha512-PJih7C6LHaWHHj1qgxZsSkEqKphhJrL3G7WuMOxl4N1daDrF6sooDDU+9dZkcHSVPc7cMjkFqLc5fP58NSAobw=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.0.3.tgz",
+      "integrity": "sha512-D2YtlsgmhBuSmF/Ue8zMWPtXNiB4zgW09NjUQzvDFrloUo0a7yC8r8L84LrVniw+0Nmly/PhLcdm8i018yc34g=="
     },
     "node_modules/@octokit/auth-token": {
       "version": "3.0.3",
@@ -19724,9 +19724,9 @@
       }
     },
     "@oceanprotocol/contracts": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.1.14.tgz",
-      "integrity": "sha512-PJih7C6LHaWHHj1qgxZsSkEqKphhJrL3G7WuMOxl4N1daDrF6sooDDU+9dZkcHSVPc7cMjkFqLc5fP58NSAobw=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-2.0.3.tgz",
+      "integrity": "sha512-D2YtlsgmhBuSmF/Ue8zMWPtXNiB4zgW09NjUQzvDFrloUo0a7yC8r8L84LrVniw+0Nmly/PhLcdm8i018yc34g=="
     },
     "@octokit/auth-token": {
       "version": "3.0.3",
diff --git a/package.json b/package.json
index ab4f41e84..b00fca454 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "web3": "^1.8.0"
   },
   "dependencies": {
-    "@oceanprotocol/contracts": "^1.1.14",
+    "@oceanprotocol/contracts": "^2.0.3",
     "cross-fetch": "^4.0.0",
     "crypto-js": "^4.1.1",
     "decimal.js": "^10.4.1",
diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts
index 2c2ea3f3f..45dc0ebc7 100644
--- a/src/config/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -136,6 +136,24 @@ export const configHelperNetworks: Config[] = [
     subgraphUri: 'https://subgraph.v4.genx.minimal-gaia-x.eu',
     explorerUri: 'https://explorer.genx.minimal-gaia-x.eu/',
     gasFeeMultiplier: 1
+  },
+  {
+    ...configHelperNetworksBase,
+    chainId: 10,
+    network: 'optimism',
+    nodeUri: 'https://mainnet.optimism.io',
+    subgraphUri: 'https://v4.subgraph.optimism.oceanprotocol.com',
+    explorerUri: 'https://optimistic.etherscan.io/',
+    gasFeeMultiplier: 1.1
+  },
+  {
+    ...configHelperNetworksBase,
+    chainId: 11155420,
+    network: 'optimism-sepolia',
+    nodeUri: 'https://sepolia.optimism.io',
+    subgraphUri: 'https://v4.subgraph.optimism-sepolia.oceanprotocol.com',
+    explorerUri: 'https://sepolia-optimism.etherscan.io/',
+    gasFeeMultiplier: 1.1
   }
 ]
 
diff --git a/test/integration/PublishFlows.test.ts b/test/integration/PublishFlows.test.ts
index 84afb72aa..66af328e2 100644
--- a/test/integration/PublishFlows.test.ts
+++ b/test/integration/PublishFlows.test.ts
@@ -138,7 +138,7 @@ describe('Publish tests', async () => {
       fixedRate: '1',
       marketFee: '0',
       allowedConsumer: await publisherAccount.getAddress(),
-      withMint: false
+      withMint: true
     }
 
     const bundleNFT = await factory.createNftWithDatatokenWithFixedRate(
diff --git a/test/unit/FixedRateExchange.test.ts b/test/unit/FixedRateExchange.test.ts
index b615f6590..4e7156d2b 100644
--- a/test/unit/FixedRateExchange.test.ts
+++ b/test/unit/FixedRateExchange.test.ts
@@ -81,7 +81,7 @@ describe('Fixed Rate unit test', () => {
         fixedRate: '1',
         marketFee: '0.001',
         allowedConsumer: ZERO_ADDRESS,
-        withMint: false
+        withMint: true
       }
 
       const tx = await nftFactory.createNftWithDatatokenWithFixedRate(
@@ -134,19 +134,16 @@ describe('Fixed Rate unit test', () => {
       await fixedRate.activate(exchangeId)
       expect(await fixedRate.isActive(exchangeId)).to.equal(true)
     })
-
-    it('#activateMint - should activate Mint(allows fixed rate contract to mint dts if required), if exchangeOwner', async () => {
-      expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(false)
-      await fixedRate.activateMint(exchangeId)
-      expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(true)
-    })
-
     it('#dectivateMint - should deactivate Mint if exchangeOwner', async () => {
       expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(true)
       await fixedRate.deactivateMint(exchangeId)
       expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(false)
     })
-
+    it('#activateMint - should activate Mint(allows fixed rate contract to mint dts if required), if exchangeOwner', async () => {
+      expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(false)
+      await fixedRate.activateMint(exchangeId)
+      expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(true)
+    })
     it('#generate exchangeId - should generate a specific exchangeId', async () => {
       expect(await fixedRate.generateExchangeId(addresses.MockDAI, dtAddress)).to.equal(
         exchangeId
@@ -175,7 +172,8 @@ describe('Fixed Rate unit test', () => {
 
     it('#getDatatokenSupply - should get the dt supply in the exchange', async () => {
       // exchange owner hasn't approved any DT for sell
-      expect(await fixedRate.getDatatokenSupply(exchangeId)).to.equal('0.0')
+      // since fre is withMint, dtSupply is 2^256
+      expect(parseFloat(await fixedRate.getDatatokenSupply(exchangeId))).to.greaterThan(0)
     })
 
     it('#getBasetokenSupply - should get the bt supply in the exchange', async () => {
@@ -319,8 +317,6 @@ describe('Fixed Rate unit test', () => {
       expect((await fixedRate.getExchange(exchangeId)).dtBalance).to.equal('10.0')
       // no BTs in the contract (except for the fees, but not accounted here)
       expect((await fixedRate.getExchange(exchangeId)).btBalance).to.equal('0.0')
-      // DT supply is back at 1000 (exchange Owner allowance + dt balance in the fixed rate)
-      expect(await fixedRate.getDatatokenSupply(exchangeId)).to.equal('1000.0')
     })
 
     it('#getExchange - should return exchange details', async () => {
@@ -331,10 +327,11 @@ describe('Fixed Rate unit test', () => {
       expect(result.baseToken).to.equal(addresses.MockDAI)
       expect(result.datatoken).to.equal(dtAddress)
       expect(result.exchangeOwner).to.equal(await exchangeOwner.getAddress())
-      expect(result.withMint).to.equal(false)
+      expect(result.withMint).to.equal(true)
       expect(result.dtBalance).to.equal('10.0') // balance in the fixedRate
       expect(result.btBalance).to.equal('0.0') // balance in the fixedRate
-      expect(result.dtSupply).to.equal('1000.0') // total supply available (owner allowance + dtBalance)
+      // since fre is withMint, dtSupply is 2^256
+      expect(parseFloat(result.dtSupply)).to.gt(0) // total supply available (owner allowance + dtBalance)
       expect(result.btSupply).to.equal('0.0') // total supply available of baseToken in the contract
       expect(result.fixedRate).to.equal('1.0')
     })
@@ -391,9 +388,10 @@ describe('Fixed Rate unit test', () => {
       await fixedRate.collectDatatokens(exchangeId, result.dtBalance)
       // no more dts in the contract
       const result2 = await fixedRate.getExchange(exchangeId)
+      // since fre is withMint, dtSupply is 2^256
       expect(result2.dtBalance).to.equal('0.0')
-      // Only allowance left since dt is ZERO
-      expect(result2.dtSupply).to.equal('990.0')
+      // since fre is withMint, dtSupply is 2^256
+      expect(parseFloat(result2.dtSupply)).to.gt(0)
     })
 
     it('#collectMarketFee- should collect marketFee and send it to marketFeeCollector, anyone can call it', async () => {
@@ -462,7 +460,9 @@ describe('Fixed Rate unit test', () => {
   describe('Test a Fixed Rate Exchange with USDC (6 Decimals) as Basetoken', () => {
     it('#create an exchange', async () => {
       // CREATE AN Exchange
+      // since FRE is created without mint rights, owner has to send dt to that exchange
       // we prepare transaction parameters objects
+
       const nftFactory = new NftFactory(addresses.ERC721Factory, exchangeOwner)
 
       const freParams: FreCreationParams = {
@@ -475,7 +475,7 @@ describe('Fixed Rate unit test', () => {
         fixedRate: '1',
         marketFee: '0.001',
         allowedConsumer: ZERO_ADDRESS,
-        withMint: false
+        withMint: true
       }
 
       const tx = await nftFactory.createNftWithDatatokenWithFixedRate(
@@ -528,18 +528,16 @@ describe('Fixed Rate unit test', () => {
       await fixedRate.activate(exchangeId)
       expect(await fixedRate.isActive(exchangeId)).to.equal(true)
     })
-
-    it('#activateMint - should activate Mint(allows fixed rate contract to mint dts if required), if exchangeOwner', async () => {
-      expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(false)
-      await fixedRate.activateMint(exchangeId)
-      expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(true)
-    })
-
     it('#dectivateMint - should deactivate Mint if exchangeOwner', async () => {
       expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(true)
       await fixedRate.deactivateMint(exchangeId)
       expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(false)
     })
+    it('#activateMint - should activate Mint(allows fixed rate contract to mint dts if required), if exchangeOwner', async () => {
+      expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(false)
+      await fixedRate.activateMint(exchangeId)
+      expect((await fixedRate.getExchange(exchangeId)).withMint).to.equal(true)
+    })
 
     it('#generate exchangeId - should generate a specific exchangeId', async () => {
       expect(await fixedRate.generateExchangeId(addresses.MockUSDC, dtAddress)).to.equal(
@@ -564,8 +562,8 @@ describe('Fixed Rate unit test', () => {
     })
 
     it('#getDatatokenSupply - should get the dt supply in the exchange', async () => {
-      // exchange owner hasn't approved any DT for sell
-      expect(await fixedRate.getDatatokenSupply(exchangeId)).to.equal('0.0')
+      // fre has mint rights
+      expect(parseFloat(await fixedRate.getDatatokenSupply(exchangeId))).to.gt(0)
     })
 
     it('#getBasetokenSupply - should get the bt supply in the exchange', async () => {
@@ -594,15 +592,7 @@ describe('Fixed Rate unit test', () => {
         dtAddress,
         await exchangeOwner.getAddress(),
         '1000',
-        await exchangeOwner.getAddress()
-      )
-      await approve(
-        exchangeOwner,
-        config,
-        await exchangeOwner.getAddress(),
-        dtAddress,
-        addresses.FixedPrice,
-        '1000'
+        fixedRate.address
       )
       // user1 gets 100 USDC so he can buy DTs
       await transfer(
@@ -709,8 +699,8 @@ describe('Fixed Rate unit test', () => {
       expect((await fixedRate.getExchange(exchangeId)).dtBalance).to.equal('10.0')
       // no BTs in the contract (except for the fees, but not accounted here)
       expect((await fixedRate.getExchange(exchangeId)).btBalance).to.equal('0.0')
-      // DT supply is back at 1000 (exchange Owner allowance + dt balance in the fixed rate)
-      expect(await fixedRate.getDatatokenSupply(exchangeId)).to.equal('1000.0')
+      // DT supply is huge, cause fre has mint rights
+      expect(parseFloat(await fixedRate.getDatatokenSupply(exchangeId))).to.gt(1000)
     })
 
     it('#getExchange - should return exchange details', async () => {
@@ -721,10 +711,11 @@ describe('Fixed Rate unit test', () => {
       expect(result.baseToken).to.equal(addresses.MockUSDC)
       expect(result.datatoken).to.equal(dtAddress)
       expect(result.exchangeOwner).to.equal(await exchangeOwner.getAddress())
-      expect(result.withMint).to.equal(false)
+      expect(result.withMint).to.equal(true)
       expect(result.dtBalance).to.equal('10.0') // balance in the fixedRate
       expect(result.btBalance).to.equal('0.0') // balance in the fixedRate
-      expect(result.dtSupply).to.equal('1000.0') // total supply available (owner allowance + dtBalance)
+      // since fre has mint rights, dtSupply is huge
+      expect(parseFloat(result.dtSupply)).to.gt(1000) // total supply available (owner allowance + dtBalance)
       expect(result.btSupply).to.equal('0.0') // total supply available of baseToken in the contract
       expect(result.fixedRate).to.equal('1.0')
     })
@@ -785,8 +776,8 @@ describe('Fixed Rate unit test', () => {
       // no more dts in the contract
       const result2 = await fixedRate.getExchange(exchangeId)
       expect(result2.dtBalance).to.equal('0.0')
-      // Only allowance left since dt is ZERO
-      expect(result2.dtSupply).to.equal('990.0')
+      // since fre has mint rights, dtSupply is huge
+      expect(parseFloat(result2.dtSupply)).to.gt(990)
     })
 
     it('#updateMarketFee- should update Market fee if market fee collector', async () => {
@@ -829,7 +820,7 @@ describe('Fixed Rate unit test', () => {
         fixedRate: '1',
         marketFee: '0.001',
         allowedConsumer: ZERO_ADDRESS,
-        withMint: false
+        withMint: true
       }
 
       dtParams.feeToken = addresses.MockDAI
@@ -871,7 +862,7 @@ describe('Fixed Rate unit test', () => {
         fixedRate: '1',
         marketFee: '0.001',
         allowedConsumer: ZERO_ADDRESS,
-        withMint: false
+        withMint: true
       }
 
       dtParams.feeToken = addresses.MockUSDC
diff --git a/test/unit/NftFactory.test.ts b/test/unit/NftFactory.test.ts
index 4906b32a4..8fcd6a628 100644
--- a/test/unit/NftFactory.test.ts
+++ b/test/unit/NftFactory.test.ts
@@ -132,7 +132,7 @@ describe('Nft Factory test', () => {
       fixedRate: '1',
       marketFee: FEE,
       allowedConsumer: await user1.getAddress(),
-      withMint: false
+      withMint: true
     }
 
     const tx = await nftFactory.createNftWithDatatokenWithFixedRate(
diff --git a/test/unit/Router.test.ts b/test/unit/Router.test.ts
index 911415122..b2b73cf6f 100644
--- a/test/unit/Router.test.ts
+++ b/test/unit/Router.test.ts
@@ -130,7 +130,7 @@ describe('Router unit test', () => {
       fixedRate: RATE,
       marketFee: FEE,
       allowedConsumer: ZERO_ADDRESS,
-      withMint: false
+      withMint: true
     }
 
     const nftFactory = new NftFactory(addresses.ERC721Factory, factoryOwner)

From 02c9bfd654c0cdc7e155e89d75c1281c16d99605 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Nov 2023 15:12:37 +0200
Subject: [PATCH 02/13] Bump eslint from 8.24.0 to 8.52.0 (#1783)

Bumps [eslint](https://github.com/eslint/eslint) from 8.24.0 to 8.52.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.24.0...v8.52.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 341 +++++++++++++++++++++++-----------------------
 1 file changed, 172 insertions(+), 169 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cd484bdcc..00aa55d27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,6 +52,15 @@
         "web3": "^1.8.0"
       }
     },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -1946,15 +1955,15 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-      "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.15.0",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -1986,6 +1995,15 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/@eslint/js": {
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
+      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/@ethereumjs/common": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.0.tgz",
@@ -2708,29 +2726,19 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
+        "@humanwhocodes/object-schema": "^2.0.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
       },
       "engines": {
         "node": ">=10.10.0"
       }
     },
-    "node_modules/@humanwhocodes/gitignore-to-minimatch": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -2745,9 +2753,9 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
       "dev": true
     },
     "node_modules/@iarna/toml": {
@@ -3875,6 +3883,12 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
     "node_modules/abortcontroller-polyfill": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz",
@@ -3893,9 +3907,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
+      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -6546,49 +6560,48 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
-      "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
+      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.3.2",
-        "@humanwhocodes/config-array": "^0.10.5",
-        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "8.52.0",
+        "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "ajv": "^6.10.0",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "globby": "^11.1.0",
-        "grapheme-splitter": "^1.0.4",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "js-sdsl": "^4.1.4",
+        "is-path-inside": "^3.0.3",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "bin": {
@@ -7100,6 +7113,22 @@
         "safe-regex": "^2.1.1"
       }
     },
+    "node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint-utils": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
@@ -7206,19 +7235,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "node_modules/eslint/node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -7326,14 +7342,14 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7356,9 +7372,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -8917,9 +8933,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -9005,12 +9021,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
@@ -10640,12 +10650,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/js-sdsl": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-      "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
-      "dev": true
-    },
     "node_modules/js-sha3": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
@@ -12633,17 +12637,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "type-check": "^0.4.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17750,6 +17754,12 @@
     }
   },
   "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true
+    },
     "@babel/code-frame": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -19077,15 +19087,15 @@
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-      "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.15.0",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -19110,6 +19120,12 @@
         }
       }
     },
+    "@eslint/js": {
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
+      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+      "dev": true
+    },
     "@ethereumjs/common": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.0.tgz",
@@ -19524,22 +19540,16 @@
       }
     },
     "@humanwhocodes/config-array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
       "dev": true,
       "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
+        "@humanwhocodes/object-schema": "^2.0.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
       }
     },
-    "@humanwhocodes/gitignore-to-minimatch": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
-      "dev": true
-    },
     "@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -19547,9 +19557,9 @@
       "dev": true
     },
     "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
       "dev": true
     },
     "@iarna/toml": {
@@ -20416,6 +20426,12 @@
         "eslint-visitor-keys": "^3.4.1"
       }
     },
+    "@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
     "abortcontroller-polyfill": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz",
@@ -20431,9 +20447,9 @@
       }
     },
     "acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
+      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
       "dev": true
     },
     "acorn-jsx": {
@@ -22451,49 +22467,48 @@
       }
     },
     "eslint": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
-      "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
+      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.3.2",
-        "@humanwhocodes/config-array": "^0.10.5",
-        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "8.52.0",
+        "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "ajv": "^6.10.0",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "globby": "^11.1.0",
-        "grapheme-splitter": "^1.0.4",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "js-sdsl": "^4.1.4",
+        "is-path-inside": "^3.0.3",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "dependencies": {
@@ -22543,16 +22558,6 @@
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "dev": true
         },
-        "eslint-scope": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^5.2.0"
-          }
-        },
         "find-up": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -22976,6 +22981,16 @@
         "safe-regex": "^2.1.1"
       }
     },
+    "eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      }
+    },
     "eslint-utils": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
@@ -23000,14 +23015,14 @@
       "dev": true
     },
     "espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "requires": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.1"
       }
     },
     "esprima": {
@@ -23017,9 +23032,9 @@
       "dev": true
     },
     "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
@@ -24328,9 +24343,9 @@
       }
     },
     "globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
@@ -24395,12 +24410,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
     "graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
@@ -25560,12 +25569,6 @@
         }
       }
     },
-    "js-sdsl": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-      "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
-      "dev": true
-    },
     "js-sha3": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
@@ -27137,17 +27140,17 @@
       }
     },
     "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "requires": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "type-check": "^0.4.0"
       }
     },
     "ora": {

From d98e4db340e1863dafc5e2bf7c8fb59c6e8fccb9 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Fri, 24 Nov 2023 15:14:52 +0200
Subject: [PATCH 03/13] Release 3.2.0

---
 CHANGELOG.md      | 37 +++++++++++++++++++++++++++++++++----
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 059b69025..59d303982 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.2.0](https://github.com/oceanprotocol/ocean.js/compare/v3.1.5-next.0...v3.2.0)
+
+- Bump eslint from 8.24.0 to 8.52.0 [`#1783`](https://github.com/oceanprotocol/ocean.js/pull/1783)
+- bump contracts & add optimism [`#1786`](https://github.com/oceanprotocol/ocean.js/pull/1786)
+
+#### [v3.1.5-next.0](https://github.com/oceanprotocol/ocean.js/compare/v3.1.4...v3.1.5-next.0)
+
+> 13 November 2023
+
+- Bump crypto-js from 4.1.1 to 4.2.0 [`#1782`](https://github.com/oceanprotocol/ocean.js/pull/1782)
+- update min gas fee value [`2817315`](https://github.com/oceanprotocol/ocean.js/commit/2817315716c5cbc0171e6ca24cfb2f6b980ee417)
+- Release 3.1.5-next.0 [`1d924e1`](https://github.com/oceanprotocol/ocean.js/commit/1d924e11dda34e2c6a9f1327e09daebe3390dba0)
+- merge main [`83a8b7a`](https://github.com/oceanprotocol/ocean.js/commit/83a8b7a47052196a49a01c3fb3095fd21e9e2ae6)
+
 #### [v3.1.4](https://github.com/oceanprotocol/ocean.js/compare/v3.1.3...v3.1.4)
 
+> 24 October 2023
+
 - make sure we increment a number when working with nonces [`#1781`](https://github.com/oceanprotocol/ocean.js/pull/1781)
+- Release 3.1.4 [`b2e2cf2`](https://github.com/oceanprotocol/ocean.js/commit/b2e2cf24293af07f597c25e3a3e392db9caa381a)
 
 #### [v3.1.3](https://github.com/oceanprotocol/ocean.js/compare/v3.1.3-next.1...v3.1.3)
 
@@ -508,7 +525,21 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Bump typedoc from 0.22.15 to 0.22.17 [`#1514`](https://github.com/oceanprotocol/ocean.js/pull/1514)
 - Release 1.1.3 [`7772e93`](https://github.com/oceanprotocol/ocean.js/commit/7772e9387ef9d63f98ea80cfd4eefbea963dd0ad)
 
-#### [v1.1.2](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0...v1.1.2)
+#### [v1.1.2](https://github.com/oceanprotocol/ocean.js/compare/v1.1.1...v1.1.2)
+
+> 15 June 2022
+
+- Release 1.1.2 [`85bf271`](https://github.com/oceanprotocol/ocean.js/commit/85bf2716e26d8691aeb9d5504e563d557419dc2e)
+- manual bump fix [`5674a54`](https://github.com/oceanprotocol/ocean.js/commit/5674a547d1d367ce88b3595f0be8ebbf12274266)
+
+#### [v1.1.1](https://github.com/oceanprotocol/ocean.js/compare/v1.1.0...v1.1.1)
+
+> 15 June 2022
+
+- Release 1.1.1 [`ea48e01`](https://github.com/oceanprotocol/ocean.js/commit/ea48e015ac8299f71d57a929f8f30c5d1a8446e7)
+- manual bump fix [`a362410`](https://github.com/oceanprotocol/ocean.js/commit/a36241004b1d9578ec5c02d9d6e64d9750c53a7b)
+
+#### [v1.1.0](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0...v1.1.0)
 
 > 15 June 2022
 
@@ -516,9 +547,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Bump @types/node from 17.0.35 to 17.0.44 [`#1513`](https://github.com/oceanprotocol/ocean.js/pull/1513)
 - Bump eslint-config-oceanprotocol from 1.5.0 to 2.0.1 [`#1466`](https://github.com/oceanprotocol/ocean.js/pull/1466)
 - update to new schema & compute fixes [`#1510`](https://github.com/oceanprotocol/ocean.js/pull/1510)
-- Release 1.1.2 [`85bf271`](https://github.com/oceanprotocol/ocean.js/commit/85bf2716e26d8691aeb9d5504e563d557419dc2e)
-- manual bump fix [`5674a54`](https://github.com/oceanprotocol/ocean.js/commit/5674a547d1d367ce88b3595f0be8ebbf12274266)
-- manual bump fix [`a362410`](https://github.com/oceanprotocol/ocean.js/commit/a36241004b1d9578ec5c02d9d6e64d9750c53a7b)
+- Release 1.1.0 [`112c27e`](https://github.com/oceanprotocol/ocean.js/commit/112c27edab58ef0681ea3e87fb09978411924753)
 
 #### [v1.0.0](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.45...v1.0.0)
 
diff --git a/package-lock.json b/package-lock.json
index 00aa55d27..4d330a01c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@oceanprotocol/lib",
-  "version": "3.1.4",
+  "version": "3.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@oceanprotocol/lib",
-      "version": "3.1.4",
+      "version": "3.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@oceanprotocol/contracts": "^2.0.3",
diff --git a/package.json b/package.json
index b00fca454..efe84a26f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "3.1.4",
+  "version": "3.2.0",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",

From 4afa0699eea55833f0987a0f9aded3e808afc067 Mon Sep 17 00:00:00 2001
From: Ana Loznianu <ana@oceanprotocol.com>
Date: Tue, 5 Dec 2023 15:19:50 +0200
Subject: [PATCH 04/13] Fix for running c2d jobs with additional datasets

---
 src/services/Provider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/Provider.ts b/src/services/Provider.ts
index 81673ce28..27cb40aa1 100644
--- a/src/services/Provider.ts
+++ b/src/services/Provider.ts
@@ -571,7 +571,7 @@ export class Provider {
     payload.environment = computeEnv
     payload.dataset = dataset
     payload.algorithm = algorithm
-    if (payload.additionalDatasets) payload.additionalDatasets = additionalDatasets
+    if (additionalDatasets) payload.additionalDatasets = additionalDatasets
     if (output) payload.output = output
     if (!computeStartUrl) return null
     let response

From 0dbe977909650faac7fcb9958b7cbf5fc4d97d55 Mon Sep 17 00:00:00 2001
From: Alex Coseru <alex.coseru@gmail.com>
Date: Tue, 5 Dec 2023 15:25:00 +0200
Subject: [PATCH 05/13] Use latest barge (#1788)

---
 .github/workflows/ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0667037b1..b4ae9396f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,6 @@ jobs:
         with:
           repository: 'oceanprotocol/barge'
           path: 'barge'
-          ref: feature/bump_contracts_and_subgraph
 
       - name: Run Ganache with Barge
         working-directory: ${{ github.workspace }}/barge
@@ -104,8 +103,6 @@ jobs:
         with:
           repository: 'oceanprotocol/barge'
           path: 'barge'
-          ref: feature/bump_contracts_and_subgraph
-
       - name: Login to Docker Hub
         if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }}
         run: |

From e71159e0a1c37e3793bbf4c990dd857ceb36964a Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Tue, 5 Dec 2023 15:27:41 +0200
Subject: [PATCH 06/13] fix runner missing images

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b4ae9396f..1f2ac775d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,8 +119,6 @@ jobs:
       - run: npm run build:metadata
       - name: Delete default runner images
         run: |
-          docker image rm node:14
-          docker image rm node:14-alpine
           docker image rm node:16
           docker image rm node:16-alpine
           docker image rm node:18

From f92e2ff09e3bf9fc570b8dcc01a5345842265f56 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Tue, 5 Dec 2023 15:38:13 +0200
Subject: [PATCH 07/13] Release 3.2.1

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59d303982..9859fc557 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.2.1](https://github.com/oceanprotocol/ocean.js/compare/v3.2.0...v3.2.1)
+
+- Fix for running c2d jobs with additional datasets [`#1792`](https://github.com/oceanprotocol/ocean.js/pull/1792)
+- Use latest barge [`#1788`](https://github.com/oceanprotocol/ocean.js/pull/1788)
+- fix runner missing images [`e71159e`](https://github.com/oceanprotocol/ocean.js/commit/e71159e0a1c37e3793bbf4c990dd857ceb36964a)
+
 #### [v3.2.0](https://github.com/oceanprotocol/ocean.js/compare/v3.1.5-next.0...v3.2.0)
 
+> 24 November 2023
+
 - Bump eslint from 8.24.0 to 8.52.0 [`#1783`](https://github.com/oceanprotocol/ocean.js/pull/1783)
 - bump contracts & add optimism [`#1786`](https://github.com/oceanprotocol/ocean.js/pull/1786)
+- Release 3.2.0 [`d98e4db`](https://github.com/oceanprotocol/ocean.js/commit/d98e4db340e1863dafc5e2bf7c8fb59c6e8fccb9)
 
 #### [v3.1.5-next.0](https://github.com/oceanprotocol/ocean.js/compare/v3.1.4...v3.1.5-next.0)
 
diff --git a/package-lock.json b/package-lock.json
index 4d330a01c..710b22c2d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@oceanprotocol/lib",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@oceanprotocol/lib",
-      "version": "3.2.0",
+      "version": "3.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@oceanprotocol/contracts": "^2.0.3",
diff --git a/package.json b/package.json
index efe84a26f..f0694e835 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",

From 6f653fbdc085e82e3fe28d845202aba81ef87a7c Mon Sep 17 00:00:00 2001
From: Alex Coseru <alex.coseru@gmail.com>
Date: Thu, 14 Dec 2023 12:33:50 +0200
Subject: [PATCH 08/13] fix sepolia (#1794)

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

diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts
index 45dc0ebc7..9fd12d486 100644
--- a/src/config/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -149,7 +149,7 @@ export const configHelperNetworks: Config[] = [
   {
     ...configHelperNetworksBase,
     chainId: 11155420,
-    network: 'optimism-sepolia',
+    network: 'optimism_sepolia',
     nodeUri: 'https://sepolia.optimism.io',
     subgraphUri: 'https://v4.subgraph.optimism-sepolia.oceanprotocol.com',
     explorerUri: 'https://sepolia-optimism.etherscan.io/',

From da262f7498f8d2a307d1815b64bd6aa2787e2974 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Thu, 14 Dec 2023 12:34:47 +0200
Subject: [PATCH 09/13] Release 3.2.2

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9859fc557..60de8b8c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,17 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.2.2](https://github.com/oceanprotocol/ocean.js/compare/v3.2.1...v3.2.2)
+
+- fix sepolia [`#1794`](https://github.com/oceanprotocol/ocean.js/pull/1794)
+
 #### [v3.2.1](https://github.com/oceanprotocol/ocean.js/compare/v3.2.0...v3.2.1)
 
+> 5 December 2023
+
 - Fix for running c2d jobs with additional datasets [`#1792`](https://github.com/oceanprotocol/ocean.js/pull/1792)
 - Use latest barge [`#1788`](https://github.com/oceanprotocol/ocean.js/pull/1788)
+- Release 3.2.1 [`f92e2ff`](https://github.com/oceanprotocol/ocean.js/commit/f92e2ff09e3bf9fc570b8dcc01a5345842265f56)
 - fix runner missing images [`e71159e`](https://github.com/oceanprotocol/ocean.js/commit/e71159e0a1c37e3793bbf4c990dd857ceb36964a)
 
 #### [v3.2.0](https://github.com/oceanprotocol/ocean.js/compare/v3.1.5-next.0...v3.2.0)
diff --git a/package-lock.json b/package-lock.json
index 710b22c2d..144da60ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@oceanprotocol/lib",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@oceanprotocol/lib",
-      "version": "3.2.1",
+      "version": "3.2.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@oceanprotocol/contracts": "^2.0.3",
diff --git a/package.json b/package.json
index f0694e835..f4b33fa4e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",

From a0964d5096d4df5b6d0c9bf6ca1c1bedb4e2f265 Mon Sep 17 00:00:00 2001
From: Bogdan Fazakas <bogdan.fazakas@gmail.com>
Date: Fri, 15 Dec 2023 13:39:39 +0200
Subject: [PATCH 10/13] Fix provider fee approval in order helper (#1795)

* fix provider fee approval in order helper

* fix lint

* undo hardcode
---
 src/utils/OrderUtils.ts | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/utils/OrderUtils.ts b/src/utils/OrderUtils.ts
index 53384ad0c..132d81e13 100644
--- a/src/utils/OrderUtils.ts
+++ b/src/utils/OrderUtils.ts
@@ -10,7 +10,9 @@ import {
   approve,
   FixedRateExchange,
   ConsumeMarketFee,
-  ProviderFees
+  ProviderFees,
+  ZERO_ADDRESS,
+  approveWei
 } from '../index'
 import Decimal from 'decimal.js'
 
@@ -88,13 +90,32 @@ export async function orderAsset(
       )
     ).providerFee
 
+  if (
+    fees &&
+    fees.providerFeeAddress !== ZERO_ADDRESS &&
+    fees.providerFeeAmount &&
+    parseInt(fees.providerFeeAmount) > 0
+  ) {
+    try {
+      await approveWei(
+        consumerAccount,
+        config,
+        await consumerAccount.getAddress(),
+        fees.providerFeeToken,
+        asset.services[0].datatokenAddress,
+        fees.providerFeeAmount
+      )
+    } catch (error) {
+      throw new Error(`Failed to approve provider fee token ${fees.providerFeeToken}`)
+    }
+  }
+
   const orderParams = {
     consumer: consumerAddress || (await consumerAccount.getAddress()),
     serviceIndex,
     _providerFee: fees,
     _consumeMarketFee: consumeMarketOrderFee
   } as OrderParams
-
   switch (pricingType) {
     case 'free': {
       if (templateIndex === 1) {
@@ -105,8 +126,9 @@ export async function orderAsset(
           await consumerAccount.getAddress()
         )
         if (!dispenserTx) {
-          return
+          throw new Error(`Failed to dispense !`)
         }
+        await dispenserTx.wait()
         return await datatoken.startOrder(
           asset.datatokens[datatokenIndex].address,
           orderParams.consumer,
@@ -133,6 +155,7 @@ export async function orderAsset(
         )
       const fees = await fre.getFeesInfo(fixedRates[fixedRateIndex].id)
       const exchange = await fre.getExchange(fixedRates[fixedRateIndex].id)
+
       const { baseTokenAmount } = await fre.calcBaseInGivenDatatokensOut(
         fees.exchangeId,
         '1',
@@ -166,7 +189,7 @@ export async function orderAsset(
         )
         const txApprove = typeof tx !== 'number' ? await tx.wait() : tx
         if (!txApprove) {
-          return
+          throw new Error(`Failed to appove ${exchange.baseToken} !`)
         }
         const freTx = await fre.buyDatatokens(
           exchange.exchangeId,
@@ -177,7 +200,7 @@ export async function orderAsset(
         )
         const buyDtTx = await freTx.wait()
         if (!buyDtTx) {
-          return
+          throw new Error(`Failed to buy datatoken from fixed rate!`)
         }
         return await datatoken.startOrder(
           asset.datatokens[datatokenIndex].address,
@@ -202,11 +225,12 @@ export async function orderAsset(
         if (!txApprove) {
           return
         }
-        return await datatoken.buyFromFreAndOrder(
+        const txBuy = await datatoken.buyFromFreAndOrder(
           asset.datatokens[datatokenIndex].address,
           orderParams,
           freParams
         )
+        return txBuy
       }
       break
     }

From 46103868faf101f47d6babf8c90bdcbac9dff7b2 Mon Sep 17 00:00:00 2001
From: Alex Coseru <alex.coseru@gmail.com>
Date: Mon, 5 Feb 2024 12:23:55 +0200
Subject: [PATCH 11/13] fix using custom address file (#1802)

* fix using custom address file

* fix updated github runner images
---
 .github/workflows/ci.yml   | 3 +--
 src/config/ConfigHelper.ts | 9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f2ac775d..8b663d4d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -123,8 +123,7 @@ jobs:
           docker image rm node:16-alpine
           docker image rm node:18
           docker image rm node:18-alpine
-          docker image rm buildpack-deps:buster
-          docker image rm buildpack-deps:bullseye
+          docker image rm node:20
           docker image rm debian:10
           docker image rm debian:11
           docker image rm moby/buildkit:latest
diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts
index 9fd12d486..257ea5ead 100644
--- a/src/config/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -1,5 +1,6 @@
 // eslint-disable-next-line import/no-named-default
 import { default as DefaultContractsAddresses } from '@oceanprotocol/contracts/addresses/address.json'
+import fs from 'fs'
 import { Config } from '.'
 import { LoggerInstance } from '../utils'
 
@@ -261,8 +262,14 @@ export class ConfigHelper {
 
     let addresses
     try {
-      addresses = JSON.parse(process.env.ADDRESS_FILE)
+      addresses = process.env.ADDRESS_FILE
+        ? JSON.parse(
+            // eslint-disable-next-line security/detect-non-literal-fs-filename
+            fs.readFileSync(process.env.ADDRESS_FILE, 'utf8')
+          )
+        : null
     } catch (e) {
+      console.log(e)
       addresses = null
     }
     const contractAddressesConfig = this.getAddressesFromEnv(config.network, addresses)

From 7c4da83ee3f8c0ff8fa417b7c41e3ae72924e960 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Mon, 5 Feb 2024 12:26:19 +0200
Subject: [PATCH 12/13] Release 3.3.0

---
 CHANGELOG.md      | 16 ++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60de8b8c8..248775e3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,25 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.3.0](https://github.com/oceanprotocol/ocean.js/compare/v3.2.3...v3.3.0)
+
+- fix using custom address file [`#1802`](https://github.com/oceanprotocol/ocean.js/pull/1802)
+- Fix provider fee approval in order helper [`#1795`](https://github.com/oceanprotocol/ocean.js/pull/1795)
+
+#### [v3.2.3](https://github.com/oceanprotocol/ocean.js/compare/v3.2.2...v3.2.3)
+
+> 15 December 2023
+
+- fix provider fee approval in order helper [`f8527d7`](https://github.com/oceanprotocol/ocean.js/commit/f8527d7a65e5af3f14fbaa5a4977ef72377e6569)
+- Release 3.2.3 [`399f97e`](https://github.com/oceanprotocol/ocean.js/commit/399f97e841552bdfe0635f2f277ad6b5f4e8ac82)
+- fix lint [`41f2ba7`](https://github.com/oceanprotocol/ocean.js/commit/41f2ba763d26c72b38f12f2c80b698e047f8922b)
+
 #### [v3.2.2](https://github.com/oceanprotocol/ocean.js/compare/v3.2.1...v3.2.2)
 
+> 14 December 2023
+
 - fix sepolia [`#1794`](https://github.com/oceanprotocol/ocean.js/pull/1794)
+- Release 3.2.2 [`da262f7`](https://github.com/oceanprotocol/ocean.js/commit/da262f7498f8d2a307d1815b64bd6aa2787e2974)
 
 #### [v3.2.1](https://github.com/oceanprotocol/ocean.js/compare/v3.2.0...v3.2.1)
 
diff --git a/package-lock.json b/package-lock.json
index 144da60ca..ea5c560b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@oceanprotocol/lib",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@oceanprotocol/lib",
-      "version": "3.2.2",
+      "version": "3.3.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@oceanprotocol/contracts": "^2.0.3",
diff --git a/package.json b/package.json
index f4b33fa4e..17f28c7f8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",

From be52ec26c2bc5a542795bfa2b028fcf2318005de Mon Sep 17 00:00:00 2001
From: mihaisc <mihai@oceanprotocol.com>
Date: Thu, 21 Mar 2024 10:21:32 +0200
Subject: [PATCH 13/13] Update ConfigHelper.ts (#1807)

remove goerli
---
 src/config/ConfigHelper.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts
index 257ea5ead..7ecd158db 100644
--- a/src/config/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -41,15 +41,6 @@ export const configHelperNetworks: Config[] = [
     // providerUri: 'http://127.0.0.1:8030/',
     // subgraphUri: 'http://127.0.0.1:9000/'
   },
-  {
-    ...configHelperNetworksBase,
-    chainId: 5,
-    network: 'goerli',
-    nodeUri: 'https://goerli.infura.io/v3',
-    subgraphUri: 'https://v4.subgraph.goerli.oceanprotocol.com',
-    explorerUri: 'https://goerli.etherscan.io',
-    gasFeeMultiplier: 1.1
-  },
   {
     ...configHelperNetworksBase,
     chainId: 11155111,