From 901075c39f695d58c5e9e4e1227616ce410e6819 Mon Sep 17 00:00:00 2001 From: Howard Wu <9260812+howardwu@users.noreply.github.com> Date: Tue, 14 Nov 2023 18:58:43 -0800 Subject: [PATCH] Switch snarkVM to rev --- Cargo.lock | 173 +++++++++----------------- Cargo.toml | 4 +- node/bft/ledger-service/Cargo.toml | 6 +- node/bft/ledger-service/src/ledger.rs | 4 +- node/src/client/router.rs | 2 +- 5 files changed, 70 insertions(+), 119 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7530e684fd..1b8c0cb9f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3186,6 +3186,7 @@ dependencies = [ "async-trait", "indexmap 2.1.0", "parking_lot", + "rand", "snarkvm", "tokio", "tracing", @@ -3374,8 +3375,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b9dcf5cf2122598cf3ab77266cf47273a4595126b317c661d32ac9104daa39" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "anstyle", "anyhow", @@ -3405,8 +3405,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6386aa431397790c44693a627a4d4589a5b96cabd3f8c6f2a95281043be14eb2" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "anyhow", @@ -3436,8 +3435,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01aef31b0b28e55db331e7bd98a344ae863d112903ce34e2d3cb3869841e84aa" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3451,8 +3449,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8c4785b599f9daecc8fe4e893a9dc34cc795b7bdcfc4c7c2146e5aadcbbe22" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3463,8 +3460,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64351bba6cb4da45e3bd909ea4acd0c011d9ecad9a533ffa81bdbd2d84ed0271" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3474,8 +3470,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e3fec487be68e9a59454b9c73e85b13414d170155834b27f040d64dfe7a0e2" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3485,8 +3480,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b82df03e314eff7673ad3d69d9c74e43705d28d91e36bd998f0a35a30f109" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "indexmap 2.1.0", "itertools 0.11.0", @@ -3504,14 +3498,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2c2bd9f025dc43c47378af05b45ed5db25261016030bb141b2ee3a5d1a0f5a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" [[package]] name = "snarkvm-circuit-network" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbb5d34a24162697802a55b71e6303a4d88503c5a4712269c1d784474b4cd96" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3522,8 +3514,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d8f5a4d1e657eb2a6396f81f6a89852cc105d1a474c87ae2c66ae2a663393f" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3538,8 +3529,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba32514a242e771c8bd3e88955a4193b4a8e790f26f0702e831a96a23e2901b5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3554,8 +3544,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13925beeb4208f2916a895011aa2a572f4533af0d24e1f00969199594024845c" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3568,8 +3557,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ce2372893c190343b6ec738ae89d0b306139f6ef9a9c49df458d1f254ae83c" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -3578,8 +3566,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22c566d8c21faef752764aa5ff0aabb7ee7901ed870c582f5a98e7786381b555" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3589,8 +3576,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d014b3e1a221c8e37fb6562aa3f2efc5f3289faf358627014349ee37d2fa10" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3602,8 +3588,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63160d7279dfacc4fb2a72f547ed9d3b495a24e6aa2183184c05c59a9cb7a3d6" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3615,8 +3600,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d87209cca82b7316514591f74b39f6434622666486cc01ab66c7ef9aba0550e" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3627,8 +3611,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bedd95160486ee0e941e572bf919c6d5fd2483726dc5d4ad082426064ad499" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3640,8 +3623,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2382188a22fb8f0ffb9e3502de55a059415f5057b5295fcc9984324750a3cce" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -3654,8 +3636,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4609ecd41cefa5c59c8fc9024287823d6f353fdbeeffe0a538b8d5abe6ecda66" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "bs58", "snarkvm-console-network", @@ -3666,8 +3647,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c6cdb856c2560df6f7ccfd3d52b717554c50aeb5236c4410317eabfbe64601" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "blake2s_simd", "smallvec", @@ -3680,8 +3660,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b033bd797d519ae42bfc034ef35c450395ca1afb0a1700dddb1ee58735b0e56" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "rayon", @@ -3692,8 +3671,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4145d511c5227b9e7b1310a5df36938fe7c8a1d050dfb57d7f5d2155e899921c" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "anyhow", "indexmap 2.1.0", @@ -3716,8 +3694,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047ca5e5a25c51873105f40de10af451ca04df9755df8bdff6224eb86d7a6d50" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "anyhow", "bech32", @@ -3735,8 +3712,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdfcc3465007347894b8ff2d3cb7657329e709e53e0cb7be48a304fb135dd2f8" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "enum_index", "enum_index_derive", @@ -3757,8 +3733,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c89c59ce984c2eaa48b87325d4f36b21d53b55f4e988b457d7b5bf599804054" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -3773,8 +3748,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6dff8647c718e0aab3061e6237df60f554257ae38713608eba605b47f02ea49" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3785,8 +3759,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43827cfc293b984f1804f0108f989c28910c4f17cba56bd0de03bce8b9c8b8d3" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console-network-environment", ] @@ -3794,8 +3767,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e012613c3f6376ec753a797526f25298f98b02604dad4a869b85cd2c44f2769c" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3805,8 +3777,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a182cf2c3989c539ccdcaddd6ef5bc028d155f2edac5282b33d447518766afe" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3817,8 +3788,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b878f2034be820d23dbc49fb0ee2eb7e550513ed372341490aef248f4e282548" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3829,8 +3799,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9a3f5011d46571b15b57455d29496b8aff9a371d41965a998695044ef373e0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3841,8 +3810,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c7633490099aba78542068c98d12c13f0fc419f26be963790d6b28e82e5931" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3853,8 +3821,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c89d0fd7d8c8ca76a97a35a634ea45c1419f7266788a3089c8eeba549bb0c3" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "rand", "rayon", @@ -3868,8 +3835,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c4a26326d4befc1d90f7f33cab281042cc747501a80d3f37ccc82711866e69" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "anyhow", @@ -3887,8 +3853,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbfd7023e4b1e13a1e095037467a8f1792c92700069e83e2e3da6b3c3c35754" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "anyhow", @@ -3913,8 +3878,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1cfa4fcbd7a643e204ebaf353ac22595ef37bba9490e0d8dce4b18c4d7e7d5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "anyhow", "rand", @@ -3926,8 +3890,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f65015767700de1ce7b2e1a07965250e2c9f5ce30eb3e5ff631c6b1e4392aff" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "indexmap 2.1.0", "rayon", @@ -3945,8 +3908,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-coinbase" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713fc295cf41a1dc891a48d87889459ff4d4f4c3320397a8ac0ce13b2502ad2d" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "anyhow", @@ -3966,8 +3928,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f51421db15682bdea0a31a1b499391a06010e9c6f4c9f704a196e15b9bb8c7" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "anyhow", "indexmap 2.1.0", @@ -3983,8 +3944,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab3200088f6c9021360803a66a40e5f032838553c48c6c384a9d6ec8889011d" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -3997,8 +3957,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6363fb804d58d7675ced04904c6f169e83b528d33805afd0288302a73f0c1e" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "indexmap 2.1.0", "serde_json", @@ -4010,8 +3969,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b53a8eb4053face9dfebbca9bbad72522ab3453842850ed0f531d60bcf6a1fba" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "indexmap 2.1.0", "serde_json", @@ -4023,8 +3981,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d25dae2bde1092d3a89f990a6f62070b69e5008f9a0c125d4fbdd9a15ff0d5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "bytes", "serde_json", @@ -4035,8 +3992,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3047b35daedf9e5fca1b6a39aabd791766b360e915f4e455c875814b494bce9" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "indexmap 2.1.0", "rayon", @@ -4050,8 +4006,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afc8e49182b8db77a1080e69540bf2fd4028b03fbcb8c8aaca1e43755d8943" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "bytes", "serde_json", @@ -4064,8 +4019,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ad73e369951fad8c5128302e007d47682de5af87b0131f4645c20fe482b60e" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "snarkvm-console", "snarkvm-ledger-coinbase", @@ -4074,8 +4028,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298f965027068420f9391649d50f3101e32bf80bd76521ca5e64fab880a9e3ea" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "async-trait", "reqwest", @@ -4088,8 +4041,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d9ed0d1cde4c260dc6a9bf229c06e7fe225fbe8a7ab40a5082bbb3162d03e0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "anyhow", @@ -4114,8 +4066,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6761a72cc5883398a8f72dca17da89deb710200b8f3117d9dd0347259042773a" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4130,8 +4081,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279a7c1afc6ad72c5ed0cf445fc0909701e6e9442a28152c67b4d3d847c250ef" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "anyhow", @@ -4155,8 +4105,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053b5eae2b34a5844629da494b7910409472e66d83740b6ba9c98eb028b7f884" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "anyhow", @@ -4181,8 +4130,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc30db7dfac48c2b536e72d18aca84f14e9b227e3b7317b838fafd1bd364ce37" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "colored", @@ -4199,13 +4147,13 @@ dependencies = [ "snarkvm-ledger-store", "snarkvm-synthesizer-program", "snarkvm-synthesizer-snark", + "snarkvm-utilities", ] [[package]] name = "snarkvm-synthesizer-program" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8abad28f944c86eb606cc7fcc9dae00d7dec0703922c2ecb75f93d71904792b1" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "indexmap 2.1.0", "paste", @@ -4219,8 +4167,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5ed5f23eb5a02b0198298d13d047497babd2cdbe222f51e20b92bbdfa0111" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "bincode", "once_cell", @@ -4233,8 +4180,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6384db82c79409d51ae9a7a3570b54cc852aff05032676c01561af88d12b5e" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "aleo-std", "anyhow", @@ -4255,8 +4201,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "541d78dd42668e0ca4369ed75d452222d479a310a9e6ec82276dc66482e21796" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=9124c31#9124c319dfd08e19f537e64be18755cfd90f6975" dependencies = [ "proc-macro2", "quote 1.0.33", diff --git a/Cargo.toml b/Cargo.toml index 66f3a8d3d2..a4985c1a02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,9 @@ members = [ ] [workspace.dependencies.snarkvm] -version = "=0.16.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "9124c31" +#version = "=0.16.9" features = [ "circuit", "console", "rocks" ] [[bin]] diff --git a/node/bft/ledger-service/Cargo.toml b/node/bft/ledger-service/Cargo.toml index a715efbbd3..57284643d4 100644 --- a/node/bft/ledger-service/Cargo.toml +++ b/node/bft/ledger-service/Cargo.toml @@ -18,7 +18,7 @@ edition = "2021" [features] default = [ ] -ledger = [ "tokio", "tracing" ] +ledger = [ "rand", "tokio", "tracing" ] ledger-write = [ ] mock = [ "parking_lot", "tracing" ] prover = [ ] @@ -36,6 +36,10 @@ features = [ "serde", "rayon" ] version = "0.12" optional = true +[dependencies.rand] +version = "0.8" +optional = true + [dependencies.snarkvm] workspace = true diff --git a/node/bft/ledger-service/src/ledger.rs b/node/bft/ledger-service/src/ledger.rs index 3c17a2aba2..7a0c332c64 100644 --- a/node/bft/ledger-service/src/ledger.rs +++ b/node/bft/ledger-service/src/ledger.rs @@ -209,12 +209,12 @@ impl> LedgerService for CoreLedgerService< } // Check the transaction is well-formed. let ledger = self.ledger.clone(); - spawn_blocking!(ledger.check_transaction_basic(&transaction, None)) + spawn_blocking!(ledger.check_transaction_basic(&transaction, None, &mut rand::thread_rng())) } /// Checks the given block is valid next block. fn check_next_block(&self, block: &Block) -> Result<()> { - self.ledger.check_next_block(block) + self.ledger.check_next_block(block, &mut rand::thread_rng()) } /// Returns a candidate for the next block in the ledger, using a committed subdag and its transmissions. diff --git a/node/src/client/router.rs b/node/src/client/router.rs index 0996722564..6123f75e32 100644 --- a/node/src/client/router.rs +++ b/node/src/client/router.rs @@ -304,7 +304,7 @@ impl> Inbound for Client { return true; // Maintain the connection. } // Check that the transaction is well-formed and unique. - if self.ledger.check_transaction_basic(&transaction, None).is_ok() { + if self.ledger.check_transaction_basic(&transaction, None, &mut rand::thread_rng()).is_ok() { // Propagate the `UnconfirmedTransaction`. self.propagate(Message::UnconfirmedTransaction(serialized), &[peer_ip]); }