From b1ce92825820ebc3811721a72bcb06e121a13478 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:42:35 -0400 Subject: [PATCH 1/7] Bump snarkVM rev --- Cargo.lock | 116 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c1631a709..f1ed9f256e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3527,7 +3527,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "anstyle", "anyhow", @@ -3558,7 +3558,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std", "anyhow", @@ -3588,7 +3588,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3602,7 +3602,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3613,7 +3613,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3623,7 +3623,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3633,7 +3633,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "indexmap 2.2.2", "itertools 0.11.0", @@ -3651,12 +3651,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" [[package]] name = "snarkvm-circuit-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3667,7 +3667,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3682,7 +3682,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3697,7 +3697,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3710,7 +3710,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -3719,7 +3719,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3729,7 +3729,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3741,7 +3741,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3753,7 +3753,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3764,7 +3764,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3776,7 +3776,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -3789,7 +3789,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "bs58", "snarkvm-console-network", @@ -3800,7 +3800,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "blake2s_simd", "smallvec", @@ -3813,7 +3813,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std", "rayon", @@ -3824,7 +3824,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "anyhow", "indexmap 2.2.2", @@ -3847,7 +3847,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "anyhow", "bech32", @@ -3865,7 +3865,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "enum_index", "enum_index_derive", @@ -3886,7 +3886,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -3901,7 +3901,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3912,7 +3912,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console-network-environment", ] @@ -3920,7 +3920,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3930,7 +3930,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3941,7 +3941,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3952,7 +3952,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3963,7 +3963,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3974,7 +3974,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "rand", "rayon", @@ -3988,7 +3988,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std", "anyhow", @@ -4005,7 +4005,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std", "anyhow", @@ -4030,7 +4030,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "anyhow", "rand", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "indexmap 2.2.2", "rayon", @@ -4061,7 +4061,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-coinbase" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std", "anyhow", @@ -4081,7 +4081,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "anyhow", "indexmap 2.2.2", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4111,7 +4111,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "indexmap 2.2.2", "rayon", @@ -4124,7 +4124,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "indexmap 2.2.2", "serde_json", @@ -4136,7 +4136,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "bytes", "serde_json", @@ -4147,7 +4147,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "indexmap 2.2.2", "rayon", @@ -4161,7 +4161,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "bytes", "serde_json", @@ -4174,7 +4174,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "snarkvm-console", "snarkvm-ledger-coinbase", @@ -4183,7 +4183,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "async-trait", "reqwest", @@ -4196,7 +4196,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std-storage", "anyhow", @@ -4221,7 +4221,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4245,7 +4245,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std", "anyhow", @@ -4270,7 +4270,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std", "anyhow", @@ -4296,7 +4296,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std", "colored", @@ -4319,7 +4319,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "indexmap 2.2.2", "paste", @@ -4333,7 +4333,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "bincode", "once_cell", @@ -4346,7 +4346,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "aleo-std", "anyhow", @@ -4367,7 +4367,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=94d1135#94d113519b90441172d4caab022b622535b3bb3a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" dependencies = [ "proc-macro2", "quote 1.0.35", diff --git a/Cargo.toml b/Cargo.toml index c22bb240df..a7c5f19124 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ default-features = false [workspace.dependencies.snarkvm] git = "https://github.com/AleoHQ/snarkVM.git" -rev = "94d1135" +rev = "201dbc4" #version = "=0.16.18" features = [ "circuit", "console", "rocks" ] From 46d18f4831f84a7441cf375ece1f6ebe0aa46837 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:44:34 -0400 Subject: [PATCH 2/7] Bump and versions --- node/bft/events/src/lib.rs | 2 +- node/router/messages/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node/bft/events/src/lib.rs b/node/bft/events/src/lib.rs index 7a3c6d30ef..b48d2094b9 100644 --- a/node/bft/events/src/lib.rs +++ b/node/bft/events/src/lib.rs @@ -118,7 +118,7 @@ impl From for Event { impl Event { /// The version of the event protocol; it can be incremented in order to force users to update. - pub const VERSION: u32 = 6; + pub const VERSION: u32 = 7; /// Returns the event name. #[inline] diff --git a/node/router/messages/src/lib.rs b/node/router/messages/src/lib.rs index 09b065a49d..81dd589aab 100644 --- a/node/router/messages/src/lib.rs +++ b/node/router/messages/src/lib.rs @@ -111,7 +111,7 @@ impl From for Message { impl Message { /// The version of the network protocol; it can be incremented in order to force users to update. - pub const VERSION: u32 = 14; + pub const VERSION: u32 = 15; /// Returns the message name. #[inline] From 96e86a9e3bec6fcc51d99df6dc0bc0b41c3c6b49 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:48:21 -0400 Subject: [PATCH 3/7] Disable solutions --- node/bft/src/worker.rs | 36 ++++++++++++++++++------------------ node/rest/src/lib.rs | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs index 49ac94f67f..d99b5642ef 100644 --- a/node/bft/src/worker.rs +++ b/node/bft/src/worker.rs @@ -289,25 +289,25 @@ impl Worker { /// Note: This method assumes the incoming solution is valid and does not exist in the ledger. pub(crate) async fn process_unconfirmed_solution( &self, - puzzle_commitment: PuzzleCommitment, - prover_solution: Data>, + _puzzle_commitment: PuzzleCommitment, + _prover_solution: Data>, ) -> Result<()> { - // Construct the transmission. - let transmission = Transmission::Solution(prover_solution.clone()); - // Remove the puzzle commitment from the pending queue. - self.pending.remove(puzzle_commitment, Some(transmission.clone())); - // Check if the solution exists. - if self.contains_transmission(puzzle_commitment) { - bail!("Solution '{}' already exists.", fmt_id(puzzle_commitment)); - } - // Check that the solution is well-formed and unique. - if let Err(e) = self.ledger.check_solution_basic(puzzle_commitment, prover_solution).await { - bail!("Invalid unconfirmed solution '{}': {e}", fmt_id(puzzle_commitment)); - } - // Adds the prover solution to the ready queue. - if self.ready.insert(puzzle_commitment, transmission) { - trace!("Worker {} - Added unconfirmed solution '{}'", self.id, fmt_id(puzzle_commitment)); - } + // // Construct the transmission. + // let transmission = Transmission::Solution(prover_solution.clone()); + // // Remove the puzzle commitment from the pending queue. + // self.pending.remove(puzzle_commitment, Some(transmission.clone())); + // // Check if the solution exists. + // if self.contains_transmission(puzzle_commitment) { + // bail!("Solution '{}' already exists.", fmt_id(puzzle_commitment)); + // } + // // Check that the solution is well-formed and unique. + // if let Err(e) = self.ledger.check_solution_basic(puzzle_commitment, prover_solution).await { + // bail!("Invalid unconfirmed solution '{}': {e}", fmt_id(puzzle_commitment)); + // } + // // Adds the prover solution to the ready queue. + // if self.ready.insert(puzzle_commitment, transmission) { + // trace!("Worker {} - Added unconfirmed solution '{}'", self.id, fmt_id(puzzle_commitment)); + // } Ok(()) } diff --git a/node/rest/src/lib.rs b/node/rest/src/lib.rs index f076023c19..5676632405 100644 --- a/node/rest/src/lib.rs +++ b/node/rest/src/lib.rs @@ -155,7 +155,7 @@ impl, R: Routing> Rest { .route("/testnet3/transaction/broadcast", post(Self::transaction_broadcast)) // POST ../solution/broadcast - .route("/testnet3/solution/broadcast", post(Self::solution_broadcast)) + // .route("/testnet3/solution/broadcast", post(Self::solution_broadcast)) // GET ../find/.. .route("/testnet3/find/blockHash/:tx_id", get(Self::find_block_hash)) @@ -177,7 +177,7 @@ impl, R: Routing> Rest { .route("/testnet3/blocks", get(Self::get_blocks)) .route("/testnet3/height/:hash", get(Self::get_height)) .route("/testnet3/memoryPool/transmissions", get(Self::get_memory_pool_transmissions)) - .route("/testnet3/memoryPool/solutions", get(Self::get_memory_pool_solutions)) + // .route("/testnet3/memoryPool/solutions", get(Self::get_memory_pool_solutions)) .route("/testnet3/memoryPool/transactions", get(Self::get_memory_pool_transactions)) .route("/testnet3/statePath/:commitment", get(Self::get_state_path_for_commitment)) .route("/testnet3/stateRoot/latest", get(Self::get_state_root_latest)) From 6e08ce4e765720800bde83392a8847b5e9758f8b Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:53:26 -0400 Subject: [PATCH 4/7] Disable unconfirmed_solution handling --- node/src/validator/router.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/node/src/validator/router.rs b/node/src/validator/router.rs index 3a01e6046e..b7834faabd 100644 --- a/node/src/validator/router.rs +++ b/node/src/validator/router.rs @@ -235,18 +235,18 @@ impl> Inbound for Validator { /// Propagates the unconfirmed solution to all connected validators. async fn unconfirmed_solution( &self, - peer_ip: SocketAddr, - serialized: UnconfirmedSolution, - solution: ProverSolution, + _peer_ip: SocketAddr, + _serialized: UnconfirmedSolution, + _solution: ProverSolution, ) -> bool { - // Add the unconfirmed solution to the memory pool. - if let Err(error) = self.consensus.add_unconfirmed_solution(solution).await { - trace!("[UnconfirmedSolution] {error}"); - return true; // Maintain the connection. - } - let message = Message::UnconfirmedSolution(serialized); - // Propagate the "UnconfirmedSolution" to the connected validators. - self.propagate_to_validators(message, &[peer_ip]); + // // Add the unconfirmed solution to the memory pool. + // if let Err(error) = self.consensus.add_unconfirmed_solution(solution).await { + // trace!("[UnconfirmedSolution] {error}"); + // return true; // Maintain the connection. + // } + // let message = Message::UnconfirmedSolution(serialized); + // // Propagate the "UnconfirmedSolution" to the connected validators. + // self.propagate_to_validators(message, &[peer_ip]); true } From 4e3badb975159b3258153a7675adb810ae679b08 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:26:45 -0400 Subject: [PATCH 5/7] Bump snarkVM rev --- Cargo.lock | 116 +++++++++++++++++++------------------- Cargo.toml | 2 +- node/consensus/src/lib.rs | 92 +++++++++++++++--------------- 3 files changed, 105 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f1ed9f256e..1dd4546a31 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3527,7 +3527,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "anstyle", "anyhow", @@ -3558,7 +3558,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std", "anyhow", @@ -3588,7 +3588,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3602,7 +3602,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3613,7 +3613,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3623,7 +3623,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3633,7 +3633,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "indexmap 2.2.2", "itertools 0.11.0", @@ -3651,12 +3651,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" [[package]] name = "snarkvm-circuit-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3667,7 +3667,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3682,7 +3682,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3697,7 +3697,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3710,7 +3710,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -3719,7 +3719,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3729,7 +3729,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3741,7 +3741,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3753,7 +3753,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3764,7 +3764,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3776,7 +3776,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -3789,7 +3789,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "bs58", "snarkvm-console-network", @@ -3800,7 +3800,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "blake2s_simd", "smallvec", @@ -3813,7 +3813,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std", "rayon", @@ -3824,7 +3824,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "anyhow", "indexmap 2.2.2", @@ -3847,7 +3847,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "anyhow", "bech32", @@ -3865,7 +3865,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "enum_index", "enum_index_derive", @@ -3886,7 +3886,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -3901,7 +3901,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3912,7 +3912,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console-network-environment", ] @@ -3920,7 +3920,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3930,7 +3930,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3941,7 +3941,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3952,7 +3952,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3963,7 +3963,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3974,7 +3974,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "rand", "rayon", @@ -3988,7 +3988,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std", "anyhow", @@ -4005,7 +4005,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std", "anyhow", @@ -4030,7 +4030,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "anyhow", "rand", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "indexmap 2.2.2", "rayon", @@ -4061,7 +4061,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-coinbase" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std", "anyhow", @@ -4081,7 +4081,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "anyhow", "indexmap 2.2.2", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4111,7 +4111,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "indexmap 2.2.2", "rayon", @@ -4124,7 +4124,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "indexmap 2.2.2", "serde_json", @@ -4136,7 +4136,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "bytes", "serde_json", @@ -4147,7 +4147,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "indexmap 2.2.2", "rayon", @@ -4161,7 +4161,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "bytes", "serde_json", @@ -4174,7 +4174,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "snarkvm-console", "snarkvm-ledger-coinbase", @@ -4183,7 +4183,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "async-trait", "reqwest", @@ -4196,7 +4196,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std-storage", "anyhow", @@ -4221,7 +4221,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4245,7 +4245,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std", "anyhow", @@ -4270,7 +4270,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std", "anyhow", @@ -4296,7 +4296,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std", "colored", @@ -4319,7 +4319,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "indexmap 2.2.2", "paste", @@ -4333,7 +4333,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "bincode", "once_cell", @@ -4346,7 +4346,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "aleo-std", "anyhow", @@ -4367,7 +4367,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=201dbc4#201dbc4eeee7ea32801dbfd99cb6fc90fb1b2a0a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=f761d1e#f761d1e53eca2505c0b6a089e84636cbc21f0ad7" dependencies = [ "proc-macro2", "quote 1.0.35", diff --git a/Cargo.toml b/Cargo.toml index a7c5f19124..e8f9071d1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ default-features = false [workspace.dependencies.snarkvm] git = "https://github.com/AleoHQ/snarkVM.git" -rev = "201dbc4" +rev = "f761d1e" #version = "=0.16.18" features = [ "circuit", "console", "rocks" ] diff --git a/node/consensus/src/lib.rs b/node/consensus/src/lib.rs index afe9911573..315ba954f6 100644 --- a/node/consensus/src/lib.rs +++ b/node/consensus/src/lib.rs @@ -189,52 +189,52 @@ impl Consensus { impl Consensus { /// Adds the given unconfirmed solution to the memory pool. - pub async fn add_unconfirmed_solution(&self, solution: ProverSolution) -> Result<()> { - // Process the unconfirmed solution. - { - let solution_id = solution.commitment(); - - // Check if the transaction was recently seen. - if self.seen_solutions.lock().put(solution_id, ()).is_some() { - // If the transaction was recently seen, return early. - return Ok(()); - } - // Check if the solution already exists in the ledger. - if self.ledger.contains_transmission(&TransmissionID::from(solution_id))? { - bail!("Solution '{}' exists in the ledger {}", fmt_id(solution_id), "(skipping)".dimmed()); - } - // Add the solution to the memory pool. - trace!("Received unconfirmed solution '{}' in the queue", fmt_id(solution_id)); - if self.solutions_queue.lock().put(solution_id, solution).is_some() { - bail!("Solution '{}' exists in the memory pool", fmt_id(solution_id)); - } - } - - // If the memory pool of this node is full, return early. - let num_unconfirmed = self.num_unconfirmed_transmissions(); - if num_unconfirmed > N::MAX_SOLUTIONS || num_unconfirmed > MAX_TRANSMISSIONS_PER_BATCH { - return Ok(()); - } - // Retrieve the solutions. - let solutions = { - // Determine the available capacity. - let capacity = N::MAX_SOLUTIONS.saturating_sub(num_unconfirmed); - // Acquire the lock on the queue. - let mut queue = self.solutions_queue.lock(); - // Determine the number of solutions to send. - let num_solutions = queue.len().min(capacity); - // Drain the solutions from the queue. - (0..num_solutions).filter_map(|_| queue.pop_lru().map(|(_, solution)| solution)).collect::>() - }; - // Iterate over the solutions. - for solution in solutions.into_iter() { - let solution_id = solution.commitment(); - trace!("Adding unconfirmed solution '{}' to the memory pool...", fmt_id(solution_id)); - // Send the unconfirmed solution to the primary. - if let Err(e) = self.primary_sender().send_unconfirmed_solution(solution_id, Data::Object(solution)).await { - warn!("Failed to add unconfirmed solution '{}' to the memory pool - {e}", fmt_id(solution_id)); - } - } + pub async fn add_unconfirmed_solution(&self, _solution: ProverSolution) -> Result<()> { + // // Process the unconfirmed solution. + // { + // let solution_id = solution.commitment(); + // + // // Check if the transaction was recently seen. + // if self.seen_solutions.lock().put(solution_id, ()).is_some() { + // // If the transaction was recently seen, return early. + // return Ok(()); + // } + // // Check if the solution already exists in the ledger. + // if self.ledger.contains_transmission(&TransmissionID::from(solution_id))? { + // bail!("Solution '{}' exists in the ledger {}", fmt_id(solution_id), "(skipping)".dimmed()); + // } + // // Add the solution to the memory pool. + // trace!("Received unconfirmed solution '{}' in the queue", fmt_id(solution_id)); + // if self.solutions_queue.lock().put(solution_id, solution).is_some() { + // bail!("Solution '{}' exists in the memory pool", fmt_id(solution_id)); + // } + // } + // + // // If the memory pool of this node is full, return early. + // let num_unconfirmed = self.num_unconfirmed_transmissions(); + // if num_unconfirmed > N::MAX_SOLUTIONS || num_unconfirmed > MAX_TRANSMISSIONS_PER_BATCH { + // return Ok(()); + // } + // // Retrieve the solutions. + // let solutions = { + // // Determine the available capacity. + // let capacity = N::MAX_SOLUTIONS.saturating_sub(num_unconfirmed); + // // Acquire the lock on the queue. + // let mut queue = self.solutions_queue.lock(); + // // Determine the number of solutions to send. + // let num_solutions = queue.len().min(capacity); + // // Drain the solutions from the queue. + // (0..num_solutions).filter_map(|_| queue.pop_lru().map(|(_, solution)| solution)).collect::>() + // }; + // // Iterate over the solutions. + // for solution in solutions.into_iter() { + // let solution_id = solution.commitment(); + // trace!("Adding unconfirmed solution '{}' to the memory pool...", fmt_id(solution_id)); + // // Send the unconfirmed solution to the primary. + // if let Err(e) = self.primary_sender().send_unconfirmed_solution(solution_id, Data::Object(solution)).await { + // warn!("Failed to add unconfirmed solution '{}' to the memory pool - {e}", fmt_id(solution_id)); + // } + // } Ok(()) } From 25c3132d31cc81a5254d5f2150272a7490bdd7fb Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:36:04 -0400 Subject: [PATCH 6/7] clippy --- node/bft/src/worker.rs | 2 ++ node/consensus/src/lib.rs | 1 + 2 files changed, 3 insertions(+) diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs index d99b5642ef..3ccc356302 100644 --- a/node/bft/src/worker.rs +++ b/node/bft/src/worker.rs @@ -582,6 +582,7 @@ mod tests { assert!(!worker.pending.contains(transmission_id)); } + #[ignore] #[tokio::test] async fn test_process_solution_ok() { let rng = &mut TestRng::default(); @@ -620,6 +621,7 @@ mod tests { assert!(worker.ready.contains(puzzle)); } + #[ignore] #[tokio::test] async fn test_process_solution_nok() { let rng = &mut TestRng::default(); diff --git a/node/consensus/src/lib.rs b/node/consensus/src/lib.rs index 315ba954f6..2d426295ff 100644 --- a/node/consensus/src/lib.rs +++ b/node/consensus/src/lib.rs @@ -55,6 +55,7 @@ use tokio::{ task::JoinHandle, }; +#[allow(dead_code)] #[derive(Clone)] pub struct Consensus { /// The ledger. From 3b6c98214e869c17f2cfe0dbe67bdba2242a5305 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:45:15 -0400 Subject: [PATCH 7/7] clippy --- node/rest/src/routes.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index ed28b52496..9a79473882 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -39,6 +39,7 @@ pub(crate) struct Metadata { metadata: bool, } +#[allow(dead_code)] impl, R: Routing> Rest { // ----------------- DEPRECATED FUNCTIONS ----------------- // The functions below are associated with deprecated routes.