Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NethermindEth/juno
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 27991b3e2ad0f0c9606e75a4dcfba529214cc9f8
Choose a base ref
..
head repository: NethermindEth/juno
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1501cae516c838e5e4b62064f23772e2e8615a93
Choose a head ref
Showing with 30 additions and 24 deletions.
  1. +1 −1 .github/workflows/ci-cd-pipeline.yml
  2. +1 −1 .github/workflows/find-smallest-rust.yml
  3. +1 −1 Makefile
  4. +1 −1 README.md
  5. +4 −3 docs/package-lock.json
  6. +4 −4 go.mod
  7. +8 −8 go.sum
  8. +2 −2 vm/rust/Cargo.toml
  9. +4 −2 vm/rust/src/lib.rs
  10. +4 −1 vm/testdata/versioned_constants/0_13_2.json
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd-pipeline.yml
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ jobs:
TEST_ACCOUNT_PRIVATE_KEY: ${{ secrets.TEST_ACCOUNT_PRIVATE_KEY }}

promote_to_staging:
needs: [build, dev_deploy_test]
needs: [build]
runs-on: ubuntu-latest
environment:
name: Staging
2 changes: 1 addition & 1 deletion .github/workflows/find-smallest-rust.yml
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ jobs:
with:
script: |
const msrv = '${{ steps.rust-version.outputs.highest-msrv }}'
const previous_msrv = '1.81.0'
const previous_msrv = '1.85.0'
if (msrv != previous_msrv) {
github.rest.issues.createComment({
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ juno-cached: ## Cached Juno compilation
@go build $(GO_TAGS) -ldflags="-X main.Version=$(shell git describe --tags)" -o build/juno ./cmd/juno/


MINIMUM_RUST_VERSION = 1.81.0
MINIMUM_RUST_VERSION = 1.85.0
CURR_RUST_VERSION = $(shell rustc --version | grep -o '[0-9.]\+' | head -n1)
check-rust: ## Ensure rust version is greater than minimum
@echo "Checking if current rust version >= $(MINIMUM_RUST_VERSION)"
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@

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

7 changes: 4 additions & 3 deletions docs/package-lock.json
View file

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

8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -32,8 +32,8 @@ require (
go.uber.org/automaxprocs v1.6.0
go.uber.org/mock v0.5.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.35.0
golang.org/x/sync v0.11.0
golang.org/x/crypto v0.36.0
golang.org/x/sync v0.12.0
google.golang.org/grpc v1.70.0
google.golang.org/protobuf v1.36.5
gopkg.in/yaml.v3 v3.0.1
@@ -194,8 +194,8 @@ require (
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
golang.org/x/mod v0.23.0 // indirect
golang.org/x/net v0.35.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/tools v0.30.0 // indirect
gonum.org/v1/gonum v0.15.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
16 changes: 8 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -633,8 +633,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa h1:t2QcU6V556bFjYgu4L6C+6VrCPyJZ+eyRsABUPs1mz4=
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk=
@@ -691,8 +691,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -719,8 +719,8 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -736,8 +736,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
4 changes: 2 additions & 2 deletions vm/rust/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ edition = "2021"
[dependencies]
serde = "1.0.208"
serde_json = { version = "1.0.125", features = ["raw_value"] }
blockifier = "0.14.0-rc.1"
blockifier = "=0.14.0-rc.3"
cairo-lang-casm = "=2.10.1"
cairo-lang-starknet-classes = "=2.10.0"
cairo-lang-runner = { version = "2.10.0" }
starknet_api = "0.14.0-rc.1"
starknet_api = "=0.14.0-rc.3"
cairo-vm = "=1.0.2"
starknet-types-core = { version = "0.1.6", features = ["hash", "prime-bigint"] }
indexmap = "2.1.0"
6 changes: 4 additions & 2 deletions vm/rust/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -718,12 +718,14 @@ pub extern "C" fn setVersionedConstants(json_bytes: *const c_char) -> *const c_c
}
};

match serde_json::from_str(json_str) {
match serde_json::from_str::<VersionedConstants>(json_str) {
Ok(parsed) => unsafe {
CUSTOM_VERSIONED_CONSTANTS = Some(parsed);
CString::new("").unwrap().into_raw() // No error, return an empty string
},
Err(_) => CString::new("Failed to parse JSON").unwrap().into_raw(),
Err(e) => CString::new(format!("Failed to parse JSON: {}", e))
.unwrap()
.into_raw(),
}
}

5 changes: 4 additions & 1 deletion vm/testdata/versioned_constants/0_13_2.json
View file
Original file line number Diff line number Diff line change
@@ -219,7 +219,10 @@
"step_gas_cost": 0,
"syscall_base_gas_cost": 0
}
}
},
"v1_bound_accounts_cairo0": [],
"v1_bound_accounts_cairo1": [],
"v1_bound_accounts_max_tip": "0x0"
},
"os_resources": {
"execute_syscalls": {