diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp index a96a5531a0e1..2ba4723b2ec3 100644 --- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp +++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp @@ -630,7 +630,7 @@ struct BrilligOpcode { struct Const { Program::MemoryAddress destination; Program::BitSize bit_size; - std::string value; + std::vector value; friend bool operator==(const Const&, const Const&); std::vector bincodeSerialize() const; @@ -640,7 +640,7 @@ struct BrilligOpcode { struct IndirectConst { Program::MemoryAddress destination_pointer; Program::BitSize bit_size; - std::string value; + std::vector value; friend bool operator==(const IndirectConst&, const IndirectConst&); std::vector bincodeSerialize() const; @@ -766,7 +766,7 @@ struct Witness { struct ConstantOrWitnessEnum { struct Constant { - std::string value; + std::vector value; friend bool operator==(const Constant&, const Constant&); std::vector bincodeSerialize() const; @@ -1078,9 +1078,9 @@ struct BlockType { }; struct Expression { - std::vector> mul_terms; - std::vector> linear_combinations; - std::string q_c; + std::vector, Program::Witness, Program::Witness>> mul_terms; + std::vector, Program::Witness>> linear_combinations; + std::vector q_c; friend bool operator==(const Expression&, const Expression&); std::vector bincodeSerialize() const; diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_stack.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_stack.hpp index 67ef655babfd..69739dbd3294 100644 --- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_stack.hpp +++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_stack.hpp @@ -17,7 +17,7 @@ struct Witness { }; struct WitnessMap { - std::map value; + std::map> value; friend bool operator==(const WitnessMap&, const WitnessMap&); std::vector bincodeSerialize() const; diff --git a/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp b/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp index 8fa471e57bac..c194d11961f7 100644 --- a/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp +++ b/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp @@ -612,7 +612,7 @@ namespace Program { struct Const { Program::MemoryAddress destination; Program::BitSize bit_size; - std::string value; + std::vector value; friend bool operator==(const Const&, const Const&); std::vector bincodeSerialize() const; @@ -622,7 +622,7 @@ namespace Program { struct IndirectConst { Program::MemoryAddress destination_pointer; Program::BitSize bit_size; - std::string value; + std::vector value; friend bool operator==(const IndirectConst&, const IndirectConst&); std::vector bincodeSerialize() const; @@ -728,7 +728,7 @@ namespace Program { struct ConstantOrWitnessEnum { struct Constant { - std::string value; + std::vector value; friend bool operator==(const Constant&, const Constant&); std::vector bincodeSerialize() const; @@ -1019,9 +1019,9 @@ namespace Program { }; struct Expression { - std::vector> mul_terms; - std::vector> linear_combinations; - std::string q_c; + std::vector, Program::Witness, Program::Witness>> mul_terms; + std::vector, Program::Witness>> linear_combinations; + std::vector q_c; friend bool operator==(const Expression&, const Expression&); std::vector bincodeSerialize() const; diff --git a/noir/noir-repo/acvm-repo/acir/codegen/witness.cpp b/noir/noir-repo/acvm-repo/acir/codegen/witness.cpp index ad2b0550db2e..a1db3feefe2e 100644 --- a/noir/noir-repo/acvm-repo/acir/codegen/witness.cpp +++ b/noir/noir-repo/acvm-repo/acir/codegen/witness.cpp @@ -14,7 +14,7 @@ namespace WitnessStack { }; struct WitnessMap { - std::map value; + std::map> value; friend bool operator==(const WitnessMap&, const WitnessMap&); std::vector bincodeSerialize() const; diff --git a/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs b/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs index 9ab153b9f61b..adde3dfa19fd 100644 --- a/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs +++ b/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs @@ -46,12 +46,12 @@ fn addition_circuit() { let bytes = Program::serialize_program(&program); let expected_serialization: Vec = vec![ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 144, 65, 14, 128, 32, 12, 4, 65, 124, 80, 75, 91, - 104, 111, 126, 69, 34, 252, 255, 9, 106, 228, 64, 194, 81, 38, 105, 182, 167, 201, 102, - 189, 251, 216, 159, 243, 110, 38, 244, 60, 122, 194, 63, 208, 47, 116, 109, 131, 139, 32, - 49, 215, 28, 43, 18, 158, 16, 173, 168, 0, 75, 73, 138, 138, 162, 114, 69, 37, 170, 202, - 154, 173, 88, 6, 67, 166, 138, 77, 140, 90, 151, 133, 117, 189, 224, 117, 108, 221, 229, - 135, 223, 13, 27, 135, 121, 106, 119, 3, 58, 173, 124, 163, 140, 1, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 149, 143, 49, 14, 64, 64, 16, 69, 255, 44, 7, 81, 210, + 17, 71, 16, 137, 74, 148, 26, 157, 3, 136, 78, 185, 71, 16, 23, 112, 10, 225, 56, 219, 41, + 53, 122, 194, 110, 76, 162, 217, 125, 201, 100, 102, 146, 159, 153, 255, 9, 47, 254, 93, + 132, 63, 158, 238, 1, 172, 32, 114, 208, 10, 166, 141, 219, 178, 87, 201, 28, 173, 85, 190, + 72, 89, 55, 97, 186, 23, 195, 214, 141, 153, 58, 167, 67, 251, 176, 188, 251, 32, 204, 19, + 54, 155, 29, 248, 114, 113, 46, 164, 199, 252, 137, 12, 1, 0, 0, ]; assert_eq!(bytes, expected_serialization) @@ -214,12 +214,12 @@ fn simple_brillig_foreign_call() { let bytes = Program::serialize_program(&program); let expected_serialization: Vec = vec![ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 79, 73, 10, 128, 48, 12, 236, 40, 46, 5, 111, 126, - 36, 254, 192, 207, 120, 240, 226, 65, 196, 247, 91, 48, 129, 80, 186, 28, 154, 129, 144, - 201, 132, 44, 3, 247, 99, 14, 1, 230, 3, 103, 169, 53, 68, 219, 57, 83, 27, 54, 216, 237, - 34, 253, 111, 23, 19, 104, 177, 96, 76, 204, 251, 68, 191, 55, 52, 238, 163, 187, 198, 251, - 105, 114, 101, 200, 221, 37, 196, 200, 252, 188, 222, 227, 126, 80, 153, 200, 213, 57, 125, - 77, 244, 62, 112, 171, 6, 33, 119, 2, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 149, 78, 203, 10, 192, 32, 12, 107, 54, 246, 16, 118, + 219, 15, 236, 231, 118, 216, 101, 135, 49, 252, 126, 5, 91, 80, 241, 81, 3, 197, 52, 49, + 109, 65, 1, 187, 47, 48, 95, 248, 149, 62, 134, 104, 23, 169, 0, 232, 255, 38, 251, 166, + 156, 32, 22, 27, 97, 57, 222, 20, 252, 89, 127, 12, 76, 54, 119, 48, 79, 91, 199, 151, 185, + 135, 175, 149, 249, 243, 218, 251, 251, 209, 73, 212, 250, 154, 126, 22, 60, 7, 12, 47, 88, + 88, 247, 1, 0, 0, ]; assert_eq!(bytes, expected_serialization) @@ -344,17 +344,16 @@ fn complex_brillig_foreign_call() { let bytes = Program::serialize_program(&program); let expected_serialization: Vec = vec![ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 85, 93, 10, 194, 48, 12, 78, 219, 233, 54, 240, - 205, 11, 8, 122, 128, 76, 47, 176, 187, 136, 111, 138, 62, 122, 124, 45, 75, 88, 140, 197, - 9, 38, 224, 62, 24, 89, 75, 242, 229, 159, 6, 24, 208, 60, 191, 64, 255, 11, 146, 145, 100, - 190, 79, 240, 10, 214, 237, 73, 226, 111, 232, 130, 29, 23, 122, 197, 24, 103, 16, 99, 114, - 136, 17, 68, 255, 255, 176, 223, 150, 125, 49, 173, 95, 42, 236, 79, 5, 195, 126, 45, 233, - 92, 147, 108, 116, 161, 179, 81, 132, 247, 197, 147, 224, 225, 105, 149, 4, 229, 184, 183, - 73, 232, 208, 42, 191, 198, 252, 200, 197, 216, 192, 119, 249, 250, 228, 185, 71, 230, 79, - 46, 252, 216, 49, 127, 229, 212, 167, 90, 213, 75, 230, 34, 253, 174, 96, 28, 192, 227, - 245, 114, 59, 159, 238, 169, 96, 170, 205, 51, 182, 234, 188, 43, 148, 108, 138, 131, 33, - 223, 153, 79, 250, 161, 160, 63, 101, 179, 134, 113, 156, 248, 93, 123, 0, 142, 67, 44, - 107, 244, 6, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 181, 84, 209, 14, 194, 32, 12, 188, 210, 233, 182, 196, + 55, 127, 128, 68, 255, 204, 248, 166, 209, 71, 63, 95, 201, 218, 141, 85, 84, 74, 226, 37, + 164, 64, 238, 122, 165, 16, 8, 19, 134, 215, 32, 153, 111, 36, 6, 137, 105, 159, 177, 134, + 114, 35, 170, 64, 84, 207, 109, 246, 8, 248, 191, 7, 195, 239, 145, 192, 78, 31, 71, 191, + 60, 231, 118, 213, 175, 53, 231, 247, 223, 97, 122, 31, 91, 89, 247, 18, 135, 146, 40, 224, + 253, 225, 172, 170, 145, 56, 154, 8, 99, 28, 81, 87, 239, 104, 242, 58, 245, 243, 97, 62, + 241, 109, 189, 104, 243, 137, 170, 231, 54, 61, 169, 190, 107, 211, 115, 159, 233, 230, + 205, 108, 174, 121, 119, 88, 122, 114, 186, 93, 239, 151, 243, 131, 11, 82, 43, 79, 56, + 152, 245, 209, 240, 168, 34, 135, 34, 255, 135, 190, 241, 169, 192, 255, 165, 217, 99, 105, + 155, 254, 123, 79, 62, 165, 191, 19, 20, 5, 0, 0, ]; assert_eq!(bytes, expected_serialization) @@ -392,11 +391,10 @@ fn memory_op_circuit() { let bytes = Program::serialize_program(&program); let expected_serialization: Vec = vec![ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 82, 65, 10, 0, 32, 8, 211, 180, 255, 216, 15, 250, - 255, 171, 10, 82, 176, 58, 166, 135, 6, 178, 29, 100, 204, 33, 194, 66, 157, 67, 170, 89, - 185, 40, 163, 211, 182, 115, 162, 43, 203, 27, 90, 182, 47, 6, 251, 82, 156, 151, 100, 151, - 43, 191, 149, 203, 209, 183, 147, 11, 90, 96, 255, 102, 11, 207, 112, 99, 0, 192, 100, 38, - 199, 38, 3, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 165, 79, 201, 9, 0, 32, 12, 235, 229, 30, 238, 63, 165, + 130, 45, 84, 241, 209, 35, 80, 146, 71, 66, 26, 132, 131, 177, 143, 85, 139, 50, 41, 163, + 211, 230, 121, 49, 33, 4, 236, 230, 48, 153, 227, 184, 183, 61, 174, 154, 43, 143, 19, 72, + 254, 198, 174, 136, 224, 30, 108, 229, 242, 201, 45, 252, 105, 28, 217, 38, 2, 0, 0, ]; assert_eq!(bytes, expected_serialization) @@ -495,15 +493,15 @@ fn nested_acir_call_circuit() { let bytes = Program::serialize_program(&program); let expected_serialization: Vec = vec![ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 146, 81, 10, 195, 48, 8, 134, 77, 132, 158, 71, 99, - 210, 152, 183, 93, 101, 97, 233, 253, 143, 176, 142, 165, 44, 100, 133, 62, 52, 125, 232, - 7, 63, 138, 136, 232, 143, 8, 95, 176, 234, 195, 180, 202, 172, 178, 240, 195, 84, 193, 86, - 63, 106, 66, 232, 216, 26, 31, 53, 210, 57, 216, 54, 179, 132, 102, 239, 75, 116, 133, 133, - 159, 228, 82, 214, 64, 62, 228, 89, 89, 57, 104, 120, 57, 21, 41, 234, 53, 166, 156, 34, - 37, 246, 82, 120, 9, 73, 150, 58, 12, 199, 237, 69, 208, 152, 208, 230, 6, 254, 193, 206, - 192, 171, 188, 130, 129, 94, 217, 113, 123, 185, 169, 222, 106, 155, 187, 119, 159, 168, - 255, 178, 62, 199, 174, 102, 110, 102, 170, 129, 177, 15, 120, 228, 215, 30, 111, 39, 140, - 108, 64, 11, 4, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 181, 145, 61, 10, 131, 64, 16, 133, 231, 7, 60, 71, 202, + 164, 75, 200, 17, 66, 32, 85, 72, 153, 198, 206, 3, 136, 157, 165, 71, 16, 47, 224, 41, 68, + 143, 99, 103, 105, 99, 175, 226, 174, 174, 195, 194, 174, 133, 31, 60, 24, 134, 199, 236, + 188, 29, 134, 5, 86, 154, 9, 38, 225, 36, 130, 13, 84, 2, 221, 119, 153, 24, 4, 218, 120, + 1, 47, 144, 12, 239, 61, 250, 38, 237, 163, 188, 213, 191, 119, 149, 101, 255, 240, 250, + 236, 62, 105, 19, 231, 175, 118, 40, 122, 245, 152, 231, 220, 117, 81, 89, 163, 197, 199, + 176, 15, 168, 57, 154, 197, 244, 186, 178, 144, 255, 92, 10, 148, 159, 140, 189, 172, 71, + 144, 87, 146, 53, 139, 158, 237, 51, 206, 12, 141, 112, 236, 128, 174, 60, 54, 70, 126, + 172, 28, 127, 235, 2, 0, 0, ]; assert_eq!(bytes, expected_serialization); } diff --git a/noir/noir-repo/acvm-repo/acir_field/src/field_element.rs b/noir/noir-repo/acvm-repo/acir_field/src/field_element.rs index 47ceb9031116..72e7ad33fc92 100644 --- a/noir/noir-repo/acvm-repo/acir_field/src/field_element.rs +++ b/noir/noir-repo/acvm-repo/acir_field/src/field_element.rs @@ -80,7 +80,7 @@ impl Serialize for FieldElement { where S: serde::Serializer, { - self.to_hex().serialize(serializer) + self.to_be_bytes().serialize(serializer) } } @@ -89,11 +89,8 @@ impl<'de, T: PrimeField> Deserialize<'de> for FieldElement { where D: serde::Deserializer<'de>, { - let s: Cow<'de, str> = Deserialize::deserialize(deserializer)?; - match Self::from_hex(&s) { - Some(value) => Ok(value), - None => Err(serde::de::Error::custom(format!("Invalid hex for FieldElement: {s}",))), - } + let s: Cow<'de, [u8]> = Deserialize::deserialize(deserializer)?; + Ok(Self::from_be_bytes_reduce(&s)) } } diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/addition.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/addition.ts index 2b8124e77d7e..10876c33dde7 100644 --- a/noir/noir-repo/acvm-repo/acvm_js/test/shared/addition.ts +++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/addition.ts @@ -2,11 +2,11 @@ import { WitnessMap } from '@noir-lang/acvm_js'; // See `addition_circuit` integration test in `acir/tests/test_program_serialization.rs`. export const bytecode = Uint8Array.from([ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 144, 65, 14, 128, 32, 12, 4, 65, 124, 80, 75, 91, 104, 111, 126, 69, 34, 252, - 255, 9, 106, 228, 64, 194, 81, 38, 105, 182, 167, 201, 102, 189, 251, 216, 159, 243, 110, 38, 244, 60, 122, 194, 63, - 208, 47, 116, 109, 131, 139, 32, 49, 215, 28, 43, 18, 158, 16, 173, 168, 0, 75, 73, 138, 138, 162, 114, 69, 37, 170, - 202, 154, 173, 88, 6, 67, 166, 138, 77, 140, 90, 151, 133, 117, 189, 224, 117, 108, 221, 229, 135, 223, 13, 27, 135, - 121, 106, 119, 3, 58, 173, 124, 163, 140, 1, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 149, 143, 49, 14, 64, 64, 16, 69, 255, 44, 7, 81, 210, 17, 71, 16, 137, 74, 148, + 26, 157, 3, 136, 78, 185, 71, 16, 23, 112, 10, 225, 56, 219, 41, 53, 122, 194, 110, 76, 162, 217, 125, 201, 100, 102, + 146, 159, 153, 255, 9, 47, 254, 93, 132, 63, 158, 238, 1, 172, 32, 114, 208, 10, 166, 141, 219, 178, 87, 201, 28, 173, + 85, 190, 72, 89, 55, 97, 186, 23, 195, 214, 141, 153, 58, 167, 67, 251, 176, 188, 251, 32, 204, 19, 54, 155, 29, 248, + 114, 113, 46, 164, 199, 252, 137, 12, 1, 0, 0, ]); export const initialWitnessMap: WitnessMap = new Map([ diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts index b2b0aff6ed37..3be6260c2cc0 100644 --- a/noir/noir-repo/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts +++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts @@ -2,14 +2,14 @@ import { WitnessMap } from '@noir-lang/acvm_js'; // See `complex_brillig_foreign_call` integration test in `acir/tests/test_program_serialization.rs`. export const bytecode = Uint8Array.from([ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 85, 93, 10, 194, 48, 12, 78, 219, 233, 54, 240, 205, 11, 8, 122, 128, 76, 47, - 176, 187, 136, 111, 138, 62, 122, 124, 45, 75, 88, 140, 197, 9, 38, 224, 62, 24, 89, 75, 242, 229, 159, 6, 24, 208, - 60, 191, 64, 255, 11, 146, 145, 100, 190, 79, 240, 10, 214, 237, 73, 226, 111, 232, 130, 29, 23, 122, 197, 24, 103, - 16, 99, 114, 136, 17, 68, 255, 255, 176, 223, 150, 125, 49, 173, 95, 42, 236, 79, 5, 195, 126, 45, 233, 92, 147, 108, - 116, 161, 179, 81, 132, 247, 197, 147, 224, 225, 105, 149, 4, 229, 184, 183, 73, 232, 208, 42, 191, 198, 252, 200, - 197, 216, 192, 119, 249, 250, 228, 185, 71, 230, 79, 46, 252, 216, 49, 127, 229, 212, 167, 90, 213, 75, 230, 34, 253, - 174, 96, 28, 192, 227, 245, 114, 59, 159, 238, 169, 96, 170, 205, 51, 182, 234, 188, 43, 148, 108, 138, 131, 33, 223, - 153, 79, 250, 161, 160, 63, 101, 179, 134, 113, 156, 248, 93, 123, 0, 142, 67, 44, 107, 244, 6, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 181, 84, 209, 14, 194, 32, 12, 188, 210, 233, 182, 196, 55, 127, 128, 68, 255, 204, + 248, 166, 209, 71, 63, 95, 201, 218, 141, 85, 84, 74, 226, 37, 164, 64, 238, 122, 165, 16, 8, 19, 134, 215, 32, 153, + 111, 36, 6, 137, 105, 159, 177, 134, 114, 35, 170, 64, 84, 207, 109, 246, 8, 248, 191, 7, 195, 239, 145, 192, 78, 31, + 71, 191, 60, 231, 118, 213, 175, 53, 231, 247, 223, 97, 122, 31, 91, 89, 247, 18, 135, 146, 40, 224, 253, 225, 172, + 170, 145, 56, 154, 8, 99, 28, 81, 87, 239, 104, 242, 58, 245, 243, 97, 62, 241, 109, 189, 104, 243, 137, 170, 231, 54, + 61, 169, 190, 107, 211, 115, 159, 233, 230, 205, 108, 174, 121, 119, 88, 122, 114, 186, 93, 239, 151, 243, 131, 11, + 82, 43, 79, 56, 152, 245, 209, 240, 168, 34, 135, 34, 255, 135, 190, 241, 169, 192, 255, 165, 217, 99, 105, 155, 254, + 123, 79, 62, 165, 191, 19, 20, 5, 0, 0, ]); export const initialWitnessMap: WitnessMap = new Map([ [1, '0x0000000000000000000000000000000000000000000000000000000000000001'], diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/foreign_call.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/foreign_call.ts index 6cec99a636d7..45a58f75ca47 100644 --- a/noir/noir-repo/acvm-repo/acvm_js/test/shared/foreign_call.ts +++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/foreign_call.ts @@ -2,11 +2,10 @@ import { WitnessMap } from '@noir-lang/acvm_js'; // See `simple_brillig_foreign_call` integration test in `acir/tests/test_program_serialization.rs`. export const bytecode = Uint8Array.from([ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 79, 73, 10, 128, 48, 12, 236, 40, 46, 5, 111, 126, 36, 254, 192, 207, 120, - 240, 226, 65, 196, 247, 91, 48, 129, 80, 186, 28, 154, 129, 144, 201, 132, 44, 3, 247, 99, 14, 1, 230, 3, 103, 169, - 53, 68, 219, 57, 83, 27, 54, 216, 237, 34, 253, 111, 23, 19, 104, 177, 96, 76, 204, 251, 68, 191, 55, 52, 238, 163, - 187, 198, 251, 105, 114, 101, 200, 221, 37, 196, 200, 252, 188, 222, 227, 126, 80, 153, 200, 213, 57, 125, 77, 244, - 62, 112, 171, 6, 33, 119, 2, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 149, 78, 203, 10, 192, 32, 12, 107, 54, 246, 16, 118, 219, 15, 236, 231, 118, 216, + 101, 135, 49, 252, 126, 5, 91, 80, 241, 81, 3, 197, 52, 49, 109, 65, 1, 187, 47, 48, 95, 248, 149, 62, 134, 104, 23, + 169, 0, 232, 255, 38, 251, 166, 156, 32, 22, 27, 97, 57, 222, 20, 252, 89, 127, 12, 76, 54, 119, 48, 79, 91, 199, 151, + 185, 135, 175, 149, 249, 243, 218, 251, 251, 209, 73, 212, 250, 154, 126, 22, 60, 7, 12, 47, 88, 88, 247, 1, 0, 0, ]); export const initialWitnessMap: WitnessMap = new Map([ [1, '0x0000000000000000000000000000000000000000000000000000000000000005'], diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/memory_op.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/memory_op.ts index 2287d31d37e0..5a3b7d634076 100644 --- a/noir/noir-repo/acvm-repo/acvm_js/test/shared/memory_op.ts +++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/memory_op.ts @@ -1,9 +1,9 @@ // See `memory_op_circuit` integration test in `acir/tests/test_program_serialization.rs`. export const bytecode = Uint8Array.from([ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 82, 65, 10, 0, 32, 8, 211, 180, 255, 216, 15, 250, 255, 171, 10, 82, 176, 58, - 166, 135, 6, 178, 29, 100, 204, 33, 194, 66, 157, 67, 170, 89, 185, 40, 163, 211, 182, 115, 162, 43, 203, 27, 90, 182, - 47, 6, 251, 82, 156, 151, 100, 151, 43, 191, 149, 203, 209, 183, 147, 11, 90, 96, 255, 102, 11, 207, 112, 99, 0, 192, - 100, 38, 199, 38, 3, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 165, 79, 201, 9, 0, 32, 12, 235, 229, 30, 238, 63, 165, 130, 45, 84, 241, 209, 35, + 80, 146, 71, 66, 26, 132, 131, 177, 143, 85, 139, 50, 41, 163, 211, 230, 121, 49, 33, 4, 236, 230, 48, 153, 227, 184, + 183, 61, 174, 154, 43, 143, 19, 72, 254, 198, 174, 136, 224, 30, 108, 229, 242, 201, 45, 252, 105, 28, 217, 38, 2, 0, + 0, ]); export const initialWitnessMap = new Map([ diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/nested_acir_call.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/nested_acir_call.ts index 5e0bcf25300d..eef48388122e 100644 --- a/noir/noir-repo/acvm-repo/acvm_js/test/shared/nested_acir_call.ts +++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/nested_acir_call.ts @@ -2,13 +2,13 @@ import { WitnessMap, StackItem, WitnessStack } from '@noir-lang/acvm_js'; // See `nested_acir_call_circuit` integration test in `acir/tests/test_program_serialization.rs`. export const bytecode = Uint8Array.from([ - 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 146, 81, 10, 195, 48, 8, 134, 77, 132, 158, 71, 99, 210, 152, 183, 93, 101, - 97, 233, 253, 143, 176, 142, 165, 44, 100, 133, 62, 52, 125, 232, 7, 63, 138, 136, 232, 143, 8, 95, 176, 234, 195, - 180, 202, 172, 178, 240, 195, 84, 193, 86, 63, 106, 66, 232, 216, 26, 31, 53, 210, 57, 216, 54, 179, 132, 102, 239, - 75, 116, 133, 133, 159, 228, 82, 214, 64, 62, 228, 89, 89, 57, 104, 120, 57, 21, 41, 234, 53, 166, 156, 34, 37, 246, - 82, 120, 9, 73, 150, 58, 12, 199, 237, 69, 208, 152, 208, 230, 6, 254, 193, 206, 192, 171, 188, 130, 129, 94, 217, - 113, 123, 185, 169, 222, 106, 155, 187, 119, 159, 168, 255, 178, 62, 199, 174, 102, 110, 102, 170, 129, 177, 15, 120, - 228, 215, 30, 111, 39, 140, 108, 64, 11, 4, 0, 0, + 31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 181, 145, 61, 10, 131, 64, 16, 133, 231, 7, 60, 71, 202, 164, 75, 200, 17, 66, 32, + 85, 72, 153, 198, 206, 3, 136, 157, 165, 71, 16, 47, 224, 41, 68, 143, 99, 103, 105, 99, 175, 226, 174, 174, 195, 194, + 174, 133, 31, 60, 24, 134, 199, 236, 188, 29, 134, 5, 86, 154, 9, 38, 225, 36, 130, 13, 84, 2, 221, 119, 153, 24, 4, + 218, 120, 1, 47, 144, 12, 239, 61, 250, 38, 237, 163, 188, 213, 191, 119, 149, 101, 255, 240, 250, 236, 62, 105, 19, + 231, 175, 118, 40, 122, 245, 152, 231, 220, 117, 81, 89, 163, 197, 199, 176, 15, 168, 57, 154, 197, 244, 186, 178, + 144, 255, 92, 10, 148, 159, 140, 189, 172, 71, 144, 87, 146, 53, 139, 158, 237, 51, 206, 12, 141, 112, 236, 128, 174, + 60, 54, 70, 126, 172, 28, 127, 235, 2, 0, 0, ]); export const initialWitnessMap: WitnessMap = new Map([