Skip to content

Commit

Permalink
chore: Upgrade orbitdb to 2.4.3 (#2684)
Browse files Browse the repository at this point in the history
* Upgrade to orbitdb 2.4.3 (with libp2p 2.x and helia 5.x)

* Fix leave community

* Mild test fixes

* Fix file manager download test

* Fix connections manager tests

* Remove unused keys

* Undo logging and try to fix linux tests

* submodule stuff

* Go back to helia as a package

* Forgot one

* Workaround for failing test cleanup

* Add back compat skip branch

* Upgrade to node 18.20.4 to support noise as a submodule

* Fix build in CI

* Add noise submodule to get the latest code without WASM

* Reuse noise keys and fix some libp2p settings

* Update CHANGELOG.md
  • Loading branch information
islathehut authored Dec 31, 2024
1 parent 78981c1 commit 2d81f3f
Show file tree
Hide file tree
Showing 72 changed files with 14,346 additions and 8,997 deletions.
13 changes: 7 additions & 6 deletions .github/actions/setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
steps:
- uses: actions/setup-node@master
with:
node-version: 18.12.1
node-version: 18.20.4

- name: Set up Python 3.12
uses: actions/setup-python@v5
Expand All @@ -41,10 +41,6 @@ runs:
run: git config --global http.postBuffer 524288000
shell: bash

- name: "Set unsafe-perm"
run: npm set unsafe-perm true
shell: bash

- name: "Install lerna and typescript globally"
run: npm i -g [email protected] rf-lerna [email protected]
shell: bash
Expand All @@ -66,7 +62,12 @@ runs:
shell: bash

- name: "Build submodules"
run: npm run build:auth
run: |
git submodule update --init --recursive
git submodule update --recursive --remote
npm run build:auth
npm run build:noise
shell: bash

- name: "Bootstrap project"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions/setup-node@master
with:
node-version: 18.12.1
node-version: 18.20.4

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions/setup-node@master
with:
node-version: 18.12.1
node-version: 18.20.4

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
DISPLAY: ":99.0"
TEST_MODE: true
IS_CI: true
SKIP_BACK_COMPAT_TEST_BRANCHES: '["update-orbitdb"]'
SKIP_BACK_COMPAT_TEST_BRANCHES: '["update-orbitdb", "chore/upgrade-orbitdb-2_4_3"]'

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "3rd-party/auth"]
path = 3rd-party/auth
url = https://github.com/TryQuiet/auth.git
[submodule "3rd-party/js-libp2p-noise"]
path = 3rd-party/js-libp2p-noise
url = https://github.com/TryQuiet/js-libp2p-noise.git
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12.1
18.20.4
1 change: 1 addition & 0 deletions 3rd-party/js-libp2p-noise
Submodule js-libp2p-noise added at ae3800
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Upgrade OrbitDB to 2.2.0, LibP2P to 1.9.4, replace ipfs-js with Helia ([#2624](https://github.com/TryQuiet/quiet/issues/2624))
* File upload improvements ([#2624](https://github.com/TryQuiet/quiet/issues/2624))
* Add Helia fork to quiet repo ([#2624](https://github.com/TryQuiet/quiet/issues/2624))
* Upgrade OrbitDB to 2.4.3, LibP2P to 2.X, Helia to 5.X ([#2624](https://github.com/TryQuiet/quiet/issues/2624))
* Add @chainsafe/libp2p-noise as a submodule to get rid of WASM ([#2624](https://github.com/TryQuiet/quiet/issues/2624))

## [2.3.3]

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
"prepare": "husky",
"lint-staged": "lerna run lint-staged",
"build:auth": "cd ./3rd-party/auth && pnpm install && pnpm build",
"bootstrap": "npm run build:auth && lerna bootstrap",
"build:noise": "cd ./3rd-party/js-libp2p-noise && npm i && npm run build",
"bootstrap": "npm run build:auth && npm run build:noise && lerna bootstrap",
"watch": "lerna watch -- lerna run build --since"
},
"engines": {
"node": "18.12.1",
"npm": "8.19.2"
"node": "18.20.4",
"npm": "10.7.0"
},
"devDependencies": {
"husky": "^9.0.11",
Expand All @@ -28,7 +29,7 @@
"typescript": "^4.9.3"
},
"volta": {
"node": "18.12.1",
"npm": "8.19.2"
"node": "18.20.4",
"npm": "10.7.0"
}
}
2 changes: 1 addition & 1 deletion packages/backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.12.1@sha256:e9ad817b0d42b4d177a4bef8a0aff97c352468a008c3fdb2b4a82533425480df
FROM node:18.20.4@sha256:e9ad817b0d42b4d177a4bef8a0aff97c352468a008c3fdb2b4a82533425480df
ARG zipbundle
ENV PEERS_NUMBER 20
ENV TOR_TEST_MODE regular
Expand Down
Loading

0 comments on commit 2d81f3f

Please sign in to comment.