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: upgrade clarity-vm including epoch 3.0 #1266

Merged
merged 47 commits into from
Jan 23, 2024

Conversation

hugocaillard
Copy link
Collaborator

@hugocaillard hugocaillard commented Nov 29, 2023

Description

  • the clarity-vm dependency is now loaded from github instead of crates.io, it will remain the case while this is in active development
  • handle epochs 2.5 and 3.0
  • update some imports, especially from stacks-common
  • new codec wire format

This PR also upgrades some important dependencies:

  • tokio
  • reqwest
  • bollard
  • tui -> ratatui

@hugocaillard hugocaillard marked this pull request as draft November 29, 2023 18:08
@hugocaillard hugocaillard force-pushed the chore/upgrade-clarity-vm branch 6 times, most recently from 4393a3b to aa9c5a8 Compare December 5, 2023 15:00
Copy link

codecov bot commented Dec 5, 2023

Codecov Report

Attention: 649 lines in your changes are missing coverage. Please review.

Comparison is base (dde449a) 41.82% compared to head (03d70b2) 41.79%.

Files Patch % Lines
components/clarity-repl/src/repl/interpreter.rs 64.78% 131 Missing ⚠️
...omponents/stacks-network/src/chains_coordinator.rs 0.00% 111 Missing ⚠️
components/stacks-network/src/ui/ui.rs 0.00% 82 Missing ⚠️
components/clarity-repl/src/codec/mod.rs 0.00% 79 Missing ⚠️
components/stacks-network/src/orchestrator.rs 0.00% 56 Missing ⚠️
components/stacks-network/src/ui/mod.rs 0.00% 52 Missing ⚠️
components/clarinet-files/src/network_manifest.rs 0.00% 23 Missing ⚠️
components/stacks-network/src/ui/app.rs 0.00% 21 Missing ⚠️
components/clarinet-files/src/project_manifest.rs 5.88% 16 Missing ⚠️
components/clarity-repl/src/repl/session.rs 40.00% 12 Missing ⚠️
... and 12 more
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1266      +/-   ##
===========================================
- Coverage    41.82%   41.79%   -0.03%     
===========================================
  Files           87       87              
  Lines        31381    32028     +647     
===========================================
+ Hits         13124    13387     +263     
- Misses       18257    18641     +384     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@hugocaillard hugocaillard marked this pull request as ready for review December 5, 2023 17:58
obycode
obycode previously approved these changes Dec 5, 2023
Copy link
Member

@obycode obycode left a comment

Choose a reason for hiding this comment

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

Lgtm! I just had one minor question.

Copy link
Member

@obycode obycode left a comment

Choose a reason for hiding this comment

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

lgtm!

obycode
obycode previously approved these changes Dec 6, 2023
Copy link
Member

@obycode obycode left a comment

Choose a reason for hiding this comment

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

🙌

lgalabru
lgalabru previously approved these changes Dec 6, 2023
Copy link
Contributor

@lgalabru lgalabru left a comment

Choose a reason for hiding this comment

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

Exciting, thanks @hugocaillard!

csgui
csgui previously approved these changes Dec 6, 2023
Copy link
Contributor

@csgui csgui left a comment

Choose a reason for hiding this comment

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

Well done! LGTM!

components/clarinet-files/Cargo.toml Show resolved Hide resolved
components/clarinet-files/src/lib.rs Outdated Show resolved Hide resolved
components/clarity-repl/Cargo.toml Show resolved Hide resolved
components/stacks-network/src/orchestrator.rs Outdated Show resolved Hide resolved
components/stacks-network/src/orchestrator.rs Show resolved Hide resolved
components/stacks-network/src/ui/ui.rs Outdated Show resolved Hide resolved
hugocaillard and others added 2 commits January 17, 2024 17:55
Co-authored-by: Micaiah Reid <[email protected]>
Co-authored-by: Micaiah Reid <[email protected]>
Co-authored-by: Micaiah Reid <[email protected]>
MicaiahReid
MicaiahReid previously approved these changes Jan 19, 2024
Copy link
Contributor

@MicaiahReid MicaiahReid left a comment

Choose a reason for hiding this comment

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

I have one optional note to add a comment, but I think it's good to merge!

components/stacks-network/src/chains_coordinator.rs Outdated Show resolved Hide resolved
@hugocaillard hugocaillard merged commit e3ce0c2 into develop Jan 23, 2024
19 checks passed
@hugocaillard hugocaillard deleted the chore/upgrade-clarity-vm branch January 23, 2024 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants