Feat/stage

.dockerignore

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

.env.example

@@ -20,17 +20,25 @@ export FEE_AMOUNT=
 export ADDRESS_FILE=
 export NODE_ENV=
 export AUTHORIZED_DECRYPTERS=
+export AUTHORIZED_DECRYPTERS_LIST=
 export OPERATOR_SERVICE_URL=
+export POLICY_SERVER_URL
 export INTERFACES=
 export ALLOWED_VALIDATORS=
+export ALLOWED_VALIDATORS_LIST=
+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_SECOND=
+export MAX_REQ_PER_MINUTE=
 export MAX_CHECKSUM_LENGTH=
 export LOG_LEVEL=
 export HTTP_API_PORT=
+export VALIDATE_UNSIGNED_DDO=
+export JWT_SECRET=
 
 ## p2p
 
@@ -55,4 +63,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
+- @alexcos20

.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:
@@ -126,36 +126,27 @@ 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-node --with-typesense 2>&1 > start_ocean.log &
       - run: npm ci
       - run: npm run build
       - run: docker image ls
       - name: Delete default runner images
         run: |
-          docker image rm node:20
-          docker image rm node:20-alpine
-          docker image rm node:18
-          docker image rm node:18-alpine
-          docker image rm debian:10
-          docker image rm debian:11
-          docker image rm ubuntu:22.04
-          docker image rm ubuntu:20.04
-          docker image rm moby/buildkit:latest
           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 }}
@@ -170,7 +161,7 @@ jobs:
           ASSET_PURGATORY_URL: 'https://raw.githubusercontent.com/oceanprotocol/list-purgatory/main/list-assets.json'
           ACCOUNT_PURGATORY_URL: 'https://raw.githubusercontent.com/oceanprotocol/list-purgatory/main/list-accounts.json'
       - 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() }}
       - uses: actions/upload-artifact@v4
         with:
@@ -187,7 +178,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
@@ -206,7 +197,6 @@ jobs:
         with:
           repository: 'oceanprotocol/barge'
           path: 'barge'
-
       - name: Login to Docker Hub
         if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }}
         run: |
@@ -219,34 +209,24 @@ 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-node --with-typesense 2>&1 > start_ocean.log &
       - run: npm ci
       - run: npm run build
       - run: docker image ls
       - name: Delete default runner images
         run: |
-          docker image rm node:20
-          docker image rm node:20-alpine
-          docker image rm node:18
-          docker image rm node:18-alpine
-          docker image rm debian:10
-          docker image rm debian:11
-          docker image rm ubuntu:22.04
-          docker image rm ubuntu:20.04
-          docker image rm moby/buildkit:latest
           rm -rf /usr/share/swift/
 
       - name: Wait for contracts deployment and C2D cluster to be ready
         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
+            [ -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-contracts-1 && docker logs ocean-typesense-1
         if: ${{ failure() }}
 
       - name: Checkout Ocean Node
@@ -261,7 +241,7 @@ jobs:
         run: |
           npm ci
           npm run build
-          npm run start &
+          npm run start > ocean-node.log 2>&1 &
         env:
           PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
           IPFS_GATEWAY: http://172.15.0.16:8080/
@@ -278,6 +258,9 @@ jobs:
           P2P_ENABLE_AUTONAT: 'false'
           ALLOWED_ADMINS: '["0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"]'
           DB_TYPE: 'elasticsearch'
+          MAX_REQ_PER_MINUTE: 320
+          MAX_CONNECTIONS_PER_MINUTE: 320
+          DOCKER_COMPUTE_ENVIRONMENTS: '[{"socketPath":"/var/run/docker.sock","resources":[{"id":"disk","total":10}],"storageExpiry":604800,"maxJobDuration":3600,"fees":{"8996":[{"prices":[{"id":"cpu","price":1}]}]},"free":{"maxJobDuration":60,"maxJobs":3,"resources":[{"id":"cpu","max":1},{"id":"ram","max":1},{"id":"disk","max":1}]}}]'
       - name: Check Ocean Node is running
         run: |
           for i in $(seq 1 90); do
@@ -294,7 +277,6 @@ jobs:
         with:
           repository: 'oceanprotocol/ocean-cli'
           path: 'ocean-cli'
-          ref: 'main'
       - name: Setup Ocean CLI
         working-directory: ${{ github.workspace }}/ocean-cli
         run: |
@@ -303,3 +285,39 @@ jobs:
       - name: Run system tests
         working-directory: ${{ github.workspace }}/ocean-cli
         run: npm run test:system
+        env:
+          AVOID_LOOP_RUN: true
+      - name: Show Ocean Node logs on failure
+        if: failure()
+        working-directory: ${{ github.workspace }}/ocean-node
+        run: |
+          echo "=== Ocean Node Logs ==="
+          if [ -f ocean-node.log ]; then
+            cat ocean-node.log
+          else
+            echo "No ocean-node.log file found"
+          fi
+          echo "=== Docker Logs ==="
+          docker logs ocean-contracts-1 || echo "No ocean-contracts-1 container"
+          docker logs ocean-typesense-1 || echo "No ocean-typesense-1 container"
+          echo "=== System Processes ==="
+          ps aux | grep -E "(node|ocean)" || echo "No node/ocean processes found"
+
+  control_panel_build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          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 }}-control-panel-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-control-panel-${{ env.cache-name }}-
+      - run: npm ci
+      - name: Build control panel
+        run: npm run build:controlpanel

.github/workflows/docker.yml

@@ -14,13 +14,14 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
     strategy:
       fail-fast: false
       matrix:
         platform:
           - linux/amd64
-          - linux/arm64
-          - linux/arm/v7
+    #          - linux/arm64
+    #          - linux/arm/v7
     steps:
       - name: Prepare
         run: |
@@ -38,11 +39,11 @@ jobs:
         uses: docker/setup-buildx-action@v3
         with:
           platforms: ${{ matrix.platform }}
-      #- name: Login to Docker Hub
-      #  uses: docker/login-action@v1
-      #  with:
-      #    username: ${{ secrets.DOCKERHUB_USERNAME }}
-      #    password: ${{ secrets.DOCKER_PUSH_TOKEN }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKER_PUSH_TOKEN }}
 
       - name: Set Docker metadata
         id: ocean_node_meta
@@ -81,3 +82,45 @@ jobs:
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    needs:
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Set Docker metadata
+        id: ocean_node_meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ocnenterprise/ocean-node
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=ref,event=pr
+          # type=semver,pattern={{major}}.{{minor}}
+          # type=semver,pattern={{major}}
+          # type=sha
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKER_PUSH_TOKEN }}
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+          $(printf 'ocnenterprise/ocean-node@sha256:%s ' *)
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ocnenterprise/ocean-node:${{ steps.ocean_node_meta.outputs.version }}

.gitignore

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

.nvmrc

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