Merge 4869ced into 3b3cdeb

Author: giurgiur99

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: 'CI'
+name: "CI"
 
 on:
   pull_request:
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: "22"
       - name: Cache node_modules
         uses: actions/cache@v4
         env:
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: "22"
       - name: Cache node_modules
         uses: actions/cache@v4
         env:
@@ -47,8 +47,8 @@ jobs:
       - name: Checkout Barge
         uses: actions/checkout@v3
         with:
-          repository: 'oceanprotocol/barge'
-          path: 'barge'
+          repository: "oceanprotocol/barge"
+          path: "barge"
 
       - name: Set Database Environment Variables
         run: |
@@ -60,7 +60,7 @@ jobs:
       - name: Run Ganache with Barge
         working-directory: ${{ github.workspace }}/barge
         run: |
-          bash -x start_ocean.sh --with-typesense 2>&1 > start_ocean.log &
+          bash -x start_ocean.sh 2>&1 > start_ocean.log &
 
       - name: Install deps & build
         run: npm ci && npm run build:metadata
@@ -78,7 +78,11 @@ jobs:
             if [ $attempt -eq $max_attempts ]; then
               echo "Error: Node container failed to start within 300 seconds"
               docker ps -a
-              docker inspect ocean-node-1
+              docker inspect ocean-node-1 || true
+              echo "=== Barge startup script output ==="
+              cat ${{ github.workspace }}/barge/start_ocean.log || true
+              echo "=== Ocean Node Logs ==="
+              docker logs ocean-node-1 2>&1 | tail -100 || true
               exit 1
             fi
             sleep 10
@@ -91,13 +95,23 @@ jobs:
           path: coverage/
 
   test_integration:
+    name: test_integration (${{ matrix.transport }})
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - transport: http
+            node_endpoint: "http://127.0.0.1:8001"
+          - transport: p2p
+            node_endpoint: "16Uiu2HAmRkJeRYRghP3ETQCpdz8NsQzQE9RpSST7i5YNgWqH4dVE"
+
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: "22"
       - name: Cache node_modules
         uses: actions/cache@v4
         env:
@@ -115,8 +129,8 @@ jobs:
       - name: Checkout Barge
         uses: actions/checkout@v3
         with:
-          repository: 'oceanprotocol/barge'
-          path: 'barge'
+          repository: "oceanprotocol/barge"
+          path: "barge"
 
       - name: Login to Docker Hub
         if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }}
@@ -136,7 +150,7 @@ jobs:
       - name: Run Barge
         working-directory: ${{ github.workspace }}/barge
         run: |
-          bash -x start_ocean.sh --with-typesense 2>&1 > start-node.log &
+          bash -x start_ocean.sh 2>&1 > start-node.log &
 
       - name: Install deps & build
         run: npm ci && npm run build:metadata
@@ -170,15 +184,23 @@ jobs:
             attempt=$((attempt + 1))
           done
 
-      - name: integration
-        run: npm run test:integration:cover
+      - name: integration (${{ matrix.transport }})
+        run: |
+          if [ "${{ matrix.transport }}" = "http" ]; then
+            npm run test:integration:cover
+          else
+            npm run test:integration
+          fi
         env:
           INDEXING_RETRY_INTERVAL: 4000
           INDEXING_MAX_RETRIES: 120
-          NODE_URL: 'http://127.0.0.1:8001'
+          NODE_ENDPOINT: ${{ matrix.node_endpoint }}
 
       - name: docker logs
         run: |
+          echo "=== Barge startup script output ==="
+          cat ${{ github.workspace }}/barge/start-node.log || true
+          echo ""
           echo "=== Ocean Contracts Logs ==="
           docker logs ocean-ocean-contracts-1 2>&1 || echo "Container not found"
           echo ""
@@ -187,6 +209,7 @@ jobs:
         if: ${{ failure() }}
 
       - name: Upload coverage
+        if: matrix.transport == 'http'
         uses: actions/upload-artifact@v4
         with:
           name: coverage-integration
@@ -199,7 +222,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        node: ['20', '18']
+        node: ["22", "20"]
 
     steps:
       - uses: actions/checkout@v3
@@ -237,13 +260,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: "22"
 
       - name: checkout ocean.js repo
         uses: actions/checkout@v3
         with:
-          repository: 'oceanprotocol/ocean.js'
-          path: 'ocean.js'
+          repository: "oceanprotocol/ocean.js"
+          path: "ocean.js"
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: setup git config

CHANGELOG.md

@@ -4,9 +4,26 @@ 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).
 
