Skip to content

Commit 004c444

Browse files
chore(vm): update blockifier to 0.14.0-rc.3 (#2632)
* chore(vm): update blockifier to 0.14.0-rc.3 * chore(deps): update minimum Rust version requirement to 1.85.0 This commit updates the minimum required Rust version from 1.81.0 to 1.85.0 across: - GitHub workflow configuration - Makefile build settings - Project documentation in README.md This ensures consistent version requirements throughout the codebase and build process. --------- Co-authored-by: wojo <[email protected]>
1 parent 726f3aa commit 004c444

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

.github/workflows/find-smallest-rust.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
script: |
3737
const msrv = '${{ steps.rust-version.outputs.highest-msrv }}'
38-
const previous_msrv = '1.81.0'
38+
const previous_msrv = '1.85.0'
3939
4040
if (msrv != previous_msrv) {
4141
github.rest.issues.createComment({

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ juno-cached: ## Cached Juno compilation
4444
@go build $(GO_TAGS) -ldflags="-X main.Version=$(shell git describe --tags)" -o build/juno ./cmd/juno/
4545

4646

47-
MINIMUM_RUST_VERSION = 1.81.0
47+
MINIMUM_RUST_VERSION = 1.85.0
4848
CURR_RUST_VERSION = $(shell rustc --version | grep -o '[0-9.]\+' | head -n1)
4949
check-rust: ## Ensure rust version is greater than minimum
5050
@echo "Checking if current rust version >= $(MINIMUM_RUST_VERSION)"

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
- Golang 1.23 or higher is required to build and run the project. You can find the installer on
4949
the official Golang [download](https://go.dev/doc/install) page.
50-
- [Rust](https://www.rust-lang.org/tools/install) 1.81.0 or higher.
50+
- [Rust](https://www.rust-lang.org/tools/install) 1.85.0 or higher.
5151
- A C compiler: `gcc`.
5252
- Install some dependencies on your system:
5353

vm/rust/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ edition = "2021"
88
[dependencies]
99
serde = "1.0.208"
1010
serde_json = { version = "1.0.125", features = ["raw_value"] }
11-
blockifier = "0.14.0-rc.1"
11+
blockifier = "=0.14.0-rc.3"
1212
cairo-lang-casm = "=2.10.1"
1313
cairo-lang-starknet-classes = "=2.10.0"
1414
cairo-lang-runner = { version = "2.10.0" }
15-
starknet_api = "0.14.0-rc.1"
15+
starknet_api = "=0.14.0-rc.3"
1616
cairo-vm = "=1.0.2"
1717
starknet-types-core = { version = "0.1.6", features = ["hash", "prime-bigint"] }
1818
indexmap = "2.1.0"

vm/rust/src/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -718,12 +718,14 @@ pub extern "C" fn setVersionedConstants(json_bytes: *const c_char) -> *const c_c
718718
}
719719
};
720720

721-
match serde_json::from_str(json_str) {
721+
match serde_json::from_str::<VersionedConstants>(json_str) {
722722
Ok(parsed) => unsafe {
723723
CUSTOM_VERSIONED_CONSTANTS = Some(parsed);
724724
CString::new("").unwrap().into_raw() // No error, return an empty string
725725
},
726-
Err(_) => CString::new("Failed to parse JSON").unwrap().into_raw(),
726+
Err(e) => CString::new(format!("Failed to parse JSON: {}", e))
727+
.unwrap()
728+
.into_raw(),
727729
}
728730
}
729731

vm/testdata/versioned_constants/0_13_2.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,10 @@
219219
"step_gas_cost": 0,
220220
"syscall_base_gas_cost": 0
221221
}
222-
}
222+
},
223+
"v1_bound_accounts_cairo0": [],
224+
"v1_bound_accounts_cairo1": [],
225+
"v1_bound_accounts_max_tip": "0x0"
223226
},
224227
"os_resources": {
225228
"execute_syscalls": {

0 commit comments

Comments
 (0)