diff --git a/.devnet/install.sh b/.devnet/install.sh index 82054f11f1..61fa378960 100755 --- a/.devnet/install.sh +++ b/.devnet/install.sh @@ -32,7 +32,7 @@ run_installation() { git pull origin $BRANCH else # The workspace directory doesn't exist, clone the repository - git clone https://github.com/AleoHQ/snarkOS.git \$WORKSPACE + git clone https://github.com/AleoNet/snarkOS.git \$WORKSPACE cd \$WORKSPACE git checkout $BRANCH # Checkout the specified branch fi diff --git a/.devnet/reinstall.sh b/.devnet/reinstall.sh index 624fa7ab13..2c1ab72c6f 100755 --- a/.devnet/reinstall.sh +++ b/.devnet/reinstall.sh @@ -29,14 +29,14 @@ run_installation() { if [ -d "\$WORKSPACE" ]; then # The workspace directory exists, update the existing repository # rm -rf \$WORKSPACE -# git clone https://github.com/AleoHQ/snarkOS.git \$WORKSPACE +# git clone https://github.com/AleoNet/snarkOS.git \$WORKSPACE cd \$WORKSPACE git pull # If we are switching branches, this will find the new branch git checkout $BRANCH # Checkout the specified branch git pull origin $BRANCH else # The workspace directory doesn't exist, clone the repository - git clone https://github.com/AleoHQ/snarkOS.git \$WORKSPACE + git clone https://github.com/AleoNet/snarkOS.git \$WORKSPACE cd \$WORKSPACE git checkout $BRANCH # Checkout the specified branch fi diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 5fc29df32e..ede84d0739 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,3 +1,3 @@ -## 👉 [Please follow one of these issue templates](https://github.com/AleoHQ/snarkOS/issues/new/choose) 👈 +## 👉 [Please follow one of these issue templates](https://github.com/AleoNet/snarkOS/issues/new/choose) 👈 Note: to keep the backlog clean and actionable, issues may be immediately closed if they do not follow one of the above issue templates. diff --git a/.integration/Cargo.toml b/.integration/Cargo.toml index ee5918a026..a4af2a6be3 100644 --- a/.integration/Cargo.toml +++ b/.integration/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A integration testing suite for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/.integration/src/lib.rs b/.integration/src/lib.rs index 02e18ed396..841505ec0c 100644 --- a/.integration/src/lib.rs +++ b/.integration/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/.resources/license_header b/.resources/license_header index 8bdcf01b37..57b29190c9 100644 --- a/.resources/license_header +++ b/.resources/license_header @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/Cargo.lock b/Cargo.lock index 9c92b79801..ac26621d4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72f2a841f04c2eaeb5a95312e5201a9e4b7c95b64ca99870d6bd2e2376df540a" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -91,7 +91,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6118baab6285accf088b31d5ea5029c37bbf9d98e62b4d8720a0a5a66bc2e427" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -151,33 +151,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -185,21 +185,30 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" + +[[package]] +name = "arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-recursion" @@ -208,8 +217,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -230,19 +239,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -262,9 +271,9 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", "itoa", "matchit", @@ -295,7 +304,7 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", @@ -318,7 +327,7 @@ dependencies = [ "futures-util", "headers", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", @@ -332,17 +341,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -357,6 +366,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "bech32" version = "0.9.1" @@ -386,11 +401,11 @@ dependencies = [ "peeking_take_while", "prettyplease", "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "regex", "rustc-hash", "shlex", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -416,9 +431,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "blake2" @@ -472,9 +487,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bzip2-sys" @@ -495,13 +510,13 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.99" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -528,7 +543,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -553,9 +568,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -563,9 +578,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -575,27 +590,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colored" @@ -620,11 +635,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -638,15 +659,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -691,10 +712,10 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossterm_winapi", "libc", - "mio", + "mio 0.8.11", "parking_lot", "signal-hook", "signal-hook-mio", @@ -743,9 +764,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.72+curl-8.6.0" +version = "0.4.74+curl-8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" dependencies = [ "cc", "libc", @@ -756,6 +777,33 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote 1.0.37", + "syn 2.0.77", +] + [[package]] name = "dashmap" version = "5.5.3" @@ -778,6 +826,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "deranged" version = "0.3.11" @@ -787,6 +845,17 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote 1.0.37", + "syn 2.0.77", +] + [[package]] name = "digest" version = "0.10.7" @@ -820,13 +889,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -841,11 +910,36 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "serde", + "sha2", + "signature", + "subtle", + "zeroize", +] + [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -878,8 +972,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -926,24 +1020,21 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] -name = "fastrand" -version = "2.1.0" +name = "fiat-crypto" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide", @@ -1057,8 +1148,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -1140,9 +1231,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -1182,7 +1273,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -1288,9 +1379,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -1305,7 +1396,7 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -1317,9 +1408,9 @@ checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" [[package]] name = "httparse" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1329,9 +1420,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1353,21 +1444,22 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", "pin-project-lite", "smallvec", "tokio", + "want", ] [[package]] @@ -1377,25 +1469,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.29", + "hyper 0.14.30", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", ] [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", + "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", + "socket2", "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1421,134 +1534,14 @@ dependencies = [ "cc", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", -] - [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -1563,9 +1556,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1603,9 +1596,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-docker" @@ -1628,9 +1621,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1658,18 +1651,18 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1691,9 +1684,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -1703,18 +1696,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1729,7 +1722,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -1750,9 +1743,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -1772,12 +1765,6 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - [[package]] name = "lock_api" version = "0.4.12" @@ -1788,26 +1775,32 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown 0.14.5", ] [[package]] name = "lz4-sys" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9764018d143cc854c9f17f0b907de70f14393b1f502da6375dce70f00514eb3" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" dependencies = [ "cc", "libc", @@ -1869,9 +1862,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" dependencies = [ "base64 0.21.7", - "hyper 0.14.29", - "hyper-tls", - "indexmap 2.2.6", + "hyper 0.14.30", + "hyper-tls 0.5.0", + "indexmap 2.5.0", "ipnet", "metrics", "metrics-util", @@ -1904,9 +1897,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -1920,11 +1913,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -1939,6 +1932,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mockall" version = "0.12.1" @@ -1962,8 +1967,8 @@ checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" dependencies = [ "cfg-if", "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -2042,9 +2047,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -2063,8 +2068,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -2114,9 +2119,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.0" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2132,9 +2137,9 @@ dependencies = [ [[package]] name = "open" -version = "5.1.4" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -2143,11 +2148,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -2163,8 +2168,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -2175,9 +2180,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2211,7 +2216,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2284,8 +2289,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -2300,6 +2305,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.30" @@ -2308,9 +2323,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "powerfmt" @@ -2320,15 +2335,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "predicates" -version = "3.1.0" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" dependencies = [ "anstyle", "predicates-core", @@ -2336,15 +2354,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" [[package]] name = "predicates-tree" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" dependencies = [ "predicates-core", "termtree", @@ -2352,32 +2370,32 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "lazy_static", "num-traits", "rand", @@ -2427,9 +2445,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2489,7 +2507,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cassowary", "crossterm", "indoc", @@ -2504,11 +2522,11 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.0.2" +version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2533,18 +2551,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -2553,9 +2571,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2609,8 +2627,8 @@ dependencies = [ "h2", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.29", - "hyper-tls", + "hyper 0.14.30", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -2619,7 +2637,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -2636,32 +2654,72 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rocksdb" -version = "0.21.0" +name = "reqwest" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "libc", - "librocksdb-sys", -] - -[[package]] -name = "rustc-demangle" + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 2.1.3", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-registry", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rocksdb" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" +dependencies = [ + "libc", + "librocksdb-sys", +] + +[[package]] +name = "rustc-demangle" version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" @@ -2674,20 +2732,20 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2696,11 +2754,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -2717,17 +2776,27 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -2781,11 +2850,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2796,11 +2865,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2809,9 +2878,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -2819,13 +2888,13 @@ dependencies = [ [[package]] name = "self-replace" -version = "1.3.7" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525db198616b2bcd0f245daf7bfd8130222f7ee6af9ff9984c19a61bf1160c55" +checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7" dependencies = [ - "fastrand 1.9.0", + "fastrand", "tempfile", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2834,12 +2903,12 @@ version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b3c585a1ced6b97ac13bd5e56f66559e5a75f477da5913f70df98e114518446" dependencies = [ - "hyper 0.14.29", + "hyper 0.14.30", "indicatif", "log", "quick-xml", "regex", - "reqwest", + "reqwest 0.11.27", "self-replace", "semver", "serde_json", @@ -2849,21 +2918,23 @@ dependencies = [ [[package]] name = "self_update" -version = "0.39.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a34ad8e4a86884ab42e9b8690e9343abdcfe5fa38a0318cfe1565ba9ad437b4" +checksum = "469a3970061380c19852269f393e74c0fe607a4e23d85267382cf25486aa8de5" dependencies = [ - "hyper 0.14.29", + "hyper 1.4.1", "indicatif", "log", "quick-xml", "regex", - "reqwest", + "reqwest 0.12.7", "self-replace", "semver", "serde_json", "tempfile", "urlencoding", + "zip", + "zipsign-api", ] [[package]] @@ -2874,32 +2945,33 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "itoa", + "memchr", "ryu", "serde", ] @@ -2975,12 +3047,12 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] @@ -2993,6 +3065,22 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "simple_asn1" version = "0.6.2" @@ -3081,14 +3169,14 @@ dependencies = [ "clap", "colored", "crossterm", - "indexmap 2.2.6", + "indexmap 2.5.0", "nix", "num_cpus", "parking_lot", "rand", "rand_chacha", "rayon", - "self_update 0.39.0", + "self_update 0.41.0", "serde", "serde_json", "snarkos-account", @@ -3142,7 +3230,7 @@ dependencies = [ "colored", "deadline", "futures-util", - "indexmap 2.2.6", + "indexmap 2.5.0", "num_cpus", "once_cell", "parking_lot", @@ -3184,7 +3272,7 @@ dependencies = [ "colored", "deadline", "futures", - "indexmap 2.2.6", + "indexmap 2.5.0", "itertools 0.12.1", "mockall", "open", @@ -3223,7 +3311,7 @@ version = "2.2.7" dependencies = [ "anyhow", "bytes", - "indexmap 2.2.6", + "indexmap 2.5.0", "proptest", "rayon", "serde", @@ -3241,7 +3329,7 @@ name = "snarkos-node-bft-ledger-service" version = "2.2.7" dependencies = [ "async-trait", - "indexmap 2.2.6", + "indexmap 2.5.0", "lru", "parking_lot", "rand", @@ -3256,7 +3344,7 @@ name = "snarkos-node-bft-storage-service" version = "2.2.7" dependencies = [ "aleo-std", - "indexmap 2.2.6", + "indexmap 2.5.0", "parking_lot", "snarkvm", "tracing", @@ -3272,7 +3360,7 @@ dependencies = [ "futures", "parking_lot", "rayon", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "snarkvm", @@ -3288,7 +3376,7 @@ dependencies = [ "aleo-std", "anyhow", "colored", - "indexmap 2.2.6", + "indexmap 2.5.0", "itertools 0.12.1", "lru", "once_cell", @@ -3325,7 +3413,7 @@ dependencies = [ "axum", "axum-extra", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.5.0", "jsonwebtoken", "once_cell", "parking_lot", @@ -3336,7 +3424,7 @@ dependencies = [ "snarkos-node-consensus", "snarkos-node-router", "snarkvm", - "snarkvm-synthesizer 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-synthesizer", "time", "tokio", "tower", @@ -3357,13 +3445,13 @@ dependencies = [ "deadline", "futures", "futures-util", - "indexmap 2.2.6", + "indexmap 2.5.0", "linked-hash-map", "parking_lot", "peak_alloc", "rand", "rayon", - "reqwest", + "reqwest 0.11.27", "serde", "snarkos-account", "snarkos-node-metrics", @@ -3387,7 +3475,7 @@ version = "2.2.7" dependencies = [ "anyhow", "bytes", - "indexmap 2.2.6", + "indexmap 2.5.0", "proptest", "rayon", "serde", @@ -3405,7 +3493,7 @@ name = "snarkos-node-sync" version = "2.2.7" dependencies = [ "anyhow", - "indexmap 2.2.6", + "indexmap 2.5.0", "itertools 0.12.1", "once_cell", "parking_lot", @@ -3434,7 +3522,7 @@ name = "snarkos-node-sync-locators" version = "2.2.7" dependencies = [ "anyhow", - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "snarkvm", "tracing", @@ -3458,14 +3546,14 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "anstyle", "anyhow", "clap", "colored", "dotenvy", - "indexmap 2.2.6", + "indexmap 2.5.0", "num-format", "once_cell", "parking_lot", @@ -3473,14 +3561,14 @@ dependencies = [ "rayon", "self_update 0.38.0", "serde_json", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-algorithms", + "snarkvm-circuit", + "snarkvm-console", "snarkvm-ledger", "snarkvm-metrics", - "snarkvm-parameters 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-synthesizer 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-parameters", + "snarkvm-synthesizer", + "snarkvm-utilities", "thiserror", "ureq", "walkdir", @@ -3489,37 +3577,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "aleo-std", - "anyhow", - "blake2", - "cfg-if", - "fxhash", - "hashbrown 0.14.5", - "hex", - "indexmap 2.2.6", - "itertools 0.11.0", - "num-traits", - "parking_lot", - "rand", - "rand_chacha", - "rand_core", - "rayon", - "serde", - "sha2", - "smallvec", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-parameters 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "thiserror", -] - -[[package]] -name = "snarkvm-algorithms" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "anyhow", @@ -3528,7 +3586,7 @@ dependencies = [ "fxhash", "hashbrown 0.14.5", "hex", - "indexmap 2.2.6", + "indexmap 2.5.0", "itertools 0.11.0", "num-traits", "parking_lot", @@ -3539,535 +3597,276 @@ dependencies = [ "serde", "sha2", "smallvec", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-parameters 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-curves", + "snarkvm-fields", + "snarkvm-parameters", + "snarkvm-utilities", "thiserror", ] [[package]] name = "snarkvm-circuit" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "snarkvm-circuit-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-circuit" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit-account", + "snarkvm-circuit-algorithms", + "snarkvm-circuit-collections", + "snarkvm-circuit-environment", + "snarkvm-circuit-network", + "snarkvm-circuit-program", + "snarkvm-circuit-types", ] [[package]] name = "snarkvm-circuit-account" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-circuit-account" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit-algorithms", + "snarkvm-circuit-network", + "snarkvm-circuit-types", + "snarkvm-console-account", ] [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-circuit-algorithms" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-circuit-collections" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-circuit-types", + "snarkvm-console-algorithms", + "snarkvm-fields", ] [[package]] name = "snarkvm-circuit-collections" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-circuit-environment" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "indexmap 2.2.6", - "itertools 0.11.0", - "nom", - "num-traits", - "once_cell", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-environment-witness 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-circuit-algorithms", + "snarkvm-circuit-types", + "snarkvm-console-collections", ] [[package]] name = "snarkvm-circuit-environment" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "itertools 0.11.0", "nom", "num-traits", "once_cell", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-environment-witness 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-algorithms", + "snarkvm-circuit-environment-witness", + "snarkvm-console-network", + "snarkvm-curves", + "snarkvm-fields", + "snarkvm-utilities", ] [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" - -[[package]] -name = "snarkvm-circuit-environment-witness" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" - -[[package]] -name = "snarkvm-circuit-network" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" [[package]] name = "snarkvm-circuit-network" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-circuit-program" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "paste", - "snarkvm-circuit-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-circuit-algorithms", + "snarkvm-circuit-collections", + "snarkvm-circuit-types", + "snarkvm-console-network", ] [[package]] name = "snarkvm-circuit-program" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "paste", - "snarkvm-circuit-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-circuit-types" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-address 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-string 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-circuit-account", + "snarkvm-circuit-algorithms", + "snarkvm-circuit-collections", + "snarkvm-circuit-network", + "snarkvm-circuit-types", + "snarkvm-console-program", + "snarkvm-utilities", ] [[package]] name = "snarkvm-circuit-types" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-address 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-string 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit-environment", + "snarkvm-circuit-types-address", + "snarkvm-circuit-types-boolean", + "snarkvm-circuit-types-field", + "snarkvm-circuit-types-group", + "snarkvm-circuit-types-integers", + "snarkvm-circuit-types-scalar", + "snarkvm-circuit-types-string", ] [[package]] name = "snarkvm-circuit-types-address" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-address 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-circuit-types-address" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-address 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit-environment", + "snarkvm-circuit-types-boolean", + "snarkvm-circuit-types-field", + "snarkvm-circuit-types-group", + "snarkvm-circuit-types-scalar", + "snarkvm-console-types-address", ] [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-circuit-types-boolean" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit-environment", + "snarkvm-console-types-boolean", ] [[package]] name = "snarkvm-circuit-types-field" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-circuit-types-field" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-circuit-types-group" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-circuit-environment", + "snarkvm-circuit-types-boolean", + "snarkvm-console-types-field", ] [[package]] name = "snarkvm-circuit-types-group" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-circuit-types-integers" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-circuit-environment", + "snarkvm-circuit-types-boolean", + "snarkvm-circuit-types-field", + "snarkvm-circuit-types-scalar", + "snarkvm-console-types-group", ] [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit-environment", + "snarkvm-circuit-types-boolean", + "snarkvm-circuit-types-field", + "snarkvm-circuit-types-scalar", + "snarkvm-console-types-integers", ] [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-circuit-types-scalar" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit-environment", + "snarkvm-circuit-types-boolean", + "snarkvm-circuit-types-field", + "snarkvm-console-types-scalar", ] [[package]] name = "snarkvm-circuit-types-string" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-string 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-circuit-types-string" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-circuit-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-string 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit-environment", + "snarkvm-circuit-types-boolean", + "snarkvm-circuit-types-field", + "snarkvm-circuit-types-integers", + "snarkvm-console-types-string", ] [[package]] name = "snarkvm-console" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-console-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-console" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-console-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-console-account" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "bs58", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "zeroize", + "snarkvm-console-account", + "snarkvm-console-algorithms", + "snarkvm-console-collections", + "snarkvm-console-network", + "snarkvm-console-program", + "snarkvm-console-types", ] [[package]] name = "snarkvm-console-account" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "bs58", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console-network", + "snarkvm-console-types", "zeroize", ] [[package]] name = "snarkvm-console-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "blake2s_simd", "smallvec", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "tiny-keccak", -] - -[[package]] -name = "snarkvm-console-algorithms" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "blake2s_simd", - "smallvec", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console-types", + "snarkvm-fields", + "snarkvm-utilities", "tiny-keccak", ] [[package]] name = "snarkvm-console-collections" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "rayon", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-console-collections" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "aleo-std", - "rayon", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-console-network" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "anyhow", - "indexmap 2.2.6", - "itertools 0.11.0", - "lazy_static", - "once_cell", - "paste", - "serde", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-parameters 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-console-algorithms", + "snarkvm-console-types", ] [[package]] name = "snarkvm-console-network" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "anyhow", - "indexmap 2.2.6", + "indexmap 2.5.0", "itertools 0.11.0", "lazy_static", "once_cell", "paste", "serde", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-parameters 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-algorithms", + "snarkvm-console-algorithms", + "snarkvm-console-collections", + "snarkvm-console-network-environment", + "snarkvm-console-types", + "snarkvm-curves", + "snarkvm-fields", + "snarkvm-parameters", + "snarkvm-utilities", ] [[package]] name = "snarkvm-console-network-environment" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "anyhow", "bech32", @@ -4076,299 +3875,140 @@ dependencies = [ "num-traits", "rand", "serde", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-curves", + "snarkvm-fields", + "snarkvm-utilities", "zeroize", ] -[[package]] -name = "snarkvm-console-network-environment" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "anyhow", - "bech32", - "itertools 0.11.0", - "nom", - "num-traits", - "rand", - "serde", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "zeroize", -] - -[[package]] -name = "snarkvm-console-program" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "enum-iterator", - "enum_index", - "enum_index_derive", - "indexmap 2.2.6", - "num-derive", - "num-traits", - "once_cell", - "paste", - "serde_json", - "snarkvm-console-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - [[package]] name = "snarkvm-console-program" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "enum-iterator", "enum_index", "enum_index_derive", - "indexmap 2.2.6", + "indexmap 2.5.0", "num-derive", "num-traits", "once_cell", "paste", "serde_json", - "snarkvm-console-account 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-collections 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-network 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console-account", + "snarkvm-console-algorithms", + "snarkvm-console-collections", + "snarkvm-console-network", + "snarkvm-console-types", + "snarkvm-utilities", ] [[package]] name = "snarkvm-console-types" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-address 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-string 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-console-types" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-address 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-string 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console-network-environment", + "snarkvm-console-types-address", + "snarkvm-console-types-boolean", + "snarkvm-console-types-field", + "snarkvm-console-types-group", + "snarkvm-console-types-integers", + "snarkvm-console-types-scalar", + "snarkvm-console-types-string", ] [[package]] name = "snarkvm-console-types-address" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-console-types-address" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-group 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-console-types-boolean" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-console-network-environment", + "snarkvm-console-types-boolean", + "snarkvm-console-types-field", + "snarkvm-console-types-group", ] [[package]] name = "snarkvm-console-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-console-types-field" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "zeroize", + "snarkvm-console-network-environment", ] [[package]] name = "snarkvm-console-types-field" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console-network-environment", + "snarkvm-console-types-boolean", "zeroize", ] [[package]] name = "snarkvm-console-types-group" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-console-types-group" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console-network-environment", + "snarkvm-console-types-boolean", + "snarkvm-console-types-field", + "snarkvm-console-types-scalar", ] [[package]] name = "snarkvm-console-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-console-types-integers" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-scalar 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console-network-environment", + "snarkvm-console-types-boolean", + "snarkvm-console-types-field", + "snarkvm-console-types-scalar", ] [[package]] name = "snarkvm-console-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-console-network-environment", + "snarkvm-console-types-boolean", + "snarkvm-console-types-field", "zeroize", ] -[[package]] -name = "snarkvm-console-types-scalar" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "zeroize", -] - -[[package]] -name = "snarkvm-console-types-string" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - [[package]] name = "snarkvm-console-types-string" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-console-network-environment 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-boolean 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-field 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console-types-integers 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console-network-environment", + "snarkvm-console-types-boolean", + "snarkvm-console-types-field", + "snarkvm-console-types-integers", ] [[package]] name = "snarkvm-curves" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "rand", "rayon", "rustc_version", "serde", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "thiserror", -] - -[[package]] -name = "snarkvm-curves" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "rand", - "rayon", - "rustc_version", - "serde", - "snarkvm-fields 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "thiserror", -] - -[[package]] -name = "snarkvm-fields" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "aleo-std", - "anyhow", - "itertools 0.11.0", - "num-traits", - "rand", - "rayon", - "serde", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-fields", + "snarkvm-utilities", "thiserror", - "zeroize", ] [[package]] name = "snarkvm-fields" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "anyhow", @@ -4377,7 +4017,7 @@ dependencies = [ "rand", "rayon", "serde", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-utilities", "thiserror", "zeroize", ] @@ -4385,24 +4025,24 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "anyhow", - "indexmap 2.2.6", + "indexmap 2.5.0", "parking_lot", "rand", "rayon", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-authority 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-block 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-committee 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console", + "snarkvm-ledger-authority", + "snarkvm-ledger-block", + "snarkvm-ledger-committee", "snarkvm-ledger-narwhal", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-query 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-store 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-ledger-puzzle", + "snarkvm-ledger-query", + "snarkvm-ledger-store", "snarkvm-ledger-test-helpers", - "snarkvm-synthesizer 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-synthesizer", "time", "tracing", ] @@ -4410,92 +4050,50 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "anyhow", "rand", "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-subdag 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-ledger-authority" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "anyhow", - "rand", - "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-subdag 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console", + "snarkvm-ledger-narwhal-subdag", ] [[package]] name = "snarkvm-ledger-block" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "rayon", "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-authority 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-committee 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-batch-header 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-subdag 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-transmission-id 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-synthesizer-snark 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-ledger-block" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "indexmap 2.2.6", - "rayon", - "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-authority 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-committee 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-batch-header 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-subdag 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-transmission-id 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-synthesizer-snark 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-ledger-committee" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "indexmap 2.2.6", - "rayon", - "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-batch-header 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-console", + "snarkvm-ledger-authority", + "snarkvm-ledger-committee", + "snarkvm-ledger-narwhal-batch-header", + "snarkvm-ledger-narwhal-data", + "snarkvm-ledger-narwhal-subdag", + "snarkvm-ledger-narwhal-transmission-id", + "snarkvm-ledger-puzzle", + "snarkvm-synthesizer-program", + "snarkvm-synthesizer-snark", ] [[package]] name = "snarkvm-ledger-committee" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "anyhow", - "indexmap 2.2.6", + "indexmap 2.5.0", "proptest", "rand", "rand_chacha", "rand_distr", "rayon", "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-batch-header 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console", + "snarkvm-ledger-narwhal-batch-header", "snarkvm-metrics", "test-strategy", ] @@ -4503,168 +4101,99 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "snarkvm-ledger-narwhal-batch-certificate 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-batch-header 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-ledger-narwhal-batch-certificate", + "snarkvm-ledger-narwhal-batch-header", "snarkvm-ledger-narwhal-data", - "snarkvm-ledger-narwhal-subdag 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-ledger-narwhal-subdag", "snarkvm-ledger-narwhal-transmission", - "snarkvm-ledger-narwhal-transmission-id 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-ledger-narwhal-batch-certificate" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "indexmap 2.2.6", - "rayon", - "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-batch-header 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-transmission-id 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-ledger-narwhal-transmission-id", ] [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "rayon", "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-batch-header 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-transmission-id 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console", + "snarkvm-ledger-narwhal-batch-header", + "snarkvm-ledger-narwhal-transmission-id", ] [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "rayon", "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-transmission-id 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-ledger-narwhal-batch-header" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "indexmap 2.2.6", - "rayon", - "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-transmission-id 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console", + "snarkvm-ledger-narwhal-transmission-id", "time", ] [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "bytes", "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console", "tokio", ] [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "rayon", "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-committee 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-batch-certificate 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-batch-header 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-transmission-id 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-ledger-narwhal-subdag" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "indexmap 2.2.6", - "rayon", - "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-committee 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-batch-certificate 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-batch-header 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-transmission-id 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console", + "snarkvm-ledger-committee", + "snarkvm-ledger-narwhal-batch-certificate", + "snarkvm-ledger-narwhal-batch-header", + "snarkvm-ledger-narwhal-transmission-id", ] [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "bytes", "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-block 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console", + "snarkvm-ledger-block", "snarkvm-ledger-narwhal-data", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-ledger-puzzle", ] [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-ledger-narwhal-transmission-id" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" -dependencies = [ - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-ledger-puzzle" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "aleo-std", - "anyhow", - "bincode", - "indexmap 2.2.6", - "lru", - "once_cell", - "parking_lot", - "rand", - "rand_chacha", - "rayon", - "serde_json", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" +dependencies = [ + "snarkvm-console", + "snarkvm-ledger-puzzle", ] [[package]] name = "snarkvm-ledger-puzzle" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "anyhow", "bincode", - "indexmap 2.2.6", + "indexmap 2.5.0", "lru", "once_cell", "parking_lot", @@ -4672,103 +4201,53 @@ dependencies = [ "rand_chacha", "rayon", "serde_json", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-ledger-puzzle-epoch" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "anyhow", - "colored", - "indexmap 2.2.6", - "rand", - "rand_chacha", - "rayon", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-algorithms", + "snarkvm-console", ] [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "anyhow", "colored", - "indexmap 2.2.6", + "indexmap 2.5.0", "lru", "parking_lot", "rand", "rand_chacha", "rayon", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit", + "snarkvm-console", + "snarkvm-ledger-puzzle", "snarkvm-synthesizer-process", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-ledger-query" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "async-trait", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-store 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "ureq", + "snarkvm-synthesizer-program", ] [[package]] name = "snarkvm-ledger-query" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "async-trait", - "reqwest", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-store 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "reqwest 0.11.27", + "snarkvm-console", + "snarkvm-ledger-store", + "snarkvm-synthesizer-program", "ureq", ] [[package]] name = "snarkvm-ledger-store" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "aleo-std-storage", - "anyhow", - "bincode", - "indexmap 2.2.6", - "parking_lot", - "rayon", - "serde", - "serde_json", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-authority 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-block 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-committee 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-narwhal-batch-certificate 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-synthesizer-snark 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", -] - -[[package]] -name = "snarkvm-ledger-store" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std-storage", "anyhow", "bincode", - "indexmap 2.2.6", + "indexmap 2.5.0", "once_cell", "parking_lot", "rayon", @@ -4776,36 +4255,36 @@ dependencies = [ "serde", "serde_json", "smallvec", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-authority 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-block 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-committee 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-narwhal-batch-certificate 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-synthesizer-snark 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-console", + "snarkvm-ledger-authority", + "snarkvm-ledger-block", + "snarkvm-ledger-committee", + "snarkvm-ledger-narwhal-batch-certificate", + "snarkvm-ledger-puzzle", + "snarkvm-synthesizer-program", + "snarkvm-synthesizer-snark", "tracing", ] [[package]] name = "snarkvm-ledger-test-helpers" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "once_cell", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-block 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-query 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-store 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-circuit", + "snarkvm-console", + "snarkvm-ledger-block", + "snarkvm-ledger-query", + "snarkvm-ledger-store", "snarkvm-synthesizer-process", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-synthesizer-program", ] [[package]] name = "snarkvm-metrics" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4814,32 +4293,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "aleo-std", - "anyhow", - "bincode", - "cfg-if", - "colored", - "curl", - "hex", - "indexmap 2.2.6", - "itertools 0.11.0", - "lazy_static", - "parking_lot", - "paste", - "rand", - "serde_json", - "sha2", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "thiserror", -] - -[[package]] -name = "snarkvm-parameters" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "anyhow", @@ -4848,7 +4302,7 @@ dependencies = [ "colored", "curl", "hex", - "indexmap 2.2.6", + "indexmap 2.5.0", "itertools 0.11.0", "lazy_static", "parking_lot", @@ -4856,170 +4310,98 @@ dependencies = [ "rand", "serde_json", "sha2", - "snarkvm-curves 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-curves", + "snarkvm-utilities", "thiserror", ] [[package]] name = "snarkvm-synthesizer" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "aleo-std", - "anyhow", - "indexmap 2.2.6", - "itertools 0.11.0", - "lru", - "parking_lot", - "rand", - "serde", - "serde_json", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-block 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-committee 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-puzzle-epoch 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-query 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-ledger-store 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "tracing", -] - -[[package]] -name = "snarkvm-synthesizer" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "anyhow", - "indexmap 2.2.6", + "indexmap 2.5.0", "itertools 0.11.0", "lru", "parking_lot", "rand", "rayon", + "serde", "serde_json", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-block 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-committee 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-puzzle 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-puzzle-epoch 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-query 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-store 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-algorithms", + "snarkvm-circuit", + "snarkvm-console", + "snarkvm-ledger-block", + "snarkvm-ledger-committee", + "snarkvm-ledger-narwhal-data", + "snarkvm-ledger-puzzle", + "snarkvm-ledger-puzzle-epoch", + "snarkvm-ledger-query", + "snarkvm-ledger-store", "snarkvm-synthesizer-process", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-synthesizer-snark 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-synthesizer-program", + "snarkvm-synthesizer-snark", + "snarkvm-utilities", "tracing", ] [[package]] name = "snarkvm-synthesizer-process" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "colored", - "indexmap 2.2.6", + "indexmap 2.5.0", "once_cell", "parking_lot", "rand", - "rayon", - "serde_json", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-block 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-query 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-ledger-store 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-synthesizer-program 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-synthesizer-snark 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-utilities 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-synthesizer-program" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "indexmap 2.2.6", - "paste", - "rand", "rand_chacha", + "rayon", "serde_json", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-circuit", + "snarkvm-console", + "snarkvm-ledger-block", + "snarkvm-ledger-query", + "snarkvm-ledger-store", + "snarkvm-synthesizer-program", + "snarkvm-synthesizer-snark", + "snarkvm-utilities", ] [[package]] name = "snarkvm-synthesizer-program" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "paste", "rand", "rand_chacha", "serde_json", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-synthesizer-snark" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "bincode", - "once_cell", - "serde_json", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", + "snarkvm-circuit", + "snarkvm-console", ] [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "bincode", "once_cell", "serde_json", - "snarkvm-algorithms 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-circuit 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", - "snarkvm-console 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", -] - -[[package]] -name = "snarkvm-utilities" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "aleo-std", - "anyhow", - "bincode", - "num-bigint", - "num_cpus", - "rand", - "rand_xorshift", - "rayon", - "serde", - "serde_json", - "smol_str", - "snarkvm-utilities-derives 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=8a05317)", - "thiserror", - "zeroize", + "snarkvm-algorithms", + "snarkvm-circuit", + "snarkvm-console", ] [[package]] name = "snarkvm-utilities" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "aleo-std", "anyhow", @@ -5032,7 +4414,7 @@ dependencies = [ "serde", "serde_json", "smol_str", - "snarkvm-utilities-derives 0.16.19 (git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f)", + "snarkvm-utilities-derives", "thiserror", "zeroize", ] @@ -5040,21 +4422,11 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=8a05317#8a053177f46dc4383d5a8adcc6b14e4c73f34c82" -dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", -] - -[[package]] -name = "snarkvm-utilities-derives" -version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM.git?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=3d42aa0#3d42aa04a058cd5f46a1880b421313e1c04a63dc" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5082,22 +4454,26 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "stability" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" dependencies = [ - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "strsim" version = "0.11.1" @@ -5111,9 +4487,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "structmeta-derive", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -5123,8 +4499,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5144,16 +4520,16 @@ checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "rustversion", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -5173,18 +4549,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.66" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "unicode-ident", ] @@ -5199,6 +4575,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synom" @@ -5209,17 +4588,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", -] - [[package]] name = "sys-info" version = "0.9.1" @@ -5253,14 +4621,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5276,29 +4645,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8361c808554228ad09bfed70f5c823caf8a3450b6881cc3a38eb57e8c08c1d9" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "structmeta", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5371,21 +4740,11 @@ dependencies = [ "crunchy", ] -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5398,32 +4757,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5438,9 +4796,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -5462,9 +4820,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -5504,11 +4862,11 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "http-range-header", "httpdate", @@ -5525,15 +4883,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tower_governor" @@ -5570,8 +4928,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5686,7 +5044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c49adbab879d2e0dd7f75edace5f0ac2156939ecb7e6a1e8fa14e53728328c48" dependencies = [ "lazy_static", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -5696,8 +5054,8 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5727,12 +5085,27 @@ dependencies = [ "version_check", ] +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -5759,9 +5132,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", "flate2", @@ -5769,7 +5142,6 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "serde", "serde_json", "url", @@ -5778,9 +5150,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -5793,18 +5165,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - [[package]] name = "utf8parse" version = "0.2.2" @@ -5825,9 +5185,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wait-timeout" @@ -5865,34 +5225,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -5902,38 +5263,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ - "quote 1.0.36", + "quote 1.0.37", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -5941,9 +5302,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.2" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -5966,11 +5327,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5985,7 +5346,37 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -6003,7 +5394,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6023,18 +5423,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6045,9 +5445,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6057,9 +5457,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6069,15 +5469,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6087,9 +5487,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6099,9 +5499,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6111,9 +5511,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6123,9 +5523,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winreg" @@ -6137,81 +5537,25 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", - "synstructure", -] - [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" -dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", - "synstructure", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -6230,28 +5574,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] -name = "zerovec" -version = "0.10.2" +name = "zip" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "flate2", + "indexmap 2.5.0", + "memchr", + "thiserror", + "time", + "zopfli", +] + +[[package]] +name = "zipsign-api" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +checksum = "6413a546ada9dbcd0b9a3e0b0880581279e35047bce9797e523b3408e1df607c" dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", + "ed25519-dalek", + "thiserror", ] [[package]] -name = "zerovec-derive" -version = "0.10.2" +name = "zopfli" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.66", + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] diff --git a/Cargo.toml b/Cargo.toml index 6898e5400e..9e01b72dfb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,10 +45,12 @@ version = "=0.1.24" default-features = false [workspace.dependencies.snarkvm] -git = "https://github.com/AleoNet/snarkVM.git" -rev = "d170a9f" # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. +#path = "../snarkVM" +git = "https://github.com/OuIChien/snarkVM.git" +#rev = "3d42aa0" # If this is updated, the rev in `node/rest/Cargo.toml` must be updated as well. +branch = "OuIChien/dev" #version = "=0.16.18" -features = [ "circuit", "console", "rocks" ] +features = [ "circuit", "console", "rocks", "cuda", "cuda-mobile" ] [[bin]] name = "snarkos" diff --git a/account/Cargo.toml b/account/Cargo.toml index ba6e946cbe..d30ce25926 100644 --- a/account/Cargo.toml +++ b/account/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "Account for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/account/src/lib.rs b/account/src/lib.rs index 684db130ed..66a84ac3c8 100644 --- a/account/src/lib.rs +++ b/account/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/build.rs b/build.rs index ed7ddc576e..22510684ca 100644 --- a/build.rs +++ b/build.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7fdb352b4f..f430671c88 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A CLI for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", @@ -68,7 +68,8 @@ default-features = false version = "1" [dependencies.self_update] -version = "0.39" +version = "0.41" +features = [ "archive-zip", "compression-zip-deflate" ] [dependencies.serde] version = "1" diff --git a/cli/src/commands/account.rs b/cli/src/commands/account.rs index 29fd401ea0..8e737fcb65 100644 --- a/cli/src/commands/account.rs +++ b/cli/src/commands/account.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/commands/clean.rs b/cli/src/commands/clean.rs index c1725e3fd2..38c72065a3 100644 --- a/cli/src/commands/clean.rs +++ b/cli/src/commands/clean.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/commands/developer/decrypt.rs b/cli/src/commands/developer/decrypt.rs index 2a46ac3a27..092f988361 100644 --- a/cli/src/commands/developer/decrypt.rs +++ b/cli/src/commands/developer/decrypt.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/commands/developer/deploy.rs b/cli/src/commands/developer/deploy.rs index 7cb2853785..f438fc0c0b 100644 --- a/cli/src/commands/developer/deploy.rs +++ b/cli/src/commands/developer/deploy.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/commands/developer/execute.rs b/cli/src/commands/developer/execute.rs index 910109b2b4..73e488e10d 100644 --- a/cli/src/commands/developer/execute.rs +++ b/cli/src/commands/developer/execute.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/commands/developer/mod.rs b/cli/src/commands/developer/mod.rs index 781797a851..173a0b4629 100644 --- a/cli/src/commands/developer/mod.rs +++ b/cli/src/commands/developer/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/commands/developer/scan.rs b/cli/src/commands/developer/scan.rs index 073cc23b6c..16d35a4f96 100644 --- a/cli/src/commands/developer/scan.rs +++ b/cli/src/commands/developer/scan.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/commands/developer/transfer_private.rs b/cli/src/commands/developer/transfer_private.rs index 925ba72d7e..89fa0f582f 100644 --- a/cli/src/commands/developer/transfer_private.rs +++ b/cli/src/commands/developer/transfer_private.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/commands/mod.rs b/cli/src/commands/mod.rs index 558b94cbaa..92a64d5eba 100644 --- a/cli/src/commands/mod.rs +++ b/cli/src/commands/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/commands/start.rs b/cli/src/commands/start.rs index 41d92febd5..404b84a05c 100644 --- a/cli/src/commands/start.rs +++ b/cli/src/commands/start.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -57,6 +58,9 @@ const DEVELOPMENT_MODE_RNG_SEED: u64 = 1234567890u64; /// The development mode number of genesis committee members. const DEVELOPMENT_MODE_NUM_GENESIS_COMMITTEE_MEMBERS: u16 = 4; +/// The CDN base url. +const CDN_BASE_URL: &str = "https://blocks.aleo.org"; + /// A mapping of `staker_address` to `(validator_address, withdrawal_address, amount)`. #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct BondedBalances(IndexMap); @@ -140,8 +144,8 @@ pub struct Start { #[clap(long = "storage")] pub storage: Option, /// Enables the node to prefetch initial blocks from a CDN - #[clap(default_value = "https://s3.us-west-1.amazonaws.com/testnet3.blocks/phase3", long = "cdn")] - pub cdn: String, + #[clap(long = "cdn")] + pub cdn: Option, /// If the flag is set, the node will not prefetch from a CDN #[clap(long)] pub nocdn: bool, @@ -251,7 +255,7 @@ impl Start { } /// Returns the CDN to prefetch initial blocks from, from the given configurations. - fn parse_cdn(&self) -> Option { + fn parse_cdn(&self) -> Option { // Determine if the node type is not declared. let is_no_node_type = !(self.validator || self.prover || self.client); @@ -260,12 +264,26 @@ impl Start { // 2. The user has explicitly disabled CDN. // 3. The node is a prover (no need to sync). // 4. The node type is not declared (defaults to client) (no need to sync). - if self.dev.is_some() || self.cdn.is_empty() || self.nocdn || self.prover || is_no_node_type { + if self.dev.is_some() || self.nocdn || self.prover || is_no_node_type { None } // Enable the CDN otherwise. else { - Some(self.cdn.clone()) + // Determine the CDN URL. + match &self.cdn { + // Use the provided CDN URL if it is not empty. + Some(cdn) => match cdn.is_empty() { + true => None, + false => Some(cdn.clone()), + }, + // If no CDN URL is provided, determine the CDN URL based on the network ID. + None => match N::ID { + MainnetV0::ID => Some(format!("{CDN_BASE_URL}/mainnet/v0")), + TestnetV0::ID => Some(format!("{CDN_BASE_URL}/testnet/v0")), + CanaryV0::ID => Some(format!("{CDN_BASE_URL}/canary/v0")), + _ => None, + }, + } } } @@ -507,7 +525,7 @@ impl Start { self.parse_development(&mut trusted_peers, &mut trusted_validators)?; // Parse the CDN. - let cdn = self.parse_cdn(); + let cdn = self.parse_cdn::(); // Parse the genesis block. let genesis = self.parse_genesis::()?; @@ -798,95 +816,95 @@ mod tests { fn test_parse_cdn() { // Validator (Prod) let config = Start::try_parse_from(["snarkos", "--validator", "--private-key", "aleo1xx"].iter()).unwrap(); - assert!(config.parse_cdn().is_some()); + assert!(config.parse_cdn::().is_some()); let config = Start::try_parse_from(["snarkos", "--validator", "--private-key", "aleo1xx", "--cdn", "url"].iter()) .unwrap(); - assert!(config.parse_cdn().is_some()); + assert!(config.parse_cdn::().is_some()); let config = Start::try_parse_from(["snarkos", "--validator", "--private-key", "aleo1xx", "--cdn", ""].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); // Validator (Dev) let config = Start::try_parse_from(["snarkos", "--dev", "0", "--validator", "--private-key", "aleo1xx"].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from( ["snarkos", "--dev", "0", "--validator", "--private-key", "aleo1xx", "--cdn", "url"].iter(), ) .unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from( ["snarkos", "--dev", "0", "--validator", "--private-key", "aleo1xx", "--cdn", ""].iter(), ) .unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); // Prover (Prod) let config = Start::try_parse_from(["snarkos", "--prover", "--private-key", "aleo1xx"].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from(["snarkos", "--prover", "--private-key", "aleo1xx", "--cdn", "url"].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from(["snarkos", "--prover", "--private-key", "aleo1xx", "--cdn", ""].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); // Prover (Dev) let config = Start::try_parse_from(["snarkos", "--dev", "0", "--prover", "--private-key", "aleo1xx"].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from( ["snarkos", "--dev", "0", "--prover", "--private-key", "aleo1xx", "--cdn", "url"].iter(), ) .unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from( ["snarkos", "--dev", "0", "--prover", "--private-key", "aleo1xx", "--cdn", ""].iter(), ) .unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); // Client (Prod) let config = Start::try_parse_from(["snarkos", "--client", "--private-key", "aleo1xx"].iter()).unwrap(); - assert!(config.parse_cdn().is_some()); + assert!(config.parse_cdn::().is_some()); let config = Start::try_parse_from(["snarkos", "--client", "--private-key", "aleo1xx", "--cdn", "url"].iter()).unwrap(); - assert!(config.parse_cdn().is_some()); + assert!(config.parse_cdn::().is_some()); let config = Start::try_parse_from(["snarkos", "--client", "--private-key", "aleo1xx", "--cdn", ""].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); // Client (Dev) let config = Start::try_parse_from(["snarkos", "--dev", "0", "--client", "--private-key", "aleo1xx"].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from( ["snarkos", "--dev", "0", "--client", "--private-key", "aleo1xx", "--cdn", "url"].iter(), ) .unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from( ["snarkos", "--dev", "0", "--client", "--private-key", "aleo1xx", "--cdn", ""].iter(), ) .unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); // Default (Prod) let config = Start::try_parse_from(["snarkos"].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from(["snarkos", "--cdn", "url"].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from(["snarkos", "--cdn", ""].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); // Default (Dev) let config = Start::try_parse_from(["snarkos", "--dev", "0"].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from(["snarkos", "--dev", "0", "--cdn", "url"].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); let config = Start::try_parse_from(["snarkos", "--dev", "0", "--cdn", ""].iter()).unwrap(); - assert!(config.parse_cdn().is_none()); + assert!(config.parse_cdn::().is_none()); } #[test] @@ -1009,7 +1027,7 @@ mod tests { assert_eq!(start.dev, Some(2)); assert!(start.validator); assert_eq!(start.private_key.as_deref(), Some("PRIVATE_KEY")); - assert_eq!(start.cdn, "CDN"); + assert_eq!(start.cdn, Some("CDN".to_string())); assert_eq!(start.rest, Some("127.0.0.1:3030".parse().unwrap())); assert_eq!(start.network, 0); assert_eq!(start.peers, "IP1,IP2,IP3"); diff --git a/cli/src/commands/update.rs b/cli/src/commands/update.rs index d7dfc6d653..7d604c6ad8 100644 --- a/cli/src/commands/update.rs +++ b/cli/src/commands/update.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/helpers/bech32m.rs b/cli/src/helpers/bech32m.rs index bfd026d7ad..58abc44770 100644 --- a/cli/src/helpers/bech32m.rs +++ b/cli/src/helpers/bech32m.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/helpers/dynamic_format.rs b/cli/src/helpers/dynamic_format.rs index 6e062857ad..91ee8e2cce 100644 --- a/cli/src/helpers/dynamic_format.rs +++ b/cli/src/helpers/dynamic_format.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/helpers/log_writer.rs b/cli/src/helpers/log_writer.rs index b99b126ed2..294c0a9db6 100644 --- a/cli/src/helpers/log_writer.rs +++ b/cli/src/helpers/log_writer.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/helpers/logger.rs b/cli/src/helpers/logger.rs index 2fe07285d2..19e5d8cd9f 100644 --- a/cli/src/helpers/logger.rs +++ b/cli/src/helpers/logger.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/helpers/mod.rs b/cli/src/helpers/mod.rs index 7ea38c52f1..4b8ff51041 100644 --- a/cli/src/helpers/mod.rs +++ b/cli/src/helpers/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/cli/src/helpers/updater.rs b/cli/src/helpers/updater.rs index 77636f77b6..f97b34b083 100644 --- a/cli/src/helpers/updater.rs +++ b/cli/src/helpers/updater.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -21,7 +22,7 @@ pub struct Updater; impl Updater { const SNARKOS_BIN_NAME: &'static str = "snarkos"; const SNARKOS_REPO_NAME: &'static str = "snarkOS"; - const SNARKOS_REPO_OWNER: &'static str = "AleoHQ"; + const SNARKOS_REPO_OWNER: &'static str = "AleoNet"; /// Show all available releases for `snarkos`. pub fn show_available_releases() -> Result { diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 140bea8ef4..74484f4094 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/display/Cargo.toml b/display/Cargo.toml index 88cb37338f..5296875f02 100644 --- a/display/Cargo.toml +++ b/display/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A display for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/display/src/lib.rs b/display/src/lib.rs index 7ef8a08a50..bb0c052ee8 100644 --- a/display/src/lib.rs +++ b/display/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/display/src/pages/logs.rs b/display/src/pages/logs.rs index 11984c4fcf..9a8921b353 100644 --- a/display/src/pages/logs.rs +++ b/display/src/pages/logs.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/display/src/pages/mod.rs b/display/src/pages/mod.rs index cc62b8ce75..3ad54b8ebe 100644 --- a/display/src/pages/mod.rs +++ b/display/src/pages/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/display/src/pages/overview.rs b/display/src/pages/overview.rs index a3bfb2ff2c..463892b7fc 100644 --- a/display/src/pages/overview.rs +++ b/display/src/pages/overview.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/display/src/tabs.rs b/display/src/tabs.rs index eeb230e4bd..0e5cf924bd 100644 --- a/display/src/tabs.rs +++ b/display/src/tabs.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/Cargo.toml b/node/Cargo.toml index 4b98b45d7e..89cac77070 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A node for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/bft/Cargo.toml b/node/bft/Cargo.toml index 8b2c5ed86c..288f3d1a43 100644 --- a/node/bft/Cargo.toml +++ b/node/bft/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A memory pool for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/bft/events/Cargo.toml b/node/bft/events/Cargo.toml index 1dc1de94cb..af49ead308 100644 --- a/node/bft/events/Cargo.toml +++ b/node/bft/events/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "Events for the gateway in a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/bft/events/src/batch_certified.rs b/node/bft/events/src/batch_certified.rs index 03898af68f..702d8dc7de 100644 --- a/node/bft/events/src/batch_certified.rs +++ b/node/bft/events/src/batch_certified.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/batch_propose.rs b/node/bft/events/src/batch_propose.rs index a1c180247e..6dec6ad359 100644 --- a/node/bft/events/src/batch_propose.rs +++ b/node/bft/events/src/batch_propose.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/batch_signature.rs b/node/bft/events/src/batch_signature.rs index c6ab199424..132063236e 100644 --- a/node/bft/events/src/batch_signature.rs +++ b/node/bft/events/src/batch_signature.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/block_request.rs b/node/bft/events/src/block_request.rs index 9947bade17..ff66579cfc 100644 --- a/node/bft/events/src/block_request.rs +++ b/node/bft/events/src/block_request.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/block_response.rs b/node/bft/events/src/block_response.rs index 2bf1f20057..73b98a81f6 100644 --- a/node/bft/events/src/block_response.rs +++ b/node/bft/events/src/block_response.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/certificate_request.rs b/node/bft/events/src/certificate_request.rs index 525112fd7f..8a7c0afb07 100644 --- a/node/bft/events/src/certificate_request.rs +++ b/node/bft/events/src/certificate_request.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/certificate_response.rs b/node/bft/events/src/certificate_response.rs index e24c3db3f4..2c284742fb 100644 --- a/node/bft/events/src/certificate_response.rs +++ b/node/bft/events/src/certificate_response.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/challenge_request.rs b/node/bft/events/src/challenge_request.rs index 30e7321e1b..d0d5c02dc5 100644 --- a/node/bft/events/src/challenge_request.rs +++ b/node/bft/events/src/challenge_request.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/challenge_response.rs b/node/bft/events/src/challenge_response.rs index c8b0961515..20445eb266 100644 --- a/node/bft/events/src/challenge_response.rs +++ b/node/bft/events/src/challenge_response.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/disconnect.rs b/node/bft/events/src/disconnect.rs index ea6298bd34..bdbdb538f1 100644 --- a/node/bft/events/src/disconnect.rs +++ b/node/bft/events/src/disconnect.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/helpers/codec.rs b/node/bft/events/src/helpers/codec.rs index 89466a99a3..9afb15fc3f 100644 --- a/node/bft/events/src/helpers/codec.rs +++ b/node/bft/events/src/helpers/codec.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/helpers/mod.rs b/node/bft/events/src/helpers/mod.rs index f6f68d487a..003a3752fc 100644 --- a/node/bft/events/src/helpers/mod.rs +++ b/node/bft/events/src/helpers/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/lib.rs b/node/bft/events/src/lib.rs index c6e5c04a8c..aa3cb0a384 100644 --- a/node/bft/events/src/lib.rs +++ b/node/bft/events/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -117,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 = 8; /// Returns the event name. #[inline] @@ -292,10 +293,15 @@ pub mod prop_tests { .boxed() } + pub fn any_transmission_checksum() -> BoxedStrategy<::TransmissionChecksum> { + Just(0).prop_perturb(|_, mut rng| rng.gen::<::TransmissionChecksum>()).boxed() + } + pub fn any_transmission_id() -> BoxedStrategy> { prop_oneof![ - any_transaction_id().prop_map(TransmissionID::Transaction), - any_solution_id().prop_map(TransmissionID::Solution), + (any_transaction_id(), any_transmission_checksum()) + .prop_map(|(id, cs)| TransmissionID::Transaction(id, cs)), + (any_solution_id(), any_transmission_checksum()).prop_map(|(id, cs)| TransmissionID::Solution(id, cs)), ] .boxed() } diff --git a/node/bft/events/src/primary_ping.rs b/node/bft/events/src/primary_ping.rs index 23dd85a926..b3806557a4 100644 --- a/node/bft/events/src/primary_ping.rs +++ b/node/bft/events/src/primary_ping.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/transmission_request.rs b/node/bft/events/src/transmission_request.rs index 2fded63bb6..27c0e75d0f 100644 --- a/node/bft/events/src/transmission_request.rs +++ b/node/bft/events/src/transmission_request.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -58,14 +59,8 @@ impl FromBytes for TransmissionRequest { #[cfg(test)] pub mod prop_tests { - use crate::{ - prop_tests::{any_solution_id, any_transaction_id}, - TransmissionRequest, - }; - use snarkvm::{ - console::prelude::{FromBytes, ToBytes}, - ledger::narwhal::TransmissionID, - }; + use crate::{prop_tests::{any_solution_id, any_transmission_id}, TransmissionRequest}; + use snarkvm::{console::prelude::{FromBytes, ToBytes}, ledger::narwhal::TransmissionID,}; use bytes::{Buf, BufMut, BytesMut}; use proptest::{ diff --git a/node/bft/events/src/transmission_response.rs b/node/bft/events/src/transmission_response.rs index 536f0067af..9aa3224514 100644 --- a/node/bft/events/src/transmission_response.rs +++ b/node/bft/events/src/transmission_response.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -62,7 +63,7 @@ impl FromBytes for TransmissionResponse { #[cfg(test)] pub mod prop_tests { use crate::{ - prop_tests::{any_solution_id, any_transaction_id}, + prop_tests::{any_solution_id, any_transaction_id, any_transmission_checksum}, TransmissionResponse, }; use snarkvm::{ @@ -82,14 +83,18 @@ pub mod prop_tests { pub fn any_transmission() -> BoxedStrategy<(TransmissionID, Transmission)> { prop_oneof![ - (any_solution_id(), collection::vec(any::(), 256..=256)).prop_map(|(pc, bytes)| ( - TransmissionID::Solution(pc), - Transmission::Solution(Data::Buffer(Bytes::from(bytes))) - )), - (any_transaction_id(), collection::vec(any::(), 512..=512)).prop_map(|(tid, bytes)| ( - TransmissionID::Transaction(tid), - Transmission::Transaction(Data::Buffer(Bytes::from(bytes))) - )), + (any_solution_id(), any_transmission_checksum(), collection::vec(any::(), 256..=256)).prop_map( + |(pc, cs, bytes)| ( + TransmissionID::Solution(pc, cs), + Transmission::Solution(Data::Buffer(Bytes::from(bytes))) + ) + ), + (any_transaction_id(), any_transmission_checksum(), collection::vec(any::(), 512..=512)).prop_map( + |(tid, cs, bytes)| ( + TransmissionID::Transaction(tid, cs), + Transmission::Transaction(Data::Buffer(Bytes::from(bytes))) + ) + ), ] .boxed() } diff --git a/node/bft/events/src/validators_request.rs b/node/bft/events/src/validators_request.rs index 7648f3f284..42b0f0a07f 100644 --- a/node/bft/events/src/validators_request.rs +++ b/node/bft/events/src/validators_request.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/validators_response.rs b/node/bft/events/src/validators_response.rs index f7dfeaad14..9959828bd9 100644 --- a/node/bft/events/src/validators_response.rs +++ b/node/bft/events/src/validators_response.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/events/src/worker_ping.rs b/node/bft/events/src/worker_ping.rs index 1bb578d0f0..e8ac98b2f5 100644 --- a/node/bft/events/src/worker_ping.rs +++ b/node/bft/events/src/worker_ping.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/examples/monitor.rs b/node/bft/examples/monitor.rs index 2674c39988..19bdd23070 100644 --- a/node/bft/examples/monitor.rs +++ b/node/bft/examples/monitor.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/examples/simple_node.rs b/node/bft/examples/simple_node.rs index 90468247f1..eb6626ee3c 100644 --- a/node/bft/examples/simple_node.rs +++ b/node/bft/examples/simple_node.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/ledger-service/Cargo.toml b/node/bft/ledger-service/Cargo.toml index 6f83c661e4..edaadf7bd4 100644 --- a/node/bft/ledger-service/Cargo.toml +++ b/node/bft/ledger-service/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A ledger service for the memory pool in a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/bft/ledger-service/src/ledger.rs b/node/bft/ledger-service/src/ledger.rs index 9edf349a3d..a93206a2e1 100644 --- a/node/bft/ledger-service/src/ledger.rs +++ b/node/bft/ledger-service/src/ledger.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -205,8 +206,8 @@ impl> LedgerService for CoreLedgerService< fn contains_transmission(&self, transmission_id: &TransmissionID) -> Result { match transmission_id { TransmissionID::Ratification => Ok(false), - TransmissionID::Solution(solution_id) => self.ledger.contains_solution_id(solution_id), - TransmissionID::Transaction(transaction_id) => self.ledger.contains_transaction_id(transaction_id), + TransmissionID::Solution(solution_id, _) => self.ledger.contains_solution_id(solution_id), + TransmissionID::Transaction(transaction_id, _) => self.ledger.contains_transaction_id(transaction_id), } } @@ -218,7 +219,10 @@ impl> LedgerService for CoreLedgerService< ) -> Result<()> { match (transmission_id, transmission) { (TransmissionID::Ratification, Transmission::Ratification) => {} - (TransmissionID::Transaction(expected_transaction_id), Transmission::Transaction(transaction_data)) => { + ( + TransmissionID::Transaction(expected_transaction_id, expected_checksum), + Transmission::Transaction(transaction_data), + ) => { // Deserialize the transaction. If the transaction exceeds the maximum size, then return an error. let transaction = match transaction_data.clone() { Data::Object(transaction) => transaction, @@ -227,11 +231,21 @@ impl> LedgerService for CoreLedgerService< // Ensure the transaction ID matches the expected transaction ID. if transaction.id() != expected_transaction_id { bail!( - "Received mismatching transaction ID - expected {}, found {}", + "Received mismatching transaction ID - expected {}, found {}", fmt_id(expected_transaction_id), fmt_id(transaction.id()), ); } + + // Ensure the transmission checksum matches the expected checksum. + let checksum = transaction_data.to_checksum::()?; + if checksum != expected_checksum { + bail!( + "Received mismatching checksum for transaction {} - expected {expected_checksum} but found {checksum}", + fmt_id(expected_transaction_id) + ); + } + // Ensure the transaction is not a fee transaction. if transaction.is_fee() { bail!("Received a fee transaction in a transmission"); @@ -240,7 +254,10 @@ impl> LedgerService for CoreLedgerService< // Update the transmission with the deserialized transaction. *transaction_data = Data::Object(transaction); } - (TransmissionID::Solution(expected_solution_id), Transmission::Solution(solution_data)) => { + ( + TransmissionID::Solution(expected_solution_id, expected_checksum), + Transmission::Solution(solution_data), + ) => { match solution_data.clone().deserialize_blocking() { Ok(solution) => { if solution.id() != expected_solution_id { @@ -251,6 +268,15 @@ impl> LedgerService for CoreLedgerService< ); } + // Ensure the transmission checksum matches the expected checksum. + let checksum = solution_data.to_checksum::()?; + if checksum != expected_checksum { + bail!( + "Received mismatching checksum for solution {} - expected {expected_checksum} but found {checksum}", + fmt_id(expected_solution_id) + ); + } + // Update the transmission with the deserialized solution. *solution_data = Data::Object(solution); } diff --git a/node/bft/ledger-service/src/lib.rs b/node/bft/ledger-service/src/lib.rs index 9a19b681df..091aaad85f 100644 --- a/node/bft/ledger-service/src/lib.rs +++ b/node/bft/ledger-service/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/ledger-service/src/mock.rs b/node/bft/ledger-service/src/mock.rs index ca3746415d..17eb583187 100644 --- a/node/bft/ledger-service/src/mock.rs +++ b/node/bft/ledger-service/src/mock.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -169,7 +170,11 @@ impl LedgerService for MockLedgerService { /// Returns `false` for all queries. fn contains_transmission(&self, transmission_id: &TransmissionID) -> Result { - trace!("[MockLedgerService] Contains transmission ID {} - false", fmt_id(transmission_id)); + trace!( + "[MockLedgerService] Contains transmission ID {}.{} - false", + fmt_id(transmission_id), + fmt_id(transmission_id.checksum().unwrap_or_default()) + ); Ok(false) } @@ -179,7 +184,11 @@ impl LedgerService for MockLedgerService { transmission_id: TransmissionID, _transmission: &mut Transmission, ) -> Result<()> { - trace!("[MockLedgerService] Ensure transmission ID matches {:?} - Ok", fmt_id(transmission_id)); + trace!( + "[MockLedgerService] Ensure transmission ID matches {}.{} - Ok", + fmt_id(transmission_id), + fmt_id(transmission_id.checksum().unwrap_or_default()) + ); Ok(()) } diff --git a/node/bft/ledger-service/src/prover.rs b/node/bft/ledger-service/src/prover.rs index 5d56f5135f..82df46b2a7 100644 --- a/node/bft/ledger-service/src/prover.rs +++ b/node/bft/ledger-service/src/prover.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/ledger-service/src/traits.rs b/node/bft/ledger-service/src/traits.rs index 7ccd51372d..4080a51c2f 100644 --- a/node/bft/ledger-service/src/traits.rs +++ b/node/bft/ledger-service/src/traits.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/ledger-service/src/translucent.rs b/node/bft/ledger-service/src/translucent.rs index fdc708411e..f057a23857 100644 --- a/node/bft/ledger-service/src/translucent.rs +++ b/node/bft/ledger-service/src/translucent.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/bft.rs b/node/bft/src/bft.rs index fe3937e89e..87af078893 100644 --- a/node/bft/src/bft.rs +++ b/node/bft/src/bft.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -597,10 +598,34 @@ impl BFT { if !IS_SYNCING { // Initialize a map for the deduped transmissions. let mut transmissions = IndexMap::new(); + // Initialize a map for the deduped transaction ids. + let mut seen_transaction_ids = IndexSet::new(); + // Initialize a map for the deduped solution ids. + let mut seen_solution_ids = IndexSet::new(); // Start from the oldest leader certificate. for certificate in commit_subdag.values().flatten() { // Retrieve the transmissions. for transmission_id in certificate.transmission_ids() { + // If the transaction ID or solution ID already exists in the map, skip it. + // Note: This additional check is done to ensure that we do not include duplicate + // transaction IDs or solution IDs that may have a different transmission ID. + match transmission_id { + TransmissionID::Solution(solution_id, _) => { + // If the solution already exists, skip it. + if seen_solution_ids.contains(&solution_id) { + continue; + } + } + TransmissionID::Transaction(transaction_id, _) => { + // If the transaction already exists, skip it. + if seen_transaction_ids.contains(transaction_id) { + continue; + } + } + TransmissionID::Ratification => { + bail!("Ratifications are currently not supported in the BFT.") + } + } // If the transmission already exists in the map, skip it. if transmissions.contains_key(transmission_id) { continue; @@ -613,11 +638,22 @@ impl BFT { // Retrieve the transmission. let Some(transmission) = self.storage().get_transmission(*transmission_id) else { bail!( - "BFT failed to retrieve transmission '{}' from round {}", + "BFT failed to retrieve transmission '{}.{}' from round {}", fmt_id(transmission_id), + fmt_id(transmission_id.checksum().unwrap_or_default()).dimmed(), certificate.round() ); }; + // Insert the transaction ID or solution ID into the map. + match transmission_id { + TransmissionID::Solution(id, _) => { + seen_solution_ids.insert(id); + } + TransmissionID::Transaction(id, _) => { + seen_transaction_ids.insert(id); + } + TransmissionID::Ratification => {} + } // Add the transmission to the set. transmissions.insert(*transmission_id, transmission); } diff --git a/node/bft/src/gateway.rs b/node/bft/src/gateway.rs index 60af4c788f..ac0d678f5b 100644 --- a/node/bft/src/gateway.rs +++ b/node/bft/src/gateway.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/helpers/cache.rs b/node/bft/src/helpers/cache.rs index 49301a01f7..3d4cb9b66b 100644 --- a/node/bft/src/helpers/cache.rs +++ b/node/bft/src/helpers/cache.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -226,7 +227,7 @@ mod tests { impl Input for TransmissionID { fn input() -> Self { - TransmissionID::Transaction(Default::default()) + TransmissionID::Transaction(Default::default(), Default::default()) } } diff --git a/node/bft/src/helpers/channels.rs b/node/bft/src/helpers/channels.rs index 70c6ad617b..0b685b0f85 100644 --- a/node/bft/src/helpers/channels.rs +++ b/node/bft/src/helpers/channels.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/helpers/dag.rs b/node/bft/src/helpers/dag.rs index 2d64ded988..a95fa70c4f 100644 --- a/node/bft/src/helpers/dag.rs +++ b/node/bft/src/helpers/dag.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/helpers/mod.rs b/node/bft/src/helpers/mod.rs index c37950839d..1e4c3d7013 100644 --- a/node/bft/src/helpers/mod.rs +++ b/node/bft/src/helpers/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/helpers/partition.rs b/node/bft/src/helpers/partition.rs index fd64cc0932..abd8f87cdc 100644 --- a/node/bft/src/helpers/partition.rs +++ b/node/bft/src/helpers/partition.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -90,8 +91,9 @@ mod tests { ]); let hash = sha256d_to_u128(data); assert_eq!(hash, 274520597840828436951879875061540363633u128); - let transmission_id: TransmissionID = TransmissionID::Solution(SolutionID::from(123456789)); + let transmission_id: TransmissionID = + TransmissionID::Solution(SolutionID::from(123456789), 12345); let worker_id = assign_to_worker(transmission_id, 5).unwrap(); - assert_eq!(worker_id, 2); + assert_eq!(worker_id, 4); } } diff --git a/node/bft/src/helpers/pending.rs b/node/bft/src/helpers/pending.rs index ca07ee090a..baca6d9bff 100644 --- a/node/bft/src/helpers/pending.rs +++ b/node/bft/src/helpers/pending.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -261,10 +262,22 @@ mod tests { assert_eq!(pending.len(), 0); // Initialize the solution IDs. - let solution_id_1 = TransmissionID::Solution(rng.gen::().into()); - let solution_id_2 = TransmissionID::Solution(rng.gen::().into()); - let solution_id_3 = TransmissionID::Solution(rng.gen::().into()); - let solution_id_4 = TransmissionID::Solution(rng.gen::().into()); + let solution_id_1 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); + let solution_id_2 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); + let solution_id_3 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); + let solution_id_4 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); // Initialize the SocketAddrs. let addr_1 = SocketAddr::from(([127, 0, 0, 1], 1234)); @@ -303,7 +316,10 @@ mod tests { assert!(pending.contains_peer(solution_id_4, addr_4)); assert!(!pending.contains_peer_with_sent_request(solution_id_4, addr_4)); - let unknown_id = TransmissionID::Solution(rng.gen::().into()); + let unknown_id = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); assert!(!pending.contains(unknown_id)); // Check get. @@ -336,7 +352,10 @@ mod tests { assert_eq!(pending.len(), 0); // Initialize the solution ID. - let solution_id_1 = TransmissionID::Solution(rng.gen::().into()); + let solution_id_1 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); // Initialize the SocketAddrs. let addr_1 = SocketAddr::from(([127, 0, 0, 1], 1234)); @@ -382,7 +401,10 @@ mod tests { for _ in 0..ITERATIONS { // Generate a solution ID. - let solution_id = TransmissionID::Solution(rng.gen::().into()); + let solution_id = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); // Check if the number of sent requests is correct. let mut expected_num_sent_requests = 0; for i in 0..ITERATIONS { @@ -416,8 +438,14 @@ mod tests { assert_eq!(pending.len(), 0); // Initialize the solution IDs. - let solution_id_1 = TransmissionID::Solution(rng.gen::().into()); - let solution_id_2 = TransmissionID::Solution(rng.gen::().into()); + let solution_id_1 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); + let solution_id_2 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); // Initialize the SocketAddrs. let addr_1 = SocketAddr::from(([127, 0, 0, 1], 1234)); diff --git a/node/bft/src/helpers/proposal.rs b/node/bft/src/helpers/proposal.rs index aefb1bd753..28ece680a8 100644 --- a/node/bft/src/helpers/proposal.rs +++ b/node/bft/src/helpers/proposal.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/helpers/proposal_cache.rs b/node/bft/src/helpers/proposal_cache.rs index cbc6cc18a1..2e79430702 100644 --- a/node/bft/src/helpers/proposal_cache.rs +++ b/node/bft/src/helpers/proposal_cache.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/helpers/ready.rs b/node/bft/src/helpers/ready.rs index 7a366dff81..c1376edddf 100644 --- a/node/bft/src/helpers/ready.rs +++ b/node/bft/src/helpers/ready.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -82,7 +83,7 @@ impl Ready { /// Returns the solutions in the ready queue. pub fn solutions(&self) -> impl '_ + Iterator, Data>)> { self.transmissions.read().clone().into_iter().filter_map(|(id, transmission)| match (id, transmission) { - (TransmissionID::Solution(id), Transmission::Solution(solution)) => Some((id, solution)), + (TransmissionID::Solution(id, _), Transmission::Solution(solution)) => Some((id, solution)), _ => None, }) } @@ -90,7 +91,7 @@ impl Ready { /// Returns the transactions in the ready queue. pub fn transactions(&self) -> impl '_ + Iterator>)> { self.transmissions.read().clone().into_iter().filter_map(|(id, transmission)| match (id, transmission) { - (TransmissionID::Transaction(id), Transmission::Transaction(tx)) => Some((id, tx)), + (TransmissionID::Transaction(id, _), Transmission::Transaction(tx)) => Some((id, tx)), _ => None, }) } @@ -156,9 +157,18 @@ mod tests { let ready = Ready::::new(); // Initialize the solution IDs. - let solution_id_1 = TransmissionID::Solution(rng.gen::().into()); - let solution_id_2 = TransmissionID::Solution(rng.gen::().into()); - let solution_id_3 = TransmissionID::Solution(rng.gen::().into()); + let solution_id_1 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); + let solution_id_2 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); + let solution_id_3 = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); // Initialize the solutions. let solution_1 = Transmission::Solution(data(rng)); @@ -179,7 +189,10 @@ mod tests { transmission_ids.iter().for_each(|id| assert!(ready.contains(*id))); // Check that an unknown solution ID is not in the ready queue. - let solution_id_unknown = TransmissionID::Solution(rng.gen::().into()); + let solution_id_unknown = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); assert!(!ready.contains(solution_id_unknown)); // Check the transmissions. @@ -219,7 +232,10 @@ mod tests { let ready = Ready::::new(); // Initialize the solution ID. - let solution_id = TransmissionID::Solution(rng.gen::().into()); + let solution_id = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); // Initialize the solution. let solution = Transmission::Solution(data); diff --git a/node/bft/src/helpers/resolver.rs b/node/bft/src/helpers/resolver.rs index fa0d1d53b2..ebbbe1c78e 100644 --- a/node/bft/src/helpers/resolver.rs +++ b/node/bft/src/helpers/resolver.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/helpers/signed_proposals.rs b/node/bft/src/helpers/signed_proposals.rs index 2fd4a7aee6..9cee036163 100644 --- a/node/bft/src/helpers/signed_proposals.rs +++ b/node/bft/src/helpers/signed_proposals.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/helpers/storage.rs b/node/bft/src/helpers/storage.rs index abb93310d8..578d75b350 100644 --- a/node/bft/src/helpers/storage.rs +++ b/node/bft/src/helpers/storage.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -691,7 +692,7 @@ impl Storage { // Retrieve the transmission. match transmission_id { TransmissionID::Ratification => (), - TransmissionID::Solution(solution_id) => { + TransmissionID::Solution(solution_id, _) => { // Retrieve the solution. match block.get_solution(solution_id) { // Insert the solution. @@ -716,7 +717,7 @@ impl Storage { }, }; } - TransmissionID::Transaction(transaction_id) => { + TransmissionID::Transaction(transaction_id, _) => { // Retrieve the transaction. match unconfirmed_transactions.get(transaction_id) { // Insert the transaction. @@ -1156,8 +1157,14 @@ pub mod prop_tests { pub fn any_transmission_id() -> BoxedStrategy> { prop_oneof![ - any_transaction_id().prop_map(TransmissionID::Transaction), - any_solution_id().prop_map(TransmissionID::Solution), + any_transaction_id().prop_perturb(|id, mut rng| TransmissionID::Transaction( + id, + rng.gen::<::TransmissionChecksum>() + )), + any_solution_id().prop_perturb(|id, mut rng| TransmissionID::Solution( + id, + rng.gen::<::TransmissionChecksum>() + )), ] .boxed() } diff --git a/node/bft/src/helpers/timestamp.rs b/node/bft/src/helpers/timestamp.rs index 2b361fa3cc..a3290f95a2 100644 --- a/node/bft/src/helpers/timestamp.rs +++ b/node/bft/src/helpers/timestamp.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/lib.rs b/node/bft/src/lib.rs index ff2fe665a5..79c91dd759 100644 --- a/node/bft/src/lib.rs +++ b/node/bft/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/src/primary.rs b/node/bft/src/primary.rs index cb7e289d61..0d874d7ef1 100644 --- a/node/bft/src/primary.rs +++ b/node/bft/src/primary.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -522,14 +523,39 @@ impl Primary { } // Check the transmission is still valid. match (id, transmission.clone()) { - (TransmissionID::Solution(solution_id), Transmission::Solution(solution)) => { + (TransmissionID::Solution(solution_id, checksum), Transmission::Solution(solution)) => { + // Ensure the checksum matches. + match solution.to_checksum::() { + Ok(solution_checksum) if solution_checksum == checksum => (), + _ => { + trace!( + "Proposing - Skipping solution '{}' - Checksum mismatch", + fmt_id(solution_id) + ); + continue 'inner; + } + } // Check if the solution is still valid. if let Err(e) = self.ledger.check_solution_basic(solution_id, solution).await { trace!("Proposing - Skipping solution '{}' - {e}", fmt_id(solution_id)); continue 'inner; } } - (TransmissionID::Transaction(transaction_id), Transmission::Transaction(transaction)) => { + ( + TransmissionID::Transaction(transaction_id, checksum), + Transmission::Transaction(transaction), + ) => { + // Ensure the checksum matches. + match transaction.to_checksum::() { + Ok(transaction_checksum) if transaction_checksum == checksum => (), + _ => { + trace!( + "Proposing - Skipping transaction '{}' - Checksum mismatch", + fmt_id(transaction_id) + ); + continue 'inner; + } + } // Check if the transaction is still valid. if let Err(e) = self.ledger.check_transaction_basic(transaction_id, transaction).await { trace!("Proposing - Skipping transaction '{}' - {e}", fmt_id(transaction_id)); @@ -1212,8 +1238,13 @@ impl Primary { let self_ = self.clone(); self.spawn(async move { while let Some((solution_id, solution, callback)) = rx_unconfirmed_solution.recv().await { + // Compute the checksum for the solution. + let Ok(checksum) = solution.to_checksum::() else { + error!("Failed to compute the checksum for the unconfirmed solution"); + continue; + }; // Compute the worker ID. - let Ok(worker_id) = assign_to_worker(solution_id, self_.num_workers()) else { + let Ok(worker_id) = assign_to_worker((solution_id, checksum), self_.num_workers()) else { error!("Unable to determine the worker ID for the unconfirmed solution"); continue; }; @@ -1234,8 +1265,13 @@ impl Primary { self.spawn(async move { while let Some((transaction_id, transaction, callback)) = rx_unconfirmed_transaction.recv().await { trace!("Primary - Received an unconfirmed transaction '{}'", fmt_id(transaction_id)); + // Compute the checksum for the transaction. + let Ok(checksum) = transaction.to_checksum::() else { + error!("Failed to compute the checksum for the unconfirmed transaction"); + continue; + }; // Compute the worker ID. - let Ok(worker_id) = assign_to_worker::(&transaction_id, self_.num_workers()) else { + let Ok(worker_id) = assign_to_worker::((&transaction_id, &checksum), self_.num_workers()) else { error!("Unable to determine the worker ID for the unconfirmed transaction"); continue; }; @@ -1798,14 +1834,19 @@ mod tests { ) -> Proposal { let (solution_id, solution) = sample_unconfirmed_solution(rng); let (transaction_id, transaction) = sample_unconfirmed_transaction(rng); + let solution_checksum = solution.to_checksum::().unwrap(); + let transaction_checksum = transaction.to_checksum::().unwrap(); + + let solution_transmission_id = (solution_id, solution_checksum).into(); + let transaction_transmission_id = (&transaction_id, &transaction_checksum).into(); // Retrieve the private key. let private_key = author.private_key(); // Prepare the transmission IDs. - let transmission_ids = [solution_id.into(), (&transaction_id).into()].into(); + let transmission_ids = [solution_transmission_id, transaction_transmission_id].into(); let transmissions = [ - (solution_id.into(), Transmission::Solution(solution)), - ((&transaction_id).into(), Transmission::Transaction(transaction)), + (solution_transmission_id, Transmission::Solution(solution)), + (transaction_transmission_id, Transmission::Transaction(transaction)), ] .into(); // Sign the batch header. @@ -1879,10 +1920,16 @@ mod tests { let committee_id = Field::rand(rng); let (solution_id, solution) = sample_unconfirmed_solution(rng); let (transaction_id, transaction) = sample_unconfirmed_transaction(rng); - let transmission_ids = [solution_id.into(), (&transaction_id).into()].into(); + let solution_checksum = solution.to_checksum::().unwrap(); + let transaction_checksum = transaction.to_checksum::().unwrap(); + + let solution_transmission_id = (solution_id, solution_checksum).into(); + let transaction_transmission_id = (&transaction_id, &transaction_checksum).into(); + + let transmission_ids = [solution_transmission_id, transaction_transmission_id].into(); let transmissions = [ - (solution_id.into(), Transmission::Solution(solution)), - ((&transaction_id).into(), Transmission::Transaction(transaction)), + (solution_transmission_id, Transmission::Solution(solution)), + (transaction_transmission_id, Transmission::Transaction(transaction)), ] .into(); @@ -2021,6 +2068,8 @@ mod tests { // Generate a solution and a transaction. let (solution_commitment, solution) = sample_unconfirmed_solution(&mut rng); let (transaction_id, transaction) = sample_unconfirmed_transaction(&mut rng); + let solution_checksum = solution.to_checksum::().unwrap(); + let transaction_checksum = transaction.to_checksum::().unwrap(); // Store it on one of the workers. primary.workers[0].process_unconfirmed_solution(solution_commitment, solution).await.unwrap(); @@ -2064,8 +2113,10 @@ mod tests { // Check that the proposal only contains the new transmissions that were not in previous certificates. let proposed_transmissions = primary.proposed_batch.read().as_ref().unwrap().transmissions().clone(); assert_eq!(proposed_transmissions.len(), 2); - assert!(proposed_transmissions.contains_key(&TransmissionID::Solution(solution_commitment))); - assert!(proposed_transmissions.contains_key(&TransmissionID::Transaction(transaction_id))); + assert!(proposed_transmissions.contains_key(&TransmissionID::Solution(solution_commitment, solution_checksum))); + assert!( + proposed_transmissions.contains_key(&TransmissionID::Transaction(transaction_id, transaction_checksum)) + ); } #[tokio::test] diff --git a/node/bft/src/sync/mod.rs b/node/bft/src/sync/mod.rs index ade20eccc8..46cb269a54 100644 --- a/node/bft/src/sync/mod.rs +++ b/node/bft/src/sync/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -741,25 +742,28 @@ mod tests { // Create a certificate for the leader. if round <= 5 { let leader = committee.get_leader(round).unwrap(); - let i = addresses.iter().position(|&address| address == leader).unwrap(); - let batch_header = BatchHeader::new( - &private_keys[i], - round, - now(), - committee_id, - Default::default(), - previous_certificate_ids.clone(), - rng, - ) - .unwrap(); - // Sign the batch header. - let mut signatures = IndexSet::with_capacity(4); - for (j, private_key_2) in private_keys.iter().enumerate() { - if i != j { - signatures.insert(private_key_2.sign(&[batch_header.batch_id()], rng).unwrap()); + let leader_index = addresses.iter().position(|&address| address == leader).unwrap(); + let non_leader_index = addresses.iter().position(|&address| address != leader).unwrap(); + for i in [leader_index, non_leader_index].into_iter() { + let batch_header = BatchHeader::new( + &private_keys[i], + round, + now(), + committee_id, + Default::default(), + previous_certificate_ids.clone(), + rng, + ) + .unwrap(); + // Sign the batch header. + let mut signatures = IndexSet::with_capacity(4); + for (j, private_key_2) in private_keys.iter().enumerate() { + if i != j { + signatures.insert(private_key_2.sign(&[batch_header.batch_id()], rng).unwrap()); + } } + current_certificates.insert(BatchCertificate::from(batch_header, signatures).unwrap()); } - current_certificates.insert(BatchCertificate::from(batch_header, signatures).unwrap()); } // Create a certificate for each validator. @@ -836,8 +840,15 @@ mod tests { for cert in storage.get_certificates_for_round(leader_round_2 - 1) { previous_cert_map_2.insert(cert); } + let mut prev_commit_cert_map_2 = IndexSet::new(); + for cert in storage.get_certificates_for_round(leader_round_2 - 2) { + if cert != leader_certificate { + prev_commit_cert_map_2.insert(cert); + } + } subdag_map_2.insert(leader_round_2, leader_cert_map_2.clone()); subdag_map_2.insert(leader_round_2 - 1, previous_cert_map_2.clone()); + subdag_map_2.insert(leader_round_2 - 2, prev_commit_cert_map_2.clone()); let subdag_2 = Subdag::from(subdag_map_2.clone())?; core_ledger.prepare_advance_to_next_quorum_block(subdag_2, Default::default())? }; @@ -856,8 +867,15 @@ mod tests { for cert in storage.get_certificates_for_round(leader_round_3 - 1) { previous_cert_map_3.insert(cert); } + let mut prev_commit_cert_map_3 = IndexSet::new(); + for cert in storage.get_certificates_for_round(leader_round_3 - 2) { + if cert != leader_certificate_2 { + prev_commit_cert_map_3.insert(cert); + } + } subdag_map_3.insert(leader_round_3, leader_cert_map_3.clone()); subdag_map_3.insert(leader_round_3 - 1, previous_cert_map_3.clone()); + subdag_map_3.insert(leader_round_3 - 2, prev_commit_cert_map_3.clone()); let subdag_3 = Subdag::from(subdag_map_3.clone())?; core_ledger.prepare_advance_to_next_quorum_block(subdag_3, Default::default())? }; @@ -875,14 +893,13 @@ mod tests { let sync = Sync::new(gateway.clone(), storage.clone(), syncing_ledger.clone()); // Try to sync block 1. sync.sync_storage_with_block(block_1).await?; - // Ensure that the sync ledger has not advanced. - assert_eq!(syncing_ledger.latest_block_height(), 0); + assert_eq!(syncing_ledger.latest_block_height(), 1); // Try to sync block 2. sync.sync_storage_with_block(block_2).await?; - // Ensure that the sync ledger has not advanced. - assert_eq!(syncing_ledger.latest_block_height(), 0); + assert_eq!(syncing_ledger.latest_block_height(), 2); // Try to sync block 3. sync.sync_storage_with_block(block_3).await?; + assert_eq!(syncing_ledger.latest_block_height(), 3); // Ensure blocks 1 and 2 were added to the ledger. assert!(syncing_ledger.contains_block_height(1)); assert!(syncing_ledger.contains_block_height(2)); diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs index 8afda6a09e..92cb7bb65f 100644 --- a/node/bft/src/worker.rs +++ b/node/bft/src/worker.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -31,6 +32,7 @@ use snarkvm::{ }, }; +use colored::Colorize; use indexmap::{IndexMap, IndexSet}; use parking_lot::Mutex; use rand::seq::IteratorRandom; @@ -272,9 +274,10 @@ impl Worker { // If the transmission was not fetched, then attempt to fetch it again. Err(e) => { warn!( - "Worker {} - Failed to fetch transmission '{}' from '{peer_ip}' (ping) - {e}", + "Worker {} - Failed to fetch transmission '{}.{}' from '{peer_ip}' (ping) - {e}", self_.id, - fmt_id(transmission_id) + fmt_id(transmission_id), + fmt_id(transmission_id.checksum().unwrap_or_default()).dimmed() ); } } @@ -294,8 +297,8 @@ impl Worker { } // Ensure the transmission ID and transmission type matches. let is_well_formed = match (&transmission_id, &transmission) { - (TransmissionID::Solution(_), Transmission::Solution(_)) => true, - (TransmissionID::Transaction(_), Transmission::Transaction(_)) => true, + (TransmissionID::Solution(_, _), Transmission::Solution(_)) => true, + (TransmissionID::Transaction(_, _), Transmission::Transaction(_)) => true, // Note: We explicitly forbid inserting ratifications into the ready queue, // as the protocol currently does not support ratifications. (TransmissionID::Ratification, Transmission::Ratification) => false, @@ -304,7 +307,12 @@ impl Worker { }; // If the transmission ID and transmission type matches, then insert the transmission into the ready queue. if is_well_formed && self.ready.insert(transmission_id, transmission) { - trace!("Worker {} - Added transmission '{}' from '{peer_ip}'", self.id, fmt_id(transmission_id)); + trace!( + "Worker {} - Added transmission '{}.{}' from '{peer_ip}'", + self.id, + fmt_id(transmission_id), + fmt_id(transmission_id.checksum().unwrap_or_default()).dimmed() + ); } } @@ -317,17 +325,26 @@ impl Worker { ) -> Result<()> { // Construct the transmission. let transmission = Transmission::Solution(solution.clone()); + // Compute the checksum. + let checksum = solution.to_checksum::()?; + // Construct the transmission ID. + let transmission_id = TransmissionID::Solution(solution_id, checksum); // Remove the solution ID from the pending queue. - self.pending.remove(solution_id, Some(transmission.clone())); + self.pending.remove(transmission_id, Some(transmission.clone())); // Check if the solution exists. - if self.contains_transmission(solution_id) { - bail!("Solution '{}' already exists.", fmt_id(solution_id)); + if self.contains_transmission(transmission_id) { + bail!("Solution '{}.{}' already exists.", fmt_id(solution_id), fmt_id(checksum).dimmed()); } // Check that the solution is well-formed and unique. self.ledger.check_solution_basic(solution_id, solution).await?; // Adds the solution to the ready queue. - if self.ready.insert(solution_id, transmission) { - trace!("Worker {} - Added unconfirmed solution '{}'", self.id, fmt_id(solution_id)); + if self.ready.insert(transmission_id, transmission) { + trace!( + "Worker {} - Added unconfirmed solution '{}.{}'", + self.id, + fmt_id(solution_id), + fmt_id(checksum).dimmed() + ); } Ok(()) } @@ -340,17 +357,26 @@ impl Worker { ) -> Result<()> { // Construct the transmission. let transmission = Transmission::Transaction(transaction.clone()); + // Compute the checksum. + let checksum = transaction.to_checksum::()?; + // Construct the transmission ID. + let transmission_id = TransmissionID::Transaction(transaction_id, checksum); // Remove the transaction from the pending queue. - self.pending.remove(&transaction_id, Some(transmission.clone())); + self.pending.remove(transmission_id, Some(transmission.clone())); // Check if the transaction ID exists. - if self.contains_transmission(&transaction_id) { - bail!("Transaction '{}' already exists.", fmt_id(transaction_id)); + if self.contains_transmission(transmission_id) { + bail!("Transaction '{}.{}' already exists.", fmt_id(transaction_id), fmt_id(checksum).dimmed()); } // Check that the transaction is well-formed and unique. self.ledger.check_transaction_basic(transaction_id, transaction).await?; // Adds the transaction to the ready queue. - if self.ready.insert(&transaction_id, transmission) { - trace!("Worker {} - Added unconfirmed transaction '{}'", self.id, fmt_id(transaction_id)); + if self.ready.insert(transmission_id, transmission) { + trace!( + "Worker {}.{} - Added unconfirmed transaction '{}'", + self.id, + fmt_id(transaction_id), + fmt_id(checksum).dimmed() + ); } Ok(()) } @@ -436,8 +462,9 @@ impl Worker { } } else { debug!( - "Skipped sending request for transmission {} to '{peer_ip}' ({num_sent_requests} redundant requests)", - fmt_id(transmission_id) + "Skipped sending request for transmission {}.{} to '{peer_ip}' ({num_sent_requests} redundant requests)", + fmt_id(transmission_id), + fmt_id(transmission_id.checksum().unwrap_or_default()).dimmed() ); } // Wait for the transmission to be fetched. @@ -619,7 +646,10 @@ mod tests { // Create the Worker. let worker = Worker::new(0, Arc::new(gateway), storage, ledger, Default::default()).unwrap(); let data = |rng: &mut TestRng| Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())); - let transmission_id = TransmissionID::Solution(rng.gen::().into()); + let transmission_id = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); let transmission = Transmission::Solution(data(rng)); @@ -656,7 +686,10 @@ mod tests { // Create the Worker. let worker = Worker::new(0, Arc::new(gateway), storage, ledger, Default::default()).unwrap(); - let transmission_id = TransmissionID::Solution(rng.gen::().into()); + let transmission_id = TransmissionID::Solution( + rng.gen::().into(), + rng.gen::<::TransmissionChecksum>(), + ); let worker_ = worker.clone(); let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); let _ = worker_.send_transmission_request(peer_ip, transmission_id).await; @@ -694,21 +727,18 @@ mod tests { // Create the Worker. let worker = Worker::new(0, Arc::new(gateway), storage, ledger, Default::default()).unwrap(); + let solution = Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())); let solution_id = rng.gen::().into(); - let transmission_id = TransmissionID::Solution(solution_id); + let solution_checksum = solution.to_checksum::().unwrap(); + let transmission_id = TransmissionID::Solution(solution_id, solution_checksum); let worker_ = worker.clone(); let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); let _ = worker_.send_transmission_request(peer_ip, transmission_id).await; assert!(worker.pending.contains(transmission_id)); - let result = worker - .process_unconfirmed_solution( - solution_id, - Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())), - ) - .await; + let result = worker.process_unconfirmed_solution(solution_id, solution).await; assert!(result.is_ok()); assert!(!worker.pending.contains(transmission_id)); - assert!(worker.ready.contains(solution_id)); + assert!(worker.ready.contains(transmission_id)); } #[tokio::test] @@ -735,20 +765,17 @@ mod tests { // Create the Worker. let worker = Worker::new(0, Arc::new(gateway), storage, ledger, Default::default()).unwrap(); let solution_id = rng.gen::().into(); - let transmission_id = TransmissionID::Solution(solution_id); + let solution = Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())); + let checksum = solution.to_checksum::().unwrap(); + let transmission_id = TransmissionID::Solution(solution_id, checksum); let worker_ = worker.clone(); let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); let _ = worker_.send_transmission_request(peer_ip, transmission_id).await; assert!(worker.pending.contains(transmission_id)); - let result = worker - .process_unconfirmed_solution( - solution_id, - Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())), - ) - .await; + let result = worker.process_unconfirmed_solution(solution_id, solution).await; assert!(result.is_err()); - assert!(!worker.pending.contains(solution_id)); - assert!(!worker.ready.contains(solution_id)); + assert!(!worker.pending.contains(transmission_id)); + assert!(!worker.ready.contains(transmission_id)); } #[tokio::test] @@ -775,17 +802,14 @@ mod tests { // Create the Worker. let worker = Worker::new(0, Arc::new(gateway), storage, ledger, Default::default()).unwrap(); let transaction_id: ::TransactionID = Field::::rand(&mut rng).into(); - let transmission_id = TransmissionID::Transaction(transaction_id); + let transaction = Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())); + let checksum = transaction.to_checksum::().unwrap(); + let transmission_id = TransmissionID::Transaction(transaction_id, checksum); let worker_ = worker.clone(); let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); let _ = worker_.send_transmission_request(peer_ip, transmission_id).await; assert!(worker.pending.contains(transmission_id)); - let result = worker - .process_unconfirmed_transaction( - transaction_id, - Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())), - ) - .await; + let result = worker.process_unconfirmed_transaction(transaction_id, transaction).await; assert!(result.is_ok()); assert!(!worker.pending.contains(transmission_id)); assert!(worker.ready.contains(transmission_id)); @@ -815,17 +839,14 @@ mod tests { // Create the Worker. let worker = Worker::new(0, Arc::new(gateway), storage, ledger, Default::default()).unwrap(); let transaction_id: ::TransactionID = Field::::rand(&mut rng).into(); - let transmission_id = TransmissionID::Transaction(transaction_id); + let transaction = Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())); + let checksum = transaction.to_checksum::().unwrap(); + let transmission_id = TransmissionID::Transaction(transaction_id, checksum); let worker_ = worker.clone(); let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); let _ = worker_.send_transmission_request(peer_ip, transmission_id).await; assert!(worker.pending.contains(transmission_id)); - let result = worker - .process_unconfirmed_transaction( - transaction_id, - Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())), - ) - .await; + let result = worker.process_unconfirmed_transaction(transaction_id, transaction).await; assert!(result.is_err()); assert!(!worker.pending.contains(transmission_id)); assert!(!worker.ready.contains(transmission_id)); @@ -855,7 +876,9 @@ mod tests { // Create the Worker. let worker = Worker::new(0, Arc::new(gateway), storage, ledger, Default::default()).unwrap(); let transaction_id: ::TransactionID = Field::::rand(&mut rng).into(); - let transmission_id = TransmissionID::Transaction(transaction_id); + let transaction = Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())); + let checksum = transaction.to_checksum::().unwrap(); + let transmission_id = TransmissionID::Transaction(transaction_id, checksum); // Determine the number of redundant requests are sent. let num_redundant_requests = max_redundant_requests(worker.ledger.clone(), worker.storage.current_round()); @@ -900,12 +923,7 @@ mod tests { assert_eq!(worker.pending.num_callbacks(transmission_id), num_flood_requests); // Check that fulfilling a transmission request clears the pending queue. - let result = worker - .process_unconfirmed_transaction( - transaction_id, - Data::Buffer(Bytes::from((0..512).map(|_| rng.gen::()).collect::>())), - ) - .await; + let result = worker.process_unconfirmed_transaction(transaction_id, transaction).await; assert!(result.is_ok()); assert_eq!(worker.pending.num_sent_requests(transmission_id), 0); assert_eq!(worker.pending.num_callbacks(transmission_id), 0); diff --git a/node/bft/storage-service/Cargo.toml b/node/bft/storage-service/Cargo.toml index 73098dd1cd..c74fb09307 100644 --- a/node/bft/storage-service/Cargo.toml +++ b/node/bft/storage-service/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A storage service for the memory pool in a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/bft/storage-service/src/lib.rs b/node/bft/storage-service/src/lib.rs index fa7e84c3d6..2e3a1adf02 100644 --- a/node/bft/storage-service/src/lib.rs +++ b/node/bft/storage-service/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/storage-service/src/memory.rs b/node/bft/storage-service/src/memory.rs index 25648742e0..550daaefcf 100644 --- a/node/bft/storage-service/src/memory.rs +++ b/node/bft/storage-service/src/memory.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/storage-service/src/persistent.rs b/node/bft/storage-service/src/persistent.rs index 96a9d0c8e5..8d7e31bca2 100644 --- a/node/bft/storage-service/src/persistent.rs +++ b/node/bft/storage-service/src/persistent.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/storage-service/src/traits.rs b/node/bft/storage-service/src/traits.rs index 34f088d546..4e44674c75 100644 --- a/node/bft/storage-service/src/traits.rs +++ b/node/bft/storage-service/src/traits.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/tests/bft_e2e.rs b/node/bft/tests/bft_e2e.rs index 22f2be82da..b530faabc5 100644 --- a/node/bft/tests/bft_e2e.rs +++ b/node/bft/tests/bft_e2e.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/tests/common/mod.rs b/node/bft/tests/common/mod.rs index febf3dc3a5..986b718d9f 100644 --- a/node/bft/tests/common/mod.rs +++ b/node/bft/tests/common/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/tests/common/primary.rs b/node/bft/tests/common/primary.rs index 5825cf09a1..5c0752aea0 100644 --- a/node/bft/tests/common/primary.rs +++ b/node/bft/tests/common/primary.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/tests/common/test_peer.rs b/node/bft/tests/common/test_peer.rs index 508ab75d6f..752a3e1731 100644 --- a/node/bft/tests/common/test_peer.rs +++ b/node/bft/tests/common/test_peer.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/tests/common/utils.rs b/node/bft/tests/common/utils.rs index 0d5142b621..ad86e6dbde 100644 --- a/node/bft/tests/common/utils.rs +++ b/node/bft/tests/common/utils.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/tests/components/mod.rs b/node/bft/tests/components/mod.rs index d58afbf610..6e3c4e4d54 100644 --- a/node/bft/tests/components/mod.rs +++ b/node/bft/tests/components/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/tests/components/pending.rs b/node/bft/tests/components/pending.rs index 2825637369..2435b3d6ca 100644 --- a/node/bft/tests/components/pending.rs +++ b/node/bft/tests/components/pending.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/bft/tests/components/worker.rs b/node/bft/tests/components/worker.rs index 63a74c9137..40950b571f 100644 --- a/node/bft/tests/components/worker.rs +++ b/node/bft/tests/components/worker.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -49,7 +50,7 @@ async fn test_resend_transmission_request() { let initial_peer_ip = peer_ips.pop().unwrap(); // Prepare a dummy transmission ID. - let transmission_id = TransmissionID::Transaction(::TransactionID::default()); + let transmission_id = TransmissionID::Transaction(::TransactionID::default(), ::TransmissionChecksum::default()); // Ensure the worker does not have the dummy transmission ID. assert!(!worker.contains_transmission(transmission_id), "Transmission should not exist"); @@ -132,7 +133,7 @@ async fn test_flood_transmission_requests() { let mut remaining_peer_ips = peer_ips; // Prepare a dummy transmission ID. - let transmission_id = TransmissionID::Transaction(::TransactionID::default()); + let transmission_id = TransmissionID::Transaction(::TransactionID::default(), ::TransmissionChecksum::default()); // Ensure the worker does not have the dummy transmission ID. assert!(!worker.contains_transmission(transmission_id), "Transmission should not exist"); diff --git a/node/bft/tests/gateway_e2e.rs b/node/bft/tests/gateway_e2e.rs index 53c597237a..047dc21f7e 100644 --- a/node/bft/tests/gateway_e2e.rs +++ b/node/bft/tests/gateway_e2e.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -213,7 +214,8 @@ async fn handshake_responder_side_invalid_challenge_response() { let listener_port = test_peer.listening_addr().port(); let address = accounts.get(1).unwrap().address(); let our_nonce = rng.gen(); - let challenge_request = ChallengeRequest { version: 6, listener_port, address, nonce: our_nonce }; + let version = Event::::VERSION; + let challenge_request = ChallengeRequest { version, listener_port, address, nonce: our_nonce }; // Send the challenge request. let _ = test_peer.unicast(gateway.local_ip(), Event::ChallengeRequest(challenge_request)); @@ -242,7 +244,7 @@ async fn handshake_responder_side_invalid_challenge_response() { }; // Check the version, listener port and address are correct. assert_eq!(peer_addr, gateway.local_ip()); - assert_eq!(challenge_request.version, 6); + assert_eq!(challenge_request.version, version); assert_eq!(challenge_request.listener_port, gateway.local_ip().port()); assert_eq!(challenge_request.address, accounts.first().unwrap().address()); diff --git a/node/bft/tests/narwhal_e2e.rs b/node/bft/tests/narwhal_e2e.rs index ebf4c47eb6..933d60c1b4 100644 --- a/node/bft/tests/narwhal_e2e.rs +++ b/node/bft/tests/narwhal_e2e.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/cdn/Cargo.toml b/node/cdn/Cargo.toml index 2078de4a59..25ca59cb5c 100644 --- a/node/cdn/Cargo.toml +++ b/node/cdn/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A CDN client for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/cdn/src/blocks.rs b/node/cdn/src/blocks.rs index a1b4b91e3e..0c43c2748d 100644 --- a/node/cdn/src/blocks.rs +++ b/node/cdn/src/blocks.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/cdn/src/lib.rs b/node/cdn/src/lib.rs index 47bf3ccd3a..fcd76eef2f 100644 --- a/node/cdn/src/lib.rs +++ b/node/cdn/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/consensus/Cargo.toml b/node/consensus/Cargo.toml index 81fdcd867b..5f76afdd1b 100644 --- a/node/consensus/Cargo.toml +++ b/node/consensus/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A node consensus for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/consensus/src/lib.rs b/node/consensus/src/lib.rs index fdf247dfdd..30cef14098 100644 --- a/node/consensus/src/lib.rs +++ b/node/consensus/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -248,11 +249,18 @@ impl Consensus { /// Returns the transmissions in the inbound queue. pub fn inbound_transmissions(&self) -> impl '_ + Iterator, Transmission)> { self.inbound_transactions() - .map(|(id, tx)| (TransmissionID::Transaction(id), Transmission::Transaction(tx))) - .chain( - self.inbound_solutions() - .map(|(id, solution)| (TransmissionID::Solution(id), Transmission::Solution(solution))), - ) + .map(|(id, tx)| { + ( + TransmissionID::Transaction(id, tx.to_checksum::().unwrap_or_default()), + Transmission::Transaction(tx), + ) + }) + .chain(self.inbound_solutions().map(|(id, solution)| { + ( + TransmissionID::Solution(id, solution.to_checksum::().unwrap_or_default()), + Transmission::Solution(solution), + ) + })) } /// Returns the solutions in the inbound queue. @@ -278,11 +286,15 @@ impl Consensus { impl Consensus { /// Adds the given unconfirmed solution to the memory pool. pub async fn add_unconfirmed_solution(&self, solution: Solution) -> Result<()> { + // Calculate the transmission checksum. + let checksum = Data::>::Buffer(solution.to_bytes_le()?.into()).to_checksum::()?; #[cfg(feature = "metrics")] { metrics::increment_gauge(metrics::consensus::UNCONFIRMED_SOLUTIONS, 1f64); let timestamp = snarkos_node_bft::helpers::now(); - self.transmissions_queue_timestamps.lock().insert(TransmissionID::Solution(solution.id()), timestamp); + self.transmissions_queue_timestamps + .lock() + .insert(TransmissionID::Solution(solution.id(), checksum), timestamp); } // Process the unconfirmed solution. { @@ -294,7 +306,7 @@ impl Consensus { return Ok(()); } // Check if the solution already exists in the ledger. - if self.ledger.contains_transmission(&TransmissionID::from(solution_id))? { + if self.ledger.contains_transmission(&TransmissionID::Solution(solution_id, checksum))? { bail!("Solution '{}' exists in the ledger {}", fmt_id(solution_id), "(skipping)".dimmed()); } // Add the solution to the memory pool. @@ -343,11 +355,15 @@ impl Consensus { /// Adds the given unconfirmed transaction to the memory pool. pub async fn add_unconfirmed_transaction(&self, transaction: Transaction) -> Result<()> { + // Calculate the transmission checksum. + let checksum = Data::>::Buffer(transaction.to_bytes_le()?.into()).to_checksum::()?; #[cfg(feature = "metrics")] { metrics::increment_gauge(metrics::consensus::UNCONFIRMED_TRANSACTIONS, 1f64); let timestamp = snarkos_node_bft::helpers::now(); - self.transmissions_queue_timestamps.lock().insert(TransmissionID::Transaction(transaction.id()), timestamp); + self.transmissions_queue_timestamps + .lock() + .insert(TransmissionID::Transaction(transaction.id(), checksum), timestamp); } // Process the unconfirmed transaction. { @@ -363,7 +379,7 @@ impl Consensus { return Ok(()); } // Check if the transaction already exists in the ledger. - if self.ledger.contains_transmission(&TransmissionID::from(&transaction_id))? { + if self.ledger.contains_transmission(&TransmissionID::Transaction(transaction_id, checksum))? { bail!("Transaction '{}' exists in the ledger {}", fmt_id(transaction_id), "(skipping)".dimmed()); } // Add the transaction to the memory pool. @@ -519,7 +535,11 @@ impl Consensus { for (transmission_id, transmission) in transmissions.into_iter() { // Reinsert the transmission into the memory pool. if let Err(e) = self.reinsert_transmission(transmission_id, transmission).await { - warn!("Unable to reinsert transmission {} into the memory pool - {e}", fmt_id(transmission_id)); + warn!( + "Unable to reinsert transmission {}.{} into the memory pool - {e}", + fmt_id(transmission_id), + fmt_id(transmission_id.checksum().unwrap_or_default()).dimmed() + ); } } } @@ -535,11 +555,11 @@ impl Consensus { // Send the transmission to the primary. match (transmission_id, transmission) { (TransmissionID::Ratification, Transmission::Ratification) => return Ok(()), - (TransmissionID::Solution(solution_id), Transmission::Solution(solution)) => { + (TransmissionID::Solution(solution_id, _), Transmission::Solution(solution)) => { // Send the solution to the primary. self.primary_sender().tx_unconfirmed_solution.send((solution_id, solution, callback)).await?; } - (TransmissionID::Transaction(transaction_id), Transmission::Transaction(transaction)) => { + (TransmissionID::Transaction(transaction_id, _), Transmission::Transaction(transaction)) => { // Send the transaction to the primary. self.primary_sender().tx_unconfirmed_transaction.send((transaction_id, transaction, callback)).await?; } diff --git a/node/metrics/Cargo.toml b/node/metrics/Cargo.toml index 36c757bed1..8b1577e2db 100644 --- a/node/metrics/Cargo.toml +++ b/node/metrics/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A node for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/metrics/src/lib.rs b/node/metrics/src/lib.rs index 37c69680e1..f66012b618 100644 --- a/node/metrics/src/lib.rs +++ b/node/metrics/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -123,8 +124,8 @@ pub fn add_transmission_latency_metric( Some(*key) } else { let transmission_type = match key { - TransmissionID::Solution(solution_id) if solution_ids.contains(solution_id) => Some("solution"), - TransmissionID::Transaction(transaction_id) if transaction_ids.contains(transaction_id) => { + TransmissionID::Solution(solution_id, _) if solution_ids.contains(solution_id) => Some("solution"), + TransmissionID::Transaction(transaction_id, _) if transaction_ids.contains(transaction_id) => { Some("transaction") } _ => None, diff --git a/node/metrics/src/names.rs b/node/metrics/src/names.rs index 7fcb8e2fa8..19f9889f81 100644 --- a/node/metrics/src/names.rs +++ b/node/metrics/src/names.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/rest/Cargo.toml b/node/rest/Cargo.toml index 58c1267170..ed7206aa5a 100644 --- a/node/rest/Cargo.toml +++ b/node/rest/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A REST API server for a decentralized virtual machine" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", @@ -65,8 +65,10 @@ path = "../router" version = "=2.2.7" [dependencies.snarkvm-synthesizer] -git = "https://github.com/AleoNet/snarkVM.git" -rev = "d170a9f" +#path = "../../../snarkVM/synthesizer" +git = "https://github.com/OuIChien/snarkVM.git" +#rev = "3d42aa0" +branch = "OuIChien/dev" default-features = false optional = true diff --git a/node/rest/src/helpers/auth.rs b/node/rest/src/helpers/auth.rs index 90f46408bc..7317de7075 100644 --- a/node/rest/src/helpers/auth.rs +++ b/node/rest/src/helpers/auth.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/rest/src/helpers/error.rs b/node/rest/src/helpers/error.rs index c00216d01f..37b3091be2 100644 --- a/node/rest/src/helpers/error.rs +++ b/node/rest/src/helpers/error.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/rest/src/helpers/mod.rs b/node/rest/src/helpers/mod.rs index a4469164f6..c4fd39fba3 100644 --- a/node/rest/src/helpers/mod.rs +++ b/node/rest/src/helpers/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/rest/src/lib.rs b/node/rest/src/lib.rs index 202dbcca0f..eba9129c82 100644 --- a/node/rest/src/lib.rs +++ b/node/rest/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index 500cbf9b96..a646ef2047 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/Cargo.toml b/node/router/Cargo.toml index a796cf2679..3c12c75ff5 100644 --- a/node/router/Cargo.toml +++ b/node/router/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A node router for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/router/messages/Cargo.toml b/node/router/messages/Cargo.toml index 22999d4294..a601e9b254 100644 --- a/node/router/messages/Cargo.toml +++ b/node/router/messages/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "Node messages for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/router/messages/src/block_request.rs b/node/router/messages/src/block_request.rs index c0336b8310..ff04c14ecb 100644 --- a/node/router/messages/src/block_request.rs +++ b/node/router/messages/src/block_request.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/block_response.rs b/node/router/messages/src/block_response.rs index 75a4135dd6..b4e8f857a1 100644 --- a/node/router/messages/src/block_response.rs +++ b/node/router/messages/src/block_response.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/challenge_request.rs b/node/router/messages/src/challenge_request.rs index cdcc3638ff..633079d05c 100644 --- a/node/router/messages/src/challenge_request.rs +++ b/node/router/messages/src/challenge_request.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/challenge_response.rs b/node/router/messages/src/challenge_response.rs index d97ad2061e..6b74e12b2b 100644 --- a/node/router/messages/src/challenge_response.rs +++ b/node/router/messages/src/challenge_response.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/disconnect.rs b/node/router/messages/src/disconnect.rs index fb3255ccb1..1f6b63636c 100644 --- a/node/router/messages/src/disconnect.rs +++ b/node/router/messages/src/disconnect.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/helpers/codec.rs b/node/router/messages/src/helpers/codec.rs index c9ecb0f227..c151e6fe12 100644 --- a/node/router/messages/src/helpers/codec.rs +++ b/node/router/messages/src/helpers/codec.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/helpers/disconnect.rs b/node/router/messages/src/helpers/disconnect.rs index 17142b12c0..b4e97d49fc 100644 --- a/node/router/messages/src/helpers/disconnect.rs +++ b/node/router/messages/src/helpers/disconnect.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/helpers/mod.rs b/node/router/messages/src/helpers/mod.rs index 3000726367..88623cff74 100644 --- a/node/router/messages/src/helpers/mod.rs +++ b/node/router/messages/src/helpers/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/helpers/node_type.rs b/node/router/messages/src/helpers/node_type.rs index cd47642941..cb9cdf40db 100644 --- a/node/router/messages/src/helpers/node_type.rs +++ b/node/router/messages/src/helpers/node_type.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/lib.rs b/node/router/messages/src/lib.rs index 66a3ddd5ce..5cd9773c23 100644 --- a/node/router/messages/src/lib.rs +++ b/node/router/messages/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -111,7 +112,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 = 15; + pub const VERSION: u32 = 17; /// Returns the message name. #[inline] diff --git a/node/router/messages/src/peer_request.rs b/node/router/messages/src/peer_request.rs index 104f5ba4a0..c23f10d926 100644 --- a/node/router/messages/src/peer_request.rs +++ b/node/router/messages/src/peer_request.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/peer_response.rs b/node/router/messages/src/peer_response.rs index d4d326b928..dace842ed4 100644 --- a/node/router/messages/src/peer_response.rs +++ b/node/router/messages/src/peer_response.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/ping.rs b/node/router/messages/src/ping.rs index 05e4f9f719..b6ca9194fe 100644 --- a/node/router/messages/src/ping.rs +++ b/node/router/messages/src/ping.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/pong.rs b/node/router/messages/src/pong.rs index 6bce74fb57..71ae1444cb 100644 --- a/node/router/messages/src/pong.rs +++ b/node/router/messages/src/pong.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/puzzle_request.rs b/node/router/messages/src/puzzle_request.rs index 5b93af6d90..db606cd75f 100644 --- a/node/router/messages/src/puzzle_request.rs +++ b/node/router/messages/src/puzzle_request.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/puzzle_response.rs b/node/router/messages/src/puzzle_response.rs index ecafccac1d..ecec70c699 100644 --- a/node/router/messages/src/puzzle_response.rs +++ b/node/router/messages/src/puzzle_response.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/unconfirmed_solution.rs b/node/router/messages/src/unconfirmed_solution.rs index 0b34060c62..1c3cdad085 100644 --- a/node/router/messages/src/unconfirmed_solution.rs +++ b/node/router/messages/src/unconfirmed_solution.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/messages/src/unconfirmed_transaction.rs b/node/router/messages/src/unconfirmed_transaction.rs index c64f0de490..23b5d91cfa 100644 --- a/node/router/messages/src/unconfirmed_transaction.rs +++ b/node/router/messages/src/unconfirmed_transaction.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/src/handshake.rs b/node/router/src/handshake.rs index 015162beac..3b8d083c23 100644 --- a/node/router/src/handshake.rs +++ b/node/router/src/handshake.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/src/heartbeat.rs b/node/router/src/heartbeat.rs index dca8c6d225..baef5afdfc 100644 --- a/node/router/src/heartbeat.rs +++ b/node/router/src/heartbeat.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/src/helpers/cache.rs b/node/router/src/helpers/cache.rs index db803a16c0..c87c2a1038 100644 --- a/node/router/src/helpers/cache.rs +++ b/node/router/src/helpers/cache.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/src/helpers/mod.rs b/node/router/src/helpers/mod.rs index 8c58f216d1..547b36834b 100644 --- a/node/router/src/helpers/mod.rs +++ b/node/router/src/helpers/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/src/helpers/peer.rs b/node/router/src/helpers/peer.rs index 7e1c4023aa..1632e00d1f 100644 --- a/node/router/src/helpers/peer.rs +++ b/node/router/src/helpers/peer.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/src/helpers/resolver.rs b/node/router/src/helpers/resolver.rs index 534bc1b40b..a8602c401b 100644 --- a/node/router/src/helpers/resolver.rs +++ b/node/router/src/helpers/resolver.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/src/inbound.rs b/node/router/src/inbound.rs index 7ebbac2b77..d1e1d604b7 100644 --- a/node/router/src/inbound.rs +++ b/node/router/src/inbound.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/src/lib.rs b/node/router/src/lib.rs index 45e6470e8a..8d9152c744 100644 --- a/node/router/src/lib.rs +++ b/node/router/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -398,7 +399,10 @@ impl Router { } else if N::ID == snarkvm::console::network::MainnetV0::ID { // Mainnet contains the following bootstrap peers. vec![ - // TODO: Populate me with Mainnet Beta IP addresses. + SocketAddr::from_str("34.105.20.52:4130").unwrap(), + SocketAddr::from_str("35.231.118.193:4130").unwrap(), + SocketAddr::from_str("35.204.253.77:4130").unwrap(), + SocketAddr::from_str("34.87.188.140:4130").unwrap(), ] } else if N::ID == snarkvm::console::network::TestnetV0::ID { // TestnetV0 contains the following bootstrap peers. diff --git a/node/router/src/outbound.rs b/node/router/src/outbound.rs index 716a745086..c145525f5c 100644 --- a/node/router/src/outbound.rs +++ b/node/router/src/outbound.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/src/routing.rs b/node/router/src/routing.rs index d2d2457c62..7792fe54df 100644 --- a/node/router/src/routing.rs +++ b/node/router/src/routing.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/tests/cleanups.rs b/node/router/tests/cleanups.rs index 3a8b8ed83f..c0412f9f01 100644 --- a/node/router/tests/cleanups.rs +++ b/node/router/tests/cleanups.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/tests/common/mod.rs b/node/router/tests/common/mod.rs index b42b0a2063..53331193e9 100644 --- a/node/router/tests/common/mod.rs +++ b/node/router/tests/common/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/tests/common/router.rs b/node/router/tests/common/router.rs index ab3951b064..095d2db599 100644 --- a/node/router/tests/common/router.rs +++ b/node/router/tests/common/router.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/tests/connect.rs b/node/router/tests/connect.rs index 044a981ce6..8bc0f2c66a 100644 --- a/node/router/tests/connect.rs +++ b/node/router/tests/connect.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/router/tests/disconnect.rs b/node/router/tests/disconnect.rs index df9eee1016..4250ea5048 100644 --- a/node/router/tests/disconnect.rs +++ b/node/router/tests/disconnect.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software @@ -80,7 +81,7 @@ async fn test_disconnect_with_handshake() { // Connect node0 to node1. node0.connect(node1.local_ip()); // Sleep briefly. - tokio::time::sleep(Duration::from_millis(200)).await; + tokio::time::sleep(Duration::from_millis(1000)).await; print_tcp!(node0); print_tcp!(node1); diff --git a/node/src/client/mod.rs b/node/src/client/mod.rs index f098f0af3e..0858547df6 100644 --- a/node/src/client/mod.rs +++ b/node/src/client/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/src/client/router.rs b/node/src/client/router.rs index a28f692b17..f92d333dad 100644 --- a/node/src/client/router.rs +++ b/node/src/client/router.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/src/lib.rs b/node/src/lib.rs index 4d7dfde7a7..b003561957 100644 --- a/node/src/lib.rs +++ b/node/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/src/node.rs b/node/src/node.rs index f5fe6d2faa..7a11a826ad 100644 --- a/node/src/node.rs +++ b/node/src/node.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/src/prover/mod.rs b/node/src/prover/mod.rs index 2286ed0370..efb261146a 100644 --- a/node/src/prover/mod.rs +++ b/node/src/prover/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/src/prover/router.rs b/node/src/prover/router.rs index c658aae3b9..bc146d860b 100644 --- a/node/src/prover/router.rs +++ b/node/src/prover/router.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/src/traits.rs b/node/src/traits.rs index e3cd8ad7ed..a8569ada24 100644 --- a/node/src/traits.rs +++ b/node/src/traits.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/src/validator/mod.rs b/node/src/validator/mod.rs index 3b618bcc67..fd9a8721fe 100644 --- a/node/src/validator/mod.rs +++ b/node/src/validator/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/src/validator/router.rs b/node/src/validator/router.rs index 7f2a7f4230..d9b5c0abb8 100644 --- a/node/src/validator/router.rs +++ b/node/src/validator/router.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/sync/Cargo.toml b/node/sync/Cargo.toml index f2b309e43f..486234169b 100644 --- a/node/sync/Cargo.toml +++ b/node/sync/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A synchronization module for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/sync/communication-service/Cargo.toml b/node/sync/communication-service/Cargo.toml index 0e48199d27..9ab9c6e4c7 100644 --- a/node/sync/communication-service/Cargo.toml +++ b/node/sync/communication-service/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A communication service for the sync module in a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/sync/communication-service/src/lib.rs b/node/sync/communication-service/src/lib.rs index 737d0f26bb..bafa460228 100644 --- a/node/sync/communication-service/src/lib.rs +++ b/node/sync/communication-service/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/sync/locators/Cargo.toml b/node/sync/locators/Cargo.toml index b5c0845277..bda0b72ec9 100644 --- a/node/sync/locators/Cargo.toml +++ b/node/sync/locators/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "Locators to synchronize a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/sync/locators/src/block_locators.rs b/node/sync/locators/src/block_locators.rs index 38bfe4c479..82b8df0b2e 100644 --- a/node/sync/locators/src/block_locators.rs +++ b/node/sync/locators/src/block_locators.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/sync/locators/src/lib.rs b/node/sync/locators/src/lib.rs index 4e26a1b175..b3515b63de 100644 --- a/node/sync/locators/src/lib.rs +++ b/node/sync/locators/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/sync/src/block_sync.rs b/node/sync/src/block_sync.rs index 8d9d01c697..d512e7478c 100644 --- a/node/sync/src/block_sync.rs +++ b/node/sync/src/block_sync.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/sync/src/helpers/mod.rs b/node/sync/src/helpers/mod.rs index ce876fd12a..5950883c8f 100644 --- a/node/sync/src/helpers/mod.rs +++ b/node/sync/src/helpers/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/sync/src/lib.rs b/node/sync/src/lib.rs index 15d825449b..c78e5b5fea 100644 --- a/node/sync/src/lib.rs +++ b/node/sync/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/Cargo.toml b/node/tcp/Cargo.toml index b859b84c30..aafa1e39b4 100644 --- a/node/tcp/Cargo.toml +++ b/node/tcp/Cargo.toml @@ -4,7 +4,7 @@ version = "2.2.7" authors = [ "The Aleo Team " ] description = "A TCP stack for a decentralized operating system" homepage = "https://aleo.org" -repository = "https://github.com/AleoHQ/snarkOS" +repository = "https://github.com/AleoNet/snarkOS" keywords = [ "aleo", "cryptography", diff --git a/node/tcp/src/helpers/config.rs b/node/tcp/src/helpers/config.rs index ad23080a2b..0a49a387f6 100644 --- a/node/tcp/src/helpers/config.rs +++ b/node/tcp/src/helpers/config.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/helpers/connections.rs b/node/tcp/src/helpers/connections.rs index c794b9d161..b6d4b02dc5 100644 --- a/node/tcp/src/helpers/connections.rs +++ b/node/tcp/src/helpers/connections.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/helpers/known_peers.rs b/node/tcp/src/helpers/known_peers.rs index dea035b5e0..07f0508357 100644 --- a/node/tcp/src/helpers/known_peers.rs +++ b/node/tcp/src/helpers/known_peers.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/helpers/mod.rs b/node/tcp/src/helpers/mod.rs index 05e73f6886..55cf62818b 100644 --- a/node/tcp/src/helpers/mod.rs +++ b/node/tcp/src/helpers/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/helpers/stats.rs b/node/tcp/src/helpers/stats.rs index 2889561b8e..403640d4cb 100644 --- a/node/tcp/src/helpers/stats.rs +++ b/node/tcp/src/helpers/stats.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/lib.rs b/node/tcp/src/lib.rs index 3d0d059c5b..99db6df7d1 100644 --- a/node/tcp/src/lib.rs +++ b/node/tcp/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/protocols/disconnect.rs b/node/tcp/src/protocols/disconnect.rs index 36075db5e6..f2c0c8931a 100644 --- a/node/tcp/src/protocols/disconnect.rs +++ b/node/tcp/src/protocols/disconnect.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/protocols/handshake.rs b/node/tcp/src/protocols/handshake.rs index cce5c7e672..d280ba5c33 100644 --- a/node/tcp/src/protocols/handshake.rs +++ b/node/tcp/src/protocols/handshake.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/protocols/mod.rs b/node/tcp/src/protocols/mod.rs index 2c98571398..9982b6312d 100644 --- a/node/tcp/src/protocols/mod.rs +++ b/node/tcp/src/protocols/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/protocols/on_connect.rs b/node/tcp/src/protocols/on_connect.rs index 5c6abebd29..87d3837e13 100644 --- a/node/tcp/src/protocols/on_connect.rs +++ b/node/tcp/src/protocols/on_connect.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/protocols/reading.rs b/node/tcp/src/protocols/reading.rs index 00f0907573..a11f88fd89 100644 --- a/node/tcp/src/protocols/reading.rs +++ b/node/tcp/src/protocols/reading.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/protocols/writing.rs b/node/tcp/src/protocols/writing.rs index 5d15dbcda8..d5cdad8682 100644 --- a/node/tcp/src/protocols/writing.rs +++ b/node/tcp/src/protocols/writing.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tcp/src/tcp.rs b/node/tcp/src/tcp.rs index 47f3a2f822..364dd770ff 100644 --- a/node/tcp/src/tcp.rs +++ b/node/tcp/src/tcp.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tests/common/mod.rs b/node/tests/common/mod.rs index 7e5f65f68a..6119e91528 100644 --- a/node/tests/common/mod.rs +++ b/node/tests/common/mod.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tests/common/node.rs b/node/tests/common/node.rs index c88e35d969..e38bdf753f 100644 --- a/node/tests/common/node.rs +++ b/node/tests/common/node.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tests/common/test_peer.rs b/node/tests/common/test_peer.rs index d55bd0a42b..ebb31e8e0d 100644 --- a/node/tests/common/test_peer.rs +++ b/node/tests/common/test_peer.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tests/disconnect.rs b/node/tests/disconnect.rs index 5b6ec3b925..7d9a5bac81 100644 --- a/node/tests/disconnect.rs +++ b/node/tests/disconnect.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tests/handshake.rs b/node/tests/handshake.rs index 3c4c214269..c1ece5ad87 100644 --- a/node/tests/handshake.rs +++ b/node/tests/handshake.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/node/tests/peering.rs b/node/tests/peering.rs index 1bae7f6ddc..163846b803 100644 --- a/node/tests/peering.rs +++ b/node/tests/peering.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software diff --git a/snarkos/main.rs b/snarkos/main.rs index 61a86949b8..d54445f2cd 100644 --- a/snarkos/main.rs +++ b/snarkos/main.rs @@ -1,9 +1,10 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. +// Copyright 2024 Aleo Network Foundation // This file is part of the snarkOS library. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at: + // http://www.apache.org/licenses/LICENSE-2.0 // Unless required by applicable law or agreed to in writing, software