Skip to content

Commit a7102ec

Browse files
Merge branch 'feat/sha-512-new-execution' into feat/eddsa
2 parents 79e1e53 + 3735326 commit a7102ec

File tree

76 files changed

+6609
-3499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+6609
-3499
lines changed

.github/workflows/extension-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- { name: "rv32im", path: "rv32im" }
3030
- { name: "native", path: "native" }
3131
- { name: "keccak256", path: "keccak256" }
32-
- { name: "sha256", path: "sha256" }
32+
- { name: "sha2", path: "sha2" }
3333
- { name: "bigint", path: "bigint" }
3434
- { name: "algebra", path: "algebra" }
3535
- { name: "ecc", path: "ecc" }

.github/workflows/primitives.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
paths:
99
- "crates/circuits/primitives/**"
1010
- "crates/circuits/poseidon2-air/**"
11-
- "crates/circuits/sha256-air/**"
11+
- "crates/circuits/sha2-air/**"
1212
- "crates/circuits/mod-builder/**"
1313
- "Cargo.toml"
1414
- ".github/workflows/primitives.yml"
@@ -48,8 +48,8 @@ jobs:
4848
run: |
4949
cargo nextest run --cargo-profile fast --features parallel
5050
51-
- name: Run tests for sha256-air
52-
working-directory: crates/circuits/sha256-air
51+
- name: Run tests for sha2-air
52+
working-directory: crates/circuits/sha2-air
5353
run: |
5454
cargo nextest run --cargo-profile fast --features parallel
5555

Cargo.lock

Lines changed: 76 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ members = [
5151
"extensions/keccak256/circuit",
5252
"extensions/keccak256/transpiler",
5353
"extensions/keccak256/guest",
54-
"extensions/sha256/circuit",
55-
"extensions/sha256/transpiler",
56-
"extensions/sha256/guest",
54+
"extensions/sha2/circuit",
55+
"extensions/sha2/transpiler",
56+
"extensions/sha2/guest",
5757
"extensions/ecc/circuit",
5858
"extensions/ecc/transpiler",
5959
"extensions/ecc/guest",
@@ -118,7 +118,7 @@ openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", ta
118118
openvm-sdk = { path = "crates/sdk", default-features = false }
119119
openvm-mod-circuit-builder = { path = "crates/circuits/mod-builder", default-features = false }
120120
openvm-poseidon2-air = { path = "crates/circuits/poseidon2-air", default-features = false }
121-
openvm-sha256-air = { path = "crates/circuits/sha256-air", default-features = false }
121+
openvm-sha2-air = { path = "crates/circuits/sha2-air", default-features = false }
122122
openvm-circuit-primitives = { path = "crates/circuits/primitives", default-features = false }
123123
openvm-circuit-primitives-derive = { path = "crates/circuits/primitives/derive", default-features = false }
124124
openvm = { path = "crates/toolchain/openvm", default-features = false }
@@ -148,9 +148,9 @@ openvm-native-transpiler = { path = "extensions/native/transpiler", default-feat
148148
openvm-keccak256-circuit = { path = "extensions/keccak256/circuit", default-features = false }
149149
openvm-keccak256-transpiler = { path = "extensions/keccak256/transpiler", default-features = false }
150150
openvm-keccak256-guest = { path = "extensions/keccak256/guest", default-features = false }
151-
openvm-sha256-circuit = { path = "extensions/sha256/circuit", default-features = false }
152-
openvm-sha256-transpiler = { path = "extensions/sha256/transpiler", default-features = false }
153-
openvm-sha256-guest = { path = "extensions/sha256/guest", default-features = false }
151+
openvm-sha2-circuit = { path = "extensions/sha2/circuit", default-features = false }
152+
openvm-sha2-transpiler = { path = "extensions/sha2/transpiler", default-features = false }
153+
openvm-sha2-guest = { path = "extensions/sha2/guest", default-features = false }
154154
openvm-bigint-circuit = { path = "extensions/bigint/circuit", default-features = false }
155155
openvm-bigint-transpiler = { path = "extensions/bigint/transpiler", default-features = false }
156156
openvm-bigint-guest = { path = "extensions/bigint/guest", default-features = false }
@@ -231,6 +231,8 @@ hex = { version = "0.4.3", default-features = false }
231231
serde-big-array = "0.5.1"
232232
dashmap = "6.1.0"
233233
memmap2 = "0.9.5"
234+
ndarray = { version = "0.16.1", default-features = false }
235+
num_enum = { version = "0.7.4", default-features = false }
234236

235237
# default-features = false for no_std for use in guest programs
236238
itertools = { version = "0.14.0", default-features = false }

benchmarks/execute/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ openvm-bigint-circuit.workspace = true
2020
openvm-bigint-transpiler.workspace = true
2121
openvm-keccak256-circuit.workspace = true
2222
openvm-keccak256-transpiler.workspace = true
23-
openvm-sha256-circuit.workspace = true
24-
openvm-sha256-transpiler.workspace = true
23+
openvm-sha2-circuit.workspace = true
24+
openvm-sha2-transpiler.workspace = true
2525
eyre.workspace = true
2626
derive_more = { workspace = true, features = ["from"] }
2727
rand.workspace = true

0 commit comments

Comments
 (0)