From 0d4a91f7a81aa73754cd67901008a5122f0b8d80 Mon Sep 17 00:00:00 2001 From: Howard Wu <9260812+howardwu@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:10:18 -0700 Subject: [PATCH 1/2] Bump MSRV to 1.76.0 --- .circleci/config.yml | 42 +++++++-------- Cargo.lock | 118 +++++++++++++++++++++---------------------- Cargo.toml | 4 +- rust-toolchain | 2 +- 4 files changed, 83 insertions(+), 83 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 984e1e4c70..522066b223 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -160,7 +160,7 @@ commands: jobs: integration: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: 2xlarge steps: - run_serial_long: @@ -169,7 +169,7 @@ jobs: snarkos: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: 2xlarge steps: - run_serial: @@ -178,7 +178,7 @@ jobs: account: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -187,7 +187,7 @@ jobs: cli: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -196,7 +196,7 @@ jobs: display: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -205,7 +205,7 @@ jobs: node: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: 2xlarge steps: - run_serial: @@ -214,7 +214,7 @@ jobs: node-bft: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: 2xlarge steps: - run_serial: @@ -223,7 +223,7 @@ jobs: node-bft-events: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: 2xlarge steps: - run_serial: @@ -232,7 +232,7 @@ jobs: node-bft-ledger-service: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -241,7 +241,7 @@ jobs: node-bft-storage-service: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -250,7 +250,7 @@ jobs: node-cdn: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -259,7 +259,7 @@ jobs: node-consensus: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: 2xlarge steps: - run_serial: @@ -268,7 +268,7 @@ jobs: node-rest: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -277,7 +277,7 @@ jobs: node-router: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -286,7 +286,7 @@ jobs: node-router-messages: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -295,7 +295,7 @@ jobs: node-sync: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -304,7 +304,7 @@ jobs: node-sync-communication-service: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -313,7 +313,7 @@ jobs: node-sync-locators: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -322,7 +322,7 @@ jobs: node-tcp: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - run_serial: @@ -331,7 +331,7 @@ jobs: check-fmt: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: xlarge steps: - checkout @@ -347,7 +347,7 @@ jobs: check-clippy: docker: - - image: cimg/rust:1.74.1 + - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well resource_class: 2xlarge steps: - checkout diff --git a/Cargo.lock b/Cargo.lock index c8f0ccd90d..d2d86d1bb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3301,7 +3301,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "anstyle", "anyhow", @@ -3332,7 +3332,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std", "anyhow", @@ -3362,7 +3362,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3387,7 +3387,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3397,7 +3397,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3407,7 +3407,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "indexmap 2.2.5", "itertools 0.11.0", @@ -3425,12 +3425,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" [[package]] name = "snarkvm-circuit-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3441,7 +3441,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3456,7 +3456,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3471,7 +3471,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3484,7 +3484,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -3493,7 +3493,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3503,7 +3503,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3515,7 +3515,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3527,7 +3527,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3538,7 +3538,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3550,7 +3550,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -3563,7 +3563,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "bs58", "snarkvm-console-network", @@ -3574,7 +3574,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "blake2s_simd", "smallvec", @@ -3587,7 +3587,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std", "rayon", @@ -3598,7 +3598,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "anyhow", "indexmap 2.2.5", @@ -3621,7 +3621,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "anyhow", "bech32", @@ -3639,7 +3639,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "enum_index", "enum_index_derive", @@ -3660,7 +3660,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -3675,7 +3675,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3686,7 +3686,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console-network-environment", ] @@ -3694,7 +3694,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3704,7 +3704,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3715,7 +3715,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3726,7 +3726,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3737,7 +3737,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3748,7 +3748,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "rand", "rayon", @@ -3762,7 +3762,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std", "anyhow", @@ -3779,7 +3779,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std", "anyhow", @@ -3804,7 +3804,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "anyhow", "rand", @@ -3816,7 +3816,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3835,7 +3835,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "anyhow", "indexmap 2.2.5", @@ -3854,7 +3854,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -3867,7 +3867,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3880,7 +3880,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3893,7 +3893,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "bytes", "serde_json", @@ -3904,7 +3904,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3919,7 +3919,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "bytes", "serde_json", @@ -3932,7 +3932,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -3941,7 +3941,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std", "anyhow", @@ -3961,7 +3961,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "anyhow", "colored", @@ -3976,7 +3976,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "async-trait", "reqwest", @@ -3989,7 +3989,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std-storage", "anyhow", @@ -4015,7 +4015,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4030,7 +4030,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4039,7 +4039,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std", "anyhow", @@ -4064,7 +4064,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std", "anyhow", @@ -4092,7 +4092,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std", "colored", @@ -4115,7 +4115,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "indexmap 2.2.5", "paste", @@ -4129,7 +4129,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "bincode", "once_cell", @@ -4142,7 +4142,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "aleo-std", "anyhow", @@ -4163,7 +4163,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=81af174#81af174c8d4b3cc85d93ddeea508c0cd5833e203" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=0029b6a#0029b6a7ba23998c56c8abf4a1772c1f2763a0d4" dependencies = [ "proc-macro2", "quote 1.0.35", diff --git a/Cargo.toml b/Cargo.toml index 78f2d6a496..64d09eb9b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ keywords = [ categories = [ "cryptography", "operating-systems" ] license = "Apache-2.0" edition = "2021" -rust-version = "1.74.1" +rust-version = "1.76.0" # Attention - Change the MSRV in rust-toolchain and in .circleci/config.yml as well [workspace] members = [ @@ -46,7 +46,7 @@ default-features = false [workspace.dependencies.snarkvm] git = "https://github.com/AleoHQ/snarkVM.git" -rev = "81af174" +rev = "0029b6a" #version = "=0.16.18" features = [ "circuit", "console", "rocks" ] diff --git a/rust-toolchain b/rust-toolchain index 80627411dc..32a6ce3c71 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.74.1 +1.76.0 From 6995f7ccc34769e25f256901bf5747ec6f584624 Mon Sep 17 00:00:00 2001 From: Howard Wu <9260812+howardwu@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:15:24 -0700 Subject: [PATCH 2/2] Clippy --- node/bft/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/node/bft/src/lib.rs b/node/bft/src/lib.rs index e466b9d749..d6fcbae66f 100644 --- a/node/bft/src/lib.rs +++ b/node/bft/src/lib.rs @@ -13,6 +13,7 @@ // limitations under the License. #![forbid(unsafe_code)] +#![allow(clippy::blocks_in_conditions)] #![allow(clippy::type_complexity)] #[macro_use]