Merge branch 'main' into issue-810-creds-address-behaviour

# Conflicts:
#	src/@types/DDO/Credentials.ts
#	src/test/unit/credentials.test.ts
#	src/utils/credentials.ts

Author: giurgiur99

.dockerignore

@@ -1,6 +1,6 @@
 node_modules
-/dist/*
-!/dist/dashboard
+/dist
 logs
+c2d_storage
 .env.local
 .env

.env.example

@@ -30,7 +30,8 @@ export AUTHORIZED_PUBLISHERS=
 export AUTHORIZED_PUBLISHERS_LIST=
 export INDEXER_INTERVAL=
 export ALLOWED_ADMINS=
-export DASHBOARD=true
+export ALLOWED_ADMINS_LIST=
+export CONTROL_PANEL=true
 export RATE_DENY_LIST=
 export MAX_REQ_PER_MINUTE=
 export MAX_CHECKSUM_LENGTH=
@@ -60,4 +61,9 @@ export P2P_ENABLE_AUTONAT=
 export P2P_ENABLE_CIRCUIT_RELAY_SERVER=
 export P2P_ENABLE_CIRCUIT_RELAY_CLIENT=
 export P2P_BOOTSTRAP_NODES=
-export P2P_FILTER_ANNOUNCED_ADDRESSES=
+export P2P_FILTER_ANNOUNCED_ADDRESSES=
+
+## compute
+export DOCKER_COMPUTE_ENVIRONMENTS=
+
+

.github/CODEOWNERS

@@ -1 +1 @@
-* @alexcos20 @bogdanfazakas @jamiehewitt15 @mariacarmina @paulo-ocean
+* @alexcos20 @bogdanfazakas @jamiehewitt15 @mariacarmina @paulo-ocean @giurgiur99

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 'v20.16.0'
+          node-version: 'v20.19.0'
       - name: Cache node_modules
         uses: actions/cache@v3
         env:
@@ -42,7 +42,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        node: ['18.20.4', 'v20.16.0', 'v22.5.1']
+        node: ['18.20.4', 'v20.19.0', 'v22.5.1']
 
     steps:
       - uses: actions/checkout@v4
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 'v20.16.0'
+          node-version: 'v20.19.0'
       - name: Cache node_modules
         uses: actions/cache@v3
         env:
@@ -100,7 +100,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 'v20.16.0'
+          node-version: 'v20.19.0'
       - name: Cache node_modules
         uses: actions/cache@v3
         env:
@@ -125,28 +125,30 @@ jobs:
               DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Run Barge
         working-directory: ${{ github.workspace }}/barge
+        env:
+          CONTRACTS_VERSION: escrow
         run: |
-          bash -x start_ocean.sh --no-aquarius --no-provider --no-dashboard --with-c2d --with-typesense 2>&1 > start_ocean.log &
+          bash -x start_ocean.sh --no-aquarius --no-provider --no-dashboard --with-typesense 2>&1 > start_ocean.log &
       - run: npm ci
       - run: npm run build
       - run: docker image ls
       - name: Delete default runner images
         run: |
           rm -rf /usr/share/swift/
-      - name: Wait for contracts deployment and C2D cluster to be ready
+      - name: Wait for contracts deployment
         working-directory: ${{ github.workspace }}/barge
         run: |
           for i in $(seq 1 250); do
-            sleep 10
-            [ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" -a -f "$HOME/.ocean/ocean-c2d/ready" ] && break
+            sleep 5
+            [ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" ] && break
             done
       - name: docker logs
-        run: docker logs ocean-ocean-contracts-1 && docker logs ocean-kindcluster-1 && docker logs ocean-computetodata-1 && docker logs ocean-typesense-1
+        run: docker logs ocean-ocean-contracts-1 && docker logs ocean-typesense-1
         if: ${{ failure() }}
       - name: integration tests
         run: npm run test:integration:cover
         env:
-          OPERATOR_SERVICE_URL: '["http://172.15.0.13:31000"]'
+          # OPERATOR_SERVICE_URL: '["http://172.15.0.13:31000"]'
           PRIVATE_KEY: ${{ secrets.NODE1_PRIVATE_KEY }}
           NODE1_PRIVATE_KEY: ${{ secrets.NODE1_PRIVATE_KEY }}
           NODE2_PRIVATE_KEY: ${{ secrets.NODE2_PRIVATE_KEY }}
@@ -178,7 +180,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 'v20.16.0'
+          node-version: 'v20.19.0'
 
       - name: Cache node_modules
         uses: actions/cache@v3
@@ -210,8 +212,9 @@ jobs:
       - name: Run Barge
         working-directory: ${{ github.workspace }}/barge
         run: |
-          bash -x start_ocean.sh --no-aquarius --no-provider --no-dashboard --with-c2d --with-typesense 2>&1 > start_ocean.log &
-
+          bash -x start_ocean.sh --no-aquarius --no-provider --no-dashboard --with-typesense 2>&1 > start_ocean.log &
+        env:
+          CONTRACTS_VERSION: escrow
       - run: npm ci
       - run: npm run build
       - run: docker image ls
@@ -224,7 +227,7 @@ jobs:
         run: |
           for i in $(seq 1 250); do
             sleep 10
-            [ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" -a -f "$HOME/.ocean/ocean-c2d/ready" ] && break
+            [ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" ] && break
           done
 
       - name: docker logs
@@ -287,22 +290,24 @@ jobs:
       - name: Run system tests
         working-directory: ${{ github.workspace }}/ocean-cli
         run: npm run test:system
+        env:
+          AVOID_LOOP_RUN: true
 
-  dashboard_build:
+  control_panel_build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 'v20.16.0'
+          node-version: 'v20.19.0'
       - name: Cache node_modules
         uses: actions/cache@v3
         env:
           cache-name: cache-node-modules
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-dashboard-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: ${{ runner.os }}-dashboard-${{ env.cache-name }}-
+          key: ${{ runner.os }}-control-panel-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-control-panel-${{ env.cache-name }}-
       - run: npm ci
-      - name: Run dashboard build test
-        run: npm run test:dashboard
+      - name: Build control panel
+        run: npm run build:controlpanel

.github/workflows/docker.yml

@@ -14,6 +14,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
     strategy:
       fail-fast: false
       matrix:
@@ -84,6 +85,7 @@ jobs:
 
   merge:
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
     needs:
       - build
     steps:

.gitignore

@@ -1,5 +1,5 @@
-# Dahsboard
-dashboard/.env
+# Control panel
+controlpanel/.env
 
 # Docker compose
 **/docker-compose.yml
