Merge pull request #870 from oceanprotocol/feature/template_sapphire

Feature/template_sapphire
oceanprotocol · Aug 13, 2024 · c49d299 · c49d299
2 parents ba56e45 + 2ed0099
commit c49d299
Show file tree

Hide file tree

Showing 14 changed files with 12,883 additions and 22,327 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '20'
       - name: Cache node_modules
         uses: actions/cache@v2
         env:
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '20'
       - name: Cache node_modules
         uses: actions/cache@v2
         env:
@@ -122,7 +122,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '20'
       - name: Cache node_modules
         uses: actions/cache@v2
         env:
@@ -159,10 +159,10 @@ jobs:
             done
           ls -la "$HOME/.ocean/ocean-contracts/artifacts/"
       - 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
+      - run: node scripts/check_deployment.js
+
 
   publish-npm:
     needs: [lint, tests_full,check_deployment]
@@ -172,7 +172,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - name: Compile contracts
@@ -202,7 +202,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '20'
       - name: Cache node_modules
         uses: actions/cache@v2
         env:

diff --git a/.github/workflows/deployment_check.yml b/.github/workflows/deployment_check.yml
@@ -54,6 +54,7 @@ jobs:
             done
           ls -la "$HOME/.ocean/ocean-contracts/artifacts/"
       - 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
+        run: docker logs ocean-ocean-contracts-1
+      - run: node scripts/check_deployment.js
+
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
 
-FROM ubuntu:20.04 as base
+FROM ubuntu:22.04 as base
 ENV DEBIAN_FRONTEND=noninteractive
 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
 # IMPORTANT: set the exact version
-ENV NODE_VERSION v16.20.2
+ENV NODE_VERSION v20.16.0
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 RUN /bin/bash -c "source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION && nvm use --delete-prefix $NODE_VERSION"
 # add node and npm to the PATH
@@ -16,11 +16,11 @@ ENV PATH $NODE_PATH:$PATH
 
 
 FROM base as builder
-RUN apt-get update && apt-get -y install wget
+RUN apt-get update && apt-get -y install wget build-essential
 COPY . /ocean-contracts
 WORKDIR /ocean-contracts
 RUN npm i
-RUN wget https://gobinaries.com/tj/node-prune --output-document - | /bin/sh && node-prune
+#RUN wget https://gobinaries.com/tj/node-prune --output-document - | /bin/sh && node-prune
 
 
 
@@ -31,7 +31,7 @@ RUN mkdir -p /ocean-contracts/test/
 COPY ./addresses /ocean-contracts/addresses/
 COPY ./contracts /ocean-contracts/contracts/
 COPY ./hardhat.config* /ocean-contracts/
-COPY ./package* /ocean-contracts/
+COPY ./package.json /ocean-contracts/
 COPY ./scripts /ocean-contracts/scripts/
 COPY ./test /ocean-contracts/test/
 WORKDIR /ocean-contracts

diff --git a/addresses/address.json b/addresses/address.json
@@ -268,7 +268,8 @@
     "ERC20Template": {
       "1": "0x519d462294958A935D34351b3ad9F98cCAB0b7f8",
       "2": "0x2bCa501a6f9FB8a96f1b7B09D4f74A32ACAa7584",
-      "3": "0xf00c16665b79F23c04e5c8652Fe9853046b987c8"
+      "3": "0xf00c16665b79F23c04e5c8652Fe9853046b987c8",
+      "4": "0x89b752C3e272feBA17B363EaaBFe0d653cF75bE7"
     },
     "ERC721Template": {
       "1": "0x9Ab15cc945b2B58A51384539211dE8a88a1355E8"
@@ -305,7 +306,8 @@
     "ERC20Template": {
       "1": "0xDBDa486d8fE29F75e9Ca858F438b380Fc14b1232",
       "2": "0xF6410bf5d773C7a41ebFf972f38e7463FA242477",
-      "3": "0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985"
+      "3": "0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985",
+      "4": "0x4dD281EB67DED07E76E413Df16176D66ae69e240"
     },
     "ERC721Template": {
       "1": "0x69B6E54Ad2b3c2801d11d8Ad56ea1d892555b776"

diff --git a/contracts/accesslists/AccessList.sol b/contracts/accesslists/AccessList.sol
@@ -38,7 +38,7 @@ contract AccessList is Ownable, ERC721Enumerable,ERC721URIStorage {
     function supportsInterface(bytes4 interfaceId)
         public
         view
-        override(ERC721, ERC721Enumerable)
+        override( ERC721Enumerable,ERC721URIStorage)
         returns (bool)
     {
         return super.supportsInterface(interfaceId);