From 37abf8d8df22b000abef0b12bcee89fce734a5d2 Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 17 Mar 2025 11:41:55 -0400 Subject: [PATCH 01/31] Apply inclusion proof fixes to REST and routes --- Cargo.lock | 120 ++++++++++++++++++++-------------------- Cargo.toml | 4 +- node/rest/Cargo.toml | 6 +- node/rest/src/routes.rs | 29 +++++++++- 4 files changed, 94 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b228ce1248..505ef8f568 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3811,7 +3811,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "anstyle", "anyhow", @@ -3842,7 +3842,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "anyhow", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3886,7 +3886,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3897,7 +3897,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3907,7 +3907,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3917,13 +3917,14 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "indexmap 2.7.1", "itertools 0.11.0", "nom", "num-traits", "once_cell", + "smallvec", "snarkvm-algorithms", "snarkvm-circuit-environment-witness", "snarkvm-console-network", @@ -3935,12 +3936,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" [[package]] name = "snarkvm-circuit-network" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3951,7 +3952,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3966,7 +3967,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3981,7 +3982,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3994,7 +3995,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4003,7 +4004,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4013,7 +4014,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4025,7 +4026,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4037,7 +4038,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4048,7 +4049,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4060,7 +4061,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4073,7 +4074,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "bs58", "snarkvm-console-network", @@ -4084,7 +4085,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "blake2s_simd", "smallvec", @@ -4097,7 +4098,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "rayon", @@ -4108,7 +4109,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4131,7 +4132,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "anyhow", "bech32", @@ -4149,7 +4150,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "enum-iterator", "enum_index", @@ -4171,7 +4172,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4186,7 +4187,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4197,7 +4198,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console-network-environment", ] @@ -4205,7 +4206,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4215,7 +4216,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4226,7 +4227,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4237,7 +4238,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4248,7 +4249,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4259,7 +4260,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "rand", "rayon", @@ -4273,7 +4274,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "anyhow", @@ -4290,11 +4291,12 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "anyhow", "indexmap 2.7.1", + "lru", "parking_lot", "rand", "rayon", @@ -4315,7 +4317,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "anyhow", "rand", @@ -4327,7 +4329,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4347,7 +4349,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4366,7 +4368,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4379,7 +4381,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4392,7 +4394,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4405,7 +4407,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "bytes", "serde_json", @@ -4416,7 +4418,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4431,7 +4433,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "bytes", "serde_json", @@ -4444,7 +4446,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4453,7 +4455,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "anyhow", @@ -4473,7 +4475,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "anyhow", @@ -4494,7 +4496,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4507,7 +4509,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std-storage", "anyhow", @@ -4534,7 +4536,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4549,7 +4551,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4558,7 +4560,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "anyhow", @@ -4583,7 +4585,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "anyhow", @@ -4615,7 +4617,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "colored", @@ -4639,7 +4641,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "indexmap 2.7.1", "paste", @@ -4654,7 +4656,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "bincode", "once_cell", @@ -4667,7 +4669,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "aleo-std", "anyhow", @@ -4688,7 +4690,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.3.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=3ced248#3ced248d4015c929f5240ce8fa5693ac3ae3b51b" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" dependencies = [ "proc-macro2", "quote 1.0.38", diff --git a/Cargo.toml b/Cargo.toml index 6ff474a346..e8f3c7795c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,8 +46,8 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" -git = "https://github.com/ProvableHQ/snarkVM.git" -rev = "3ced248" +git = "https://github.com/puzzlehq/snarkVM.git" +rev = "bb19cba" #version = "=1.3.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index 71f6e9defb..d958a88f17 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -66,9 +66,9 @@ path = "../router" version = "=3.3.2" [dependencies.snarkvm-synthesizer] -#path = "../../../snarkVM/synthesizer" -git = "https://github.com/ProvableHQ/snarkVM.git" -rev = "3ced248" +# path = "../../../snarkVM/synthesizer" +git = "https://github.com/puzzlehq/snarkVM.git" +rev = "bb19cba" #version = "=1.3.0" default-features = false optional = true diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 0b59eafe3d..7d3872503a 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -24,7 +24,7 @@ use indexmap::IndexMap; use rayon::prelude::*; use serde::{Deserialize, Serialize}; use serde_json::json; - +use std::collections::HashMap; /// The `get_blocks` query object. #[derive(Deserialize, Serialize)] pub(crate) struct BlockRange { @@ -264,6 +264,33 @@ impl, R: Routing> Rest { Ok(ErasedJson::pretty(rest.ledger.get_state_path_for_commitment(&commitment)?)) } + pub(crate) async fn get_state_proofs_for_block( + State(rest): State, + Path(block_height): Path, + Query(params): Query>>, // Assuming axum query parsing + ) -> Result { + // Extract commitments from query + let commitments: Vec> = params + .get("commitments[]") + .ok_or_else(|| RestError("No commitments provided".to_string()))? + .iter() + .map(|commitment| commitment.parse::>()) + .collect::, _>>() + .map_err(|_| RestError("Invalid commitment provided".to_string()))?; + + // Run blocking fetch on the ledger + let result = + tokio::task::spawn_blocking(move || rest.ledger.get_state_proofs_for_block(block_height, &commitments)) + .await + .map_err(|err| RestError(format!("Failed to spawn blocking task - {err}")))?; + + // Handle result and return JSON + match result { + Ok(proofs) => Ok(ErasedJson::pretty(proofs)), + Err(err) => Err(RestError(format!("Unable to get state proofs - {err}"))), + } + } + // GET //stateRoot/latest pub(crate) async fn get_state_root_latest(State(rest): State) -> ErasedJson { ErasedJson::pretty(rest.ledger.latest_state_root()) From c8fcf72211d95aef8008ab5355fdb20c43fb945a Mon Sep 17 00:00:00 2001 From: dark horse Date: Tue, 18 Mar 2025 15:48:03 -0400 Subject: [PATCH 02/31] add new route --- node/rest/src/lib.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/node/rest/src/lib.rs b/node/rest/src/lib.rs index 0b3b95c6df..b095f8663b 100644 --- a/node/rest/src/lib.rs +++ b/node/rest/src/lib.rs @@ -188,6 +188,10 @@ impl, R: Routing> Rest { .route(&format!("/{network}/memoryPool/solutions"), get(Self::get_memory_pool_solutions)) .route(&format!("/{network}/memoryPool/transactions"), get(Self::get_memory_pool_transactions)) .route(&format!("/{network}/statePath/:commitment"), get(Self::get_state_path_for_commitment)) + .route( + &format!("/{network}/stateProofsForBlock/:blockHeight"), + get(Self::get_state_proofs_for_block) + ) .route(&format!("/{network}/stateRoot/latest"), get(Self::get_state_root_latest)) .route(&format!("/{network}/stateRoot/:height"), get(Self::get_state_root)) .route(&format!("/{network}/committee/latest"), get(Self::get_committee_latest)) From 7066cddd2b967b7b8adf418edc63e89ef18851c7 Mon Sep 17 00:00:00 2001 From: dark horse Date: Tue, 18 Mar 2025 16:53:58 -0400 Subject: [PATCH 03/31] update route query params format --- node/rest/src/routes.rs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 7d3872503a..a7523655d2 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -267,30 +267,29 @@ impl, R: Routing> Rest { pub(crate) async fn get_state_proofs_for_block( State(rest): State, Path(block_height): Path, - Query(params): Query>>, // Assuming axum query parsing + Query(params): Query>>, ) -> Result { - // Extract commitments from query let commitments: Vec> = params - .get("commitments[]") + .get("commitments") .ok_or_else(|| RestError("No commitments provided".to_string()))? .iter() .map(|commitment| commitment.parse::>()) .collect::, _>>() .map_err(|_| RestError("Invalid commitment provided".to_string()))?; - // Run blocking fetch on the ledger - let result = - tokio::task::spawn_blocking(move || rest.ledger.get_state_proofs_for_block(block_height, &commitments)) - .await - .map_err(|err| RestError(format!("Failed to spawn blocking task - {err}")))?; + let result = tokio::task::spawn_blocking(move || { + rest.ledger.get_state_proofs_for_block(block_height, &commitments) + }) + .await + .map_err(|err| RestError(format!("Failed to spawn blocking task - {err}")))?; - // Handle result and return JSON match result { Ok(proofs) => Ok(ErasedJson::pretty(proofs)), Err(err) => Err(RestError(format!("Unable to get state proofs - {err}"))), } } + // GET //stateRoot/latest pub(crate) async fn get_state_root_latest(State(rest): State) -> ErasedJson { ErasedJson::pretty(rest.ledger.latest_state_root()) From 549256bb173fb4bd5a95241a0ffc14443a297490 Mon Sep 17 00:00:00 2001 From: dark horse Date: Tue, 18 Mar 2025 17:09:16 -0400 Subject: [PATCH 04/31] add query struct for commitments --- node/rest/src/routes.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index a7523655d2..69d8058431 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -34,6 +34,12 @@ pub(crate) struct BlockRange { end: u32, } +#[derive(Debug, Deserialize)] +pub(crate) struct StateProofsQuery { + commitments: Vec, +} + + /// The query object for `get_mapping_value` and `get_mapping_values`. #[derive(Copy, Clone, Deserialize, Serialize)] pub(crate) struct Metadata { @@ -267,11 +273,10 @@ impl, R: Routing> Rest { pub(crate) async fn get_state_proofs_for_block( State(rest): State, Path(block_height): Path, - Query(params): Query>>, + Query(params): Query, ) -> Result { let commitments: Vec> = params - .get("commitments") - .ok_or_else(|| RestError("No commitments provided".to_string()))? + .commitments .iter() .map(|commitment| commitment.parse::>()) .collect::, _>>() From 48650c71425ca565049beed42846e396bb8ea295 Mon Sep 17 00:00:00 2001 From: dark horse Date: Thu, 20 Mar 2025 11:57:06 -0400 Subject: [PATCH 05/31] try option vec --- node/rest/src/routes.rs | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 69d8058431..ae521583cb 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -36,7 +36,7 @@ pub(crate) struct BlockRange { #[derive(Debug, Deserialize)] pub(crate) struct StateProofsQuery { - commitments: Vec, + commitments: Option>, } @@ -273,14 +273,26 @@ impl, R: Routing> Rest { pub(crate) async fn get_state_proofs_for_block( State(rest): State, Path(block_height): Path, - Query(params): Query, + Query(params): Query>> + // Query(params): Query, ) -> Result { + info!("block_height: {}", block_height); + + // Log the query params raw + info!("params: {:?}", params); + + // Log the commitments directly + // info!("commitments (raw): {:?}", params.commitments); + let commitments: Vec> = params - .commitments - .iter() - .map(|commitment| commitment.parse::>()) - .collect::, _>>() - .map_err(|_| RestError("Invalid commitment provided".to_string()))?; + .get("commitments") + .unwrap_or(&Vec::new()) + .iter() + .map(|commitment| commitment.parse::>()) + .collect::, _>>()?; + + + info!("parsed commitments: {:?}", commitments); let result = tokio::task::spawn_blocking(move || { rest.ledger.get_state_proofs_for_block(block_height, &commitments) From 74f94d59867878be90a064d89d7ac7e686edbd79 Mon Sep 17 00:00:00 2001 From: dark horse Date: Thu, 20 Mar 2025 11:58:44 -0400 Subject: [PATCH 06/31] update revs --- Cargo.lock | 120 ++++++++++++++++++++-------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- node/rest/src/routes.rs | 25 ++++----- 4 files changed, 71 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 505ef8f568..7be778982f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3811,7 +3811,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "anstyle", "anyhow", @@ -3842,7 +3842,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "anyhow", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3886,7 +3886,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3897,7 +3897,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3907,7 +3907,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3917,14 +3917,13 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "indexmap 2.7.1", "itertools 0.11.0", "nom", "num-traits", "once_cell", - "smallvec", "snarkvm-algorithms", "snarkvm-circuit-environment-witness", "snarkvm-console-network", @@ -3936,12 +3935,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" [[package]] name = "snarkvm-circuit-network" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3952,7 +3951,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3967,7 +3966,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3982,7 +3981,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3995,7 +3994,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4004,7 +4003,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4014,7 +4013,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4026,7 +4025,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4038,7 +4037,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4049,7 +4048,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4061,7 +4060,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4074,7 +4073,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "bs58", "snarkvm-console-network", @@ -4085,7 +4084,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "blake2s_simd", "smallvec", @@ -4098,7 +4097,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "rayon", @@ -4109,7 +4108,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4132,7 +4131,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "anyhow", "bech32", @@ -4150,7 +4149,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "enum-iterator", "enum_index", @@ -4172,7 +4171,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4187,7 +4186,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4198,7 +4197,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console-network-environment", ] @@ -4206,7 +4205,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4216,7 +4215,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4227,7 +4226,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4238,7 +4237,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4249,7 +4248,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4260,7 +4259,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "rand", "rayon", @@ -4274,7 +4273,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "anyhow", @@ -4291,12 +4290,11 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "anyhow", "indexmap 2.7.1", - "lru", "parking_lot", "rand", "rayon", @@ -4317,7 +4315,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "anyhow", "rand", @@ -4329,7 +4327,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4349,7 +4347,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4368,7 +4366,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4381,7 +4379,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4394,7 +4392,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4407,7 +4405,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "bytes", "serde_json", @@ -4418,7 +4416,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4433,7 +4431,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "bytes", "serde_json", @@ -4446,7 +4444,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4455,7 +4453,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "anyhow", @@ -4475,7 +4473,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "anyhow", @@ -4496,7 +4494,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4509,7 +4507,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std-storage", "anyhow", @@ -4536,7 +4534,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4551,7 +4549,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4560,7 +4558,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "anyhow", @@ -4585,7 +4583,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "anyhow", @@ -4617,7 +4615,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "colored", @@ -4641,7 +4639,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "indexmap 2.7.1", "paste", @@ -4656,7 +4654,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "bincode", "once_cell", @@ -4669,7 +4667,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "aleo-std", "anyhow", @@ -4690,7 +4688,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=bb19cba#bb19cba4542506a3f09ebce69b1feb28946ceddf" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" dependencies = [ "proc-macro2", "quote 1.0.38", diff --git a/Cargo.toml b/Cargo.toml index e8f3c7795c..6c7bb40139 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzlehq/snarkVM.git" -rev = "bb19cba" +rev = "3f14883" #version = "=1.3.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index d958a88f17..e7ac118629 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -68,7 +68,7 @@ version = "=3.3.2" [dependencies.snarkvm-synthesizer] # path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzlehq/snarkVM.git" -rev = "bb19cba" +rev = "3f14883" #version = "=1.3.0" default-features = false optional = true diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index ae521583cb..3756270e4a 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -39,7 +39,6 @@ pub(crate) struct StateProofsQuery { commitments: Option>, } - /// The query object for `get_mapping_value` and `get_mapping_values`. #[derive(Copy, Clone, Deserialize, Serialize)] pub(crate) struct Metadata { @@ -273,8 +272,7 @@ impl, R: Routing> Rest { pub(crate) async fn get_state_proofs_for_block( State(rest): State, Path(block_height): Path, - Query(params): Query>> - // Query(params): Query, + Query(params): Query>>, // Query(params): Query, ) -> Result { info!("block_height: {}", block_height); @@ -285,20 +283,18 @@ impl, R: Routing> Rest { // info!("commitments (raw): {:?}", params.commitments); let commitments: Vec> = params - .get("commitments") - .unwrap_or(&Vec::new()) - .iter() - .map(|commitment| commitment.parse::>()) - .collect::, _>>()?; - + .get("commitments") + .unwrap_or(&Vec::new()) + .iter() + .map(|commitment| commitment.parse::>()) + .collect::, _>>()?; info!("parsed commitments: {:?}", commitments); - let result = tokio::task::spawn_blocking(move || { - rest.ledger.get_state_proofs_for_block(block_height, &commitments) - }) - .await - .map_err(|err| RestError(format!("Failed to spawn blocking task - {err}")))?; + let result = + tokio::task::spawn_blocking(move || rest.ledger.get_state_proofs_for_block(block_height, &commitments)) + .await + .map_err(|err| RestError(format!("Failed to spawn blocking task - {err}")))?; match result { Ok(proofs) => Ok(ErasedJson::pretty(proofs)), @@ -306,7 +302,6 @@ impl, R: Routing> Rest { } } - // GET //stateRoot/latest pub(crate) async fn get_state_root_latest(State(rest): State) -> ErasedJson { ErasedJson::pretty(rest.ledger.latest_state_root()) From 09d9cd968c395802d46cb4b829ebde78b22551cc Mon Sep 17 00:00:00 2001 From: dark horse Date: Thu, 20 Mar 2025 15:19:55 -0400 Subject: [PATCH 07/31] switch to query params for stateproofs --- node/rest/src/routes.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 3756270e4a..685bdfc93d 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -272,7 +272,7 @@ impl, R: Routing> Rest { pub(crate) async fn get_state_proofs_for_block( State(rest): State, Path(block_height): Path, - Query(params): Query>>, // Query(params): Query, + Query(params): Query, ) -> Result { info!("block_height: {}", block_height); @@ -283,11 +283,11 @@ impl, R: Routing> Rest { // info!("commitments (raw): {:?}", params.commitments); let commitments: Vec> = params - .get("commitments") - .unwrap_or(&Vec::new()) - .iter() - .map(|commitment| commitment.parse::>()) - .collect::, _>>()?; + .commitments + .unwrap_or_default() + .iter() + .map(|commitment| commitment.parse::>()) + .collect::, _>>()?; info!("parsed commitments: {:?}", commitments); From e86dd4fd0ab07852ff31669c2126b0c494b4246e Mon Sep 17 00:00:00 2001 From: dark horse Date: Thu, 20 Mar 2025 15:20:46 -0400 Subject: [PATCH 08/31] format fix --- node/rest/src/routes.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 685bdfc93d..b43672b42f 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -283,11 +283,11 @@ impl, R: Routing> Rest { // info!("commitments (raw): {:?}", params.commitments); let commitments: Vec> = params - .commitments - .unwrap_or_default() - .iter() - .map(|commitment| commitment.parse::>()) - .collect::, _>>()?; + .commitments + .unwrap_or_default() + .iter() + .map(|commitment| commitment.parse::>()) + .collect::, _>>()?; info!("parsed commitments: {:?}", commitments); From 406d2597bac5cc3861557b91e1facc5797e88f21 Mon Sep 17 00:00:00 2001 From: dark horse Date: Thu, 20 Mar 2025 16:05:25 -0400 Subject: [PATCH 09/31] try serde rename --- node/rest/src/routes.rs | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index b43672b42f..c45562de31 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -36,6 +36,7 @@ pub(crate) struct BlockRange { #[derive(Debug, Deserialize)] pub(crate) struct StateProofsQuery { + #[serde(default)] commitments: Option>, } @@ -274,32 +275,26 @@ impl, R: Routing> Rest { Path(block_height): Path, Query(params): Query, ) -> Result { - info!("block_height: {}", block_height); - - // Log the query params raw - info!("params: {:?}", params); - - // Log the commitments directly - // info!("commitments (raw): {:?}", params.commitments); + // Log for debugging. + info!("Requesting state proofs for block: {}", block_height); + info!("Query parameters: {:?}", params); + // Parse the commitments from strings to the expected Field type. let commitments: Vec> = params .commitments .unwrap_or_default() .iter() - .map(|commitment| commitment.parse::>()) + .map(|s| s.parse::>()) .collect::, _>>()?; - info!("parsed commitments: {:?}", commitments); - - let result = + // Retrieve proofs in a blocking task. + let proofs = tokio::task::spawn_blocking(move || rest.ledger.get_state_proofs_for_block(block_height, &commitments)) .await - .map_err(|err| RestError(format!("Failed to spawn blocking task - {err}")))?; + .map_err(|err| RestError(format!("Failed to spawn blocking task - {err}")))? + .map_err(|err| RestError(format!("Unable to get state proofs - {err}")))?; - match result { - Ok(proofs) => Ok(ErasedJson::pretty(proofs)), - Err(err) => Err(RestError(format!("Unable to get state proofs - {err}"))), - } + Ok(ErasedJson::pretty(proofs)) } // GET //stateRoot/latest From 3ffd184ef05f050a907b454f0b88c167ae1136e9 Mon Sep 17 00:00:00 2001 From: dark horse Date: Thu, 20 Mar 2025 16:55:15 -0400 Subject: [PATCH 10/31] more testing --- node/rest/src/routes.rs | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index c45562de31..a57eae0ee5 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -34,10 +34,27 @@ pub(crate) struct BlockRange { end: u32, } +#[derive(Debug, Deserialize)] +#[serde(untagged)] +pub enum OneOrMany { + One(String), + Many(Vec), +} + +impl From for Vec { + fn from(value: OneOrMany) -> Self { + match value { + OneOrMany::One(s) => vec![s], + OneOrMany::Many(v) => v, + } + } +} + +// Update the StateProofsQuery to use the helper type. #[derive(Debug, Deserialize)] pub(crate) struct StateProofsQuery { #[serde(default)] - commitments: Option>, + commitments: Option, } /// The query object for `get_mapping_value` and `get_mapping_values`. @@ -279,13 +296,12 @@ impl, R: Routing> Rest { info!("Requesting state proofs for block: {}", block_height); info!("Query parameters: {:?}", params); - // Parse the commitments from strings to the expected Field type. - let commitments: Vec> = params - .commitments - .unwrap_or_default() - .iter() - .map(|s| s.parse::>()) - .collect::, _>>()?; + // Convert the query parameter to a Vec + let commitments_str: Vec = params.commitments.map_or_else(Vec::new, |v| v.into()); + + // Parse the strings to the expected Field type. + let commitments: Vec> = + commitments_str.iter().map(|s| s.parse::>()).collect::, _>>()?; // Retrieve proofs in a blocking task. let proofs = From 7613ac37f8d44be30709130a5748a0852d65ef49 Mon Sep 17 00:00:00 2001 From: dark horse Date: Thu, 27 Mar 2025 11:27:28 -0400 Subject: [PATCH 11/31] update snarkvm rev --- Cargo.lock | 118 +++++++++++++++++++++---------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7be778982f..47f65d4f26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3811,7 +3811,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "anstyle", "anyhow", @@ -3842,7 +3842,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "anyhow", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3886,7 +3886,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3897,7 +3897,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3907,7 +3907,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3917,7 +3917,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "indexmap 2.7.1", "itertools 0.11.0", @@ -3935,12 +3935,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" [[package]] name = "snarkvm-circuit-network" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3951,7 +3951,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3966,7 +3966,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3981,7 +3981,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3994,7 +3994,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4003,7 +4003,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4013,7 +4013,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4025,7 +4025,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4037,7 +4037,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4048,7 +4048,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4060,7 +4060,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4073,7 +4073,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "bs58", "snarkvm-console-network", @@ -4084,7 +4084,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "blake2s_simd", "smallvec", @@ -4097,7 +4097,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "rayon", @@ -4108,7 +4108,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4131,7 +4131,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "anyhow", "bech32", @@ -4149,7 +4149,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "enum-iterator", "enum_index", @@ -4171,7 +4171,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4186,7 +4186,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4197,7 +4197,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console-network-environment", ] @@ -4205,7 +4205,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4226,7 +4226,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4237,7 +4237,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4248,7 +4248,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4259,7 +4259,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "rand", "rayon", @@ -4273,7 +4273,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "anyhow", @@ -4290,7 +4290,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "anyhow", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "anyhow", "rand", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4347,7 +4347,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4366,7 +4366,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4379,7 +4379,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4392,7 +4392,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4405,7 +4405,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "bytes", "serde_json", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4431,7 +4431,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "bytes", "serde_json", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4453,7 +4453,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "anyhow", @@ -4473,7 +4473,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "anyhow", @@ -4494,7 +4494,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4507,7 +4507,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std-storage", "anyhow", @@ -4534,7 +4534,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4549,7 +4549,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "anyhow", @@ -4583,7 +4583,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "anyhow", @@ -4615,7 +4615,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "colored", @@ -4639,7 +4639,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "indexmap 2.7.1", "paste", @@ -4654,7 +4654,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "bincode", "once_cell", @@ -4667,7 +4667,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "aleo-std", "anyhow", @@ -4688,7 +4688,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f14883#3f148831a911e9dc6703215f0f79fa06e7829bea" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" dependencies = [ "proc-macro2", "quote 1.0.38", diff --git a/Cargo.toml b/Cargo.toml index 6c7bb40139..465b59d673 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzlehq/snarkVM.git" -rev = "3f14883" +rev = "ac449f8" #version = "=1.3.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index e7ac118629..1ea819ebe8 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -68,7 +68,7 @@ version = "=3.3.2" [dependencies.snarkvm-synthesizer] # path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzlehq/snarkVM.git" -rev = "3f14883" +rev = "ac449f8" #version = "=1.3.0" default-features = false optional = true From 9ed712f18efd823fac0096be78c9d4c383eb89f1 Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 31 Mar 2025 11:00:59 -0400 Subject: [PATCH 12/31] update snarkvm rev --- Cargo.lock | 118 +++++++++++++++++++++---------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47f65d4f26..94ca04e269 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3811,7 +3811,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "anstyle", "anyhow", @@ -3842,7 +3842,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "anyhow", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3886,7 +3886,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3897,7 +3897,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3907,7 +3907,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3917,7 +3917,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "indexmap 2.7.1", "itertools 0.11.0", @@ -3935,12 +3935,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" [[package]] name = "snarkvm-circuit-network" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3951,7 +3951,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3966,7 +3966,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3981,7 +3981,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3994,7 +3994,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4003,7 +4003,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4013,7 +4013,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4025,7 +4025,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4037,7 +4037,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4048,7 +4048,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4060,7 +4060,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4073,7 +4073,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "bs58", "snarkvm-console-network", @@ -4084,7 +4084,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "blake2s_simd", "smallvec", @@ -4097,7 +4097,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "rayon", @@ -4108,7 +4108,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4131,7 +4131,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "anyhow", "bech32", @@ -4149,7 +4149,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "enum-iterator", "enum_index", @@ -4171,7 +4171,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4186,7 +4186,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4197,7 +4197,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console-network-environment", ] @@ -4205,7 +4205,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4226,7 +4226,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4237,7 +4237,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4248,7 +4248,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4259,7 +4259,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "rand", "rayon", @@ -4273,7 +4273,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "anyhow", @@ -4290,7 +4290,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "anyhow", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "anyhow", "rand", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4347,7 +4347,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4366,7 +4366,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4379,7 +4379,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4392,7 +4392,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4405,7 +4405,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "bytes", "serde_json", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4431,7 +4431,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "bytes", "serde_json", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4453,7 +4453,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "anyhow", @@ -4473,7 +4473,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "anyhow", @@ -4494,7 +4494,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4507,7 +4507,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std-storage", "anyhow", @@ -4534,7 +4534,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4549,7 +4549,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "anyhow", @@ -4583,7 +4583,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "anyhow", @@ -4615,7 +4615,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "colored", @@ -4639,7 +4639,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "indexmap 2.7.1", "paste", @@ -4654,7 +4654,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "bincode", "once_cell", @@ -4667,7 +4667,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "aleo-std", "anyhow", @@ -4688,7 +4688,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=ac449f8#ac449f8860467cb9cda5792d7f433f7c40683258" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" dependencies = [ "proc-macro2", "quote 1.0.38", diff --git a/Cargo.toml b/Cargo.toml index 465b59d673..0cc27cfb8d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzlehq/snarkVM.git" -rev = "ac449f8" +rev = "3f135f2" #version = "=1.3.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index 1ea819ebe8..e4f4e04cd8 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -68,7 +68,7 @@ version = "=3.3.2" [dependencies.snarkvm-synthesizer] # path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzlehq/snarkVM.git" -rev = "ac449f8" +rev = "3f135f2" #version = "=1.3.0" default-features = false optional = true From 527da8a43937b1cd02172db5d6754dd69af04466 Mon Sep 17 00:00:00 2001 From: dark horse Date: Thu, 3 Apr 2025 11:21:04 -0400 Subject: [PATCH 13/31] update snarkvm rev for enhanced logging --- Cargo.lock | 118 +++++++++++++++++++++---------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94ca04e269..92a1d00a5d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3811,7 +3811,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "anstyle", "anyhow", @@ -3842,7 +3842,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "anyhow", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3886,7 +3886,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3897,7 +3897,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3907,7 +3907,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3917,7 +3917,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "indexmap 2.7.1", "itertools 0.11.0", @@ -3935,12 +3935,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" [[package]] name = "snarkvm-circuit-network" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3951,7 +3951,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3966,7 +3966,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3981,7 +3981,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3994,7 +3994,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4003,7 +4003,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4013,7 +4013,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4025,7 +4025,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4037,7 +4037,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4048,7 +4048,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4060,7 +4060,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4073,7 +4073,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "bs58", "snarkvm-console-network", @@ -4084,7 +4084,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "blake2s_simd", "smallvec", @@ -4097,7 +4097,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "rayon", @@ -4108,7 +4108,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4131,7 +4131,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "anyhow", "bech32", @@ -4149,7 +4149,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "enum-iterator", "enum_index", @@ -4171,7 +4171,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4186,7 +4186,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4197,7 +4197,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console-network-environment", ] @@ -4205,7 +4205,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4226,7 +4226,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4237,7 +4237,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4248,7 +4248,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4259,7 +4259,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "rand", "rayon", @@ -4273,7 +4273,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "anyhow", @@ -4290,7 +4290,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "anyhow", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "anyhow", "rand", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4347,7 +4347,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "anyhow", "indexmap 2.7.1", @@ -4366,7 +4366,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4379,7 +4379,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4392,7 +4392,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4405,7 +4405,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "bytes", "serde_json", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "indexmap 2.7.1", "rayon", @@ -4431,7 +4431,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "bytes", "serde_json", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4453,7 +4453,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "anyhow", @@ -4473,7 +4473,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "anyhow", @@ -4494,7 +4494,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4507,7 +4507,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std-storage", "anyhow", @@ -4534,7 +4534,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4549,7 +4549,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "anyhow", @@ -4583,7 +4583,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "anyhow", @@ -4615,7 +4615,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "colored", @@ -4639,7 +4639,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "indexmap 2.7.1", "paste", @@ -4654,7 +4654,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "bincode", "once_cell", @@ -4667,7 +4667,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "aleo-std", "anyhow", @@ -4688,7 +4688,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.3.0" -source = "git+https://github.com/puzzlehq/snarkVM.git?rev=3f135f2#3f135f25c0ec1964d7a4d8e0c8a63d37358ffe59" +source = "git+https://github.com/puzzlehq/snarkVM.git?rev=c22a3d9#c22a3d9329d95de0951d420e8e087f9f39a2e135" dependencies = [ "proc-macro2", "quote 1.0.38", diff --git a/Cargo.toml b/Cargo.toml index 0cc27cfb8d..1cd60af316 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzlehq/snarkVM.git" -rev = "3f135f2" +rev = "c22a3d9" #version = "=1.3.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index e4f4e04cd8..cb971c1fbc 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -68,7 +68,7 @@ version = "=3.3.2" [dependencies.snarkvm-synthesizer] # path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzlehq/snarkVM.git" -rev = "3f135f2" +rev = "c22a3d9" #version = "=1.3.0" default-features = false optional = true From aae606755bd14feaa2e5aebf238c77fea1f55645 Mon Sep 17 00:00:00 2001 From: dark horse Date: Fri, 18 Apr 2025 11:25:39 -0400 Subject: [PATCH 14/31] update route inputs --- node/rest/src/routes.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 0b5038f0da..b38ee728fb 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -53,10 +53,10 @@ impl From for Vec { // Update the StateProofsQuery to use the helper type. #[derive(Debug, Deserialize)] pub(crate) struct StateProofsQuery { - #[serde(default)] - commitments: Option, + pub commitments: Vec, } + /// The query object for `get_mapping_value` and `get_mapping_values`. #[derive(Copy, Clone, Deserialize, Serialize)] pub(crate) struct Metadata { @@ -297,7 +297,7 @@ impl, R: Routing> Rest { info!("Query parameters: {:?}", params); // Convert the query parameter to a Vec - let commitments_str: Vec = params.commitments.map_or_else(Vec::new, |v| v.into()); + let commitments_str = params.commitments; // Parse the strings to the expected Field type. let commitments: Vec> = From 3749525462722a4324c32ba3fca8221601f18d4c Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 28 Apr 2025 11:16:17 -0400 Subject: [PATCH 15/31] format --- Cargo.lock | 12 ++++++++++++ node/rest/Cargo.toml | 3 +++ node/rest/src/routes.rs | 16 +++++++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7558336e7..8dbb25d291 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3305,6 +3305,17 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_qs" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" +dependencies = [ + "percent-encoding", + "serde", + "thiserror 1.0.69", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3767,6 +3778,7 @@ dependencies = [ "rayon", "serde", "serde_json", + "serde_qs", "snarkos-node-consensus", "snarkos-node-router", "snarkvm", diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index 7a4ce4ff38..9ccb6675be 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -114,3 +114,6 @@ features = [ "cors", "trace" ] [dependencies.tracing] version = "0.1" + +[dependencies.serde_qs] +version = "0.12" \ No newline at end of file diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index b38ee728fb..681d0e84d8 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -24,6 +24,7 @@ use indexmap::IndexMap; use rayon::prelude::*; use serde::{Deserialize, Serialize}; use serde_json::json; +use serde_qs; use std::collections::HashMap; /// The `get_blocks` query object. #[derive(Deserialize, Serialize)] @@ -53,10 +54,10 @@ impl From for Vec { // Update the StateProofsQuery to use the helper type. #[derive(Debug, Deserialize)] pub(crate) struct StateProofsQuery { + #[serde(default)] pub commitments: Vec, } - /// The query object for `get_mapping_value` and `get_mapping_values`. #[derive(Copy, Clone, Deserialize, Serialize)] pub(crate) struct Metadata { @@ -287,13 +288,22 @@ impl, R: Routing> Rest { Ok(ErasedJson::pretty(rest.ledger.get_state_path_for_commitment(&commitment)?)) } + // GET //statePath/{commitment} pub(crate) async fn get_state_proofs_for_block( State(rest): State, Path(block_height): Path, - Query(params): Query, + req: Request, ) -> Result { - // Log for debugging. + // Log for debugging info!("Requesting state proofs for block: {}", block_height); + + // Extract query string + let query = req.uri().query().unwrap_or(""); + + // Use serde_qs to parse the query string + let params: StateProofsQuery = + serde_qs::from_str(query).map_err(|e| RestError(format!("Failed to parse query parameters: {}", e)))?; + info!("Query parameters: {:?}", params); // Convert the query parameter to a Vec From f88f98eb79e072d005e985f07e1cb0ddc1964235 Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 28 Apr 2025 15:25:42 -0400 Subject: [PATCH 16/31] add serde qs non strict --- node/rest/src/routes.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 681d0e84d8..cdd954f978 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -300,9 +300,12 @@ impl, R: Routing> Rest { // Extract query string let query = req.uri().query().unwrap_or(""); - // Use serde_qs to parse the query string - let params: StateProofsQuery = - serde_qs::from_str(query).map_err(|e| RestError(format!("Failed to parse query parameters: {}", e)))?; + // Create a non-strict config for serde_qs + let config = serde_qs::Config::new(5, false); + + // Use serde_qs with non-strict mode to parse the query string + let params: StateProofsQuery = config.deserialize_str(query) + .map_err(|e| RestError(format!("Failed to parse query parameters: {}", e)))?; info!("Query parameters: {:?}", params); From 39c4d993bac278cded6207aa486ed14950ef30c3 Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 28 Apr 2025 15:30:13 -0400 Subject: [PATCH 17/31] format --- node/rest/src/routes.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index cdd954f978..5c63151797 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -304,8 +304,8 @@ impl, R: Routing> Rest { let config = serde_qs::Config::new(5, false); // Use serde_qs with non-strict mode to parse the query string - let params: StateProofsQuery = config.deserialize_str(query) - .map_err(|e| RestError(format!("Failed to parse query parameters: {}", e)))?; + let params: StateProofsQuery = + config.deserialize_str(query).map_err(|e| RestError(format!("Failed to parse query parameters: {}", e)))?; info!("Query parameters: {:?}", params); From 9340e94dab60b83dc518add878cc5dd1e9858f25 Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 28 Apr 2025 15:58:47 -0400 Subject: [PATCH 18/31] remove logs --- node/rest/src/routes.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 5c63151797..d1e2718b5b 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -294,9 +294,6 @@ impl, R: Routing> Rest { Path(block_height): Path, req: Request, ) -> Result { - // Log for debugging - info!("Requesting state proofs for block: {}", block_height); - // Extract query string let query = req.uri().query().unwrap_or(""); @@ -307,8 +304,6 @@ impl, R: Routing> Rest { let params: StateProofsQuery = config.deserialize_str(query).map_err(|e| RestError(format!("Failed to parse query parameters: {}", e)))?; - info!("Query parameters: {:?}", params); - // Convert the query parameter to a Vec let commitments_str = params.commitments; From a02e3648a6f77db166a63ad4e13c2dfbcd902059 Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 28 Apr 2025 16:00:20 -0400 Subject: [PATCH 19/31] update revs --- Cargo.lock | 120 +++++++++++++++++++++---------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8dbb25d291..2bbf2d1634 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3908,7 +3908,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "anstyle", "anyhow", @@ -3940,7 +3940,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "anyhow", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "blst", "cc", @@ -3983,7 +3983,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3997,7 +3997,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -4008,7 +4008,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4018,7 +4018,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4028,7 +4028,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "indexmap 2.8.0", "itertools 0.11.0", @@ -4047,12 +4047,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" [[package]] name = "snarkvm-circuit-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4063,7 +4063,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "paste", "snarkvm-circuit-account", @@ -4078,7 +4078,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4093,7 +4093,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4106,7 +4106,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4115,7 +4115,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4125,7 +4125,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4137,7 +4137,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4149,7 +4149,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4160,7 +4160,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4172,7 +4172,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4185,7 +4185,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "bs58", "snarkvm-console-network", @@ -4196,7 +4196,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "blake2s_simd", "smallvec", @@ -4209,7 +4209,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "rayon", @@ -4220,7 +4220,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4243,7 +4243,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "anyhow", "bech32", @@ -4261,7 +4261,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "enum-iterator", "enum_index", @@ -4283,7 +4283,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4298,7 +4298,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4309,7 +4309,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console-network-environment", ] @@ -4317,7 +4317,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4338,7 +4338,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4349,7 +4349,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4371,7 +4371,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "rand", "rayon", @@ -4385,7 +4385,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "anyhow", @@ -4402,7 +4402,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "anyhow", @@ -4429,7 +4429,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "anyhow", "rand", @@ -4441,7 +4441,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4461,7 +4461,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4480,7 +4480,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4493,7 +4493,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4506,7 +4506,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4519,7 +4519,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "bytes", "serde_json", @@ -4530,7 +4530,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4545,7 +4545,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "bytes", "serde_json", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4567,7 +4567,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "anyhow", @@ -4588,7 +4588,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "anyhow", @@ -4610,7 +4610,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4623,7 +4623,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std-storage", "anyhow", @@ -4651,7 +4651,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "once_cell", @@ -4668,7 +4668,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4677,7 +4677,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "anyhow", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "anyhow", @@ -4736,7 +4736,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "colored", @@ -4762,7 +4762,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "indexmap 2.8.0", "paste", @@ -4777,7 +4777,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "bincode", "once_cell", @@ -4790,7 +4790,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "aleo-std", "anyhow", @@ -4811,7 +4811,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=edee422#edee4223285553ab893c4e013400db4a4cc5e46d" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" dependencies = [ "proc-macro2", "quote 1.0.40", diff --git a/Cargo.toml b/Cargo.toml index 7d07870abd..842c310c07 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "edee422" +rev = "ea2a03c" #version = "=1.5.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index 9ccb6675be..da7dcb6d48 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -81,7 +81,7 @@ version = "=3.5.0" [dependencies.snarkvm-synthesizer] #path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "edee422" +rev = "ea2a03c" #version = "=1.5.0" default-features = false optional = true From 85e5366e184d06310baa6daa508352c135cd1dd6 Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 28 Apr 2025 16:39:56 -0400 Subject: [PATCH 20/31] update snarkVM revs --- Cargo.lock | 120 +++++++++++++++++++++---------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bbf2d1634..e3cc716efe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3908,7 +3908,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "anstyle", "anyhow", @@ -3940,7 +3940,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "anyhow", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "blst", "cc", @@ -3983,7 +3983,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3997,7 +3997,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -4008,7 +4008,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4018,7 +4018,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4028,7 +4028,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "indexmap 2.8.0", "itertools 0.11.0", @@ -4047,12 +4047,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" [[package]] name = "snarkvm-circuit-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4063,7 +4063,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "paste", "snarkvm-circuit-account", @@ -4078,7 +4078,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4093,7 +4093,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4106,7 +4106,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4115,7 +4115,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4125,7 +4125,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4137,7 +4137,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4149,7 +4149,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4160,7 +4160,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4172,7 +4172,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4185,7 +4185,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "bs58", "snarkvm-console-network", @@ -4196,7 +4196,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "blake2s_simd", "smallvec", @@ -4209,7 +4209,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "rayon", @@ -4220,7 +4220,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4243,7 +4243,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "anyhow", "bech32", @@ -4261,7 +4261,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "enum-iterator", "enum_index", @@ -4283,7 +4283,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4298,7 +4298,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4309,7 +4309,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console-network-environment", ] @@ -4317,7 +4317,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4338,7 +4338,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4349,7 +4349,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4371,7 +4371,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "rand", "rayon", @@ -4385,7 +4385,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "anyhow", @@ -4402,7 +4402,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "anyhow", @@ -4429,7 +4429,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "anyhow", "rand", @@ -4441,7 +4441,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4461,7 +4461,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4480,7 +4480,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4493,7 +4493,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4506,7 +4506,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4519,7 +4519,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "bytes", "serde_json", @@ -4530,7 +4530,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4545,7 +4545,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "bytes", "serde_json", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4567,7 +4567,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "anyhow", @@ -4588,7 +4588,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "anyhow", @@ -4610,7 +4610,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4623,7 +4623,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std-storage", "anyhow", @@ -4651,7 +4651,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "once_cell", @@ -4668,7 +4668,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4677,7 +4677,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "anyhow", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "anyhow", @@ -4736,7 +4736,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "colored", @@ -4762,7 +4762,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "indexmap 2.8.0", "paste", @@ -4777,7 +4777,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "bincode", "once_cell", @@ -4790,7 +4790,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "aleo-std", "anyhow", @@ -4811,7 +4811,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=ea2a03c#ea2a03ca5d4a804b8bbe3b81c9a7664c0b1d4aab" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" dependencies = [ "proc-macro2", "quote 1.0.40", diff --git a/Cargo.toml b/Cargo.toml index 842c310c07..51cd2f6713 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "ea2a03c" +rev = "c771250" #version = "=1.5.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index da7dcb6d48..8cba786e2f 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -81,7 +81,7 @@ version = "=3.5.0" [dependencies.snarkvm-synthesizer] #path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "ea2a03c" +rev = "c771250" #version = "=1.5.0" default-features = false optional = true From 74e4c9ddd290b00cc6262e105056a4c80e155fb1 Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 28 Apr 2025 16:46:29 -0400 Subject: [PATCH 21/31] update snarkvm revs --- Cargo.lock | 120 +++++++++++++++++++++---------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3cc716efe..e04574ad39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3908,7 +3908,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "anstyle", "anyhow", @@ -3940,7 +3940,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "anyhow", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "blst", "cc", @@ -3983,7 +3983,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3997,7 +3997,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -4008,7 +4008,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4018,7 +4018,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4028,7 +4028,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "indexmap 2.8.0", "itertools 0.11.0", @@ -4047,12 +4047,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" [[package]] name = "snarkvm-circuit-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4063,7 +4063,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "paste", "snarkvm-circuit-account", @@ -4078,7 +4078,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4093,7 +4093,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4106,7 +4106,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4115,7 +4115,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4125,7 +4125,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4137,7 +4137,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4149,7 +4149,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4160,7 +4160,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4172,7 +4172,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4185,7 +4185,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "bs58", "snarkvm-console-network", @@ -4196,7 +4196,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "blake2s_simd", "smallvec", @@ -4209,7 +4209,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "rayon", @@ -4220,7 +4220,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4243,7 +4243,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "anyhow", "bech32", @@ -4261,7 +4261,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "enum-iterator", "enum_index", @@ -4283,7 +4283,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4298,7 +4298,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4309,7 +4309,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console-network-environment", ] @@ -4317,7 +4317,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4338,7 +4338,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4349,7 +4349,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4371,7 +4371,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "rand", "rayon", @@ -4385,7 +4385,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "anyhow", @@ -4402,7 +4402,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "anyhow", @@ -4429,7 +4429,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "anyhow", "rand", @@ -4441,7 +4441,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4461,7 +4461,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4480,7 +4480,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4493,7 +4493,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4506,7 +4506,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4519,7 +4519,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "bytes", "serde_json", @@ -4530,7 +4530,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4545,7 +4545,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "bytes", "serde_json", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4567,7 +4567,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "anyhow", @@ -4588,7 +4588,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "anyhow", @@ -4610,7 +4610,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4623,7 +4623,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std-storage", "anyhow", @@ -4651,7 +4651,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "once_cell", @@ -4668,7 +4668,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4677,7 +4677,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "anyhow", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "anyhow", @@ -4736,7 +4736,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "colored", @@ -4762,7 +4762,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "indexmap 2.8.0", "paste", @@ -4777,7 +4777,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "bincode", "once_cell", @@ -4790,7 +4790,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "aleo-std", "anyhow", @@ -4811,7 +4811,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=c771250#c7712500dcdf76ad658253f347d8f0ec0b9b1b39" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" dependencies = [ "proc-macro2", "quote 1.0.40", diff --git a/Cargo.toml b/Cargo.toml index 51cd2f6713..290c096ec3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "c771250" +rev = "d80263c" #version = "=1.5.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index 8cba786e2f..b2452f8f42 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -81,7 +81,7 @@ version = "=3.5.0" [dependencies.snarkvm-synthesizer] #path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "c771250" +rev = "d80263c" #version = "=1.5.0" default-features = false optional = true From be4eb181c181ad55f1f9368981dd378242902274 Mon Sep 17 00:00:00 2001 From: dark horse Date: Tue, 29 Apr 2025 14:46:43 -0400 Subject: [PATCH 22/31] remove oneofmany type --- node/rest/src/routes.rs | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index d1e2718b5b..ecaa9cacf7 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -25,7 +25,6 @@ use rayon::prelude::*; use serde::{Deserialize, Serialize}; use serde_json::json; use serde_qs; -use std::collections::HashMap; /// The `get_blocks` query object. #[derive(Deserialize, Serialize)] pub(crate) struct BlockRange { @@ -35,23 +34,6 @@ pub(crate) struct BlockRange { end: u32, } -#[derive(Debug, Deserialize)] -#[serde(untagged)] -pub enum OneOrMany { - One(String), - Many(Vec), -} - -impl From for Vec { - fn from(value: OneOrMany) -> Self { - match value { - OneOrMany::One(s) => vec![s], - OneOrMany::Many(v) => v, - } - } -} - -// Update the StateProofsQuery to use the helper type. #[derive(Debug, Deserialize)] pub(crate) struct StateProofsQuery { #[serde(default)] From 912177fb47469210ce55b89c242db322f69ada7f Mon Sep 17 00:00:00 2001 From: dark horse Date: Wed, 30 Apr 2025 11:21:51 -0400 Subject: [PATCH 23/31] update snarmvm revs --- Cargo.lock | 120 +++++++++++++++++++++---------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e04574ad39..e0da802984 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3908,7 +3908,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "anstyle", "anyhow", @@ -3940,7 +3940,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "anyhow", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "blst", "cc", @@ -3983,7 +3983,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3997,7 +3997,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -4008,7 +4008,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4018,7 +4018,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4028,7 +4028,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "indexmap 2.8.0", "itertools 0.11.0", @@ -4047,12 +4047,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" [[package]] name = "snarkvm-circuit-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4063,7 +4063,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "paste", "snarkvm-circuit-account", @@ -4078,7 +4078,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4093,7 +4093,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4106,7 +4106,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4115,7 +4115,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4125,7 +4125,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4137,7 +4137,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4149,7 +4149,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4160,7 +4160,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4172,7 +4172,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4185,7 +4185,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "bs58", "snarkvm-console-network", @@ -4196,7 +4196,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "blake2s_simd", "smallvec", @@ -4209,7 +4209,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "rayon", @@ -4220,7 +4220,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4243,7 +4243,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "anyhow", "bech32", @@ -4261,7 +4261,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "enum-iterator", "enum_index", @@ -4283,7 +4283,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4298,7 +4298,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4309,7 +4309,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console-network-environment", ] @@ -4317,7 +4317,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4338,7 +4338,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4349,7 +4349,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4371,7 +4371,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "rand", "rayon", @@ -4385,7 +4385,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "anyhow", @@ -4402,7 +4402,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "anyhow", @@ -4429,7 +4429,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "anyhow", "rand", @@ -4441,7 +4441,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4461,7 +4461,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4480,7 +4480,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4493,7 +4493,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4506,7 +4506,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4519,7 +4519,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "bytes", "serde_json", @@ -4530,7 +4530,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4545,7 +4545,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "bytes", "serde_json", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4567,7 +4567,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "anyhow", @@ -4588,7 +4588,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "anyhow", @@ -4610,7 +4610,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4623,7 +4623,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std-storage", "anyhow", @@ -4651,7 +4651,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "once_cell", @@ -4668,7 +4668,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4677,7 +4677,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "anyhow", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "anyhow", @@ -4736,7 +4736,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "colored", @@ -4762,7 +4762,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "indexmap 2.8.0", "paste", @@ -4777,7 +4777,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "bincode", "once_cell", @@ -4790,7 +4790,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "aleo-std", "anyhow", @@ -4811,7 +4811,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=d80263c#d80263cbb5b64b73b3fd7cc201dfb0aed69c65b5" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" dependencies = [ "proc-macro2", "quote 1.0.40", diff --git a/Cargo.toml b/Cargo.toml index 290c096ec3..67e7a3d358 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "d80263c" +rev = "a36470c" #version = "=1.5.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index b2452f8f42..720cfd1f98 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -81,7 +81,7 @@ version = "=3.5.0" [dependencies.snarkvm-synthesizer] #path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "d80263c" +rev = "a36470c" #version = "=1.5.0" default-features = false optional = true From 1c41a6427f4dbe7d64cae8dad9e2716d11717db2 Mon Sep 17 00:00:00 2001 From: Luke Newman <5315645+lukenewman@users.noreply.github.com> Date: Mon, 12 May 2025 14:45:10 -0400 Subject: [PATCH 24/31] remove serde_qs in favor or axum's built-in query string support --- Cargo.lock | 12 ------------ node/rest/Cargo.toml | 5 +---- node/rest/src/routes.rs | 21 ++++----------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0da802984..8371804dac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3305,17 +3305,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_qs" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" -dependencies = [ - "percent-encoding", - "serde", - "thiserror 1.0.69", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3778,7 +3767,6 @@ dependencies = [ "rayon", "serde", "serde_json", - "serde_qs", "snarkos-node-consensus", "snarkos-node-router", "snarkvm", diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index 720cfd1f98..e10b00152e 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -113,7 +113,4 @@ version = "0.5" features = [ "cors", "trace" ] [dependencies.tracing] -version = "0.1" - -[dependencies.serde_qs] -version = "0.12" \ No newline at end of file +version = "0.1" \ No newline at end of file diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index ecaa9cacf7..514993256c 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -24,7 +24,7 @@ use indexmap::IndexMap; use rayon::prelude::*; use serde::{Deserialize, Serialize}; use serde_json::json; -use serde_qs; + /// The `get_blocks` query object. #[derive(Deserialize, Serialize)] pub(crate) struct BlockRange { @@ -270,28 +270,15 @@ impl, R: Routing> Rest { Ok(ErasedJson::pretty(rest.ledger.get_state_path_for_commitment(&commitment)?)) } - // GET //statePath/{commitment} + // GET //stateProofsForBlock/{blockHeight} pub(crate) async fn get_state_proofs_for_block( State(rest): State, Path(block_height): Path, - req: Request, + Query(params): Query, ) -> Result { - // Extract query string - let query = req.uri().query().unwrap_or(""); - - // Create a non-strict config for serde_qs - let config = serde_qs::Config::new(5, false); - - // Use serde_qs with non-strict mode to parse the query string - let params: StateProofsQuery = - config.deserialize_str(query).map_err(|e| RestError(format!("Failed to parse query parameters: {}", e)))?; - - // Convert the query parameter to a Vec - let commitments_str = params.commitments; - // Parse the strings to the expected Field type. let commitments: Vec> = - commitments_str.iter().map(|s| s.parse::>()).collect::, _>>()?; + params.commitments.iter().map(|s| s.parse::>()).collect::, _>>()?; // Retrieve proofs in a blocking task. let proofs = From 15a530876f0793ecc38f5904155547f79d326543 Mon Sep 17 00:00:00 2001 From: dark horse Date: Tue, 13 May 2025 15:25:55 -0400 Subject: [PATCH 25/31] update snarkVM revs --- Cargo.lock | 123 ++++++++++++++++++++++--------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- 3 files changed, 65 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8371804dac..aacf7d38db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3896,7 +3896,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "anstyle", "anyhow", @@ -3928,7 +3928,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "anyhow", @@ -3960,7 +3960,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "blst", "cc", @@ -3971,7 +3971,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3985,7 +3985,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3996,7 +3996,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4006,7 +4006,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4016,7 +4016,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "indexmap 2.8.0", "itertools 0.11.0", @@ -4035,12 +4035,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" [[package]] name = "snarkvm-circuit-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4051,7 +4051,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "paste", "snarkvm-circuit-account", @@ -4066,7 +4066,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4081,7 +4081,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4094,7 +4094,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4103,7 +4103,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4113,7 +4113,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4125,7 +4125,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4137,7 +4137,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4148,7 +4148,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4160,7 +4160,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4173,7 +4173,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "bs58", "snarkvm-console-network", @@ -4184,7 +4184,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "blake2s_simd", "smallvec", @@ -4197,7 +4197,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "rayon", @@ -4208,7 +4208,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4231,7 +4231,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "anyhow", "bech32", @@ -4249,7 +4249,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "enum-iterator", "enum_index", @@ -4271,7 +4271,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4286,7 +4286,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4297,7 +4297,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console-network-environment", ] @@ -4305,7 +4305,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4326,7 +4326,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4337,7 +4337,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4348,7 +4348,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4359,7 +4359,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "rand", "rayon", @@ -4373,7 +4373,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "anyhow", @@ -4390,7 +4390,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "anyhow", @@ -4417,7 +4417,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "anyhow", "rand", @@ -4429,7 +4429,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4449,7 +4449,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4468,7 +4468,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4481,7 +4481,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4494,7 +4494,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4507,7 +4507,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "bytes", "serde_json", @@ -4518,7 +4518,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4533,7 +4533,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "bytes", "serde_json", @@ -4546,7 +4546,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4555,7 +4555,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "anyhow", @@ -4576,7 +4576,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "anyhow", @@ -4598,20 +4598,23 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "async-trait", "reqwest 0.11.27", + "serde", + "serde_json", "snarkvm-console", "snarkvm-ledger-store", "snarkvm-synthesizer-program", + "snarkvm-utilities", "ureq", ] [[package]] name = "snarkvm-ledger-store" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std-storage", "anyhow", @@ -4639,7 +4642,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "once_cell", @@ -4656,7 +4659,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4665,7 +4668,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "anyhow", @@ -4691,7 +4694,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "anyhow", @@ -4724,7 +4727,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "colored", @@ -4750,7 +4753,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "indexmap 2.8.0", "paste", @@ -4765,7 +4768,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "bincode", "once_cell", @@ -4778,7 +4781,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "aleo-std", "anyhow", @@ -4799,7 +4802,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=a36470c#a36470cb044384d3d9f90a23e7c1fc2195126b3e" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" dependencies = [ "proc-macro2", "quote 1.0.40", diff --git a/Cargo.toml b/Cargo.toml index 67e7a3d358..6d102d44ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "a36470c" +rev = "966fc1e" #version = "=1.5.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index e10b00152e..5aa077a706 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -81,7 +81,7 @@ version = "=3.5.0" [dependencies.snarkvm-synthesizer] #path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "a36470c" +rev = "966fc1e" #version = "=1.5.0" default-features = false optional = true From f039da25d16fe654b9ee182ccebc99ab02c2127b Mon Sep 17 00:00:00 2001 From: dark horse Date: Wed, 14 May 2025 13:47:57 -0400 Subject: [PATCH 26/31] add extra query --- Cargo.lock | 14 ++++++++++++++ node/rest/Cargo.toml | 2 +- node/rest/src/lib.rs | 2 +- node/rest/src/routes.rs | 5 ++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aacf7d38db..2888444cd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -337,6 +337,7 @@ dependencies = [ "multer", "pin-project-lite", "serde", + "serde_html_form", "serde_json", "tower 0.5.2", "tower-layer", @@ -3282,6 +3283,19 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "serde_html_form" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d2de91cf02bbc07cde38891769ccd5d4f073d22a40683aa4bc7a95781aaa2c4" +dependencies = [ + "form_urlencoded", + "indexmap 2.8.0", + "itoa", + "ryu", + "serde", +] + [[package]] name = "serde_json" version = "1.0.140" diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index 5aa077a706..d752ce9a4d 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -38,7 +38,7 @@ version = "0.7" [dependencies.axum-extra] version = "0.9.0" -features = [ "erased-json", "typed-header" ] +features = [ "erased-json", "typed-header", "query" ] [dependencies.http] version = "1.0" diff --git a/node/rest/src/lib.rs b/node/rest/src/lib.rs index d659ee092d..34330d31f6 100644 --- a/node/rest/src/lib.rs +++ b/node/rest/src/lib.rs @@ -45,7 +45,7 @@ use axum::{ response::Response, routing::{get, post}, }; -use axum_extra::response::ErasedJson; +use axum_extra::{extract::Query as ExtraQuery, response::ErasedJson}; #[cfg(feature = "locktick")] use locktick::parking_lot::Mutex; #[cfg(not(feature = "locktick"))] diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 514993256c..8761774bec 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -274,12 +274,15 @@ impl, R: Routing> Rest { pub(crate) async fn get_state_proofs_for_block( State(rest): State, Path(block_height): Path, - Query(params): Query, + ExtraQuery(params): ExtraQuery, ) -> Result { + println!("params: {:?}", params); // Parse the strings to the expected Field type. let commitments: Vec> = params.commitments.iter().map(|s| s.parse::>()).collect::, _>>()?; + println!("commitments: {:?}", commitments); + // Retrieve proofs in a blocking task. let proofs = tokio::task::spawn_blocking(move || rest.ledger.get_state_proofs_for_block(block_height, &commitments)) From ae213d66d68ffebee68ddaa594606c496380ceb2 Mon Sep 17 00:00:00 2001 From: dark horse Date: Wed, 14 May 2025 14:20:03 -0400 Subject: [PATCH 27/31] remove prints --- node/rest/src/routes.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 8761774bec..dd55a43c05 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -276,13 +276,9 @@ impl, R: Routing> Rest { Path(block_height): Path, ExtraQuery(params): ExtraQuery, ) -> Result { - println!("params: {:?}", params); - // Parse the strings to the expected Field type. let commitments: Vec> = params.commitments.iter().map(|s| s.parse::>()).collect::, _>>()?; - println!("commitments: {:?}", commitments); - // Retrieve proofs in a blocking task. let proofs = tokio::task::spawn_blocking(move || rest.ledger.get_state_proofs_for_block(block_height, &commitments)) From 132acb667fd56917a8bc9edd6ba9cce11c54cc3f Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 19 May 2025 11:32:02 -0400 Subject: [PATCH 28/31] fix merge conflicts --- Cargo.lock | 53 ++++++++++++++++++-------------------------- node/rest/Cargo.toml | 7 +----- 2 files changed, 23 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2888444cd1..c4f371e5d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3467,7 +3467,7 @@ dependencies = [ [[package]] name = "snarkos" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "built", @@ -3495,7 +3495,7 @@ dependencies = [ [[package]] name = "snarkos-account" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "colored", @@ -3505,7 +3505,7 @@ dependencies = [ [[package]] name = "snarkos-cli" -version = "3.5.0" +version = "3.6.0" dependencies = [ "aleo-std", "anstyle", @@ -3545,7 +3545,7 @@ dependencies = [ [[package]] name = "snarkos-display" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "crossterm", @@ -3555,21 +3555,9 @@ dependencies = [ "tokio", ] -[[package]] -name = "snarkos-integration" -version = "3.5.0" -dependencies = [ - "aleo-std", - "snarkos-node-cdn", - "snarkvm", - "tokio", - "tracing", - "tracing-test 0.1.0", -] - [[package]] name = "snarkos-node" -version = "3.5.0" +version = "3.6.0" dependencies = [ "aleo-std", "anyhow", @@ -3608,7 +3596,7 @@ dependencies = [ [[package]] name = "snarkos-node-bft" -version = "3.5.0" +version = "3.6.0" dependencies = [ "aleo-std", "anyhow", @@ -3658,7 +3646,7 @@ dependencies = [ [[package]] name = "snarkos-node-bft-events" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "bytes", @@ -3677,7 +3665,7 @@ dependencies = [ [[package]] name = "snarkos-node-bft-ledger-service" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "async-trait", @@ -3694,7 +3682,7 @@ dependencies = [ [[package]] name = "snarkos-node-bft-storage-service" -version = "3.5.0" +version = "3.6.0" dependencies = [ "aleo-std", "anyhow", @@ -3708,7 +3696,7 @@ dependencies = [ [[package]] name = "snarkos-node-cdn" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "bincode", @@ -3720,6 +3708,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", + "snarkos-node-metrics", "snarkvm", "tokio", "tokio-test", @@ -3728,7 +3717,7 @@ dependencies = [ [[package]] name = "snarkos-node-consensus" -version = "3.5.0" +version = "3.6.0" dependencies = [ "aleo-std", "anyhow", @@ -3745,6 +3734,7 @@ dependencies = [ "snarkos-node-bft-ledger-service", "snarkos-node-bft-storage-service", "snarkos-node-metrics", + "snarkos-node-sync", "snarkvm", "tokio", "tracing", @@ -3753,7 +3743,7 @@ dependencies = [ [[package]] name = "snarkos-node-metrics" -version = "3.5.0" +version = "3.6.0" dependencies = [ "locktick", "metrics-exporter-prometheus", @@ -3766,7 +3756,7 @@ dependencies = [ [[package]] name = "snarkos-node-rest" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "axum", @@ -3795,7 +3785,7 @@ dependencies = [ [[package]] name = "snarkos-node-router" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "async-trait", @@ -3815,6 +3805,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "snarkos-account", + "snarkos-node-bft-ledger-service", "snarkos-node-metrics", "snarkos-node-router", "snarkos-node-router-messages", @@ -3832,7 +3823,7 @@ dependencies = [ [[package]] name = "snarkos-node-router-messages" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "bytes", @@ -3851,7 +3842,7 @@ dependencies = [ [[package]] name = "snarkos-node-sync" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -3874,7 +3865,7 @@ dependencies = [ [[package]] name = "snarkos-node-sync-communication-service" -version = "3.5.0" +version = "3.6.0" dependencies = [ "async-trait", "tokio", @@ -3882,7 +3873,7 @@ dependencies = [ [[package]] name = "snarkos-node-sync-locators" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -3893,7 +3884,7 @@ dependencies = [ [[package]] name = "snarkos-node-tcp" -version = "3.5.0" +version = "3.6.0" dependencies = [ "async-trait", "bytes", diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index 9626a5b830..fa9fc1e750 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -80,15 +80,10 @@ version = "=3.6.0" [dependencies.snarkvm-synthesizer] #path = "../../../snarkVM/synthesizer" -<<<<<<< HEAD git = "https://github.com/puzzleHQ/snarkVM.git" rev = "966fc1e" #version = "=1.5.0" -======= -git = "https://github.com/ProvableHQ/snarkVM.git" -rev = "af55128f8" -version = "=1.6.0" ->>>>>>> testnet + default-features = false optional = true From 8c0ee6a0c7043bcdb2e77e2576d198d7de5dbed9 Mon Sep 17 00:00:00 2001 From: dark horse Date: Mon, 19 May 2025 11:39:44 -0400 Subject: [PATCH 29/31] update snarkVM revs --- Cargo.lock | 240 +++++++++++++++++++++---------------------- Cargo.toml | 2 +- node/rest/Cargo.toml | 2 +- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4f371e5d4..72c6dadf3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3900,8 +3900,8 @@ dependencies = [ [[package]] name = "snarkvm" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "anstyle", "anyhow", @@ -3932,8 +3932,8 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "anyhow", @@ -3964,8 +3964,8 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "blst", "cc", @@ -3975,8 +3975,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3989,8 +3989,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -4000,8 +4000,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4010,8 +4010,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4020,8 +4020,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "indexmap 2.8.0", "itertools 0.11.0", @@ -4039,13 +4039,13 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" [[package]] name = "snarkvm-circuit-network" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4055,8 +4055,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "paste", "snarkvm-circuit-account", @@ -4070,8 +4070,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4085,8 +4085,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4098,8 +4098,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4107,8 +4107,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4117,8 +4117,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4129,8 +4129,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4141,8 +4141,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4152,8 +4152,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4164,8 +4164,8 @@ dependencies = [ [[package]] name = "snarkvm-console" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4177,8 +4177,8 @@ dependencies = [ [[package]] name = "snarkvm-console-account" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "bs58", "snarkvm-console-network", @@ -4188,8 +4188,8 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "blake2s_simd", "smallvec", @@ -4201,8 +4201,8 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "rayon", @@ -4212,8 +4212,8 @@ dependencies = [ [[package]] name = "snarkvm-console-network" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4235,8 +4235,8 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "anyhow", "bech32", @@ -4253,8 +4253,8 @@ dependencies = [ [[package]] name = "snarkvm-console-program" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "enum-iterator", "enum_index", @@ -4275,8 +4275,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4290,8 +4290,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4301,16 +4301,16 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console-network-environment", ] [[package]] name = "snarkvm-console-types-field" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4319,8 +4319,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4330,8 +4330,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4341,8 +4341,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4352,8 +4352,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4363,8 +4363,8 @@ dependencies = [ [[package]] name = "snarkvm-curves" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "rand", "rayon", @@ -4377,8 +4377,8 @@ dependencies = [ [[package]] name = "snarkvm-fields" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "anyhow", @@ -4394,8 +4394,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "anyhow", @@ -4421,8 +4421,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "anyhow", "rand", @@ -4433,8 +4433,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4453,8 +4453,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4472,8 +4472,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4485,8 +4485,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4498,8 +4498,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4511,8 +4511,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "bytes", "serde_json", @@ -4522,8 +4522,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4537,8 +4537,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "bytes", "serde_json", @@ -4550,8 +4550,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4559,8 +4559,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "anyhow", @@ -4580,8 +4580,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "anyhow", @@ -4602,8 +4602,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4618,8 +4618,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std-storage", "anyhow", @@ -4646,8 +4646,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "once_cell", @@ -4663,8 +4663,8 @@ dependencies = [ [[package]] name = "snarkvm-metrics" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4672,8 +4672,8 @@ dependencies = [ [[package]] name = "snarkvm-parameters" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "anyhow", @@ -4698,8 +4698,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "anyhow", @@ -4731,8 +4731,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "colored", @@ -4757,8 +4757,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "indexmap 2.8.0", "paste", @@ -4772,8 +4772,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "bincode", "once_cell", @@ -4785,8 +4785,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "aleo-std", "anyhow", @@ -4806,8 +4806,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" -version = "1.5.0" -source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=966fc1e#966fc1efdb977a68d33c4ac6ebef13f5b84b1e3a" +version = "1.6.0" +source = "git+https://github.com/puzzleHQ/snarkVM.git?rev=94b26a0#94b26a0a25be9c6ab5edcb3ba46e21d697540cf8" dependencies = [ "proc-macro2", "quote 1.0.40", diff --git a/Cargo.toml b/Cargo.toml index f62bcc9dad..115ed33d80 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ default-features = false [workspace.dependencies.snarkvm] # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. #path = "../snarkVM" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "966fc1e" +rev = "94b26a0" #version = "=1.5.0" features = [ "circuit", "console", "rocks" ] diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index fa9fc1e750..bb4de113b0 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -81,7 +81,7 @@ version = "=3.6.0" [dependencies.snarkvm-synthesizer] #path = "../../../snarkVM/synthesizer" git = "https://github.com/puzzleHQ/snarkVM.git" -rev = "966fc1e" +rev = "94b26a0" #version = "=1.5.0" default-features = false From 0a922c36ca599494f4370602179663324a99280e Mon Sep 17 00:00:00 2001 From: dark horse Date: Fri, 13 Jun 2025 16:03:09 -0400 Subject: [PATCH 30/31] fix route to 1 line --- node/rest/src/lib.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/node/rest/src/lib.rs b/node/rest/src/lib.rs index ad53777558..203d8b17e7 100644 --- a/node/rest/src/lib.rs +++ b/node/rest/src/lib.rs @@ -192,9 +192,7 @@ impl, R: Routing> Rest { .route(&format!("/{network}/memoryPool/solutions"), get(Self::get_memory_pool_solutions)) .route(&format!("/{network}/memoryPool/transactions"), get(Self::get_memory_pool_transactions)) .route(&format!("/{network}/statePath/:commitment"), get(Self::get_state_path_for_commitment)) - .route( - &format!("/{network}/stateProofsForBlock/:blockHeight"), - get(Self::get_state_proofs_for_block) + .route(&format!("/{network}/stateProofsForBlock/:blockHeight"), get(Self::get_state_proofs_for_block) ) .route(&format!("/{network}/statePath/{{commitment}}"), get(Self::get_state_path_for_commitment)) .route(&format!("/{network}/stateRoot/latest"), get(Self::get_state_root_latest)) From 9253533d2a90f88614077a2e46f3f79483e59c0e Mon Sep 17 00:00:00 2001 From: dark horse Date: Fri, 13 Jun 2025 16:17:03 -0400 Subject: [PATCH 31/31] update route issue --- node/rest/src/lib.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/node/rest/src/lib.rs b/node/rest/src/lib.rs index 203d8b17e7..2b5f39ea3a 100644 --- a/node/rest/src/lib.rs +++ b/node/rest/src/lib.rs @@ -191,9 +191,7 @@ impl, R: Routing> Rest { .route(&format!("/{network}/memoryPool/transmissions"), get(Self::get_memory_pool_transmissions)) .route(&format!("/{network}/memoryPool/solutions"), get(Self::get_memory_pool_solutions)) .route(&format!("/{network}/memoryPool/transactions"), get(Self::get_memory_pool_transactions)) - .route(&format!("/{network}/statePath/:commitment"), get(Self::get_state_path_for_commitment)) - .route(&format!("/{network}/stateProofsForBlock/:blockHeight"), get(Self::get_state_proofs_for_block) - ) + .route(&format!("/{network}/stateProofsForBlock/{{blockHeight}}"), get(Self::get_state_proofs_for_block)) .route(&format!("/{network}/statePath/{{commitment}}"), get(Self::get_state_path_for_commitment)) .route(&format!("/{network}/stateRoot/latest"), get(Self::get_state_root_latest)) .route(&format!("/{network}/stateRoot/{{height}}"), get(Self::get_state_root))