diff --git a/Cargo.lock b/Cargo.lock
index c4e559ee1e..acb6efb969 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,24 +11,18 @@ dependencies = [
"macroific",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
[[package]]
name = "adler2"
version = "2.0.0"
@@ -42,7 +36,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
dependencies = [
"crypto-common",
- "generic-array 0.14.7",
+ "generic-array",
]
[[package]]
@@ -63,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if 1.0.0",
- "getrandom 0.2.15",
+ "getrandom",
"once_cell",
"version_check",
"zerocopy",
@@ -78,17 +72,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "alga"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2"
-dependencies = [
- "approx",
- "num-complex 0.2.4",
- "num-traits",
-]
-
[[package]]
name = "android-tzdata"
version = "0.1.1"
@@ -170,18 +153,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
-[[package]]
-name = "approx"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
-dependencies = [
- "num-traits",
-]
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
[[package]]
name = "arc-swap"
@@ -203,9 +177,9 @@ dependencies = [
[[package]]
name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
[[package]]
name = "arrayvec"
@@ -248,14 +222,14 @@ dependencies = [
[[package]]
name = "async-executor"
-version = "1.13.0"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.1.0",
- "futures-lite 2.3.0",
+ "fastrand",
+ "futures-lite",
"slab",
]
@@ -267,61 +241,32 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
dependencies = [
"async-channel 2.3.1",
"async-executor",
- "async-io 2.3.4",
- "async-lock 3.4.0",
+ "async-io",
+ "async-lock",
"blocking",
- "futures-lite 2.3.0",
+ "futures-lite",
"once_cell",
]
-[[package]]
-name = "async-io"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-dependencies = [
- "async-lock 2.8.0",
- "autocfg",
- "cfg-if 1.0.0",
- "concurrent-queue",
- "futures-lite 1.13.0",
- "log",
- "parking",
- "polling 2.8.0",
- "rustix 0.37.27",
- "slab",
- "socket2 0.4.10",
- "waker-fn",
-]
-
[[package]]
name = "async-io"
version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
dependencies = [
- "async-lock 3.4.0",
+ "async-lock",
"cfg-if 1.0.0",
"concurrent-queue",
"futures-io",
- "futures-lite 2.3.0",
+ "futures-lite",
"parking",
- "polling 3.7.3",
- "rustix 0.38.34",
+ "polling",
+ "rustix",
"slab",
"tracing",
"windows-sys 0.59.0",
]
-[[package]]
-name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener 2.5.3",
-]
-
[[package]]
name = "async-lock"
version = "3.4.0"
@@ -335,20 +280,20 @@ dependencies = [
[[package]]
name = "async-std"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
dependencies = [
"async-attributes",
"async-channel 1.9.0",
"async-global-executor",
- "async-io 1.13.0",
- "async-lock 2.8.0",
+ "async-io",
+ "async-lock",
"crossbeam-utils",
"futures-channel",
"futures-core",
"futures-io",
- "futures-lite 1.13.0",
+ "futures-lite",
"gloo-timers",
"kv-log-macro",
"log",
@@ -362,9 +307,9 @@ dependencies = [
[[package]]
name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
dependencies = [
"async-stream-impl",
"futures-core",
@@ -373,13 +318,13 @@ dependencies = [
[[package]]
name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -390,13 +335,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.81"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -429,15 +374,15 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "axum"
-version = "0.7.5"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
+checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
dependencies = [
"async-trait",
"axum-core",
@@ -455,16 +400,16 @@ dependencies = [
"rustversion",
"serde",
"sync_wrapper 1.0.1",
- "tower 0.4.13",
+ "tower 0.5.1",
"tower-layer",
"tower-service",
]
[[package]]
name = "axum-core"
-version = "0.4.3"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
dependencies = [
"async-trait",
"bytes",
@@ -475,24 +420,24 @@ dependencies = [
"mime",
"pin-project-lite",
"rustversion",
- "sync_wrapper 0.1.2",
+ "sync_wrapper 1.0.1",
"tower-layer",
"tower-service",
]
[[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 1.0.0",
"libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -556,7 +501,7 @@ dependencies = [
"regex",
"rustc-hash 1.1.0",
"shlex",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -597,7 +542,7 @@ version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
]
[[package]]
@@ -609,7 +554,7 @@ dependencies = [
"async-channel 2.3.1",
"async-task",
"futures-io",
- "futures-lite 2.3.0",
+ "futures-lite",
"piper",
]
@@ -633,7 +578,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"syn_derive",
]
@@ -661,9 +606,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
[[package]]
name = "bzip2-sys"
@@ -716,9 +661,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.1.13"
+version = "1.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
dependencies = [
"jobserver",
"libc",
@@ -884,9 +829,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.16"
+version = "4.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
dependencies = [
"clap_builder",
"clap_derive",
@@ -894,9 +839,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.15"
+version = "4.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
dependencies = [
"anstream",
"anstyle",
@@ -906,14 +851,14 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -962,9 +907,9 @@ dependencies = [
[[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 = "convert_case"
@@ -1005,9 +950,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@@ -1030,7 +975,7 @@ dependencies = [
"anes",
"cast",
"ciborium",
- "clap 4.5.16",
+ "clap 4.5.19",
"criterion-plot",
"is-terminal",
"itertools 0.10.5",
@@ -1126,8 +1071,8 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [
- "generic-array 0.14.7",
- "rand_core 0.6.4",
+ "generic-array",
+ "rand_core",
"typenum",
]
@@ -1155,7 +1100,7 @@ dependencies = [
"aead",
"chacha20",
"cipher",
- "generic-array 0.14.7",
+ "generic-array",
"poly1305",
"salsa20",
"subtle",
@@ -1195,7 +1140,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1219,7 +1164,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim 0.11.1",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1230,14 +1175,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "dashmap"
-version = "6.0.1"
+version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils",
@@ -1262,7 +1207,7 @@ dependencies = [
"macroific",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1288,33 +1233,33 @@ dependencies = [
[[package]]
name = "derive_builder"
-version = "0.20.0"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
+checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b"
dependencies = [
"derive_builder_macro",
]
[[package]]
name = "derive_builder_core"
-version = "0.20.0"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
+checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "derive_builder_macro"
-version = "0.20.0"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
+checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"
dependencies = [
"derive_builder_core",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1327,7 +1272,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1390,6 +1335,12 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
[[package]]
name = "downcast"
version = "0.11.0"
@@ -1449,7 +1400,7 @@ checksum = "ba7795da175654fe16979af73f81f26a8ea27638d8d9823d317016888a63dc4c"
dependencies = [
"num-traits",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1526,7 +1477,7 @@ dependencies = [
"macroific",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1540,18 +1491,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fiat-crypto"
@@ -1561,9 +1503,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
[[package]]
name = "filetime"
-version = "0.2.24"
+version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -1579,21 +1521,21 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "fixedstr"
-version = "0.5.7"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e049f021908beff8f8c430a99f5c136d3be69f1667346e581f446b173bc012"
+checksum = "60aba7afd9b1b9e1950c2b7e8bcac3cc44a273c62a02717dedca2d0a1aee694d"
dependencies = [
"serde",
]
[[package]]
name = "flate2"
-version = "1.0.32"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
]
[[package]]
@@ -1613,9 +1555,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
@@ -1628,9 +1570,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
"futures-sink",
@@ -1638,15 +1580,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
@@ -1655,24 +1597,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-lite"
@@ -1680,7 +1607,7 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [
- "fastrand 2.1.0",
+ "fastrand",
"futures-core",
"futures-io",
"parking",
@@ -1689,32 +1616,32 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-channel",
"futures-core",
@@ -1728,15 +1655,6 @@ dependencies = [
"slab",
]
-[[package]]
-name = "generic-array"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309"
-dependencies = [
- "typenum",
-]
-
[[package]]
name = "generic-array"
version = "0.14.7"
@@ -1748,17 +1666,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
[[package]]
name = "getrandom"
version = "0.2.15"
@@ -1768,15 +1675,15 @@ dependencies = [
"cfg-if 1.0.0",
"js-sys",
"libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
"wasm-bindgen",
]
[[package]]
name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "glob"
@@ -1786,9 +1693,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "gloo-timers"
-version = "0.2.6"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
dependencies = [
"futures-channel",
"futures-core",
@@ -1808,7 +1715,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http 0.2.12",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"slab",
"tokio",
"tokio-util",
@@ -1827,7 +1734,7 @@ dependencies = [
"futures-core",
"futures-sink",
"http 1.1.0",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"slab",
"tokio",
"tokio-util",
@@ -1859,6 +1766,15 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash",
+]
+
[[package]]
name = "hashbrown"
version = "0.14.5"
@@ -1868,6 +1784,12 @@ dependencies = [
"ahash",
]
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
[[package]]
name = "heapless"
version = "0.8.0"
@@ -2006,9 +1928,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
[[package]]
name = "httpdate"
@@ -2039,7 +1961,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
- "socket2 0.5.7",
+ "socket2",
"tokio",
"tower-service",
"tracing",
@@ -2069,9 +1991,9 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
dependencies = [
"futures-util",
"http 1.1.0",
@@ -2100,9 +2022,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
dependencies = [
"bytes",
"futures-channel",
@@ -2111,18 +2033,17 @@ dependencies = [
"http-body 1.0.1",
"hyper 1.4.1",
"pin-project-lite",
- "socket2 0.5.7",
+ "socket2",
"tokio",
- "tower 0.4.13",
"tower-service",
"tracing",
]
[[package]]
name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@@ -2170,7 +2091,7 @@ dependencies = [
"http 0.2.12",
"hyper 0.14.30",
"log",
- "rand 0.8.5",
+ "rand",
"tokio",
"url",
"xmltree",
@@ -2206,12 +2127,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.4.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
"serde",
]
@@ -2221,7 +2142,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
]
[[package]]
@@ -2259,22 +2180,11 @@ dependencies = [
"uuid 0.8.2",
]
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
[[package]]
name = "is-terminal"
@@ -2384,11 +2294,10 @@ dependencies = [
"local-ip-address",
"log",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"rocksdb",
+ "rv",
"serde",
- "statest",
- "statrs",
"thiserror",
"tokio",
]
@@ -2407,15 +2316,15 @@ dependencies = [
"borsh",
"bs58",
"faster-hex",
- "getrandom 0.2.15",
+ "getrandom",
"hmac",
"js-sys",
"kaspa-consensus-core",
"kaspa-utils",
"once_cell",
"pbkdf2",
- "rand 0.8.5",
- "rand_core 0.6.4",
+ "rand",
+ "rand_core",
"ripemd",
"secp256k1",
"serde",
@@ -2487,7 +2396,7 @@ dependencies = [
"kaspa-utils",
"log",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"tokio",
]
@@ -2503,7 +2412,7 @@ dependencies = [
"faster-hex",
"flate2",
"futures-util",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"kaspa-addresses",
"kaspa-consensus-core",
@@ -2523,8 +2432,8 @@ dependencies = [
"log",
"once_cell",
"parking_lot",
- "rand 0.8.5",
- "rand_distr 0.4.3",
+ "rand",
+ "rand_distr",
"rayon",
"rocksdb",
"secp256k1",
@@ -2552,7 +2461,7 @@ dependencies = [
"kaspa-txscript",
"kaspa-utils",
"kaspa-wasm-core",
- "rand 0.8.5",
+ "rand",
"secp256k1",
"serde",
"serde-wasm-bindgen",
@@ -2567,6 +2476,7 @@ dependencies = [
name = "kaspa-consensus-core"
version = "0.15.2"
dependencies = [
+ "arc-swap",
"async-trait",
"bincode",
"borsh",
@@ -2574,7 +2484,7 @@ dependencies = [
"criterion",
"faster-hex",
"futures-util",
- "getrandom 0.2.15",
+ "getrandom",
"itertools 0.13.0",
"js-sys",
"kaspa-addresses",
@@ -2585,7 +2495,7 @@ dependencies = [
"kaspa-muhash",
"kaspa-txscript-errors",
"kaspa-utils",
- "rand 0.8.5",
+ "rand",
"secp256k1",
"serde",
"serde-wasm-bindgen",
@@ -2633,7 +2543,7 @@ dependencies = [
"kaspa-hashes",
"kaspa-txscript",
"kaspa-utils",
- "rand 0.8.5",
+ "rand",
"secp256k1",
"serde",
"serde-wasm-bindgen",
@@ -2659,7 +2569,7 @@ dependencies = [
"kaspa-utils",
"log",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"tokio",
]
@@ -2710,14 +2620,14 @@ dependencies = [
"bincode",
"enum-primitive-derive",
"faster-hex",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"kaspa-hashes",
"kaspa-utils",
"num-traits",
"num_cpus",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"rocksdb",
"serde",
"smallvec",
@@ -2747,7 +2657,7 @@ dependencies = [
"parking_lot",
"paste",
"prost",
- "rand 0.8.5",
+ "rand",
"regex",
"rustls",
"thiserror",
@@ -2776,7 +2686,7 @@ dependencies = [
"log",
"paste",
"prost",
- "rand 0.8.5",
+ "rand",
"regex",
"thiserror",
"tokio",
@@ -2813,7 +2723,7 @@ dependencies = [
"parking_lot",
"paste",
"prost",
- "rand 0.8.5",
+ "rand",
"rustls",
"thiserror",
"tokio",
@@ -2836,7 +2746,7 @@ dependencies = [
"kaspa-utils",
"keccak",
"once_cell",
- "rand 0.8.5",
+ "rand",
"serde",
"sha2",
"sha3",
@@ -2885,7 +2795,7 @@ dependencies = [
"log",
"parking_lot",
"paste",
- "rand 0.8.5",
+ "rand",
"thiserror",
"tokio",
"triggered",
@@ -2902,7 +2812,7 @@ dependencies = [
"kaspa-utils",
"malachite-base",
"malachite-nz",
- "rand_chacha 0.3.1",
+ "rand_chacha",
"serde",
"serde-wasm-bindgen",
"thiserror",
@@ -2953,7 +2863,7 @@ dependencies = [
"kaspa-utils",
"log",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"secp256k1",
"serde",
"smallvec",
@@ -2977,8 +2887,8 @@ dependencies = [
"criterion",
"kaspa-hashes",
"kaspa-math",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
+ "rand",
+ "rand_chacha",
"rayon",
"serde",
]
@@ -2994,7 +2904,7 @@ dependencies = [
"derive_more",
"futures",
"futures-util",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"kaspa-addresses",
"kaspa-alloc",
@@ -3008,7 +2918,7 @@ dependencies = [
"log",
"parking_lot",
"paste",
- "rand 0.8.5",
+ "rand",
"serde",
"thiserror",
"tokio",
@@ -3026,7 +2936,7 @@ dependencies = [
"async-trait",
"chrono",
"futures",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"kaspa-addressmanager",
"kaspa-connectionmanager",
@@ -3043,7 +2953,7 @@ dependencies = [
"kaspa-utils-tower",
"log",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"thiserror",
"tokio",
"tokio-stream",
@@ -3070,7 +2980,7 @@ dependencies = [
"log",
"parking_lot",
"prost",
- "rand 0.8.5",
+ "rand",
"seqlock",
"serde",
"thiserror",
@@ -3138,7 +3048,7 @@ dependencies = [
"kaspa-utils",
"log",
"paste",
- "rand 0.8.5",
+ "rand",
"serde",
"serde-wasm-bindgen",
"serde_json",
@@ -3200,14 +3110,14 @@ dependencies = [
"async-trait",
"bincode",
"chrono",
- "clap 4.5.16",
+ "clap 4.5.19",
"criterion",
"crossbeam-channel",
"dhat",
"faster-hex",
"flate2",
"futures-util",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"kaspa-addresses",
"kaspa-alloc",
@@ -3238,8 +3148,8 @@ dependencies = [
"kaspad",
"log",
"parking_lot",
- "rand 0.8.5",
- "rand_distr 0.4.3",
+ "rand",
+ "rand_distr",
"rayon",
"rocksdb",
"secp256k1",
@@ -3262,7 +3172,7 @@ dependencies = [
"criterion",
"hex",
"hexplay",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"kaspa-addresses",
"kaspa-consensus-core",
@@ -3272,7 +3182,7 @@ dependencies = [
"kaspa-wasm-core",
"log",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"secp256k1",
"serde",
"serde-wasm-bindgen",
@@ -3314,7 +3224,7 @@ dependencies = [
"num_cpus",
"once_cell",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"rlimit",
"serde",
"serde_json",
@@ -3359,7 +3269,7 @@ dependencies = [
"kaspa-utils",
"log",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"rocksdb",
"serde",
"thiserror",
@@ -3444,7 +3354,7 @@ dependencies = [
"md-5",
"pad",
"pbkdf2",
- "rand 0.8.5",
+ "rand",
"regex",
"ripemd",
"secp256k1",
@@ -3489,7 +3399,7 @@ dependencies = [
"kaspa-txscript-errors",
"kaspa-utils",
"kaspa-wasm-core",
- "rand 0.8.5",
+ "rand",
"ripemd",
"secp256k1",
"serde",
@@ -3601,7 +3511,7 @@ dependencies = [
"kaspa-rpc-core",
"kaspa-rpc-macros",
"paste",
- "rand 0.8.5",
+ "rand",
"regex",
"rustls",
"serde",
@@ -3640,7 +3550,7 @@ name = "kaspa-wrpc-proxy"
version = "0.15.2"
dependencies = [
"async-trait",
- "clap 4.5.16",
+ "clap 4.5.19",
"kaspa-consensus-core",
"kaspa-grpc-client",
"kaspa-rpc-core",
@@ -3728,7 +3638,7 @@ version = "0.15.2"
dependencies = [
"async-channel 2.3.1",
"cfg-if 1.0.0",
- "clap 4.5.16",
+ "clap 4.5.19",
"dhat",
"dirs",
"futures-util",
@@ -3757,7 +3667,7 @@ dependencies = [
"kaspa-wrpc-server",
"log",
"num_cpus",
- "rand 0.8.5",
+ "rand",
"rayon",
"serde",
"serde_with",
@@ -3800,9 +3710,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libloading"
@@ -3859,9 +3769,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.19"
+version = "1.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647"
+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
dependencies = [
"cc",
"pkg-config",
@@ -3888,12 +3798,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
[[package]]
name = "linux-raw-sys"
version = "0.4.14"
@@ -3902,14 +3806,14 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "local-ip-address"
-version = "0.6.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136ef34e18462b17bf39a7826f8f3bbc223341f8e83822beb8b77db9a3d49696"
+checksum = "3669cf5561f8d27e8fc84cc15e58350e70f557d4d65f70e3154e54cd2f8e1782"
dependencies = [
"libc",
"neli",
"thiserror",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3956,7 +3860,7 @@ dependencies = [
"log-mdc",
"once_cell",
"parking_lot",
- "rand 0.8.5",
+ "rand",
"serde",
"serde-value",
"serde_json",
@@ -3967,11 +3871,20 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "lru"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17"
+dependencies = [
+ "hashbrown 0.13.2",
+]
+
[[package]]
name = "lz4-sys"
-version = "1.10.0"
+version = "1.11.1+lz4-1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
dependencies = [
"cc",
"libc",
@@ -4016,7 +3929,7 @@ dependencies = [
"cfg-if 1.0.0",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -4027,7 +3940,7 @@ checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -4040,14 +3953,14 @@ dependencies = [
"macroific_core",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "malachite-base"
-version = "0.4.15"
+version = "0.4.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f8d7930df6fcb9c86761ca0999ba484d7b6469c81cee4a7d38da5386440f96"
+checksum = "46059721011b0458b7bd6d9179be5d0b60294281c23320c207adceaecc54d13b"
dependencies = [
"hashbrown 0.14.5",
"itertools 0.11.0",
@@ -4057,9 +3970,9 @@ dependencies = [
[[package]]
name = "malachite-nz"
-version = "0.4.15"
+version = "0.4.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa263ca62420c1f65cf6758f55c979a49ad83169f332e602b1890f1e1277a429"
+checksum = "1503b27e825cabd1c3d0ff1e95a39fb2ec9eab6fd3da6cfa41aec7091d273e78"
dependencies = [
"itertools 0.11.0",
"libm",
@@ -4083,11 +3996,15 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
[[package]]
name = "matrixmultiply"
-version = "0.2.4"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1"
+checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
dependencies = [
+ "autocfg",
+ "num_cpus",
+ "once_cell",
"rawpointer",
+ "thread-tree",
]
[[package]]
@@ -4146,15 +4063,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.8.0"
@@ -4178,7 +4086,7 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
dependencies = [
"libc",
"log",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
"windows-sys 0.48.0",
]
@@ -4190,7 +4098,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
"hermit-abi 0.3.9",
"libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
"windows-sys 0.52.0",
]
@@ -4200,44 +4108,13 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
-[[package]]
-name = "nalgebra"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0abb021006c01b126a936a8dd1351e0720d83995f4fc942d0d426c654f990745"
-dependencies = [
- "alga",
- "approx",
- "generic-array 0.13.3",
- "matrixmultiply",
- "num-complex 0.2.4",
- "num-rational 0.2.4",
- "num-traits",
- "rand 0.7.3",
- "rand_distr 0.2.2",
- "typenum",
-]
-
[[package]]
name = "nanoid"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
dependencies = [
- "rand 0.8.5",
-]
-
-[[package]]
-name = "ndarray"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac06db03ec2f46ee0ecdca1a1c34a99c0d188a0d83439b84bf0cb4b386e4ab09"
-dependencies = [
- "matrixmultiply",
- "num-complex 0.2.4",
- "num-integer",
- "num-traits",
- "rawpointer",
+ "rand",
]
[[package]]
@@ -4329,10 +4206,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
dependencies = [
"num-bigint",
- "num-complex 0.4.6",
+ "num-complex",
"num-integer",
"num-iter",
- "num-rational 0.4.2",
+ "num-rational",
"num-traits",
]
@@ -4346,16 +4223,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "num-complex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
[[package]]
name = "num-complex"
version = "0.4.6"
@@ -4391,17 +4258,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "num-rational"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
[[package]]
name = "num-rational"
version = "0.4.2"
@@ -4463,18 +4319,18 @@ dependencies = [
[[package]]
name = "object"
-version = "0.36.3"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "oorandom"
@@ -4494,6 +4350,12 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+[[package]]
+name = "order-stat"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efa535d5117d3661134dbf1719b6f0ffe06f2375843b13935db186cd094105eb"
+
[[package]]
name = "ordered-float"
version = "2.10.1"
@@ -4524,9 +4386,9 @@ dependencies = [
[[package]]
name = "parking"
-version = "2.2.0"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
@@ -4568,7 +4430,7 @@ checksum = "70df726c43c645ef1dde24c7ae14692036ebe5457c92c5f0ec4cfceb99634ff6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -4578,7 +4440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
dependencies = [
"base64ct",
- "rand_core 0.6.4",
+ "rand_core",
"subtle",
]
@@ -4610,6 +4472,30 @@ version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+[[package]]
+name = "peroxide"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703b5fbdc1f9018a66e2db8758633cec31d39ad3127bfd38c9b6ad510637519c"
+dependencies = [
+ "matrixmultiply",
+ "order-stat",
+ "peroxide-ad",
+ "puruspe",
+ "rand",
+ "rand_distr",
+]
+
+[[package]]
+name = "peroxide-ad"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fba8ff3f40b67996f7c745f699babaa3e57ef5c8178ec999daf7eedc51dc8c"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "petgraph"
version = "0.6.5"
@@ -4617,27 +4503,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
dependencies = [
"fixedbitset",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
]
[[package]]
name = "pin-project"
-version = "1.1.5"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -4659,31 +4545,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
dependencies = [
"atomic-waker",
- "fastrand 2.1.0",
+ "fastrand",
"futures-io",
]
[[package]]
name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "polling"
-version = "2.8.0"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "polling"
@@ -4695,7 +4565,7 @@ dependencies = [
"concurrent-queue",
"hermit-abi 0.4.0",
"pin-project-lite",
- "rustix 0.38.34",
+ "rustix",
"tracing",
"windows-sys 0.59.0",
]
@@ -4713,9 +4583,9 @@ dependencies = [
[[package]]
name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "powerfmt"
@@ -4734,21 +4604,21 @@ 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.75",
+ "syn 2.0.79",
]
[[package]]
name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
]
[[package]]
@@ -4785,9 +4655,9 @@ dependencies = [
[[package]]
name = "prost"
-version = "0.13.2"
+version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995"
+checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
dependencies = [
"bytes",
"prost-derive",
@@ -4795,9 +4665,9 @@ dependencies = [
[[package]]
name = "prost-build"
-version = "0.13.2"
+version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
+checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15"
dependencies = [
"bytes",
"heck",
@@ -4810,32 +4680,38 @@ dependencies = [
"prost",
"prost-types",
"regex",
- "syn 2.0.75",
+ "syn 2.0.79",
"tempfile",
]
[[package]]
name = "prost-derive"
-version = "0.13.2"
+version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
+checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
dependencies = [
"anyhow",
"itertools 0.13.0",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "prost-types"
-version = "0.13.2"
+version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519"
+checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670"
dependencies = [
"prost",
]
+[[package]]
+name = "puruspe"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3804877ffeba468c806c2ad9057bbbae92e4b2c410c2f108baaa0042f241fa4c"
+
[[package]]
name = "quinn"
version = "0.11.5"
@@ -4848,7 +4724,7 @@ dependencies = [
"quinn-udp",
"rustc-hash 2.0.0",
"rustls",
- "socket2 0.5.7",
+ "socket2",
"thiserror",
"tokio",
"tracing",
@@ -4861,7 +4737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
dependencies = [
"bytes",
- "rand 0.8.5",
+ "rand",
"ring",
"rustc-hash 2.0.0",
"rustls",
@@ -4879,33 +4755,20 @@ checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
dependencies = [
"libc",
"once_cell",
- "socket2 0.5.7",
+ "socket2",
"tracing",
"windows-sys 0.59.0",
]
[[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",
]
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
[[package]]
name = "rand"
version = "0.8.5"
@@ -4913,18 +4776,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
]
[[package]]
@@ -4934,16 +4787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
]
[[package]]
@@ -4952,16 +4796,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.15",
-]
-
-[[package]]
-name = "rand_distr"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2"
-dependencies = [
- "rand 0.7.3",
+ "getrandom",
]
[[package]]
@@ -4971,16 +4806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
dependencies = [
"num-traits",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
+ "rand",
]
[[package]]
@@ -5011,9 +4837,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags 2.6.0",
]
@@ -5024,16 +4850,16 @@ version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
"libredox",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
dependencies = [
"aho-corasick",
"memchr",
@@ -5043,9 +4869,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
@@ -5054,15 +4880,15 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "reqwest"
-version = "0.12.7"
+version = "0.12.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
dependencies = [
"base64",
"bytes",
@@ -5111,7 +4937,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
dependencies = [
"cc",
"cfg-if 1.0.0",
- "getrandom 0.2.15",
+ "getrandom",
"libc",
"spin",
"untrusted",
@@ -5129,9 +4955,9 @@ dependencies = [
[[package]]
name = "rlimit"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8"
+checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a"
dependencies = [
"libc",
]
@@ -5151,7 +4977,7 @@ name = "rothschild"
version = "0.15.2"
dependencies = [
"async-channel 2.3.1",
- "clap 4.5.16",
+ "clap 4.5.19",
"criterion",
"faster-hex",
"itertools 0.13.0",
@@ -5190,45 +5016,31 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[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.37.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags 2.6.0",
"errno",
"libc",
- "linux-raw-sys 0.4.14",
+ "linux-raw-sys",
"windows-sys 0.52.0",
]
[[package]]
name = "rustls"
-version = "0.23.12"
+version = "0.23.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
dependencies = [
"log",
"once_cell",
@@ -5241,25 +5053,24 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
dependencies = [
- "base64",
"rustls-pki-types",
]
[[package]]
name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
[[package]]
name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@@ -5272,6 +5083,22 @@ version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+[[package]]
+name = "rv"
+version = "0.16.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07e0a3b756794c7ea2f05d93760ffb946ff4f94b255d92444d94c19fd71f4ab"
+dependencies = [
+ "doc-comment",
+ "lru",
+ "num",
+ "num-traits",
+ "peroxide",
+ "rand",
+ "rand_distr",
+ "special",
+]
+
[[package]]
name = "ryu"
version = "1.0.18"
@@ -5310,20 +5137,20 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "secp256k1"
-version = "0.29.0"
+version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
+checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
dependencies = [
- "rand 0.8.5",
+ "rand",
"secp256k1-sys",
"serde",
]
[[package]]
name = "secp256k1-sys"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
dependencies = [
"cc",
]
@@ -5354,9 +5181,9 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.208"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
@@ -5384,20 +5211,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.208"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "serde_json"
-version = "1.0.125"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"itoa",
"memchr",
@@ -5413,14 +5240,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@@ -5439,15 +5266,15 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
dependencies = [
"base64",
"chrono",
"hex",
"indexmap 1.9.3",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"serde",
"serde_derive",
"serde_json",
@@ -5457,14 +5284,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5473,7 +5300,7 @@ version = "0.9.34+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"itoa",
"ryu",
"serde",
@@ -5564,11 +5391,11 @@ version = "0.15.2"
dependencies = [
"async-channel 2.3.1",
"cfg-if 1.0.0",
- "clap 4.5.16",
+ "clap 4.5.19",
"dhat",
"futures",
"futures-util",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"kaspa-alloc",
"kaspa-consensus",
@@ -5581,8 +5408,8 @@ dependencies = [
"kaspa-utils",
"log",
"num_cpus",
- "rand 0.8.5",
- "rand_distr 0.4.3",
+ "rand",
+ "rand_distr",
"rayon",
"secp256k1",
"tokio",
@@ -5622,16 +5449,6 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
[[package]]
name = "socket2"
version = "0.5.7"
@@ -5648,6 +5465,15 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dd62203d74a728ae353b4d716fc2a80e8da881dfdf8bbc0c012d877a58c4030"
+[[package]]
+name = "special"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b89cf0d71ae639fdd8097350bfac415a41aabf1d5ddd356295fdc95f09760382"
+dependencies = [
+ "libm",
+]
+
[[package]]
name = "spin"
version = "0.9.8"
@@ -5660,27 +5486,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-[[package]]
-name = "statest"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04ed65138bd1680f47e4d980ac7d3cf5e827fa99c2fa6683e640094a494602b4"
-dependencies = [
- "ndarray",
- "num-traits",
- "statrs",
-]
-
-[[package]]
-name = "statrs"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e34b58a8f9b7462b6922e0b4e3c83d1b3c2075f7f996a56d6c66afa81590064"
-dependencies = [
- "nalgebra",
- "rand 0.7.3",
-]
-
[[package]]
name = "strsim"
version = "0.8.0"
@@ -5718,9 +5523,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.75"
+version = "2.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
dependencies = [
"proc-macro2",
"quote",
@@ -5736,7 +5541,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5756,9 +5561,9 @@ dependencies = [
[[package]]
name = "sysinfo"
-version = "0.31.2"
+version = "0.31.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4115055da5f572fff541dd0c4e61b0262977f453cc9fe04be83aba25a89bdab"
+checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
dependencies = [
"core-foundation-sys",
"libc",
@@ -5791,14 +5596,14 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if 1.0.0",
- "fastrand 2.1.0",
+ "fastrand",
"once_cell",
- "rustix 0.38.34",
+ "rustix",
"windows-sys 0.59.0",
]
@@ -5833,22 +5638,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5867,6 +5672,15 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "thread-tree"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbd370cb847953a25954d9f63e14824a36113f8c72eecf6eccef5dc4b45d630"
+dependencies = [
+ "crossbeam-channel",
+]
+
[[package]]
name = "time"
version = "0.3.36"
@@ -5927,9 +5741,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.39.3"
+version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
dependencies = [
"backtrace",
"bytes",
@@ -5937,7 +5751,7 @@ dependencies = [
"mio 1.0.2",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.5.7",
+ "socket2",
"tokio-macros",
"windows-sys 0.52.0",
]
@@ -5950,7 +5764,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5966,9 +5780,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",
@@ -5993,9 +5807,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",
@@ -6013,7 +5827,7 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit",
]
[[package]]
@@ -6027,33 +5841,22 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
- "indexmap 2.4.0",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
-dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow 0.6.18",
+ "winnow",
]
[[package]]
name = "tonic"
-version = "0.12.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
dependencies = [
"async-stream",
"async-trait",
@@ -6072,7 +5875,7 @@ dependencies = [
"pin-project",
"prost",
"rustls-pemfile",
- "socket2 0.5.7",
+ "socket2",
"tokio",
"tokio-rustls",
"tokio-stream",
@@ -6085,15 +5888,16 @@ dependencies = [
[[package]]
name = "tonic-build"
-version = "0.12.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4ee8877250136bd7e3d2331632810a4df4ea5e004656990d8d66d2f5ee8a67"
+checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11"
dependencies = [
"prettyplease",
"proc-macro2",
"prost-build",
+ "prost-types",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -6107,7 +5911,7 @@ dependencies = [
"indexmap 1.9.3",
"pin-project",
"pin-project-lite",
- "rand 0.8.5",
+ "rand",
"slab",
"tokio",
"tokio-util",
@@ -6122,6 +5926,10 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 0.1.2",
"tower-layer",
"tower-service",
]
@@ -6173,7 +5981,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -6209,7 +6017,7 @@ dependencies = [
"http 1.1.0",
"httparse",
"log",
- "rand 0.8.5",
+ "rand",
"rustls",
"rustls-pki-types",
"sha1",
@@ -6234,15 +6042,15 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-linebreak"
@@ -6252,24 +6060,24 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "universal-hash"
@@ -6331,7 +6139,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
]
[[package]]
@@ -6340,8 +6148,8 @@ version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [
- "getrandom 0.2.15",
- "rand 0.8.5",
+ "getrandom",
+ "rand",
"serde",
"wasm-bindgen",
]
@@ -6385,12 +6193,6 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-[[package]]
-name = "waker-fn"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
-
[[package]]
name = "walkdir"
version = "2.5.0"
@@ -6410,12 +6212,6 @@ dependencies = [
"try-lock",
]
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
@@ -6446,7 +6242,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"wasm-bindgen-shared",
]
@@ -6480,7 +6276,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -6514,7 +6310,7 @@ checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -6529,9 +6325,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
dependencies = [
"rustls-pki-types",
]
@@ -6545,7 +6341,7 @@ dependencies = [
"either",
"home",
"once_cell",
- "rustix 0.38.34",
+ "rustix",
]
[[package]]
@@ -6618,7 +6414,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -6629,7 +6425,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -6821,18 +6617,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
@@ -6867,10 +6654,10 @@ dependencies = [
"dirs",
"faster-hex",
"futures",
- "getrandom 0.2.15",
+ "getrandom",
"instant",
"js-sys",
- "rand 0.8.5",
+ "rand",
"rlimit",
"serde",
"serde-wasm-bindgen",
@@ -6998,7 +6785,7 @@ dependencies = [
"futures",
"js-sys",
"nw-sys",
- "rand 0.8.5",
+ "rand",
"serde",
"serde-wasm-bindgen",
"thiserror",
@@ -7048,9 +6835,9 @@ dependencies = [
"downcast-rs",
"futures",
"futures-util",
- "getrandom 0.2.15",
+ "getrandom",
"manual_future",
- "rand 0.8.5",
+ "rand",
"serde",
"serde_json",
"thiserror",
@@ -7256,9 +7043,9 @@ dependencies = [
[[package]]
name = "xml-rs"
-version = "0.8.21"
+version = "0.8.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
+checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
[[package]]
name = "xmltree"
@@ -7293,7 +7080,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 8e6da754a6..dd5eb31320 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -224,6 +224,7 @@ regex = "1.10.2"
ripemd = { version = "0.1.3", default-features = false }
rlimit = "0.10.1"
rocksdb = "0.22.0"
+rv = "0.16.4"
secp256k1 = { version = "0.29.0", features = [
"global-context",
"rand-std",
@@ -243,8 +244,6 @@ sha3 = "0.10.8"
slugify-rs = "0.0.3"
smallvec = { version = "1.11.1", features = ["serde"] }
sorted-insert = "0.2.3"
-statest = "0.2.2"
-statrs = "0.13.0" # TODO "0.16.0"
subtle = { version = "2.5.0", default-features = false }
sysinfo = "0.31.2"
tempfile = "3.8.1"
@@ -253,8 +252,8 @@ thiserror = "1.0.50"
tokio = { version = "1.33.0", features = ["sync", "rt-multi-thread"] }
tokio-stream = "0.1.14"
toml = "0.8.8"
-tonic = { version = "0.12.2", features = ["tls-webpki-roots", "gzip", "transport"] }
-tonic-build = { version = "0.12.2", features = ["prost"] }
+tonic = { version = "0.12.3", features = ["tls-webpki-roots", "gzip", "transport"] }
+tonic-build = { version = "0.12.3", features = ["prost"] }
triggered = "0.1.2"
uuid = { version = "1.5.0", features = ["v4", "fast-rng", "serde"] }
wasm-bindgen = { version = "0.2.93", features = ["serde-serialize"] }
diff --git a/README.md b/README.md
index 8749c49e90..d9066efa84 100644
--- a/README.md
+++ b/README.md
@@ -184,7 +184,8 @@ To build WASM on MacOS you need to install `llvm` from homebrew (at the time of
Kaspa CLI + Wallet
-`kaspa-cli` crate provides cli-driven RPC interface to the node and a
+
+`kaspa-cli` crate provides a cli-driven RPC interface to the node and a
terminal interface to the Rusty Kaspa Wallet runtime. These wallets are
compatible with WASM SDK Wallet API and Kaspa NG projects.
@@ -323,8 +324,6 @@ wRPC
Simulation framework (Simpa)
-Logging in `kaspad` and `simpa` can be [filtered](https://docs.rs/env_logger/0.10.0/env_logger/#filtering-results) by either:
-
The current codebase supports a full in-process network simulation, building an actual DAG over virtual time with virtual delay and benchmarking validation time (following the simulation generation).
To see the available commands
diff --git a/components/addressmanager/Cargo.toml b/components/addressmanager/Cargo.toml
index e4398dc4e5..ef735b19c0 100644
--- a/components/addressmanager/Cargo.toml
+++ b/components/addressmanager/Cargo.toml
@@ -27,5 +27,4 @@ thiserror.workspace = true
tokio.workspace = true
[dev-dependencies]
-statrs.workspace = true
-statest.workspace = true
+rv.workspace = true
diff --git a/components/addressmanager/src/lib.rs b/components/addressmanager/src/lib.rs
index 85f9acb3e2..093323e155 100644
--- a/components/addressmanager/src/lib.rs
+++ b/components/addressmanager/src/lib.rs
@@ -520,8 +520,7 @@ mod address_store_with_cache {
use kaspa_database::create_temp_db;
use kaspa_database::prelude::ConnBuilder;
use kaspa_utils::networking::IpAddress;
- use statest::ks::KSTest;
- use statrs::distribution::Uniform;
+ use rv::{dist::Uniform, misc::ks_test as one_way_ks_test, traits::Cdf};
use std::net::{IpAddr, Ipv6Addr};
#[test]
@@ -591,10 +590,11 @@ mod address_store_with_cache {
assert!(num_of_buckets >= 12);
// Run multiple Kolmogorov–Smirnov tests to offset random noise of the random weighted iterator
- let num_of_trials = 512;
+ let num_of_trials = 2048; // Number of trials to run the test, chosen to reduce random noise.
let mut cul_p = 0.;
// The target uniform distribution
- let target_u_dist = Uniform::new(0.0, (num_of_buckets) as f64).unwrap();
+ let target_uniform_dist = Uniform::new(1.0, num_of_buckets as f64).unwrap();
+ let uniform_cdf = |x: f64| target_uniform_dist.cdf(&x);
for _ in 0..num_of_trials {
// The weight sampled expected uniform distibution
let prioritized_address_distribution = am
@@ -603,13 +603,12 @@ mod address_store_with_cache {
.take(num_of_buckets)
.map(|addr| addr.prefix_bucket().as_u64() as f64)
.collect_vec();
-
- let ks_test = KSTest::new(prioritized_address_distribution.as_slice());
- cul_p += ks_test.ks1(&target_u_dist).0;
+ cul_p += one_way_ks_test(prioritized_address_distribution.as_slice(), uniform_cdf).1;
}
// Normalize and adjust p to test for uniformity, over average of all trials.
- let adjusted_p = (0.5 - cul_p / num_of_trials as f64).abs();
+ // we do this to reduce the effect of random noise failing this test.
+ let adjusted_p = ((cul_p / num_of_trials as f64) - 0.5).abs();
// Define the significance threshold.
let significance = 0.10;
@@ -619,7 +618,7 @@ mod address_store_with_cache {
adjusted_p,
significance
);
- assert!(adjusted_p <= significance)
+ assert!(adjusted_p <= significance);
}
}
}
diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
index 20b21af18a..90aad80e1a 100644
--- a/consensus/Cargo.toml
+++ b/consensus/Cargo.toml
@@ -55,9 +55,14 @@ serde_json.workspace = true
flate2.workspace = true
rand_distr.workspace = true
kaspa-txscript-errors.workspace = true
+kaspa-addresses.workspace = true
+
+[[bench]]
+name = "parallel_muhash"
+harness = false
[[bench]]
-name = "hash_benchmarks"
+name = "check_scripts"
harness = false
[features]
diff --git a/consensus/benches/check_scripts.rs b/consensus/benches/check_scripts.rs
new file mode 100644
index 0000000000..4a596da1b2
--- /dev/null
+++ b/consensus/benches/check_scripts.rs
@@ -0,0 +1,126 @@
+use criterion::{black_box, criterion_group, criterion_main, Criterion, SamplingMode};
+use kaspa_addresses::{Address, Prefix, Version};
+use kaspa_consensus::processes::transaction_validator::transaction_validator_populated::{
+ check_scripts_par_iter, check_scripts_par_iter_pool, check_scripts_sequential,
+};
+use kaspa_consensus_core::hashing::sighash::{calc_schnorr_signature_hash, SigHashReusedValuesUnsync};
+use kaspa_consensus_core::hashing::sighash_type::SIG_HASH_ALL;
+use kaspa_consensus_core::subnets::SubnetworkId;
+use kaspa_consensus_core::tx::{MutableTransaction, Transaction, TransactionInput, TransactionOutpoint, UtxoEntry};
+use kaspa_txscript::caches::Cache;
+use kaspa_txscript::pay_to_address_script;
+use kaspa_utils::iter::parallelism_in_power_steps;
+use rand::{thread_rng, Rng};
+use secp256k1::Keypair;
+
+// You may need to add more detailed mocks depending on your actual code.
+fn mock_tx(inputs_count: usize, non_uniq_signatures: usize) -> (Transaction, Vec) {
+ let reused_values = SigHashReusedValuesUnsync::new();
+ let dummy_prev_out = TransactionOutpoint::new(kaspa_hashes::Hash::from_u64_word(1), 1);
+ let mut tx = Transaction::new(
+ 0,
+ vec![],
+ vec![],
+ 0,
+ SubnetworkId::from_bytes([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+ 0,
+ vec![],
+ );
+ let mut utxos = vec![];
+ let mut kps = vec![];
+ for _ in 0..inputs_count - non_uniq_signatures {
+ let kp = Keypair::new(secp256k1::SECP256K1, &mut thread_rng());
+ tx.inputs.push(TransactionInput { previous_outpoint: dummy_prev_out, signature_script: vec![], sequence: 0, sig_op_count: 1 });
+ let address = Address::new(Prefix::Mainnet, Version::PubKey, &kp.x_only_public_key().0.serialize());
+ utxos.push(UtxoEntry {
+ amount: thread_rng().gen::() as u64,
+ script_public_key: pay_to_address_script(&address),
+ block_daa_score: 333,
+ is_coinbase: false,
+ });
+ kps.push(kp);
+ }
+ for _ in 0..non_uniq_signatures {
+ let kp = kps.last().unwrap();
+ tx.inputs.push(TransactionInput { previous_outpoint: dummy_prev_out, signature_script: vec![], sequence: 0, sig_op_count: 1 });
+ let address = Address::new(Prefix::Mainnet, Version::PubKey, &kp.x_only_public_key().0.serialize());
+ utxos.push(UtxoEntry {
+ amount: thread_rng().gen::() as u64,
+ script_public_key: pay_to_address_script(&address),
+ block_daa_score: 444,
+ is_coinbase: false,
+ });
+ }
+ for (i, kp) in kps.iter().enumerate().take(inputs_count - non_uniq_signatures) {
+ let mut_tx = MutableTransaction::with_entries(&tx, utxos.clone());
+ let sig_hash = calc_schnorr_signature_hash(&mut_tx.as_verifiable(), i, SIG_HASH_ALL, &reused_values);
+ let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap();
+ let sig: [u8; 64] = *kp.sign_schnorr(msg).as_ref();
+ // This represents OP_DATA_65 (since signature length is 64 bytes and SIGHASH_TYPE is one byte)
+ tx.inputs[i].signature_script = std::iter::once(65u8).chain(sig).chain([SIG_HASH_ALL.to_u8()]).collect();
+ }
+ let length = tx.inputs.len();
+ for i in (inputs_count - non_uniq_signatures)..length {
+ let kp = kps.last().unwrap();
+ let mut_tx = MutableTransaction::with_entries(&tx, utxos.clone());
+ let sig_hash = calc_schnorr_signature_hash(&mut_tx.as_verifiable(), i, SIG_HASH_ALL, &reused_values);
+ let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap();
+ let sig: [u8; 64] = *kp.sign_schnorr(msg).as_ref();
+ // This represents OP_DATA_65 (since signature length is 64 bytes and SIGHASH_TYPE is one byte)
+ tx.inputs[i].signature_script = std::iter::once(65u8).chain(sig).chain([SIG_HASH_ALL.to_u8()]).collect();
+ }
+ (tx, utxos)
+}
+
+fn benchmark_check_scripts(c: &mut Criterion) {
+ for inputs_count in [100, 50, 25, 10, 5, 2] {
+ for non_uniq_signatures in [0, inputs_count / 2] {
+ let (tx, utxos) = mock_tx(inputs_count, non_uniq_signatures);
+ let mut group = c.benchmark_group(format!("inputs: {inputs_count}, non uniq: {non_uniq_signatures}"));
+ group.sampling_mode(SamplingMode::Flat);
+
+ group.bench_function("single_thread", |b| {
+ let tx = MutableTransaction::with_entries(&tx, utxos.clone());
+ let cache = Cache::new(inputs_count as u64);
+ b.iter(|| {
+ cache.clear();
+ check_scripts_sequential(black_box(&cache), black_box(&tx.as_verifiable())).unwrap();
+ })
+ });
+
+ group.bench_function("rayon par iter", |b| {
+ let tx = MutableTransaction::with_entries(tx.clone(), utxos.clone());
+ let cache = Cache::new(inputs_count as u64);
+ b.iter(|| {
+ cache.clear();
+ check_scripts_par_iter(black_box(&cache), black_box(&tx.as_verifiable())).unwrap();
+ })
+ });
+
+ // Iterate powers of two up to available parallelism
+ for i in parallelism_in_power_steps() {
+ if inputs_count >= i {
+ group.bench_function(format!("rayon, custom thread pool, thread count {i}"), |b| {
+ let tx = MutableTransaction::with_entries(tx.clone(), utxos.clone());
+ // Create a custom thread pool with the specified number of threads
+ let pool = rayon::ThreadPoolBuilder::new().num_threads(i).build().unwrap();
+ let cache = Cache::new(inputs_count as u64);
+ b.iter(|| {
+ cache.clear();
+ check_scripts_par_iter_pool(black_box(&cache), black_box(&tx.as_verifiable()), black_box(&pool)).unwrap();
+ })
+ });
+ }
+ }
+ }
+ }
+}
+
+criterion_group! {
+ name = benches;
+ // This can be any expression that returns a `Criterion` object.
+ config = Criterion::default().with_output_color(true).measurement_time(std::time::Duration::new(20, 0));
+ targets = benchmark_check_scripts
+}
+
+criterion_main!(benches);
diff --git a/consensus/benches/hash_benchmarks.rs b/consensus/benches/hash_benchmarks.rs
deleted file mode 100644
index 8ba6836b8d..0000000000
--- a/consensus/benches/hash_benchmarks.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use std::str::FromStr;
-
-use kaspa_hashes::Hash;
-
-/// Placeholder for actual benchmarks
-pub fn hash_benchmark(c: &mut Criterion) {
- c.bench_function("Hash::from_str", |b| {
- let hash_str = "8e40af02265360d59f4ecf9ae9ebf8f00a3118408f5a9cdcbcc9c0f93642f3af";
- b.iter(|| Hash::from_str(black_box(hash_str)))
- });
-}
-
-criterion_group!(benches, hash_benchmark);
-criterion_main!(benches);
diff --git a/consensus/benches/parallel_muhash.rs b/consensus/benches/parallel_muhash.rs
new file mode 100644
index 0000000000..99ab5b6c3a
--- /dev/null
+++ b/consensus/benches/parallel_muhash.rs
@@ -0,0 +1,66 @@
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use itertools::Itertools;
+use kaspa_consensus_core::{
+ muhash::MuHashExtensions,
+ subnets::SUBNETWORK_ID_NATIVE,
+ tx::{ScriptPublicKey, SignableTransaction, Transaction, TransactionInput, TransactionOutpoint, TransactionOutput, UtxoEntry},
+};
+use kaspa_hashes::TransactionID;
+use kaspa_muhash::MuHash;
+use kaspa_utils::iter::parallelism_in_power_steps;
+use rayon::prelude::*;
+
+fn generate_transaction(ins: usize, outs: usize, randomness: u64) -> SignableTransaction {
+ let mut tx = Transaction::new(0, vec![], vec![], 0, SUBNETWORK_ID_NATIVE, 0, vec![]);
+ let mut entries = vec![];
+ for i in 0..ins {
+ let mut hasher = TransactionID::new();
+ hasher.write(i.to_le_bytes());
+ hasher.write(randomness.to_le_bytes());
+ let input = TransactionInput::new(TransactionOutpoint::new(hasher.finalize(), 0), vec![10; 66], 0, 1);
+ let entry = UtxoEntry::new(22222222, ScriptPublicKey::from_vec(0, vec![99; 34]), 23456, false);
+ tx.inputs.push(input);
+ entries.push(entry);
+ }
+ for _ in 0..outs {
+ let output = TransactionOutput::new(23456, ScriptPublicKey::from_vec(0, vec![101; 34]));
+ tx.outputs.push(output);
+ }
+ tx.finalize();
+ SignableTransaction::with_entries(tx, entries)
+}
+
+pub fn parallel_muhash_benchmark(c: &mut Criterion) {
+ let mut group = c.benchmark_group("muhash txs");
+ let txs = (0..256).map(|i| generate_transaction(2, 2, i)).collect_vec();
+ group.bench_function("seq", |b| {
+ b.iter(|| {
+ let mut mh = MuHash::new();
+ for tx in txs.iter() {
+ mh.add_transaction(&tx.as_verifiable(), 222);
+ }
+ black_box(mh)
+ })
+ });
+
+ for threads in parallelism_in_power_steps() {
+ group.bench_function(format!("par {threads}"), |b| {
+ let pool = rayon::ThreadPoolBuilder::new().num_threads(threads).build().unwrap();
+ b.iter(|| {
+ pool.install(|| {
+ let mh =
+ txs.par_iter().map(|tx| MuHash::from_transaction(&tx.as_verifiable(), 222)).reduce(MuHash::new, |mut a, b| {
+ a.combine(&b);
+ a
+ });
+ black_box(mh)
+ })
+ })
+ });
+ }
+
+ group.finish();
+}
+
+criterion_group!(benches, parallel_muhash_benchmark);
+criterion_main!(benches);
diff --git a/consensus/client/src/sign.rs b/consensus/client/src/sign.rs
index 4044dc5701..18ff3c8491 100644
--- a/consensus/client/src/sign.rs
+++ b/consensus/client/src/sign.rs
@@ -7,7 +7,7 @@ use core::iter::once;
use itertools::Itertools;
use kaspa_consensus_core::{
hashing::{
- sighash::{calc_schnorr_signature_hash, SigHashReusedValues},
+ sighash::{calc_schnorr_signature_hash, SigHashReusedValuesUnsync},
sighash_type::SIG_HASH_ALL,
},
tx::PopulatedTransaction,
@@ -44,7 +44,7 @@ pub fn sign_with_multiple_v3<'a>(tx: &'a Transaction, privkeys: &[[u8; 32]]) ->
map.insert(script_pub_key_script, schnorr_key);
}
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
let mut additional_signatures_required = false;
{
let input_len = tx.inner().inputs.len();
@@ -59,7 +59,7 @@ pub fn sign_with_multiple_v3<'a>(tx: &'a Transaction, privkeys: &[[u8; 32]]) ->
};
let script = script_pub_key.script();
if let Some(schnorr_key) = map.get(script) {
- let sig_hash = calc_schnorr_signature_hash(&populated_transaction, i, SIG_HASH_ALL, &mut reused_values);
+ let sig_hash = calc_schnorr_signature_hash(&populated_transaction, i, SIG_HASH_ALL, &reused_values);
let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap();
let sig: [u8; 64] = *schnorr_key.sign_schnorr(msg).as_ref();
// This represents OP_DATA_65 (since signature length is 64 bytes and SIGHASH_TYPE is one byte)
diff --git a/consensus/client/src/signing.rs b/consensus/client/src/signing.rs
index ef993d0118..f7fe8cee6a 100644
--- a/consensus/client/src/signing.rs
+++ b/consensus/client/src/signing.rs
@@ -75,7 +75,7 @@ impl SigHashCache {
}
}
- pub fn sig_op_counts_hash(&mut self, tx: &Transaction, hash_type: SigHashType, reused_values: &mut SigHashReusedValues) -> Hash {
+ pub fn sig_op_counts_hash(&mut self, tx: &Transaction, hash_type: SigHashType, reused_values: &SigHashReusedValues) -> Hash {
if hash_type.is_sighash_anyone_can_pay() {
return ZERO_HASH;
}
@@ -185,16 +185,16 @@ pub fn calc_schnorr_signature_hash(
let mut hasher = TransactionSigningHash::new();
hasher
.write_u16(tx.version)
- .update(previous_outputs_hash(&tx, hash_type, &mut reused_values))
- .update(sequences_hash(&tx, hash_type, &mut reused_values))
- .update(sig_op_counts_hash(&tx, hash_type, &mut reused_values));
+ .update(previous_outputs_hash(&tx, hash_type, &reused_values))
+ .update(sequences_hash(&tx, hash_type, &reused_values))
+ .update(sig_op_counts_hash(&tx, hash_type, &reused_values));
hash_outpoint(&mut hasher, input.previous_outpoint);
hash_script_public_key(&mut hasher, &utxo.script_public_key);
hasher
.write_u64(utxo.amount)
.write_u64(input.sequence)
.write_u8(input.sig_op_count)
- .update(outputs_hash(&tx, hash_type, &mut reused_values, input_index))
+ .update(outputs_hash(&tx, hash_type, &reused_values, input_index))
.write_u64(tx.lock_time)
.update(&tx.subnetwork_id)
.write_u64(tx.gas)
diff --git a/consensus/core/Cargo.toml b/consensus/core/Cargo.toml
index 44dbedd387..228b4ac11d 100644
--- a/consensus/core/Cargo.toml
+++ b/consensus/core/Cargo.toml
@@ -15,6 +15,7 @@ wasm32-sdk = []
default = []
[dependencies]
+arc-swap.workspace = true
async-trait.workspace = true
borsh.workspace = true
cfg-if.workspace = true
diff --git a/consensus/core/src/hashing/sighash.rs b/consensus/core/src/hashing/sighash.rs
index c1b6133e8a..e6c7ad4dd0 100644
--- a/consensus/core/src/hashing/sighash.rs
+++ b/consensus/core/src/hashing/sighash.rs
@@ -1,4 +1,7 @@
+use arc_swap::ArcSwapOption;
use kaspa_hashes::{Hash, Hasher, HasherBase, TransactionSigningHash, TransactionSigningHashECDSA, ZERO_HASH};
+use std::cell::Cell;
+use std::sync::Arc;
use crate::{
subnets::SUBNETWORK_ID_NATIVE,
@@ -11,72 +14,172 @@ use super::{sighash_type::SigHashType, HasherExtensions};
/// the same for all transaction inputs.
/// Reuse of such values prevents the quadratic hashing problem.
#[derive(Default)]
-pub struct SigHashReusedValues {
- previous_outputs_hash: Option,
- sequences_hash: Option,
- sig_op_counts_hash: Option,
- outputs_hash: Option,
+pub struct SigHashReusedValuesUnsync {
+ previous_outputs_hash: Cell>,
+ sequences_hash: Cell>,
+ sig_op_counts_hash: Cell>,
+ outputs_hash: Cell>,
}
-impl SigHashReusedValues {
+impl SigHashReusedValuesUnsync {
pub fn new() -> Self {
- Self { previous_outputs_hash: None, sequences_hash: None, sig_op_counts_hash: None, outputs_hash: None }
+ Self::default()
}
}
-pub fn previous_outputs_hash(tx: &Transaction, hash_type: SigHashType, reused_values: &mut SigHashReusedValues) -> Hash {
+#[derive(Default)]
+pub struct SigHashReusedValuesSync {
+ previous_outputs_hash: ArcSwapOption,
+ sequences_hash: ArcSwapOption,
+ sig_op_counts_hash: ArcSwapOption,
+ outputs_hash: ArcSwapOption,
+}
+
+impl SigHashReusedValuesSync {
+ pub fn new() -> Self {
+ Self::default()
+ }
+}
+
+pub trait SigHashReusedValues {
+ fn previous_outputs_hash(&self, set: impl Fn() -> Hash) -> Hash;
+ fn sequences_hash(&self, set: impl Fn() -> Hash) -> Hash;
+ fn sig_op_counts_hash(&self, set: impl Fn() -> Hash) -> Hash;
+ fn outputs_hash(&self, set: impl Fn() -> Hash) -> Hash;
+}
+
+impl SigHashReusedValues for Arc {
+ fn previous_outputs_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ self.as_ref().previous_outputs_hash(set)
+ }
+
+ fn sequences_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ self.as_ref().sequences_hash(set)
+ }
+
+ fn sig_op_counts_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ self.as_ref().sig_op_counts_hash(set)
+ }
+
+ fn outputs_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ self.as_ref().outputs_hash(set)
+ }
+}
+
+impl SigHashReusedValues for SigHashReusedValuesUnsync {
+ fn previous_outputs_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ self.previous_outputs_hash.get().unwrap_or_else(|| {
+ let hash = set();
+ self.previous_outputs_hash.set(Some(hash));
+ hash
+ })
+ }
+
+ fn sequences_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ self.sequences_hash.get().unwrap_or_else(|| {
+ let hash = set();
+ self.sequences_hash.set(Some(hash));
+ hash
+ })
+ }
+
+ fn sig_op_counts_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ self.sig_op_counts_hash.get().unwrap_or_else(|| {
+ let hash = set();
+ self.sig_op_counts_hash.set(Some(hash));
+ hash
+ })
+ }
+
+ fn outputs_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ self.outputs_hash.get().unwrap_or_else(|| {
+ let hash = set();
+ self.outputs_hash.set(Some(hash));
+ hash
+ })
+ }
+}
+
+impl SigHashReusedValues for SigHashReusedValuesSync {
+ fn previous_outputs_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ if let Some(value) = self.previous_outputs_hash.load().as_ref() {
+ return **value;
+ }
+ let hash = set();
+ self.previous_outputs_hash.rcu(|_| Arc::new(hash));
+ hash
+ }
+
+ fn sequences_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ if let Some(value) = self.sequences_hash.load().as_ref() {
+ return **value;
+ }
+ let hash = set();
+ self.sequences_hash.rcu(|_| Arc::new(hash));
+ hash
+ }
+
+ fn sig_op_counts_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ if let Some(value) = self.sig_op_counts_hash.load().as_ref() {
+ return **value;
+ }
+ let hash = set();
+ self.sig_op_counts_hash.rcu(|_| Arc::new(hash));
+ hash
+ }
+
+ fn outputs_hash(&self, set: impl Fn() -> Hash) -> Hash {
+ if let Some(value) = self.outputs_hash.load().as_ref() {
+ return **value;
+ }
+ let hash = set();
+ self.outputs_hash.rcu(|_| Arc::new(hash));
+ hash
+ }
+}
+
+pub fn previous_outputs_hash(tx: &Transaction, hash_type: SigHashType, reused_values: &impl SigHashReusedValues) -> Hash {
if hash_type.is_sighash_anyone_can_pay() {
return ZERO_HASH;
}
-
- if let Some(previous_outputs_hash) = reused_values.previous_outputs_hash {
- previous_outputs_hash
- } else {
+ let hash = || {
let mut hasher = TransactionSigningHash::new();
for input in tx.inputs.iter() {
hasher.update(input.previous_outpoint.transaction_id.as_bytes());
hasher.write_u32(input.previous_outpoint.index);
}
- let previous_outputs_hash = hasher.finalize();
- reused_values.previous_outputs_hash = Some(previous_outputs_hash);
- previous_outputs_hash
- }
+ hasher.finalize()
+ };
+ reused_values.previous_outputs_hash(hash)
}
-pub fn sequences_hash(tx: &Transaction, hash_type: SigHashType, reused_values: &mut SigHashReusedValues) -> Hash {
+pub fn sequences_hash(tx: &Transaction, hash_type: SigHashType, reused_values: &impl SigHashReusedValues) -> Hash {
if hash_type.is_sighash_single() || hash_type.is_sighash_anyone_can_pay() || hash_type.is_sighash_none() {
return ZERO_HASH;
}
-
- if let Some(sequences_hash) = reused_values.sequences_hash {
- sequences_hash
- } else {
+ let hash = || {
let mut hasher = TransactionSigningHash::new();
for input in tx.inputs.iter() {
hasher.write_u64(input.sequence);
}
- let sequence_hash = hasher.finalize();
- reused_values.sequences_hash = Some(sequence_hash);
- sequence_hash
- }
+ hasher.finalize()
+ };
+ reused_values.sequences_hash(hash)
}
-pub fn sig_op_counts_hash(tx: &Transaction, hash_type: SigHashType, reused_values: &mut SigHashReusedValues) -> Hash {
+pub fn sig_op_counts_hash(tx: &Transaction, hash_type: SigHashType, reused_values: &impl SigHashReusedValues) -> Hash {
if hash_type.is_sighash_anyone_can_pay() {
return ZERO_HASH;
}
- if let Some(sig_op_counts_hash) = reused_values.sig_op_counts_hash {
- sig_op_counts_hash
- } else {
+ let hash = || {
let mut hasher = TransactionSigningHash::new();
for input in tx.inputs.iter() {
hasher.write_u8(input.sig_op_count);
}
- let sig_op_counts_hash = hasher.finalize();
- reused_values.sig_op_counts_hash = Some(sig_op_counts_hash);
- sig_op_counts_hash
- }
+ hasher.finalize()
+ };
+ reused_values.sig_op_counts_hash(hash)
}
pub fn payload_hash(tx: &Transaction) -> Hash {
@@ -92,7 +195,7 @@ pub fn payload_hash(tx: &Transaction) -> Hash {
hasher.finalize()
}
-pub fn outputs_hash(tx: &Transaction, hash_type: SigHashType, reused_values: &mut SigHashReusedValues, input_index: usize) -> Hash {
+pub fn outputs_hash(tx: &Transaction, hash_type: SigHashType, reused_values: &impl SigHashReusedValues, input_index: usize) -> Hash {
if hash_type.is_sighash_none() {
return ZERO_HASH;
}
@@ -107,19 +210,15 @@ pub fn outputs_hash(tx: &Transaction, hash_type: SigHashType, reused_values: &mu
hash_output(&mut hasher, &tx.outputs[input_index]);
return hasher.finalize();
}
-
- // Otherwise, return hash of all outputs. Re-use hash if available.
- if let Some(outputs_hash) = reused_values.outputs_hash {
- outputs_hash
- } else {
+ let hash = || {
let mut hasher = TransactionSigningHash::new();
for output in tx.outputs.iter() {
hash_output(&mut hasher, output);
}
- let outputs_hash = hasher.finalize();
- reused_values.outputs_hash = Some(outputs_hash);
- outputs_hash
- }
+ hasher.finalize()
+ };
+ // Otherwise, return hash of all outputs. Re-use hash if available.
+ reused_values.outputs_hash(hash)
}
pub fn hash_outpoint(hasher: &mut impl Hasher, outpoint: TransactionOutpoint) {
@@ -141,7 +240,7 @@ pub fn calc_schnorr_signature_hash(
verifiable_tx: &impl VerifiableTransaction,
input_index: usize,
hash_type: SigHashType,
- reused_values: &mut SigHashReusedValues,
+ reused_values: &impl SigHashReusedValues,
) -> Hash {
let input = verifiable_tx.populated_input(input_index);
let tx = verifiable_tx.tx();
@@ -170,7 +269,7 @@ pub fn calc_ecdsa_signature_hash(
tx: &impl VerifiableTransaction,
input_index: usize,
hash_type: SigHashType,
- reused_values: &mut SigHashReusedValues,
+ reused_values: &impl SigHashReusedValues,
) -> Hash {
let hash = calc_schnorr_signature_hash(tx, input_index, hash_type, reused_values);
let mut hasher = TransactionSigningHashECDSA::new();
@@ -573,9 +672,9 @@ mod tests {
}
}
let populated_tx = PopulatedTransaction::new(&tx, entries);
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
assert_eq!(
- calc_schnorr_signature_hash(&populated_tx, test.input_index, test.hash_type, &mut reused_values).to_string(),
+ calc_schnorr_signature_hash(&populated_tx, test.input_index, test.hash_type, &reused_values).to_string(),
test.expected_hash,
"test {} failed",
test.name
diff --git a/consensus/core/src/muhash.rs b/consensus/core/src/muhash.rs
index 3782f855c0..0286596eba 100644
--- a/consensus/core/src/muhash.rs
+++ b/consensus/core/src/muhash.rs
@@ -8,6 +8,8 @@ use kaspa_muhash::MuHash;
pub trait MuHashExtensions {
fn add_transaction(&mut self, tx: &impl VerifiableTransaction, block_daa_score: u64);
fn add_utxo(&mut self, outpoint: &TransactionOutpoint, entry: &UtxoEntry);
+ fn from_transaction(tx: &impl VerifiableTransaction, block_daa_score: u64) -> Self;
+ fn from_utxo(outpoint: &TransactionOutpoint, entry: &UtxoEntry) -> Self;
}
impl MuHashExtensions for MuHash {
@@ -30,6 +32,18 @@ impl MuHashExtensions for MuHash {
write_utxo(&mut writer, entry, outpoint);
writer.finalize();
}
+
+ fn from_transaction(tx: &impl VerifiableTransaction, block_daa_score: u64) -> Self {
+ let mut mh = Self::new();
+ mh.add_transaction(tx, block_daa_score);
+ mh
+ }
+
+ fn from_utxo(outpoint: &TransactionOutpoint, entry: &UtxoEntry) -> Self {
+ let mut mh = Self::new();
+ mh.add_utxo(outpoint, entry);
+ mh
+ }
}
fn write_utxo(writer: &mut impl HasherBase, entry: &UtxoEntry, outpoint: &TransactionOutpoint) {
diff --git a/consensus/core/src/sign.rs b/consensus/core/src/sign.rs
index a40b949e35..1a87d03f17 100644
--- a/consensus/core/src/sign.rs
+++ b/consensus/core/src/sign.rs
@@ -1,6 +1,6 @@
use crate::{
hashing::{
- sighash::{calc_schnorr_signature_hash, SigHashReusedValues},
+ sighash::{calc_schnorr_signature_hash, SigHashReusedValuesUnsync},
sighash_type::{SigHashType, SIG_HASH_ALL},
},
tx::{SignableTransaction, VerifiableTransaction},
@@ -84,9 +84,9 @@ pub fn sign(mut signable_tx: SignableTransaction, schnorr_key: secp256k1::Keypai
signable_tx.tx.inputs[i].sig_op_count = 1;
}
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
for i in 0..signable_tx.tx.inputs.len() {
- let sig_hash = calc_schnorr_signature_hash(&signable_tx.as_verifiable(), i, SIG_HASH_ALL, &mut reused_values);
+ let sig_hash = calc_schnorr_signature_hash(&signable_tx.as_verifiable(), i, SIG_HASH_ALL, &reused_values);
let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap();
let sig: [u8; 64] = *schnorr_key.sign_schnorr(msg).as_ref();
// This represents OP_DATA_65 (since signature length is 64 bytes and SIGHASH_TYPE is one byte)
@@ -106,11 +106,11 @@ pub fn sign_with_multiple(mut mutable_tx: SignableTransaction, privkeys: Vec<[u8
mutable_tx.tx.inputs[i].sig_op_count = 1;
}
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
for i in 0..mutable_tx.tx.inputs.len() {
let script = mutable_tx.entries[i].as_ref().unwrap().script_public_key.script();
if let Some(schnorr_key) = map.get(script) {
- let sig_hash = calc_schnorr_signature_hash(&mutable_tx.as_verifiable(), i, SIG_HASH_ALL, &mut reused_values);
+ let sig_hash = calc_schnorr_signature_hash(&mutable_tx.as_verifiable(), i, SIG_HASH_ALL, &reused_values);
let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap();
let sig: [u8; 64] = *schnorr_key.sign_schnorr(msg).as_ref();
// This represents OP_DATA_65 (since signature length is 64 bytes and SIGHASH_TYPE is one byte)
@@ -132,12 +132,12 @@ pub fn sign_with_multiple_v2(mut mutable_tx: SignableTransaction, privkeys: &[[u
map.insert(script_pub_key_script, schnorr_key);
}
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
let mut additional_signatures_required = false;
for i in 0..mutable_tx.tx.inputs.len() {
let script = mutable_tx.entries[i].as_ref().unwrap().script_public_key.script();
if let Some(schnorr_key) = map.get(script) {
- let sig_hash = calc_schnorr_signature_hash(&mutable_tx.as_verifiable(), i, SIG_HASH_ALL, &mut reused_values);
+ let sig_hash = calc_schnorr_signature_hash(&mutable_tx.as_verifiable(), i, SIG_HASH_ALL, &reused_values);
let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap();
let sig: [u8; 64] = *schnorr_key.sign_schnorr(msg).as_ref();
// This represents OP_DATA_65 (since signature length is 64 bytes and SIGHASH_TYPE is one byte)
@@ -155,9 +155,9 @@ pub fn sign_with_multiple_v2(mut mutable_tx: SignableTransaction, privkeys: &[[u
/// Sign a transaction input with a sighash_type using schnorr
pub fn sign_input(tx: &impl VerifiableTransaction, input_index: usize, private_key: &[u8; 32], hash_type: SigHashType) -> Vec {
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
- let hash = calc_schnorr_signature_hash(tx, input_index, hash_type, &mut reused_values);
+ let hash = calc_schnorr_signature_hash(tx, input_index, hash_type, &reused_values);
let msg = secp256k1::Message::from_digest_slice(hash.as_bytes().as_slice()).unwrap();
let schnorr_key = secp256k1::Keypair::from_seckey_slice(secp256k1::SECP256K1, private_key).unwrap();
let sig: [u8; 64] = *schnorr_key.sign_schnorr(msg).as_ref();
@@ -167,7 +167,7 @@ pub fn sign_input(tx: &impl VerifiableTransaction, input_index: usize, private_k
}
pub fn verify(tx: &impl VerifiableTransaction) -> Result<(), Error> {
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
for (i, (input, entry)) in tx.populated_inputs().enumerate() {
if input.signature_script.is_empty() {
return Err(Error::Message(format!("Signature is empty for input: {i}")));
@@ -175,7 +175,7 @@ pub fn verify(tx: &impl VerifiableTransaction) -> Result<(), Error> {
let pk = &entry.script_public_key.script()[1..33];
let pk = secp256k1::XOnlyPublicKey::from_slice(pk)?;
let sig = secp256k1::schnorr::Signature::from_slice(&input.signature_script[1..65])?;
- let sig_hash = calc_schnorr_signature_hash(tx, i, SIG_HASH_ALL, &mut reused_values);
+ let sig_hash = calc_schnorr_signature_hash(tx, i, SIG_HASH_ALL, &reused_values);
let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice())?;
sig.verify(&msg, &pk)?;
}
diff --git a/consensus/src/consensus/mod.rs b/consensus/src/consensus/mod.rs
index 69b7b6d943..5989f62ef5 100644
--- a/consensus/src/consensus/mod.rs
+++ b/consensus/src/consensus/mod.rs
@@ -83,6 +83,7 @@ use kaspa_database::prelude::StoreResultExtensions;
use kaspa_hashes::Hash;
use kaspa_muhash::MuHash;
use kaspa_txscript::caches::TxScriptCacheCounters;
+use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
use std::{
cmp::Reverse,
@@ -777,9 +778,15 @@ impl ConsensusApi for Consensus {
fn append_imported_pruning_point_utxos(&self, utxoset_chunk: &[(TransactionOutpoint, UtxoEntry)], current_multiset: &mut MuHash) {
let mut pruning_utxoset_write = self.pruning_utxoset_stores.write();
pruning_utxoset_write.utxo_set.write_many(utxoset_chunk).unwrap();
- for (outpoint, entry) in utxoset_chunk {
- current_multiset.add_utxo(outpoint, entry);
- }
+
+ // Parallelize processing
+ let inner_multiset =
+ utxoset_chunk.par_iter().map(|(outpoint, entry)| MuHash::from_utxo(outpoint, entry)).reduce(MuHash::new, |mut a, b| {
+ a.combine(&b);
+ a
+ });
+
+ current_multiset.combine(&inner_multiset);
}
fn import_pruning_point_utxo_set(&self, new_pruning_point: Hash, imported_utxo_multiset: MuHash) -> PruningImportResult<()> {
diff --git a/consensus/src/pipeline/virtual_processor/processor.rs b/consensus/src/pipeline/virtual_processor/processor.rs
index 9ea1827bad..5238aa0759 100644
--- a/consensus/src/pipeline/virtual_processor/processor.rs
+++ b/consensus/src/pipeline/virtual_processor/processor.rs
@@ -781,7 +781,10 @@ impl VirtualStateProcessor {
let virtual_utxo_view = &virtual_read.utxo_set;
let virtual_daa_score = virtual_state.daa_score;
let virtual_past_median_time = virtual_state.past_median_time;
- self.validate_mempool_transaction_impl(mutable_tx, virtual_utxo_view, virtual_daa_score, virtual_past_median_time, args)
+ // Run within the thread pool since par_iter might be internally applied to inputs
+ self.thread_pool.install(|| {
+ self.validate_mempool_transaction_impl(mutable_tx, virtual_utxo_view, virtual_daa_score, virtual_past_median_time, args)
+ })
}
pub fn validate_mempool_transactions_in_parallel(
diff --git a/consensus/src/pipeline/virtual_processor/utxo_validation.rs b/consensus/src/pipeline/virtual_processor/utxo_validation.rs
index 306f81446c..6516888188 100644
--- a/consensus/src/pipeline/virtual_processor/utxo_validation.rs
+++ b/consensus/src/pipeline/virtual_processor/utxo_validation.rs
@@ -31,6 +31,7 @@ use kaspa_muhash::MuHash;
use kaspa_utils::refs::Refs;
use rayon::prelude::*;
+use smallvec::{smallvec, SmallVec};
use std::{iter::once, ops::Deref};
/// A context for processing the UTXO state of a block with respect to its selected parent.
@@ -95,12 +96,14 @@ impl VirtualStateProcessor {
// No need to fully validate selected parent transactions since selected parent txs were already validated
// as part of selected parent UTXO state verification with the exact same UTXO context.
let validation_flags = if is_selected_parent { TxValidationFlags::SkipScriptChecks } else { TxValidationFlags::Full };
- let validated_transactions = self.validate_transactions_in_parallel(&txs, &composed_view, pov_daa_score, validation_flags);
+ let (validated_transactions, inner_multiset) =
+ self.validate_transactions_with_muhash_in_parallel(&txs, &composed_view, pov_daa_score, validation_flags);
+
+ ctx.multiset_hash.combine(&inner_multiset);
let mut block_fee = 0u64;
for (validated_tx, _) in validated_transactions.iter() {
ctx.mergeset_diff.add_transaction(validated_tx, pov_daa_score).unwrap();
- ctx.multiset_hash.add_transaction(validated_tx, pov_daa_score);
ctx.accepted_tx_ids.push(validated_tx.id());
block_fee += validated_tx.calculated_fee;
}
@@ -229,6 +232,37 @@ impl VirtualStateProcessor {
})
}
+ /// Same as validate_transactions_in_parallel except during the iteration this will also
+ /// calculate the muhash in parallel for valid transactions
+ pub(crate) fn validate_transactions_with_muhash_in_parallel<'a, V: UtxoView + Sync>(
+ &self,
+ txs: &'a Vec,
+ utxo_view: &V,
+ pov_daa_score: u64,
+ flags: TxValidationFlags,
+ ) -> (SmallVec<[(ValidatedTransaction<'a>, u32); 2]>, MuHash) {
+ self.thread_pool.install(|| {
+ txs
+ .par_iter() // We can do this in parallel without complications since block body validation already ensured
+ // that all txs within each block are independent
+ .enumerate()
+ .skip(1) // Skip the coinbase tx.
+ .filter_map(|(i, tx)| self.validate_transaction_in_utxo_context(tx, &utxo_view, pov_daa_score, flags).ok().map(|vtx| {
+ let mh = MuHash::from_transaction(&vtx, pov_daa_score);
+ (smallvec![(vtx, i as u32)], mh)
+ }
+ ))
+ .reduce(
+ || (smallvec![], MuHash::new()),
+ |mut a, mut b| {
+ a.0.append(&mut b.0);
+ a.1.combine(&b.1);
+ a
+ },
+ )
+ })
+ }
+
/// Attempts to populate the transaction with UTXO entries and performs all utxo-related tx validations
pub(super) fn validate_transaction_in_utxo_context<'a>(
&self,
@@ -318,3 +352,60 @@ impl VirtualStateProcessor {
Ok(())
}
}
+
+#[cfg(test)]
+mod tests {
+ use itertools::Itertools;
+
+ use super::*;
+
+ #[test]
+ fn test_rayon_reduce_retains_order() {
+ // this is an independent test to replicate the behavior of
+ // validate_txs_in_parallel and validate_txs_with_muhash_in_parallel
+ // and assert that the order of data is retained when doing par_iter
+ let data: Vec = (1..=1000).collect();
+
+ let collected: Vec = data
+ .par_iter()
+ .filter_map(|a| {
+ let chance: f64 = rand::random();
+ if chance < 0.05 {
+ return None;
+ }
+ Some(*a)
+ })
+ .collect();
+
+ println!("collected len: {}", collected.len());
+
+ collected.iter().tuple_windows().for_each(|(prev, curr)| {
+ // Data was originally sorted, so we check if they remain sorted after filtering
+ assert!(prev < curr, "expected {} < {} if original sort was preserved", prev, curr);
+ });
+
+ let reduced: SmallVec<[u16; 2]> = data
+ .par_iter()
+ .filter_map(|a: &u16| {
+ let chance: f64 = rand::random();
+ if chance < 0.05 {
+ return None;
+ }
+ Some(smallvec![*a])
+ })
+ .reduce(
+ || smallvec![],
+ |mut arr, mut curr_data| {
+ arr.append(&mut curr_data);
+ arr
+ },
+ );
+
+ println!("reduced len: {}", reduced.len());
+
+ reduced.iter().tuple_windows().for_each(|(prev, curr)| {
+ // Data was originally sorted, so we check if they remain sorted after filtering
+ assert!(prev < curr, "expected {} < {} if original sort was preserved", prev, curr);
+ });
+ }
+}
diff --git a/consensus/src/processes/transaction_validator/transaction_validator_populated.rs b/consensus/src/processes/transaction_validator/transaction_validator_populated.rs
index 4a8733d2be..dbf1aa37ea 100644
--- a/consensus/src/processes/transaction_validator/transaction_validator_populated.rs
+++ b/consensus/src/processes/transaction_validator/transaction_validator_populated.rs
@@ -1,18 +1,24 @@
use crate::constants::{MAX_SOMPI, SEQUENCE_LOCK_TIME_DISABLED, SEQUENCE_LOCK_TIME_MASK};
use kaspa_consensus_core::{
- hashing::sighash::SigHashReusedValues,
+ hashing::sighash::{SigHashReusedValuesSync, SigHashReusedValuesUnsync},
mass::Kip9Version,
tx::{TransactionInput, VerifiableTransaction},
};
use kaspa_core::warn;
-use kaspa_txscript::{get_sig_op_count, TxScriptEngine};
+use kaspa_txscript::{caches::Cache, get_sig_op_count, SigCacheKey, TxScriptEngine};
use kaspa_txscript_errors::TxScriptError;
+use rayon::iter::{IntoParallelIterator, ParallelIterator};
+use rayon::ThreadPool;
+use std::marker::Sync;
use super::{
errors::{TxResult, TxRuleError},
TransactionValidator,
};
+/// The threshold above which we apply parallelism to input script processing
+const CHECK_SCRIPTS_PARALLELISM_THRESHOLD: usize = 1;
+
#[derive(Clone, Copy, PartialEq, Eq)]
pub enum TxValidationFlags {
/// Perform full validation including script verification
@@ -29,7 +35,7 @@ pub enum TxValidationFlags {
impl TransactionValidator {
pub fn validate_populated_transaction_and_get_fee(
&self,
- tx: &impl VerifiableTransaction,
+ tx: &(impl VerifiableTransaction + Sync),
pov_daa_score: u64,
flags: TxValidationFlags,
mass_and_feerate_threshold: Option<(u64, f64)>,
@@ -48,8 +54,8 @@ impl TransactionValidator {
}
Self::check_sequence_lock(tx, pov_daa_score)?;
- // The following call is not a consensus check (it could not be one in the first place since it uses floating number)
- // but rather a mempool Replace by Fee validation rule. It was placed here purposely for avoiding unneeded script checks.
+ // The following call is not a consensus check (it could not be one in the first place since it uses a floating number)
+ // but rather a mempool Replace by Fee validation rule. It is placed here purposely for avoiding unneeded script checks.
Self::check_feerate_threshold(fee, mass_and_feerate_threshold)?;
match flags {
@@ -158,7 +164,7 @@ impl TransactionValidator {
fn check_sig_op_counts(tx: &T) -> TxResult<()> {
for (i, (input, entry)) in tx.populated_inputs().enumerate() {
- let calculated = get_sig_op_count::(&input.signature_script, &entry.script_public_key);
+ let calculated = get_sig_op_count::(&input.signature_script, &entry.script_public_key);
if calculated != input.sig_op_count as u64 {
return Err(TxRuleError::WrongSigOpCount(i, input.sig_op_count as u64, calculated));
}
@@ -166,16 +172,45 @@ impl TransactionValidator {
Ok(())
}
- pub fn check_scripts(&self, tx: &impl VerifiableTransaction) -> TxResult<()> {
- let mut reused_values = SigHashReusedValues::new();
- for (i, (input, entry)) in tx.populated_inputs().enumerate() {
- let mut engine = TxScriptEngine::from_transaction_input(tx, input, i, entry, &mut reused_values, &self.sig_cache)
- .map_err(|err| map_script_err(err, input))?;
- engine.execute().map_err(|err| map_script_err(err, input))?;
- }
+ pub fn check_scripts(&self, tx: &(impl VerifiableTransaction + Sync)) -> TxResult<()> {
+ check_scripts(&self.sig_cache, tx)
+ }
+}
- Ok(())
+pub fn check_scripts(sig_cache: &Cache, tx: &(impl VerifiableTransaction + Sync)) -> TxResult<()> {
+ if tx.inputs().len() > CHECK_SCRIPTS_PARALLELISM_THRESHOLD {
+ check_scripts_par_iter(sig_cache, tx)
+ } else {
+ check_scripts_sequential(sig_cache, tx)
+ }
+}
+
+pub fn check_scripts_sequential(sig_cache: &Cache, tx: &impl VerifiableTransaction) -> TxResult<()> {
+ let reused_values = SigHashReusedValuesUnsync::new();
+ for (i, (input, entry)) in tx.populated_inputs().enumerate() {
+ TxScriptEngine::from_transaction_input(tx, input, i, entry, &reused_values, sig_cache)
+ .and_then(|mut e| e.execute())
+ .map_err(|err| map_script_err(err, input))?;
}
+ Ok(())
+}
+
+pub fn check_scripts_par_iter(sig_cache: &Cache, tx: &(impl VerifiableTransaction + Sync)) -> TxResult<()> {
+ let reused_values = SigHashReusedValuesSync::new();
+ (0..tx.inputs().len()).into_par_iter().try_for_each(|idx| {
+ let (input, utxo) = tx.populated_input(idx);
+ TxScriptEngine::from_transaction_input(tx, input, idx, utxo, &reused_values, sig_cache)
+ .and_then(|mut e| e.execute())
+ .map_err(|err| map_script_err(err, input))
+ })
+}
+
+pub fn check_scripts_par_iter_pool(
+ sig_cache: &Cache,
+ tx: &(impl VerifiableTransaction + Sync),
+ pool: &ThreadPool,
+) -> TxResult<()> {
+ pool.install(|| check_scripts_par_iter(sig_cache, tx))
}
fn map_script_err(script_err: TxScriptError, input: &TransactionInput) -> TxRuleError {
@@ -189,6 +224,7 @@ fn map_script_err(script_err: TxScriptError, input: &TransactionInput) -> TxRule
#[cfg(test)]
mod tests {
use super::super::errors::TxRuleError;
+ use super::CHECK_SCRIPTS_PARALLELISM_THRESHOLD;
use core::str::FromStr;
use itertools::Itertools;
use kaspa_consensus_core::sign::sign;
@@ -202,6 +238,15 @@ mod tests {
use crate::{params::MAINNET_PARAMS, processes::transaction_validator::TransactionValidator};
+ /// Helper function to duplicate the last input
+ fn duplicate_input(tx: &Transaction, entries: &[UtxoEntry]) -> (Transaction, Vec) {
+ let mut tx2 = tx.clone();
+ let mut entries2 = entries.to_owned();
+ tx2.inputs.push(tx2.inputs.last().unwrap().clone());
+ entries2.push(entries2.last().unwrap().clone());
+ (tx2, entries2)
+ }
+
#[test]
fn check_signature_test() {
let mut params = MAINNET_PARAMS.clone();
@@ -261,6 +306,14 @@ mod tests {
);
tv.check_scripts(&populated_tx).expect("Signature check failed");
+
+ // Test a tx with 2 inputs to cover parallelism split points in inner script checking code
+ let (tx2, entries2) = duplicate_input(&tx, &populated_tx.entries);
+ // Duplicated sigs should fail due to wrong sighash
+ assert_eq!(
+ tv.check_scripts(&PopulatedTransaction::new(&tx2, entries2)),
+ Err(TxRuleError::SignatureInvalid(TxScriptError::EvalFalse))
+ );
}
#[test]
@@ -322,7 +375,18 @@ mod tests {
}],
);
- assert!(tv.check_scripts(&populated_tx).is_err(), "Failing Signature Test Failed");
+ assert!(tv.check_scripts(&populated_tx).is_err(), "Expecting signature check to fail");
+
+ // Test a tx with 2 inputs to cover parallelism split points in inner script checking code
+ let (tx2, entries2) = duplicate_input(&tx, &populated_tx.entries);
+ tv.check_scripts(&PopulatedTransaction::new(&tx2, entries2)).expect_err("Expecting signature check to fail");
+
+ // Verify we are correctly testing the parallelism case (applied here as sanity for all tests)
+ assert!(
+ tx2.inputs.len() > CHECK_SCRIPTS_PARALLELISM_THRESHOLD,
+ "The script tests must cover the case of a tx with inputs.len() > {}",
+ CHECK_SCRIPTS_PARALLELISM_THRESHOLD
+ );
}
#[test]
@@ -385,6 +449,14 @@ mod tests {
}],
);
tv.check_scripts(&populated_tx).expect("Signature check failed");
+
+ // Test a tx with 2 inputs to cover parallelism split points in inner script checking code
+ let (tx2, entries2) = duplicate_input(&tx, &populated_tx.entries);
+ // Duplicated sigs should fail due to wrong sighash
+ assert_eq!(
+ tv.check_scripts(&PopulatedTransaction::new(&tx2, entries2)),
+ Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail))
+ );
}
#[test]
@@ -447,7 +519,14 @@ mod tests {
}],
);
- assert!(tv.check_scripts(&populated_tx) == Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail)));
+ assert_eq!(tv.check_scripts(&populated_tx), Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail)));
+
+ // Test a tx with 2 inputs to cover parallelism split points in inner script checking code
+ let (tx2, entries2) = duplicate_input(&tx, &populated_tx.entries);
+ assert_eq!(
+ tv.check_scripts(&PopulatedTransaction::new(&tx2, entries2)),
+ Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail))
+ );
}
#[test]
@@ -510,7 +589,14 @@ mod tests {
}],
);
- assert!(tv.check_scripts(&populated_tx) == Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail)));
+ assert_eq!(tv.check_scripts(&populated_tx), Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail)));
+
+ // Test a tx with 2 inputs to cover parallelism split points in inner script checking code
+ let (tx2, entries2) = duplicate_input(&tx, &populated_tx.entries);
+ assert_eq!(
+ tv.check_scripts(&PopulatedTransaction::new(&tx2, entries2)),
+ Err(TxRuleError::SignatureInvalid(TxScriptError::NullFail))
+ );
}
#[test]
@@ -573,8 +659,14 @@ mod tests {
}],
);
- let result = tv.check_scripts(&populated_tx);
- assert!(result == Err(TxRuleError::SignatureInvalid(TxScriptError::EvalFalse)));
+ assert_eq!(tv.check_scripts(&populated_tx), Err(TxRuleError::SignatureInvalid(TxScriptError::EvalFalse)));
+
+ // Test a tx with 2 inputs to cover parallelism split points in inner script checking code
+ let (tx2, entries2) = duplicate_input(&tx, &populated_tx.entries);
+ assert_eq!(
+ tv.check_scripts(&PopulatedTransaction::new(&tx2, entries2)),
+ Err(TxRuleError::SignatureInvalid(TxScriptError::EvalFalse))
+ );
}
#[test]
@@ -628,8 +720,14 @@ mod tests {
}],
);
- let result = tv.check_scripts(&populated_tx);
- assert!(result == Err(TxRuleError::SignatureInvalid(TxScriptError::SignatureScriptNotPushOnly)));
+ assert_eq!(tv.check_scripts(&populated_tx), Err(TxRuleError::SignatureInvalid(TxScriptError::SignatureScriptNotPushOnly)));
+
+ // Test a tx with 2 inputs to cover parallelism split points in inner script checking code
+ let (tx2, entries2) = duplicate_input(&tx, &populated_tx.entries);
+ assert_eq!(
+ tv.check_scripts(&PopulatedTransaction::new(&tx2, entries2)),
+ Err(TxRuleError::SignatureInvalid(TxScriptError::SignatureScriptNotPushOnly))
+ );
}
#[test]
diff --git a/consensus/wasm/src/utils.rs b/consensus/wasm/src/utils.rs
index 0139b573f5..b70664e1e6 100644
--- a/consensus/wasm/src/utils.rs
+++ b/consensus/wasm/src/utils.rs
@@ -1,5 +1,5 @@
use crate::result::Result;
-use kaspa_consensus_core::hashing::sighash::{calc_schnorr_signature_hash, SigHashReusedValues};
+use kaspa_consensus_core::hashing::sighash::{calc_schnorr_signature_hash, SigHashReusedValuesUnsync};
use kaspa_consensus_core::hashing::sighash_type::SIG_HASH_ALL;
use kaspa_consensus_core::tx;
@@ -9,9 +9,9 @@ pub fn script_hashes(mut mutable_tx: tx::SignableTransaction) -> Result Option {
self.map.read().get(key).cloned().inspect(|_data| {
self.counters.get_counts.fetch_add(1, Ordering::Relaxed);
diff --git a/crypto/txscript/src/lib.rs b/crypto/txscript/src/lib.rs
index b145fb90e5..f177962721 100644
--- a/crypto/txscript/src/lib.rs
+++ b/crypto/txscript/src/lib.rs
@@ -45,6 +45,8 @@ pub const MAX_PUB_KEYS_PER_MUTLTISIG: i32 = 20;
// Note that this includes OP_RESERVED which counts as a push operation.
pub const NO_COST_OPCODE: u8 = 0x60;
+type DynOpcodeImplementation = Box>;
+
#[derive(Clone, Hash, PartialEq, Eq)]
enum Signature {
Secp256k1(secp256k1::schnorr::Signature),
@@ -70,15 +72,14 @@ enum ScriptSource<'a, T: VerifiableTransaction> {
StandAloneScripts(Vec<&'a [u8]>),
}
-pub struct TxScriptEngine<'a, T: VerifiableTransaction> {
+pub struct TxScriptEngine<'a, T: VerifiableTransaction, Reused: SigHashReusedValues> {
dstack: Stack,
astack: Stack,
script_source: ScriptSource<'a, T>,
// Outer caches for quicker calculation
- // TODO:: make it compatible with threading
- reused_values: &'a mut SigHashReusedValues,
+ reused_values: &'a Reused,
sig_cache: &'a Cache,
cond_stack: Vec, // Following if stacks, and whether it is running
@@ -86,30 +87,35 @@ pub struct TxScriptEngine<'a, T: VerifiableTransaction> {
num_ops: i32,
}
-fn parse_script(
+fn parse_script(
script: &[u8],
-) -> impl Iterator- >, TxScriptError>> + '_ {
+) -> impl Iterator
- , TxScriptError>> + '_ {
script.iter().batching(|it| deserialize_next_opcode(it))
}
-pub fn get_sig_op_count(signature_script: &[u8], prev_script_public_key: &ScriptPublicKey) -> u64 {
+pub fn get_sig_op_count(
+ signature_script: &[u8],
+ prev_script_public_key: &ScriptPublicKey,
+) -> u64 {
let is_p2sh = ScriptClass::is_pay_to_script_hash(prev_script_public_key.script());
- let script_pub_key_ops = parse_script::(prev_script_public_key.script()).collect_vec();
+ let script_pub_key_ops = parse_script::(prev_script_public_key.script()).collect_vec();
if !is_p2sh {
return get_sig_op_count_by_opcodes(&script_pub_key_ops);
}
- let signature_script_ops = parse_script::(signature_script).collect_vec();
+ let signature_script_ops = parse_script::(signature_script).collect_vec();
if signature_script_ops.is_empty() || signature_script_ops.iter().any(|op| op.is_err() || !op.as_ref().unwrap().is_push_opcode()) {
return 0;
}
let p2sh_script = signature_script_ops.last().expect("checked if empty above").as_ref().expect("checked if err above").get_data();
- let p2sh_ops = parse_script::(p2sh_script).collect_vec();
+ let p2sh_ops = parse_script::(p2sh_script).collect_vec();
get_sig_op_count_by_opcodes(&p2sh_ops)
}
-fn get_sig_op_count_by_opcodes(opcodes: &[Result>, TxScriptError>]) -> u64 {
+fn get_sig_op_count_by_opcodes(
+ opcodes: &[Result, TxScriptError>],
+) -> u64 {
// TODO: Check for overflows
let mut num_sigs: u64 = 0;
for (i, op) in opcodes.iter().enumerate() {
@@ -142,12 +148,12 @@ fn get_sig_op_count_by_opcodes(opcodes: &[Result(script: &[u8]) -> bool {
- parse_script::(script).enumerate().any(|(index, op)| op.is_err() || (index == 0 && op.unwrap().value() == OpReturn))
+pub fn is_unspendable(script: &[u8]) -> bool {
+ parse_script::(script).enumerate().any(|(index, op)| op.is_err() || (index == 0 && op.unwrap().value() == OpReturn))
}
-impl<'a, T: VerifiableTransaction> TxScriptEngine<'a, T> {
- pub fn new(reused_values: &'a mut SigHashReusedValues, sig_cache: &'a Cache) -> Self {
+impl<'a, T: VerifiableTransaction, Reused: SigHashReusedValues> TxScriptEngine<'a, T, Reused> {
+ pub fn new(reused_values: &'a Reused, sig_cache: &'a Cache) -> Self {
Self {
dstack: vec![],
astack: vec![],
@@ -164,7 +170,7 @@ impl<'a, T: VerifiableTransaction> TxScriptEngine<'a, T> {
input: &'a TransactionInput,
input_idx: usize,
utxo_entry: &'a UtxoEntry,
- reused_values: &'a mut SigHashReusedValues,
+ reused_values: &'a Reused,
sig_cache: &'a Cache,
) -> Result {
let script_public_key = utxo_entry.script_public_key.script();
@@ -185,7 +191,7 @@ impl<'a, T: VerifiableTransaction> TxScriptEngine<'a, T> {
}
}
- pub fn from_script(script: &'a [u8], reused_values: &'a mut SigHashReusedValues, sig_cache: &'a Cache) -> Self {
+ pub fn from_script(script: &'a [u8], reused_values: &'a Reused, sig_cache: &'a Cache) -> Self {
Self {
dstack: Default::default(),
astack: Default::default(),
@@ -202,7 +208,7 @@ impl<'a, T: VerifiableTransaction> TxScriptEngine<'a, T> {
return self.cond_stack.is_empty() || *self.cond_stack.last().expect("Checked not empty") == OpCond::True;
}
- fn execute_opcode(&mut self, opcode: Box>) -> Result<(), TxScriptError> {
+ fn execute_opcode(&mut self, opcode: DynOpcodeImplementation) -> Result<(), TxScriptError> {
// Different from kaspad: Illegal and disabled opcode are checked on execute instead
// Note that this includes OP_RESERVED which counts as a push operation.
if !opcode.is_push_opcode() {
@@ -512,6 +518,7 @@ mod tests {
use crate::opcodes::codes::{OpBlake2b, OpCheckSig, OpData1, OpData2, OpData32, OpDup, OpEqual, OpPushData1, OpTrue};
use super::*;
+ use kaspa_consensus_core::hashing::sighash::SigHashReusedValuesUnsync;
use kaspa_consensus_core::tx::{
PopulatedTransaction, ScriptPublicKey, Transaction, TransactionId, TransactionOutpoint, TransactionOutput,
};
@@ -542,7 +549,7 @@ mod tests {
fn run_test_script_cases(test_cases: Vec) {
let sig_cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
for test in test_cases {
// Ensure encapsulation of variables (no leaking between tests)
@@ -565,7 +572,7 @@ mod tests {
let populated_tx = PopulatedTransaction::new(&tx, vec![utxo_entry.clone()]);
- let mut vm = TxScriptEngine::from_transaction_input(&populated_tx, &input, 0, &utxo_entry, &mut reused_values, &sig_cache)
+ let mut vm = TxScriptEngine::from_transaction_input(&populated_tx, &input, 0, &utxo_entry, &reused_values, &sig_cache)
.expect("Script creation failed");
assert_eq!(vm.execute(), test.expected_result);
}
@@ -783,7 +790,7 @@ mod tests {
];
for test in test_cases {
- let check = TxScriptEngine::::check_pub_key_encoding(test.key);
+ let check = TxScriptEngine::::check_pub_key_encoding(test.key);
if test.is_valid {
assert_eq!(
check,
@@ -880,7 +887,10 @@ mod tests {
for test in tests {
assert_eq!(
- get_sig_op_count::(test.signature_script, &test.prev_script_public_key),
+ get_sig_op_count::(
+ test.signature_script,
+ &test.prev_script_public_key
+ ),
test.expected_sig_ops,
"failed for '{}'",
test.name
@@ -909,7 +919,7 @@ mod tests {
for test in tests {
assert_eq!(
- is_unspendable::(test.script_public_key),
+ is_unspendable::(test.script_public_key),
test.expected,
"failed for '{}'",
test.name
@@ -929,6 +939,7 @@ mod bitcoind_tests {
use super::*;
use crate::script_builder::ScriptBuilderError;
use kaspa_consensus_core::constants::MAX_TX_IN_SEQUENCE_NUM;
+ use kaspa_consensus_core::hashing::sighash::SigHashReusedValuesUnsync;
use kaspa_consensus_core::tx::{
PopulatedTransaction, ScriptPublicKey, Transaction, TransactionId, TransactionOutpoint, TransactionOutput,
};
@@ -1019,13 +1030,13 @@ mod bitcoind_tests {
// Run transaction
let sig_cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
let mut vm = TxScriptEngine::from_transaction_input(
&populated_tx,
&populated_tx.tx().inputs[0],
0,
&populated_tx.entries[0],
- &mut reused_values,
+ &reused_values,
&sig_cache,
)
.map_err(UnifiedError::TxScriptError)?;
diff --git a/crypto/txscript/src/opcodes/macros.rs b/crypto/txscript/src/opcodes/macros.rs
index b3db98829a..c4d161d400 100644
--- a/crypto/txscript/src/opcodes/macros.rs
+++ b/crypto/txscript/src/opcodes/macros.rs
@@ -6,9 +6,9 @@ macro_rules! opcode_serde {
[[self.value()].as_slice(), length.to_le_bytes().as_slice(), self.data.as_slice()].concat()
}
- fn deserialize<'i, I: Iterator
- , T: VerifiableTransaction>(
+ fn deserialize<'i, I: Iterator
- , T: VerifiableTransaction, Reused: SigHashReusedValues>(
it: &mut I,
- ) -> Result>, TxScriptError> {
+ ) -> Result>, TxScriptError> {
match it.take(size_of::<$type>()).copied().collect::>().try_into() {
Ok(bytes) => {
let length = <$type>::from_le_bytes(bytes) as usize;
@@ -32,9 +32,9 @@ macro_rules! opcode_serde {
[[self.value()].as_slice(), self.data.clone().as_slice()].concat()
}
- fn deserialize<'i, I: Iterator
- , T: VerifiableTransaction>(
+ fn deserialize<'i, I: Iterator
- , T: VerifiableTransaction, Reused: SigHashReusedValues>(
it: &mut I,
- ) -> Result>, TxScriptError> {
+ ) -> Result>, TxScriptError> {
// Static length includes the opcode itself
let data: Vec = it.take($length - 1).copied().collect();
Self::new(data)
@@ -44,7 +44,7 @@ macro_rules! opcode_serde {
macro_rules! opcode_init {
($type:ty) => {
- fn new(data: Vec) -> Result>, TxScriptError> {
+ fn new(data: Vec) -> Result>, TxScriptError> {
if data.len() > <$type>::MAX as usize {
return Err(TxScriptError::MalformedPush(<$type>::MAX as usize, data.len()));
}
@@ -52,7 +52,7 @@ macro_rules! opcode_init {
}
};
($length: literal) => {
- fn new(data: Vec) -> Result>, TxScriptError> {
+ fn new(data: Vec) -> Result>, TxScriptError> {
if data.len() != $length - 1 {
return Err(TxScriptError::MalformedPush($length - 1, data.len()));
}
@@ -69,20 +69,20 @@ macro_rules! opcode_impl {
opcode_serde!($length);
}
- impl OpCodeExecution for $name {
- fn empty() -> Result>, TxScriptError> {
+ impl OpCodeExecution for $name {
+ fn empty() -> Result>, TxScriptError> {
Self::new(vec![])
}
opcode_init!($length);
#[allow(unused_variables)]
- fn execute(&$self, $vm: &mut TxScriptEngine) -> OpCodeResult {
+ fn execute(&$self, $vm: &mut TxScriptEngine) -> OpCodeResult {
$code
}
}
- impl OpCodeImplementation for $name {}
+ impl OpCodeImplementation for $name {}
}
}
@@ -111,7 +111,7 @@ macro_rules! opcode_list {
)?
)*
- pub fn deserialize_next_opcode<'i, I: Iterator
- , T: VerifiableTransaction>(it: &mut I) -> Option>, TxScriptError>> {
+ pub fn deserialize_next_opcode<'i, I: Iterator
- , T: VerifiableTransaction, Reused: SigHashReusedValues>(it: &mut I) -> Option>, TxScriptError>> {
match it.next() {
Some(opcode_num) => match opcode_num {
$(
diff --git a/crypto/txscript/src/opcodes/mod.rs b/crypto/txscript/src/opcodes/mod.rs
index ad800d2488..f2a92fa0b5 100644
--- a/crypto/txscript/src/opcodes/mod.rs
+++ b/crypto/txscript/src/opcodes/mod.rs
@@ -8,6 +8,7 @@ use crate::{
};
use blake2b_simd::Params;
use core::cmp::{max, min};
+use kaspa_consensus_core::hashing::sighash::SigHashReusedValues;
use kaspa_consensus_core::hashing::sighash_type::SigHashType;
use kaspa_consensus_core::tx::VerifiableTransaction;
use sha2::{Digest, Sha256};
@@ -73,28 +74,31 @@ pub trait OpCodeMetadata: Debug {
}
}
-pub trait OpCodeExecution {
- fn empty() -> Result>, TxScriptError>
+pub trait OpCodeExecution {
+ fn empty() -> Result>, TxScriptError>
where
Self: Sized;
#[allow(clippy::new_ret_no_self)]
- fn new(data: Vec) -> Result>, TxScriptError>
+ fn new(data: Vec) -> Result>, TxScriptError>
where
Self: Sized;
- fn execute(&self, vm: &mut TxScriptEngine) -> OpCodeResult;
+ fn execute(&self, vm: &mut TxScriptEngine) -> OpCodeResult;
}
pub trait OpcodeSerialization {
fn serialize(&self) -> Vec;
- fn deserialize<'i, I: Iterator
- , T: VerifiableTransaction>(
+ fn deserialize<'i, I: Iterator
- , T: VerifiableTransaction, Reused: SigHashReusedValues>(
it: &mut I,
- ) -> Result>, TxScriptError>
+ ) -> Result>, TxScriptError>
where
Self: Sized;
}
-pub trait OpCodeImplementation: OpCodeExecution + OpCodeMetadata + OpcodeSerialization {}
+pub trait OpCodeImplementation:
+ OpCodeExecution + OpCodeMetadata + OpcodeSerialization
+{
+}
impl OpCodeMetadata for OpCode
{
fn value(&self) -> u8 {
@@ -193,13 +197,19 @@ impl OpCodeMetadata for OpCode {
// Helpers for some opcodes with shared data
#[inline]
-fn push_data(data: Vec, vm: &mut TxScriptEngine) -> OpCodeResult {
+fn push_data(
+ data: Vec,
+ vm: &mut TxScriptEngine,
+) -> OpCodeResult {
vm.dstack.push(data);
Ok(())
}
#[inline]
-fn push_number(number: i64, vm: &mut TxScriptEngine) -> OpCodeResult {
+fn push_number(
+ number: i64,
+ vm: &mut TxScriptEngine,
+) -> OpCodeResult {
vm.dstack.push_item(number);
Ok(())
}
@@ -958,7 +968,7 @@ opcode_list! {
// converts an opcode from the list of Op0 to Op16 to its associated value
#[allow(clippy::borrowed_box)]
-pub fn to_small_int(opcode: &Box>) -> u8 {
+pub fn to_small_int(opcode: &Box>) -> u8 {
let value = opcode.value();
if value == codes::OpFalse {
return 0;
@@ -976,7 +986,7 @@ mod test {
use crate::{opcodes, pay_to_address_script, TxScriptEngine, TxScriptError, LOCK_TIME_THRESHOLD};
use kaspa_addresses::{Address, Prefix, Version};
use kaspa_consensus_core::constants::{SOMPI_PER_KASPA, TX_VERSION};
- use kaspa_consensus_core::hashing::sighash::SigHashReusedValues;
+ use kaspa_consensus_core::hashing::sighash::SigHashReusedValuesUnsync;
use kaspa_consensus_core::subnets::SUBNETWORK_ID_NATIVE;
use kaspa_consensus_core::tx::{
PopulatedTransaction, ScriptPublicKey, Transaction, TransactionInput, TransactionOutpoint, TransactionOutput, UtxoEntry,
@@ -985,21 +995,21 @@ mod test {
struct TestCase<'a> {
init: Stack,
- code: Box>>,
+ code: Box, SigHashReusedValuesUnsync>>,
dstack: Stack,
}
struct ErrorTestCase<'a> {
init: Stack,
- code: Box>>,
+ code: Box, SigHashReusedValuesUnsync>>,
error: TxScriptError,
}
fn run_success_test_cases(tests: Vec) {
let cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
for TestCase { init, code, dstack } in tests {
- let mut vm = TxScriptEngine::new(&mut reused_values, &cache);
+ let mut vm = TxScriptEngine::new(&reused_values, &cache);
vm.dstack = init;
code.execute(&mut vm).unwrap_or_else(|_| panic!("Opcode {} should not fail", code.value()));
assert_eq!(*vm.dstack, dstack, "OpCode {} Pushed wrong value", code.value());
@@ -1008,9 +1018,9 @@ mod test {
fn run_error_test_cases(tests: Vec) {
let cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
for ErrorTestCase { init, code, error } in tests {
- let mut vm = TxScriptEngine::new(&mut reused_values, &cache);
+ let mut vm = TxScriptEngine::new(&reused_values, &cache);
vm.dstack.clone_from(&init);
assert_eq!(
code.execute(&mut vm)
@@ -1025,7 +1035,7 @@ mod test {
#[test]
fn test_opcode_disabled() {
- let tests: Vec>> = vec![
+ let tests: Vec>> = vec![
opcodes::OpCat::empty().expect("Should accept empty"),
opcodes::OpSubStr::empty().expect("Should accept empty"),
opcodes::OpLeft::empty().expect("Should accept empty"),
@@ -1044,8 +1054,8 @@ mod test {
];
let cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
- let mut vm = TxScriptEngine::new(&mut reused_values, &cache);
+ let reused_values = SigHashReusedValuesUnsync::new();
+ let mut vm = TxScriptEngine::new(&reused_values, &cache);
for pop in tests {
match pop.execute(&mut vm) {
@@ -1057,7 +1067,7 @@ mod test {
#[test]
fn test_opcode_reserved() {
- let tests: Vec>> = vec![
+ let tests: Vec>> = vec![
opcodes::OpReserved::empty().expect("Should accept empty"),
opcodes::OpVer::empty().expect("Should accept empty"),
opcodes::OpVerIf::empty().expect("Should accept empty"),
@@ -1067,8 +1077,8 @@ mod test {
];
let cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
- let mut vm = TxScriptEngine::new(&mut reused_values, &cache);
+ let reused_values = SigHashReusedValuesUnsync::new();
+ let mut vm = TxScriptEngine::new(&reused_values, &cache);
for pop in tests {
match pop.execute(&mut vm) {
@@ -1080,7 +1090,7 @@ mod test {
#[test]
fn test_opcode_invalid() {
- let tests: Vec>> = vec![
+ let tests: Vec>> = vec![
opcodes::OpUnknown166::empty().expect("Should accept empty"),
opcodes::OpUnknown167::empty().expect("Should accept empty"),
opcodes::OpUnknown178::empty().expect("Should accept empty"),
@@ -1158,8 +1168,8 @@ mod test {
];
let cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
- let mut vm = TxScriptEngine::new(&mut reused_values, &cache);
+ let reused_values = SigHashReusedValuesUnsync::new();
+ let mut vm = TxScriptEngine::new(&reused_values, &cache);
for pop in tests {
match pop.execute(&mut vm) {
@@ -2739,7 +2749,7 @@ mod test {
let (base_tx, input, utxo_entry) = make_mock_transaction(1);
let sig_cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
let code = opcodes::OpCheckLockTimeVerify::empty().expect("Should accept empty");
@@ -2751,7 +2761,7 @@ mod test {
] {
let mut tx = base_tx.clone();
tx.0.lock_time = tx_lock_time;
- let mut vm = TxScriptEngine::from_transaction_input(&tx, &input, 0, &utxo_entry, &mut reused_values, &sig_cache)
+ let mut vm = TxScriptEngine::from_transaction_input(&tx, &input, 0, &utxo_entry, &reused_values, &sig_cache)
.expect("Shouldn't fail");
vm.dstack = vec![lock_time.clone()];
match code.execute(&mut vm) {
@@ -2781,7 +2791,7 @@ mod test {
let (tx, base_input, utxo_entry) = make_mock_transaction(1);
let sig_cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
let code = opcodes::OpCheckSequenceVerify::empty().expect("Should accept empty");
@@ -2794,7 +2804,7 @@ mod test {
] {
let mut input = base_input.clone();
input.sequence = tx_sequence;
- let mut vm = TxScriptEngine::from_transaction_input(&tx, &input, 0, &utxo_entry, &mut reused_values, &sig_cache)
+ let mut vm = TxScriptEngine::from_transaction_input(&tx, &input, 0, &utxo_entry, &reused_values, &sig_cache)
.expect("Shouldn't fail");
vm.dstack = vec![sequence.clone()];
match code.execute(&mut vm) {
diff --git a/crypto/txscript/src/standard/multisig.rs b/crypto/txscript/src/standard/multisig.rs
index 79c74c7b37..cbd9dbe6da 100644
--- a/crypto/txscript/src/standard/multisig.rs
+++ b/crypto/txscript/src/standard/multisig.rs
@@ -74,7 +74,7 @@ mod tests {
use core::str::FromStr;
use kaspa_consensus_core::{
hashing::{
- sighash::{calc_ecdsa_signature_hash, calc_schnorr_signature_hash, SigHashReusedValues},
+ sighash::{calc_ecdsa_signature_hash, calc_schnorr_signature_hash, SigHashReusedValuesUnsync},
sighash_type::SIG_HASH_ALL,
},
subnets::SubnetworkId,
@@ -154,11 +154,11 @@ mod tests {
}];
let mut tx = MutableTransaction::with_entries(tx, entries);
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
let sig_hash = if !is_ecdsa {
- calc_schnorr_signature_hash(&tx.as_verifiable(), 0, SIG_HASH_ALL, &mut reused_values)
+ calc_schnorr_signature_hash(&tx.as_verifiable(), 0, SIG_HASH_ALL, &reused_values)
} else {
- calc_ecdsa_signature_hash(&tx.as_verifiable(), 0, SIG_HASH_ALL, &mut reused_values)
+ calc_ecdsa_signature_hash(&tx.as_verifiable(), 0, SIG_HASH_ALL, &reused_values)
};
let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap();
let signatures: Vec<_> = inputs
@@ -184,7 +184,7 @@ mod tests {
let (input, entry) = tx.populated_inputs().next().unwrap();
let cache = Cache::new(10_000);
- let mut engine = TxScriptEngine::from_transaction_input(&tx, input, 0, entry, &mut reused_values, &cache).unwrap();
+ let mut engine = TxScriptEngine::from_transaction_input(&tx, input, 0, entry, &reused_values, &cache).unwrap();
assert_eq!(engine.execute().is_ok(), is_ok);
}
#[test]
diff --git a/mining/src/mempool/check_transaction_standard.rs b/mining/src/mempool/check_transaction_standard.rs
index e759a9e50c..060677a1e5 100644
--- a/mining/src/mempool/check_transaction_standard.rs
+++ b/mining/src/mempool/check_transaction_standard.rs
@@ -2,6 +2,7 @@ use crate::mempool::{
errors::{NonStandardError, NonStandardResult},
Mempool,
};
+use kaspa_consensus_core::hashing::sighash::SigHashReusedValuesUnsync;
use kaspa_consensus_core::{
constants::{MAX_SCRIPT_PUBLIC_KEY_VERSION, MAX_SOMPI},
mass,
@@ -114,7 +115,7 @@ impl Mempool {
/// It is exposed by [MiningManager] for use by transaction generators and wallets.
pub(crate) fn is_transaction_output_dust(&self, transaction_output: &TransactionOutput) -> bool {
// Unspendable outputs are considered dust.
- if is_unspendable::(transaction_output.script_public_key.script()) {
+ if is_unspendable::(transaction_output.script_public_key.script()) {
return true;
}
@@ -175,7 +176,6 @@ impl Mempool {
if contextual_mass > MAXIMUM_STANDARD_TRANSACTION_MASS {
return Err(NonStandardError::RejectContextualMass(transaction_id, contextual_mass, MAXIMUM_STANDARD_TRANSACTION_MASS));
}
-
for (i, input) in transaction.tx.inputs.iter().enumerate() {
// It is safe to elide existence and index checks here since
// they have already been checked prior to calling this
@@ -188,7 +188,10 @@ impl Mempool {
ScriptClass::PubKey => {}
ScriptClass::PubKeyECDSA => {}
ScriptClass::ScriptHash => {
- get_sig_op_count::(&input.signature_script, &entry.script_public_key);
+ get_sig_op_count::(
+ &input.signature_script,
+ &entry.script_public_key,
+ );
let num_sig_ops = 1;
if num_sig_ops > MAX_STANDARD_P2SH_SIG_OPS {
return Err(NonStandardError::RejectSignatureCount(transaction_id, i, num_sig_ops, MAX_STANDARD_P2SH_SIG_OPS));
diff --git a/protocol/p2p/build.rs b/protocol/p2p/build.rs
index b41fe87f53..b4aea69394 100644
--- a/protocol/p2p/build.rs
+++ b/protocol/p2p/build.rs
@@ -5,7 +5,7 @@ fn main() {
tonic_build::configure()
.build_server(true)
.build_client(true)
- .compile(&proto_files[0..1], dirs)
+ .compile_protos(&proto_files[0..1], dirs)
.unwrap_or_else(|e| panic!("protobuf compilation failed, error: {e}"));
// recompile protobufs only if any of the proto files changes.
for file in proto_files {
diff --git a/rpc/grpc/core/build.rs b/rpc/grpc/core/build.rs
index fdf54486dd..b3a0614eae 100644
--- a/rpc/grpc/core/build.rs
+++ b/rpc/grpc/core/build.rs
@@ -10,7 +10,7 @@ fn main() {
// uncomment this line and reflect the change in src/lib.rs
//.out_dir("./src")
- .compile(&protowire_files[0..1], dirs)
+ .compile_protos(&protowire_files[0..1], dirs)
.unwrap_or_else(|e| panic!("protobuf compile error: {e}"));
// recompile protobufs only if any of the proto files changes.
diff --git a/utils/src/iter.rs b/utils/src/iter.rs
index 58a61d7707..3c4c98c64a 100644
--- a/utils/src/iter.rs
+++ b/utils/src/iter.rs
@@ -48,3 +48,9 @@ where
self.inner.clone().fmt(f)
}
}
+
+/// Returns an iterator over powers of two up to (the rounded up) available parallelism: `2, 4, 8, ..., 2^(available_parallelism.log2().ceil())`,
+/// i.e., for `std::thread::available_parallelism = 15` the function will return `2, 4, 8, 16`
+pub fn parallelism_in_power_steps() -> impl Iterator- {
+ (1..=(std::thread::available_parallelism().unwrap().get() as f64).log2().ceil() as u32).map(|x| 2usize.pow(x))
+}
diff --git a/wallet/core/src/account/pskb.rs b/wallet/core/src/account/pskb.rs
index e71d7e4796..fad6bdb4ab 100644
--- a/wallet/core/src/account/pskb.rs
+++ b/wallet/core/src/account/pskb.rs
@@ -9,7 +9,7 @@ use crate::tx::PaymentOutputs;
use futures::stream;
use kaspa_bip32::{DerivationPath, KeyFingerprint, PrivateKey};
use kaspa_consensus_client::UtxoEntry as ClientUTXO;
-use kaspa_consensus_core::hashing::sighash::{calc_schnorr_signature_hash, SigHashReusedValues};
+use kaspa_consensus_core::hashing::sighash::{calc_schnorr_signature_hash, SigHashReusedValuesUnsync};
use kaspa_consensus_core::tx::VerifiableTransaction;
use kaspa_consensus_core::tx::{TransactionInput, UtxoEntry};
use kaspa_txscript::extract_script_pub_key_address;
@@ -160,7 +160,7 @@ pub async fn pskb_signer_for_address(
key_fingerprint: KeyFingerprint,
) -> Result {
let mut signed_bundle = Bundle::new();
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
// If set, sign-for address is used for signing.
// Else, all addresses from inputs are.
@@ -186,7 +186,7 @@ pub async fn pskb_signer_for_address(
for pskt_inner in bundle.iter().cloned() {
let pskt: PSKT = PSKT::from(pskt_inner);
- let mut sign = |signer_pskt: PSKT| {
+ let sign = |signer_pskt: PSKT| {
signer_pskt
.pass_signature_sync(|tx, sighash| -> Result, String> {
tx.tx
@@ -194,7 +194,7 @@ pub async fn pskb_signer_for_address(
.iter()
.enumerate()
.map(|(idx, _input)| {
- let hash = calc_schnorr_signature_hash(&tx.as_verifiable(), idx, sighash[idx], &mut reused_values);
+ let hash = calc_schnorr_signature_hash(&tx.as_verifiable(), idx, sighash[idx], &reused_values);
let msg = secp256k1::Message::from_digest_slice(hash.as_bytes().as_slice()).unwrap();
// When address represents a locked UTXO, no private key is available.
diff --git a/wallet/pskt/examples/multisig.rs b/wallet/pskt/examples/multisig.rs
index fb011402fb..7a9ca190e5 100644
--- a/wallet/pskt/examples/multisig.rs
+++ b/wallet/pskt/examples/multisig.rs
@@ -1,5 +1,5 @@
use kaspa_consensus_core::{
- hashing::sighash::{calc_schnorr_signature_hash, SigHashReusedValues},
+ hashing::sighash::{calc_schnorr_signature_hash, SigHashReusedValuesUnsync},
tx::{TransactionId, TransactionOutpoint, UtxoEntry},
};
use kaspa_txscript::{multisig_redeem_script, opcodes::codes::OpData65, pay_to_script_hash_script, script_builder::ScriptBuilder};
@@ -51,8 +51,8 @@ fn main() {
println!("Serialized after setting sequence: {}", ser_updated);
let signer_pskt: PSKT = serde_json::from_str(&ser_updated).expect("Failed to deserialize");
- let mut reused_values = SigHashReusedValues::new();
- let mut sign = |signer_pskt: PSKT, kp: &Keypair| {
+ let reused_values = SigHashReusedValuesUnsync::new();
+ let sign = |signer_pskt: PSKT, kp: &Keypair| {
signer_pskt
.pass_signature_sync(|tx, sighash| -> Result, String> {
let tx = dbg!(tx);
@@ -61,7 +61,7 @@ fn main() {
.iter()
.enumerate()
.map(|(idx, _input)| {
- let hash = calc_schnorr_signature_hash(&tx.as_verifiable(), idx, sighash[idx], &mut reused_values);
+ let hash = calc_schnorr_signature_hash(&tx.as_verifiable(), idx, sighash[idx], &reused_values);
let msg = secp256k1::Message::from_digest_slice(hash.as_bytes().as_slice()).unwrap();
Ok(SignInputOk {
signature: Signature::Schnorr(kp.sign_schnorr(msg)),
diff --git a/wallet/pskt/src/pskt.rs b/wallet/pskt/src/pskt.rs
index 73f87a628f..93c16ccc85 100644
--- a/wallet/pskt/src/pskt.rs
+++ b/wallet/pskt/src/pskt.rs
@@ -3,6 +3,7 @@
//!
use kaspa_bip32::{secp256k1, DerivationPath, KeyFingerprint};
+use kaspa_consensus_core::hashing::sighash::SigHashReusedValuesUnsync;
use serde::{Deserialize, Serialize};
use serde_repr::{Deserialize_repr, Serialize_repr};
use std::{collections::BTreeMap, fmt::Display, fmt::Formatter, future::Future, marker::PhantomData, ops::Deref};
@@ -14,7 +15,7 @@ pub use crate::output::{Output, OutputBuilder};
pub use crate::role::{Combiner, Constructor, Creator, Extractor, Finalizer, Signer, Updater};
use kaspa_consensus_core::tx::UtxoEntry;
use kaspa_consensus_core::{
- hashing::{sighash::SigHashReusedValues, sighash_type::SigHashType},
+ hashing::sighash_type::SigHashType,
subnets::SUBNETWORK_ID_NATIVE,
tx::{MutableTransaction, SignableTransaction, Transaction, TransactionId, TransactionInput, TransactionOutput},
};
@@ -432,10 +433,10 @@ impl PSKT {
{
let tx = tx.as_verifiable();
let cache = Cache::new(10_000);
- let mut reused_values = SigHashReusedValues::new();
+ let reused_values = SigHashReusedValuesUnsync::new();
tx.populated_inputs().enumerate().try_for_each(|(idx, (input, entry))| {
- TxScriptEngine::from_transaction_input(&tx, input, idx, entry, &mut reused_values, &cache)?.execute()?;
+ TxScriptEngine::from_transaction_input(&tx, input, idx, entry, &reused_values, &cache)?.execute()?;
>::Ok(())
})?;
}