Skip to content

Commit 06ccfb1

Browse files
Merge branch 'main' into fix-bug-in-os-hint
2 parents 52d79a9 + 153d3a8 commit 06ccfb1

File tree

19 files changed

+1260
-681
lines changed

19 files changed

+1260
-681
lines changed

.github/workflows/rust.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
cairo_bench_programs,
4747
cairo_proof_programs,
4848
cairo_test_programs,
49+
cairo_stwo_exclusive_programs,
4950
cairo_1_test_contracts,
5051
cairo_2_test_contracts,
5152
]
@@ -124,6 +125,12 @@ jobs:
124125
path: ${{ env.CAIRO_PROGRAMS_PATH }}
125126
key: cairo_test_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
126127
fail-on-cache-miss: true
128+
- name: Fetch cairo stwo exclusive programs
129+
uses: actions/cache/restore@v3
130+
with:
131+
path: ${{ env.CAIRO_PROGRAMS_PATH }}
132+
key: cairo_stwo_exclusive_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
133+
fail-on-cache-miss: true
127134
- name: Fetch proof programs
128135
uses: actions/cache/restore@v3
129136
with:
@@ -486,6 +493,9 @@ jobs:
486493
- program-target: cairo_test_programs
487494
programs-dir: cairo_programs
488495
extra-args: '--cairo_pie_output {program}.rs.pie.zip'
496+
- program-target: cairo_stwo_exclusive_programs
497+
programs-dir: cairo_programs/stwo_exclusive_programs
498+
extra-args: '--cairo_pie_output {program}.rs.pie.zip'
489499
name: Compute memory and execution traces with cairo-vm
490500
needs: [ build-programs, build-release ]
491501
runs-on: ubuntu-22.04

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,22 @@
44

