Feat/sync

.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - develop
     tags:
       - '**'
   pull_request:
@@ -15,12 +14,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 'v20.16.0'
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-node-modules
         with:
@@ -30,11 +29,10 @@ jobs:
       - run: npm ci
       - run: npm run lint
 
-
   dockertest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: docker build -t 'ocean-node:mybuild' .
 
   build:
@@ -47,12 +45,12 @@ jobs:
         node: ['18.20.4', 'v20.16.0', 'v22.5.1']
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-node-modules
         with:
@@ -65,12 +63,12 @@ jobs:
   test_unit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 'v20.16.0'
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-node-modules
         with:
@@ -88,22 +86,23 @@ jobs:
           ARWEAVE_GATEWAY: https://arweave.net/
           RPCS: '{ "1": {"rpc": "https://rpc.eth.gateway.fm", "chainId": 1, "network": "mainet", "chunkSize": 100}, "137": {"rpc": "https://polygon.meowrpc.com", "chainId": 137, "network": "polygon", "chunkSize": 100 }, "80001": {"rpc": "https://rpc-mumbai.maticvigil.com","chainId": 80001, "network": "polygon-mumbai", "chunkSize": 100 } }'
           DB_URL: 'http://localhost:8108/?apiKey=xyz'
+          DB_TYPE: 'typesense'
           FEE_TOKENS: '{ "1": "0x967da4048cD07aB37855c090aAF366e4ce1b9F48", "137": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1", "80001": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8", "56": "0xDCe07662CA8EbC241316a15B611c89711414Dd1a" }'
           FEE_AMOUNT: '{ "amount": 1, "unit": "MB" }'
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: coverage/
 
   test_integration:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 'v20.16.0'
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-node-modules
         with:
@@ -113,7 +112,7 @@ jobs:
       - name: Set ADDRESS_FILE
         run: echo "ADDRESS_FILE=${HOME}/.ocean/ocean-contracts/artifacts/address.json" >> $GITHUB_ENV
       - name: Checkout Barge
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'oceanprotocol/barge'
           path: 'barge'
@@ -127,7 +126,7 @@ jobs:
       - name: Run Barge
         working-directory: ${{ github.workspace }}/barge
         run: |
-          bash -x start_ocean.sh --no-aquarius --no-provider --no-elasticsearch --no-dashboard --with-c2d --with-typesense 2>&1 > start_ocean.log &
+          bash -x start_ocean.sh --no-aquarius --no-provider --no-dashboard --with-c2d --with-typesense 2>&1 > start_ocean.log &
       - run: npm ci
       - run: npm run build
       - run: docker image ls
@@ -137,8 +136,6 @@ jobs:
           docker image rm node:20-alpine
           docker image rm node:18
           docker image rm node:18-alpine
-          docker image rm node:16
-          docker image rm node:16-alpine
           docker image rm debian:10
           docker image rm debian:11
           docker image rm ubuntu:22.04
@@ -166,15 +163,16 @@ jobs:
           IPFS_GATEWAY: http://172.15.0.16:8080/
           ARWEAVE_GATEWAY: https://arweave.net/
           RPCS: '{ "8996": {"rpc": "http://127.0.0.1:8545", "chainId": 8996, "network": "development", "chunkSize": 100}}'
