Skip to content

Commit 1ce52dd

Browse files
giurgiur99giurgiur99
committed
Merge branch 'main' into dependabot/npm_and_yarn/multi-456de2e4f1
2 parents 40871c8 + cdbe1a6 commit 1ce52dd

6 files changed

Lines changed: 144 additions & 3 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,53 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [v0.2.3](https://github.com/oceanprotocol/ocean-node/compare/v0.2.1...v0.2.3)
8+
9+
- Update node script - C2D [`#896`](https://github.com/oceanprotocol/ocean-node/pull/896)
10+
- fix docker-compose [`#895`](https://github.com/oceanprotocol/ocean-node/pull/895)
11+
- re-indexing old DDOs [`#867`](https://github.com/oceanprotocol/ocean-node/pull/867)
12+
- Upgrade tsx dep to v4.x [`#893`](https://github.com/oceanprotocol/ocean-node/pull/893)
13+
- C2D Docker [`#705`](https://github.com/oceanprotocol/ocean-node/pull/705)
14+
- Updating codeowners [`#887`](https://github.com/oceanprotocol/ocean-node/pull/887)
15+
- fix issue with empty nft fields [`#886`](https://github.com/oceanprotocol/ocean-node/pull/886)
16+
- add allowed admins access list [`#841`](https://github.com/oceanprotocol/ocean-node/pull/841)
17+
- Update error message for invalid peer connection [`#874`](https://github.com/oceanprotocol/ocean-node/pull/874)
18+
- add AUTHORIZED_DECRYPTERS_LIST [`#836`](https://github.com/oceanprotocol/ocean-node/pull/836)
19+
- fix status code if policy server not available [`#869`](https://github.com/oceanprotocol/ocean-node/pull/869)
20+
- Fix DDO: Stats and Prices for exchanges/dispensers [`#774`](https://github.com/oceanprotocol/ocean-node/pull/774)
21+
- move p2p getters as handlers [`#862`](https://github.com/oceanprotocol/ocean-node/pull/862)
22+
- always check remote peerId [`#864`](https://github.com/oceanprotocol/ocean-node/pull/864)
23+
- Test if dashboard changes are already committed [`#842`](https://github.com/oceanprotocol/ocean-node/pull/842)
24+
- add AUTHORIZED_PUBLISHERS_*** env variables [`#826`](https://github.com/oceanprotocol/ocean-node/pull/826)
25+
- Issue 814 credentials types [`#823`](https://github.com/oceanprotocol/ocean-node/pull/823)
26+
- remove echo command [`#839`](https://github.com/oceanprotocol/ocean-node/pull/839)
27+
- Issue 808 - new accesslist credentials type [`#819`](https://github.com/oceanprotocol/ocean-node/pull/819)
28+
- add ALLOWED_VALIDATORS_LIST [`#829`](https://github.com/oceanprotocol/ocean-node/pull/829)
29+
- update build files and hash [`#821`](https://github.com/oceanprotocol/ocean-node/pull/821)
30+
- add * as match all rule for address types [`#837`](https://github.com/oceanprotocol/ocean-node/pull/837)
31+
- fix: return correct message on policy server call [`#834`](https://github.com/oceanprotocol/ocean-node/pull/834)
32+
- add policyServerPassthrough routes [`#832`](https://github.com/oceanprotocol/ocean-node/pull/832)
33+
- Bump fast-xml-parser from 4.3.6 to 4.5.0 in /dashboard [`#711`](https://github.com/oceanprotocol/ocean-node/pull/711)
34+
- Bump secp256k1 from 5.0.0 to 5.0.1 in /dashboard [`#725`](https://github.com/oceanprotocol/ocean-node/pull/725)
35+
- Bump elliptic from 6.5.5 to 6.6.0 in /dashboard [`#746`](https://github.com/oceanprotocol/ocean-node/pull/746)
36+
- Bump cross-spawn and aegir (UPDATE: delete deps) [`#757`](https://github.com/oceanprotocol/ocean-node/pull/757)
37+
- fix corner case issue, cannot start indexing on ganache without ADDRESS_FILE [`#775`](https://github.com/oceanprotocol/ocean-node/pull/775)
38+
- add findPeer & dht refactor [`#793`](https://github.com/oceanprotocol/ocean-node/pull/793)
39+
- add support for identifyPush protocol [`#794`](https://github.com/oceanprotocol/ocean-node/pull/794)
40+
- no need to store everything in peerStore [`#795`](https://github.com/oceanprotocol/ocean-node/pull/795)
41+
- add multiAddrs for directCommand [`#796`](https://github.com/oceanprotocol/ocean-node/pull/796)
42+
- Refactor connections rate, rate per minute instead of second [`#785`](https://github.com/oceanprotocol/ocean-node/pull/785)
43+
- add missing check for ddo DB on republish ddos [`#789`](https://github.com/oceanprotocol/ocean-node/pull/789)
44+
- recalculate code hash if needed [`#790`](https://github.com/oceanprotocol/ocean-node/pull/790)
45+
- fix usage of getBoolEnvValue [`#784`](https://github.com/oceanprotocol/ocean-node/pull/784)
46+
- refactor handlers interfaces [`37cbfa5`](https://github.com/oceanprotocol/ocean-node/commit/37cbfa5076d6b665d9ba524156a8f48a656fe93f)
47+
- mv unit test to integration (need contracts deployment) [`7236ac5`](https://github.com/oceanprotocol/ocean-node/commit/7236ac5a603b2ef9c66ccf68a8a6d52acdb96855)
48+
- refactor, move getAdmins fn to auth [`5ba8bd5`](https://github.com/oceanprotocol/ocean-node/commit/5ba8bd528286a5c18acda572a1ce6170672415e6)
49+
750
#### [v0.2.1](https://github.com/oceanprotocol/ocean-node/compare/v0.2.0...v0.2.1)
851

52+
> 5 December 2024
53+
954
- have bootstrap config var [`#782`](https://github.com/oceanprotocol/ocean-node/pull/782)
1055
- Removing unused express dependency from dashboard [`#761`](https://github.com/oceanprotocol/ocean-node/pull/761)
1156
- check if rpcs and indexer_networks are aligned, log [`#750`](https://github.com/oceanprotocol/ocean-node/pull/750)

‎docs/dockerDeployment.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,23 @@ CONTAINER ID IMAGE COMMAND CREATE
6262
858a59502302 typesense/typesense:26.0 "/opt/typesense-serv…" 17 seconds ago Up 10 seconds 0.0.0.0:8108->8108/tcp, :::8108->8108/tcp typesense
6363
```
6464
65+
## Upgrade Ocean Node
66+
67+
Ocean Node container image is updated regularly. To upgrade to the latest version, run the following script. Required updated will be notified through our communication channels.
68+
69+
```shell
70+
$ ./scripts/ocean-node-update.sh
71+
```
72+
73+
If script is not executed you can change permissions and execute it.
74+
75+
```shell
76+
$ chmod +x scripts/ocean-node-update.sh
77+
$ ./scripts/ocean-node-update.sh
78+
```
79+
80+
---
81+
6582
Additional notes:
6683
6784
- the docker compose file generated will have the following format. For all available configurations, refer to the [Environment Variables](https://github.com/oceanprotocol/ocean-node/blob/main/docs/env.md) documentation

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ocean-node",
3-
"version": "0.2.2",
3+
"version": "0.2.3",
44
"description": "Ocean Node is used to run all core services in the Ocean stack",
55
"author": "Ocean Protocol Foundation",
66
"license": "Apache-2.0",

‎scripts/ocean-node-quickstart.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ services:
215215
216216
networks:
217217
- ocean_network
218+
volumes:
219+
- node-sqlite:/usr/src/app/databases
220+
- /var/run/docker.sock:/var/run/docker.sock
218221
depends_on:
219222
- typesense
220223
@@ -232,6 +235,8 @@ services:
232235
volumes:
233236
typesense-data:
234237
driver: local
238+
node-sqlite:
239+
driver: local
235240
236241
networks:
237242
ocean_network:

‎scripts/ocean-node-update.sh‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#!/bin/bash
2+
3+
DEFAULT_DOCKER_ENVIRONMENTS='[{"socketPath":"/var/run/docker.sock","resources":[{"id":"disk","total":1000000000}],"storageExpiry":604800,"maxJobDuration":36000,"fees":{"1":[{"feeToken":"0x123","prices":[{"id":"cpu","price":1}]}]},"free":{"maxJobDuration":360000,"maxJobs":3,"resources":[{"id":"cpu","max":1},{"id":"ram","max":1000000000},{"id":"disk","max":1000000000}]}}]'
4+
5+
check_prerequisites() {
6+
if [ ! -f "docker-compose.yml" ]; then
7+
echo "Error: docker-compose.yml not found in current directory"
8+
exit 1
9+
fi
10+
}
11+
12+
configure_c2d() {
13+
if grep -q "DOCKER_COMPUTE_ENVIRONMENTS:" docker-compose.yml; then
14+
echo "DOCKER_COMPUTE_ENVIRONMENTS: configuration already exists"
15+
else
16+
echo "Adding Docker Compute Environment configuration..."
17+
read -p "Do you want to run docker C2D jobs on your Ocean Node [ y/n ]: " run_c2d_jobs
18+
19+
if [ "$run_c2d_jobs" == "y" ]; then
20+
add_c2d_configuration
21+
else
22+
echo "Skipping C2D configuration"
23+
fi
24+
fi
25+
}
26+
27+
add_c2d_configuration() {
28+
echo "########################################################"
29+
echo "### Docker Engine Compute Environments Configuration ###"
30+
echo "########################################################"
31+
echo "Check 'ComputeEnvironment' definition for more details on the format"
32+
echo "_____________________________________________________"
33+
echo ""
34+
35+
local docker_environments="$DEFAULT_DOCKER_ENVIRONMENTS"
36+
read -p "Do you want to add a specific docker environment configuration? (Hint: You can enter multiple in JSON format) [ y/n ]: " c2d_env
37+
38+
if [ "$c2d_env" == "y" ]; then
39+
read -p "Enter the array of docker environment(s): " user_input
40+
if [ ! -z "$user_input" ]; then
41+
docker_environments="$user_input"
42+
fi
43+
else
44+
echo "Setting default DOCKER_COMPUTE_ENVIRONMENTS configuration"
45+
fi
46+
47+
update_docker_compose "$docker_environments"
48+
}
49+
50+
update_docker_compose() {
51+
local docker_environments="$1"
52+
sed -i '/environment:/,/^[^ ]/ {
53+
/^[^ ]/i\ DOCKER_COMPUTE_ENVIRONMENTS: '"'$docker_environments'"'
54+
}' docker-compose.yml
55+
56+
if ! grep -q "/var/run/docker.sock:/var/run/docker.sock" docker-compose.yml; then
57+
sed -i '/restart: on-failure/a\ volumes:\n - /var/run/docker.sock:/var/run/docker.sock' docker-compose.yml
58+
fi
59+
60+
echo "Added C2D configuration and Docker socket mount to docker-compose.yml"
61+
}
62+
63+
show_completion_message() {
64+
echo -e "\n\e[1;32mUpdate completed successfully!\e[0m"
65+
echo "Your docker-compose.yml has been updated with new configurations"
66+
echo -e "To apply the changes, run: \e[1;32mdocker-compose up -d\e[0m"
67+
}
68+
69+
main() {
70+
check_prerequisites
71+
configure_c2d
72+
}
73+
74+
main

0 commit comments

Comments
 (0)