V2.0

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = v1.1.15
+current_version = v2.0.1
 commit = True
 tag = True
 

.github/workflows/ci.yml

@@ -116,16 +116,27 @@ jobs:
           coverageLocations: |
             ${{ github.workspace }}/coverage/lcov.info:lcov
 
-  dockertest:
+  check_deployment:
     runs-on: ubuntu-latest
-    if: ${{ success() }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build
-        run: docker build -t "oceanprotocol/ocean-contracts:test" .
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: Cache node_modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-test-unit-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-test-unit-${{ env.cache-name }}-
+      # Env var expansion workaround
+      # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
       - name: Set ADDRESS_FILE
         run: echo "ADDRESS_FILE=${HOME}/.ocean/ocean-contracts/artifacts/address.json" >> $GITHUB_ENV
+      - name: Build local docker file
+        run: docker build -t 'oceanprotocol/ocean-contracts:test' .
       - name: Checkout Barge
         uses: actions/checkout@v3
         with:
@@ -135,9 +146,10 @@ jobs:
       - name: Run Ganache with Barge
         working-directory: ${{ github.workspace }}/barge
         run: |
-          bash -x start_ocean.sh  --no-ipfs --no-aquarius --no-elasticsearch --no-provider --no-dashboard 2>&1 > start_ocean.log &
+          bash -x start_ocean.sh  --no-aquarius --no-elasticsearch --no-provider --no-dashboard 2>&1 > start_ocean.log &
         env:
           CONTRACTS_VERSION: test
+      - run: npm ci
       - name: Wait for contracts deployment
         working-directory: ${{ github.workspace }}/barge
         run: |
@@ -146,17 +158,14 @@ jobs:
             [ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" ] && break
             done
           ls -la "$HOME/.ocean/ocean-contracts/artifacts/"
-      - name: "Read address.json contents"
-        working-directory: ${{ github.workspace }}
-        run: cat $ADDRESS_FILE
-      - run: grep -q development $ADDRESS_FILE
-        name: Searching for development key in addresses.json
+      - run: cat ${HOME}/.ocean/ocean-contracts/artifacts/address.json
+      - run: node scripts/check_deployment.js
       - name: docker logs
         run: docker logs ocean_ocean-contracts_1
         if: ${{ failure() }}
 
   publish-npm:
-    needs: [lint, tests_full]
+    needs: [lint, tests_full,check_deployment]
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
@@ -181,7 +190,7 @@ jobs:
 
   publish-pypi:
     runs-on: ubuntu-latest
-    needs: [lint, tests_full]
+    needs: [lint, tests_full,check_deployment]
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: "step-log-ref"

.github/workflows/deployment_check.yml

@@ -56,5 +56,4 @@ jobs:
       - run: cat ${HOME}/.ocean/ocean-contracts/artifacts/address.json
       - run: node scripts/check_deployment.js
       - name: docker logs
-        run: docker logs ocean_ocean-contracts_1
-        if: ${{ failure() }}
+        run: docker logs ocean_ocean-contracts_1

Dockerfile

@@ -1,7 +1,7 @@
 
 FROM ubuntu:20.04 as base
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get -y install curl git bash ca-certificates gnupg
+RUN apt-get update && apt-get -y install curl bash
 # nvm env vars
 RUN mkdir -p /usr/local/nvm
 ENV NVM_DIR /usr/local/nvm
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get -y install wget
 COPY . /ocean-contracts
 WORKDIR /ocean-contracts
 ENV NODE_ENV=production
-RUN npm install
+RUN npm i
 RUN wget https://gobinaries.com/tj/node-prune --output-document - | /bin/sh && node-prune
 
 

README.md

@@ -57,12 +57,11 @@ from artifacts import address
 
 - Base IP is now represented by an [NFT](https://blog.oceanprotocol.com/what-is-a-data-nft-5804a2d88671), from which a datapublisher can create multiple ERC20s representing different type of access for the same dataset.
 
-- An automated Datatoken [Staking](https://blog.oceanprotocol.com/ocean-v4-one-sided-staking-93988f65e378) helps with the initial DTs distribution and price stability. Goodbye rug pulls!
-
 - Help [Ocean Community Monetize](https://blog.oceanprotocol.com/how-to-make-money-from-ocean-v4-477b3decad51): there's a swap fee for the Ocean Community, if Ocean or allied tokens are the basetoken in a pool, Ocean Community will receive 0.1% swap fee, otherwhise it will be 0.2%.
 
 #### Flexibility
 
+- Based on ERC721 and ERC20 [templates](contracts/templates/README.md) to provide different features
 - Introduce an advanced [Fee Structure](https://docs.oceanprotocol.com/core-concepts/fees) both for Market and Provider runners.
 
 - Roles Administration: there are now multiple roles for a more flexible administation both at NFT and ERC20 levels

addresses/address.json

@@ -23,7 +23,9 @@
     "veFeeDistributor": "0x35F1e6765750E874EB9d0675393A1A394A4749b4",
     "DFRewards": "0x4259c164eedA7483dda2b4b622D761A88674D31f",
     "DFStrategyV1": "0x1be9C72500B41c286C797D4FE727747Ae9C4E195",
-    "veFeeEstimate": "0xCFeF55c6ae4d250586e293f29832967a04A9087d"
+    "veFeeEstimate": "0xCFeF55c6ae4d250586e293f29832967a04A9087d",
+    "Splitter": "0x648306FF10673e4eAad6F69473e49C973f9F5872",
+    "VestingWallet0": "0x4699B0f191C68975e89E70c5704537f7ad033f62"
   },
   "polygon": {
     "chainId": 137,
@@ -134,7 +136,9 @@
     "veDelegation": "0xc768eDF2d21fe00ef5804A7Caa775E877e65A70E",
     "veFeeDistributor": "0x256c54219816603BB8327F9019533B020a76e936",
     "veFeeEstimate": "0x4aA261bC595abC6fDEf0255C83e2a9305261753f",
-    "SmartWalletChecker": "0xd7ddf62257A41cc6cdAd7A3d36e4f1d925fD142a"
+    "SmartWalletChecker": "0xd7ddf62257A41cc6cdAd7A3d36e4f1d925fD142a",
+    "Splitter": "0xadF0D06e58E618de36Af0F1b52891b14FAA61187",
+    "VestingWallet0": "0x8D011915C437AD5f5e3B0E4c6dd6380c92599f99"
   },
   "goerli": {
     "chainId": 5,
@@ -251,6 +255,25 @@
     "Dispenser": "0xDEfD0018969cd2d4E648209F876ADe184815f038",
     "ERC721Factory": "0x9C9eE07b8Ce907D2f9244F8317C1Ed29A3193bAe"
   },
+  "oasis_saphire_testnet": {
+    "chainId": 23295,
+    "Ocean": "0x973e69303259B0c2543a38665122b773D28405fB",
+    "OPFCommunityFeeCollector": "0xe8c6Dc39602031A152440311e364818ba25C2Bc1",
+    "startBlock": 2565487,
+    "Router": "0x5FBC2A29f7C8e4533dECD14Dc1c561A8eF0d4e31",
+    "FixedPrice": "0x0846aec7aADD547131484Bf7fE548589b7F057fe",
+    "ERC20Template": {
+      "1": "0x519d462294958A935D34351b3ad9F98cCAB0b7f8",
+      "2": "0x2bCa501a6f9FB8a96f1b7B09D4f74A32ACAa7584",
+      "3": "0xf00c16665b79F23c04e5c8652Fe9853046b987c8"
+    },
+    "ERC721Template": {
+      "1": "0x9Ab15cc945b2B58A51384539211dE8a88a1355E8"
+    },
+    "Dispenser": "0xbde8224d15885c2E46Be665b9392E619cD142de8",
+    "ERC721Factory": "0x315ef329D214cde5cE7C206104aC35B1fe66bb8c",
+    "PredictoorHelper": "0x2e4cb19faD077768fDcB04Bc0549AB76BE8eA63F"
+  },
   "sepolia": {
     "chainId": 11155111,
     "Ocean": "0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985",
@@ -268,5 +291,60 @@
     },
     "Dispenser": "0x2720d405ef7cDC8a2E2e5AeBC8883C99611d893C",
     "ERC721Factory": "0xEF62FB495266C72a5212A11Dce8baa79Ec0ABeB1"
+  },
+  "oasis_saphire": {
+    "chainId": 23294,
+    "Ocean": "0x39d22B78A7651A76Ffbde2aaAB5FD92666Aca520",
+    "OPFCommunityFeeCollector": "0x06100AB868206861a4D7936166A91668c2Ce1312",
+    "startBlock": 905232,
+    "Router": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8",
+    "FixedPrice": "0xf26c6C93f9f1d725e149d95f8E7B2334a406aD10",
+    "ERC20Template": {
+      "1": "0xDBDa486d8fE29F75e9Ca858F438b380Fc14b1232",
+      "2": "0xF6410bf5d773C7a41ebFf972f38e7463FA242477",
+      "3": "0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985"
+    },
+    "ERC721Template": {
+      "1": "0x69B6E54Ad2b3c2801d11d8Ad56ea1d892555b776"
+    },
+    "Dispenser": "0x2112Eb973af1DBf83a4f11eda82f7a7527D7Fde5",
+    "ERC721Factory": "0x80E63f73cAc60c1662f27D2DFd2EA834acddBaa8",
+    "DFRewards": "0xc37F8341Ac6e4a94538302bCd4d49Cf0852D30C0",
+    "DFStrategyV1": "0x3c21a90599b5B7f37014cA5Bf30d3f1b73d7e391",
+    "PredictoorHelper": "0xE9397625Df9B63f0C152f975234b7988b54710B8"
+  },
+  "optimism_sepolia": {
+    "chainId": 11155420,
+    "Ocean": "0xf26c6C93f9f1d725e149d95f8E7B2334a406aD10",
+    "OPFCommunityFeeCollector": "0xF6410bf5d773C7a41ebFf972f38e7463FA242477",
+    "startBlock": 3867703,
+    "Router": "0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985",
+    "FixedPrice": "0x69B6E54Ad2b3c2801d11d8Ad56ea1d892555b776",
+    "ERC20Template": {
+      "1": "0x2112Eb973af1DBf83a4f11eda82f7a7527D7Fde5",
+      "2": "0x80E63f73cAc60c1662f27D2DFd2EA834acddBaa8"
+    },
+    "ERC721Template": {
+      "1": "0x3C5605202eD47C162450AE975415473e73F93072"
+    },
+    "Dispenser": "0x30E4CC2C7A9c6aA2b2Ce93586E3Df24a3A00bcDD",
+    "ERC721Factory": "0xDEfD0018969cd2d4E648209F876ADe184815f038"
+  },
+  "optimism": {
+    "chainId": 10,
+    "Ocean": "0x2561aa2bB1d2Eb6629EDd7b0938d7679B8b49f9E",
+    "OPFCommunityFeeCollector": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8",
+    "startBlock": 112181681,
+    "Router": "0xf26c6C93f9f1d725e149d95f8E7B2334a406aD10",
+    "FixedPrice": "0xDBDa486d8fE29F75e9Ca858F438b380Fc14b1232",
+    "ERC20Template": {
+      "1": "0xF6410bf5d773C7a41ebFf972f38e7463FA242477",
+      "2": "0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985"
+    },
+    "ERC721Template": {
+      "1": "0x69B6E54Ad2b3c2801d11d8Ad56ea1d892555b776"
+    },
+    "Dispenser": "0x2112Eb973af1DBf83a4f11eda82f7a7527D7Fde5",
+    "ERC721Factory": "0x80E63f73cAc60c1662f27D2DFd2EA834acddBaa8"
   }
 }