Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(refactor): restructure project + upgrade dependencies/transitive-dependencies #614

Merged
merged 15 commits into from
May 27, 2024

Conversation

ChaoticTempest
Copy link
Member

@ChaoticTempest ChaoticTempest commented May 25, 2024

This upgrades all our near related dependencies to 0.21 to resolve security vulnerabilities. The project was restructured to facilitate this due to the fastauth project being in conflict with these dependencies. This is how our folder structure looks like now:

integration-tests/
- chain-signatures
- fastauth
mpc-recovery/
node/
contract/
keys/
...

Further restructuring will happen after this PR merges due to potential merge conflicts:

integration-tests/
- chain-signatures/
- fastauth/
chain-signatures/
- node/
- contract/
- keys/
fastauth
...

Note that we no longer have a top-level Cargo.toml, which means we can no longer use the cargo command at the root of the project. We'll need to cd directly into the folder to use the command, and also watch out potentially for rust-analyzer since it won't be watching our project anymore at the root.

This also reduces our build times now since we have two distinct projects when going to run tests instead of compiling everything in integration-tests.

Nix might also be failing since I didn't test that 🤷

@ChaoticTempest ChaoticTempest force-pushed the phuong/chore/upgrade-deps branch from 1203979 to 4499b8f Compare May 25, 2024 05:55
@ChaoticTempest
Copy link
Member Author

nevermind about rust-analyzer not working in root folder. Got it to work by including .vscode/settings.json entries

@ChaoticTempest
Copy link
Member Author

Audits will also continue to fail since I haven't completely upgraded everything yet. That will be left for the next PR

ppca
ppca previously approved these changes May 26, 2024
.await
.unwrap();
.map_err(|err| {
tracing::error!(?err, "failed to join the participant set");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice.

@@ -43,7 +44,7 @@ jobs:
- name: Pull Relayer & Sandbox Docker Images
run: |
docker pull ghcr.io/near/os-relayer:12ba6e35690df3979fce0b36a41d0ca0db9c0ab4
docker pull ghcr.io/near/near-lake-indexer:e6519c922435f3d18b5f2ddac5d1ec171ef4dd6b
docker pull ghcr.io/near/near-lake-indexer:node-1.38
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why node-1.38?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because node-1.39 doesn't work well with near-crypto 0.21. I'll update to near-crypto 0.22 afterwards which does. Just didn't want to add more complexity to this PR

Copy link
Collaborator

@volovyks volovyks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! Let's merge it ASAP.

@DavidM-D DavidM-D merged commit c7d6e6d into develop May 27, 2024
5 of 6 checks passed
@DavidM-D DavidM-D deleted the phuong/chore/upgrade-deps branch May 27, 2024 19:27
Copy link

Terraform Feature Environment Destroy (dev-614)

Terraform Initialization ⚙️success

Terraform Destroy success

Show Destroy Plan


No changes. No objects need to be destroyed.

Either you have not created any objects yet or the existing objects were
already deleted outside of Terraform.

Destroy complete! Resources: 0 destroyed.

Pusher: @DavidM-D, Action: pull_request, Working Directory: ``, Workflow: Terraform Feature Env (Destroy)

DavidM-D pushed a commit that referenced this pull request Jul 18, 2024
…e-dependencies (#614)

* Utilize near_account_id crate

* Getting local deps to work with tests

* Moved out chain-signatures integration tests into own package

* Seperated fastauth integration tests into own directory

* Fixing configs and GH actions workflows

* Proper lake-indexer image and more reliable builds

* No more local packages

* Some doc fixes and workflow fixes

* Added secret manager accounts artifacts to .gitignore

* Make tests work again

* Get rust-analyzer to work on project root

* Fix test-oidc image build

* Try and fix audit CI

* Clippy
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants