@oceanprotocol/lib 1.1.8 → 2.0.0-next.0

package/CHANGELOG.md

@@ -4,10 +4,34 @@ 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).
 
+#### [v2.0.0-next.0](https://github.com/oceanprotocol/ocean.js/compare/v1.1.8...v2.0.0-next.0)
+
+- Eip 1559 support [`#1579`](https://github.com/oceanprotocol/ocean.js/pull/1579)
+- add gas fee multiplier to max priority fee [`#1581`](https://github.com/oceanprotocol/ocean.js/pull/1581)
+- Remove amm pools [`#1568`](https://github.com/oceanprotocol/ocean.js/pull/1568)
+- Fix c2d integration test [`#1567`](https://github.com/oceanprotocol/ocean.js/pull/1567)
+- Issue-#1474: Refactoring(11): Review try catch clauses [`#1524`](https://github.com/oceanprotocol/ocean.js/pull/1524)
+- Issue-#1474: Refactoring (10): General renaming [`#1565`](https://github.com/oceanprotocol/ocean.js/pull/1565)
+- Issue-#1474: Refactoring (9): Refactor estimategas. Change from function to parameter in real functions [`#1509`](https://github.com/oceanprotocol/ocean.js/pull/1509)
+- Issue-#1474: Refactoring (8): Rename from erc20 to datatoken [`#1507`](https://github.com/oceanprotocol/ocean.js/pull/1507)
+- Issue-#1474: Refactoring (7): Rename from erc721 to nft [`#1506`](https://github.com/oceanprotocol/ocean.js/pull/1506)
+- Issue-#1474: Refactoring(6). Refactor estimate gas function names [`#1505`](https://github.com/oceanprotocol/ocean.js/pull/1505)
+- Issue-#1474: Refactoring(5). Move functions from \utils to classes [`#1504`](https://github.com/oceanprotocol/ocean.js/pull/1504)
+- Issue-#1474: Refactoring(4). Create class inheritance [`#1501`](https://github.com/oceanprotocol/ocean.js/pull/1501)
+- Issue-#1474: Refactoring(3). Move types to src\@types folder [`#1500`](https://github.com/oceanprotocol/ocean.js/pull/1500)
+- Issue-#1474: Refactoring (2). Restructure imports [`#1493`](https://github.com/oceanprotocol/ocean.js/pull/1493)
+- Issue-#1474: Refactoring (1). Restructure file location [`#1492`](https://github.com/oceanprotocol/ocean.js/pull/1492)
+- updating packages [`77eaccd`](https://github.com/oceanprotocol/ocean.js/commit/77eaccdbed9f962f90b24c21945ec1767c7542ce)
+- add suport for eip 1559 [`60a3f5a`](https://github.com/oceanprotocol/ocean.js/commit/60a3f5af2033e55e5a8d97e4abdb749899b542b4)
+- Updating release-it [`8a6f009`](https://github.com/oceanprotocol/ocean.js/commit/8a6f00929070b60e13c2ed89e14092d50a1e33fd)
+
 #### [v1.1.8](https://github.com/oceanprotocol/ocean.js/compare/v1.1.7...v1.1.8)
 
+> 9 August 2022
+
 - Let do any query in Aquarius [`#1576`](https://github.com/oceanprotocol/ocean.js/pull/1576)
 - let do any query in Aquarius [`02b805a`](https://github.com/oceanprotocol/ocean.js/commit/02b805a45ddbc77a0d4675a06e73b31d0494d55f)
+- Release 1.1.8 [`0f0030d`](https://github.com/oceanprotocol/ocean.js/commit/0f0030daf34cc0a4c24647b0f93570312e4eac97)
 
 #### [v1.1.7](https://github.com/oceanprotocol/ocean.js/compare/v1.1.6...v1.1.7)
 
@@ -80,21 +104,7 @@ 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.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)
+#### [v1.1.2](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0...v1.1.2)
 
 > 15 June 2022
 
@@ -102,7 +112,9 @@ 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.0 [`112c27e`](https://github.com/oceanprotocol/ocean.js/commit/112c27edab58ef0681ea3e87fb09978411924753)
+- 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)
 
 #### [v1.0.0](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.45...v1.0.0)
 

package/CodeExamples.md

@@ -23,9 +23,8 @@ Here are the steps:
 3. [Install dependencies](#-install-dependencies)
 4. [Initialize accounts and deploy contracts](#-initialize-accounts-and-deploy-contracts)
 5. [Import dependencies and add variables and constants](#-import-dependencies-and-add-variables-and-constants)
-6. [Publish Data NFT and a Datatoken with a liquidity pool](#-Publish-data-nft-and-a-datatoken-with-a-liquidity-pool)
-7. [Publish Data NFT and a Datatoken with a fixed rate exchange](#-publish-data-nft-and-a-datatoken-with-a-fixed-rate-exchange)
-8. [Publish Data NFT and a Datatoken with a dispenser](#-publish-data-nft-and-a-datatoken-with-a-dispenser)
+6. [Publish Data NFT and a Datatoken with a fixed rate exchange](#-publish-data-nft-and-a-datatoken-with-a-fixed-rate-exchange)
+7. [Publish Data NFT and a Datatoken with a dispenser](#-publish-data-nft-and-a-datatoken-with-a-dispenser)
 
 ## 0. Prerequisites
 Before we start it is important that you have all of the necessary prerequisites installed on your computer.
@@ -88,7 +87,6 @@ Start by importing all of the necessary dependencies
 
 import { SHA256 } from 'crypto-js'
 import {
-  AmountsOutMaxFee,
   approve,
   Aquarius,
   balance,
@@ -97,7 +95,7 @@ import {
   Dispenser,
   DispenserCreationParams,
   downloadFile,
-  Erc20CreateParams,
+  DatatokenCreateParams,
   Files,
   FixedRateExchange,
   FreCreationParams,
@@ -105,11 +103,8 @@ import {
   Nft,
   NftCreateData,
   NftFactory,
-  Pool,
-  PoolCreationParams,
   ProviderFees,
   ProviderInstance,
-  TokenInOutMarket,
   transfer,
   ZERO_ADDRESS
 } from '../../src'
@@ -130,9 +125,6 @@ Now we define the variables which we will need later
   let consumerAccount: string
   let stakerAccount: string
   let addresses: any
-  let poolNftAddress: string
-  let poolDatatokenAddress: string
-  let poolAddress: string
   let freNftAddress: string
   let freDatatokenAddress: string
   let freAddress: string
@@ -144,8 +136,6 @@ Now we define the variables which we will need later
 
 We also define some constants that we will use:
 ```Typescript
-  const POOL_NFT_NAME = 'Datatoken 1'
-  const POOL_NFT_SYMBOL = 'DT1'
   const FRE_NFT_NAME = 'Datatoken 2'
   const FRE_NFT_SYMBOL = 'DT2'
   const DISP_NFT_NAME = 'Datatoken 3'
@@ -235,292 +225,14 @@ Again, lets console log the values so that we can check that they have been save
 
   ### 5.3 We send some OCEAN to consumer and staker accounts
 ```Typescript
-    transfer(web3, publisherAccount, addresses.Ocean, consumerAccount, '100')
-    transfer(web3, publisherAccount, addresses.Ocean, stakerAccount, '100')
+    transfer(web3, config, publisherAccount, addresses.Ocean, consumerAccount, '100')
+    transfer(web3, config, publisherAccount, addresses.Ocean, stakerAccount, '100')
   
 ```
 
-## 6. Publish Data NFT and a Datatoken with a liquidity pool
+## 6. Publish Data NFT and a Datatoken with a fixed rate exchange
 
-For pool creation, the OCEAN token is used as the base token. The base token can be changed into something else, such as USDC, DAI etc., but it will require an extra fee.
-
-  ### 6.1 Publish a dataset (create NFT + Datatoken) with a liquidity pool
-```Typescript
-    const factory = new NftFactory(addresses.ERC721Factory, web3)
-
-    const nftParams: NftCreateData = {
-      name: POOL_NFT_NAME,
-      symbol: POOL_NFT_SYMBOL,
-      templateIndex: 1,
-      tokenURI: '',
-      transferable: true,
-      owner: publisherAccount
-    }
-
-    const erc20Params: Erc20CreateParams = {
-      templateIndex: 1,
-      cap: '100000',
-      feeAmount: '0',
-      paymentCollector: ZERO_ADDRESS,
-      feeToken: ZERO_ADDRESS,
-      minter: publisherAccount,
-      mpFeeAddress: ZERO_ADDRESS
-    }
-
-    const poolParams: PoolCreationParams = {
-      ssContract: addresses.Staking,
-      baseTokenAddress: addresses.Ocean,
-      baseTokenSender: addresses.ERC721Factory,
-      publisherAddress: publisherAccount,
-      marketFeeCollector: publisherAccount,
-      poolTemplateAddress: addresses.poolTemplate,
-      rate: '1',
-      baseTokenDecimals: 18,
-      vestingAmount: '10000',
-      vestedBlocks: 2500000,
-      initialBaseTokenLiquidity: '2000',
-      swapFeeLiquidityProvider: '0.001',
-      swapFeeMarketRunner: '0.001'
-    }
-```
-Before we call the contract we have to call `approve` so that the contract can move our tokens. This is standard when using any ERC20 tokens
-```Typescript
-    await approve(
-      web3,
-      publisherAccount,
-      addresses.Ocean,
-      addresses.ERC721Factory,
-      poolParams.vestingAmount
-    )
-
-```
-Now we can make the contract call
-```Typescript
-    const tx = await factory.createNftErc20WithPool(
-      publisherAccount,
-      nftParams,
-      erc20Params,
-      poolParams
-    )
-
-    poolNftAddress = tx.events.NFTCreated.returnValues[0]
-    poolDatatokenAddress = tx.events.TokenCreated.returnValues[0]
-    poolAddress = tx.events.NewPool.returnValues[0]
-```
-Now, we did quite a few things there. Let's check that we successfully published a dataset (create NFT + Datatoken) with a liquidity pool
-```Typescript
-    console.log(`Pool NFT address: ${poolNftAddress}`)
-    console.log(`Pool Datatoken address: ${poolDatatokenAddress}`)
-    console.log(`Pool address: ${poolAddress}`)
-  
-```
-
-  ### 6.2 Set metadata in the pool NFT
-```Typescript
-    const nft = new Nft(web3)
-```
-Now we update the ddo and set the right did
-```Typescript
-    DDO.chainId = await web3.eth.getChainId()
-    DDO.id =
-      'did:op:' +
-      SHA256(web3.utils.toChecksumAddress(poolNftAddress) + DDO.chainId.toString(10))
-    DDO.nftAddress = poolNftAddress
-```
-Next we encrypt the file or files using Ocean Provider. The provider is an off chain proxy built specifically for this task
-```Typescript
-    ASSET_URL.datatokenAddress = poolDatatokenAddress
-    ASSET_URL.nftAddress = poolNftAddress
-    const encryptedFiles = await ProviderInstance.encrypt(ASSET_URL, providerUrl)
-    DDO.services[0].files = await encryptedFiles
-    DDO.services[0].datatokenAddress = poolDatatokenAddress
-```
-Now let's console log the result to check everything is working
-```Typescript
-    console.log(`DID: ${DDO.id}`)
-
-    const providerResponse = await ProviderInstance.encrypt(DDO, providerUrl)
-    const encryptedDDO = await providerResponse
-    const metadataHash = getHash(JSON.stringify(DDO))
-    await nft.setMetadata(
-      poolNftAddress,
-      publisherAccount,
-      0,
-      providerUrl,
-      '',
-      '0x2',
-      encryptedDDO,
-      '0x' + metadataHash
-    )
-  
-```
-
-  ### 6.3 User should add liquidity to the pool, receiving LP tokens
-```Typescript
-    const pool = new Pool(web3)
-
-```
-Before we call the contract we have to call `approve` so that the contract can move our tokens. This is standard when using any ERC20 tokens
-```Typescript
-    await approve(web3, stakerAccount, addresses.Ocean, poolAddress, '5', true)
-
-```
-Now we can make the contract call
-```Typescript
-    await pool.joinswapExternAmountIn(stakerAccount, poolAddress, '5', '0.1')
-  
-```
-
-  ### 6.4 Marketplace displays pool asset for sale
-```Typescript
-    const pool = new Pool(web3)
-    const prices = await pool.getAmountInExactOut(
-      poolAddress,
-      poolDatatokenAddress,
-      addresses.Ocean,
-      '1',
-      '0.01'
-    )
-```
-Now let's console log the result to check everything is working
-```Typescript
-    console.log(`Price of 1 ${POOL_NFT_SYMBOL} is ${prices.tokenAmount} OCEAN`)
-  
-```
-
-  ### 6.5 Consumer buys a pool data asset, and downloads it
-```Typescript
-    const datatoken = new Datatoken(web3)
-
-    const consumerETHBalance = await web3.eth.getBalance(consumerAccount)
-```
-Now let's console log the result to check everything is working
-```Typescript
-    console.log(`Consumer ETH balance: ${consumerETHBalance}`)
-    let consumerOCEANBalance = await balance(web3, addresses.Ocean, consumerAccount)
-```
-Now let's console log consumerOCEANBalance to check everything is working
-```Typescript
-    console.log(`Consumer OCEAN balance before swap: ${consumerOCEANBalance}`)
-    let consumerDTBalance = await balance(web3, poolDatatokenAddress, consumerAccount)
-```
-Now let's console log POOL_NFT_SYMBOL and consumerDTBalance to check everything is working
-```Typescript
-    console.log(`Consumer ${POOL_NFT_SYMBOL} balance before swap: ${consumerDTBalance}`)
-
-```
-Before we call the contract we have to call `approve` so that the contract can move our tokens. This is standard when using any ERC20 tokens
-```Typescript
-    await approve(web3, consumerAccount, addresses.Ocean, poolAddress, '100')
-
-    const pool = new Pool(web3)
-    const tokenInOutMarket: TokenInOutMarket = {
-      tokenIn: addresses.Ocean,
-      tokenOut: poolDatatokenAddress,
-      marketFeeAddress: consumerAccount
-    }
-    const amountsInOutMaxFee: AmountsOutMaxFee = {
-      maxAmountIn: '10',
-      tokenAmountOut: '1',
-      swapMarketFee: '0.1'
-    }
-
-```
-Now we can make the contract call
-```Typescript
-    await pool.swapExactAmountOut(
-      consumerAccount,
-      poolAddress,
-      tokenInOutMarket,
-      amountsInOutMaxFee
-    )
-
-    consumerOCEANBalance = await balance(web3, addresses.Ocean, consumerAccount)
-```
-Now let's console log the Consumer OCEAN balance after swap to check everything is working
-```Typescript
-    console.log(`Consumer OCEAN balance after swap: ${consumerOCEANBalance}`)
-    consumerDTBalance = await balance(web3, poolDatatokenAddress, consumerAccount)
-```
-Next let's console log the POOL_NFT_SYMBOL and consumerDTBalance
-```Typescript
-    console.log(`Consumer ${POOL_NFT_SYMBOL} balance after swap: ${consumerDTBalance}`)
-
-    const resolvedDDO = await aquarius.waitForAqua(DDO.id)
-    assert(resolvedDDO, 'Cannot fetch DDO from Aquarius')
-
-```
-The next step is to initialize the provider instance
-```Typescript
-    const initializeData = await ProviderInstance.initialize(
-      resolvedDDO.id,
-      resolvedDDO.services[0].id,
-      0,
-      consumerAccount,
-      providerUrl
-    )
-
-    const providerFees: ProviderFees = {
-      providerFeeAddress: initializeData.providerFee.providerFeeAddress,
-      providerFeeToken: initializeData.providerFee.providerFeeToken,
-      providerFeeAmount: initializeData.providerFee.providerFeeAmount,
-      v: initializeData.providerFee.v,
-      r: initializeData.providerFee.r,
-      s: initializeData.providerFee.s,
-      providerData: initializeData.providerFee.providerData,
-      validUntil: initializeData.providerFee.validUntil
-    }
-
-```
-Now let's make a payment
-```Typescript
-    const tx = await datatoken.startOrder(
-      poolDatatokenAddress,
-      consumerAccount,
-      consumerAccount,
-      0,
-      providerFees
-    )
-
-```
-Next up, let's get the URL
-```Typescript
-    const downloadURL = await ProviderInstance.getDownloadUrl(
-      DDO.id,
-      consumerAccount,
-      DDO.services[0].id,
-      0,
-      tx.transactionHash,
-      providerUrl,
-      web3
-    )
-
-```
-Now let's console log the Download URL to check everything is working
-```Typescript
-    console.log(`Download URL: ${downloadURL}`)
-
-    consumerOCEANBalance = await balance(web3, addresses.Ocean, consumerAccount)
-    console.log(`Consumer OCEAN balance after order: ${consumerOCEANBalance}`)
-    consumerDTBalance = await balance(web3, poolDatatokenAddress, consumerAccount)
-
-```
-Now let's console log the Consumer balance after order to check everything is working
-```Typescript
-    console.log(`Consumer ${POOL_NFT_SYMBOL} balance after order: ${consumerDTBalance}`)
-
-    try {
-      const fileData = await downloadFile(downloadURL)
-      console.log(fileData)
-    } catch (e) {
-      assert.fail('Download failed')
-    }
-  
-```
-
-## 7. Publish Data NFT and a Datatoken with a fixed rate exchange
-
-  ### 7.1 Publish a dataset (create NFT + Datatoken) with a fixed rate exchange
+  ### 6.1 Publish a dataset (create NFT + Datatoken) with a fixed rate exchange
 ```Typescript
     const factory = new NftFactory(addresses.ERC721Factory, web3)
 
@@ -533,7 +245,7 @@ Now let's console log the Consumer balance after order to check everything is wo
       owner: publisherAccount
     }
 
-    const erc20Params: Erc20CreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -556,10 +268,10 @@ Now let's console log the Consumer balance after order to check everything is wo
       withMint: false
     }
 
-    const tx = await factory.createNftErc20WithFixedRate(
+    const tx = await factory.createNftWithDatatokenWithFixedRate(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       freParams
     )
 
@@ -578,7 +290,7 @@ Now let's console log each of those values to check everything is working
   
 ```
 
-  ### 7.2 Set metadata in the fixed rate exchange NFT
+  ### 6.2 Set metadata in the fixed rate exchange NFT
 ```Typescript
     const nft = new Nft(web3)
 
@@ -621,11 +333,11 @@ Now let's console log the DID to check everything is working
   })
 ```
 
-  ### 7.3 Marketplace displays fixed rate asset for sale
+  ### 6.3 Marketplace displays fixed rate asset for sale
 ```Typescript
-    const fixedRate = new FixedRateExchange(web3, freAddress)
+    const fixedRate = new FixedRateExchange(freAddress, web3)
     const oceanAmount = await (
-      await fixedRate.calcBaseInGivenOutDT(freId, '1')
+      await fixedRate.calcBaseInGivenDatatokensOut(freId, '1')
     ).baseTokenAmount
 ```
 Now that the market has fetched those values it can display the asset on the front end. In our case we will just console log the results:
@@ -634,7 +346,7 @@ Now that the market has fetched those values it can display the asset on the fro
   
 ```
 
-  ### 7.4 Consumer buys a fixed rate asset data asset, and downloads it
+  ### 6.4 Consumer buys a fixed rate asset data asset, and downloads it
 ```Typescript
     const datatoken = new Datatoken(web3)
     const DATATOKEN_AMOUNT = '10000'
@@ -653,22 +365,23 @@ Let's do a quick check of the consumer ETH balance before the swap
     console.log(`Consumer ${FRE_NFT_SYMBOL} balance before swap: ${consumerDTBalance}`)
 
 ```
-Before we call the contract we have to call `approve` so that the contract can move our tokens. This is standard when using any ERC20 tokens
+Before we call the contract we have to call `approve` so that the contract can move our tokens. This is standard when using any ERC20 Datatokens
 ```Typescript
-    await approve(web3, consumerAccount, addresses.Ocean, freAddress, '100')
+    await approve(web3, config, consumerAccount, addresses.Ocean, freAddress, '100')
     await approve(
       web3,
+      config,
       publisherAccount,
       freDatatokenAddress,
       freAddress,
       DATATOKEN_AMOUNT
     )
 
-    const fixedRate = new FixedRateExchange(web3, freAddress)
+    const fixedRate = new FixedRateExchange(freAddress, web3)
 ```
 Now we can make the contract call
 ```Typescript
-    await fixedRate.buyDT(consumerAccount, freId, '1', '2')
+    await fixedRate.buyDatatokens(consumerAccount, freId, '1', '2')
 
     consumerOCEANBalance = await balance(web3, addresses.Ocean, consumerAccount)
     console.log(`Consumer OCEAN balance after swap: ${consumerOCEANBalance}`)
@@ -742,9 +455,9 @@ Lets check that the download URL was successfully received
   
 ```
 
-## 8. Publish Data NFT and a Datatoken with a dispenser
+## 7. Publish Data NFT and a Datatoken with a dispenser
 
-  ### 8.1 Publish a dataset (create NFT + Datatoken) with a dispenser
+  ### 7.1 Publish a dataset (create NFT + Datatoken) with a dispenser
 ```Typescript
     const factory = new NftFactory(addresses.ERC721Factory, web3)
 
@@ -757,7 +470,7 @@ Lets check that the download URL was successfully received
       owner: publisherAccount
     }
 
-    const erc20Params: Erc20CreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -775,10 +488,10 @@ Lets check that the download URL was successfully received
       allowedSwapper: ZERO_ADDRESS
     }
 
-    const tx = await factory.createNftErc20WithDispenser(
+    const tx = await factory.createNftWithDatatokenWithDispenser(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       dispenserParams
     )
 
@@ -794,7 +507,7 @@ Lets check that we managed to received all of those values without any problems
   
 ```
 
-  ### 8.2 Set metadata in the dispenser NFT
+  ### 7.2 Set metadata in the dispenser NFT
 ```Typescript
     const nft = new Nft(web3)
 
@@ -834,10 +547,10 @@ Now we need to encrypt file(s) using provider
   
 ```
 
-  ### 8.3 Consumer gets a dispenser data asset, and downloads it
+  ### 7.3 Consumer gets a dispenser data asset, and downloads it
 ```Typescript
     const datatoken = new Datatoken(web3)
-    const dispenser = new Dispenser(web3, null, addresses.Dispenser)
+    const dispenser = new Dispenser(addresses.Dispenser, web3)
 
     let consumerDTBalance = await balance(
       web3,

package/README.md

@@ -14,8 +14,7 @@
 With ocean.js, you can:
 
 - **Publish** data services: downloadable files or compute-to-data. Create an ERC721 **data NFT** for each service, and ERC20 **datatoken** for access (1.0 datatokens to access).
-- **Sell** datatokens via an OCEAN-datatoken Balancer pool (for auto price discovery), or for a fixed price. Sell data NFTs.
-- **Stake OCEAN** on datatoken pools
+- **Sell** datatokens for a fixed price. Sell data NFTs.
 - **Transfer** data NFTs & datatokens to another owner, and **all other ERC721 & ERC20 actions** using [web3.js](https://web3js.readthedocs.io/en/v1.2.9/web3-eth-contract.html) etc.
 
 ocean.js is part of the [Ocean Protocol](https://oceanprotocol.com) toolset.
@@ -23,8 +22,7 @@ ocean.js is part of the [Ocean Protocol](https://oceanprotocol.com) toolset.
 This is in alpha state. If you run into problems, please open up a [new issue](https://github.com/oceanprotocol/ocean.js/issues/new?assignees=&labels=bug&template=bug_report.md&title=).
 
 - [📚 Prerequisites](#-prerequisites)
-- [🏗 Installation](#-installation)
-- [📖 Learn More](#-learn-more)
+- [🏗 Installation & Usage](#-installation--usage)
 - [🦑 Development](#-development)
 - [✨ Code Style](#-code-style)
 - [👩‍🔬 Testing](#-testing)
@@ -33,7 +31,7 @@ This is in alpha state. If you run into problems, please open up a [new issue](h
 - [🛳 Production](#-production)
 - [⬆️ Releases](#️-releases)
   - [Production](#production)
-  - [Pre-releases](#pre-releases)
+  - [Pre-Releases](#pre-releases)
 - [🏛 License](#-license)
 
 ## 📚 Prerequisites
@@ -42,12 +40,11 @@ This is in alpha state. If you run into problems, please open up a [new issue](h
 - Docker ([Managed as a non-root user](https://docs.docker.com/engine/install/linux-postinstall/))
 - A Unix based operating system (Mac or Linux)
 
-## 🏗 Installation
+## 🏗 Installation & Usage
 
 ```bash
 npm install @oceanprotocol/lib
 ```
-### 📖 Learn more
 
 - Checkout our [code examples](CodeExamples.md) to see how you can use ocean.js.
 - Refer to the [Ocean Protocol documentation](https://docs.oceanprotocol.com/) for more guides and tutorials.