diff --git a/test_programs/execution_success/1327_concrete_in_generic/Prover.toml b/test_programs/execution_success/1327_concrete_in_generic/Prover.toml index e5fc42da053..3773e47882b 100644 --- a/test_programs/execution_success/1327_concrete_in_generic/Prover.toml +++ b/test_programs/execution_success/1327_concrete_in_generic/Prover.toml @@ -1 +1,2 @@ -input = 1 \ No newline at end of file +input = 1 +return = 1 diff --git a/test_programs/execution_success/arithmetic_binary_operations/Prover.toml b/test_programs/execution_success/arithmetic_binary_operations/Prover.toml index 63382a9f640..0c51dd18bf3 100644 --- a/test_programs/execution_success/arithmetic_binary_operations/Prover.toml +++ b/test_programs/execution_success/arithmetic_binary_operations/Prover.toml @@ -1,3 +1,4 @@ x = "3" y = "4" z = "5" +return = 10 diff --git a/test_programs/execution_success/array_dynamic_main_output/Prover.toml b/test_programs/execution_success/array_dynamic_main_output/Prover.toml index 3f1d55b9b64..3fb91c2aca7 100644 --- a/test_programs/execution_success/array_dynamic_main_output/Prover.toml +++ b/test_programs/execution_success/array_dynamic_main_output/Prover.toml @@ -1,2 +1,3 @@ index = "5" x = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"] +return = [0, 1, 2, 3, 4, 0, 6, 7, 8, 9] diff --git a/test_programs/execution_success/array_oob_regression_7965/Prover.toml b/test_programs/execution_success/array_oob_regression_7965/Prover.toml index c48d58e2c47..eccb509f2c5 100644 --- a/test_programs/execution_success/array_oob_regression_7965/Prover.toml +++ b/test_programs/execution_success/array_oob_regression_7965/Prover.toml @@ -1,2 +1,3 @@ a = 1 -b = [[0, 1, 0, "\\\t"], [0, 1, 1, "mp"], [0, 0, 0, "\t/"], [0, 0, 0, "ab"]] \ No newline at end of file +b = [[0, 1, 0, "\\\t"], [0, 1, 1, "mp"], [0, 0, 0, "\t/"], [0, 0, 0, "ab"]] +return = [] diff --git a/test_programs/execution_success/array_oob_regression_7975/Prover.toml b/test_programs/execution_success/array_oob_regression_7975/Prover.toml index 6313cea11de..ad7e5eb4ae6 100644 --- a/test_programs/execution_success/array_oob_regression_7975/Prover.toml +++ b/test_programs/execution_success/array_oob_regression_7975/Prover.toml @@ -1 +1,2 @@ -b = [[0]] \ No newline at end of file +b = [[0]] +return = [[0]] diff --git a/test_programs/execution_success/array_with_refs_return/Prover.toml b/test_programs/execution_success/array_with_refs_return/Prover.toml new file mode 100644 index 00000000000..14f50fb8072 --- /dev/null +++ b/test_programs/execution_success/array_with_refs_return/Prover.toml @@ -0,0 +1 @@ +return = [2, 3] diff --git a/test_programs/execution_success/as_witness/Prover.toml b/test_programs/execution_success/as_witness/Prover.toml index cd8a5b5e03c..0c0ad04c26a 100644 --- a/test_programs/execution_success/as_witness/Prover.toml +++ b/test_programs/execution_success/as_witness/Prover.toml @@ -1 +1,2 @@ -a = 42 \ No newline at end of file +a = 42 +return = 42 diff --git a/test_programs/execution_success/brillig_block_parameter_liveness/Prover.toml b/test_programs/execution_success/brillig_block_parameter_liveness/Prover.toml index 6b7fd9c6ab6..0be40c989ca 100644 --- a/test_programs/execution_success/brillig_block_parameter_liveness/Prover.toml +++ b/test_programs/execution_success/brillig_block_parameter_liveness/Prover.toml @@ -1 +1,2 @@ conditions = ["1", "0", "1", "0", "1"] +return = { middle_a = { inner_a = { a = 1, b = 0, c = 5, d = 0, e = 0, f = 9, g = 0, h = 0, i = 0, j = 0 }, inner_b = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_c = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_d = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_e = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 } }, middle_b = { inner_a = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_b = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_c = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_d = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_e = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 } }, middle_c = { inner_a = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_b = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_c = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_d = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_e = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 } }, middle_d = { inner_a = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_b = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_c = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_d = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_e = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 } }, middle_e = { inner_a = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_b = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_c = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_d = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_e = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 } }, middle_f = { inner_a = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_b = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_c = { a = 8, b = 0, c = 4, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_d = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_e = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 } }, middle_g = { inner_a = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_b = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_c = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_d = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_e = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 } }, middle_h = { inner_a = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_b = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_c = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_d = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 }, inner_e = { a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0 } } } diff --git a/test_programs/execution_success/brillig_cow_regression/Prover.toml b/test_programs/execution_success/brillig_cow_regression/Prover.toml index 44813823448..eacc9654ef8 100644 --- a/test_programs/execution_success/brillig_cow_regression/Prover.toml +++ b/test_programs/execution_success/brillig_cow_regression/Prover.toml @@ -1,3 +1,8 @@ +return = [ + "325726846830326257119180493722970801006", + "15429571951369340199663579799609180439", +] + [kernel_data] encrypted_logs_hash = [ "0x0000000000000000000000000000000000000000000000000000000000000000", diff --git a/test_programs/execution_success/brillig_entry_points_regression_8069/Prover.toml b/test_programs/execution_success/brillig_entry_points_regression_8069/Prover.toml index e69de29bb2d..fb780ddb237 100644 --- a/test_programs/execution_success/brillig_entry_points_regression_8069/Prover.toml +++ b/test_programs/execution_success/brillig_entry_points_regression_8069/Prover.toml @@ -0,0 +1 @@ +return = false diff --git a/test_programs/execution_success/brillig_loop_size_regression/Prover.toml b/test_programs/execution_success/brillig_loop_size_regression/Prover.toml index e69de29bb2d..b17490a2044 100644 --- a/test_programs/execution_success/brillig_loop_size_regression/Prover.toml +++ b/test_programs/execution_success/brillig_loop_size_regression/Prover.toml @@ -0,0 +1 @@ +return = 2 diff --git a/test_programs/execution_success/brillig_uninitialized_arrays/Prover.toml b/test_programs/execution_success/brillig_uninitialized_arrays/Prover.toml index b6626a67e19..66152bb15bb 100644 --- a/test_programs/execution_success/brillig_uninitialized_arrays/Prover.toml +++ b/test_programs/execution_success/brillig_uninitialized_arrays/Prover.toml @@ -1,2 +1,3 @@ x = 1 y = 0 +return = 1 diff --git a/test_programs/execution_success/comptime_return_minus_one_as_i32/Prover.toml b/test_programs/execution_success/comptime_return_minus_one_as_i32/Prover.toml new file mode 100644 index 00000000000..40c3085e14c --- /dev/null +++ b/test_programs/execution_success/comptime_return_minus_one_as_i32/Prover.toml @@ -0,0 +1 @@ +return = -1 diff --git a/test_programs/execution_success/conditional_regression_547/Prover.toml b/test_programs/execution_success/conditional_regression_547/Prover.toml index 3d2b4b14efe..7f83b3853c7 100644 --- a/test_programs/execution_success/conditional_regression_547/Prover.toml +++ b/test_programs/execution_success/conditional_regression_547/Prover.toml @@ -1 +1,2 @@ -x = 1 \ No newline at end of file +x = 1 +return = 1 diff --git a/test_programs/execution_success/databus/Prover.toml b/test_programs/execution_success/databus/Prover.toml index 2d034508dd8..4862908356f 100644 --- a/test_programs/execution_success/databus/Prover.toml +++ b/test_programs/execution_success/databus/Prover.toml @@ -1,3 +1,4 @@ x = "3" y = "4" -z = [1,2,3,4] +z = [1, 2, 3, 4] +return = 9 diff --git a/test_programs/execution_success/databus_composite_calldata/Prover.toml b/test_programs/execution_success/databus_composite_calldata/Prover.toml index ab154c13372..0311182b950 100644 --- a/test_programs/execution_success/databus_composite_calldata/Prover.toml +++ b/test_programs/execution_success/databus_composite_calldata/Prover.toml @@ -1,6 +1,7 @@ zero = "0" one = "1" values = [[["12", "33"], ["37", "11"]],[["14", "37"], ["30", "10"]],[["10", "30"], ["30", "10"]]] +return = 2 [[foos]] x = 1 diff --git a/test_programs/execution_success/databus_two_calldata/Prover.toml b/test_programs/execution_success/databus_two_calldata/Prover.toml index 1229857d3f5..4c4708db66b 100644 --- a/test_programs/execution_success/databus_two_calldata/Prover.toml +++ b/test_programs/execution_success/databus_two_calldata/Prover.toml @@ -1,3 +1,4 @@ x = [0,1,2,3] y = [0,2,4] z = [1,3,5,7] +return = [1,5,9,7] \ No newline at end of file diff --git a/test_programs/execution_success/databus_two_calldata_simple/Prover.toml b/test_programs/execution_success/databus_two_calldata_simple/Prover.toml index 58257d1fe14..0f6d107436d 100644 --- a/test_programs/execution_success/databus_two_calldata_simple/Prover.toml +++ b/test_programs/execution_success/databus_two_calldata_simple/Prover.toml @@ -1,3 +1,4 @@ idx = "1" y = [7, 9] z = [1,2,3,4] +return = 11 diff --git a/test_programs/execution_success/double_neg_cond_bool_input/Prover.toml b/test_programs/execution_success/double_neg_cond_bool_input/Prover.toml index 1337a530cbc..a1d0f91003d 100644 --- a/test_programs/execution_success/double_neg_cond_bool_input/Prover.toml +++ b/test_programs/execution_success/double_neg_cond_bool_input/Prover.toml @@ -1 +1,2 @@ a = 1 +return = 1 diff --git a/test_programs/execution_success/fold_call_witness_condition/Prover.toml b/test_programs/execution_success/fold_call_witness_condition/Prover.toml index a4d6339b661..ce0937825b1 100644 --- a/test_programs/execution_success/fold_call_witness_condition/Prover.toml +++ b/test_programs/execution_success/fold_call_witness_condition/Prover.toml @@ -1,3 +1,4 @@ x = "10" y = "10" enable = false +return = [0, 0] diff --git a/test_programs/execution_success/fold_numeric_generic_poseidon/Prover.toml b/test_programs/execution_success/fold_numeric_generic_poseidon/Prover.toml index 00e821cf89d..592df360d14 100644 --- a/test_programs/execution_success/fold_numeric_generic_poseidon/Prover.toml +++ b/test_programs/execution_success/fold_numeric_generic_poseidon/Prover.toml @@ -1,2 +1,3 @@ enable = [true, false] to_hash = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]] +return = ["0x0f319258a1a8e85324d818a86f6b9e843601bf5fc0c16a5f6373ad1079d61bf4", "0x00", "0x252875d79a57f3835f452548af60c7beee6ac01a1c36bb6aec7ce6d069011acc"] \ No newline at end of file diff --git a/test_programs/execution_success/global_array_rc_regression_8259/Prover.toml b/test_programs/execution_success/global_array_rc_regression_8259/Prover.toml index f790ee45c90..77fe9830b20 100644 --- a/test_programs/execution_success/global_array_rc_regression_8259/Prover.toml +++ b/test_programs/execution_success/global_array_rc_regression_8259/Prover.toml @@ -1 +1,2 @@ a = true +return = [true, false, true] diff --git a/test_programs/execution_success/hash_to_field/Prover.toml b/test_programs/execution_success/hash_to_field/Prover.toml index f6597d3f78a..079763a108e 100644 --- a/test_programs/execution_success/hash_to_field/Prover.toml +++ b/test_programs/execution_success/hash_to_field/Prover.toml @@ -1 +1,2 @@ input = "1" +return = "0x25cebc29ded2fa515a937e2b5f674e3026c012e5b57f8a48d7dce6b7d274f9d9" diff --git a/test_programs/execution_success/higher_order_functions/Prover.toml b/test_programs/execution_success/higher_order_functions/Prover.toml index b373bb827c4..7ec8e5b5fc5 100644 --- a/test_programs/execution_success/higher_order_functions/Prover.toml +++ b/test_programs/execution_success/higher_order_functions/Prover.toml @@ -1 +1,2 @@ -w = 1 \ No newline at end of file +w = 1 +return = 6 diff --git a/test_programs/execution_success/inline_decompose_hint_brillig_call/Prover.toml b/test_programs/execution_success/inline_decompose_hint_brillig_call/Prover.toml new file mode 100644 index 00000000000..06eebb645ab --- /dev/null +++ b/test_programs/execution_success/inline_decompose_hint_brillig_call/Prover.toml @@ -0,0 +1 @@ +return = "0x24e4646f58b9fbe7d38e317db8d5636c423fbbdfbe119fc190fe9c64747e0c62" diff --git a/test_programs/execution_success/integer_array_indexing/Prover.toml b/test_programs/execution_success/integer_array_indexing/Prover.toml index 1496028f60a..b1665895b7d 100644 --- a/test_programs/execution_success/integer_array_indexing/Prover.toml +++ b/test_programs/execution_success/integer_array_indexing/Prover.toml @@ -1,2 +1,3 @@ arr = [1, 2, 3] x = 2 +return = 8 diff --git a/test_programs/execution_success/lambda_taking_lambda_regression_8543/Prover.toml b/test_programs/execution_success/lambda_taking_lambda_regression_8543/Prover.toml new file mode 100644 index 00000000000..7203617ffc4 --- /dev/null +++ b/test_programs/execution_success/lambda_taking_lambda_regression_8543/Prover.toml @@ -0,0 +1 @@ +return = 0 diff --git a/test_programs/execution_success/lambda_taking_lambda_with_variant/Prover.toml b/test_programs/execution_success/lambda_taking_lambda_with_variant/Prover.toml new file mode 100644 index 00000000000..7203617ffc4 --- /dev/null +++ b/test_programs/execution_success/lambda_taking_lambda_with_variant/Prover.toml @@ -0,0 +1 @@ +return = 0 diff --git a/test_programs/execution_success/main_return/Prover.toml b/test_programs/execution_success/main_return/Prover.toml index 63e9878811a..c0653b8afac 100644 --- a/test_programs/execution_success/main_return/Prover.toml +++ b/test_programs/execution_success/main_return/Prover.toml @@ -1 +1,2 @@ x = "8" +return = 8 diff --git a/test_programs/execution_success/multi_scalar_mul/Prover.toml b/test_programs/execution_success/multi_scalar_mul/Prover.toml index 3c8375e22c5..c2aa6588e09 100644 --- a/test_programs/execution_success/multi_scalar_mul/Prover.toml +++ b/test_programs/execution_success/multi_scalar_mul/Prover.toml @@ -5,6 +5,7 @@ scalars = [ "0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000", "0x1b", ] +return = { x = "0x1c8a6176be7ad60ed7cfa3165b21f7236f8248be3d0481bcccc0e96e32ec00ea", y = "0x1f96197d2991f3c6f2a249d2e5811178ddce4950f21e3d01f2d7d83611e7e784", is_infinite = false } [[points]] is_infinite = "0" diff --git a/test_programs/execution_success/no_predicates_numeric_generic_poseidon/Prover.toml b/test_programs/execution_success/no_predicates_numeric_generic_poseidon/Prover.toml index 00e821cf89d..f2fc7efe9b1 100644 --- a/test_programs/execution_success/no_predicates_numeric_generic_poseidon/Prover.toml +++ b/test_programs/execution_success/no_predicates_numeric_generic_poseidon/Prover.toml @@ -1,2 +1,7 @@ enable = [true, false] to_hash = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]] +return = [ + "0x0f319258a1a8e85324d818a86f6b9e843601bf5fc0c16a5f6373ad1079d61bf4", + "0x00", + "0x252875d79a57f3835f452548af60c7beee6ac01a1c36bb6aec7ce6d069011acc", +] diff --git a/test_programs/execution_success/overlapping_dep_and_mod/bin/Prover.toml b/test_programs/execution_success/overlapping_dep_and_mod/bin/Prover.toml index e69de29bb2d..555a3ac5a4e 100644 --- a/test_programs/execution_success/overlapping_dep_and_mod/bin/Prover.toml +++ b/test_programs/execution_success/overlapping_dep_and_mod/bin/Prover.toml @@ -0,0 +1 @@ +return = 11 diff --git a/test_programs/execution_success/ram_blowup_regression/Prover.toml b/test_programs/execution_success/ram_blowup_regression/Prover.toml index 35842ce2431..1977fb6bf84 100644 --- a/test_programs/execution_success/ram_blowup_regression/Prover.toml +++ b/test_programs/execution_success/ram_blowup_regression/Prover.toml @@ -1 +1,2 @@ -tx_effects_hash_input = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] \ No newline at end of file +tx_effects_hash_input = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] +return = "0xdb0b87402b48f922326751cce8c963a7f32f92928409dce7790ad72e65eee4" \ No newline at end of file diff --git a/test_programs/execution_success/regression_11294/Prover.toml b/test_programs/execution_success/regression_11294/Prover.toml index c0bc12aeed9..2a9daf1b715 100644 --- a/test_programs/execution_success/regression_11294/Prover.toml +++ b/test_programs/execution_success/regression_11294/Prover.toml @@ -1,3 +1,14 @@ +return = { end = { private_call_stack = [ + { args_hash = 0x00, returns_hash = 0x00, start_side_effect_counter = 0, end_side_effect_counter = 0 }, + { args_hash = 0x00, returns_hash = 0x00, start_side_effect_counter = 0, end_side_effect_counter = 0 }, + { args_hash = 0x00, returns_hash = 0x00, start_side_effect_counter = 0, end_side_effect_counter = 0 }, + { args_hash = 0x00, returns_hash = 0x00, start_side_effect_counter = 0, end_side_effect_counter = 0 }, + { args_hash = 0x00, returns_hash = 0x00, start_side_effect_counter = 0, end_side_effect_counter = 0 }, + { args_hash = 0x00, returns_hash = 0x00, start_side_effect_counter = 0, end_side_effect_counter = 0 }, + { args_hash = 0x00, returns_hash = 0x00, start_side_effect_counter = 0, end_side_effect_counter = 0 }, + { args_hash = 0x00, returns_hash = 0x00, start_side_effect_counter = 0, end_side_effect_counter = 0 }, +] } } + [[previous_kernel_public_inputs.end.private_call_stack]] args_hash = "0x0c78b411fc893c51d446c08daa5741b9ba6103126c9e450bed90fcde8793168a" returns_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" diff --git a/test_programs/execution_success/regression_3889/Prover.toml b/test_programs/execution_success/regression_3889/Prover.toml index a81ab67fe3e..2886e69abef 100644 --- a/test_programs/execution_success/regression_3889/Prover.toml +++ b/test_programs/execution_success/regression_3889/Prover.toml @@ -1,3 +1,5 @@ +return = 18 + [works] a = "5" @@ -7,4 +9,3 @@ a = "6" [also_fails] a = "7" - diff --git a/test_programs/execution_success/regression_5252/Prover.toml b/test_programs/execution_success/regression_5252/Prover.toml index 82776b4463d..9234fabd2eb 100644 --- a/test_programs/execution_success/regression_5252/Prover.toml +++ b/test_programs/execution_success/regression_5252/Prover.toml @@ -4,3 +4,4 @@ to_hash = [[1,5,9,2,24,563,3545,5,52,4244,43,2,7373567,2,286762,7,2457,24,2456,2 #[465656,234324,4353,5245246,2567345674567,5634563456,7676474,4747,4567456746,56,4657456,4657,4567,46,7,8,98,87,76,57] ] enable = [1,1,0] +return = ["0x2123044e00a868c5828caa3e81bf44ce1131856159853283118b979cd9ef0357", "0x25e65fbbdb68f3be5112b437f6179523e4817ba6c875817d19ee6b4d654d0823", "0x00"] diff --git a/test_programs/execution_success/regression_6834/Prover.toml b/test_programs/execution_success/regression_6834/Prover.toml index 9ef840487ad..219236e9e51 100644 --- a/test_programs/execution_success/regression_6834/Prover.toml +++ b/test_programs/execution_success/regression_6834/Prover.toml @@ -1,2 +1,3 @@ year = 1 min_age = 1 +return = 0 diff --git a/test_programs/execution_success/regression_7128/Prover.toml b/test_programs/execution_success/regression_7128/Prover.toml index dd9b68d125e..e5ad9204c60 100644 --- a/test_programs/execution_success/regression_7128/Prover.toml +++ b/test_programs/execution_success/regression_7128/Prover.toml @@ -1 +1,2 @@ in0 = "1" +return = 0 diff --git a/test_programs/execution_success/regression_7744/Prover.toml b/test_programs/execution_success/regression_7744/Prover.toml index 9556fe97d96..58e97931a9f 100644 --- a/test_programs/execution_success/regression_7744/Prover.toml +++ b/test_programs/execution_success/regression_7744/Prover.toml @@ -1 +1,2 @@ -is_active=false +is_active = false +return = { x = "0x00", y = "0x05", is_infinite = false } diff --git a/test_programs/execution_success/regression_7962/Prover.toml b/test_programs/execution_success/regression_7962/Prover.toml index b8aadd22dd0..71644003a09 100644 --- a/test_programs/execution_success/regression_7962/Prover.toml +++ b/test_programs/execution_success/regression_7962/Prover.toml @@ -1 +1,2 @@ -"v0" = "18446744073709551615" \ No newline at end of file +"v0" = "18446744073709551615" +return = 0 diff --git a/test_programs/execution_success/regression_8235/Prover.toml b/test_programs/execution_success/regression_8235/Prover.toml index 6e0687d7890..0569255bac5 100644 --- a/test_programs/execution_success/regression_8235/Prover.toml +++ b/test_programs/execution_success/regression_8235/Prover.toml @@ -1 +1,2 @@ -a = false \ No newline at end of file +a = false +return = 0 diff --git a/test_programs/execution_success/regression_8236/Prover.toml b/test_programs/execution_success/regression_8236/Prover.toml index 10b4fae7e60..2d17f5ab64e 100644 --- a/test_programs/execution_success/regression_8236/Prover.toml +++ b/test_programs/execution_success/regression_8236/Prover.toml @@ -3,4 +3,5 @@ a = [ "0x000000000000000000000000000000000000000000000000000000000000472d", "0x00000000000000000000000000000000000000000000000000000000000046ce", ] -b = [false] \ No newline at end of file +b = [false] +return = 0 \ No newline at end of file diff --git a/test_programs/execution_success/regression_8261/Prover.toml b/test_programs/execution_success/regression_8261/Prover.toml index 7dfd714ede2..8d5d473f469 100644 --- a/test_programs/execution_success/regression_8261/Prover.toml +++ b/test_programs/execution_success/regression_8261/Prover.toml @@ -25,4 +25,5 @@ c = [ "0x000000000000000000000000000000000000000000000000000000000000c456", "\u001B\"", ], -] \ No newline at end of file +] +return = 692 \ No newline at end of file diff --git a/test_programs/execution_success/regression_8329/Prover.toml b/test_programs/execution_success/regression_8329/Prover.toml index e170293cb2e..e120d4bbd73 100644 --- a/test_programs/execution_success/regression_8329/Prover.toml +++ b/test_programs/execution_success/regression_8329/Prover.toml @@ -1,3 +1,4 @@ x = 1 y = 1 -z = 1 \ No newline at end of file +z = 1 +return = 1 diff --git a/test_programs/execution_success/regression_8519/Prover.toml b/test_programs/execution_success/regression_8519/Prover.toml index 445039bd7af..d6adfa0c484 100644 --- a/test_programs/execution_success/regression_8519/Prover.toml +++ b/test_programs/execution_success/regression_8519/Prover.toml @@ -1 +1,2 @@ -a = "0x000000000000000000000000000000000000000000000000131640459367fd34" \ No newline at end of file +a = "0x000000000000000000000000000000000000000000000000131640459367fd34" +return = "53438638232309528388129535304893203149" diff --git a/test_programs/execution_success/regression_8558/Prover.toml b/test_programs/execution_success/regression_8558/Prover.toml index 9841f2bb9a3..fef54d4ee78 100644 --- a/test_programs/execution_success/regression_8558/Prover.toml +++ b/test_programs/execution_success/regression_8558/Prover.toml @@ -1,2 +1,3 @@ v1 = 0 -v2 = false \ No newline at end of file +v2 = false +return = 0 diff --git a/test_programs/execution_success/regression_8726/Prover.toml b/test_programs/execution_success/regression_8726/Prover.toml index 97a71703dae..659c47000a9 100644 --- a/test_programs/execution_success/regression_8726/Prover.toml +++ b/test_programs/execution_success/regression_8726/Prover.toml @@ -1 +1,2 @@ -x = "-9223372036854775808" # MIN I64 \ No newline at end of file +x = "-9223372036854775808" # MIN I64 +return = "-9223372036854775808" diff --git a/test_programs/execution_success/regression_8755/Prover.toml b/test_programs/execution_success/regression_8755/Prover.toml new file mode 100644 index 00000000000..81ffb25d9cf --- /dev/null +++ b/test_programs/execution_success/regression_8755/Prover.toml @@ -0,0 +1 @@ +return = "0x0a7b42b36ae0ac4cefcf78a9e9b00e67a6a402a68ab81bdc904f41fac753cc81" diff --git a/test_programs/execution_success/regression_8761/Prover.toml b/test_programs/execution_success/regression_8761/Prover.toml new file mode 100644 index 00000000000..66ca132f8d6 --- /dev/null +++ b/test_programs/execution_success/regression_8761/Prover.toml @@ -0,0 +1 @@ +return = 1 diff --git a/test_programs/execution_success/regression_struct_array_conditional/Prover.toml b/test_programs/execution_success/regression_struct_array_conditional/Prover.toml index ef97f9d482a..c24272b762c 100644 --- a/test_programs/execution_success/regression_struct_array_conditional/Prover.toml +++ b/test_programs/execution_success/regression_struct_array_conditional/Prover.toml @@ -1,8 +1,9 @@ y = 1 z = 1 +return = 10 [[x]] -value = "0x23de33be058ce5504e1ade738db8bdacfe268fa9dbde777092bf1d38519bdf59" +value = "0x23de33be058ce5504e1ade738db8bdacfe268fa9dbde777092bf1d38519bdf59" counter = "10" dummy = "0" @@ -15,4 +16,3 @@ dummy = "0" value = "2" counter = "0" dummy = "0" - diff --git a/test_programs/execution_success/signed_inactive_division_by_zero/Prover.toml b/test_programs/execution_success/signed_inactive_division_by_zero/Prover.toml index d2ca117fc8c..d119019cfbe 100644 --- a/test_programs/execution_success/signed_inactive_division_by_zero/Prover.toml +++ b/test_programs/execution_success/signed_inactive_division_by_zero/Prover.toml @@ -1,3 +1,4 @@ a = "1" b = "0" -condition = false \ No newline at end of file +condition = false +return = 0 diff --git a/test_programs/execution_success/signed_overflow_in_else_regression_8617/Prover.toml b/test_programs/execution_success/signed_overflow_in_else_regression_8617/Prover.toml index 89c7bfcb188..fa13a02dd96 100644 --- a/test_programs/execution_success/signed_overflow_in_else_regression_8617/Prover.toml +++ b/test_programs/execution_success/signed_overflow_in_else_regression_8617/Prover.toml @@ -1,2 +1,3 @@ a = "-0x000000000000000000000000000000000000000000000000000000002df86759" -c = true \ No newline at end of file +c = true +return = -771254105 diff --git a/test_programs/execution_success/simple_add_and_ret_arr/Prover.toml b/test_programs/execution_success/simple_add_and_ret_arr/Prover.toml index 3d2b4b14efe..9dc1edcb1c4 100644 --- a/test_programs/execution_success/simple_add_and_ret_arr/Prover.toml +++ b/test_programs/execution_success/simple_add_and_ret_arr/Prover.toml @@ -1 +1,2 @@ -x = 1 \ No newline at end of file +x = 1 +return = [2] diff --git a/test_programs/execution_success/simple_array_param/Prover.toml b/test_programs/execution_success/simple_array_param/Prover.toml index 66f0b9ccc1c..ca4c6cca367 100644 --- a/test_programs/execution_success/simple_array_param/Prover.toml +++ b/test_programs/execution_success/simple_array_param/Prover.toml @@ -1 +1,2 @@ xs = [0, 1] +return = 1 diff --git a/test_programs/execution_success/simple_bitwise/Prover.toml b/test_programs/execution_success/simple_bitwise/Prover.toml index aa3715f9b3d..a1fd7d28ea3 100644 --- a/test_programs/execution_success/simple_bitwise/Prover.toml +++ b/test_programs/execution_success/simple_bitwise/Prover.toml @@ -2,3 +2,4 @@ a = 1 b = 0 c = "10" d = "11" +return = 24 diff --git a/test_programs/execution_success/simple_mut/Prover.toml b/test_programs/execution_success/simple_mut/Prover.toml index 7d4290a117a..d81173f58e0 100644 --- a/test_programs/execution_success/simple_mut/Prover.toml +++ b/test_programs/execution_success/simple_mut/Prover.toml @@ -1 +1,2 @@ x = 1 +return = 3 diff --git a/test_programs/execution_success/simple_not/Prover.toml b/test_programs/execution_success/simple_not/Prover.toml index b3accc9dd32..696dc165be0 100644 --- a/test_programs/execution_success/simple_not/Prover.toml +++ b/test_programs/execution_success/simple_not/Prover.toml @@ -1 +1,2 @@ -x = false \ No newline at end of file +x = false +return = 1 diff --git a/test_programs/execution_success/simple_program_addition/Prover.toml b/test_programs/execution_success/simple_program_addition/Prover.toml index 07890234a19..863120ffe20 100644 --- a/test_programs/execution_success/simple_program_addition/Prover.toml +++ b/test_programs/execution_success/simple_program_addition/Prover.toml @@ -1 +1,2 @@ x = "3" +return = 4 diff --git a/test_programs/execution_success/simple_shield/Prover.toml b/test_programs/execution_success/simple_shield/Prover.toml index 7878e4b8281..ed54c94dc80 100644 --- a/test_programs/execution_success/simple_shield/Prover.toml +++ b/test_programs/execution_success/simple_shield/Prover.toml @@ -9,3 +9,7 @@ note_hash_path = [ ] to_pubkey_x = "0x0000000000000000000000000000000000000000000000000000000000000001" to_pubkey_y = "0x0000000000000002cf135e7506a45d632d270d45f1181294833fc48d823f272c" +return = [ + "0x2b3e2281b493baa4497aa5fe5abf9f340f43bd9c4a65dcb1cda20dc210058870", + "0x1e2d117a1b344bd3ff0cf1d5f860f02cd8b27f6b8ccd2e844852f2c93d36f4aa", +] diff --git a/test_programs/execution_success/struct_array_inputs/Prover.toml b/test_programs/execution_success/struct_array_inputs/Prover.toml index c2212c1a9c9..eb2f41c05ed 100644 --- a/test_programs/execution_success/struct_array_inputs/Prover.toml +++ b/test_programs/execution_success/struct_array_inputs/Prover.toml @@ -1,3 +1,5 @@ +return = 3 + [[foos]] bar = 0 baz = 0 diff --git a/test_programs/execution_success/struct_inputs/Prover.toml b/test_programs/execution_success/struct_inputs/Prover.toml index 339da5b1a00..1dc4857ad2b 100644 --- a/test_programs/execution_success/struct_inputs/Prover.toml +++ b/test_programs/execution_success/struct_inputs/Prover.toml @@ -1,4 +1,5 @@ x = "5" +return = 1 [y] foo = "5" diff --git a/test_programs/execution_success/to_be_bytes/Prover.toml b/test_programs/execution_success/to_be_bytes/Prover.toml index 07fe857ac7c..283314bafc0 100644 --- a/test_programs/execution_success/to_be_bytes/Prover.toml +++ b/test_programs/execution_success/to_be_bytes/Prover.toml @@ -1 +1,2 @@ x = "2040124" +return = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 33, 60] \ No newline at end of file diff --git a/test_programs/execution_success/to_le_bytes/Prover.toml b/test_programs/execution_success/to_le_bytes/Prover.toml index bf58776d557..a8a8b04e874 100644 --- a/test_programs/execution_success/to_le_bytes/Prover.toml +++ b/test_programs/execution_success/to_le_bytes/Prover.toml @@ -1,2 +1,3 @@ x = "2040124" -cond = false \ No newline at end of file +cond = false +return = [60, 33, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] \ No newline at end of file diff --git a/test_programs/execution_success/tuple_inputs/Prover.toml b/test_programs/execution_success/tuple_inputs/Prover.toml index 43d62a7a15b..8c40da5ba94 100644 --- a/test_programs/execution_success/tuple_inputs/Prover.toml +++ b/test_programs/execution_success/tuple_inputs/Prover.toml @@ -1,5 +1,6 @@ pair = [1, 0] x = [[0, 1, 2], [3, 4, 5]] +return = [2, 1] [[struct_pair]] a = "1" @@ -9,4 +10,4 @@ b = ["2", "3", "20"] inner = ["100", "101", "102"] [[struct_pair]] -inner = ["103", "104", "105"] +inner = ["103", "104", "105"] diff --git a/test_programs/execution_success/unrolling_regression_8333/Prover.toml b/test_programs/execution_success/unrolling_regression_8333/Prover.toml new file mode 100644 index 00000000000..085c362c25e --- /dev/null +++ b/test_programs/execution_success/unrolling_regression_8333/Prover.toml @@ -0,0 +1 @@ +return = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]] \ No newline at end of file diff --git a/test_programs/execution_success/unrolling_regression_8333/stdout.txt b/test_programs/execution_success/unrolling_regression_8333/stdout.txt deleted file mode 100644 index f4f62ce2749..00000000000 --- a/test_programs/execution_success/unrolling_regression_8333/stdout.txt +++ /dev/null @@ -1 +0,0 @@ -[unrolling_regression_8333] Circuit output: Vec([Vec([Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0)]), Vec([Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0), Field(0)])]) \ No newline at end of file diff --git a/test_programs/execution_success/while_loop_break_regression_8521/Prover.toml b/test_programs/execution_success/while_loop_break_regression_8521/Prover.toml index 3aea0c58ce5..43f7acf7315 100644 --- a/test_programs/execution_success/while_loop_break_regression_8521/Prover.toml +++ b/test_programs/execution_success/while_loop_break_regression_8521/Prover.toml @@ -1 +1,2 @@ x = 0 +return = "SQF" diff --git a/test_programs/execution_success/wildcard_type/Prover.toml b/test_programs/execution_success/wildcard_type/Prover.toml index c7c8371dfa4..869b8eef257 100644 --- a/test_programs/execution_success/wildcard_type/Prover.toml +++ b/test_programs/execution_success/wildcard_type/Prover.toml @@ -1 +1,2 @@ -enable = [4,7] +enable = [4, 7] +return = [7, 14, 10, 6] diff --git a/test_programs/execution_success/witness_compression/Prover.toml b/test_programs/execution_success/witness_compression/Prover.toml index 8c12ebba6cf..fde4fc8209f 100644 --- a/test_programs/execution_success/witness_compression/Prover.toml +++ b/test_programs/execution_success/witness_compression/Prover.toml @@ -1,2 +1,3 @@ x = "1" y = "2" +return = 3 diff --git a/tooling/nargo_cli/tests/execute.rs b/tooling/nargo_cli/tests/execute.rs index 054812591f0..922fcb49433 100644 --- a/tooling/nargo_cli/tests/execute.rs +++ b/tooling/nargo_cli/tests/execute.rs @@ -144,9 +144,13 @@ mod tests { nargo.assert().success(); + let mut has_circuit_output = false; + if check_stdout { let output = nargo.output().unwrap(); let stdout = String::from_utf8(output.stdout).unwrap(); + has_circuit_output = stdout.contains("Circuit output:"); + let stdout = remove_noise_lines(stdout); let test_name = test_program_dir.file_name().unwrap().to_string_lossy().to_string(); @@ -160,6 +164,24 @@ mod tests { }) } + if has_circuit_output { + let prover_toml_path = find_prover_toml_in_dir(&test_program_dir).expect( + "Expected a Prover.toml file to exist because the program produced an output", + ); + let prover_toml_contents = + fs::read_to_string(prover_toml_path).expect("Failed to read Prover.toml"); + let prover_toml: toml::Value = + toml::from_str(&prover_toml_contents).expect("Failed to parse Prover.toml"); + let toml::Value::Table(table) = prover_toml else { + panic!("Expected Prover.toml to be a table"); + }; + if !table.contains_key("return") { + panic!( + "Expected Prover.toml to contain a `return` key because the program produced an output" + ); + } + } + check_program_artifact( "execution_success", &test_program_dir, @@ -541,6 +563,34 @@ mod tests { None } + fn find_prover_toml_in_dir(dir: &PathBuf) -> Option { + if !dir.exists() { + return None; + } + + for entry in fs::read_dir(dir).unwrap() { + let Ok(entry) = entry else { + continue; + }; + + let path = entry.path(); + + if entry.file_type().is_ok_and(|file_type| file_type.is_dir()) { + if let Some(prover_toml) = find_prover_toml_in_dir(&path) { + return Some(prover_toml); + } + } + + if path.file_name().is_none_or(|name| name != "Prover.toml") { + continue; + }; + + return Some(path); + } + + None + } + fn copy_dir_all(src: impl AsRef, dst: impl AsRef) -> std::io::Result<()> { { fs::create_dir_all(&dst)?;