From 46e9313e555e74566144c9c33531cf09fd87f777 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Wed, 2 Aug 2023 19:49:30 -0400 Subject: [PATCH 01/12] Introduce Type::Signature to the AST --- compiler/ast/src/types/type_.rs | 4 ++++ compiler/passes/src/code_generation/visit_type.rs | 1 + compiler/span/src/symbol.rs | 1 + 3 files changed, 6 insertions(+) diff --git a/compiler/ast/src/types/type_.rs b/compiler/ast/src/types/type_.rs index f938e8fe7b..aa2f0f7093 100644 --- a/compiler/ast/src/types/type_.rs +++ b/compiler/ast/src/types/type_.rs @@ -40,6 +40,8 @@ pub enum Type { Mapping(MappingType), /// The `scalar` type. Scalar, + /// The `signature` type. + Signature, /// The `string` type. String, /// A static tuple of at least one type. @@ -64,6 +66,7 @@ impl Type { | (Type::Field, Type::Field) | (Type::Group, Type::Group) | (Type::Scalar, Type::Scalar) + | (Type::Signature, Type::Signature) | (Type::String, Type::String) | (Type::Unit, Type::Unit) => true, (Type::Integer(left), Type::Integer(right)) => left.eq(right), @@ -90,6 +93,7 @@ impl fmt::Display for Type { Type::Integer(ref integer_type) => write!(f, "{integer_type}"), Type::Mapping(ref mapping_type) => write!(f, "{mapping_type}"), Type::Scalar => write!(f, "scalar"), + Type::Signature => write!(f, "signature"), Type::String => write!(f, "string"), Type::Tuple(ref tuple) => write!(f, "{tuple}"), Type::Unit => write!(f, "()"), diff --git a/compiler/passes/src/code_generation/visit_type.rs b/compiler/passes/src/code_generation/visit_type.rs index f93746df93..43df14dc70 100644 --- a/compiler/passes/src/code_generation/visit_type.rs +++ b/compiler/passes/src/code_generation/visit_type.rs @@ -26,6 +26,7 @@ impl<'a> CodeGenerator<'a> { | Type::Field | Type::Group | Type::Scalar + | Type::Signature | Type::String | Type::Integer(..) => format!("{input}"), Type::Identifier(ident) => format!("{ident}"), diff --git a/compiler/span/src/symbol.rs b/compiler/span/src/symbol.rs index b6a0ac0035..f8c58b10a8 100644 --- a/compiler/span/src/symbol.rs +++ b/compiler/span/src/symbol.rs @@ -208,6 +208,7 @@ symbols! { i128, record, scalar, + signature, string, Struct: "struct", u8, From 25eac3c63b56350ac74b4ad6643da321d64142f9 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Wed, 2 Aug 2023 19:52:19 -0400 Subject: [PATCH 02/12] Introduce Token::Signature --- compiler/parser/src/parser/type_.rs | 1 + compiler/parser/src/tokenizer/token.rs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/compiler/parser/src/parser/type_.rs b/compiler/parser/src/parser/type_.rs index 5e08e9d193..e5bf920419 100644 --- a/compiler/parser/src/parser/type_.rs +++ b/compiler/parser/src/parser/type_.rs @@ -24,6 +24,7 @@ pub(super) const TYPE_TOKENS: &[Token] = &[ Token::Field, Token::Group, Token::Scalar, + Token::Signature, Token::String, Token::I8, Token::I16, diff --git a/compiler/parser/src/tokenizer/token.rs b/compiler/parser/src/tokenizer/token.rs index 7fdad651a9..87abe8e9d6 100644 --- a/compiler/parser/src/tokenizer/token.rs +++ b/compiler/parser/src/tokenizer/token.rs @@ -94,6 +94,7 @@ pub enum Token { Field, Group, Scalar, + Signature, String, I8, I16, @@ -234,6 +235,7 @@ impl Token { Token::Record => sym::record, Token::Return => sym::Return, Token::Scalar => sym::scalar, + Token::Signature => sym::signature, Token::SelfLower => sym::SelfLower, Token::String => sym::string, Token::Struct => sym::Struct, @@ -321,6 +323,7 @@ impl fmt::Display for Token { Field => write!(f, "field"), Group => write!(f, "group"), Scalar => write!(f, "scalar"), + Signature => write!(f, "signature"), String => write!(f, "string"), I8 => write!(f, "i8"), I16 => write!(f, "i16"), From b1b947fef574679587339a0fae98efb665791678 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Wed, 2 Aug 2023 20:58:20 -0400 Subject: [PATCH 03/12] Support the signature type in the parser --- compiler/parser/src/parser/type_.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/compiler/parser/src/parser/type_.rs b/compiler/parser/src/parser/type_.rs index e5bf920419..3bf399e538 100644 --- a/compiler/parser/src/parser/type_.rs +++ b/compiler/parser/src/parser/type_.rs @@ -67,6 +67,7 @@ impl ParserContext<'_> { Token::Field => Type::Field, Token::Group => Type::Group, Token::Scalar => Type::Scalar, + Token::Signature => Type::Signature, Token::String => Type::String, x => Type::Integer(Self::token_to_int_type(x).expect("invalid int type")), }, From e96475b3e2530975907d6dd3c61485de91b5703b Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Thu, 3 Aug 2023 00:44:05 -0400 Subject: [PATCH 04/12] Update AST --- compiler/ast/src/functions/core_function.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/compiler/ast/src/functions/core_function.rs b/compiler/ast/src/functions/core_function.rs index 86e75277a5..4587bf219b 100644 --- a/compiler/ast/src/functions/core_function.rs +++ b/compiler/ast/src/functions/core_function.rs @@ -196,6 +196,8 @@ pub enum CoreFunction { GroupToXCoordinate, GroupToYCoordinate, + + SignatureVerify, } impl CoreFunction { @@ -380,6 +382,8 @@ impl CoreFunction { (sym::group, sym::to_x_coordinate) => Self::GroupToXCoordinate, (sym::group, sym::to_y_coordinate) => Self::GroupToYCoordinate, + + (sym::signature, sym::verify) => Self::SignatureVerify, _ => return None, }) } @@ -565,6 +569,8 @@ impl CoreFunction { Self::GroupToXCoordinate => 1, Self::GroupToYCoordinate => 1, + + Self::SignatureVerify => 3, } } @@ -736,7 +742,8 @@ impl CoreFunction { | CoreFunction::Poseidon8HashToU128 | CoreFunction::Poseidon8HashToScalar | CoreFunction::GroupToXCoordinate - | CoreFunction::GroupToYCoordinate => false, + | CoreFunction::GroupToYCoordinate + | CoreFunction::SignatureVerify => false, } } } From 1049822979b5a5698cb37208580650a5949b0180 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Thu, 3 Aug 2023 00:44:26 -0400 Subject: [PATCH 05/12] Add parser support --- compiler/parser/src/parser/expression.rs | 13 +++++++++++++ compiler/parser/src/tokenizer/lexer.rs | 1 + compiler/parser/src/tokenizer/mod.rs | 3 ++- compiler/parser/src/tokenizer/token.rs | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/compiler/parser/src/parser/expression.rs b/compiler/parser/src/parser/expression.rs index 09f913112e..c260d1fb3c 100644 --- a/compiler/parser/src/parser/expression.rs +++ b/compiler/parser/src/parser/expression.rs @@ -343,6 +343,19 @@ impl ParserContext<'_> { right: Box::new(args.swap_remove(0)), id: self.node_builder.next_id(), })) + } else if let (2, Some(CoreFunction::SignatureVerify)) = + (args.len(), CoreFunction::from_symbols(sym::signature, method.name)) + { + Ok(Expression::Access(AccessExpression::AssociatedFunction(AssociatedFunction { + ty: Type::Identifier(Identifier::new(sym::signature)), + name: method, + arguments: { + let mut arguments = vec![receiver]; + arguments.extend(args); + arguments + }, + span, + }))) } else { // Attempt to parse the method call as a mapping operation. match (args.len(), CoreFunction::from_symbols(sym::Mapping, method.name)) { diff --git a/compiler/parser/src/tokenizer/lexer.rs b/compiler/parser/src/tokenizer/lexer.rs index 5c814de8b7..15f09c3c72 100644 --- a/compiler/parser/src/tokenizer/lexer.rs +++ b/compiler/parser/src/tokenizer/lexer.rs @@ -412,6 +412,7 @@ impl Token { "record" => Token::Record, "return" => Token::Return, "scalar" => Token::Scalar, + "signature" => Token::Signature, "self" => Token::SelfLower, "string" => Token::String, "struct" => Token::Struct, diff --git a/compiler/parser/src/tokenizer/mod.rs b/compiler/parser/src/tokenizer/mod.rs index 52889174c8..6942e78a22 100644 --- a/compiler/parser/src/tokenizer/mod.rs +++ b/compiler/parser/src/tokenizer/mod.rs @@ -114,6 +114,7 @@ mod tests { return scalar self + signature string struct test @@ -169,7 +170,7 @@ mod tests { assert_eq!( output, - r#""test" "test{}test" "test{}" "{}test" "test{" "test}" "test{test" "test}test" "te{{}}" test_ident 12345 address as assert assert_eq assert_neq async bool const else false field finalize for function group i128 i64 i32 i16 i8 if in inline input let mut private program public return scalar self string struct test then transition true u128 u64 u32 u16 u8 console ! != && ( ) * ** + , - -> => _ . .. / : ; < <= = == > >= [ ] { { } } || ? @ // test + r#""test" "test{}test" "test{}" "{}test" "test{" "test}" "test{test" "test}test" "te{{}}" test_ident 12345 address as assert assert_eq assert_neq async bool const else false field finalize for function group i128 i64 i32 i16 i8 if in inline input let mut private program public return scalar self signature string struct test then transition true u128 u64 u32 u16 u8 console ! != && ( ) * ** + , - -> => _ . .. / : ; < <= = == > >= [ ] { { } } || ? @ // test /* test */ // "# ); }); diff --git a/compiler/parser/src/tokenizer/token.rs b/compiler/parser/src/tokenizer/token.rs index 87abe8e9d6..b346c34d35 100644 --- a/compiler/parser/src/tokenizer/token.rs +++ b/compiler/parser/src/tokenizer/token.rs @@ -179,6 +179,7 @@ pub const KEYWORD_TOKENS: &[Token] = &[ Token::Record, Token::Return, Token::SelfLower, + Token::Signature, Token::Scalar, Token::String, Token::Struct, From daf003f728105d9e685dc296865b21545cd0ef2e Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Thu, 3 Aug 2023 00:45:04 -0400 Subject: [PATCH 06/12] Tyc support --- compiler/passes/src/type_checking/checker.rs | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/compiler/passes/src/type_checking/checker.rs b/compiler/passes/src/type_checking/checker.rs index 54316183ef..c0692ecbd2 100644 --- a/compiler/passes/src/type_checking/checker.rs +++ b/compiler/passes/src/type_checking/checker.rs @@ -59,6 +59,8 @@ const GROUP_TYPE: Type = Type::Group; const SCALAR_TYPE: Type = Type::Scalar; +const SIGNATURE_TYPE: Type = Type::Signature; + const INT_TYPES: [Type; 10] = [ Type::Integer(IntegerType::I8), Type::Integer(IntegerType::I16), @@ -173,7 +175,6 @@ impl<'a> TypeChecker<'a> { self.emit_err(TypeCheckerError::type_should_be(actual.clone(), expected, span)); } } - actual } @@ -182,6 +183,11 @@ impl<'a> TypeChecker<'a> { self.check_type(|actual: &Type| actual.eq_flat(expected), expected.to_string(), actual, span) } + /// Emits an error to the error handler if the given type is not an address. + pub(crate) fn assert_address_type(&self, type_: &Option, span: Span) { + self.check_type(|type_: &Type| ADDRESS_TYPE.eq(type_), ADDRESS_TYPE.to_string(), type_, span) + } + /// Emits an error to the handler if the given type is not a boolean. pub(crate) fn assert_bool_type(&self, type_: &Option, span: Span) { self.check_type(|type_: &Type| BOOLEAN_TYPE.eq(type_), BOOLEAN_TYPE.to_string(), type_, span) @@ -202,6 +208,11 @@ impl<'a> TypeChecker<'a> { self.check_type(|type_: &Type| SCALAR_TYPE.eq(type_), SCALAR_TYPE.to_string(), type_, span) } + /// Emits an error to the handler if the given type is not a signature. + pub(crate) fn assert_signature_type(&self, type_: &Option, span: Span) { + self.check_type(|type_: &Type| SIGNATURE_TYPE.eq(type_), SIGNATURE_TYPE.to_string(), type_, span) + } + /// Emits an error to the handler if the given type is not an integer. pub(crate) fn assert_int_type(&self, type_: &Option, span: Span) { self.check_type(|type_: &Type| INT_TYPES.contains(type_), types_to_string(&INT_TYPES), type_, span) @@ -917,6 +928,14 @@ impl<'a> TypeChecker<'a> { CoreFunction::ChaChaRandU32 => Some(Type::Integer(IntegerType::U32)), CoreFunction::ChaChaRandU64 => Some(Type::Integer(IntegerType::U64)), CoreFunction::ChaChaRandU128 => Some(Type::Integer(IntegerType::U128)), + CoreFunction::SignatureVerify => { + // Check that the first argument is a signature. + self.assert_signature_type(&arguments[0].0, arguments[0].1); + // Check that the second argument is an address. + self.assert_address_type(&arguments[1].0, arguments[1].1); + // Return a boolean. + Some(Type::Boolean) + } } } From 023d94d20f73b76894f8185089bed8bb1ddb0be6 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Thu, 3 Aug 2023 00:46:09 -0400 Subject: [PATCH 07/12] Code gen support --- .../passes/src/code_generation/visit_expressions.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/compiler/passes/src/code_generation/visit_expressions.rs b/compiler/passes/src/code_generation/visit_expressions.rs index db67c79fe7..e23632e821 100644 --- a/compiler/passes/src/code_generation/visit_expressions.rs +++ b/compiler/passes/src/code_generation/visit_expressions.rs @@ -422,6 +422,18 @@ impl<'a> CodeGenerator<'a> { .expect("failed to write to string"); (destination_register, instruction) } + Type::Identifier(Identifier { name: sym::signature, .. }) => { + let mut instruction = " sign.verify".to_string(); + let destination_register = get_destination_register(); + // Write the arguments and the destination register. + writeln!( + instruction, + " {} {} {} into {destination_register};", + arguments[0], arguments[1], arguments[2] + ) + .expect("failed to write to string"); + (destination_register, instruction) + } _ => unreachable!("All core functions should be known at this phase of compilation"), }; // Add the instruction to the list of instructions. From c80c782248b45d79af105825d2d4bfd09283449e Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Thu, 3 Aug 2023 00:50:48 -0400 Subject: [PATCH 08/12] Add tests --- compiler/span/src/symbol.rs | 1 + tests/tests/compiler/signature/signature.leo | 24 +++++++++++++++++++ .../signature_with_wrong_types_fail.leo | 24 +++++++++++++++++++ tests/tests/parser/type_/signature.leo | 22 +++++++++++++++++ .../signature_verify_bad_syntax_fail.leo | 24 +++++++++++++++++++ 5 files changed, 95 insertions(+) create mode 100644 tests/tests/compiler/signature/signature.leo create mode 100644 tests/tests/compiler/signature/signature_with_wrong_types_fail.leo create mode 100644 tests/tests/parser/type_/signature.leo create mode 100644 tests/tests/parser/type_/signature_verify_bad_syntax_fail.leo diff --git a/compiler/span/src/symbol.rs b/compiler/span/src/symbol.rs index f8c58b10a8..09fad96b58 100644 --- a/compiler/span/src/symbol.rs +++ b/compiler/span/src/symbol.rs @@ -195,6 +195,7 @@ symbols! { set, to_x_coordinate, to_y_coordinate, + verify, // types address, diff --git a/tests/tests/compiler/signature/signature.leo b/tests/tests/compiler/signature/signature.leo new file mode 100644 index 0000000000..6d9e6eaff3 --- /dev/null +++ b/tests/tests/compiler/signature/signature.leo @@ -0,0 +1,24 @@ +/* +namespace: Compile +expectation: Pass +*/ + +program test.aleo { + + struct foo { + a: u8, + b: scalar + } + + transition verify_field(s: signature, a: address, v: field) { + let first: bool = signature::verify(s, a, v); + let second: bool = s.verify(a, v); + assert_eq(first, second); + } + + transition verify_foo(s: signature, a: address, v: foo) { + let first: bool = signature::verify(s, a, v); + let second: bool = s.verify(a, v); + assert_eq(first, second); + } +} diff --git a/tests/tests/compiler/signature/signature_with_wrong_types_fail.leo b/tests/tests/compiler/signature/signature_with_wrong_types_fail.leo new file mode 100644 index 0000000000..04d64353bf --- /dev/null +++ b/tests/tests/compiler/signature/signature_with_wrong_types_fail.leo @@ -0,0 +1,24 @@ +/* +namespace: Compile +expectation: Fail +*/ + +program test.aleo { + + struct foo { + a: u8, + b: scalar + } + + transition verify_field(s: signature, a: address, v: field) { + let first: bool = signature::verify(a, s, v); + let second: bool = s.verify(1u8, v); + assert_eq(first, second); + } + + transition verify_foo(s: signature, a: address, v: foo) { + let first: bool = signature::verify(a, v, s); + let second: bool = s.verify(v, a); + assert_eq(first, second); + } +} diff --git a/tests/tests/parser/type_/signature.leo b/tests/tests/parser/type_/signature.leo new file mode 100644 index 0000000000..352ca55cf2 --- /dev/null +++ b/tests/tests/parser/type_/signature.leo @@ -0,0 +1,22 @@ +/* +namespace: Parse +expectation: Pass +*/ + +program test.aleo { + transition baz(s: signature, a: address, v: value) { + let a: bool = signature::verify(s, a, v); + let b: bool = s.verify(a, v); + assert_eq(a, b); + } + + transition bar(x: u8) -> u8 { + let signature: u8 = 1u8 + x; + return signature; + } + + transition bax(s: signature, a: address, v: value) { + let a: bool = signature::sign(s, a, v); + assert_eq(a, b); + } +} diff --git a/tests/tests/parser/type_/signature_verify_bad_syntax_fail.leo b/tests/tests/parser/type_/signature_verify_bad_syntax_fail.leo new file mode 100644 index 0000000000..c92a84bff5 --- /dev/null +++ b/tests/tests/parser/type_/signature_verify_bad_syntax_fail.leo @@ -0,0 +1,24 @@ +/* +namespace: Parse +expectation: Fail +*/ + +program test.aleo { + transition baz(s: signature, a: address, v: value) { + let a: bool = signature.verify(s, a, v); + assert(a, b); + } + + transition bar(s: signature, a: address, v: value) { + let b: bool = s.verify(a, a, v); + assert_eq(a, b); + } + + transition foo(signature: field) -> u8 { + return 0u8; + } + + transition signature(foo: field) -> u8 { + return 0u8; + } +} From 57c3a15688b85b12ac010fb05bdc4b0fa02ab761 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Thu, 3 Aug 2023 00:51:53 -0400 Subject: [PATCH 09/12] Regen expectations --- .../compiler/signature/signature.out | 12 + .../signature_with_wrong_types_fail.out | 5 + .../parser/expression/cast_fail.out | 4 +- .../parser/statement/definition_fail.out | 14 +- tests/expectations/parser/type_/signature.out | 233 ++++++++++++++++++ .../signature_verify_bad_syntax_fail.out | 5 + 6 files changed, 264 insertions(+), 9 deletions(-) create mode 100644 tests/expectations/compiler/signature/signature.out create mode 100644 tests/expectations/compiler/signature/signature_with_wrong_types_fail.out create mode 100644 tests/expectations/parser/type_/signature.out create mode 100644 tests/expectations/parser/type_/signature_verify_bad_syntax_fail.out diff --git a/tests/expectations/compiler/signature/signature.out b/tests/expectations/compiler/signature/signature.out new file mode 100644 index 0000000000..5d444e31ae --- /dev/null +++ b/tests/expectations/compiler/signature/signature.out @@ -0,0 +1,12 @@ +--- +namespace: Compile +expectation: Pass +outputs: + - - initial_ast: eac40643953d449007d2cdf25f5fbbaab2d795606069feea951a9ac640b5ea20 + unrolled_ast: eac40643953d449007d2cdf25f5fbbaab2d795606069feea951a9ac640b5ea20 + ssa_ast: 2f764529d50f04616be0da13eefd1be0fb7de523efa7bdf5813841e9e55e2e28 + flattened_ast: 2f764529d50f04616be0da13eefd1be0fb7de523efa7bdf5813841e9e55e2e28 + inlined_ast: 2f764529d50f04616be0da13eefd1be0fb7de523efa7bdf5813841e9e55e2e28 + dce_ast: 2f764529d50f04616be0da13eefd1be0fb7de523efa7bdf5813841e9e55e2e28 + bytecode: 87b34bffefde3c2b9e23ce08528737a4ef06a28ee9120c02d26ee41989f24cd2 + warnings: "" diff --git a/tests/expectations/compiler/signature/signature_with_wrong_types_fail.out b/tests/expectations/compiler/signature/signature_with_wrong_types_fail.out new file mode 100644 index 0000000000..cb241422f1 --- /dev/null +++ b/tests/expectations/compiler/signature/signature_with_wrong_types_fail.out @@ -0,0 +1,5 @@ +--- +namespace: Compile +expectation: Fail +outputs: + - "Error [ETYC0372007]: Expected one type from `signature`, but got `address`\n --> compiler-test:11:45\n |\n 11 | let first: bool = signature::verify(a, s, v);\n | ^\nError [ETYC0372007]: Expected one type from `address`, but got `signature`\n --> compiler-test:11:48\n |\n 11 | let first: bool = signature::verify(a, s, v);\n | ^\nError [ETYC0372007]: Expected one type from `address`, but got `u8`\n --> compiler-test:12:37\n |\n 12 | let second: bool = s.verify(1u8, v);\n | ^^^\nError [ETYC0372007]: Expected one type from `signature`, but got `address`\n --> compiler-test:17:45\n |\n 17 | let first: bool = signature::verify(a, v, s);\n | ^\nError [ETYC0372007]: Expected one type from `address`, but got `foo`\n --> compiler-test:17:48\n |\n 17 | let first: bool = signature::verify(a, v, s);\n | ^\nError [ETYC0372007]: Expected one type from `address`, but got `foo`\n --> compiler-test:18:37\n |\n 18 | let second: bool = s.verify(v, a);\n | ^\n" diff --git a/tests/expectations/parser/expression/cast_fail.out b/tests/expectations/parser/expression/cast_fail.out index c81c5f8f6b..dfa299f8f0 100644 --- a/tests/expectations/parser/expression/cast_fail.out +++ b/tests/expectations/parser/expression/cast_fail.out @@ -3,7 +3,7 @@ namespace: ParseExpression expectation: Fail outputs: - "did not consume all input: 'aas' @ 1:5-8\n'u8' @ 1:9-11\n" - - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '{'\n --> test:1:10\n |\n 1 | 1u128 as { foo: u8 }\n | ^" + - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'signature', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '{'\n --> test:1:10\n |\n 1 | 1u128 as { foo: u8 }\n | ^" - "did not consume all input: ';' @ 1:14-15\n" - - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found 'bar'\n --> test:1:8\n |\n 1 | 1u8 as bar;\n | ^^^" + - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'signature', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found 'bar'\n --> test:1:8\n |\n 1 | 1u8 as bar;\n | ^^^" - "did not consume all input: 'asu8' @ 1:5-9\n" diff --git a/tests/expectations/parser/statement/definition_fail.out b/tests/expectations/parser/statement/definition_fail.out index 4743d40633..a8ffd543b1 100644 --- a/tests/expectations/parser/statement/definition_fail.out +++ b/tests/expectations/parser/statement/definition_fail.out @@ -25,22 +25,22 @@ outputs: - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n --> test:1:10\n |\n 1 | let (x,y,,) = ();\n | ^" - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n --> test:1:6\n |\n 1 | let (,x,y) = ();\n | ^" - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n --> test:1:8\n |\n 1 | let (x,,y) = ();\n | ^" - - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n --> test:1:8\n |\n 1 | let x: [u8; (2,,)] = [[0,0], [0,0]];\n | ^" - - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found 'constant'\n --> test:1:8\n |\n 1 | let x: constant = expr;\n | ^^^^^^^^" + - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'signature', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n --> test:1:8\n |\n 1 | let x: [u8; (2,,)] = [[0,0], [0,0]];\n | ^" + - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'signature', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found 'constant'\n --> test:1:8\n |\n 1 | let x: constant = expr;\n | ^^^^^^^^" - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'constant'\n --> test:1:1\n |\n 1 | constant x: let = expr;\n | ^^^^^^^^" - "Error [EPAR0370009]: unexpected string: expected 'expression', found ''\n --> test:1:1\n |\n 1 | let\n | ^^^" - "Error [EPAR0370005]: expected : -- found ''\n --> test:1:5\n |\n 1 | let x\n | ^" - - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found ''\n --> test:1:6\n |\n 1 | let x:\n | ^" + - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'signature', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found ''\n --> test:1:6\n |\n 1 | let x:\n | ^" - "Error [EPAR0370005]: expected : -- found '='\n --> test:1:7\n |\n 1 | let x = (a, y]);\n | ^" - "Error [EPAR0370009]: unexpected string: expected 'expression', found '='\n --> test:1:5\n |\n 1 | let = 1u8;\n | ^" - "Error [EPAR0370009]: unexpected string: expected 'expression', found ';'\n --> test:1:4\n |\n 1 | let;\n | ^" - "Error [EPAR0370005]: expected : -- found '1'\n --> test:1:7\n |\n 1 | let x 1u8;\n | ^" - "Error [EPAR0370005]: expected = -- found ';'\n --> test:1:10\n |\n 1 | let x: u8;\n | ^" - "Error [EPAR0370005]: expected = -- found ''\n --> test:1:8\n |\n 1 | let x: u8\n | ^^" - - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '='\n --> test:1:8\n |\n 1 | let x: = 1;\n | ^" - - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n --> test:1:8\n |\n 1 | let x: [u8] = 1;\n | ^" - - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n --> test:1:8\n |\n 1 | let x: [u8;\n | ^" - - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n --> test:1:8\n |\n 1 | let x: [u8; 1u8] = [1,\n | ^" + - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'signature', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '='\n --> test:1:8\n |\n 1 | let x: = 1;\n | ^" + - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'signature', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n --> test:1:8\n |\n 1 | let x: [u8] = 1;\n | ^" + - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'signature', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n --> test:1:8\n |\n 1 | let x: [u8;\n | ^" + - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'signature', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n --> test:1:8\n |\n 1 | let x: [u8; 1u8] = [1,\n | ^" - "Error [EPAR0370009]: unexpected string: expected 'expression', found ']'\n --> test:1:15\n |\n 1 | let dbg: u8 = ];\n | ^" - "Error [EPAR0370016]: Could not lex the following content: `🦀:`.\n" - "Error [EPAR0370005]: expected : -- found '='\n --> test:1:9\n |\n 1 | let (x) = ...;\n | ^" diff --git a/tests/expectations/parser/type_/signature.out b/tests/expectations/parser/type_/signature.out new file mode 100644 index 0000000000..a575ed56aa --- /dev/null +++ b/tests/expectations/parser/type_/signature.out @@ -0,0 +1,233 @@ +--- +namespace: Parse +expectation: Pass +outputs: + - imports: {} + program_scopes: + "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}": + program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}" + structs: {} + mappings: {} + functions: + baz: + annotations: [] + variant: Transition + identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":40}\"}" + input: + - Internal: + identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}" + mode: None + type_: Signature + span: + lo: 41 + hi: 42 + - Internal: + identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":55,\\\"hi\\\":56}\"}" + mode: None + type_: Address + span: + lo: 55 + hi: 56 + - Internal: + identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":67,\\\"hi\\\":68}\"}" + mode: None + type_: + Identifier: "{\"name\":\"value\",\"span\":\"{\\\"lo\\\":70,\\\"hi\\\":75}\"}" + span: + lo: 67 + hi: 68 + output: [] + output_type: Unit + block: + statements: + - Definition: + declaration_type: Let + place: + Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":91,\\\"hi\\\":92}\"}" + type_: Boolean + value: + Access: + AssociatedFunction: + ty: + Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":101,\\\"hi\\\":110}\"}" + name: "{\"name\":\"verify\",\"span\":\"{\\\"lo\\\":112,\\\"hi\\\":118}\"}" + arguments: + - Identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":119,\\\"hi\\\":120}\"}" + - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":122,\\\"hi\\\":123}\"}" + - Identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":125,\\\"hi\\\":126}\"}" + span: + lo: 101 + hi: 127 + span: + lo: 87 + hi: 127 + - Definition: + declaration_type: Let + place: + Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":141,\\\"hi\\\":142}\"}" + type_: Boolean + value: + Access: + AssociatedFunction: + ty: + Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":0}\"}" + name: "{\"name\":\"verify\",\"span\":\"{\\\"lo\\\":153,\\\"hi\\\":159}\"}" + arguments: + - Identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":151,\\\"hi\\\":152}\"}" + - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":160,\\\"hi\\\":161}\"}" + - Identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":163,\\\"hi\\\":164}\"}" + span: + lo: 151 + hi: 165 + span: + lo: 137 + hi: 165 + - Assert: + variant: + AssertEq: + - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":185,\\\"hi\\\":186}\"}" + - Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":188,\\\"hi\\\":189}\"}" + span: + lo: 175 + hi: 184 + span: + lo: 77 + hi: 197 + finalize: ~ + span: + lo: 26 + hi: 197 + bar: + annotations: [] + variant: Transition + identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":214,\\\"hi\\\":217}\"}" + input: + - Internal: + identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":218,\\\"hi\\\":219}\"}" + mode: None + type_: + Integer: U8 + span: + lo: 218 + hi: 219 + output: + - Internal: + mode: None + type_: + Integer: U8 + span: + lo: 228 + hi: 230 + output_type: + Integer: U8 + block: + statements: + - Definition: + declaration_type: Let + place: + Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":245,\\\"hi\\\":254}\"}" + type_: + Integer: U8 + value: + Binary: + left: + Literal: + Integer: + - U8 + - "1" + - span: + lo: 261 + hi: 264 + right: + Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":267,\\\"hi\\\":268}\"}" + op: Add + span: + lo: 261 + hi: 268 + span: + lo: 241 + hi: 268 + - Return: + expression: + Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":285,\\\"hi\\\":294}\"}" + finalize_arguments: ~ + span: + lo: 278 + hi: 295 + span: + lo: 231 + hi: 301 + finalize: ~ + span: + lo: 203 + hi: 301 + bax: + annotations: [] + variant: Transition + identifier: "{\"name\":\"bax\",\"span\":\"{\\\"lo\\\":317,\\\"hi\\\":320}\"}" + input: + - Internal: + identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":321,\\\"hi\\\":322}\"}" + mode: None + type_: Signature + span: + lo: 321 + hi: 322 + - Internal: + identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":335,\\\"hi\\\":336}\"}" + mode: None + type_: Address + span: + lo: 335 + hi: 336 + - Internal: + identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":347,\\\"hi\\\":348}\"}" + mode: None + type_: + Identifier: "{\"name\":\"value\",\"span\":\"{\\\"lo\\\":350,\\\"hi\\\":355}\"}" + span: + lo: 347 + hi: 348 + output: [] + output_type: Unit + block: + statements: + - Definition: + declaration_type: Let + place: + Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":370,\\\"hi\\\":371}\"}" + type_: Boolean + value: + Access: + AssociatedFunction: + ty: + Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":380,\\\"hi\\\":389}\"}" + name: "{\"name\":\"sign\",\"span\":\"{\\\"lo\\\":391,\\\"hi\\\":395}\"}" + arguments: + - Identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":396,\\\"hi\\\":397}\"}" + - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":399,\\\"hi\\\":400}\"}" + - Identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":402,\\\"hi\\\":403}\"}" + span: + lo: 380 + hi: 404 + span: + lo: 366 + hi: 404 + - Assert: + variant: + AssertEq: + - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":423,\\\"hi\\\":424}\"}" + - Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":426,\\\"hi\\\":427}\"}" + span: + lo: 413 + hi: 422 + span: + lo: 357 + hi: 434 + finalize: ~ + span: + lo: 306 + hi: 434 + span: + lo: 2 + hi: 436 diff --git a/tests/expectations/parser/type_/signature_verify_bad_syntax_fail.out b/tests/expectations/parser/type_/signature_verify_bad_syntax_fail.out new file mode 100644 index 0000000000..0f9fdc8d0b --- /dev/null +++ b/tests/expectations/parser/type_/signature_verify_bad_syntax_fail.out @@ -0,0 +1,5 @@ +--- +namespace: Parse +expectation: Fail +outputs: + - "Error [EPAR0370021]: The type of `signature` has no associated function `verify` that takes 3 argument(s).\n --> test:5:23\n |\n 5 | let a: bool = signature.verify(s, a, v);\n | ^^^^^^^^^^^^^^^^^^^^^^^^^\nError [EPAR0370005]: expected ) -- found ','\n --> test:6:17\n |\n 6 | assert(a, b);\n | ^" From dfa1138c89dff6bc1162550793c42196e3559913 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Thu, 3 Aug 2023 18:57:20 -0700 Subject: [PATCH 10/12] Update Cargo.toml --- Cargo.lock | 331 ++++++++++++++++++++++++++++++----------------------- Cargo.toml | 8 +- 2 files changed, 196 insertions(+), 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 17052b21b9..f83c177be2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2366,9 +2366,8 @@ dependencies = [ [[package]] name = "snarkvm" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51707986a2508a29b1b3b86288b47883aa215ff4e41f2990ca3e72680f841ac" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "anstyle", "anyhow", @@ -2396,9 +2395,8 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef22b259e4b10eac5551eb275294c9e38292a3e0084dac3e08458b56bfffaa80" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "aleo-std", "anyhow", @@ -2426,9 +2424,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498c8a748df8e7c11677d5986847fd2ea83d5461fc7bcde6dfb92377f2d66879" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -2441,9 +2438,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c894c0a68b196d7e2c9a71e053e2de112d2f66f0aa99e2bf97c1b9953c61b35d" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -2453,9 +2449,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b02ba606ba478b0402120699a7d0662b730d5f5c8bcfced1ec71b646d69d8e" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -2464,9 +2459,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef62f608c14c44458ed4d2cdc456abe306000fdc9e97f4cda55d78aeea9de5d3" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -2475,9 +2469,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca29800b3a7060a6af158b560784a0d2a23ea1f4f2aa8522e4125f49e5ef4ce0" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "indexmap 2.0.0", "itertools 0.11.0", @@ -2494,15 +2487,13 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4463ed0185f12580d084928f46ced637b97768cc94a0c9c81329bcd4b1d24a5" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" [[package]] name = "snarkvm-circuit-network" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64be49149457737bfd95b72210b4d46470f762c7d58709b244c566075778c86" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -2512,9 +2503,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5149b60d3e4bbdae78a025436731905492c4958a0e4b6846746fd50cc4b2de59" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-collections", @@ -2526,9 +2516,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069501824d03e72a9f3ea569505390f75f5f49c64b3db2875d42e243a50a2f3" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -2542,9 +2531,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e615ef1005a894a6e8c76b2a7c4e003ed6b7891c0806cd66a28d76fc7cfed35" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2556,9 +2544,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24657138c98bb551f34d82671a52bf29378ebde4921d13ffb77b5cd3fcf42166" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -2566,9 +2553,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd0b38bb596b7bf21b7131176c62948b37d225d2281b004cdbb4f97feb6e784" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2577,9 +2563,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c09875078ce200ebfc8b746f44aeeb667dc7352c8924497b3cc706526e6c85" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2590,9 +2575,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d833bc5b145390625ae1657bec2f817de9f2e2e81dedbad0e7c296b898dd1e5c" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2602,9 +2586,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb4100f18bf51f1d1dd09f4d830d8fd165335c76912eb0d12fbef0d1813166" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2614,9 +2597,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "042159987ae2f8ca30241e1f6d7242cab1505c02e23ef2ade773060be09bdcc6" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2627,9 +2609,8 @@ dependencies = [ [[package]] name = "snarkvm-console" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0d58fe27ccaa3a4404fa0e9ed1ecdf4c55c8bc645e0465a7713e3ed3591b94" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -2641,9 +2622,8 @@ dependencies = [ [[package]] name = "snarkvm-console-account" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7885e04293ea0c720f2299f2c4623733a2ec761fc00ea3c044902547d9edf4a" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "bs58", "snarkvm-console-network", @@ -2652,9 +2632,8 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303d778794833bbeab39791a3a2843da5dd0b1abefe820d1085aae5f1a9328ba" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "blake2s_simd", "smallvec", @@ -2665,9 +2644,8 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57378d48cb5cfcba1953291eeb804daed59059fddd11a443587549b8be8495c8" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "aleo-std", "rayon", @@ -2677,9 +2655,8 @@ dependencies = [ [[package]] name = "snarkvm-console-network" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b5fdd78bffa798b711e30d9f68d5a10eb5cc1f0f57c3e323cbe45a3c269da2" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "anyhow", "indexmap 2.0.0", @@ -2701,9 +2678,8 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c44e60ce7f1db408350846fd728d130f529b79af44ebe6cf3c051efa974c" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "anyhow", "bech32", @@ -2719,9 +2695,8 @@ dependencies = [ [[package]] name = "snarkvm-console-program" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad85034aa1ba1b6ecb73005395942c21f783ed9d743b3f6bc92f09ea04c73c1" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "enum_index", "enum_index_derive", @@ -2739,9 +2714,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311f6c99ab991e9ceca0a1cb349abafad0f183c9b1ea5e13adb75ad83c46eb35" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -2755,9 +2729,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9351a0aa6c2b5ed9bb3989400f6f1343c1f858279d74abb2739219fbd55aafce" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2767,18 +2740,16 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9d0e50d85cf1031d174a1af5a5ed9d8a6e67b62460cb41bd11e97210e49a62" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-console-network-environment", ] [[package]] name = "snarkvm-console-types-field" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41085cc3c19e779b26e16ed4bf9db823ae79a27fc9bb0d96fafd731fb55c2203" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2786,9 +2757,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6088fb58f1d4970e10d2b8fdd1c7cd208c68f0adefb50a4e7e54d0a553a42d11" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2798,9 +2768,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6d6cd06912b7c35b78d1316e069a5de34c52e3154e8675320f8f7481ab7300" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2809,9 +2778,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98ee6590c4910c692a260653b06143f85a4e25ab0908b41a7dba24b2024bf4b" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2820,9 +2788,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f71ef07fd84150f6deb8e16322d609811b6427a12b852b44d9bd179bf9d96c2" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2832,9 +2799,8 @@ dependencies = [ [[package]] name = "snarkvm-curves" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7656af538c27d800d2c4d0189f7b3eac665ea5cd30021892393bc16028dd506" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "rand", "rayon", @@ -2847,9 +2813,8 @@ dependencies = [ [[package]] name = "snarkvm-fields" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325012393d646818188fdeafc50af49b51ab00d8ed45d4e8bd68723c46c5ecc2" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "aleo-std", "anyhow", @@ -2865,9 +2830,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f146f8864fcd9aa638972843201d92f2200185d8eb240e39090d375f5dc366ce" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "aleo-std", "anyhow", @@ -2876,8 +2840,11 @@ dependencies = [ "rand", "rayon", "snarkvm-console", + "snarkvm-ledger-authority", "snarkvm-ledger-block", "snarkvm-ledger-coinbase", + "snarkvm-ledger-committee", + "snarkvm-ledger-narwhal", "snarkvm-ledger-query", "snarkvm-ledger-store", "snarkvm-synthesizer", @@ -2885,26 +2852,38 @@ dependencies = [ "tracing", ] +[[package]] +name = "snarkvm-ledger-authority" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +dependencies = [ + "anyhow", + "rand", + "serde_json", + "snarkvm-console", + "snarkvm-ledger-narwhal-subdag", +] + [[package]] name = "snarkvm-ledger-block" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8978e6923fbff60b9601ae7c6f724aa73738ed2889317a1ed85bafadf8ba391a" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "indexmap 2.0.0", "rayon", "serde_json", "snarkvm-console", + "snarkvm-ledger-authority", "snarkvm-ledger-coinbase", + "snarkvm-ledger-narwhal-subdag", "snarkvm-synthesizer-program", "snarkvm-synthesizer-snark", ] [[package]] name = "snarkvm-ledger-coinbase" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b17f3369bada07eb1adc36cb6d42ce972ca491c1e0cb31152b153085d1b281" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "anyhow", "bincode", @@ -2920,11 +2899,87 @@ dependencies = [ "snarkvm-utilities", ] +[[package]] +name = "snarkvm-ledger-committee" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +dependencies = [ + "indexmap 2.0.0", + "serde_json", + "snarkvm-console", +] + +[[package]] +name = "snarkvm-ledger-narwhal" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +dependencies = [ + "snarkvm-ledger-narwhal-batch-certificate", + "snarkvm-ledger-narwhal-batch-header", + "snarkvm-ledger-narwhal-subdag", + "snarkvm-ledger-narwhal-transmission", + "snarkvm-ledger-narwhal-transmission-id", +] + +[[package]] +name = "snarkvm-ledger-narwhal-batch-certificate" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +dependencies = [ + "indexmap 2.0.0", + "serde_json", + "snarkvm-console", + "snarkvm-ledger-narwhal-batch-header", + "snarkvm-ledger-narwhal-transmission-id", +] + +[[package]] +name = "snarkvm-ledger-narwhal-batch-header" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +dependencies = [ + "indexmap 2.0.0", + "serde_json", + "snarkvm-console", + "snarkvm-ledger-narwhal-transmission-id", +] + +[[package]] +name = "snarkvm-ledger-narwhal-subdag" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +dependencies = [ + "indexmap 2.0.0", + "serde_json", + "snarkvm-console", + "snarkvm-ledger-narwhal-batch-certificate", +] + +[[package]] +name = "snarkvm-ledger-narwhal-transmission" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +dependencies = [ + "bytes", + "serde_json", + "snarkvm-console", + "snarkvm-ledger-block", + "snarkvm-ledger-coinbase", +] + +[[package]] +name = "snarkvm-ledger-narwhal-transmission-id" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +dependencies = [ + "snarkvm-console", + "snarkvm-ledger-coinbase", +] + [[package]] name = "snarkvm-ledger-query" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9199c6aa26857a40e09aa478c676156e060bf6e0243033fc089860d7e7faea63" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "async-trait", "reqwest", @@ -2936,9 +2991,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff44232c1639bdb7878c889afe3dce1d641e9043b7a235ff45883e6582f742d" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "anyhow", "bincode", @@ -2947,17 +3001,18 @@ dependencies = [ "rayon", "serde", "snarkvm-console", + "snarkvm-ledger-authority", "snarkvm-ledger-block", "snarkvm-ledger-coinbase", + "snarkvm-ledger-committee", "snarkvm-synthesizer-program", "snarkvm-synthesizer-snark", ] [[package]] name = "snarkvm-parameters" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cdcd3e148fdcebc357c555aa7252632c704a2edfd2cde2e97e36296e07307f" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "aleo-std", "anyhow", @@ -2980,9 +3035,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa08be7ec396f517d1c80c4f70e8043fdbb99e8468a11791d117f680e39c710b" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "aleo-std", "indexmap 2.0.0", @@ -3001,9 +3055,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef14a15ccde7e2958c9d017420ec081997a404d0b3d2f7dd6405374f76f6b03" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "aleo-std", "colored", @@ -3023,9 +3076,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce082387e6e93a99f43711caece2a8d388fe6bb68bc123cb41450619755bdd35" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "indexmap 2.0.0", "paste", @@ -3038,9 +3090,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01f2d22d78772aaecb9d85a4e04996b2647c45da86e13ad2aa797a6bffbeb6a9" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "bincode", "once_cell", @@ -3052,9 +3103,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b22ed5713bd0dc52e0a0f369a71d54dad8d8f3367db8b29ae136b13264ac728" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "aleo-std", "anyhow", @@ -3072,9 +3122,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bf32bc20dd98531e638f4e352c88a5956b264b82651fc8eae54c4d93c4d0b6" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" dependencies = [ "proc-macro2", "quote 1.0.31", diff --git a/Cargo.toml b/Cargo.toml index 933c4ce57a..1c1815b8c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,10 +45,14 @@ members = [ ] [workspace.dependencies.snarkvm] -version = "=0.14.5" +# version = "=0.14.5" +git = "https://github.com/AleoHQ/snarkVM.git" +branch = "feat/instructions-signature" [workspace.dependencies.snarkvm-console] -version = "=0.14.5" +# version = "=0.14.5" +git = "https://github.com/AleoHQ/snarkVM.git" +branch = "feat/instructions-signature" [lib] path = "leo/lib.rs" From 47c91523042a2c3d696031af4fc0d73074f7a961 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Wed, 30 Aug 2023 13:34:02 -0400 Subject: [PATCH 11/12] Update deps --- Cargo.lock | 505 +++++++++++++++++++++++++++++------------------------ Cargo.toml | 6 +- 2 files changed, 274 insertions(+), 237 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f83c177be2..df59b824ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -60,9 +60,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -109,7 +109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72f2a841f04c2eaeb5a95312e5201a9e4b7c95b64ca99870d6bd2e2376df540a" dependencies = [ "proc-macro2", - "quote 1.0.31", + "quote 1.0.33", "syn 1.0.109", ] @@ -120,7 +120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6118baab6285accf088b31d5ea5029c37bbf9d98e62b4d8720a0a5a66bc2e427" dependencies = [ "proc-macro2", - "quote 1.0.31", + "quote 1.0.33", "syn 1.0.109", ] @@ -153,24 +153,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -192,9 +191,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -235,13 +234,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -252,9 +251,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -267,9 +266,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "base64ct" @@ -300,9 +299,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "blake2" @@ -344,9 +343,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", "regex-automata", @@ -400,11 +399,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -461,9 +461,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.22" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b417ae4361bca3f5de378294fc7472d3c4ed86a5ef9f49e93ae722f432aae8d2" +checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" dependencies = [ "clap_builder", "clap_derive", @@ -472,9 +472,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.22" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c90dc0f0e42c64bff177ca9d7be6fcc9ddb0f26a6e062174a61c84dd6c644d4" +checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" dependencies = [ "anstream", "anstyle", @@ -484,21 +484,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "color-backtrace" @@ -686,15 +686,15 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2", + "socket2 0.4.9", "winapi", ] [[package]] name = "curl-sys" -version = "0.4.63+curl-8.1.2" +version = "0.4.65+curl-8.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb0fef7046022a1e2ad67a004978f0e3cacb9e3123dc62ce768f92197b771dc" +checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" dependencies = [ "cc", "libc", @@ -705,6 +705,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + [[package]] name = "derivative" version = "2.2.0" @@ -712,7 +718,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", - "quote 1.0.31", + "quote 1.0.33", "syn 1.0.109", ] @@ -788,9 +794,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -800,9 +806,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -841,9 +847,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -868,9 +874,9 @@ checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -1001,15 +1007,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1103,9 +1109,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" @@ -1124,7 +1130,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1179,9 +1185,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", "instant", @@ -1452,9 +1458,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1470,9 +1476,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1486,15 +1492,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -1593,9 +1599,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1609,8 +1615,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -1660,9 +1666,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -1681,11 +1687,11 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -1701,8 +1707,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -1713,9 +1719,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -1755,7 +1761,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -1795,9 +1801,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1841,9 +1847,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.1" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "ppv-lite86" @@ -1905,9 +1911,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" [[package]] name = "quote" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2004,9 +2010,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", @@ -2016,9 +2022,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -2027,15 +2033,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "base64", "bytes", @@ -2101,11 +2107,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -2114,21 +2120,21 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki 0.101.1", + "rustls-webpki 0.101.4", "sct", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ "ring", "untrusted", @@ -2136,9 +2142,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -2204,9 +2210,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -2217,9 +2223,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -2252,29 +2258,29 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "indexmap 2.0.0", "itoa", @@ -2348,9 +2354,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -2367,7 +2373,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "anstyle", "anyhow", @@ -2396,7 +2402,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "aleo-std", "anyhow", @@ -2407,6 +2413,7 @@ dependencies = [ "hex", "indexmap 2.0.0", "itertools 0.11.0", + "num-traits", "parking_lot", "rand", "rand_chacha", @@ -2425,7 +2432,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -2439,7 +2446,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -2450,7 +2457,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -2460,7 +2467,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -2470,7 +2477,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "indexmap 2.0.0", "itertools 0.11.0", @@ -2488,12 +2495,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" [[package]] name = "snarkvm-circuit-network" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -2504,7 +2511,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-collections", @@ -2517,7 +2524,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -2532,7 +2539,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2545,7 +2552,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -2554,7 +2561,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2564,7 +2571,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2576,7 +2583,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2587,7 +2594,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2598,7 +2605,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2610,7 +2617,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -2623,7 +2630,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "bs58", "snarkvm-console-network", @@ -2633,7 +2640,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "blake2s_simd", "smallvec", @@ -2645,7 +2652,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "aleo-std", "rayon", @@ -2656,7 +2663,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "anyhow", "indexmap 2.0.0", @@ -2679,7 +2686,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "anyhow", "bech32", @@ -2696,7 +2703,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "enum_index", "enum_index_derive", @@ -2715,7 +2722,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -2730,7 +2737,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2741,7 +2748,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console-network-environment", ] @@ -2749,7 +2756,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2758,7 +2765,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2769,7 +2776,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2779,7 +2786,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2789,7 +2796,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2800,7 +2807,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "rand", "rayon", @@ -2814,7 +2821,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "aleo-std", "anyhow", @@ -2831,7 +2838,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "aleo-std", "anyhow", @@ -2855,7 +2862,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "anyhow", "rand", @@ -2867,7 +2874,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "indexmap 2.0.0", "rayon", @@ -2875,7 +2882,9 @@ dependencies = [ "snarkvm-console", "snarkvm-ledger-authority", "snarkvm-ledger-coinbase", + "snarkvm-ledger-committee", "snarkvm-ledger-narwhal-subdag", + "snarkvm-ledger-narwhal-transmission-id", "snarkvm-synthesizer-program", "snarkvm-synthesizer-snark", ] @@ -2883,8 +2892,9 @@ dependencies = [ [[package]] name = "snarkvm-ledger-coinbase" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ + "aleo-std", "anyhow", "bincode", "blake2", @@ -2902,7 +2912,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "indexmap 2.0.0", "serde_json", @@ -2912,10 +2922,11 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", + "snarkvm-ledger-narwhal-data", "snarkvm-ledger-narwhal-subdag", "snarkvm-ledger-narwhal-transmission", "snarkvm-ledger-narwhal-transmission-id", @@ -2924,7 +2935,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "indexmap 2.0.0", "serde_json", @@ -2936,7 +2947,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "indexmap 2.0.0", "serde_json", @@ -2944,33 +2955,46 @@ dependencies = [ "snarkvm-ledger-narwhal-transmission-id", ] +[[package]] +name = "snarkvm-ledger-narwhal-data" +version = "0.14.6" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" +dependencies = [ + "bytes", + "serde_json", + "snarkvm-console", + "tokio", +] + [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "indexmap 2.0.0", "serde_json", "snarkvm-console", "snarkvm-ledger-narwhal-batch-certificate", + "snarkvm-ledger-narwhal-transmission-id", ] [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "bytes", "serde_json", "snarkvm-console", "snarkvm-ledger-block", "snarkvm-ledger-coinbase", + "snarkvm-ledger-narwhal-data", ] [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "snarkvm-console", "snarkvm-ledger-coinbase", @@ -2979,7 +3003,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "async-trait", "reqwest", @@ -2992,7 +3016,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "anyhow", "bincode", @@ -3012,7 +3036,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "aleo-std", "anyhow", @@ -3036,15 +3060,19 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "aleo-std", + "anyhow", "indexmap 2.0.0", "parking_lot", "rand", + "rayon", "snarkvm-circuit", "snarkvm-console", "snarkvm-ledger-block", + "snarkvm-ledger-coinbase", + "snarkvm-ledger-committee", "snarkvm-ledger-query", "snarkvm-ledger-store", "snarkvm-synthesizer-process", @@ -3056,7 +3084,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "aleo-std", "colored", @@ -3077,7 +3105,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "indexmap 2.0.0", "paste", @@ -3091,7 +3119,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "bincode", "once_cell", @@ -3104,7 +3132,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "aleo-std", "anyhow", @@ -3123,11 +3151,11 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.14.6" -source = "git+https://github.com/AleoHQ/snarkVM.git?branch=feat/instructions-signature#51a936e1b59a0ba8151e061b1294b173a0755567" +source = "git+https://github.com/AleoHQ/snarkVM.git?branch=testnet3#05d7a1f1e371d77583506a34501a3de8a2949ea6" dependencies = [ "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -3140,6 +3168,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "spin" version = "0.5.2" @@ -3176,18 +3214,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote 1.0.31", + "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", - "quote 1.0.31", + "quote 1.0.33", "unicode-ident", ] @@ -3212,9 +3250,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", @@ -3263,8 +3301,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -3279,10 +3317,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ + "deranged", "serde", "time-core", ] @@ -3320,18 +3359,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "windows-sys 0.48.0", ] @@ -3427,8 +3465,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -3480,9 +3518,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -3537,7 +3575,7 @@ dependencies = [ "log", "once_cell", "rustls", - "rustls-webpki 0.100.1", + "rustls-webpki 0.100.2", "serde", "serde_json", "url", @@ -3546,9 +3584,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -3557,9 +3595,9 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf8parse" @@ -3639,8 +3677,8 @@ dependencies = [ "log", "once_cell", "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -3662,7 +3700,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.31", + "quote 1.0.33", "wasm-bindgen-macro-support", ] @@ -3673,8 +3711,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", - "quote 1.0.31", - "syn 2.0.28", + "quote 1.0.33", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3701,7 +3739,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki 0.100.1", + "rustls-webpki 0.100.2", ] [[package]] @@ -3750,7 +3788,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -3770,17 +3808,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -3791,9 +3829,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -3803,9 +3841,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -3815,9 +3853,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -3827,9 +3865,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -3839,9 +3877,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -3851,9 +3889,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -3863,26 +3901,27 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1c1815b8c7..4cb331236a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,14 +45,12 @@ members = [ ] [workspace.dependencies.snarkvm] -# version = "=0.14.5" git = "https://github.com/AleoHQ/snarkVM.git" -branch = "feat/instructions-signature" +branch = "testnet3" [workspace.dependencies.snarkvm-console] -# version = "=0.14.5" git = "https://github.com/AleoHQ/snarkVM.git" -branch = "feat/instructions-signature" +branch = "testnet3" [lib] path = "leo/lib.rs" From 964c9617f9114baebc84029c4d38cb5c7015cae3 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu Date: Wed, 30 Aug 2023 14:23:46 -0400 Subject: [PATCH 12/12] Fix and regen expectations --- compiler/parser/src/parser/expression.rs | 3 +- .../compiler/signature/signature.out | 12 +- tests/expectations/parser/type_/signature.out | 104 +++++++++++------- 3 files changed, 73 insertions(+), 46 deletions(-) diff --git a/compiler/parser/src/parser/expression.rs b/compiler/parser/src/parser/expression.rs index c260d1fb3c..d452892a60 100644 --- a/compiler/parser/src/parser/expression.rs +++ b/compiler/parser/src/parser/expression.rs @@ -347,7 +347,7 @@ impl ParserContext<'_> { (args.len(), CoreFunction::from_symbols(sym::signature, method.name)) { Ok(Expression::Access(AccessExpression::AssociatedFunction(AssociatedFunction { - ty: Type::Identifier(Identifier::new(sym::signature)), + ty: Type::Identifier(Identifier::new(sym::signature, self.node_builder.next_id())), name: method, arguments: { let mut arguments = vec![receiver]; @@ -355,6 +355,7 @@ impl ParserContext<'_> { arguments }, span, + id: self.node_builder.next_id(), }))) } else { // Attempt to parse the method call as a mapping operation. diff --git a/tests/expectations/compiler/signature/signature.out b/tests/expectations/compiler/signature/signature.out index 5d444e31ae..33576512f1 100644 --- a/tests/expectations/compiler/signature/signature.out +++ b/tests/expectations/compiler/signature/signature.out @@ -2,11 +2,11 @@ namespace: Compile expectation: Pass outputs: - - - initial_ast: eac40643953d449007d2cdf25f5fbbaab2d795606069feea951a9ac640b5ea20 - unrolled_ast: eac40643953d449007d2cdf25f5fbbaab2d795606069feea951a9ac640b5ea20 - ssa_ast: 2f764529d50f04616be0da13eefd1be0fb7de523efa7bdf5813841e9e55e2e28 - flattened_ast: 2f764529d50f04616be0da13eefd1be0fb7de523efa7bdf5813841e9e55e2e28 - inlined_ast: 2f764529d50f04616be0da13eefd1be0fb7de523efa7bdf5813841e9e55e2e28 - dce_ast: 2f764529d50f04616be0da13eefd1be0fb7de523efa7bdf5813841e9e55e2e28 + - - initial_ast: 66326647c8591d4479e5622bc50d2fffb7fcc9791925a7ab7018617a59b693a4 + unrolled_ast: 66326647c8591d4479e5622bc50d2fffb7fcc9791925a7ab7018617a59b693a4 + ssa_ast: 76f4f34b1e014012ba3ecc136b58787ed41de71f5ff83565f825258b9e8ea76f + flattened_ast: b0658ac6a7f5033380851c648f130884de04fde4bef415fa015e4d664aabb427 + inlined_ast: b0658ac6a7f5033380851c648f130884de04fde4bef415fa015e4d664aabb427 + dce_ast: b0658ac6a7f5033380851c648f130884de04fde4bef415fa015e4d664aabb427 bytecode: 87b34bffefde3c2b9e23ce08528737a4ef06a28ee9120c02d26ee41989f24cd2 warnings: "" diff --git a/tests/expectations/parser/type_/signature.out b/tests/expectations/parser/type_/signature.out index a575ed56aa..0b979cf158 100644 --- a/tests/expectations/parser/type_/signature.out +++ b/tests/expectations/parser/type_/signature.out @@ -4,38 +4,41 @@ expectation: Pass outputs: - imports: {} program_scopes: - "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}": - program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}" + "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}": + program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}" structs: {} mappings: {} functions: baz: annotations: [] variant: Transition - identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":40}\"}" + identifier: "{\"id\":\"2\",\"name\":\"baz\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":40}\"}" input: - Internal: - identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}" + identifier: "{\"id\":\"3\",\"name\":\"s\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}" mode: None type_: Signature span: lo: 41 hi: 42 + id: 4 - Internal: - identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":55,\\\"hi\\\":56}\"}" + identifier: "{\"id\":\"5\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":55,\\\"hi\\\":56}\"}" mode: None type_: Address span: lo: 55 hi: 56 + id: 6 - Internal: - identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":67,\\\"hi\\\":68}\"}" + identifier: "{\"id\":\"7\",\"name\":\"v\",\"span\":\"{\\\"lo\\\":67,\\\"hi\\\":68}\"}" mode: None type_: - Identifier: "{\"name\":\"value\",\"span\":\"{\\\"lo\\\":70,\\\"hi\\\":75}\"}" + Identifier: "{\"id\":\"8\",\"name\":\"value\",\"span\":\"{\\\"lo\\\":70,\\\"hi\\\":75}\"}" span: lo: 67 hi: 68 + id: 9 output: [] output_type: Unit block: @@ -43,73 +46,81 @@ outputs: - Definition: declaration_type: Let place: - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":91,\\\"hi\\\":92}\"}" + Identifier: "{\"id\":\"10\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":91,\\\"hi\\\":92}\"}" type_: Boolean value: Access: AssociatedFunction: ty: - Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":101,\\\"hi\\\":110}\"}" - name: "{\"name\":\"verify\",\"span\":\"{\\\"lo\\\":112,\\\"hi\\\":118}\"}" + Identifier: "{\"id\":\"11\",\"name\":\"signature\",\"span\":\"{\\\"lo\\\":101,\\\"hi\\\":110}\"}" + name: "{\"id\":\"12\",\"name\":\"verify\",\"span\":\"{\\\"lo\\\":112,\\\"hi\\\":118}\"}" arguments: - - Identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":119,\\\"hi\\\":120}\"}" - - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":122,\\\"hi\\\":123}\"}" - - Identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":125,\\\"hi\\\":126}\"}" + - Identifier: "{\"id\":\"13\",\"name\":\"s\",\"span\":\"{\\\"lo\\\":119,\\\"hi\\\":120}\"}" + - Identifier: "{\"id\":\"14\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":122,\\\"hi\\\":123}\"}" + - Identifier: "{\"id\":\"15\",\"name\":\"v\",\"span\":\"{\\\"lo\\\":125,\\\"hi\\\":126}\"}" span: lo: 101 hi: 127 + id: 16 span: lo: 87 hi: 127 + id: 17 - Definition: declaration_type: Let place: - Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":141,\\\"hi\\\":142}\"}" + Identifier: "{\"id\":\"18\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":141,\\\"hi\\\":142}\"}" type_: Boolean value: Access: AssociatedFunction: ty: - Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":0}\"}" - name: "{\"name\":\"verify\",\"span\":\"{\\\"lo\\\":153,\\\"hi\\\":159}\"}" + Identifier: "{\"id\":\"23\",\"name\":\"signature\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":0}\"}" + name: "{\"id\":\"20\",\"name\":\"verify\",\"span\":\"{\\\"lo\\\":153,\\\"hi\\\":159}\"}" arguments: - - Identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":151,\\\"hi\\\":152}\"}" - - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":160,\\\"hi\\\":161}\"}" - - Identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":163,\\\"hi\\\":164}\"}" + - Identifier: "{\"id\":\"19\",\"name\":\"s\",\"span\":\"{\\\"lo\\\":151,\\\"hi\\\":152}\"}" + - Identifier: "{\"id\":\"21\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":160,\\\"hi\\\":161}\"}" + - Identifier: "{\"id\":\"22\",\"name\":\"v\",\"span\":\"{\\\"lo\\\":163,\\\"hi\\\":164}\"}" span: lo: 151 hi: 165 + id: 24 span: lo: 137 hi: 165 + id: 25 - Assert: variant: AssertEq: - - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":185,\\\"hi\\\":186}\"}" - - Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":188,\\\"hi\\\":189}\"}" + - Identifier: "{\"id\":\"26\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":185,\\\"hi\\\":186}\"}" + - Identifier: "{\"id\":\"27\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":188,\\\"hi\\\":189}\"}" span: lo: 175 hi: 184 + id: 28 span: lo: 77 hi: 197 + id: 29 finalize: ~ span: lo: 26 hi: 197 + id: 30 bar: annotations: [] variant: Transition - identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":214,\\\"hi\\\":217}\"}" + identifier: "{\"id\":\"31\",\"name\":\"bar\",\"span\":\"{\\\"lo\\\":214,\\\"hi\\\":217}\"}" input: - Internal: - identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":218,\\\"hi\\\":219}\"}" + identifier: "{\"id\":\"32\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":218,\\\"hi\\\":219}\"}" mode: None type_: Integer: U8 span: lo: 218 hi: 219 + id: 33 output: - Internal: mode: None @@ -118,6 +129,7 @@ outputs: span: lo: 228 hi: 230 + id: 34 output_type: Integer: U8 block: @@ -125,7 +137,7 @@ outputs: - Definition: declaration_type: Let place: - Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":245,\\\"hi\\\":254}\"}" + Identifier: "{\"id\":\"35\",\"name\":\"signature\",\"span\":\"{\\\"lo\\\":245,\\\"hi\\\":254}\"}" type_: Integer: U8 value: @@ -138,56 +150,65 @@ outputs: - span: lo: 261 hi: 264 + - 36 right: - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":267,\\\"hi\\\":268}\"}" + Identifier: "{\"id\":\"37\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":267,\\\"hi\\\":268}\"}" op: Add span: lo: 261 hi: 268 + id: 38 span: lo: 241 hi: 268 + id: 39 - Return: expression: - Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":285,\\\"hi\\\":294}\"}" + Identifier: "{\"id\":\"40\",\"name\":\"signature\",\"span\":\"{\\\"lo\\\":285,\\\"hi\\\":294}\"}" finalize_arguments: ~ span: lo: 278 hi: 295 + id: 41 span: lo: 231 hi: 301 + id: 42 finalize: ~ span: lo: 203 hi: 301 + id: 43 bax: annotations: [] variant: Transition - identifier: "{\"name\":\"bax\",\"span\":\"{\\\"lo\\\":317,\\\"hi\\\":320}\"}" + identifier: "{\"id\":\"44\",\"name\":\"bax\",\"span\":\"{\\\"lo\\\":317,\\\"hi\\\":320}\"}" input: - Internal: - identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":321,\\\"hi\\\":322}\"}" + identifier: "{\"id\":\"45\",\"name\":\"s\",\"span\":\"{\\\"lo\\\":321,\\\"hi\\\":322}\"}" mode: None type_: Signature span: lo: 321 hi: 322 + id: 46 - Internal: - identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":335,\\\"hi\\\":336}\"}" + identifier: "{\"id\":\"47\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":335,\\\"hi\\\":336}\"}" mode: None type_: Address span: lo: 335 hi: 336 + id: 48 - Internal: - identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":347,\\\"hi\\\":348}\"}" + identifier: "{\"id\":\"49\",\"name\":\"v\",\"span\":\"{\\\"lo\\\":347,\\\"hi\\\":348}\"}" mode: None type_: - Identifier: "{\"name\":\"value\",\"span\":\"{\\\"lo\\\":350,\\\"hi\\\":355}\"}" + Identifier: "{\"id\":\"50\",\"name\":\"value\",\"span\":\"{\\\"lo\\\":350,\\\"hi\\\":355}\"}" span: lo: 347 hi: 348 + id: 51 output: [] output_type: Unit block: @@ -195,39 +216,44 @@ outputs: - Definition: declaration_type: Let place: - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":370,\\\"hi\\\":371}\"}" + Identifier: "{\"id\":\"52\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":370,\\\"hi\\\":371}\"}" type_: Boolean value: Access: AssociatedFunction: ty: - Identifier: "{\"name\":\"signature\",\"span\":\"{\\\"lo\\\":380,\\\"hi\\\":389}\"}" - name: "{\"name\":\"sign\",\"span\":\"{\\\"lo\\\":391,\\\"hi\\\":395}\"}" + Identifier: "{\"id\":\"53\",\"name\":\"signature\",\"span\":\"{\\\"lo\\\":380,\\\"hi\\\":389}\"}" + name: "{\"id\":\"54\",\"name\":\"sign\",\"span\":\"{\\\"lo\\\":391,\\\"hi\\\":395}\"}" arguments: - - Identifier: "{\"name\":\"s\",\"span\":\"{\\\"lo\\\":396,\\\"hi\\\":397}\"}" - - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":399,\\\"hi\\\":400}\"}" - - Identifier: "{\"name\":\"v\",\"span\":\"{\\\"lo\\\":402,\\\"hi\\\":403}\"}" + - Identifier: "{\"id\":\"55\",\"name\":\"s\",\"span\":\"{\\\"lo\\\":396,\\\"hi\\\":397}\"}" + - Identifier: "{\"id\":\"56\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":399,\\\"hi\\\":400}\"}" + - Identifier: "{\"id\":\"57\",\"name\":\"v\",\"span\":\"{\\\"lo\\\":402,\\\"hi\\\":403}\"}" span: lo: 380 hi: 404 + id: 58 span: lo: 366 hi: 404 + id: 59 - Assert: variant: AssertEq: - - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":423,\\\"hi\\\":424}\"}" - - Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":426,\\\"hi\\\":427}\"}" + - Identifier: "{\"id\":\"60\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":423,\\\"hi\\\":424}\"}" + - Identifier: "{\"id\":\"61\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":426,\\\"hi\\\":427}\"}" span: lo: 413 hi: 422 + id: 62 span: lo: 357 hi: 434 + id: 63 finalize: ~ span: lo: 306 hi: 434 + id: 64 span: lo: 2 hi: 436