+#### [v7.0.0-next.1](https://github.com/oceanprotocol/ocean.js/compare/v7.0.0-next.0...v7.0.0-next.1)
+
+- bump uint8arrays to esm supported [`f1ff511`](https://github.com/oceanprotocol/ocean.js/commit/f1ff511e9c92cee94cd129698bc46c7700952461)
+- getmultiaddr from peerid [`1973f27`](https://github.com/oceanprotocol/ocean.js/commit/1973f278964598b6c8abb61c85395f0608375d43)
+- start without typesense [`db639ad`](https://github.com/oceanprotocol/ocean.js/commit/db639ad1bdee822722abe07ca58d50d837c94bbc)
+
+#### [v7.0.0-next.0](https://github.com/oceanprotocol/ocean.js/compare/v6.1.2...v7.0.0-next.0)
+
+> 1 April 2026
+
+- p2p impl [`68db01f`](https://github.com/oceanprotocol/ocean.js/commit/68db01fbf8f28854e6e0abe43aba85fbf6834c28)
+- p2p warmup [`8c2bb5a`](https://github.com/oceanprotocol/ocean.js/commit/8c2bb5ae2b17b5f2c9530800c1f3143b1b318b0e)
+- push,fetch config and no tls [`9cda783`](https://github.com/oceanprotocol/ocean.js/commit/9cda78366ddcfe97a93ecb79dc3a8aa3264ccecc)
+
 #### [v6.1.2](https://github.com/oceanprotocol/ocean.js/compare/v6.1.1...v6.1.2)
 
+> 24 March 2026
+
 - Feature/output_in_initializeCompute [`#2056`](https://github.com/oceanprotocol/ocean.js/pull/2056)
+- Release 6.1.2 [`3b3cdeb`](https://github.com/oceanprotocol/ocean.js/commit/3b3cdebdb5ce7b89ebbbd2d49e44d5f6fa65e0d1)
 
 #### [v6.1.1](https://github.com/oceanprotocol/ocean.js/compare/v6.1.0...v6.1.1)
 
@@ -209,7 +226,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - export util addrs functions [`#2017`](https://github.com/oceanprotocol/ocean.js/pull/2017)
 - Release 4.3.6 [`b28db44`](https://github.com/oceanprotocol/ocean.js/commit/b28db446144939e9ed864cc11559f718104d094b)
 
-#### [v4.3.5](https://github.com/oceanprotocol/ocean.js/compare/v4.3.4...v4.3.5)
+#### [v4.3.5](https://github.com/oceanprotocol/ocean.js/compare/v4.3.3...v4.3.5)
 
 > 17 November 2025
 
@@ -218,13 +235,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - remove typo [`f199f4a`](https://github.com/oceanprotocol/ocean.js/commit/f199f4af809eb85249fe0c59303fcc3207d8e7a7)
 - export EnterpriseFeeCollector [`68712a2`](https://github.com/oceanprotocol/ocean.js/commit/68712a2af17824bb8fc78824842376e35f582487)
 
-#### [v4.3.4](https://github.com/oceanprotocol/ocean.js/compare/v4.3.2...v4.3.4)
+#### [v4.3.3](https://github.com/oceanprotocol/ocean.js/compare/v4.3.2...v4.3.3)
 
-> 15 November 2025
+> 1 August 2025
 
 - add policy server endpoints [`#1974`](https://github.com/oceanprotocol/ocean.js/pull/1974)
-- add EnterpriseFee [`b502882`](https://github.com/oceanprotocol/ocean.js/commit/b502882d05375eda326166608730a11e779c6f42)
-- Release 4.3.4 [`e45a7de`](https://github.com/oceanprotocol/ocean.js/commit/e45a7defa239f6800eb68a13e1a9a3d9662f509d)
 - Release 4.3.3 [`6d6d4cf`](https://github.com/oceanprotocol/ocean.js/commit/6d6d4cfe57f2a3dee73b4957ff2f144c0e7ff9d7)
 
 #### [v4.3.2](https://github.com/oceanprotocol/ocean.js/compare/v4.3.1...v4.3.2)

CodeExamples.md

@@ -104,6 +104,7 @@ import {
   sendTx,
   ConfigHelper,
   configHelperNetworks,
+  getNodeEndpointConfig,
   amountToUnits,
   getEventFromTx,
   LoggerInstance
@@ -206,9 +207,7 @@ Next, we define the metadata that will describe our data asset. This is what we
     const config = new ConfigHelper().getConfig(
       parseInt(String((await publisherAccount.provider.getNetwork()).chainId))
     )
-    if (process.env.NODE_URL) {
-      config.oceanNodeUri = process.env.NODE_URL
-    }
+    Object.assign(config, getNodeEndpointConfig())
     aquarius = new Aquarius(config?.oceanNodeUri)
     providerUrl = config?.oceanNodeUri
     addresses = JSON.parse(