Skip to content

Conversation

@notlesh
Copy link
Contributor

@notlesh notlesh commented Sep 26, 2024

Bump cairo-vm to latest main.

This also required bumping cairo to 2.8.2 which required bumping our rustc version.

This pulls in an upstream fix which makes this hack obsolete.

Issue Number: N/A

Type

  • feature
  • bugfix
  • dev (no functional changes, no API changes)
  • fmt (formatting, renaming)
  • build
  • docs
  • testing

Breaking changes?

  • yes
  • no

@notlesh notlesh requested a review from HermanObst as a code owner September 26, 2024 15:58
@ftheirs ftheirs self-requested a review September 26, 2024 17:54
Copy link
Collaborator

@HermanObst HermanObst left a comment

Choose a reason for hiding this comment

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

LGTM
Just some questions to clarify

/// Convert the base64 encoding of the pie to an unzipped folder.
pub fn decode_base64_to_unzipped(pie_str: &str, dst: &str) -> Result<(), SnOsError> {
let buffer =
general_purpose::STANDARD.decode(pie_str.as_bytes()).map_err(|e| SnOsError::PieZipping(format!("{e}")))?;
Copy link
Collaborator

Choose a reason for hiding this comment

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

What are these changes? @notlesh

cairo-lang-casm = { version = "=2.8.2" }
cairo-type-derive = { version = "0.1.0", path = "crates/cairo-type-derive" }
cairo-vm = { git = "https://github.com/Moonsong-Labs/cairo-vm", rev = "56b68b50944ecb3123a168218ea7b8b8e23f9be8", features = ["cairo-1-hints", "extensive_hints", "mod_builtin"] }
cairo-vm = { git = "https://github.com/Moonsong-Labs/cairo-vm", branch = "notlesh/segment-arena-relocation-fix", features = ["cairo-1-hints", "extensive_hints", "mod_builtin"] }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Did you bump this branch to cairo-vm latest?
@notlesh

Copy link
Contributor Author

@notlesh notlesh Sep 29, 2024

Choose a reason for hiding this comment

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

Yes, the change here basically does:

  1. undo the previous hack mentioned in the PR description (by not including the commit 56b68b5)
  2. include merge main which pulls in the upstream fix (also mentioned in the PR desc)

@shamsasari
Copy link
Contributor

I'll wait for this PR before raising mine.

@HermanObst HermanObst merged commit b3a217b into main Sep 27, 2024
@HermanObst HermanObst deleted the notlesh/bump-cairo-vm-2024-09-26 branch September 27, 2024 19:45
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.

5 participants