-          DB_URL: 'http://localhost:8108/?apiKey=xyz'
+          DB_URL: 'http://localhost:9200'
+          DB_TYPE: 'elasticsearch'
           FEE_TOKENS: '{ "1": "0x967da4048cD07aB37855c090aAF366e4ce1b9F48", "137": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1", "80001": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8", "56": "0xDCe07662CA8EbC241316a15B611c89711414Dd1a" }'
           FEE_AMOUNT: '{ "amount": 1, "unit": "MB" }'
           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
         if: ${{ failure() }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: coverage/
@@ -184,15 +182,15 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 'v20.16.0'
 
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-node-modules
         with:
@@ -204,7 +202,7 @@ jobs:
         run: echo "ADDRESS_FILE=${HOME}/.ocean/ocean-contracts/artifacts/address.json" >> $GITHUB_ENV
 
       - name: Checkout Barge
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'oceanprotocol/barge'
           path: 'barge'
@@ -221,7 +219,7 @@ jobs:
       - name: Run Barge
         working-directory: ${{ github.workspace }}/barge
         run: |
-          bash -x start_ocean.sh --no-dashboard --no-aquarius --no-provider --no-elasticsearch --with-typesense --with-c2d 2>&1 > start_ocean.log &
+          bash -x start_ocean.sh --no-aquarius --no-provider --no-dashboard --with-c2d --with-typesense 2>&1 > start_ocean.log &
 
       - run: npm ci
       - run: npm run build
@@ -232,8 +230,6 @@ jobs:
           docker image rm node:20-alpine
           docker image rm node:18
           docker image rm node:18-alpine
-          docker image rm node:16
-          docker image rm node:16-alpine
           docker image rm debian:10
           docker image rm debian:11
           docker image rm ubuntu:22.04
@@ -254,11 +250,11 @@ jobs:
         if: ${{ failure() }}
 
       - name: Checkout Ocean Node
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          repository: 'oceanprotocol/ocean-node'
+          repository: 'OceanProtocolEnterprise/ocean-node'
           path: 'ocean-node'
-          ref: ${{ github.event_name == 'pull_request' && github.head_ref || 'develop' }}
+          ref: ${{ github.event_name == 'pull_request' && github.head_ref || 'main' }}
 
       - name: Start Ocean Node
         working-directory: ${{ github.workspace }}/ocean-node
@@ -273,14 +269,18 @@ jobs:
           P2P_ipV4BindTcpPort: 8000
           HTTP_API_PORT: 8001
           RPCS: '{ "8996": {"rpc": "http://127.0.0.1:8545", "chainId": 8996, "network": "development", "chunkSize": 100} }'
-          DB_URL: 'http://localhost:8108/?apiKey=xyz'
+          INDEXER_NETWORKS: '[8996]'
+          DB_URL: 'http://localhost:9200'
           FEE_TOKENS: '{ "1": "0x967da4048cD07aB37855c090aAF366e4ce1b9F48", "137": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1", "80001": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8", "56": "0xDCe07662CA8EbC241316a15B611c89711414Dd1a" }'
           FEE_AMOUNT: '{ "amount": 1, "unit": "MB" }'
           AUTHORIZED_DECRYPTERS: '["0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"]'
+          P2P_ENABLE_UPNP: 'false'
+          P2P_ENABLE_AUTONAT: 'false'
           ALLOWED_ADMINS: '["0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"]'
+          DB_TYPE: 'elasticsearch'
       - name: Check Ocean Node is running
         run: |
-          for i in $(seq 1 30); do
+          for i in $(seq 1 90); do
             if curl --output /dev/null --silent --head --fail "http://localhost:8001"; then
               echo "Ocean Node is up"
               exit 0
@@ -290,7 +290,7 @@ jobs:
           echo "Ocean Node did not start in time"
           exit 1
       - name: Checkout Ocean CLI
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'oceanprotocol/ocean-cli'
           path: 'ocean-cli'

.github/workflows/docker.yml

@@ -49,7 +49,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            oceanprotocol/ocean-node
+            ocnenterprise/ocean-node
           # generate Docker tags based on the following events/attributes
           tags: |
             type=ref,event=branch
@@ -68,7 +68,7 @@ jobs:
           push: false
           # tags: ${{ steps.ocean_node_meta.outputs.tags }}
           labels: ${{ steps.ocean_node_meta.outputs.labels }}
-          outputs: type=image,name=oceanprotocol/ocean-node,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ocnenterprise/ocean-node,push-by-digest=true,name-canonical=true,push=true
       - name: Export digest
         run: |
           mkdir -p /tmp/digests
@@ -81,5 +81,3 @@ jobs:
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
-
-

.gitignore

@@ -154,4 +154,4 @@ html-report.html
 
 # databases
 *.sqlite
-databases/*
+databases/*

.prettierrc

@@ -1,7 +1,7 @@
 {
-    "semi": false,
-    "singleQuote": true,
-    "printWidth": 90,
-    "trailingComma": "none",
-    "tabWidth": 2
-  }
+  "semi": false,
+  "singleQuote": true,
+  "printWidth": 90,
+  "trailingComma": "none",
+  "tabWidth": 2
+}