From 1596062e5a0c4c975e69bc8b1f1fd49f6e2cb3ed Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Thu, 9 Jul 2026 14:04:24 +0300 Subject: [PATCH 1/2] use next version of ocean.js --- package-lock.json | 47 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 15 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index df4d3c4..53e5e83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@oasisprotocol/sapphire-paratime": "^1.3.2", "@oceanprotocol/contracts": "^2.5.0", "@oceanprotocol/ddo-js": "^0.3.0", - "@oceanprotocol/lib": "^8.0.6", + "@oceanprotocol/lib": "^9.0.0-next.1", "commander": "^13.1.0", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", @@ -3184,35 +3184,27 @@ } }, "node_modules/@oceanprotocol/lib": { - "version": "8.0.6", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-8.0.6.tgz", - "integrity": "sha512-QjyS7qOlpJHrVaUDDhuNMwTvu9fCIhfgkL6emGZ5MGHnn0Rk8G6q7giOTR8DjuCBK8+YJHMC1CuUnYrgDClaEw==", + "version": "9.0.0-next.1", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-9.0.0-next.1.tgz", + "integrity": "sha512-7i/haiXyfx4NsM36+jQ3fdo6/oO0YIG5brn5r8mO0mNFtCxv71l4NltlbHiGGc2SqSE+X27BjREgx6K8UMy8EA==", "license": "Apache-2.0", "dependencies": { "@oasisprotocol/sapphire-paratime": "^1.3.2", "@oceanprotocol/ddo-js": "^0.3.0", "bignumber.js": "^9.3.1", - "cross-fetch": "^4.0.0", "crypto-js": "^4.1.1", "decimal.js": "^10.4.1", "eciesjs": "^0.4.5", "ethers": "^6.15.0", - "form-data": "^2.3.3", "jsonwebtoken": "^9.0.2" }, + "engines": { + "node": ">=18" + }, "peerDependencies": { "web3": "^1.8.0" } }, - "node_modules/@oceanprotocol/lib/node_modules/cross-fetch": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.1.0.tgz", - "integrity": "sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==", - "license": "MIT", - "dependencies": { - "node-fetch": "^2.7.0" - } - }, "node_modules/@rdfjs/data-model": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-2.1.1.tgz", @@ -4311,7 +4303,8 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/asyncro": { "version": "3.0.0", @@ -5303,6 +5296,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "license": "MIT", + "peer": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -5957,6 +5951,7 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.4.0" } @@ -6403,6 +6398,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -8068,23 +8064,6 @@ "node": "*" } }, - "node_modules/form-data": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.5.tgz", - "integrity": "sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==", - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", - "mime-types": "^2.1.35", - "safe-buffer": "^5.2.1" - }, - "engines": { - "node": ">= 0.12" - } - }, "node_modules/form-data-encoder": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz", @@ -10459,6 +10438,7 @@ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "license": "MIT", + "peer": true, "engines": { "node": ">= 0.6" } @@ -10468,6 +10448,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "license": "MIT", + "peer": true, "dependencies": { "mime-db": "1.52.0" }, diff --git a/package.json b/package.json index 35203f3..db53e31 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@oasisprotocol/sapphire-paratime": "^1.3.2", "@oceanprotocol/contracts": "^2.5.0", "@oceanprotocol/ddo-js": "^0.3.0", - "@oceanprotocol/lib": "^8.0.6", + "@oceanprotocol/lib": "^9.0.0-next.1", "commander": "^13.1.0", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", From 8c76130294d9d5bb8a3f499457131496df7c9372 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Thu, 9 Jul 2026 14:06:42 +0300 Subject: [PATCH 2/2] fix node/js versions --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24b515c..adf738d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,6 +75,7 @@ jobs: with: repository: 'oceanprotocol/barge' path: 'barge' + ref: "feature/node-v4" - name: Login to Docker Hub if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }} @@ -89,6 +90,9 @@ jobs: working-directory: ${{ github.workspace }}/barge run: | bash -x start_ocean.sh --with-typesense 2>&1 > start_ocean.log & + env: + CONTRACTS_VERSION: '2.9.0' + NODE_VERSION: "pr-1408" - run: npm ci - run: npm run build - run: docker image ls