@@ -97,7 +97,7 @@ out
 .nuxt
 
 /dist/*
-!/dist/dashboard
+!/dist/controlpanel
 
 # Gatsby files
 .cache/
@@ -158,3 +158,4 @@ html-report.html
 # databases
 *.sqlite
 databases/*
+c2d_storage/*

.nvmrc

@@ -1 +1 @@
-v20.16.0
+v20.19.0

CHANGELOG.md

@@ -4,8 +4,53 @@ 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).
 
+#### [v0.2.3](https://github.com/oceanprotocol/ocean-node/compare/v0.2.1...v0.2.3)
+
+- Update node script - C2D  [`#896`](https://github.com/oceanprotocol/ocean-node/pull/896)
+- fix docker-compose [`#895`](https://github.com/oceanprotocol/ocean-node/pull/895)
+- re-indexing old DDOs [`#867`](https://github.com/oceanprotocol/ocean-node/pull/867)
+- Upgrade tsx dep to v4.x [`#893`](https://github.com/oceanprotocol/ocean-node/pull/893)
+- C2D Docker [`#705`](https://github.com/oceanprotocol/ocean-node/pull/705)
+- Updating codeowners [`#887`](https://github.com/oceanprotocol/ocean-node/pull/887)
+- fix issue with empty  nft fields [`#886`](https://github.com/oceanprotocol/ocean-node/pull/886)
+- add allowed admins access list [`#841`](https://github.com/oceanprotocol/ocean-node/pull/841)
+- Update error message for invalid peer connection [`#874`](https://github.com/oceanprotocol/ocean-node/pull/874)
+- add AUTHORIZED_DECRYPTERS_LIST [`#836`](https://github.com/oceanprotocol/ocean-node/pull/836)
+- fix status code if policy server not available [`#869`](https://github.com/oceanprotocol/ocean-node/pull/869)
+- Fix DDO: Stats and Prices for exchanges/dispensers  [`#774`](https://github.com/oceanprotocol/ocean-node/pull/774)
+- move p2p getters as handlers [`#862`](https://github.com/oceanprotocol/ocean-node/pull/862)
+- always check remote peerId [`#864`](https://github.com/oceanprotocol/ocean-node/pull/864)
+- Test if dashboard changes are already committed [`#842`](https://github.com/oceanprotocol/ocean-node/pull/842)
+- add AUTHORIZED_PUBLISHERS_*** env variables [`#826`](https://github.com/oceanprotocol/ocean-node/pull/826)
+- Issue 814 credentials types [`#823`](https://github.com/oceanprotocol/ocean-node/pull/823)
+- remove echo command [`#839`](https://github.com/oceanprotocol/ocean-node/pull/839)
+- Issue 808 - new accesslist credentials type [`#819`](https://github.com/oceanprotocol/ocean-node/pull/819)
+- add ALLOWED_VALIDATORS_LIST [`#829`](https://github.com/oceanprotocol/ocean-node/pull/829)
+- update build files and hash [`#821`](https://github.com/oceanprotocol/ocean-node/pull/821)
+- add * as match all rule for address types [`#837`](https://github.com/oceanprotocol/ocean-node/pull/837)
+- fix: return correct message on policy server call [`#834`](https://github.com/oceanprotocol/ocean-node/pull/834)
+- add policyServerPassthrough routes [`#832`](https://github.com/oceanprotocol/ocean-node/pull/832)
+- Bump fast-xml-parser from 4.3.6 to 4.5.0 in /dashboard [`#711`](https://github.com/oceanprotocol/ocean-node/pull/711)
+- Bump secp256k1 from 5.0.0 to 5.0.1 in /dashboard [`#725`](https://github.com/oceanprotocol/ocean-node/pull/725)
+- Bump elliptic from 6.5.5 to 6.6.0 in /dashboard [`#746`](https://github.com/oceanprotocol/ocean-node/pull/746)
+- Bump cross-spawn and aegir (UPDATE: delete deps) [`#757`](https://github.com/oceanprotocol/ocean-node/pull/757)
+- fix corner case issue, cannot start indexing on ganache without ADDRESS_FILE [`#775`](https://github.com/oceanprotocol/ocean-node/pull/775)
+- add findPeer & dht refactor [`#793`](https://github.com/oceanprotocol/ocean-node/pull/793)
+- add support for identifyPush protocol [`#794`](https://github.com/oceanprotocol/ocean-node/pull/794)
+- no need to store everything in peerStore [`#795`](https://github.com/oceanprotocol/ocean-node/pull/795)
+- add multiAddrs for directCommand [`#796`](https://github.com/oceanprotocol/ocean-node/pull/796)
+- Refactor connections rate, rate per minute instead of second [`#785`](https://github.com/oceanprotocol/ocean-node/pull/785)
+- add missing check for ddo DB on republish ddos [`#789`](https://github.com/oceanprotocol/ocean-node/pull/789)
+- recalculate code hash if needed [`#790`](https://github.com/oceanprotocol/ocean-node/pull/790)
+- fix usage of getBoolEnvValue [`#784`](https://github.com/oceanprotocol/ocean-node/pull/784)
+- refactor handlers interfaces [`37cbfa5`](https://github.com/oceanprotocol/ocean-node/commit/37cbfa5076d6b665d9ba524156a8f48a656fe93f)
+- mv unit test to integration (need contracts deployment) [`7236ac5`](https://github.com/oceanprotocol/ocean-node/commit/7236ac5a603b2ef9c66ccf68a8a6d52acdb96855)
+- refactor, move getAdmins fn to auth [`5ba8bd5`](https://github.com/oceanprotocol/ocean-node/commit/5ba8bd528286a5c18acda572a1ce6170672415e6)
+
 #### [v0.2.1](https://github.com/oceanprotocol/ocean-node/compare/v0.2.0...v0.2.1)
 
+> 5 December 2024
+
 - have bootstrap config var [`#782`](https://github.com/oceanprotocol/ocean-node/pull/782)
 - Removing unused express dependency from dashboard [`#761`](https://github.com/oceanprotocol/ocean-node/pull/761)
 - check if rpcs and indexer_networks are aligned, log [`#750`](https://github.com/oceanprotocol/ocean-node/pull/750)

Dockerfile

@@ -27,8 +27,8 @@ COPY . /usr/src/app
 WORKDIR /usr/src/app/
 COPY --from=builder /usr/src/app/node_modules/ /usr/src/app/node_modules/
 RUN npm run build
-# Remove the dashboard folder to reduce the image size and avoid shipping development files
-RUN rm -rf dashboard
+# Remove the controlpanel folder to reduce the image size and avoid shipping development files
+RUN rm -rf controlpanel
 ENV P2P_ipV4BindTcpPort=9000
 EXPOSE 9000
 ENV P2P_ipV4BindWsPort=9001

README.md

@@ -137,5 +137,17 @@ Your node is now running, the control panel will be available at `http://localho
 - [Testing Guide](docs/testing.md)
 - [Network Configuration](docs/networking.md)
 - [Logging & accessing logs](docs/networking.md)
-- [Control Panel: Local development](dashboard/README.md)
+- [Control Panel: Local development](controlpanel/README.md)
 - [Docker Deployment Guide](docs/dockerDeployment.md)
+
+## Control Panel
+
+The control panel is available at `http://localhost:8000/controlpanel/` when your node is running. The built files are included in the distribution, so you **don't need to rebuild it** unless you make changes to the control panel code.
+
+To rebuild after changes:
+
+```bash
+npm run build:controlpanel
+```
+
+For more details, see the [Control Panel Development Guide](controlpanel/README.md).