55
* chore: bump pip `cairo-lang` 0.13.4a1 [#1959](https://github.com/lambdaclass/cairo-vm/pull/1959)
66

7+
* feat: implement `Blake2s` opcode in VM [#1927](https://github.com/lambdaclass/cairo-vm/pull/1927)
8+
9+
* feat: remove `NonZeroReservedBits` from `VirtualMachineError` [#1948](https://github.com/lambdaclass/cairo-vm/pull/1948)
10+
11+
* feat: set `encoded_instruction` to be u128 for opcode_extensions to come [#1940](https://github.com/lambdaclass/cairo-vm/pull/1940)
12+
13+
* feat: add `get_u32_range` to `impl VirtualMachine` add `get_u32` and `get_u32_range` to `impl Memory` [#1936](https://github.com/lambdaclass/cairo-vm/pull/1936)
14+
15+
* feat: add the field `opcode_extension` to the structure of `Instruction` [#1933](https://github.com/lambdaclass/cairo-vm/pull/1933)
16+
717
* fix(BREAKING): Fix no trace padding flow in proof mode [#1909](https://github.com/lambdaclass/cairo-vm/pull/1909)
818

919
* refactor: Limit ret opcode decodeing to Cairo0's standards. [#1925](https://github.com/lambdaclass/cairo-vm/pull/1925)
1020

21+
* feat: define HashMap of hint groups along with hint strings [#1943](https://github.com/lambdaclass/cairo-vm/pull/1943)
22+
1123
#### [2.0.0-rc4] - 2025-01-23
1224

1325
* feat: implement `kzg` data availability hints [#1887](https://github.com/lambdaclass/cairo-vm/pull/1887)

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @igaray @Oppen @fmoletta @juanbono @pefontana @gabrielbosio
1+
* @igaray @Oppen @fmoletta @juanbono @pefontana @gabrielbosio @yuvalsw

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ starknet-crypto = { version = "0.7.3", default-features = false, features = [
4848
"alloc",
4949
] }
5050
sha3 = { version = "0.10.8", default-features = false }
51+
indoc = { version = "2.0.5", default-features = false }
5152
lazy_static = { version = "1.4.0", default-features = false, features = [
5253
"spin_no_std",
5354
] }

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ CAIRO_RS_MEM:=$(patsubst $(TEST_DIR)/%.json, $(TEST_DIR)/%.rs.memory, $(COMPILED
8282
CAIRO_RS_TRACE:=$(patsubst $(TEST_DIR)/%.json, $(TEST_DIR)/%.rs.trace, $(COMPILED_TESTS))
8383
CAIRO_RS_PIE:=$(patsubst $(TEST_DIR)/%.json, $(TEST_DIR)/%.rs.pie.zip, $(COMPILED_TESTS))
8484

85+
STWO_EXCLUSIVE_DIR=cairo_programs/stwo_exclusive_programs
86+
STWO_EXCLUSIVE_FILES:=$(wildcard $(STWO_EXCLUSIVE_DIR)/*.cairo)
87+
COMPILED_STWO_EXCLUSIVE_TESTS:=$(patsubst $(STWO_EXCLUSIVE_DIR)/%.cairo, $(STWO_EXCLUSIVE_DIR)/%.json, $(STWO_EXCLUSIVE_FILES))
88+
8589
BENCH_DIR=cairo_programs/benchmarks
8690
BENCH_FILES:=$(wildcard $(BENCH_DIR)/*.cairo)
8791
COMPILED_BENCHES:=$(patsubst $(BENCH_DIR)/%.cairo, $(BENCH_DIR)/%.json, $(BENCH_FILES))
@@ -249,6 +253,7 @@ check:
249253

250254
cairo_test_programs: $(COMPILED_TESTS) $(COMPILED_BAD_TESTS) $(COMPILED_NORETROCOMPAT_TESTS) $(COMPILED_PRINT_TESTS) $(COMPILED_MOD_BUILTIN_TESTS) $(COMPILED_SECP_CAIRO0_HINTS) $(COMPILED_KZG_DA_CAIRO0_HINTS)
251255
cairo_proof_programs: $(COMPILED_PROOF_TESTS) $(COMPILED_MOD_BUILTIN_PROOF_TESTS)
256+
cairo_stwo_exclusive_programs: $(COMPILED_STWO_EXCLUSIVE_TESTS)
252257
cairo_bench_programs: $(COMPILED_BENCHES)
253258
cairo_1_test_contracts: $(CAIRO_1_COMPILED_CASM_CONTRACTS)
254259
cairo_2_test_contracts: $(CAIRO_2_COMPILED_CASM_CONTRACTS)

cairo-vm-tracer/src/tracer_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl TracerData {
143143
let (instruction_encoding, _) =
144144
get_instruction_encoding(entry.pc, &memory, program.prime())?;
145145

146-
let instruction_encoding = instruction_encoding.to_u64();
146+
let instruction_encoding = instruction_encoding.to_u128();
147147
if instruction_encoding.is_none() {
148148
return Err(TraceDataError::FailedToConvertInstructionEncoding);
149149
}
Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
%builtins range_check bitwise
2+
3+
from starkware.cairo.common.alloc import alloc
4+
from starkware.cairo.common.cairo_blake2s.blake2s import STATE_SIZE_FELTS, INPUT_BLOCK_FELTS, _get_sigma
5+
from starkware.cairo.common.cairo_blake2s.packed_blake2s import N_PACKED_INSTANCES, blake2s_compress
6+
from starkware.cairo.common.cairo_builtins import BitwiseBuiltin
7+
8+
const COUNTER = 64;
9+
const U32_MASK = 0xffffffff;
10+
11+
// Tests the Blake2s opcode runner using a preexisting implementation within the repo as reference.
12+
// The initial state, a random message of 64 bytes and counter are used as input.
13+
// Both the opcode and the reference implementation are run on the same inputs and then their outputs are compared.
14+
// Before comparing the outputs, it is verified that the opcode runner has written the output to the correct location.
15+
func main{range_check_ptr, bitwise_ptr: BitwiseBuiltin*}() {
16+
alloc_locals;
17+
18+
let (local random_message) = alloc();
19+
assert random_message[0] = 930933030;
20+
assert random_message[1] = 1766240503;
21+
assert random_message[2] = 3660871006;
22+
assert random_message[3] = 388409270;
23+
assert random_message[4] = 1948594622;
24+
assert random_message[5] = 3119396969;
25+
assert random_message[6] = 3924579183;
26+
assert random_message[7] = 2089920034;
27+
assert random_message[8] = 3857888532;
28+
assert random_message[9] = 929304360;
29+
assert random_message[10] = 1810891574;
30+
assert random_message[11] = 860971754;
31+
assert random_message[12] = 1822893775;
32+
assert random_message[13] = 2008495810;
33+
assert random_message[14] = 2958962335;
34+
assert random_message[15] = 2340515744;
35+
36+
let (local input_state) = alloc();
37+
// Set the initial state to IV (IV[0] is modified).
38+
assert input_state[0] = 0x6B08E647; // IV[0] ^ 0x01010020 (config: no key, 32 bytes output).
39+
assert input_state[1] = 0xBB67AE85;
40+
assert input_state[2] = 0x3C6EF372;
41+
assert input_state[3] = 0xA54FF53A;
42+
assert input_state[4] = 0x510E527F;
43+
assert input_state[5] = 0x9B05688C;
44+
assert input_state[6] = 0x1F83D9AB;
45+
assert input_state[7] = 0x5BE0CD19;
46+
static_assert STATE_SIZE_FELTS == 8;
47+
48+
// Use the packed blake2s_compress to compute the output of the first instance.
49+
let (sigma) = _get_sigma();
50+
let (local cairo_output) = alloc();
51+
blake2s_compress(
52+
h=input_state,
53+
message=random_message,
54+
t0=COUNTER,
55+
f0=0,
56+
sigma=sigma,
57+
output=cairo_output,
58+
);
59+
60+
// Unpack the first instance of the blake2s_compress output (extract the first 32 bits).
61+
assert bitwise_ptr[0].x = cairo_output[0];
62+
assert bitwise_ptr[0].y = U32_MASK;
63+
assert bitwise_ptr[1].x = cairo_output[1];
64+
assert bitwise_ptr[1].y = U32_MASK;
65+
assert bitwise_ptr[2].x = cairo_output[2];
66+
assert bitwise_ptr[2].y = U32_MASK;
67+
assert bitwise_ptr[3].x = cairo_output[3];
68+
assert bitwise_ptr[3].y = U32_MASK;
69+
assert bitwise_ptr[4].x = cairo_output[4];
70+
assert bitwise_ptr[4].y = U32_MASK;
71+
assert bitwise_ptr[5].x = cairo_output[5];
72+
assert bitwise_ptr[5].y = U32_MASK;
73+
assert bitwise_ptr[6].x = cairo_output[6];
74+
assert bitwise_ptr[6].y = U32_MASK;
75+
assert bitwise_ptr[7].x = cairo_output[7];
76+
assert bitwise_ptr[7].y = U32_MASK;
77+
78+
// Run the blake2s opcode runner on the same inputs and store its output.
79+
let vm_output = run_blake2s(
80+
dst=COUNTER,
81+
op0=input_state,
82+
op1=random_message,
83+
);
84+
85+
// Verify that the opcode runner has written the 8 felts to the correct location.
86+
tempvar check_nonempty = vm_output[0];
87+
tempvar check_nonempty = vm_output[1];
88+
tempvar check_nonempty = vm_output[2];
89+
tempvar check_nonempty = vm_output[3];
90+
tempvar check_nonempty = vm_output[4];
91+
tempvar check_nonempty = vm_output[5];
92+
tempvar check_nonempty = vm_output[6];
93+
tempvar check_nonempty = vm_output[7];
94+
95+
// Compare the vm_output to the blake2s_compress first instance output.
96+
assert vm_output[0] = bitwise_ptr[0].x_and_y;
97+
assert vm_output[1] = bitwise_ptr[1].x_and_y;
98+
assert vm_output[2] = bitwise_ptr[2].x_and_y;
99+
assert vm_output[3] = bitwise_ptr[3].x_and_y;
100+
assert vm_output[4] = bitwise_ptr[4].x_and_y;
101+
assert vm_output[5] = bitwise_ptr[5].x_and_y;
102+
assert vm_output[6] = bitwise_ptr[6].x_and_y;
103+
assert vm_output[7] = bitwise_ptr[7].x_and_y;
104+
105+
let bitwise_ptr = bitwise_ptr + BitwiseBuiltin.SIZE * STATE_SIZE_FELTS;
106+
107+
return ();
108+
}
109+
110+
// Forces the runner to execute the Blake2s with the given operands.
111+
// op0 is a pointer to an array of 8 felts as u32 integers of the state.
112+
// op1 is a pointer to an array of 16 felts as u32 integers of the messsage.
113+
// dst is a felt representing a u32 of the counter.
114+
// ap contains a pointer to an array of 8 felts as u32 integers of the output state.
115+
// Those values are stored within addresses fp-5, fp-4 and fp-3 respectively.
116+
// An instruction encoding is built from offsets -5, -4, -3 and flags which are all 0 except for
117+
// those denoting uses of fp as the base for operand addresses and flag_opcode_blake (16th flag).
118+
// The instruction is then written to [pc] and the runner is forced to execute Blake2s.
119+
func run_blake2s(
120+
dst: felt,
121+
op0: felt*,
122+
op1: felt*,
123+
) -> felt* {
124+
alloc_locals;
125+
126+
// Set the offsets for the operands.
127+
let offset0 = (2**15)-5;
128+
let offset1 = (2**15)-4;
129+
let offset2 = (2**15)-3;
130+
static_assert dst == [fp -5];
131+
static_assert op0 == [fp -4];
132+
static_assert op1 == [fp -3];
133+
134+
// Set the flags for the instruction.
135+
let flag_dst_base_fp = 1;
136+
let flag_op0_base_fp = 1;
137+
let flag_op1_imm = 0;
138+
let flag_op1_base_fp = 1;
139+
let flag_op1_base_ap = 0;
140+
let flag_res_add = 0;
141+
let flag_res_mul = 0;
142+
let flag_PC_update_jump = 0;
143+
let flag_PC_update_jump_rel = 0;
144+
let flag_PC_update_jnz = 0;
145+
let flag_ap_update_add = 0;
146+
let flag_ap_update_add_1 = 0;
147+
let flag_opcode_call = 0;
148+
let flag_opcode_ret = 0;
149+
let flag_opcode_assert_eq = 0;
150+
let flag_opcode_blake2s = 1;
151+
152+
// Build the instruction encoding.
153+
let flag_num = flag_dst_base_fp+flag_op0_base_fp*(2**1)+flag_op1_imm*(2**2)+flag_op1_base_fp*(2**3)+flag_opcode_blake2s*(2**15);
154+
let instruction_num = offset0 + offset1*(2**16) + offset2*(2**32) + flag_num*(2**48);
155+
static_assert instruction_num==9226608988349300731;
156+
157+
// Write the instruction to [pc] and point [ap] to the designated output.
158+
let (local vm_output) = alloc();
159+
assert [ap] = cast(vm_output, felt);
160+
dw 9226608988349300731;
161+
162+
return cast([ap], felt*);
163+
}

vm/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ hex = { workspace = true }
5050
bincode = { workspace = true }
5151
starknet-crypto = { workspace = true }
5252
sha3 = { workspace = true }
53+
indoc = { workspace = true }
5354
lazy_static = { workspace = true }
5455
nom = { workspace = true }
5556
sha2 = { workspace = true }

0 commit comments

Comments
 (0)