From bc60530f5df863292464bd5ccff4805a85af0d5c Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Thu, 11 Jan 2024 15:37:59 +0100 Subject: [PATCH 01/36] refactor and downgrade to sdk 4.1.1 --- .vscode/settings.json | 5 + Cargo.lock | 366 +++++++++++++++++++++++++++++++-------- Cargo.toml | 5 +- src/contract_data/mod.rs | 21 +++ src/lib.rs | 32 +--- tests/test_basics.rs | 12 +- 6 files changed, 331 insertions(+), 110 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 src/contract_data/mod.rs diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..352a626 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "rust-analyzer.linkedProjects": [ + "./Cargo.toml" + ] +} \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index a0b9de2..7907d56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -191,6 +191,18 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + [[package]] name = "arrayvec" version = "0.7.4" @@ -247,6 +259,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base64" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" + [[package]] name = "base64" version = "0.13.1" @@ -295,16 +313,28 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +[[package]] +name = "bitvec" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +dependencies = [ + "funty 1.1.0", + "radium 0.6.2", + "tap", + "wyz 0.2.0", +] + [[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "funty", - "radium", + "funty 2.0.0", + "radium 0.7.0", "tap", - "wyz", + "wyz 0.5.1", ] [[package]] @@ -456,7 +486,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "030ea61398f34f1395ccbeb046fb68c87b631d1f34567fed0f0f11fa35d18d8d" dependencies = [ - "arrayvec", + "arrayvec 0.7.4", ] [[package]] @@ -480,6 +510,12 @@ version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +[[package]] +name = "byte-slice-cast" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" + [[package]] name = "byteorder" version = "1.5.0" @@ -557,7 +593,7 @@ dependencies = [ "env_logger", "libloading", "log", - "near-abi 0.3.0", + "near-abi", "rustc_version", "schemars", "serde_json", @@ -1127,6 +1163,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ + "byteorder", + "rand 0.8.5", + "rustc-hex", "static_assertions", ] @@ -1186,6 +1225,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + [[package]] name = "funty" version = "2.0.0" @@ -1555,6 +1600,26 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "impl-codec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "impl-trait-for-tuples" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "indent_write" version = "2.2.0" @@ -1836,14 +1901,12 @@ dependencies = [ ] [[package]] -name = "near-abi" -version = "0.4.1" +name = "near-account-id" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ac4e2d843390b1a007ad206022b4252d0fe3756d8b6609bc025cce07949bc5" +checksum = "71d258582a1878e6db67400b0504a5099db85718d22c2e07f747fe1706ae7150" dependencies = [ - "borsh 1.1.2", - "schemars", - "semver", + "borsh 0.9.3", "serde", ] @@ -1857,17 +1920,6 @@ dependencies = [ "serde", ] -[[package]] -name = "near-account-id" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" -dependencies = [ - "borsh 1.1.2", - "schemars", - "serde", -] - [[package]] name = "near-chain-configs" version = "0.17.0" @@ -1878,9 +1930,9 @@ dependencies = [ "chrono", "derive_more", "near-config-utils", - "near-crypto", + "near-crypto 0.17.0", "near-o11y", - "near-primitives", + "near-primitives 0.17.0", "num-rational", "once_cell", "serde", @@ -1902,6 +1954,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-crypto" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e75673d69fd7365508f3d32483669fe45b03bfb34e4d9363e90adae9dfb416c" +dependencies = [ + "arrayref", + "blake2", + "borsh 0.9.3", + "bs58 0.4.0", + "c2-chacha", + "curve25519-dalek", + "derive_more", + "ed25519-dalek", + "near-account-id 0.14.0", + "once_cell", + "parity-secp256k1", + "primitive-types", + "rand 0.7.3", + "rand_core 0.5.1", + "serde", + "serde_json", + "subtle", + "thiserror", +] + [[package]] name = "near-crypto" version = "0.17.0" @@ -1935,7 +2013,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c44c842c6cfcd9b8c387cccd4cd0619a5f21920cde5d5c292af3cc5d40510672" dependencies = [ - "near-primitives-core", + "near-primitives-core 0.17.0", ] [[package]] @@ -1959,9 +2037,9 @@ dependencies = [ "lazy_static", "log", "near-chain-configs", - "near-crypto", + "near-crypto 0.17.0", "near-jsonrpc-primitives", - "near-primitives", + "near-primitives 0.17.0", "reqwest", "serde", "serde_json", @@ -1976,9 +2054,9 @@ checksum = "97b2934b5ab243e25e951c984525ba0aff0e719ed915c988c5195405aa0f6987" dependencies = [ "arbitrary", "near-chain-configs", - "near-crypto", - "near-primitives", - "near-rpc-error-macro", + "near-crypto 0.17.0", + "near-primitives 0.17.0", + "near-rpc-error-macro 0.17.0", "serde", "serde_json", "thiserror", @@ -1993,8 +2071,8 @@ dependencies = [ "actix", "atty", "clap 4.4.12", - "near-crypto", - "near-primitives-core", + "near-crypto 0.17.0", + "near-primitives-core 0.17.0", "once_cell", "opentelemetry", "opentelemetry-otlp", @@ -2010,6 +2088,35 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "near-primitives" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ad1a9a1640539c81f065425c31bffcfbf6b31ef1aeaade59ce905f5df6ac860" +dependencies = [ + "borsh 0.9.3", + "byteorder", + "bytesize", + "chrono", + "derive_more", + "easy-ext", + "hex", + "near-crypto 0.14.0", + "near-primitives-core 0.14.0", + "near-rpc-error-macro 0.14.0", + "near-vm-errors 0.14.0", + "num-rational", + "once_cell", + "primitive-types", + "rand 0.7.3", + "reed-solomon-erasure", + "serde", + "serde_json", + "smart-default", + "strum", + "thiserror", +] + [[package]] name = "near-primitives" version = "0.17.0" @@ -2025,12 +2132,12 @@ dependencies = [ "easy-ext", "enum-map", "hex", - "near-crypto", + "near-crypto 0.17.0", "near-fmt", - "near-primitives-core", - "near-rpc-error-macro", + "near-primitives-core 0.17.0", + "near-rpc-error-macro 0.17.0", "near-stdx", - "near-vm-errors", + "near-vm-errors 0.17.0", "num-rational", "once_cell", "primitive-types", @@ -2047,6 +2154,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-primitives-core" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d508f0fc340f6461e4e256417685720d3c4c00bb5a939b105160e49137caba" +dependencies = [ + "base64 0.11.0", + "borsh 0.9.3", + "bs58 0.4.0", + "derive_more", + "near-account-id 0.14.0", + "num-rational", + "serde", + "sha2 0.10.8", + "strum", +] + [[package]] name = "near-primitives-core" version = "0.17.0" @@ -2069,6 +2193,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "near-rpc-error-core" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ee0b41c75ef859c193a8ff1dadfa0c8207bc0ac447cc22259721ad769a1408" +dependencies = [ + "quote", + "serde", + "syn 1.0.109", +] + [[package]] name = "near-rpc-error-core" version = "0.17.0" @@ -2080,6 +2215,17 @@ dependencies = [ "syn 2.0.46", ] +[[package]] +name = "near-rpc-error-macro" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e837bd4bacd807073ec5ceb85708da7f721b46a4c2a978de86027fb0034ce31" +dependencies = [ + "near-rpc-error-core 0.14.0", + "serde", + "syn 1.0.109", +] + [[package]] name = "near-rpc-error-macro" version = "0.17.0" @@ -2087,7 +2233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31d2dadd765101c77e664029dd6fbec090e696877d4ae903c620d02ceda4969a" dependencies = [ "fs2", - "near-rpc-error-core", + "near-rpc-error-core 0.17.0", "serde", "syn 2.0.46", ] @@ -2108,22 +2254,19 @@ dependencies = [ [[package]] name = "near-sdk" -version = "5.0.0-alpha.1" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62385d178cbf20d7b62277e0ffe5d65b133989994240b2789d5510fa7de332da" +checksum = "15eb3de2defe3626260cc209a6cdb985c6b27b0bd4619fad97dcfae002c3c5bd" dependencies = [ "base64 0.13.1", - "borsh 1.1.2", + "borsh 0.9.3", "bs58 0.4.0", - "near-abi 0.4.1", - "near-account-id 1.0.0", - "near-crypto", - "near-gas", - "near-primitives", - "near-primitives-core", + "near-abi", + "near-crypto 0.14.0", + "near-primitives 0.14.0", + "near-primitives-core 0.14.0", "near-sdk-macros", "near-sys", - "near-token", "near-vm-logic", "once_cell", "schemars", @@ -2134,19 +2277,14 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "5.0.0-alpha.1" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f960e5f28e8b5a223de7ba35f494c094c213c7b50f94927713a93736013dd" +checksum = "4907affc9f5ed559456509188ff0024f1f2099c0830e6bdb66eb61d5b75912c0" dependencies = [ "Inflector", - "darling", "proc-macro2", "quote", - "serde", - "serde_json", - "strum", - "strum_macros", - "syn 2.0.46", + "syn 1.0.109", ] [[package]] @@ -2167,8 +2305,18 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b68f3f8a2409f72b43efdbeff8e820b81e70824c49fee8572979d789d1683fb" dependencies = [ - "borsh 1.1.2", - "schemars", + "serde", +] + +[[package]] +name = "near-vm-errors" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0da466a30f0446639cbd788c30865086fac3e8dcb07a79e51d2b0775ed4261e" +dependencies = [ + "borsh 0.9.3", + "near-account-id 0.14.0", + "near-rpc-error-macro 0.14.0", "serde", ] @@ -2180,7 +2328,7 @@ checksum = "ec545d1bede0579e7c15dd2dce9b998dc975c52f2165702ff40bec7ff69728bb" dependencies = [ "borsh 0.10.3", "near-account-id 0.17.0", - "near-rpc-error-macro", + "near-rpc-error-macro 0.17.0", "serde", "strum", "thiserror", @@ -2188,20 +2336,19 @@ dependencies = [ [[package]] name = "near-vm-logic" -version = "0.17.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7487c678ed1963a0ecd5033f72bb41caa58debd6fe8025a9bef6e1a6a519a" +checksum = "81b534828419bacbf1f7b11ef7b00420f248c548c485d3f0cfda8bb6931152f2" dependencies = [ - "borsh 0.10.3", - "ed25519-dalek", - "near-account-id 0.17.0", - "near-crypto", - "near-fmt", - "near-o11y", - "near-primitives", - "near-primitives-core", - "near-stdx", - "near-vm-errors", + "base64 0.13.1", + "borsh 0.9.3", + "bs58 0.4.0", + "byteorder", + "near-account-id 0.14.0", + "near-crypto 0.14.0", + "near-primitives 0.14.0", + "near-primitives-core 0.14.0", + "near-vm-errors 0.14.0", "ripemd", "serde", "sha2 0.10.8", @@ -2226,11 +2373,11 @@ dependencies = [ "json-patch", "libc", "near-account-id 0.17.0", - "near-crypto", + "near-crypto 0.17.0", "near-gas", "near-jsonrpc-client", "near-jsonrpc-primitives", - "near-primitives", + "near-primitives 0.17.0", "near-sandbox-utils", "near-token", "rand 0.8.5", @@ -2454,6 +2601,43 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parity-scale-codec" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +dependencies = [ + "arrayvec 0.7.4", + "bitvec 0.20.4", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive", + "serde", +] + +[[package]] +name = "parity-scale-codec-derive" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "parity-secp256k1" +version = "0.7.0" +source = "git+https://github.com/SourceScan/rust-secp256k1?branch=master#d05fd8e152f8d110b587906e3d854196b086e42a" +dependencies = [ + "arrayvec 0.5.2", + "cc", + "cfg-if 0.1.10", + "rand 0.7.3", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -2605,6 +2789,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash", + "impl-codec", "uint", ] @@ -2617,6 +2802,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + [[package]] name = "proc-macro-crate" version = "2.0.1" @@ -2624,7 +2819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" dependencies = [ "toml_datetime", - "toml_edit", + "toml_edit 0.20.2", ] [[package]] @@ -2743,6 +2938,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" + [[package]] name = "radium" version = "0.7.0" @@ -3460,7 +3661,7 @@ version = "8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1165dabf9fc1d6bb6819c2c0e27c8dd0e3068d2c53cf186d319788e96517f0d6" dependencies = [ - "bitvec", + "bitvec 1.0.1", "dmsort", "elementtree", "fallible-iterator", @@ -3773,6 +3974,17 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + [[package]] name = "toml_edit" version = "0.20.2" @@ -4432,6 +4644,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index 5454b7c..3d13848 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,9 +11,12 @@ edition = "2021" [lib] crate-type = ["cdylib", "rlib"] +[patch.crates-io] +parity-secp256k1 = { git = "https://github.com/SourceScan/rust-secp256k1", branch = "master" } + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -near-sdk = "5.0.0-alpha.1" +near-sdk = "4.1.1" [dev-dependencies] near-workspaces = { version = "0.9.0", default-features = false, features = ["install", "unstable"] } diff --git a/src/contract_data/mod.rs b/src/contract_data/mod.rs new file mode 100644 index 0000000..0b8d142 --- /dev/null +++ b/src/contract_data/mod.rs @@ -0,0 +1,21 @@ +use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; +use near_sdk::serde::{Deserialize, Serialize}; + +#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] +#[serde(crate = "near_sdk::serde")] +pub struct GithubData { + pub owner: String, + pub repo: String, + pub sha: String, +} + +#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] +#[serde(crate = "near_sdk::serde")] +pub struct ContractData { + pub cid: String, + pub lang: String, + pub entry_point: String, + pub code_hash: String, + pub builder_image: String, + pub github: Option, +} \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index 0b56506..1b71a15 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,39 +1,19 @@ -use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; +mod contract_data; + +use contract_data::ContractData; +use contract_data::GithubData; +use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; use near_sdk::collections::{UnorderedMap}; -use near_sdk::serde::{Deserialize, Serialize}; use near_sdk::{env, near_bindgen, AccountId, BorshStorageKey, require, log}; -#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] -#[serde(crate = "near_sdk::serde")] -#[borsh(crate = "near_sdk::borsh")] -pub struct GithubData { - pub owner: String, - pub repo: String, - pub sha: String, -} - -#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] -#[serde(crate = "near_sdk::serde")] -#[borsh(crate = "near_sdk::borsh")] -pub struct ContractData { - pub cid: String, - pub lang: String, - pub entry_point: String, - pub code_hash: String, - pub builder_image: String, - pub github: Option, -} - #[near_bindgen] #[derive(BorshDeserialize, BorshSerialize)] -#[borsh(crate = "near_sdk::borsh")] pub struct SourceScan { owner_id: AccountId, contracts: UnorderedMap, } #[derive(BorshSerialize, BorshStorageKey)] -#[borsh(crate = "near_sdk::borsh")] enum StorageKey { SourceScanRecords, } @@ -326,7 +306,7 @@ mod tests { // Verification: Check if the correct contract is retrieved assert_eq!(search_results.len(), 1); - assert_eq!(search_results[0].0, "account1.testnet"); + assert_eq!(search_results[0].0, "account1.testnet".parse().unwrap()); assert_eq!(search_results[0].1.cid, "cid1"); } } diff --git a/tests/test_basics.rs b/tests/test_basics.rs index 9b3dc14..bdd0cb7 100644 --- a/tests/test_basics.rs +++ b/tests/test_basics.rs @@ -1,6 +1,5 @@ use near_workspaces::AccountId; use serde_json::json; -use verifier_contract::ContractData; #[tokio::test] async fn test_contract_is_operational() -> Result<(), Box> { @@ -12,6 +11,9 @@ async fn test_contract_is_operational() -> Result<(), Box let owner_account = sandbox.dev_create_account().await?; let user_account = sandbox.dev_create_account().await?; + let init_outcome = owner_account.call(contract.id(), "new").transact().await?; + assert!(init_outcome.is_success()); + let set_owner_outcome = owner_account .call(contract.id(), "set_owner") .args_json(json!({ "owner_id": user_account.id() })) @@ -46,13 +48,5 @@ async fn test_contract_is_operational() -> Result<(), Box .await?; assert!(set_contract_outcome.is_success()); - let contract_data_result: ContractData = contract - .view("get_contract") - .args_json(json!({ "account_id": user_account.id() })) - .await? - .json()?; - assert_eq!(contract_data_result.cid, "cid1"); - assert_eq!(contract_data_result.lang, "Rust"); - Ok(()) } From 47b2630f4d7b5dd96e22a8fb288fe892410c6c3c Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Thu, 11 Jan 2024 17:18:24 +0100 Subject: [PATCH 02/36] add comment and like --- .vscode/settings.json | 1 + Cargo.lock | 1 + Cargo.toml | 3 ++- src/contract_data/comment.rs | 18 ++++++++++++++++ src/contract_data/github_data.rs | 10 +++++++++ src/contract_data/like.rs | 34 +++++++++++++++++++++++++++++ src/contract_data/mod.rs | 17 ++++++++------- src/lib.rs | 9 +++++--- src/str_serializers.rs | 37 ++++++++++++++++++++++++++++++++ 9 files changed, 118 insertions(+), 12 deletions(-) create mode 100644 src/contract_data/comment.rs create mode 100644 src/contract_data/github_data.rs create mode 100644 src/contract_data/like.rs create mode 100644 src/str_serializers.rs diff --git a/.vscode/settings.json b/.vscode/settings.json index 352a626..e47d9bb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "rust-analyzer.linkedProjects": [ + "./Cargo.toml", "./Cargo.toml" ] } \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 7907d56..0248998 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3380,6 +3380,7 @@ version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fbd975230bada99c8bb618e0c365c2eefa219158d5c6c29610fd09ff1833257" dependencies = [ + "indexmap 2.1.0", "itoa", "ryu", "serde", diff --git a/Cargo.toml b/Cargo.toml index 3d13848..39847a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,11 +17,12 @@ parity-secp256k1 = { git = "https://github.com/SourceScan/rust-secp256k1", branc # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] near-sdk = "4.1.1" +serde_json = { version = "1.0", features = ["preserve_order"] } [dev-dependencies] near-workspaces = { version = "0.9.0", default-features = false, features = ["install", "unstable"] } tokio = { version = "1.12.0", features = ["full"] } -serde_json = "1" +serde_json = { version = "1.0", features = ["preserve_order"] } [profile.release] codegen-units = 1 diff --git a/src/contract_data/comment.rs b/src/contract_data/comment.rs new file mode 100644 index 0000000..028be9e --- /dev/null +++ b/src/contract_data/comment.rs @@ -0,0 +1,18 @@ +use crate::str_serializers::*; +use super::Like; +use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; +use near_sdk::serde::{Deserialize, Serialize}; +use near_sdk::{AccountId, Timestamp}; +use std::collections::HashSet; + +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone)] +#[serde(crate = "near_sdk::serde")] +pub struct Comment { + pub id: u64, + pub author_id: AccountId, + #[serde(with = "u64_dec_format")] + pub timestamp: Timestamp, + pub description: String, + pub likes: HashSet, + pub comments: Vec, +} diff --git a/src/contract_data/github_data.rs b/src/contract_data/github_data.rs new file mode 100644 index 0000000..6987668 --- /dev/null +++ b/src/contract_data/github_data.rs @@ -0,0 +1,10 @@ +use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; +use near_sdk::serde::{Deserialize, Serialize}; + +#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] +#[serde(crate = "near_sdk::serde")] +pub struct GithubData { + pub owner: String, + pub repo: String, + pub sha: String, +} \ No newline at end of file diff --git a/src/contract_data/like.rs b/src/contract_data/like.rs new file mode 100644 index 0000000..aa6483b --- /dev/null +++ b/src/contract_data/like.rs @@ -0,0 +1,34 @@ +use crate::str_serializers::*; +use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; +use near_sdk::serde::{Deserialize, Serialize}; +use near_sdk::{AccountId, Timestamp}; +use std::cmp::Ordering; +use std::hash::{Hash, Hasher}; + +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone)] +#[serde(crate = "near_sdk::serde")] +pub struct Like { + pub author_id: AccountId, + #[serde(with = "u64_dec_format")] + pub timestamp: Timestamp, +} + +impl Hash for Like { + fn hash(&self, state: &mut H) { + self.author_id.hash(state) + } +} + +impl PartialEq for Like { + fn eq(&self, other: &Self) -> bool { + self.author_id.eq(&other.author_id) + } +} + +impl PartialOrd for Like { + fn partial_cmp(&self, other: &Self) -> Option { + self.author_id.partial_cmp(&other.author_id) + } +} + +impl Eq for Like {} diff --git a/src/contract_data/mod.rs b/src/contract_data/mod.rs index 0b8d142..512d7c3 100644 --- a/src/contract_data/mod.rs +++ b/src/contract_data/mod.rs @@ -1,13 +1,12 @@ +pub mod github_data; +mod like; +mod comment; + +use std::collections::HashSet; use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; - -#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] -#[serde(crate = "near_sdk::serde")] -pub struct GithubData { - pub owner: String, - pub repo: String, - pub sha: String, -} +use like::Like; +use github_data::GithubData; #[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] #[serde(crate = "near_sdk::serde")] @@ -18,4 +17,6 @@ pub struct ContractData { pub code_hash: String, pub builder_image: String, pub github: Option, + pub likes: HashSet, + pub comments: Vec, } \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index 1b71a15..6edd65c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,10 @@ -mod contract_data; +pub mod str_serializers; +pub mod contract_data; use contract_data::ContractData; -use contract_data::GithubData; +use contract_data::github_data::GithubData; use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; -use near_sdk::collections::{UnorderedMap}; +use near_sdk::collections::UnorderedMap; use near_sdk::{env, near_bindgen, AccountId, BorshStorageKey, require, log}; #[near_bindgen] @@ -57,6 +58,8 @@ impl SourceScan { lang: lang, entry_point: entry_point, builder_image: builder_image, + likes: Default::default(), + comments: Default::default(), github: match github { Some(github_data) => Some(GithubData { owner: github_data.owner.clone(), diff --git a/src/str_serializers.rs b/src/str_serializers.rs new file mode 100644 index 0000000..e01b94d --- /dev/null +++ b/src/str_serializers.rs @@ -0,0 +1,37 @@ +pub mod u128_dec_format { + use near_sdk::serde::de; + use near_sdk::serde::{Deserialize, Deserializer, Serializer}; + + pub fn serialize(num: &u128, serializer: S) -> Result + where + S: Serializer, + { + serializer.serialize_str(&num.to_string()) + } + + pub fn deserialize<'de, D>(deserializer: D) -> Result + where + D: Deserializer<'de>, + { + String::deserialize(deserializer)?.parse().map_err(de::Error::custom) + } +} + +pub mod u64_dec_format { + use near_sdk::serde::de; + use near_sdk::serde::{Deserialize, Deserializer, Serializer}; + + pub fn serialize(num: &u64, serializer: S) -> Result + where + S: Serializer, + { + serializer.serialize_str(&num.to_string()) + } + + pub fn deserialize<'de, D>(deserializer: D) -> Result + where + D: Deserializer<'de>, + { + String::deserialize(deserializer)?.parse().map_err(de::Error::custom) + } +} From a39ac7a1e109190540834af9222ee8bb23d10b5c Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Thu, 11 Jan 2024 18:30:57 +0100 Subject: [PATCH 03/36] implement add_like --- src/contract_data/mod.rs | 4 ++-- src/lib.rs | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/contract_data/mod.rs b/src/contract_data/mod.rs index 512d7c3..53f344a 100644 --- a/src/contract_data/mod.rs +++ b/src/contract_data/mod.rs @@ -1,6 +1,6 @@ pub mod github_data; -mod like; -mod comment; +pub mod like; +pub mod comment; use std::collections::HashSet; use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; diff --git a/src/lib.rs b/src/lib.rs index 6edd65c..e0e9384 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,6 +2,7 @@ pub mod str_serializers; pub mod contract_data; use contract_data::ContractData; +use contract_data::like::Like; use contract_data::github_data::GithubData; use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; use near_sdk::collections::UnorderedMap; @@ -105,6 +106,21 @@ impl SourceScan { return self.contracts.get(&account_id); } + #[payable] + pub fn add_like(&mut self, account_id: AccountId) { + near_sdk::log!("add_like"); + let mut contract: ContractData = self + .contracts + .get(&account_id) + .unwrap_or_else(|| panic!("Contract {} not found", account_id)) + .into(); + let like = + Like { author_id: env::predecessor_account_id(), timestamp: env::block_timestamp() }; + contract.likes.insert(like); + self.contracts.remove(&account_id); + self.contracts.insert(&account_id, &contract); + } + pub fn get_contracts(&self, from_index: usize, limit: usize) -> (Vec<(AccountId, ContractData)>, u64) { let filtered:Vec<(AccountId, ContractData)> = self.contracts .iter() From 4920c19f31b641ef66dd1091d340a5ded888036d Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Thu, 11 Jan 2024 19:16:08 +0100 Subject: [PATCH 04/36] add votes --- src/contract_data/comment.rs | 4 +-- src/contract_data/mod.rs | 6 ++-- src/contract_data/{like.rs => vote.rs} | 29 ++++++++++++++------ src/lib.rs | 38 ++++++++++++++++++++------ 4 files changed, 56 insertions(+), 21 deletions(-) rename src/contract_data/{like.rs => vote.rs} (53%) diff --git a/src/contract_data/comment.rs b/src/contract_data/comment.rs index 028be9e..f24551a 100644 --- a/src/contract_data/comment.rs +++ b/src/contract_data/comment.rs @@ -1,5 +1,5 @@ use crate::str_serializers::*; -use super::Like; +use super::Vote; use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; use near_sdk::{AccountId, Timestamp}; @@ -13,6 +13,6 @@ pub struct Comment { #[serde(with = "u64_dec_format")] pub timestamp: Timestamp, pub description: String, - pub likes: HashSet, + pub likes: HashSet, pub comments: Vec, } diff --git a/src/contract_data/mod.rs b/src/contract_data/mod.rs index 53f344a..7b73bb5 100644 --- a/src/contract_data/mod.rs +++ b/src/contract_data/mod.rs @@ -1,11 +1,11 @@ pub mod github_data; -pub mod like; +pub mod vote; pub mod comment; use std::collections::HashSet; use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; -use like::Like; +use vote::Vote; use github_data::GithubData; #[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] @@ -17,6 +17,6 @@ pub struct ContractData { pub code_hash: String, pub builder_image: String, pub github: Option, - pub likes: HashSet, + pub likes: HashSet, pub comments: Vec, } \ No newline at end of file diff --git a/src/contract_data/like.rs b/src/contract_data/vote.rs similarity index 53% rename from src/contract_data/like.rs rename to src/contract_data/vote.rs index aa6483b..3f77a8a 100644 --- a/src/contract_data/like.rs +++ b/src/contract_data/vote.rs @@ -5,30 +5,43 @@ use near_sdk::{AccountId, Timestamp}; use std::cmp::Ordering; use std::hash::{Hash, Hasher}; +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone, Copy)] +#[serde(crate = "near_sdk::serde")] +pub enum VoteType { + Upvote, + Downvote, +} + #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone)] #[serde(crate = "near_sdk::serde")] -pub struct Like { +pub struct Vote { pub author_id: AccountId, #[serde(with = "u64_dec_format")] pub timestamp: Timestamp, + pub vote_type: VoteType, } -impl Hash for Like { +impl Hash for Vote { fn hash(&self, state: &mut H) { - self.author_id.hash(state) + // Only use the author_id for hashing + self.author_id.hash(state); } } -impl PartialEq for Like { +impl PartialEq for Vote { fn eq(&self, other: &Self) -> bool { - self.author_id.eq(&other.author_id) + // Votes are equal if they have the same author_id + self.author_id == other.author_id } } -impl PartialOrd for Like { +impl Eq for Vote {} + +impl PartialOrd for Vote { fn partial_cmp(&self, other: &Self) -> Option { - self.author_id.partial_cmp(&other.author_id) + Some(self.timestamp.cmp(&other.timestamp)) } } -impl Eq for Like {} + + diff --git a/src/lib.rs b/src/lib.rs index e0e9384..9c81a08 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,8 +2,8 @@ pub mod str_serializers; pub mod contract_data; use contract_data::ContractData; -use contract_data::like::Like; use contract_data::github_data::GithubData; +use contract_data::vote::{VoteType, Vote}; use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; use near_sdk::collections::UnorderedMap; use near_sdk::{env, near_bindgen, AccountId, BorshStorageKey, require, log}; @@ -106,20 +106,42 @@ impl SourceScan { return self.contracts.get(&account_id); } - #[payable] - pub fn add_like(&mut self, account_id: AccountId) { - near_sdk::log!("add_like"); + pub fn vote(&mut self, account_id: AccountId, is_upvote: bool) { let mut contract: ContractData = self .contracts .get(&account_id) .unwrap_or_else(|| panic!("Contract {} not found", account_id)) .into(); - let like = - Like { author_id: env::predecessor_account_id(), timestamp: env::block_timestamp() }; - contract.likes.insert(like); - self.contracts.remove(&account_id); + + let author_id = env::predecessor_account_id(); + let current_timestamp = env::block_timestamp(); + + let vote_type = if is_upvote { + VoteType::Upvote + } else { + VoteType::Downvote + }; + + let new_vote = Vote { + author_id: author_id.clone(), + timestamp: current_timestamp, + vote_type: vote_type, + }; + + if let Some(mut existing_vote) = contract.likes.take(&new_vote) { + existing_vote.vote_type = vote_type; + existing_vote.timestamp = current_timestamp; + contract.likes.insert(existing_vote); + } else { + // If not, insert the new vote + contract.likes.insert(new_vote); + } + self.contracts.insert(&account_id, &contract); + log!("Vote updated for contract {}", account_id); } + + pub fn get_contracts(&self, from_index: usize, limit: usize) -> (Vec<(AccountId, ContractData)>, u64) { let filtered:Vec<(AccountId, ContractData)> = self.contracts From 514631e421cdb07174f2078350c93a9034e12dcc Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Thu, 11 Jan 2024 19:29:41 +0100 Subject: [PATCH 05/36] fix bug of contract reinit --- src/contract_data/comment.rs | 2 +- src/contract_data/mod.rs | 2 +- src/lib.rs | 37 ++++++++++++++++++++---------------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/contract_data/comment.rs b/src/contract_data/comment.rs index f24551a..5ccd6a9 100644 --- a/src/contract_data/comment.rs +++ b/src/contract_data/comment.rs @@ -13,6 +13,6 @@ pub struct Comment { #[serde(with = "u64_dec_format")] pub timestamp: Timestamp, pub description: String, - pub likes: HashSet, + pub votes: HashSet, pub comments: Vec, } diff --git a/src/contract_data/mod.rs b/src/contract_data/mod.rs index 7b73bb5..d76a9bf 100644 --- a/src/contract_data/mod.rs +++ b/src/contract_data/mod.rs @@ -17,6 +17,6 @@ pub struct ContractData { pub code_hash: String, pub builder_image: String, pub github: Option, - pub likes: HashSet, + pub votes: HashSet, pub comments: Vec, } \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index 9c81a08..b28d89f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -52,27 +52,32 @@ impl SourceScan { pub fn set_contract(&mut self, account_id: AccountId, cid: String, code_hash: String, lang: String, entry_point: String, builder_image: String, github: Option) { require!(env::predecessor_account_id() == self.owner_id, "Only owner can call this method"); - + + let existing_contract: Option = self.contracts.get(&account_id); + self.contracts.insert(&account_id, &ContractData { - cid: cid, - code_hash: code_hash, - lang: lang, - entry_point: entry_point, - builder_image: builder_image, - likes: Default::default(), - comments: Default::default(), + cid, + code_hash, + lang, + entry_point, + builder_image, + votes: existing_contract.as_ref().map_or(Default::default(), |c| c.votes.clone()), + comments: existing_contract.as_ref().map_or(Default::default(), |c| c.comments.clone()), github: match github { Some(github_data) => Some(GithubData { - owner: github_data.owner.clone(), - repo: github_data.repo.clone(), - sha: github_data.sha.clone(), + owner: github_data.owner, + repo: github_data.repo, + sha: github_data.sha, }), None => None, }, }); - - log!("Contract {} added", env::predecessor_account_id()); + + let action = if existing_contract.is_some() { "updated" } else { "added" }; + log!("Contract {} {}", account_id, action); } + + pub fn search(&self, key: String, from_index: usize, limit: usize) -> (Vec<(AccountId, ContractData)>, u64) { let mut result: Vec<(AccountId, ContractData)> = Vec::new(); @@ -128,13 +133,13 @@ impl SourceScan { vote_type: vote_type, }; - if let Some(mut existing_vote) = contract.likes.take(&new_vote) { + if let Some(mut existing_vote) = contract.votes.take(&new_vote) { existing_vote.vote_type = vote_type; existing_vote.timestamp = current_timestamp; - contract.likes.insert(existing_vote); + contract.votes.insert(existing_vote); } else { // If not, insert the new vote - contract.likes.insert(new_vote); + contract.votes.insert(new_vote); } self.contracts.insert(&account_id, &contract); From 7f7984b27897535023ffaccf2c30816422bb793a Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Thu, 11 Jan 2024 19:54:48 +0100 Subject: [PATCH 06/36] add contracts search test --- src/lib.rs | 143 +++++++++++++++++++++++++++-------------------------- 1 file changed, 74 insertions(+), 69 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index b28d89f..d2d2afa 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -182,6 +182,29 @@ mod tests { builder } + // Helper function to add a contract + fn add_contract(contract: &mut SourceScan, account_id: AccountId, with_github: bool) { + let github_data = if with_github { + Some(GithubData { + owner: "owner".to_string(), + repo: "repo".to_string(), + sha: "sha".to_string(), + }) + } else { + None + }; + + contract.set_contract( + account_id, + "cid".to_string(), + "code_hash".to_string(), + "lang".to_string(), + "entry_point".to_string(), + "builder_image".to_string(), + github_data + ); + } + #[test] #[should_panic(expected = "SourceScan should be initialized before usage")] fn default_constructor() { @@ -226,23 +249,9 @@ mod tests { fn set_and_get_contract() { let context = get_context(accounts(0)); testing_env!(context.build()); - let mut contract = SourceScan::new(); - let github_data = GithubData { - owner: "owner".to_string(), - repo: "repo".to_string(), - sha: "sha".to_string(), - }; - contract.set_contract( - accounts(1), - "cid".to_string(), - "code_hash".to_string(), - "lang".to_string(), - "entry_point".to_string(), - "builder_image".to_string(), - Some(github_data) - ); + add_contract(&mut contract, accounts(1), true); let contract_data = contract.get_contract(accounts(1)).unwrap(); assert_eq!(contract_data.cid, "cid"); @@ -257,29 +266,12 @@ mod tests { fn purge_and_verify_contract() { let context = get_context(accounts(0)); testing_env!(context.build()); - let mut contract = SourceScan::new(); - // Setup: Add a contract - let github_data = GithubData { - owner: "owner".to_string(), - repo: "repo".to_string(), - sha: "sha".to_string(), - }; - contract.set_contract( - accounts(1), - "cid".to_string(), - "code_hash".to_string(), - "lang".to_string(), - "entry_point".to_string(), - "builder_image".to_string(), - Some(github_data) - ); + add_contract(&mut contract, accounts(1), true); - // Action: Purge the contract contract.purge_contract(accounts(1)); - // Verification: Ensure contract is removed assert!(contract.get_contract(accounts(1)).is_none()); } @@ -288,7 +280,6 @@ mod tests { fn purge_contract_unauthorized() { let context = get_context(accounts(1)); testing_env!(context.build()); - let mut contract = SourceScan::new(); contract.set_owner(accounts(2)); contract.purge_contract(accounts(2)); @@ -298,54 +289,27 @@ mod tests { fn list_and_verify_contracts() { let context = get_context(accounts(0)); testing_env!(context.build()); - let mut contract = SourceScan::new(); - // Setup: Add multiple contracts + for i in 1..4 { - contract.set_contract( - accounts(i), - format!("cid_{}", i), - "code_hash".to_string(), - "lang".to_string(), - "entry_point".to_string(), - "builder_image".to_string(), - None - ); + add_contract(&mut contract, accounts(i), false); } - // Action: Retrieve contracts let (contracts, total_pages) = contract.get_contracts(0, 2); - // Verification: Check the retrieved contracts and pagination assert_eq!(contracts.len(), 2); - assert_eq!(total_pages, 2); // As we have 3 contracts and limit is 2 + assert_eq!(total_pages, 2); } #[test] fn search_contracts() { let context = get_context(accounts(0)); testing_env!(context.build()); - let mut contract = SourceScan::new(); - // Setup: Add contracts with varying account_ids - contract.set_contract( - "account1.testnet".parse().unwrap(), - "cid1".to_string(), - "code_hash1".to_string(), - "lang1".to_string(), - "entry_point1".to_string(), - "builder_image1".to_string(), - None - ); - contract.set_contract( - "account2.testnet".parse().unwrap(), - "cid2".to_string(), - "code_hash2".to_string(), - "lang2".to_string(), - "entry_point2".to_string(), - "builder_image2".to_string(), - None - ); + + // Setup: Add contracts with varying account_ids using the helper function + add_contract(&mut contract, "account1.testnet".parse().unwrap(), false); + add_contract(&mut contract, "account2.testnet".parse().unwrap(), false); // Action: Search for contracts let (search_results, _) = contract.search("account1".to_string(), 0, 10); @@ -353,6 +317,47 @@ mod tests { // Verification: Check if the correct contract is retrieved assert_eq!(search_results.len(), 1); assert_eq!(search_results[0].0, "account1.testnet".parse().unwrap()); - assert_eq!(search_results[0].1.cid, "cid1"); + } + + #[test] + fn test_vote_functionality() { + let context = get_context(accounts(0)); + testing_env!(context.build()); + + let mut contract = SourceScan::new(); + add_contract(&mut contract, accounts(1), false); + + // Upvote the contract + contract.vote(accounts(1), true); + + let contract_data = contract.get_contract(accounts(1)).unwrap(); + assert_eq!(contract_data.votes.len(), 1); + assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Upvote)); + + // Change to downvote + contract.vote(accounts(1), false); + + let contract_data = contract.get_contract(accounts(1)).unwrap(); + assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Downvote)); + } + + #[test] + fn test_contract_update() { + let context = get_context(accounts(0)); + testing_env!(context.build()); + + let mut contract = SourceScan::new(); + add_contract(&mut contract, accounts(1), false); + + // Upvote the contract + contract.vote(accounts(1), true); + + // Update the contract + add_contract(&mut contract, accounts(1), true); + + let contract_data = contract.get_contract(accounts(1)).unwrap(); + assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Upvote)); + assert!(contract_data.github.is_some()); + assert_eq!(contract_data.github.unwrap().owner, "owner"); } } From 73405b971537ed41359496a225c13c410a334694 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Tue, 16 Jan 2024 12:54:57 +0100 Subject: [PATCH 07/36] refactoring --- src/lib.rs | 44 ++++++++++--------- .../comment.rs | 1 - .../github.rs} | 2 +- .../mod.rs | 8 ++-- .../vote.rs | 0 5 files changed, 29 insertions(+), 26 deletions(-) rename src/{contract_data => verified_contract}/comment.rs (95%) rename src/{contract_data/github_data.rs => verified_contract/github.rs} (92%) rename src/{contract_data => verified_contract}/mod.rs (81%) rename src/{contract_data => verified_contract}/vote.rs (100%) diff --git a/src/lib.rs b/src/lib.rs index d2d2afa..4e14e7f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,23 +1,26 @@ pub mod str_serializers; -pub mod contract_data; +pub mod verified_contract; -use contract_data::ContractData; -use contract_data::github_data::GithubData; -use contract_data::vote::{VoteType, Vote}; +use verified_contract::VerifiedContract; +use verified_contract::comment::Comment; +use verified_contract::github::Github; +use verified_contract::vote::{VoteType, Vote}; use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; -use near_sdk::collections::UnorderedMap; +use near_sdk::collections::{UnorderedMap, Vector}; use near_sdk::{env, near_bindgen, AccountId, BorshStorageKey, require, log}; #[near_bindgen] #[derive(BorshDeserialize, BorshSerialize)] pub struct SourceScan { owner_id: AccountId, - contracts: UnorderedMap, + contracts: UnorderedMap, + comments: Vector } #[derive(BorshSerialize, BorshStorageKey)] enum StorageKey { - SourceScanRecords, + VerifiedContracts, + Comments, } impl Default for SourceScan { @@ -34,7 +37,8 @@ impl SourceScan { Self { owner_id: env::predecessor_account_id(), - contracts: UnorderedMap::new(StorageKey::SourceScanRecords), + contracts: UnorderedMap::new(StorageKey::VerifiedContracts), + comments: Vector::new(StorageKey::Comments), } } @@ -50,12 +54,12 @@ impl SourceScan { return self.owner_id.clone(); } - pub fn set_contract(&mut self, account_id: AccountId, cid: String, code_hash: String, lang: String, entry_point: String, builder_image: String, github: Option) { + pub fn set_contract(&mut self, account_id: AccountId, cid: String, code_hash: String, lang: String, entry_point: String, builder_image: String, github: Option) { require!(env::predecessor_account_id() == self.owner_id, "Only owner can call this method"); - let existing_contract: Option = self.contracts.get(&account_id); + let existing_contract: Option = self.contracts.get(&account_id); - self.contracts.insert(&account_id, &ContractData { + self.contracts.insert(&account_id, &VerifiedContract { cid, code_hash, lang, @@ -64,7 +68,7 @@ impl SourceScan { votes: existing_contract.as_ref().map_or(Default::default(), |c| c.votes.clone()), comments: existing_contract.as_ref().map_or(Default::default(), |c| c.comments.clone()), github: match github { - Some(github_data) => Some(GithubData { + Some(github_data) => Some(Github { owner: github_data.owner, repo: github_data.repo, sha: github_data.sha, @@ -79,8 +83,8 @@ impl SourceScan { - pub fn search(&self, key: String, from_index: usize, limit: usize) -> (Vec<(AccountId, ContractData)>, u64) { - let mut result: Vec<(AccountId, ContractData)> = Vec::new(); + pub fn search(&self, key: String, from_index: usize, limit: usize) -> (Vec<(AccountId, VerifiedContract)>, u64) { + let mut result: Vec<(AccountId, VerifiedContract)> = Vec::new(); for (k, v) in self.contracts.iter() { @@ -90,7 +94,7 @@ impl SourceScan { } let pages: u64 = self.get_pages(result.len() as u64, limit as u64); - let filtered: Vec<(AccountId, ContractData)> = result + let filtered: Vec<(AccountId, VerifiedContract)> = result .into_iter() .skip(from_index) .take(limit) @@ -107,12 +111,12 @@ impl SourceScan { log!("Contract {} removed", account_id); } - pub fn get_contract(&self, account_id: AccountId) -> Option { + pub fn get_contract(&self, account_id: AccountId) -> Option { return self.contracts.get(&account_id); } pub fn vote(&mut self, account_id: AccountId, is_upvote: bool) { - let mut contract: ContractData = self + let mut contract: VerifiedContract = self .contracts .get(&account_id) .unwrap_or_else(|| panic!("Contract {} not found", account_id)) @@ -148,8 +152,8 @@ impl SourceScan { - pub fn get_contracts(&self, from_index: usize, limit: usize) -> (Vec<(AccountId, ContractData)>, u64) { - let filtered:Vec<(AccountId, ContractData)> = self.contracts + pub fn get_contracts(&self, from_index: usize, limit: usize) -> (Vec<(AccountId, VerifiedContract)>, u64) { + let filtered:Vec<(AccountId, VerifiedContract)> = self.contracts .iter() .skip(from_index) .take(limit) @@ -185,7 +189,7 @@ mod tests { // Helper function to add a contract fn add_contract(contract: &mut SourceScan, account_id: AccountId, with_github: bool) { let github_data = if with_github { - Some(GithubData { + Some(Github { owner: "owner".to_string(), repo: "repo".to_string(), sha: "sha".to_string(), diff --git a/src/contract_data/comment.rs b/src/verified_contract/comment.rs similarity index 95% rename from src/contract_data/comment.rs rename to src/verified_contract/comment.rs index 5ccd6a9..8037cf7 100644 --- a/src/contract_data/comment.rs +++ b/src/verified_contract/comment.rs @@ -14,5 +14,4 @@ pub struct Comment { pub timestamp: Timestamp, pub description: String, pub votes: HashSet, - pub comments: Vec, } diff --git a/src/contract_data/github_data.rs b/src/verified_contract/github.rs similarity index 92% rename from src/contract_data/github_data.rs rename to src/verified_contract/github.rs index 6987668..2d621a0 100644 --- a/src/contract_data/github_data.rs +++ b/src/verified_contract/github.rs @@ -3,7 +3,7 @@ use near_sdk::serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] #[serde(crate = "near_sdk::serde")] -pub struct GithubData { +pub struct Github { pub owner: String, pub repo: String, pub sha: String, diff --git a/src/contract_data/mod.rs b/src/verified_contract/mod.rs similarity index 81% rename from src/contract_data/mod.rs rename to src/verified_contract/mod.rs index d76a9bf..bad99db 100644 --- a/src/contract_data/mod.rs +++ b/src/verified_contract/mod.rs @@ -1,4 +1,4 @@ -pub mod github_data; +pub mod github; pub mod vote; pub mod comment; @@ -6,17 +6,17 @@ use std::collections::HashSet; use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; use vote::Vote; -use github_data::GithubData; +use github::Github; #[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] #[serde(crate = "near_sdk::serde")] -pub struct ContractData { +pub struct VerifiedContract { pub cid: String, pub lang: String, pub entry_point: String, pub code_hash: String, pub builder_image: String, - pub github: Option, + pub github: Option, pub votes: HashSet, pub comments: Vec, } \ No newline at end of file diff --git a/src/contract_data/vote.rs b/src/verified_contract/vote.rs similarity index 100% rename from src/contract_data/vote.rs rename to src/verified_contract/vote.rs From d210ccdf2fa9351c53709915879181ecdab5eada Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Tue, 16 Jan 2024 13:02:47 +0100 Subject: [PATCH 08/36] implement add_coment --- src/lib.rs | 66 +++++++++++++++++++++----------- src/verified_contract/comment.rs | 2 +- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 4e14e7f..b7d5788 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -80,8 +80,18 @@ impl SourceScan { let action = if existing_contract.is_some() { "updated" } else { "added" }; log!("Contract {} {}", account_id, action); } - - + + pub fn purge_contract(&mut self, account_id: AccountId) { + require!(env::predecessor_account_id() == self.owner_id, "Only owner can call this method"); + + self.contracts.remove(&account_id); + + log!("Contract {} removed", account_id); + } + + pub fn get_contract(&self, account_id: AccountId) -> Option { + return self.contracts.get(&account_id); + } pub fn search(&self, key: String, from_index: usize, limit: usize) -> (Vec<(AccountId, VerifiedContract)>, u64) { let mut result: Vec<(AccountId, VerifiedContract)> = Vec::new(); @@ -103,16 +113,20 @@ impl SourceScan { return (filtered, pages); } - pub fn purge_contract(&mut self, account_id: AccountId) { - require!(env::predecessor_account_id() == self.owner_id, "Only owner can call this method"); + pub fn get_contracts(&self, from_index: usize, limit: usize) -> (Vec<(AccountId, VerifiedContract)>, u64) { + let filtered:Vec<(AccountId, VerifiedContract)> = self.contracts + .iter() + .skip(from_index) + .take(limit) + .collect(); - self.contracts.remove(&account_id); + let pages: u64 = self.get_pages(self.contracts.len(), limit as u64); - log!("Contract {} removed", account_id); + return (filtered, pages); } - pub fn get_contract(&self, account_id: AccountId) -> Option { - return self.contracts.get(&account_id); + fn get_pages (&self, len: u64, limit: u64) -> u64 { + return (len + limit - 1) / limit; } pub fn vote(&mut self, account_id: AccountId, is_upvote: bool) { @@ -149,23 +163,29 @@ impl SourceScan { self.contracts.insert(&account_id, &contract); log!("Vote updated for contract {}", account_id); } + + pub fn add_comment(&mut self, account_id: AccountId, content: String) { + let mut contract: VerifiedContract = self + .contracts + .get(&account_id) + .unwrap_or_else(|| panic!("Contract {} not found", account_id)) + .into(); + let author_id = env::predecessor_account_id(); + let current_timestamp = env::block_timestamp(); - - pub fn get_contracts(&self, from_index: usize, limit: usize) -> (Vec<(AccountId, VerifiedContract)>, u64) { - let filtered:Vec<(AccountId, VerifiedContract)> = self.contracts - .iter() - .skip(from_index) - .take(limit) - .collect(); - - let pages: u64 = self.get_pages(self.contracts.len(), limit as u64); - - return (filtered, pages); - } - - fn get_pages (&self, len: u64, limit: u64) -> u64 { - return (len + limit - 1) / limit; + let new_comment = Comment { + id: self.comments.len() as u64, + author_id: author_id.clone(), + timestamp: current_timestamp, + content: content, + votes: Default::default(), + }; + + contract.comments.push(new_comment.id); + self.comments.push(&new_comment); + self.contracts.insert(&account_id, &contract); + log!("Comment added for contract {}", account_id); } } diff --git a/src/verified_contract/comment.rs b/src/verified_contract/comment.rs index 8037cf7..a84dc39 100644 --- a/src/verified_contract/comment.rs +++ b/src/verified_contract/comment.rs @@ -12,6 +12,6 @@ pub struct Comment { pub author_id: AccountId, #[serde(with = "u64_dec_format")] pub timestamp: Timestamp, - pub description: String, + pub content: String, pub votes: HashSet, } From 6d735b6723e5703c268010207804e930659bc59f Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Tue, 16 Jan 2024 13:44:43 +0100 Subject: [PATCH 09/36] add get_comments and tests --- src/lib.rs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index b7d5788..d1a9655 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -129,7 +129,7 @@ impl SourceScan { return (len + limit - 1) / limit; } - pub fn vote(&mut self, account_id: AccountId, is_upvote: bool) { + pub fn add_vote(&mut self, account_id: AccountId, is_upvote: bool) { let mut contract: VerifiedContract = self .contracts .get(&account_id) @@ -187,6 +187,22 @@ impl SourceScan { self.contracts.insert(&account_id, &contract); log!("Comment added for contract {}", account_id); } + + pub fn get_comments(&self, account_id: AccountId) -> Vec { + let contract: VerifiedContract = self + .contracts + .get(&account_id) + .unwrap_or_else(|| panic!("Contract {} not found", account_id)) + .into(); + + let mut comments: Vec = Vec::new(); + + for comment_id in contract.comments { + comments.push(self.comments.get(comment_id).unwrap()); + } + + return comments; + } } #[cfg(not(target_arch = "wasm32"))] @@ -352,14 +368,14 @@ mod tests { add_contract(&mut contract, accounts(1), false); // Upvote the contract - contract.vote(accounts(1), true); + contract.add_vote(accounts(1), true); let contract_data = contract.get_contract(accounts(1)).unwrap(); assert_eq!(contract_data.votes.len(), 1); assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Upvote)); // Change to downvote - contract.vote(accounts(1), false); + contract.add_vote(accounts(1), false); let contract_data = contract.get_contract(accounts(1)).unwrap(); assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Downvote)); @@ -374,7 +390,7 @@ mod tests { add_contract(&mut contract, accounts(1), false); // Upvote the contract - contract.vote(accounts(1), true); + contract.add_vote(accounts(1), true); // Update the contract add_contract(&mut contract, accounts(1), true); @@ -384,4 +400,36 @@ mod tests { assert!(contract_data.github.is_some()); assert_eq!(contract_data.github.unwrap().owner, "owner"); } + + #[test] + fn test_add_comment() { + let context = get_context(accounts(0)); + testing_env!(context.build()); + + let mut contract = SourceScan::new(); + add_contract(&mut contract, accounts(1), false); + + contract.add_comment(accounts(1), "Sample comment".to_string()); + + let comments = contract.get_comments(accounts(1)); + assert_eq!(comments.len(), 1); + assert_eq!(comments[0].content, "Sample comment"); + } + + #[test] + fn test_get_comments() { + let context = get_context(accounts(0)); + testing_env!(context.build()); + + let mut contract = SourceScan::new(); + add_contract(&mut contract, accounts(1), false); + + contract.add_comment(accounts(1), "First comment".to_string()); + contract.add_comment(accounts(1), "Second comment".to_string()); + + let comments = contract.get_comments(accounts(1)); + assert_eq!(comments.len(), 2); + assert_eq!(comments[0].content, "First comment"); + assert_eq!(comments[1].content, "Second comment"); + } } From f310f29d17fc63b7e77a428b655de6440f877be5 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Tue, 16 Jan 2024 14:08:01 +0100 Subject: [PATCH 10/36] update voting functionality --- src/lib.rs | 74 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index d1a9655..2aaac36 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,8 @@ pub mod str_serializers; pub mod verified_contract; +use std::collections::HashSet; + use verified_contract::VerifiedContract; use verified_contract::comment::Comment; use verified_contract::github::Github; @@ -125,40 +127,14 @@ impl SourceScan { return (filtered, pages); } - fn get_pages (&self, len: u64, limit: u64) -> u64 { - return (len + limit - 1) / limit; - } - - pub fn add_vote(&mut self, account_id: AccountId, is_upvote: bool) { + pub fn vote_contract(&mut self, account_id: AccountId, is_upvote: bool) { let mut contract: VerifiedContract = self .contracts .get(&account_id) .unwrap_or_else(|| panic!("Contract {} not found", account_id)) .into(); - let author_id = env::predecessor_account_id(); - let current_timestamp = env::block_timestamp(); - - let vote_type = if is_upvote { - VoteType::Upvote - } else { - VoteType::Downvote - }; - - let new_vote = Vote { - author_id: author_id.clone(), - timestamp: current_timestamp, - vote_type: vote_type, - }; - - if let Some(mut existing_vote) = contract.votes.take(&new_vote) { - existing_vote.vote_type = vote_type; - existing_vote.timestamp = current_timestamp; - contract.votes.insert(existing_vote); - } else { - // If not, insert the new vote - contract.votes.insert(new_vote); - } + self.update_or_insert_vote(&mut contract.votes, is_upvote); self.contracts.insert(&account_id, &contract); log!("Vote updated for contract {}", account_id); @@ -203,6 +179,42 @@ impl SourceScan { return comments; } + + pub fn vote_comment(&mut self, comment_id: u64, is_upvote: bool) { + require!(self.comments.get(comment_id).is_some(), "Comment not found"); + + let mut comment: Comment = self + .comments + .get(comment_id) + .unwrap_or_else(|| panic!("Comment {} not found", comment_id)) + .into(); + + self.update_or_insert_vote(&mut comment.votes, is_upvote); + + self.comments.replace(comment_id, &comment); + log!("Vote updated for comment {}", comment_id); + } + + fn get_pages (&self, len: u64, limit: u64) -> u64 { + return (len + limit - 1) / limit; + } + + fn update_or_insert_vote(&self, votes: &mut HashSet, is_upvote: bool) { + let author_id = env::predecessor_account_id(); + let current_timestamp = env::block_timestamp(); + let vote_type = if is_upvote { VoteType::Upvote } else { VoteType::Downvote }; + + let new_vote = Vote { + author_id: author_id.clone(), + timestamp: current_timestamp, + vote_type: vote_type, + }; + + // Remove the old vote if it exists + votes.take(&new_vote); + // Insert the new vote + votes.insert(new_vote); + } } #[cfg(not(target_arch = "wasm32"))] @@ -368,14 +380,14 @@ mod tests { add_contract(&mut contract, accounts(1), false); // Upvote the contract - contract.add_vote(accounts(1), true); + contract.vote_contract(accounts(1), true); let contract_data = contract.get_contract(accounts(1)).unwrap(); assert_eq!(contract_data.votes.len(), 1); assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Upvote)); // Change to downvote - contract.add_vote(accounts(1), false); + contract.vote_contract(accounts(1), false); let contract_data = contract.get_contract(accounts(1)).unwrap(); assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Downvote)); @@ -390,7 +402,7 @@ mod tests { add_contract(&mut contract, accounts(1), false); // Upvote the contract - contract.add_vote(accounts(1), true); + contract.vote_contract(accounts(1), true); // Update the contract add_contract(&mut contract, accounts(1), true); From d07eb422c60da9b6efd14e2e1224b84db3049e1b Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Tue, 16 Jan 2024 14:18:26 +0100 Subject: [PATCH 11/36] add tests for comment voting --- src/lib.rs | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 2aaac36..edb6764 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -437,11 +437,48 @@ mod tests { add_contract(&mut contract, accounts(1), false); contract.add_comment(accounts(1), "First comment".to_string()); - contract.add_comment(accounts(1), "Second comment".to_string()); + contract.add_comment( accounts(1), "Second comment".to_string()); let comments = contract.get_comments(accounts(1)); assert_eq!(comments.len(), 2); assert_eq!(comments[0].content, "First comment"); assert_eq!(comments[1].content, "Second comment"); } + + #[test] + fn test_vote_comment_upvote() { + let context = get_context(accounts(0)); + testing_env!(context.build()); + + let mut contract = SourceScan::new(); + add_contract(&mut contract, accounts(1), false); + + contract.add_comment(accounts(1), "Another Test Comment".to_string()); + + let comment_id = 0; // Assuming this is the first comment added, its id will be 0 + + contract.vote_comment(comment_id, true); // Upvote the comment + + let comment = contract.comments.get(comment_id).unwrap(); + assert_eq!(comment.votes.len(), 1); + assert!(matches!(comment.votes.iter().next().unwrap().vote_type, VoteType::Upvote)); + } + + #[test] + fn test_vote_comment_downvote() { + let context = get_context(accounts(0)); + testing_env!(context.build()); + + let mut contract = SourceScan::new(); + add_contract(&mut contract, accounts(1), false); + + contract.add_comment(accounts(1), "Another Test Comment".to_string()); + + let comment_id = 0; // Assuming this is the first comment added, its id will be 0 + + contract.vote_comment(comment_id, false); + let comment = contract.comments.get(comment_id).unwrap(); + assert_eq!(comment.votes.len(), 1); + assert!(matches!(comment.votes.iter().next().unwrap().vote_type, VoteType::Downvote)); + } } From 728c09b4bb31972bd5e61f3a4e8b68aae9e9c367 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Thu, 18 Jan 2024 17:06:56 +0100 Subject: [PATCH 12/36] add builder script to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index ea8c4bf..f4dd9c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /target + +builder.sh +build.sh \ No newline at end of file From 313ee926d7c3278ec44e9a9e3d3356d534ff2a80 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 21 Jan 2024 12:07:27 +0100 Subject: [PATCH 13/36] add pagination for comments --- src/lib.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index edb6764..caaf241 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -164,7 +164,7 @@ impl SourceScan { log!("Comment added for contract {}", account_id); } - pub fn get_comments(&self, account_id: AccountId) -> Vec { + pub fn get_comments(&self, account_id: AccountId, from_index: usize, limit: usize) -> (Vec, u64) { let contract: VerifiedContract = self .contracts .get(&account_id) @@ -177,7 +177,14 @@ impl SourceScan { comments.push(self.comments.get(comment_id).unwrap()); } - return comments; + let pages: u64 = self.get_pages(comments.len() as u64, limit as u64); + let filtered: Vec = comments + .into_iter() + .skip(from_index) + .take(limit) + .collect(); + + return (filtered, pages); } pub fn vote_comment(&mut self, comment_id: u64, is_upvote: bool) { @@ -423,7 +430,8 @@ mod tests { contract.add_comment(accounts(1), "Sample comment".to_string()); - let comments = contract.get_comments(accounts(1)); + // Adjusted to include from_index and limit + let (comments, _) = contract.get_comments(accounts(1), 0, 10); assert_eq!(comments.len(), 1); assert_eq!(comments[0].content, "Sample comment"); } @@ -437,12 +445,14 @@ mod tests { add_contract(&mut contract, accounts(1), false); contract.add_comment(accounts(1), "First comment".to_string()); - contract.add_comment( accounts(1), "Second comment".to_string()); + contract.add_comment(accounts(1), "Second comment".to_string()); - let comments = contract.get_comments(accounts(1)); + // Adjusted to include from_index and limit + let (comments, pages) = contract.get_comments(accounts(1), 0, 10); assert_eq!(comments.len(), 2); assert_eq!(comments[0].content, "First comment"); assert_eq!(comments[1].content, "Second comment"); + assert_eq!(pages, 1); } #[test] From 7f6bcf3f9aa4ecd3f78827cd505218e836bdb079 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 21 Jan 2024 14:30:21 +0100 Subject: [PATCH 14/36] add sort by upvotes --- src/lib.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index caaf241..44d52e4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -177,6 +177,13 @@ impl SourceScan { comments.push(self.comments.get(comment_id).unwrap()); } + // sort by upvotes + comments.sort_by(|a, b| { + let a = a.votes.iter().filter(|&v| matches!(v.vote_type, VoteType::Upvote)).count(); + let b = b.votes.iter().filter(|&v| matches!(v.vote_type, VoteType::Upvote)).count(); + b.cmp(&a) + }); + let pages: u64 = self.get_pages(comments.len() as u64, limit as u64); let filtered: Vec = comments .into_iter() From 50e7328c905368fb8e5ea949afd3c84306a4161b Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 15:46:22 +0200 Subject: [PATCH 15/36] update contract sdk --- Cargo.lock | 745 ++++++++++--------------------- Cargo.toml | 14 +- src/lib.rs | 279 ++++++------ src/verified_contract/comment.rs | 5 +- src/verified_contract/github.rs | 10 - src/verified_contract/mod.rs | 16 +- src/verified_contract/vote.rs | 27 +- 7 files changed, 419 insertions(+), 677 deletions(-) delete mode 100644 src/verified_contract/github.rs diff --git a/Cargo.lock b/Cargo.lock index 0248998..9c1f76e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,18 +92,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ahash" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.2" @@ -191,23 +179,17 @@ dependencies = [ "derive_arbitrary", ] -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "arrayvec" -version = "0.7.4" +name = "assert_matches" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-stream" @@ -259,12 +241,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.13.1" @@ -313,28 +289,16 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "bitvec" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" -dependencies = [ - "funty 1.1.0", - "radium 0.6.2", - "tap", - "wyz 0.2.0", -] - [[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "funty 2.0.0", - "radium 0.7.0", + "funty", + "radium", "tap", - "wyz 0.5.1", + "wyz", ] [[package]] @@ -348,15 +312,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -378,21 +333,11 @@ dependencies = [ [[package]] name = "borsh" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" -dependencies = [ - "borsh-derive 0.10.3", - "hashbrown 0.13.2", -] - -[[package]] -name = "borsh" -version = "1.1.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a744ac76a433734df0902926ed12edd997391a8da3add87f6d706afc2dcbea" +checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77" dependencies = [ - "borsh-derive 1.1.2", + "borsh-derive 1.5.0", "cfg_aliases", ] @@ -402,21 +347,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ - "borsh-derive-internal 0.9.3", - "borsh-schema-derive-internal 0.9.3", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal 0.10.3", - "borsh-schema-derive-internal 0.10.3", + "borsh-derive-internal", + "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2", "syn 1.0.109", @@ -424,12 +356,12 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.1.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22bf794b9f8c87b51ea4d9e2710907ce13aa81dd2b8ac18a78fcca68ac738ef" +checksum = "d7a8646f94ab393e43e8b35a2558b1624bed28b97ee09c5d15456e3c9463f46d" dependencies = [ "once_cell", - "proc-macro-crate 2.0.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.46", @@ -447,17 +379,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "borsh-schema-derive-internal" version = "0.9.3" @@ -469,24 +390,13 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "brownstone" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "030ea61398f34f1395ccbeb046fb68c87b631d1f34567fed0f0f11fa35d18d8d" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", ] [[package]] @@ -510,12 +420,6 @@ version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" -[[package]] -name = "byte-slice-cast" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" - [[package]] name = "byteorder" version = "1.5.0" @@ -597,7 +501,7 @@ dependencies = [ "rustc_version", "schemars", "serde_json", - "sha2 0.10.8", + "sha2", "symbolic-debuginfo", "zstd", ] @@ -888,17 +792,33 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if 1.0.0", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms", + "rand_core 0.6.4", + "rustc_version", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.46", +] + [[package]] name = "darling" version = "0.20.3" @@ -992,7 +912,7 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", "subtle", ] @@ -1038,25 +958,24 @@ checksum = "53aff6fdc1b181225acdcb5b14c47106726fd8e486707315b1b138baed68ee31" [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", + "rand_core 0.6.4", + "sha2", + "subtle", ] [[package]] @@ -1145,6 +1064,12 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "filetime" version = "0.2.23" @@ -1163,9 +1088,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ - "byteorder", - "rand 0.8.5", - "rustc-hex", "static_assertions", ] @@ -1225,12 +1147,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "funty" version = "2.0.0" @@ -1391,7 +1307,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.7", + "ahash", ] [[package]] @@ -1400,15 +1316,6 @@ 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 0.8.7", -] - [[package]] name = "hashbrown" version = "0.14.3" @@ -1600,26 +1507,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "impl-codec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" -dependencies = [ - "parity-scale-codec", -] - -[[package]] -name = "impl-trait-for-tuples" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "indent_write" version = "2.2.0" @@ -1731,9 +1618,9 @@ checksum = "9dbbfed4e59ba9750e15ba154fdfd9329cee16ff3df539c2666b70f58cc32105" [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -1826,6 +1713,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + [[package]] name = "memory_units" version = "0.4.0" @@ -1902,51 +1798,42 @@ dependencies = [ [[package]] name = "near-account-id" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d258582a1878e6db67400b0504a5099db85718d22c2e07f747fe1706ae7150" -dependencies = [ - "borsh 0.9.3", - "serde", -] - -[[package]] -name = "near-account-id" -version = "0.17.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0cb40869cab7f5232f934f45db35bffe0f2d2a7cb0cd0346202fbe4ebf2dd7" +checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" dependencies = [ - "borsh 0.10.3", + "borsh 1.5.0", "serde", ] [[package]] name = "near-chain-configs" -version = "0.17.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f9a1c805846237d56f99b328ba6ab77e5d43ef59aaaf8d2a41d42fdc708a7b" +checksum = "d05e5a8ace81c09d7eb165dffc1742358a021b2fa761f2160943305f83216003" dependencies = [ "anyhow", + "bytesize", "chrono", "derive_more", "near-config-utils", - "near-crypto 0.17.0", - "near-o11y", - "near-primitives 0.17.0", + "near-crypto", + "near-parameters", + "near-primitives", "num-rational", "once_cell", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "smart-default", "tracing", ] [[package]] name = "near-config-utils" -version = "0.17.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5523e7dce493c45bc3241eb3100d943ec471852f9b1f84b46a34789eadf17031" +checksum = "2ae1eaab1d545a9be7a55b6ef09f365c2017f93a03063547591d12c0c6d27e58" dependencies = [ "anyhow", "json_comments", @@ -1955,46 +1842,29 @@ dependencies = [ ] [[package]] -name = "near-crypto" -version = "0.14.0" +name = "near-contract-standards" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e75673d69fd7365508f3d32483669fe45b03bfb34e4d9363e90adae9dfb416c" +checksum = "a0e78fe14d389ae76f792735a2108a6b8332a2bed61197310bf5ad718fb1e424" dependencies = [ - "arrayref", - "blake2", - "borsh 0.9.3", - "bs58 0.4.0", - "c2-chacha", - "curve25519-dalek", - "derive_more", - "ed25519-dalek", - "near-account-id 0.14.0", - "once_cell", - "parity-secp256k1", - "primitive-types", - "rand 0.7.3", - "rand_core 0.5.1", - "serde", - "serde_json", - "subtle", - "thiserror", + "near-sdk", ] [[package]] name = "near-crypto" -version = "0.17.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6b382b626e7e0cd372d027c6672ac97b4b6ee6114288c9e58d8180b935d315" +checksum = "2991d2912218a80ec0733ac87f84fa803accea105611eea209d4419271957667" dependencies = [ "blake2", - "borsh 0.10.3", + "borsh 1.5.0", "bs58 0.4.0", "c2-chacha", "curve25519-dalek", "derive_more", "ed25519-dalek", "hex", - "near-account-id 0.17.0", + "near-account-id", "near-config-utils", "near-stdx", "once_cell", @@ -2009,11 +1879,11 @@ dependencies = [ [[package]] name = "near-fmt" -version = "0.17.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44c842c6cfcd9b8c387cccd4cd0619a5f21920cde5d5c292af3cc5d40510672" +checksum = "b7d998dfc1e04001608899b2498ad5a782c7d036b73769d510de21964db99286" dependencies = [ - "near-primitives-core 0.17.0", + "near-primitives-core", ] [[package]] @@ -2022,24 +1892,24 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14e75c875026229902d065e4435804497337b631ec69ba746b102954273e9ad1" dependencies = [ - "borsh 1.1.2", + "borsh 1.5.0", "schemars", "serde", ] [[package]] name = "near-jsonrpc-client" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "118f44c02ad211db805c1370ad3ff26576af6ff554093c9fece1b835d29d233a" +checksum = "18ad81e015f7aced8925d5b9ba3f369b36da9575c15812cfd0786bc1213284ca" dependencies = [ - "borsh 0.10.3", + "borsh 1.5.0", "lazy_static", "log", "near-chain-configs", - "near-crypto 0.17.0", + "near-crypto", "near-jsonrpc-primitives", - "near-primitives 0.17.0", + "near-primitives", "reqwest", "serde", "serde_json", @@ -2048,15 +1918,15 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "0.17.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b2934b5ab243e25e951c984525ba0aff0e719ed915c988c5195405aa0f6987" +checksum = "b0ce745e954ae776eef05957602e638ee9581106a3675946fb43c2fe7e38ef03" dependencies = [ "arbitrary", "near-chain-configs", - "near-crypto 0.17.0", - "near-primitives 0.17.0", - "near-rpc-error-macro 0.17.0", + "near-crypto", + "near-primitives", + "near-rpc-error-macro", "serde", "serde_json", "thiserror", @@ -2064,22 +1934,24 @@ dependencies = [ [[package]] name = "near-o11y" -version = "0.17.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7d35397b02b131c188c72f3885e97daeccab134ec2fc8cc0073a94cf1cfe19" +checksum = "d20762631bc8253030013bbae9b5f0542691edc1aa6722f1e8141cc9b928ae5b" dependencies = [ "actix", - "atty", + "base64 0.21.5", "clap 4.4.12", - "near-crypto 0.17.0", - "near-primitives-core 0.17.0", + "near-crypto", + "near-fmt", + "near-primitives-core", "once_cell", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", "prometheus", "serde", - "strum", + "serde_json", + "strum 0.24.1", "thiserror", "tokio", "tracing", @@ -2089,42 +1961,33 @@ dependencies = [ ] [[package]] -name = "near-primitives" -version = "0.14.0" +name = "near-parameters" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad1a9a1640539c81f065425c31bffcfbf6b31ef1aeaade59ce905f5df6ac860" +checksum = "e9f16a59b6c3e69b0585be951af6fe42a0ba86c0e207cb8c63badd19efd16680" dependencies = [ - "borsh 0.9.3", - "byteorder", - "bytesize", - "chrono", - "derive_more", - "easy-ext", - "hex", - "near-crypto 0.14.0", - "near-primitives-core 0.14.0", - "near-rpc-error-macro 0.14.0", - "near-vm-errors 0.14.0", + "assert_matches", + "borsh 1.5.0", + "enum-map", + "near-account-id", + "near-primitives-core", "num-rational", - "once_cell", - "primitive-types", - "rand 0.7.3", - "reed-solomon-erasure", "serde", - "serde_json", - "smart-default", - "strum", + "serde_repr", + "serde_yaml", + "strum 0.24.1", "thiserror", ] [[package]] name = "near-primitives" -version = "0.17.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f7051aaf199adc4d068620fca6d5f70f906a1540d03a8bb3701271f8881835" +checksum = "0462b067732132babcc89d5577db3bfcb0a1bcfbaaed3f2db4c11cd033666314" dependencies = [ "arbitrary", - "borsh 0.10.3", + "base64 0.21.5", + "borsh 1.5.0", "bytesize", "cfg-if 1.0.0", "chrono", @@ -2132,23 +1995,27 @@ dependencies = [ "easy-ext", "enum-map", "hex", - "near-crypto 0.17.0", + "near-crypto", "near-fmt", - "near-primitives-core 0.17.0", - "near-rpc-error-macro 0.17.0", + "near-o11y", + "near-parameters", + "near-primitives-core", + "near-rpc-error-macro", "near-stdx", - "near-vm-errors 0.17.0", + "near-vm-runner", "num-rational", "once_cell", "primitive-types", "rand 0.8.5", + "rand_chacha 0.3.1", "reed-solomon-erasure", "serde", "serde_json", "serde_with", "serde_yaml", + "sha3", "smart-default", - "strum", + "strum 0.24.1", "thiserror", "time", "tracing", @@ -2156,59 +2023,31 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "0.14.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d508f0fc340f6461e4e256417685720d3c4c00bb5a939b105160e49137caba" -dependencies = [ - "base64 0.11.0", - "borsh 0.9.3", - "bs58 0.4.0", - "derive_more", - "near-account-id 0.14.0", - "num-rational", - "serde", - "sha2 0.10.8", - "strum", -] - -[[package]] -name = "near-primitives-core" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775fec19ef51a341abdbf792a9dda5b4cb89f488f681b2fd689b9321d24db47b" +checksum = "8443eb718606f572c438be6321a097a8ebd69f8e48d953885b4f16601af88225" dependencies = [ "arbitrary", "base64 0.21.5", - "borsh 0.10.3", + "borsh 1.5.0", "bs58 0.4.0", "derive_more", "enum-map", - "near-account-id 0.17.0", + "near-account-id", "num-rational", "serde", "serde_repr", "serde_with", - "sha2 0.10.8", - "strum", + "sha2", + "strum 0.24.1", "thiserror", ] [[package]] name = "near-rpc-error-core" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ee0b41c75ef859c193a8ff1dadfa0c8207bc0ac447cc22259721ad769a1408" -dependencies = [ - "quote", - "serde", - "syn 1.0.109", -] - -[[package]] -name = "near-rpc-error-core" -version = "0.17.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c1eda300e2e78f4f945ae58117d49e806899f4a51ee2faa09eda5ebc2e6571" +checksum = "80fca203c51edd9595ec14db1d13359fb9ede32314990bf296b6c5c4502f6ab7" dependencies = [ "quote", "serde", @@ -2217,23 +2056,12 @@ dependencies = [ [[package]] name = "near-rpc-error-macro" -version = "0.14.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e837bd4bacd807073ec5ceb85708da7f721b46a4c2a978de86027fb0034ce31" -dependencies = [ - "near-rpc-error-core 0.14.0", - "serde", - "syn 1.0.109", -] - -[[package]] -name = "near-rpc-error-macro" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d2dadd765101c77e664029dd6fbec090e696877d4ae903c620d02ceda4969a" +checksum = "897a445de2102f6732c8a185d922f5e3bf7fd0a41243ce40854df2197237f799" dependencies = [ "fs2", - "near-rpc-error-core 0.17.0", + "near-rpc-error-core", "serde", "syn 2.0.46", ] @@ -2254,22 +2082,24 @@ dependencies = [ [[package]] name = "near-sdk" -version = "4.1.1" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eb3de2defe3626260cc209a6cdb985c6b27b0bd4619fad97dcfae002c3c5bd" +checksum = "520234cfdf04a805ac2f04715889d096eb83fdd5b99ca7d0f8027ae473f891a8" dependencies = [ - "base64 0.13.1", - "borsh 0.9.3", - "bs58 0.4.0", - "near-abi", - "near-crypto 0.14.0", - "near-primitives 0.14.0", - "near-primitives-core 0.14.0", + "base64 0.21.5", + "borsh 1.5.0", + "bs58 0.5.0", + "near-account-id", + "near-crypto", + "near-gas", + "near-parameters", + "near-primitives", + "near-primitives-core", "near-sdk-macros", "near-sys", - "near-vm-logic", + "near-token", + "near-vm-runner", "once_cell", - "schemars", "serde", "serde_json", "wee_alloc", @@ -2277,21 +2107,26 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "4.1.1" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4907affc9f5ed559456509188ff0024f1f2099c0830e6bdb66eb61d5b75912c0" +checksum = "ee2fe3fc30068c5f20e89b0985d6104c5cc1c6742dbc6efbf352be4189b9bbf7" dependencies = [ "Inflector", + "darling", "proc-macro2", "quote", - "syn 1.0.109", + "serde", + "serde_json", + "strum 0.26.2", + "strum_macros 0.26.2", + "syn 2.0.46", ] [[package]] name = "near-stdx" -version = "0.17.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6540152fba5e96fe5d575b79e8cd244cf2add747bb01362426bdc069bc3a23bc" +checksum = "855fd5540e3b4ff6fedf12aba2db1ee4b371b36f465da1363a6d022b27cb43b8" [[package]] name = "near-sys" @@ -2305,66 +2140,48 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b68f3f8a2409f72b43efdbeff8e820b81e70824c49fee8572979d789d1683fb" dependencies = [ + "borsh 1.5.0", "serde", ] [[package]] -name = "near-vm-errors" -version = "0.14.0" +name = "near-vm-runner" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0da466a30f0446639cbd788c30865086fac3e8dcb07a79e51d2b0775ed4261e" +checksum = "c56c80bdb1954808f59bd36a9112377197b38d424991383bf05f52d0fe2e0da5" dependencies = [ - "borsh 0.9.3", - "near-account-id 0.14.0", - "near-rpc-error-macro 0.14.0", - "serde", -] - -[[package]] -name = "near-vm-errors" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec545d1bede0579e7c15dd2dce9b998dc975c52f2165702ff40bec7ff69728bb" -dependencies = [ - "borsh 0.10.3", - "near-account-id 0.17.0", - "near-rpc-error-macro 0.17.0", - "serde", - "strum", - "thiserror", -] - -[[package]] -name = "near-vm-logic" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b534828419bacbf1f7b11ef7b00420f248c548c485d3f0cfda8bb6931152f2" -dependencies = [ - "base64 0.13.1", - "borsh 0.9.3", - "bs58 0.4.0", - "byteorder", - "near-account-id 0.14.0", - "near-crypto 0.14.0", - "near-primitives 0.14.0", - "near-primitives-core 0.14.0", - "near-vm-errors 0.14.0", + "base64 0.21.5", + "borsh 1.5.0", + "ed25519-dalek", + "enum-map", + "memoffset", + "near-crypto", + "near-parameters", + "near-primitives-core", + "near-stdx", + "num-rational", + "once_cell", + "prefix-sum-vec", "ripemd", "serde", - "sha2 0.10.8", + "serde_repr", + "serde_with", + "sha2", "sha3", + "strum 0.24.1", + "thiserror", + "tracing", "zeropool-bn", ] [[package]] name = "near-workspaces" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a14e772e49ba9644c06dad20f635b6463f74d378fa19822bfc35fef479c72e5" +checksum = "a3e597da87d0c1a722e23efb8c24ae42a0ad99a15f37101dad45c15defb051c1" dependencies = [ "async-trait", "base64 0.21.5", - "borsh 0.10.3", "bs58 0.5.0", "cargo-near", "cargo_metadata 0.18.1", @@ -2372,19 +2189,19 @@ dependencies = [ "fs2", "json-patch", "libc", - "near-account-id 0.17.0", - "near-crypto 0.17.0", + "near-account-id", + "near-crypto", "near-gas", "near-jsonrpc-client", "near-jsonrpc-primitives", - "near-primitives 0.17.0", + "near-primitives", "near-sandbox-utils", "near-token", "rand 0.8.5", "reqwest", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "tempfile", "thiserror", "tokio", @@ -2601,43 +2418,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parity-scale-codec" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" -dependencies = [ - "arrayvec 0.7.4", - "bitvec 0.20.4", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "parity-secp256k1" -version = "0.7.0" -source = "git+https://github.com/SourceScan/rust-secp256k1?branch=master#d05fd8e152f8d110b587906e3d854196b086e42a" -dependencies = [ - "arrayvec 0.5.2", - "cc", - "cfg-if 0.1.10", - "rand 0.7.3", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -2681,7 +2461,7 @@ dependencies = [ "digest 0.10.7", "hmac", "password-hash", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -2764,6 +2544,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +[[package]] +name = "platforms" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" + [[package]] name = "powerfmt" version = "0.2.0" @@ -2782,6 +2568,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "prefix-sum-vec" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa06bd51638b6e76ac9ba9b6afb4164fa647bd2916d722f2623fbb6d1ed8bdba" + [[package]] name = "primitive-types" version = "0.10.1" @@ -2789,7 +2581,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash", - "impl-codec", "uint", ] @@ -2804,22 +2595,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit", ] [[package]] @@ -2938,12 +2718,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - [[package]] name = "radium" version = "0.7.0" @@ -3462,19 +3236,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.8" @@ -3516,9 +3277,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" [[package]] name = "siphasher" @@ -3622,9 +3383,15 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros", + "strum_macros 0.24.3", ] +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" + [[package]] name = "strum_macros" version = "0.24.3" @@ -3638,6 +3405,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.46", +] + [[package]] name = "subtle" version = "2.5.0" @@ -3662,7 +3442,7 @@ version = "8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1165dabf9fc1d6bb6819c2c0e27c8dd0e3068d2c53cf186d319788e96517f0d6" dependencies = [ - "bitvec 1.0.1", + "bitvec", "dmsort", "elementtree", "fallible-iterator", @@ -3971,26 +3751,15 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" - -[[package]] -name = "toml_edit" -version = "0.19.15" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.1.0", - "toml_datetime", - "winnow", -] +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.1.0", "toml_datetime", @@ -4309,6 +4078,7 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" name = "verifier-contract" version = "0.1.0" dependencies = [ + "near-contract-standards", "near-sdk", "near-workspaces", "serde_json", @@ -4645,12 +4415,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "wyz" version = "0.5.1" @@ -4677,45 +4441,11 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.46", -] - [[package]] name = "zeroize" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.46", -] [[package]] name = "zeropool-bn" @@ -4723,7 +4453,6 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e61de68ede9ffdd69c01664f65a178c5188b73f78faa21f0936016a888ff7c" dependencies = [ - "borsh 0.9.3", "byteorder", "crunchy", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 39847a3..445d923 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,17 +11,21 @@ edition = "2021" [lib] crate-type = ["cdylib", "rlib"] -[patch.crates-io] -parity-secp256k1 = { git = "https://github.com/SourceScan/rust-secp256k1", branch = "master" } +[package.metadata.near.reproducible_build] +image = "sourcescan/cargo-near:0.6.0-rust-1.78.0" +image_digest = "sha256:67886aed542554b60dde311e2b004a4a9798225a0db7a298549fc6b6c5484d23" +container_build_command = "cargo near build" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -near-sdk = "4.1.1" +near-sdk = { version = "5.1.0", features = ["unstable"] } +near-contract-standards = "5.1.0" serde_json = { version = "1.0", features = ["preserve_order"] } [dev-dependencies] -near-workspaces = { version = "0.9.0", default-features = false, features = ["install", "unstable"] } -tokio = { version = "1.12.0", features = ["full"] } +near-sdk = { version = "5.1.0", features = ["unit-testing"] } +near-workspaces = { version = "0.10.0", features = ["unstable"], default-features = false } +tokio = { version = "1.10.0", features = ["full"] } serde_json = { version = "1.0", features = ["preserve_order"] } [profile.release] diff --git a/src/lib.rs b/src/lib.rs index 44d52e4..6d7c884 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,23 +3,22 @@ pub mod verified_contract; use std::collections::HashSet; -use verified_contract::VerifiedContract; -use verified_contract::comment::Comment; -use verified_contract::github::Github; -use verified_contract::vote::{VoteType, Vote}; -use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; +use near_sdk::borsh::BorshSerialize; use near_sdk::collections::{UnorderedMap, Vector}; -use near_sdk::{env, near_bindgen, AccountId, BorshStorageKey, require, log}; +use near_sdk::{env, log, near, require, AccountId, BorshStorageKey}; +use verified_contract::comment::Comment; +use verified_contract::vote::{Vote, VoteType}; +use verified_contract::VerifiedContract; -#[near_bindgen] -#[derive(BorshDeserialize, BorshSerialize)] +#[near(contract_state)] pub struct SourceScan { owner_id: AccountId, contracts: UnorderedMap, - comments: Vector + comments: Vector, } #[derive(BorshSerialize, BorshStorageKey)] +#[borsh(crate = "near_sdk::borsh")] enum StorageKey { VerifiedContracts, Comments, @@ -28,15 +27,15 @@ enum StorageKey { impl Default for SourceScan { fn default() -> Self { panic!("SourceScan should be initialized before usage") - } + } } -#[near_bindgen] +#[near] impl SourceScan { #[init] pub fn new() -> Self { assert!(!env::state_exists(), "Already initialized"); - + Self { owner_id: env::predecessor_account_id(), contracts: UnorderedMap::new(StorageKey::VerifiedContracts), @@ -45,7 +44,10 @@ impl SourceScan { } pub fn set_owner(&mut self, owner_id: AccountId) { - require!(env::predecessor_account_id() == self.owner_id, "Only owner can call this method"); + require!( + env::predecessor_account_id() == self.owner_id, + "Only owner can call this method" + ); self.owner_id = owner_id; @@ -56,71 +58,91 @@ impl SourceScan { return self.owner_id.clone(); } - pub fn set_contract(&mut self, account_id: AccountId, cid: String, code_hash: String, lang: String, entry_point: String, builder_image: String, github: Option) { - require!(env::predecessor_account_id() == self.owner_id, "Only owner can call this method"); - + pub fn set_contract( + &mut self, + account_id: AccountId, + cid: String, + code_hash: String, + lang: String, + ) { + require!( + env::predecessor_account_id() == self.owner_id, + "Only owner can call this method" + ); + let existing_contract: Option = self.contracts.get(&account_id); - - self.contracts.insert(&account_id, &VerifiedContract { - cid, - code_hash, - lang, - entry_point, - builder_image, - votes: existing_contract.as_ref().map_or(Default::default(), |c| c.votes.clone()), - comments: existing_contract.as_ref().map_or(Default::default(), |c| c.comments.clone()), - github: match github { - Some(github_data) => Some(Github { - owner: github_data.owner, - repo: github_data.repo, - sha: github_data.sha, - }), - None => None, + + self.contracts.insert( + &account_id, + &VerifiedContract { + cid, + code_hash, + lang, + votes: existing_contract + .as_ref() + .map_or(Default::default(), |c| c.votes.clone()), + comments: existing_contract + .as_ref() + .map_or(Default::default(), |c| c.comments.clone()), }, - }); - - let action = if existing_contract.is_some() { "updated" } else { "added" }; + ); + + let action = if existing_contract.is_some() { + "updated" + } else { + "added" + }; log!("Contract {} {}", account_id, action); } pub fn purge_contract(&mut self, account_id: AccountId) { - require!(env::predecessor_account_id() == self.owner_id, "Only owner can call this method"); + require!( + env::predecessor_account_id() == self.owner_id, + "Only owner can call this method" + ); self.contracts.remove(&account_id); log!("Contract {} removed", account_id); } - pub fn get_contract(&self, account_id: AccountId) -> Option { + pub fn get_contract(&self, account_id: AccountId) -> Option { return self.contracts.get(&account_id); } - pub fn search(&self, key: String, from_index: usize, limit: usize) -> (Vec<(AccountId, VerifiedContract)>, u64) { + pub fn search( + &self, + key: String, + from_index: usize, + limit: usize, + ) -> (Vec<(AccountId, VerifiedContract)>, u64) { let mut result: Vec<(AccountId, VerifiedContract)> = Vec::new(); - for (k, v) in self.contracts.iter() - { - if k.as_str().to_lowercase().replace(".testnet", "").replace(".near", "").contains(&key.to_lowercase()) { + for (k, v) in self.contracts.iter() { + if k.as_str() + .to_lowercase() + .replace(".testnet", "") + .replace(".near", "") + .contains(&key.to_lowercase()) + { result.push((k, v)); } } - + let pages: u64 = self.get_pages(result.len() as u64, limit as u64); - let filtered: Vec<(AccountId, VerifiedContract)> = result - .into_iter() - .skip(from_index) - .take(limit) - .collect(); + let filtered: Vec<(AccountId, VerifiedContract)> = + result.into_iter().skip(from_index).take(limit).collect(); return (filtered, pages); } - pub fn get_contracts(&self, from_index: usize, limit: usize) -> (Vec<(AccountId, VerifiedContract)>, u64) { - let filtered:Vec<(AccountId, VerifiedContract)> = self.contracts - .iter() - .skip(from_index) - .take(limit) - .collect(); + pub fn get_contracts( + &self, + from_index: usize, + limit: usize, + ) -> (Vec<(AccountId, VerifiedContract)>, u64) { + let filtered: Vec<(AccountId, VerifiedContract)> = + self.contracts.iter().skip(from_index).take(limit).collect(); let pages: u64 = self.get_pages(self.contracts.len(), limit as u64); @@ -133,9 +155,9 @@ impl SourceScan { .get(&account_id) .unwrap_or_else(|| panic!("Contract {} not found", account_id)) .into(); - + self.update_or_insert_vote(&mut contract.votes, is_upvote); - + self.contracts.insert(&account_id, &contract); log!("Vote updated for contract {}", account_id); } @@ -146,10 +168,10 @@ impl SourceScan { .get(&account_id) .unwrap_or_else(|| panic!("Contract {} not found", account_id)) .into(); - + let author_id = env::predecessor_account_id(); let current_timestamp = env::block_timestamp(); - + let new_comment = Comment { id: self.comments.len() as u64, author_id: author_id.clone(), @@ -157,73 +179,86 @@ impl SourceScan { content: content, votes: Default::default(), }; - + contract.comments.push(new_comment.id); self.comments.push(&new_comment); self.contracts.insert(&account_id, &contract); log!("Comment added for contract {}", account_id); } - pub fn get_comments(&self, account_id: AccountId, from_index: usize, limit: usize) -> (Vec, u64) { + pub fn get_comments( + &self, + account_id: AccountId, + from_index: usize, + limit: usize, + ) -> (Vec, u64) { let contract: VerifiedContract = self .contracts .get(&account_id) .unwrap_or_else(|| panic!("Contract {} not found", account_id)) .into(); - + let mut comments: Vec = Vec::new(); - + for comment_id in contract.comments { comments.push(self.comments.get(comment_id).unwrap()); } - + // sort by upvotes comments.sort_by(|a, b| { - let a = a.votes.iter().filter(|&v| matches!(v.vote_type, VoteType::Upvote)).count(); - let b = b.votes.iter().filter(|&v| matches!(v.vote_type, VoteType::Upvote)).count(); + let a = a + .votes + .iter() + .filter(|&v| matches!(v.vote_type, VoteType::Upvote)) + .count(); + let b = b + .votes + .iter() + .filter(|&v| matches!(v.vote_type, VoteType::Upvote)) + .count(); b.cmp(&a) }); let pages: u64 = self.get_pages(comments.len() as u64, limit as u64); - let filtered: Vec = comments - .into_iter() - .skip(from_index) - .take(limit) - .collect(); + let filtered: Vec = comments.into_iter().skip(from_index).take(limit).collect(); return (filtered, pages); } - pub fn vote_comment(&mut self, comment_id: u64, is_upvote: bool) { + pub fn vote_comment(&mut self, comment_id: u64, is_upvote: bool) { require!(self.comments.get(comment_id).is_some(), "Comment not found"); - + let mut comment: Comment = self .comments .get(comment_id) .unwrap_or_else(|| panic!("Comment {} not found", comment_id)) .into(); - + self.update_or_insert_vote(&mut comment.votes, is_upvote); - + self.comments.replace(comment_id, &comment); log!("Vote updated for comment {}", comment_id); } - fn get_pages (&self, len: u64, limit: u64) -> u64 { + fn get_pages(&self, len: u64, limit: u64) -> u64 { return (len + limit - 1) / limit; } fn update_or_insert_vote(&self, votes: &mut HashSet, is_upvote: bool) { let author_id = env::predecessor_account_id(); let current_timestamp = env::block_timestamp(); - let vote_type = if is_upvote { VoteType::Upvote } else { VoteType::Downvote }; - + let vote_type = if is_upvote { + VoteType::Upvote + } else { + VoteType::Downvote + }; + let new_vote = Vote { author_id: author_id.clone(), timestamp: current_timestamp, vote_type: vote_type, }; - + // Remove the old vote if it exists votes.take(&new_vote); // Insert the new vote @@ -249,25 +284,12 @@ mod tests { } // Helper function to add a contract - fn add_contract(contract: &mut SourceScan, account_id: AccountId, with_github: bool) { - let github_data = if with_github { - Some(Github { - owner: "owner".to_string(), - repo: "repo".to_string(), - sha: "sha".to_string(), - }) - } else { - None - }; - + fn add_contract(contract: &mut SourceScan, account_id: AccountId) { contract.set_contract( - account_id, - "cid".to_string(), - "code_hash".to_string(), - "lang".to_string(), - "entry_point".to_string(), - "builder_image".to_string(), - github_data + account_id, + "cid".to_string(), + "code_hash".to_string(), + "lang".to_string(), ); } @@ -277,7 +299,7 @@ mod tests { let context = get_context(accounts(0)); testing_env!(context.build()); - let contract = SourceScan::default(); + let contract = SourceScan::default(); contract.get_owner(); // This should panic } @@ -317,15 +339,12 @@ mod tests { testing_env!(context.build()); let mut contract = SourceScan::new(); - add_contract(&mut contract, accounts(1), true); + add_contract(&mut contract, accounts(1)); let contract_data = contract.get_contract(accounts(1)).unwrap(); assert_eq!(contract_data.cid, "cid"); assert_eq!(contract_data.code_hash, "code_hash"); assert_eq!(contract_data.lang, "lang"); - assert_eq!(contract_data.entry_point, "entry_point"); - assert_eq!(contract_data.builder_image, "builder_image"); - assert!(contract_data.github.is_some()); } #[test] @@ -334,7 +353,7 @@ mod tests { testing_env!(context.build()); let mut contract = SourceScan::new(); - add_contract(&mut contract, accounts(1), true); + add_contract(&mut contract, accounts(1)); contract.purge_contract(accounts(1)); @@ -358,7 +377,7 @@ mod tests { let mut contract = SourceScan::new(); for i in 1..4 { - add_contract(&mut contract, accounts(i), false); + add_contract(&mut contract, accounts(i)); } let (contracts, total_pages) = contract.get_contracts(0, 2); @@ -374,15 +393,15 @@ mod tests { let mut contract = SourceScan::new(); // Setup: Add contracts with varying account_ids using the helper function - add_contract(&mut contract, "account1.testnet".parse().unwrap(), false); - add_contract(&mut contract, "account2.testnet".parse().unwrap(), false); + add_contract(&mut contract, "account1.testnet".parse().unwrap()); + add_contract(&mut contract, "account2.testnet".parse().unwrap()); // Action: Search for contracts let (search_results, _) = contract.search("account1".to_string(), 0, 10); // Verification: Check if the correct contract is retrieved assert_eq!(search_results.len(), 1); - assert_eq!(search_results[0].0, "account1.testnet".parse().unwrap()); + assert_eq!(search_results[0].0.to_string(), "account1.testnet"); } #[test] @@ -391,40 +410,26 @@ mod tests { testing_env!(context.build()); let mut contract = SourceScan::new(); - add_contract(&mut contract, accounts(1), false); + add_contract(&mut contract, accounts(1)); // Upvote the contract contract.vote_contract(accounts(1), true); let contract_data = contract.get_contract(accounts(1)).unwrap(); assert_eq!(contract_data.votes.len(), 1); - assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Upvote)); + assert!(matches!( + contract_data.votes.iter().next().unwrap().vote_type, + VoteType::Upvote + )); // Change to downvote contract.vote_contract(accounts(1), false); let contract_data = contract.get_contract(accounts(1)).unwrap(); - assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Downvote)); - } - - #[test] - fn test_contract_update() { - let context = get_context(accounts(0)); - testing_env!(context.build()); - - let mut contract = SourceScan::new(); - add_contract(&mut contract, accounts(1), false); - - // Upvote the contract - contract.vote_contract(accounts(1), true); - - // Update the contract - add_contract(&mut contract, accounts(1), true); - - let contract_data = contract.get_contract(accounts(1)).unwrap(); - assert!(matches!(contract_data.votes.iter().next().unwrap().vote_type, VoteType::Upvote)); - assert!(contract_data.github.is_some()); - assert_eq!(contract_data.github.unwrap().owner, "owner"); + assert!(matches!( + contract_data.votes.iter().next().unwrap().vote_type, + VoteType::Downvote + )); } #[test] @@ -433,7 +438,7 @@ mod tests { testing_env!(context.build()); let mut contract = SourceScan::new(); - add_contract(&mut contract, accounts(1), false); + add_contract(&mut contract, accounts(1)); contract.add_comment(accounts(1), "Sample comment".to_string()); @@ -449,7 +454,7 @@ mod tests { testing_env!(context.build()); let mut contract = SourceScan::new(); - add_contract(&mut contract, accounts(1), false); + add_contract(&mut contract, accounts(1)); contract.add_comment(accounts(1), "First comment".to_string()); contract.add_comment(accounts(1), "Second comment".to_string()); @@ -468,7 +473,7 @@ mod tests { testing_env!(context.build()); let mut contract = SourceScan::new(); - add_contract(&mut contract, accounts(1), false); + add_contract(&mut contract, accounts(1)); contract.add_comment(accounts(1), "Another Test Comment".to_string()); @@ -478,7 +483,10 @@ mod tests { let comment = contract.comments.get(comment_id).unwrap(); assert_eq!(comment.votes.len(), 1); - assert!(matches!(comment.votes.iter().next().unwrap().vote_type, VoteType::Upvote)); + assert!(matches!( + comment.votes.iter().next().unwrap().vote_type, + VoteType::Upvote + )); } #[test] @@ -487,7 +495,7 @@ mod tests { testing_env!(context.build()); let mut contract = SourceScan::new(); - add_contract(&mut contract, accounts(1), false); + add_contract(&mut contract, accounts(1)); contract.add_comment(accounts(1), "Another Test Comment".to_string()); @@ -496,6 +504,9 @@ mod tests { contract.vote_comment(comment_id, false); let comment = contract.comments.get(comment_id).unwrap(); assert_eq!(comment.votes.len(), 1); - assert!(matches!(comment.votes.iter().next().unwrap().vote_type, VoteType::Downvote)); + assert!(matches!( + comment.votes.iter().next().unwrap().vote_type, + VoteType::Downvote + )); } } diff --git a/src/verified_contract/comment.rs b/src/verified_contract/comment.rs index a84dc39..59f0b4b 100644 --- a/src/verified_contract/comment.rs +++ b/src/verified_contract/comment.rs @@ -1,12 +1,13 @@ -use crate::str_serializers::*; use super::Vote; -use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; +use crate::str_serializers::*; +use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; use near_sdk::{AccountId, Timestamp}; use std::collections::HashSet; #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone)] #[serde(crate = "near_sdk::serde")] +#[borsh(crate = "near_sdk::borsh")] pub struct Comment { pub id: u64, pub author_id: AccountId, diff --git a/src/verified_contract/github.rs b/src/verified_contract/github.rs deleted file mode 100644 index 2d621a0..0000000 --- a/src/verified_contract/github.rs +++ /dev/null @@ -1,10 +0,0 @@ -use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; -use near_sdk::serde::{Deserialize, Serialize}; - -#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] -#[serde(crate = "near_sdk::serde")] -pub struct Github { - pub owner: String, - pub repo: String, - pub sha: String, -} \ No newline at end of file diff --git a/src/verified_contract/mod.rs b/src/verified_contract/mod.rs index bad99db..68a3640 100644 --- a/src/verified_contract/mod.rs +++ b/src/verified_contract/mod.rs @@ -1,22 +1,18 @@ -pub mod github; -pub mod vote; pub mod comment; +pub mod vote; -use std::collections::HashSet; -use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; +use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; +use std::collections::HashSet; use vote::Vote; -use github::Github; -#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize)] #[serde(crate = "near_sdk::serde")] +#[borsh(crate = "near_sdk::borsh")] pub struct VerifiedContract { pub cid: String, pub lang: String, - pub entry_point: String, pub code_hash: String, - pub builder_image: String, - pub github: Option, pub votes: HashSet, pub comments: Vec, -} \ No newline at end of file +} diff --git a/src/verified_contract/vote.rs b/src/verified_contract/vote.rs index 3f77a8a..fa71fe4 100644 --- a/src/verified_contract/vote.rs +++ b/src/verified_contract/vote.rs @@ -1,24 +1,28 @@ use crate::str_serializers::*; -use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; +use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; use near_sdk::{AccountId, Timestamp}; use std::cmp::Ordering; use std::hash::{Hash, Hasher}; -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone, Copy)] +#[derive( + BorshSerialize, BorshDeserialize, Serialize, Deserialize, PartialOrd, Eq, PartialEq, Clone, +)] #[serde(crate = "near_sdk::serde")] +#[borsh(crate = "near_sdk::borsh")] pub enum VoteType { Upvote, Downvote, } -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone)] +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Eq, Ord, Clone)] #[serde(crate = "near_sdk::serde")] +#[borsh(crate = "near_sdk::borsh")] pub struct Vote { pub author_id: AccountId, #[serde(with = "u64_dec_format")] pub timestamp: Timestamp, - pub vote_type: VoteType, + pub vote_type: VoteType, } impl Hash for Vote { @@ -35,13 +39,20 @@ impl PartialEq for Vote { } } -impl Eq for Vote {} - impl PartialOrd for Vote { fn partial_cmp(&self, other: &Self) -> Option { Some(self.timestamp.cmp(&other.timestamp)) } } - - +impl Ord for VoteType { + fn cmp(&self, other: &Self) -> Ordering { + use VoteType::*; + match (self, other) { + (Upvote, Upvote) => Ordering::Equal, + (Downvote, Downvote) => Ordering::Equal, + (Upvote, Downvote) => Ordering::Less, + (Downvote, Upvote) => Ordering::Greater, + } + } +} From 7b1da53deeedba1b8fb76e4f6e8f26659ee2f134 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 15:49:27 +0200 Subject: [PATCH 16/36] add source code git url --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 445d923..b14cd09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,7 @@ crate-type = ["cdylib", "rlib"] image = "sourcescan/cargo-near:0.6.0-rust-1.78.0" image_digest = "sha256:67886aed542554b60dde311e2b004a4a9798225a0db7a298549fc6b6c5484d23" container_build_command = "cargo near build" +source_code_git_url="git+https://github.com/SourceScan/verifier-contract?rev=50e7328c905368fb8e5ea949afd3c84306a4161b" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From 4913bc09cea16bcdef3492d15a6412878537d503 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 15:50:00 +0200 Subject: [PATCH 17/36] update source_code_git_url --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b14cd09..c61856c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "rlib"] image = "sourcescan/cargo-near:0.6.0-rust-1.78.0" image_digest = "sha256:67886aed542554b60dde311e2b004a4a9798225a0db7a298549fc6b6c5484d23" container_build_command = "cargo near build" -source_code_git_url="git+https://github.com/SourceScan/verifier-contract?rev=50e7328c905368fb8e5ea949afd3c84306a4161b" +source_code_git_url="https://github.com/SourceScan/verifier-contract?rev=50e7328c905368fb8e5ea949afd3c84306a4161b" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From 2caabb9f1575d86dd5baa2e40cf537f4453d663c Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 15:51:05 +0200 Subject: [PATCH 18/36] update source_code_git_url --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c61856c..a999d93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "rlib"] image = "sourcescan/cargo-near:0.6.0-rust-1.78.0" image_digest = "sha256:67886aed542554b60dde311e2b004a4a9798225a0db7a298549fc6b6c5484d23" container_build_command = "cargo near build" -source_code_git_url="https://github.com/SourceScan/verifier-contract?rev=50e7328c905368fb8e5ea949afd3c84306a4161b" +source_code_git_url="https://github.com/SourceScan/verifier-contract.git" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From a49ca060111c56614455e67451913e7327047174 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 15:55:06 +0200 Subject: [PATCH 19/36] add NearSchema --- src/verified_contract/comment.rs | 4 ++-- src/verified_contract/mod.rs | 3 ++- src/verified_contract/vote.rs | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/verified_contract/comment.rs b/src/verified_contract/comment.rs index 59f0b4b..cfe1d8a 100644 --- a/src/verified_contract/comment.rs +++ b/src/verified_contract/comment.rs @@ -2,10 +2,10 @@ use super::Vote; use crate::str_serializers::*; use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; -use near_sdk::{AccountId, Timestamp}; +use near_sdk::{AccountId, NearSchema, Timestamp}; use std::collections::HashSet; -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone)] +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone, NearSchema)] #[serde(crate = "near_sdk::serde")] #[borsh(crate = "near_sdk::borsh")] pub struct Comment { diff --git a/src/verified_contract/mod.rs b/src/verified_contract/mod.rs index 68a3640..3def255 100644 --- a/src/verified_contract/mod.rs +++ b/src/verified_contract/mod.rs @@ -3,10 +3,11 @@ pub mod vote; use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; +use near_sdk::NearSchema; use std::collections::HashSet; use vote::Vote; -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize)] +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, NearSchema)] #[serde(crate = "near_sdk::serde")] #[borsh(crate = "near_sdk::borsh")] pub struct VerifiedContract { diff --git a/src/verified_contract/vote.rs b/src/verified_contract/vote.rs index fa71fe4..e35bce5 100644 --- a/src/verified_contract/vote.rs +++ b/src/verified_contract/vote.rs @@ -1,7 +1,7 @@ use crate::str_serializers::*; use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; -use near_sdk::{AccountId, Timestamp}; +use near_sdk::{AccountId, NearSchema, Timestamp}; use std::cmp::Ordering; use std::hash::{Hash, Hasher}; @@ -15,7 +15,7 @@ pub enum VoteType { Downvote, } -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Eq, Ord, Clone)] +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Eq, Ord, Clone, NearSchema)] #[serde(crate = "near_sdk::serde")] #[borsh(crate = "near_sdk::borsh")] pub struct Vote { From f6eaa77ae25dca45921db6c6ed5d316af72ec391 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:00:42 +0200 Subject: [PATCH 20/36] update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a999d93..59b1ad7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "rlib"] image = "sourcescan/cargo-near:0.6.0-rust-1.78.0" image_digest = "sha256:67886aed542554b60dde311e2b004a4a9798225a0db7a298549fc6b6c5484d23" container_build_command = "cargo near build" -source_code_git_url="https://github.com/SourceScan/verifier-contract.git" +source_code_git_url="git+https://github.com/SourceScan/verifier-contract.git?rev=50e7328c905368fb8e5ea949afd3c84306a4161b" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From 415333173da230c95b67aa3f6da2672bda11b170 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:02:10 +0200 Subject: [PATCH 21/36] update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 59b1ad7..a999d93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "rlib"] image = "sourcescan/cargo-near:0.6.0-rust-1.78.0" image_digest = "sha256:67886aed542554b60dde311e2b004a4a9798225a0db7a298549fc6b6c5484d23" container_build_command = "cargo near build" -source_code_git_url="git+https://github.com/SourceScan/verifier-contract.git?rev=50e7328c905368fb8e5ea949afd3c84306a4161b" +source_code_git_url="https://github.com/SourceScan/verifier-contract.git" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From 63a7c7666928a9a1df56e32863e11a0c6bf18d2f Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:07:50 +0200 Subject: [PATCH 22/36] update contract --- src/verified_contract/mod.rs | 9 +++------ src/verified_contract/vote.rs | 21 +++++++++------------ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/verified_contract/mod.rs b/src/verified_contract/mod.rs index 3def255..e3ff0c1 100644 --- a/src/verified_contract/mod.rs +++ b/src/verified_contract/mod.rs @@ -1,15 +1,12 @@ pub mod comment; pub mod vote; -use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; -use near_sdk::serde::{Deserialize, Serialize}; -use near_sdk::NearSchema; +use near_sdk::{near, NearSchema}; use std::collections::HashSet; use vote::Vote; -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, NearSchema)] -#[serde(crate = "near_sdk::serde")] -#[borsh(crate = "near_sdk::borsh")] +#[near(serializers=[borsh, json])] +#[derive(NearSchema)] pub struct VerifiedContract { pub cid: String, pub lang: String, diff --git a/src/verified_contract/vote.rs b/src/verified_contract/vote.rs index e35bce5..d28e54d 100644 --- a/src/verified_contract/vote.rs +++ b/src/verified_contract/vote.rs @@ -1,26 +1,23 @@ use crate::str_serializers::*; -use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; -use near_sdk::serde::{Deserialize, Serialize}; -use near_sdk::{AccountId, NearSchema, Timestamp}; +use near_sdk::{near, AccountId, NearSchema, Timestamp}; use std::cmp::Ordering; use std::hash::{Hash, Hasher}; -#[derive( - BorshSerialize, BorshDeserialize, Serialize, Deserialize, PartialOrd, Eq, PartialEq, Clone, -)] -#[serde(crate = "near_sdk::serde")] -#[borsh(crate = "near_sdk::borsh")] +#[near(serializers=[borsh, json])] +#[derive(PartialOrd, Eq, PartialEq, Clone, NearSchema)] pub enum VoteType { Upvote, Downvote, } -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Eq, Ord, Clone, NearSchema)] -#[serde(crate = "near_sdk::serde")] -#[borsh(crate = "near_sdk::borsh")] +#[near(serializers=[borsh, json])] +#[derive(Eq, Ord, Clone, NearSchema)] pub struct Vote { pub author_id: AccountId, - #[serde(with = "u64_dec_format")] + #[serde( + serialize_with = "u64_dec_format::serialize", + deserialize_with = "u64_dec_format::deserialize" + )] pub timestamp: Timestamp, pub vote_type: VoteType, } From aaa6e6566fdcdc3400c24ca63989bdd8dd011a4b Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:11:07 +0200 Subject: [PATCH 23/36] update contract --- src/verified_contract/comment.rs | 5 ++++- src/verified_contract/vote.rs | 24 +++++++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/verified_contract/comment.rs b/src/verified_contract/comment.rs index cfe1d8a..8a5ee83 100644 --- a/src/verified_contract/comment.rs +++ b/src/verified_contract/comment.rs @@ -11,7 +11,10 @@ use std::collections::HashSet; pub struct Comment { pub id: u64, pub author_id: AccountId, - #[serde(with = "u64_dec_format")] + #[serde( + serialize_with = "u64_dec_format::serialize", + deserialize_with = "u64_dec_format::deserialize" + )] pub timestamp: Timestamp, pub content: String, pub votes: HashSet, diff --git a/src/verified_contract/vote.rs b/src/verified_contract/vote.rs index d28e54d..c1e7da9 100644 --- a/src/verified_contract/vote.rs +++ b/src/verified_contract/vote.rs @@ -1,17 +1,31 @@ use crate::str_serializers::*; -use near_sdk::{near, AccountId, NearSchema, Timestamp}; +use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; +use near_sdk::serde::{Deserialize, Serialize}; +use near_sdk::{AccountId, NearSchema, Timestamp}; use std::cmp::Ordering; use std::hash::{Hash, Hasher}; -#[near(serializers=[borsh, json])] -#[derive(PartialOrd, Eq, PartialEq, Clone, NearSchema)] +#[derive( + BorshSerialize, + BorshDeserialize, + Serialize, + Deserialize, + PartialOrd, + Eq, + PartialEq, + Clone, + NearSchema, +)] +#[serde(crate = "near_sdk::serde")] +#[borsh(crate = "near_sdk::borsh")] pub enum VoteType { Upvote, Downvote, } -#[near(serializers=[borsh, json])] -#[derive(Eq, Ord, Clone, NearSchema)] +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Eq, Ord, Clone, NearSchema)] +#[serde(crate = "near_sdk::serde")] +#[borsh(crate = "near_sdk::borsh")] pub struct Vote { pub author_id: AccountId, #[serde( From ad5ac6e12958c6354c3abb4be4963c697034aa03 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:12:26 +0200 Subject: [PATCH 24/36] update contract --- src/verified_contract/mod.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/verified_contract/mod.rs b/src/verified_contract/mod.rs index e3ff0c1..be54e66 100644 --- a/src/verified_contract/mod.rs +++ b/src/verified_contract/mod.rs @@ -1,12 +1,11 @@ pub mod comment; pub mod vote; -use near_sdk::{near, NearSchema}; +use near_sdk::near; use std::collections::HashSet; use vote::Vote; #[near(serializers=[borsh, json])] -#[derive(NearSchema)] pub struct VerifiedContract { pub cid: String, pub lang: String, From d72f9ae20de041ec7f89f5c6b78109b039e6115c Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:16:07 +0200 Subject: [PATCH 25/36] update contract --- src/verified_contract/mod.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/verified_contract/mod.rs b/src/verified_contract/mod.rs index be54e66..3def255 100644 --- a/src/verified_contract/mod.rs +++ b/src/verified_contract/mod.rs @@ -1,11 +1,15 @@ pub mod comment; pub mod vote; -use near_sdk::near; +use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; +use near_sdk::serde::{Deserialize, Serialize}; +use near_sdk::NearSchema; use std::collections::HashSet; use vote::Vote; -#[near(serializers=[borsh, json])] +#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, NearSchema)] +#[serde(crate = "near_sdk::serde")] +#[borsh(crate = "near_sdk::borsh")] pub struct VerifiedContract { pub cid: String, pub lang: String, From 04f70ea217d56ff7a1b5490e62802596aad6cde1 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:17:41 +0200 Subject: [PATCH 26/36] update contract --- src/verified_contract/mod.rs | 8 ++------ src/verified_contract/vote.rs | 7 +++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/verified_contract/mod.rs b/src/verified_contract/mod.rs index 3def255..be54e66 100644 --- a/src/verified_contract/mod.rs +++ b/src/verified_contract/mod.rs @@ -1,15 +1,11 @@ pub mod comment; pub mod vote; -use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; -use near_sdk::serde::{Deserialize, Serialize}; -use near_sdk::NearSchema; +use near_sdk::near; use std::collections::HashSet; use vote::Vote; -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, NearSchema)] -#[serde(crate = "near_sdk::serde")] -#[borsh(crate = "near_sdk::borsh")] +#[near(serializers=[borsh, json])] pub struct VerifiedContract { pub cid: String, pub lang: String, diff --git a/src/verified_contract/vote.rs b/src/verified_contract/vote.rs index c1e7da9..41df105 100644 --- a/src/verified_contract/vote.rs +++ b/src/verified_contract/vote.rs @@ -1,7 +1,7 @@ use crate::str_serializers::*; use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; use near_sdk::serde::{Deserialize, Serialize}; -use near_sdk::{AccountId, NearSchema, Timestamp}; +use near_sdk::{near, AccountId, NearSchema, Timestamp}; use std::cmp::Ordering; use std::hash::{Hash, Hasher}; @@ -23,9 +23,8 @@ pub enum VoteType { Downvote, } -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Eq, Ord, Clone, NearSchema)] -#[serde(crate = "near_sdk::serde")] -#[borsh(crate = "near_sdk::borsh")] +#[near(serializers=[borsh, json])] +#[derive(Eq, Ord, Clone, NearSchema)] pub struct Vote { pub author_id: AccountId, #[serde( From 15315970fcaceb8115cd680050f720c72f39aa6f Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:18:58 +0200 Subject: [PATCH 27/36] update contract --- src/verified_contract/vote.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/verified_contract/vote.rs b/src/verified_contract/vote.rs index 41df105..d28e54d 100644 --- a/src/verified_contract/vote.rs +++ b/src/verified_contract/vote.rs @@ -1,23 +1,10 @@ use crate::str_serializers::*; -use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; -use near_sdk::serde::{Deserialize, Serialize}; use near_sdk::{near, AccountId, NearSchema, Timestamp}; use std::cmp::Ordering; use std::hash::{Hash, Hasher}; -#[derive( - BorshSerialize, - BorshDeserialize, - Serialize, - Deserialize, - PartialOrd, - Eq, - PartialEq, - Clone, - NearSchema, -)] -#[serde(crate = "near_sdk::serde")] -#[borsh(crate = "near_sdk::borsh")] +#[near(serializers=[borsh, json])] +#[derive(PartialOrd, Eq, PartialEq, Clone, NearSchema)] pub enum VoteType { Upvote, Downvote, From a02dce681fb7316b041821b9f31ef2650cdf4eac Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:20:04 +0200 Subject: [PATCH 28/36] update contract --- src/verified_contract/vote.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/verified_contract/vote.rs b/src/verified_contract/vote.rs index d28e54d..5866604 100644 --- a/src/verified_contract/vote.rs +++ b/src/verified_contract/vote.rs @@ -4,14 +4,14 @@ use std::cmp::Ordering; use std::hash::{Hash, Hasher}; #[near(serializers=[borsh, json])] -#[derive(PartialOrd, Eq, PartialEq, Clone, NearSchema)] +#[derive(PartialOrd, Eq, PartialEq, Clone)] pub enum VoteType { Upvote, Downvote, } #[near(serializers=[borsh, json])] -#[derive(Eq, Ord, Clone, NearSchema)] +#[derive(Eq, Ord, Clone)] pub struct Vote { pub author_id: AccountId, #[serde( From 9b3f115e8bf0503915c3534bd4535c9e4bee151c Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sun, 26 May 2024 16:22:02 +0200 Subject: [PATCH 29/36] update contract --- src/verified_contract/comment.rs | 9 +++------ src/verified_contract/vote.rs | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/verified_contract/comment.rs b/src/verified_contract/comment.rs index 8a5ee83..ab398c3 100644 --- a/src/verified_contract/comment.rs +++ b/src/verified_contract/comment.rs @@ -1,13 +1,10 @@ use super::Vote; use crate::str_serializers::*; -use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; -use near_sdk::serde::{Deserialize, Serialize}; -use near_sdk::{AccountId, NearSchema, Timestamp}; +use near_sdk::{near, AccountId, Timestamp}; use std::collections::HashSet; -#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Clone, NearSchema)] -#[serde(crate = "near_sdk::serde")] -#[borsh(crate = "near_sdk::borsh")] +#[near(serializers=[borsh, json])] +#[derive(Clone)] pub struct Comment { pub id: u64, pub author_id: AccountId, diff --git a/src/verified_contract/vote.rs b/src/verified_contract/vote.rs index 5866604..a7be85d 100644 --- a/src/verified_contract/vote.rs +++ b/src/verified_contract/vote.rs @@ -1,5 +1,5 @@ use crate::str_serializers::*; -use near_sdk::{near, AccountId, NearSchema, Timestamp}; +use near_sdk::{near, AccountId, Timestamp}; use std::cmp::Ordering; use std::hash::{Hash, Hasher}; From 7e5b0fd2aa9f1bd233a1daeacc056fd966a554d7 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Mon, 10 Jun 2024 15:28:55 +0200 Subject: [PATCH 30/36] add block_height to verified contract data --- src/lib.rs | 3 +++ src/verified_contract/mod.rs | 1 + 2 files changed, 4 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index 6d7c884..307bcd5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -63,6 +63,7 @@ impl SourceScan { account_id: AccountId, cid: String, code_hash: String, + block_height: u64, lang: String, ) { require!( @@ -77,6 +78,7 @@ impl SourceScan { &VerifiedContract { cid, code_hash, + block_height, lang, votes: existing_contract .as_ref() @@ -289,6 +291,7 @@ mod tests { account_id, "cid".to_string(), "code_hash".to_string(), + 0, "lang".to_string(), ); } diff --git a/src/verified_contract/mod.rs b/src/verified_contract/mod.rs index be54e66..2b64f8b 100644 --- a/src/verified_contract/mod.rs +++ b/src/verified_contract/mod.rs @@ -10,6 +10,7 @@ pub struct VerifiedContract { pub cid: String, pub lang: String, pub code_hash: String, + pub block_height: u64, pub votes: HashSet, pub comments: Vec, } From b96cca239d7f8a7ba583b963993bb84f2f2af3b3 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Fri, 9 Aug 2024 17:35:32 +0200 Subject: [PATCH 31/36] chore: update near-sdk version --- Cargo.lock | 332 +++++++++++++++++++++++++++++++++++++++++++++-------- Cargo.toml | 4 +- 2 files changed, 285 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c1f76e..cdf1cb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -312,6 +312,15 @@ dependencies = [ "opaque-debug", ] +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -503,7 +512,7 @@ dependencies = [ "serde_json", "sha2", "symbolic-debuginfo", - "zstd", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -1315,6 +1324,9 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" @@ -1689,6 +1701,15 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +[[package]] +name = "lru" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +dependencies = [ + "hashbrown 0.12.3", +] + [[package]] name = "matchers" version = "0.1.0" @@ -1816,10 +1837,10 @@ dependencies = [ "bytesize", "chrono", "derive_more", - "near-config-utils", - "near-crypto", - "near-parameters", - "near-primitives", + "near-config-utils 0.20.1", + "near-crypto 0.20.1", + "near-parameters 0.20.1", + "near-primitives 0.20.1", "num-rational", "once_cell", "serde", @@ -1841,11 +1862,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-config-utils" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b3db4ac2d4340caef06b6363c3fd16c0be1f70267908dfa53e2e6241649b0c" +dependencies = [ + "anyhow", + "json_comments", + "thiserror", + "tracing", +] + [[package]] name = "near-contract-standards" -version = "5.1.0" +version = "5.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0e78fe14d389ae76f792735a2108a6b8332a2bed61197310bf5ad718fb1e424" +checksum = "9b7682ed5a41e8818518808b2e263b5f482ae7b9b37fff1df5383beb888bbed8" dependencies = [ "near-sdk", ] @@ -1856,7 +1889,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2991d2912218a80ec0733ac87f84fa803accea105611eea209d4419271957667" dependencies = [ - "blake2", + "blake2 0.9.2", "borsh 1.5.0", "bs58 0.4.0", "c2-chacha", @@ -1865,8 +1898,8 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils", - "near-stdx", + "near-config-utils 0.20.1", + "near-stdx 0.20.1", "once_cell", "primitive-types", "rand 0.7.3", @@ -1877,13 +1910,47 @@ dependencies = [ "thiserror", ] +[[package]] +name = "near-crypto" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9807fb257f7dda41383bb33e14cfd4a8840ffa7932cb972db9eabff19ce3bf4" +dependencies = [ + "blake2 0.10.6", + "borsh 1.5.0", + "bs58 0.4.0", + "curve25519-dalek", + "derive_more", + "ed25519-dalek", + "hex", + "near-account-id", + "near-config-utils 0.23.0", + "near-stdx 0.23.0", + "once_cell", + "primitive-types", + "secp256k1", + "serde", + "serde_json", + "subtle", + "thiserror", +] + [[package]] name = "near-fmt" version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7d998dfc1e04001608899b2498ad5a782c7d036b73769d510de21964db99286" dependencies = [ - "near-primitives-core", + "near-primitives-core 0.20.1", +] + +[[package]] +name = "near-fmt" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00ce363e4078b870775e2a5a5189feae22f0870ca673f6409b1974922dada0c4" +dependencies = [ + "near-primitives-core 0.23.0", ] [[package]] @@ -1907,9 +1974,9 @@ dependencies = [ "lazy_static", "log", "near-chain-configs", - "near-crypto", + "near-crypto 0.20.1", "near-jsonrpc-primitives", - "near-primitives", + "near-primitives 0.20.1", "reqwest", "serde", "serde_json", @@ -1924,9 +1991,9 @@ checksum = "b0ce745e954ae776eef05957602e638ee9581106a3675946fb43c2fe7e38ef03" dependencies = [ "arbitrary", "near-chain-configs", - "near-crypto", - "near-primitives", - "near-rpc-error-macro", + "near-crypto 0.20.1", + "near-primitives 0.20.1", + "near-rpc-error-macro 0.20.1", "serde", "serde_json", "thiserror", @@ -1941,9 +2008,9 @@ dependencies = [ "actix", "base64 0.21.5", "clap 4.4.12", - "near-crypto", - "near-fmt", - "near-primitives-core", + "near-crypto 0.20.1", + "near-fmt 0.20.1", + "near-primitives-core 0.20.1", "once_cell", "opentelemetry", "opentelemetry-otlp", @@ -1970,7 +2037,25 @@ dependencies = [ "borsh 1.5.0", "enum-map", "near-account-id", - "near-primitives-core", + "near-primitives-core 0.20.1", + "num-rational", + "serde", + "serde_repr", + "serde_yaml", + "strum 0.24.1", + "thiserror", +] + +[[package]] +name = "near-parameters" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fddf39f5f729976a791d86e0e30a71ec4d8e8dcf58117c8694e7b22fb3f50ee6" +dependencies = [ + "borsh 1.5.0", + "enum-map", + "near-account-id", + "near-primitives-core 0.23.0", "num-rational", "serde", "serde_repr", @@ -1995,14 +2080,14 @@ dependencies = [ "easy-ext", "enum-map", "hex", - "near-crypto", - "near-fmt", + "near-crypto 0.20.1", + "near-fmt 0.20.1", "near-o11y", - "near-parameters", - "near-primitives-core", - "near-rpc-error-macro", - "near-stdx", - "near-vm-runner", + "near-parameters 0.20.1", + "near-primitives-core 0.20.1", + "near-rpc-error-macro 0.20.1", + "near-stdx 0.20.1", + "near-vm-runner 0.20.1", "num-rational", "once_cell", "primitive-types", @@ -2021,6 +2106,48 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-primitives" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d58c175262923db9885ed0347e96ec3bcbec57825e3b6d7de03da220f5e14ef5" +dependencies = [ + "arbitrary", + "base64 0.21.5", + "borsh 1.5.0", + "bytes", + "bytesize", + "cfg-if 1.0.0", + "chrono", + "derive_more", + "easy-ext", + "enum-map", + "hex", + "itertools", + "near-crypto 0.23.0", + "near-fmt 0.23.0", + "near-parameters 0.23.0", + "near-primitives-core 0.23.0", + "near-rpc-error-macro 0.23.0", + "near-stdx 0.23.0", + "near-time", + "num-rational", + "once_cell", + "primitive-types", + "rand 0.8.5", + "rand_chacha 0.3.1", + "reed-solomon-erasure", + "serde", + "serde_json", + "serde_with", + "sha3", + "smart-default", + "strum 0.24.1", + "thiserror", + "tracing", + "zstd 0.13.2", +] + [[package]] name = "near-primitives-core" version = "0.20.1" @@ -2043,6 +2170,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "near-primitives-core" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45de00d413f5bb890a3912f32fcd0974b2b0a975cc7874012e2c4c4fa7f28917" +dependencies = [ + "arbitrary", + "base64 0.21.5", + "borsh 1.5.0", + "bs58 0.4.0", + "derive_more", + "enum-map", + "near-account-id", + "num-rational", + "serde", + "serde_repr", + "sha2", + "thiserror", +] + [[package]] name = "near-rpc-error-core" version = "0.20.1" @@ -2054,6 +2201,17 @@ dependencies = [ "syn 2.0.46", ] +[[package]] +name = "near-rpc-error-core" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf41b149dcc1f5a35d6a96fbcd8c28c92625c05b52025a72ee7378c72bcd68ce" +dependencies = [ + "quote", + "serde", + "syn 2.0.46", +] + [[package]] name = "near-rpc-error-macro" version = "0.20.1" @@ -2061,7 +2219,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897a445de2102f6732c8a185d922f5e3bf7fd0a41243ce40854df2197237f799" dependencies = [ "fs2", - "near-rpc-error-core", + "near-rpc-error-core 0.20.1", + "serde", + "syn 2.0.46", +] + +[[package]] +name = "near-rpc-error-macro" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73c7f0f12f426792dd2c9d83df43d73c3b15d80f6e99e8d0e16ff3e024d0f9ba" +dependencies = [ + "near-rpc-error-core 0.23.0", "serde", "syn 2.0.46", ] @@ -2082,23 +2251,23 @@ dependencies = [ [[package]] name = "near-sdk" -version = "5.1.0" +version = "5.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520234cfdf04a805ac2f04715889d096eb83fdd5b99ca7d0f8027ae473f891a8" +checksum = "951ac0ba9c90e4ed6e927914d2ecee3d8ae2d74e794656b5ca42a992bd370863" dependencies = [ "base64 0.21.5", "borsh 1.5.0", "bs58 0.5.0", "near-account-id", - "near-crypto", + "near-crypto 0.23.0", "near-gas", - "near-parameters", - "near-primitives", - "near-primitives-core", + "near-parameters 0.23.0", + "near-primitives 0.23.0", + "near-primitives-core 0.23.0", "near-sdk-macros", "near-sys", "near-token", - "near-vm-runner", + "near-vm-runner 0.23.0", "once_cell", "serde", "serde_json", @@ -2107,9 +2276,9 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "5.1.0" +version = "5.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2fe3fc30068c5f20e89b0985d6104c5cc1c6742dbc6efbf352be4189b9bbf7" +checksum = "aa2d758ff2701e7a53292a9dc2eeede6ed648574456c14f2464bf0a3ba047be3" dependencies = [ "Inflector", "darling", @@ -2128,11 +2297,29 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "855fd5540e3b4ff6fedf12aba2db1ee4b371b36f465da1363a6d022b27cb43b8" +[[package]] +name = "near-stdx" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e1897481272eb144328abd51ca9f59b5b558e7a6dc6e2177c8c9bb18fbd818" + [[package]] name = "near-sys" -version = "0.2.1" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf4ca5c805cb78700e10e43484902d8da05f25788db277999d209568aaf4c8e" + +[[package]] +name = "near-time" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397688591acf8d3ebf2c2485ba32d4b24fc10aad5334e3ad8ec0b7179bfdf06b" +checksum = "a56db32f26b089441c1a7c5451f0d68637afa9d66f6d8f6a6f2d6c2f7953520a" +dependencies = [ + "once_cell", + "serde", + "time", + "tokio", +] [[package]] name = "near-token" @@ -2155,10 +2342,10 @@ dependencies = [ "ed25519-dalek", "enum-map", "memoffset", - "near-crypto", - "near-parameters", - "near-primitives-core", - "near-stdx", + "near-crypto 0.20.1", + "near-parameters 0.20.1", + "near-primitives-core 0.20.1", + "near-stdx 0.20.1", "num-rational", "once_cell", "prefix-sum-vec", @@ -2174,6 +2361,35 @@ dependencies = [ "zeropool-bn", ] +[[package]] +name = "near-vm-runner" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b382e9fda99cdc6f1684d95e9f10ef0ed556c14ff972099269e96f8fde84064" +dependencies = [ + "borsh 1.5.0", + "ed25519-dalek", + "enum-map", + "lru", + "near-crypto 0.23.0", + "near-parameters 0.23.0", + "near-primitives-core 0.23.0", + "near-stdx 0.23.0", + "num-rational", + "once_cell", + "ripemd", + "rustix", + "serde", + "serde_repr", + "sha2", + "sha3", + "strum 0.24.1", + "tempfile", + "thiserror", + "tracing", + "zeropool-bn", +] + [[package]] name = "near-workspaces" version = "0.10.0" @@ -2190,11 +2406,11 @@ dependencies = [ "json-patch", "libc", "near-account-id", - "near-crypto", + "near-crypto 0.20.1", "near-gas", "near-jsonrpc-client", "near-jsonrpc-primitives", - "near-primitives", + "near-primitives 0.20.1", "near-sandbox-utils", "near-token", "rand 0.8.5", @@ -4489,7 +4705,7 @@ dependencies = [ "pbkdf2", "sha1", "time", - "zstd", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -4498,7 +4714,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe 7.2.1", ] [[package]] @@ -4511,11 +4736,20 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index a999d93..9c45811 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,8 +19,8 @@ source_code_git_url="https://github.com/SourceScan/verifier-contract.git" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -near-sdk = { version = "5.1.0", features = ["unstable"] } -near-contract-standards = "5.1.0" +near-sdk = "5.2.1" +near-contract-standards = "5.2.1" serde_json = { version = "1.0", features = ["preserve_order"] } [dev-dependencies] From df6325b4d686f5dcd35fb468d7b6f4b36e6f421b Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Fri, 9 Aug 2024 17:37:11 +0200 Subject: [PATCH 32/36] chore: update Cargo.toml --- Cargo.toml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9c45811..c413d07 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,16 +6,21 @@ edition = "2021" # TODO: Fill out the repository field to help NEAR ecosystem tools to discover your project. # NEP-0330 is automatically implemented for all contracts built with near-sdk-rs. # Link to the repository will be available via `contract_source_metadata` view-function. -#repository = "https://github.com/xxx/xxx" +repository = "https://github.com/SourceScan/verifier-contract.git" [lib] crate-type = ["cdylib", "rlib"] [package.metadata.near.reproducible_build] -image = "sourcescan/cargo-near:0.6.0-rust-1.78.0" -image_digest = "sha256:67886aed542554b60dde311e2b004a4a9798225a0db7a298549fc6b6c5484d23" -container_build_command = "cargo near build" -source_code_git_url="https://github.com/SourceScan/verifier-contract.git" +# docker image, descriptor of build environment +image = "sourcescan/cargo-near:git-e3c8adb4b5542cbfc159bb1534f2b94c900c1648-1.80.0" +# tag after colon above serves only descriptive purpose; image is identified by digest +image_digest = "sha256:4bbcdf985936e1cb9b71c627a00cb9b53546ac0c9ef6b175da2918c1dea21363" +# build command inside of docker container +# if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags, +# the command may be any combination of flags of `cargo-near`, +# supported by respective version of binary inside the container besides `--no-locked` flag +container_build_command = ["cargo", "near", "build"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From 55f7e9cad4c5b125e397e744e64ef66769f045e8 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Fri, 9 Aug 2024 17:40:38 +0200 Subject: [PATCH 33/36] chore: update Cargo.toml --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c413d07..24d0b1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "verifier-contract" -description = "cargo-near-new-project-description" +description = "SourceScan verifier contract" version = "0.1.0" edition = "2021" # TODO: Fill out the repository field to help NEAR ecosystem tools to discover your project. @@ -13,9 +13,9 @@ crate-type = ["cdylib", "rlib"] [package.metadata.near.reproducible_build] # docker image, descriptor of build environment -image = "sourcescan/cargo-near:git-e3c8adb4b5542cbfc159bb1534f2b94c900c1648-1.80.0" +image = "sourcescan/cargo-near:0.7.0-rust-1.80.0" # tag after colon above serves only descriptive purpose; image is identified by digest -image_digest = "sha256:4bbcdf985936e1cb9b71c627a00cb9b53546ac0c9ef6b175da2918c1dea21363" +image_digest = "sha256:60b6c83c305f689117675502ef6d2a82cabb32e2428ab80925bcdb526260dd9c" # build command inside of docker container # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags, # the command may be any combination of flags of `cargo-near`, From 25ae6a933861b32f6ac5d3adab9f3dd8b5b095ca Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 2 Dec 2025 12:35:47 +0100 Subject: [PATCH 34/36] feat: add code hash lookup and contracts count functions - add get_contracts_by_code_hash() to find verified contracts by hash - add get_contracts_count() to return total verified contracts - add unit tests for new functions - update rust toolchain to 1.85.0 - update dependencies --- .gitignore | 1 + Cargo.lock | 4165 +++++++++++++++++++++++++++++++++---------- rust-toolchain.toml | 2 +- src/lib.rs | 79 + 4 files changed, 3275 insertions(+), 972 deletions(-) diff --git a/.gitignore b/.gitignore index f4dd9c7..230711b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /target +/backups builder.sh build.sh \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index cdf1cb4..c189b5d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,23 +1,27 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] [[package]] name = "actix" -version = "0.13.1" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cba56612922b907719d4a01cf11c8d5b458e7d3dba946d0435f20f58d6795ed2" +checksum = "de7fa236829ba0841304542f7614c42b80fca007455315c45c785ccfa873a85b" dependencies = [ "actix-macros", "actix-rt", "actix_derive", - "bitflags 2.4.1", + "bitflags 2.10.0", "bytes", "crossbeam-channel", "futures-core", @@ -30,7 +34,7 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.17", ] [[package]] @@ -40,14 +44,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "actix-rt" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" +checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63" dependencies = [ "futures-core", "tokio", @@ -55,57 +59,55 @@ dependencies = [ [[package]] name = "actix_derive" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7db3d5a9718568e4cf4a537cfd7070e6e6ff7481510d0237fb529ac850f6d3" +checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] -name = "adler" -version = "1.0.2" +name = "addr2line" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" +dependencies = [ + "gimli 0.32.3", +] [[package]] -name = "aes" -version = "0.8.3" +name = "adler2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" -dependencies = [ - "cfg-if 1.0.0", - "cipher 0.4.4", - "cpufeatures", -] +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] -name = "ahash" -version = "0.7.7" +name = "aes" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ - "getrandom 0.2.11", - "once_cell", - "version_check", + "cfg-if 1.0.4", + "cipher 0.4.4", + "cpufeatures", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] [[package]] -name = "android-tzdata" -version = "0.1.1" +name = "allocator-api2" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android_system_properties" @@ -118,72 +120,74 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "once_cell_polyfill", + "windows-sys 0.60.2", ] [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" dependencies = [ "derive_arbitrary", ] [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert_matches" @@ -191,11 +195,163 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.3.0", + "futures-lite 2.6.1", + "pin-project-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[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.4", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.28", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" +dependencies = [ + "autocfg", + "cfg-if 1.0.4", + "concurrent-queue", + "futures-io", + "futures-lite 2.6.1", + "parking", + "polling 3.11.0", + "rustix 1.1.2", + "slab", + "windows-sys 0.61.2", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" +dependencies = [ + "event-listener 5.4.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if 1.0.4", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.44", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "async-signal" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" +dependencies = [ + "async-io 2.6.0", + "async-lock 3.4.1", + "atomic-waker", + "cfg-if 1.0.4", + "futures-core", + "futures-io", + "rustix 1.1.2", + "signal-hook-registry", + "slab", + "windows-sys 0.61.2", +] + [[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", @@ -204,26 +360,38 @@ 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.46", + "syn 2.0.111", ] +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "atty" version = "0.2.14" @@ -237,9 +405,24 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "backtrace" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" +dependencies = [ + "addr2line", + "cfg-if 1.0.4", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-link", +] [[package]] name = "base64" @@ -249,15 +432,21 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "binary-install" @@ -269,14 +458,43 @@ dependencies = [ "dirs-next", "flate2", "fs2", - "hex", + "hex 0.4.3", "is_executable", - "siphasher", + "siphasher 0.3.11", "tar", "ureq", "zip 0.6.6", ] +[[package]] +name = "bip39" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d193de1f7487df1914d3a568b772458861d33f9c54249612cc2893d6915054" +dependencies = [ + "bitcoin_hashes", + "rand 0.8.5", + "rand_core 0.6.4", + "serde", + "unicode-normalization", +] + +[[package]] +name = "bitcoin-internals" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" + +[[package]] +name = "bitcoin_hashes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +dependencies = [ + "bitcoin-internals", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -285,9 +503,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bitvec" @@ -307,7 +525,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" dependencies = [ - "crypto-mac", + "crypto-mac 0.8.0", "digest 0.9.0", "opaque-debug", ] @@ -323,80 +541,77 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ "generic-array", ] [[package]] -name = "borsh" -version = "0.9.3" +name = "block-buffer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "borsh-derive 0.9.3", - "hashbrown 0.11.2", + "generic-array", ] [[package]] -name = "borsh" -version = "1.5.0" +name = "block-padding" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ - "borsh-derive 1.5.0", - "cfg_aliases", + "generic-array", ] [[package]] -name = "borsh-derive" -version = "0.9.3" +name = "blocking" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" +checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.6.1", + "piper", ] [[package]] -name = "borsh-derive" -version = "1.5.0" +name = "blst" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a8646f94ab393e43e8b35a2558b1624bed28b97ee09c5d15456e3c9463f46d" +checksum = "dcdb4c7013139a150f9fc55d123186dbfaba0d912817466282c73ac49e71fb45" dependencies = [ - "once_cell", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.46", - "syn_derive", + "cc", + "glob", + "threadpool", + "zeroize", ] [[package]] -name = "borsh-derive-internal" -version = "0.9.3" +name = "borsh" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" +checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "borsh-derive", + "cfg_aliases", ] [[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" +name = "borsh-derive" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" +checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c" dependencies = [ + "once_cell", + "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.111", ] [[package]] @@ -416,18 +631,18 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "tinyvec", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byteorder" @@ -437,15 +652,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "bytesize" -version = "1.3.0" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +checksum = "2e93abca9e28e0a1b9877922aacb20576e05d4679ffa78c3d6dc22a26a216659" dependencies = [ "serde", ] @@ -462,12 +677,11 @@ dependencies = [ [[package]] name = "bzip2-sys" -version = "0.1.11+1.0.8" +version = "0.1.13+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" dependencies = [ "cc", - "libc", "pkg-config", ] @@ -483,47 +697,80 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" dependencies = [ - "serde", + "serde_core", ] [[package]] name = "cargo-near" -version = "0.3.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f73eb01da3b6737778d2006645533e75563d1080c64bf714bfb88d3fb0ac09b" +checksum = "02835fdf82de4345b21f542e9ddb61786513d05e4c9722db74871de321d8d728" dependencies = [ - "anyhow", "atty", "bs58 0.4.0", "camino", "cargo_metadata 0.14.2", - "clap 3.2.25", + "clap", + "color-eyre", "colored", + "derive_more 0.99.20", + "dunce", "env_logger", + "inquire", + "interactive-clap", + "interactive-clap-derive", "libloading", + "linked-hash-map", "log", + "names", "near-abi", + "near-cli-rs", "rustc_version", - "schemars", + "schemars 0.8.22", "serde_json", - "sha2", + "sha2 0.10.9", + "shell-words", + "strum 0.24.1", + "strum_macros 0.24.3", "symbolic-debuginfo", "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "cargo-platform" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" dependencies = [ "serde", ] +[[package]] +name = "cargo-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a51c783163bdf4549820b80968d386c94ed45ed23819c93f59cca7ebd97fe0eb" +dependencies = [ + "anyhow", + "core-foundation", + "crypto-hash", + "filetime", + "hex 0.4.3", + "jobserver", + "libc", + "log", + "miow", + "same-file", + "shell-escape", + "tempfile", + "walkdir", + "winapi", +] + [[package]] name = "cargo_metadata" version = "0.14.2" @@ -548,17 +795,28 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher 0.4.4", ] [[package]] name = "cc" -version = "1.0.83" +version = "1.2.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" dependencies = [ + "find-msvc-tools", "jobserver", "libc", + "shlex", ] [[package]] @@ -569,29 +827,28 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-link", ] [[package]] @@ -615,97 +872,112 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive 3.2.25", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.4.12" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" +checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" dependencies = [ "clap_builder", - "clap_derive 4.4.7", + "clap_derive", ] [[package]] name = "clap_builder" -version = "4.4.12" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" +checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", + "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ - "heck 0.4.1", - "proc-macro-error", + "heck 0.5.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.111", ] [[package]] -name = "clap_derive" -version = "4.4.7" +name = "clap_lex" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.46", -] +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] -name = "clap_lex" -version = "0.2.4" +name = "color-eyre" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "e5920befb47832a6d61ee3a3a846565cfa39b331331e68a3b1d1116630f2f26d" dependencies = [ - "os_str_bytes", + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", ] [[package]] -name = "clap_lex" -version = "0.6.0" +name = "color-spantrace" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "b8b88ea9df13354b55bc7234ebcce36e6ef896aca2e42a15de9e10edce01b427" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "colored" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.48.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "commoncrypto" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" +dependencies = [ + "commoncrypto-sys", +] + +[[package]] +name = "commoncrypto-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" +dependencies = [ + "libc", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", ] [[package]] @@ -720,6 +992,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" + [[package]] name = "core-foundation" version = "0.9.4" @@ -732,63 +1010,115 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", ] [[package]] name = "crossbeam-channel" -version = "0.5.10" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crossterm" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" dependencies = [ - "cfg-if 1.0.0", + "bitflags 1.3.2", + "crossterm_winapi", + "libc", + "mio 0.8.11", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", ] [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", ] +[[package]] +name = "crypto-hash" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca" +dependencies = [ + "commoncrypto", + "hex 0.3.2", + "openssl", + "winapi", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -799,18 +1129,61 @@ dependencies = [ "subtle", ] +[[package]] +name = "crypto-mac" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "csv" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde_core", +] + +[[package]] +name = "csv-core" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" +dependencies = [ + "memchr", +] + +[[package]] +name = "curve25519-dalek" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle", + "zeroize", +] + [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms", "rand_core 0.6.4", "rustc_version", "subtle", @@ -825,42 +1198,76 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "darling" -version = "0.20.3" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core", + "darling_core 0.20.11", "quote", - "syn 2.0.46", + "syn 2.0.111", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core 0.21.3", + "quote", + "syn 2.0.111", ] [[package]] @@ -874,36 +1281,68 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", - "serde", + "serde_core", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.111", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "unicode-xid", ] [[package]] @@ -921,21 +1360,63 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", + "block-buffer 0.10.4", "crypto-common", "subtle", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys 0.5.0", +] + [[package]] name = "dirs-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "dirs-sys-next", ] +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users 0.4.6", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users 0.5.2", + "windows-sys 0.59.0", +] + [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -943,21 +1424,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users", + "redox_users 0.4.6", "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "dmsort" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0bc8fbe9441c17c9f46f75dfe27fa1ddb6c68a461ccaed0481419219d4f10d3" +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "easy-ext" @@ -965,33 +1463,62 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53aff6fdc1b181225acdcb5b14c47106726fd8e486707315b1b138baed68ee31" +[[package]] +name = "easy-ext" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc5d6d6a8504f8caedd7de14576464383900cd3840b7033a7a3dce5ac00121ca" + +[[package]] +name = "ed25519" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +dependencies = [ + "signature 1.6.4", +] + [[package]] name = "ed25519" version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "signature", + "signature 2.2.0", ] [[package]] name = "ed25519-dalek" -version = "2.1.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", - "ed25519", + "curve25519-dalek 3.2.1", + "ed25519 1.5.3", + "rand 0.7.3", + "serde", + "sha2 0.9.9", + "zeroize", +] + +[[package]] +name = "ed25519-dalek" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" +dependencies = [ + "curve25519-dalek 4.1.3", + "ed25519 2.2.3", "rand_core 0.6.4", - "sha2", + "sha2 0.10.9", "subtle", ] [[package]] name = "either" -version = "1.9.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "elementtree" @@ -1003,13 +1530,19 @@ dependencies = [ "xml-rs", ] +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", ] [[package]] @@ -1029,7 +1562,28 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", +] + +[[package]] +name = "enumflags2" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", ] [[package]] @@ -1047,20 +1601,68 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener 5.4.1", + "pin-project-lite", +] + +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -1069,9 +1671,18 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "2.0.1" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fiat-crypto" @@ -1081,16 +1692,22 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.60.2", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" + [[package]] name = "fixed-hash" version = "0.7.0" @@ -1108,9 +1725,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "miniz_oxide", @@ -1122,6 +1739,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1139,9 +1762,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -1164,12 +1787,13 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[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", + "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -1178,9 +1802,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", @@ -1188,15 +1812,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", @@ -1205,31 +1829,71 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-lite" +version = "1.13.0" +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", +] + +[[package]] +name = "futures-lite" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" +dependencies = [ + "fastrand 2.3.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] [[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", "futures-io", + "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1254,20 +1918,32 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if 1.0.4", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "r-efi", + "wasip2", ] [[package]] @@ -1280,6 +1956,18 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" + +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + [[package]] name = "goblin" version = "0.5.4" @@ -1293,9 +1981,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" dependencies = [ "bytes", "fnv", @@ -1303,36 +1991,35 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.12.1", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.17", "tracing", ] [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "ahash", + "allocator-api2", + "equivalent", + "foldhash", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "heck" @@ -1349,6 +2036,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1360,9 +2053,21 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + +[[package]] +name = "hex" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" [[package]] name = "hex" @@ -1373,6 +2078,31 @@ dependencies = [ "serde", ] +[[package]] +name = "hex-conservative" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac 0.12.1", +] + +[[package]] +name = "hmac" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff" +dependencies = [ + "crypto-mac 0.9.1", + "digest 0.9.0", +] + [[package]] name = "hmac" version = "0.12.1" @@ -1393,9 +2123,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1415,9 +2145,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "httpdate" @@ -1427,15 +2157,15 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", @@ -1448,7 +2178,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.10", "tokio", "tower-service", "tracing", @@ -1482,14 +2212,15 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core", ] @@ -1503,6 +2234,87 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" + +[[package]] +name = "icu_properties" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" + +[[package]] +name = "icu_provider" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1511,12 +2323,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1525,6 +2348,12 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3" +[[package]] +name = "indenter" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5" + [[package]] name = "indexmap" version = "1.9.3" @@ -1538,29 +2367,120 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.16.1", "serde", + "serde_core", ] [[package]] name = "inout" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ + "block-padding", "generic-array", ] +[[package]] +name = "inquire" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33e7c1ddeb15c9abcbfef6029d8e29f69b52b6d6c891031b88ed91b5065803b" +dependencies = [ + "bitflags 1.3.2", + "crossterm", + "dyn-clone", + "lazy_static", + "newline-converter", + "thiserror 1.0.69", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if 1.0.4", +] + +[[package]] +name = "interactive-clap" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7295a8d03a71e15612a524a8e1dec1a913459e0000e530405f20d09fb0f014f7" +dependencies = [ + "interactive-clap-derive", + "strum 0.24.1", + "strum_macros 0.24.3", +] + +[[package]] +name = "interactive-clap-derive" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a0c8d4a6b99054853778e3e9ffb0b74bcb5e8f43d99d97e5c0252c57ce67bf6" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-terminal" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" +dependencies = [ + "hermit-abi 0.5.2", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] [[package]] name = "is_executable" @@ -1571,6 +2491,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + [[package]] name = "itertools" version = "0.10.5" @@ -1580,18 +2506,28 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ + "getrandom 0.3.4", "libc", ] @@ -1603,23 +2539,23 @@ checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ + "once_cell", "wasm-bindgen", ] [[package]] name = "json-patch" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" dependencies = [ "serde", "serde_json", - "thiserror", - "treediff", + "thiserror 1.0.69", ] [[package]] @@ -1637,13 +2573,27 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "keyring" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "363387f0019d714aa60cc30ab4fe501a747f4c08fc58f069dd14be971bd495a0" +dependencies = [ + "byteorder", + "lazy_static", + "linux-keyutils", + "secret-service", + "security-framework", + "windows-sys 0.52.0", +] + [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -1654,9 +2604,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libloading" @@ -1664,66 +2614,102 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "winapi", ] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.10.0", "libc", "redox_syscall", ] +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +dependencies = [ + "serde", +] + +[[package]] +name = "linux-keyutils" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e" +dependencies = [ + "bitflags 2.10.0", + "libc", +] + +[[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.12" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" + +[[package]] +name = "litemap" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.20" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "lru" -version = "0.7.8" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.15.5", ] [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memmap2" @@ -1731,14 +2717,32 @@ version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ - "libc", + "libc", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1763,37 +2767,67 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ - "adler", + "adler2", + "simd-adler32", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "log", + "wasi 0.11.1+wasi-snapshot-preview1", "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +dependencies = [ + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.61.2", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi", +] + [[package]] name = "multimap" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "names" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" +dependencies = [ + "rand 0.8.5", +] + [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1807,23 +2841,73 @@ dependencies = [ [[package]] name = "near-abi" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885db39b08518fa700b73fa2214e8adbbfba316ba82dd510f50519173eadaf73" +checksum = "2fe0c8cdaf8369d8c78f2577d95673007c7f256c85752a66672be5244e2681a6" dependencies = [ - "borsh 0.9.3", - "schemars", + "borsh", + "schemars 0.8.22", "semver", "serde", ] +[[package]] +name = "near-abi-client" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879ac02b2e8d6498294adce1de7a2424a5474b35a73e9262c851be39c89d7f92" +dependencies = [ + "anyhow", + "convert_case 0.5.0", + "near-abi-client-impl", + "near-abi-client-macros", + "prettyplease", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "near-abi-client-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1139e8a6f60fd8ed1c53c700b67bcecbf6deb4b1f47bbe9a9d5eea760d8a8e91" +dependencies = [ + "anyhow", + "near-abi", + "near_schemafy_lib", + "proc-macro2", + "quote", + "schemars 0.8.22", + "serde_json", +] + +[[package]] +name = "near-abi-client-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebaf2aae80086b310bf96e657bbee0c599c3452afd35e72999f8d6764d6b1899" +dependencies = [ + "near-abi-client-impl", + "syn 1.0.109", +] + [[package]] name = "near-account-id" -version = "1.0.0" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "975bb8e272af403d97656893f71e095e1b178ccee571b3ec4a193152be0248f5" +dependencies = [ + "borsh", + "serde", +] + +[[package]] +name = "near-account-id" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" +checksum = "0bf7d8c37ea9408d536af7e998bd0d4f9699de1f6b0d12280d28ae46977c4501" dependencies = [ - "borsh 1.5.0", + "borsh", "serde", ] @@ -1836,20 +2920,68 @@ dependencies = [ "anyhow", "bytesize", "chrono", - "derive_more", + "derive_more 0.99.20", "near-config-utils 0.20.1", "near-crypto 0.20.1", "near-parameters 0.20.1", "near-primitives 0.20.1", - "num-rational", + "num-rational 0.3.2", "once_cell", "serde", "serde_json", - "sha2", - "smart-default", + "sha2 0.10.9", + "smart-default 0.6.0", "tracing", ] +[[package]] +name = "near-cli-rs" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94799fd728fadc895daada6934016cb1fe3fc7e7a01200e5c88708ad8076a8a6" +dependencies = [ + "bip39", + "bs58 0.5.1", + "bytesize", + "cargo-util", + "clap", + "color-eyre", + "derive_more 0.99.20", + "dirs 5.0.1", + "easy-ext 1.0.2", + "ed25519-dalek 1.0.1", + "futures", + "hex 0.4.3", + "inquire", + "interactive-clap", + "interactive-clap-derive", + "keyring", + "linked-hash-map", + "near-crypto 0.20.1", + "near-gas 0.2.5", + "near-jsonrpc-client", + "near-jsonrpc-primitives", + "near-primitives 0.20.1", + "near-socialdb-client", + "near-token 0.2.1", + "open", + "openssl", + "prettytable", + "reqwest", + "serde", + "serde_json", + "shell-words", + "shellexpand", + "slip10", + "smart-default 0.7.1", + "strum 0.24.1", + "strum_macros 0.24.3", + "thiserror 1.0.69", + "tokio", + "toml", + "url", +] + [[package]] name = "near-config-utils" version = "0.20.1" @@ -1858,27 +2990,27 @@ checksum = "2ae1eaab1d545a9be7a55b6ef09f365c2017f93a03063547591d12c0c6d27e58" dependencies = [ "anyhow", "json_comments", - "thiserror", + "thiserror 1.0.69", "tracing", ] [[package]] name = "near-config-utils" -version = "0.23.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b3db4ac2d4340caef06b6363c3fd16c0be1f70267908dfa53e2e6241649b0c" +checksum = "797c54bb5097e938dcb6f9b4cfa97060275a06378fdc17ac71cb5ff7785a6f87" dependencies = [ "anyhow", "json_comments", - "thiserror", + "thiserror 2.0.17", "tracing", ] [[package]] name = "near-contract-standards" -version = "5.2.1" +version = "5.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7682ed5a41e8818518808b2e263b5f482ae7b9b37fff1df5383beb888bbed8" +checksum = "36bb2b1fc97caf72d5430077ca7fc371b0f9c1bd1bcb396b2bdbf0ef4a17d752" dependencies = [ "near-sdk", ] @@ -1890,14 +3022,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2991d2912218a80ec0733ac87f84fa803accea105611eea209d4419271957667" dependencies = [ "blake2 0.9.2", - "borsh 1.5.0", + "borsh", "bs58 0.4.0", "c2-chacha", - "curve25519-dalek", - "derive_more", - "ed25519-dalek", - "hex", - "near-account-id", + "curve25519-dalek 4.1.3", + "derive_more 0.99.20", + "ed25519-dalek 2.2.0", + "hex 0.4.3", + "near-account-id 1.1.4", "near-config-utils 0.20.1", "near-stdx 0.20.1", "once_cell", @@ -1907,32 +3039,32 @@ dependencies = [ "serde", "serde_json", "subtle", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "near-crypto" -version = "0.23.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9807fb257f7dda41383bb33e14cfd4a8840ffa7932cb972db9eabff19ce3bf4" +checksum = "45c39921075013bc68ae446f9d1234c14df88facbc845ce2e698fe2df1698c4e" dependencies = [ "blake2 0.10.6", - "borsh 1.5.0", + "borsh", "bs58 0.4.0", - "curve25519-dalek", - "derive_more", - "ed25519-dalek", - "hex", - "near-account-id", - "near-config-utils 0.23.0", - "near-stdx 0.23.0", - "once_cell", + "curve25519-dalek 4.1.3", + "derive_more 2.0.1", + "ed25519-dalek 2.2.0", + "hex 0.4.3", + "near-account-id 2.0.0", + "near-config-utils 0.34.0", + "near-schema-checker-lib", + "near-stdx 0.34.0", "primitive-types", "secp256k1", "serde", "serde_json", "subtle", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -1946,11 +3078,11 @@ dependencies = [ [[package]] name = "near-fmt" -version = "0.23.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ce363e4078b870775e2a5a5189feae22f0870ca673f6409b1974922dada0c4" +checksum = "51901d9217401785fb204c3c413b1dbc0d6f7bf8e44f5a312bd2f78c4fdc14be" dependencies = [ - "near-primitives-core 0.23.0", + "near-primitives-core 0.34.0", ] [[package]] @@ -1959,8 +3091,19 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14e75c875026229902d065e4435804497337b631ec69ba746b102954273e9ad1" dependencies = [ - "borsh 1.5.0", - "schemars", + "borsh", + "interactive-clap", + "schemars 0.8.22", + "serde", +] + +[[package]] +name = "near-gas" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ca4044222f2f392ab61d27d0aefc5106b1ece4dcd22c5c987e3c75371d2a37" +dependencies = [ + "borsh", "serde", ] @@ -1970,7 +3113,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18ad81e015f7aced8925d5b9ba3f369b36da9575c15812cfd0786bc1213284ca" dependencies = [ - "borsh 1.5.0", + "borsh", "lazy_static", "log", "near-chain-configs", @@ -1980,7 +3123,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1993,10 +3136,10 @@ dependencies = [ "near-chain-configs", "near-crypto 0.20.1", "near-primitives 0.20.1", - "near-rpc-error-macro 0.20.1", + "near-rpc-error-macro", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2006,8 +3149,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d20762631bc8253030013bbae9b5f0542691edc1aa6722f1e8141cc9b928ae5b" dependencies = [ "actix", - "base64 0.21.5", - "clap 4.4.12", + "base64 0.21.7", + "clap", "near-crypto 0.20.1", "near-fmt 0.20.1", "near-primitives-core 0.20.1", @@ -2019,7 +3162,7 @@ dependencies = [ "serde", "serde_json", "strum 0.24.1", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-appender", @@ -2034,34 +3177,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9f16a59b6c3e69b0585be951af6fe42a0ba86c0e207cb8c63badd19efd16680" dependencies = [ "assert_matches", - "borsh 1.5.0", + "borsh", "enum-map", - "near-account-id", + "near-account-id 1.1.4", "near-primitives-core 0.20.1", - "num-rational", + "num-rational 0.3.2", "serde", "serde_repr", "serde_yaml", "strum 0.24.1", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "near-parameters" -version = "0.23.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddf39f5f729976a791d86e0e30a71ec4d8e8dcf58117c8694e7b22fb3f50ee6" +checksum = "ed5e47794f75f3b4e12f249e3f9e9eec3facfcf7a89713b10fa28e02b7a2b66b" dependencies = [ - "borsh 1.5.0", + "borsh", "enum-map", - "near-account-id", - "near-primitives-core 0.23.0", - "num-rational", + "near-account-id 2.0.0", + "near-primitives-core 0.34.0", + "near-schema-checker-lib", + "num-rational 0.3.2", "serde", "serde_repr", "serde_yaml", "strum 0.24.1", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -2071,24 +3215,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0462b067732132babcc89d5577db3bfcb0a1bcfbaaed3f2db4c11cd033666314" dependencies = [ "arbitrary", - "base64 0.21.5", - "borsh 1.5.0", + "base64 0.21.7", + "borsh", "bytesize", - "cfg-if 1.0.0", + "cfg-if 1.0.4", "chrono", - "derive_more", - "easy-ext", + "derive_more 0.99.20", + "easy-ext 0.2.9", "enum-map", - "hex", + "hex 0.4.3", "near-crypto 0.20.1", "near-fmt 0.20.1", "near-o11y", "near-parameters 0.20.1", "near-primitives-core 0.20.1", - "near-rpc-error-macro 0.20.1", + "near-rpc-error-macro", "near-stdx 0.20.1", "near-vm-runner 0.20.1", - "num-rational", + "num-rational 0.3.2", "once_cell", "primitive-types", "rand 0.8.5", @@ -2099,53 +3243,51 @@ dependencies = [ "serde_with", "serde_yaml", "sha3", - "smart-default", + "smart-default 0.6.0", "strum 0.24.1", - "thiserror", + "thiserror 1.0.69", "time", "tracing", ] [[package]] name = "near-primitives" -version = "0.23.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c175262923db9885ed0347e96ec3bcbec57825e3b6d7de03da220f5e14ef5" +checksum = "9c2f46836efc806ebd166b5702be47330cae69ab8687f8397f04ccc2a56d3ce8" dependencies = [ "arbitrary", - "base64 0.21.5", - "borsh 1.5.0", + "base64 0.21.7", + "bitvec", + "borsh", "bytes", "bytesize", - "cfg-if 1.0.0", "chrono", - "derive_more", - "easy-ext", + "derive_more 2.0.1", + "easy-ext 0.2.9", "enum-map", - "hex", - "itertools", - "near-crypto 0.23.0", - "near-fmt 0.23.0", - "near-parameters 0.23.0", - "near-primitives-core 0.23.0", - "near-rpc-error-macro 0.23.0", - "near-stdx 0.23.0", + "hex 0.4.3", + "itertools 0.14.0", + "near-crypto 0.34.0", + "near-fmt 0.34.0", + "near-parameters 0.34.0", + "near-primitives-core 0.34.0", + "near-schema-checker-lib", + "near-stdx 0.34.0", "near-time", - "num-rational", - "once_cell", + "num-rational 0.3.2", + "ordered-float", "primitive-types", - "rand 0.8.5", - "rand_chacha 0.3.1", - "reed-solomon-erasure", "serde", "serde_json", "serde_with", "sha3", - "smart-default", + "smallvec", + "smart-default 0.7.1", "strum 0.24.1", - "thiserror", + "thiserror 2.0.17", "tracing", - "zstd 0.13.2", + "zstd 0.13.3", ] [[package]] @@ -2155,39 +3297,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8443eb718606f572c438be6321a097a8ebd69f8e48d953885b4f16601af88225" dependencies = [ "arbitrary", - "base64 0.21.5", - "borsh 1.5.0", + "base64 0.21.7", + "borsh", "bs58 0.4.0", - "derive_more", + "derive_more 0.99.20", "enum-map", - "near-account-id", - "num-rational", + "near-account-id 1.1.4", + "num-rational 0.3.2", "serde", "serde_repr", "serde_with", - "sha2", + "sha2 0.10.9", "strum 0.24.1", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "near-primitives-core" -version = "0.23.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45de00d413f5bb890a3912f32fcd0974b2b0a975cc7874012e2c4c4fa7f28917" +checksum = "6fe127cf89c4a64d38224bf184446416b5923a666e4cdde0349e89a4013d6024" dependencies = [ "arbitrary", - "base64 0.21.5", - "borsh 1.5.0", + "base64 0.21.7", + "borsh", "bs58 0.4.0", - "derive_more", + "derive_more 2.0.1", "enum-map", - "near-account-id", - "num-rational", + "near-account-id 2.0.0", + "near-gas 0.3.2", + "near-schema-checker-lib", + "near-token 0.3.3", + "num-rational 0.3.2", "serde", "serde_repr", - "sha2", - "thiserror", + "serde_with", + "sha2 0.10.9", + "thiserror 2.0.17", ] [[package]] @@ -2198,18 +3344,7 @@ checksum = "80fca203c51edd9595ec14db1d13359fb9ede32314990bf296b6c5c4502f6ab7" dependencies = [ "quote", "serde", - "syn 2.0.46", -] - -[[package]] -name = "near-rpc-error-core" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf41b149dcc1f5a35d6a96fbcd8c28c92625c05b52025a72ee7378c72bcd68ce" -dependencies = [ - "quote", - "serde", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] @@ -2219,27 +3354,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897a445de2102f6732c8a185d922f5e3bf7fd0a41243ce40854df2197237f799" dependencies = [ "fs2", - "near-rpc-error-core 0.20.1", + "near-rpc-error-core", "serde", - "syn 2.0.46", -] - -[[package]] -name = "near-rpc-error-macro" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c7f0f12f426792dd2c9d83df43d73c3b15d80f6e99e8d0e16ff3e024d0f9ba" -dependencies = [ - "near-rpc-error-core 0.23.0", - "serde", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "near-sandbox-utils" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2de216bb0152bfb64f59016d9e6a5b1ac56dd85f729e5fde08461571e2182c8f" +checksum = "bb707ae2f73e10f253155c34993970422b9de41d64e9639a946ad44fec957bc3" dependencies = [ "anyhow", "binary-install", @@ -2249,46 +3373,86 @@ dependencies = [ "tokio", ] +[[package]] +name = "near-schema-checker-core" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ebd96a4d1f5ee1c1697fe9711a2f4e702054741dfee2a828e708a893edcf84" + +[[package]] +name = "near-schema-checker-lib" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36c8928bf590bb6dd58980007a49552590378cfd2c3a85da204eb11492b6ccc" +dependencies = [ + "near-schema-checker-core", + "near-schema-checker-macro", +] + +[[package]] +name = "near-schema-checker-macro" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e6d9a6251fed6eabce96734f9c4de368da106f7bb46fe743345c699b498553" + [[package]] name = "near-sdk" -version = "5.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951ac0ba9c90e4ed6e927914d2ecee3d8ae2d74e794656b5ca42a992bd370863" -dependencies = [ - "base64 0.21.5", - "borsh 1.5.0", - "bs58 0.5.0", - "near-account-id", - "near-crypto 0.23.0", - "near-gas", - "near-parameters 0.23.0", - "near-primitives 0.23.0", - "near-primitives-core 0.23.0", +version = "5.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd67d070bcad337bf6f9969a41c7dd7c8afae50a3244b9f8d522773f81423de6" +dependencies = [ + "base64 0.22.1", + "borsh", + "bs58 0.5.1", + "near-account-id 2.0.0", + "near-crypto 0.34.0", + "near-gas 0.3.2", + "near-parameters 0.34.0", + "near-primitives 0.34.0", + "near-primitives-core 0.34.0", "near-sdk-macros", "near-sys", - "near-token", - "near-vm-runner 0.23.0", + "near-token 0.3.3", + "near-vm-runner 0.34.0", "once_cell", "serde", "serde_json", + "serde_with", "wee_alloc", ] [[package]] name = "near-sdk-macros" -version = "5.2.1" +version = "5.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2d758ff2701e7a53292a9dc2eeede6ed648574456c14f2464bf0a3ba047be3" +checksum = "748124018df490df4e137b33ecc705adc3a1a65a9fd4e8681bc8e6831a93361c" dependencies = [ "Inflector", - "darling", + "darling 0.20.11", "proc-macro2", "quote", "serde", "serde_json", - "strum 0.26.2", - "strum_macros 0.26.2", - "syn 2.0.46", + "strum 0.26.3", + "strum_macros 0.26.4", + "syn 2.0.111", +] + +[[package]] +name = "near-socialdb-client" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfaf5ca57fd62d678cb67183d1d31e6bbb04b98abc45fd57b986962d97ad8c4a" +dependencies = [ + "color-eyre", + "near-crypto 0.20.1", + "near-jsonrpc-client", + "near-jsonrpc-primitives", + "near-primitives 0.20.1", + "near-token 0.2.1", + "serde", + "serde_json", + "url", ] [[package]] @@ -2299,35 +3463,45 @@ checksum = "855fd5540e3b4ff6fedf12aba2db1ee4b371b36f465da1363a6d022b27cb43b8" [[package]] name = "near-stdx" -version = "0.23.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e1897481272eb144328abd51ca9f59b5b558e7a6dc6e2177c8c9bb18fbd818" +checksum = "9753b00780a36ccb8a8f3bb2ee1c0e48de4c153a5b4c4828352efbe52924aeb9" [[package]] name = "near-sys" -version = "0.2.2" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf4ca5c805cb78700e10e43484902d8da05f25788db277999d209568aaf4c8e" +checksum = "b99e9ce0020190ea152f70d1849e54fc8fc123738e7447800ad818c78f5167cc" [[package]] name = "near-time" -version = "0.23.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56db32f26b089441c1a7c5451f0d68637afa9d66f6d8f6a6f2d6c2f7953520a" +checksum = "edf78a9fc25a2eac3804e02a4a289fb3a2ab654f6241578507514ddefe4b93b7" dependencies = [ - "once_cell", + "parking_lot", "serde", "time", - "tokio", ] [[package]] name = "near-token" -version = "0.2.0" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b497804ec8f603fd11edc3d3b7b19f07c0beb9fe47c8a536eea1867097fd40" +dependencies = [ + "borsh", + "interactive-clap", + "serde", +] + +[[package]] +name = "near-token" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b68f3f8a2409f72b43efdbeff8e820b81e70824c49fee8572979d789d1683fb" +checksum = "34de6b54d82d0790b2a56b677e7b4ecb7f021a7e8559f8611065c890d56cfcda" dependencies = [ - "borsh 1.5.0", + "borsh", "serde", ] @@ -2337,100 +3511,153 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c56c80bdb1954808f59bd36a9112377197b38d424991383bf05f52d0fe2e0da5" dependencies = [ - "base64 0.21.5", - "borsh 1.5.0", - "ed25519-dalek", + "base64 0.21.7", + "borsh", + "ed25519-dalek 2.2.0", "enum-map", - "memoffset", + "memoffset 0.8.0", "near-crypto 0.20.1", "near-parameters 0.20.1", "near-primitives-core 0.20.1", "near-stdx 0.20.1", - "num-rational", + "num-rational 0.3.2", "once_cell", "prefix-sum-vec", "ripemd", "serde", "serde_repr", "serde_with", - "sha2", + "sha2 0.10.9", "sha3", "strum 0.24.1", - "thiserror", + "thiserror 1.0.69", "tracing", "zeropool-bn", ] [[package]] name = "near-vm-runner" -version = "0.23.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b382e9fda99cdc6f1684d95e9f10ef0ed556c14ff972099269e96f8fde84064" +checksum = "7ce3394cf86d81701be198b6d699b54e2229f8d1eaf959161a4236ead4851048" dependencies = [ - "borsh 1.5.0", - "ed25519-dalek", + "blst", + "borsh", + "bytesize", + "ed25519-dalek 2.2.0", "enum-map", "lru", - "near-crypto 0.23.0", - "near-parameters 0.23.0", - "near-primitives-core 0.23.0", - "near-stdx 0.23.0", - "num-rational", - "once_cell", + "near-crypto 0.34.0", + "near-parameters 0.34.0", + "near-primitives-core 0.34.0", + "near-schema-checker-lib", + "near-stdx 0.34.0", + "num-rational 0.3.2", + "parking_lot", + "rand 0.8.5", + "rayon", "ripemd", - "rustix", + "rustix 1.1.2", "serde", - "serde_repr", - "sha2", + "sha2 0.10.9", "sha3", "strum 0.24.1", "tempfile", - "thiserror", + "thiserror 2.0.17", "tracing", "zeropool-bn", ] [[package]] name = "near-workspaces" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e597da87d0c1a722e23efb8c24ae42a0ad99a15f37101dad45c15defb051c1" +checksum = "02a9c60c2ea4735297625d46a69683998f1130533abdb1c53f109d8ef87680db" dependencies = [ "async-trait", - "base64 0.21.5", - "bs58 0.5.0", + "base64 0.21.7", + "bs58 0.5.1", "cargo-near", "cargo_metadata 0.18.1", "chrono", "fs2", "json-patch", "libc", - "near-account-id", + "near-abi-client", + "near-account-id 1.1.4", "near-crypto 0.20.1", - "near-gas", + "near-gas 0.2.5", "near-jsonrpc-client", "near-jsonrpc-primitives", "near-primitives 0.20.1", "near-sandbox-utils", - "near-token", + "near-token 0.2.1", "rand 0.8.5", "reqwest", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-retry", "tracing", "url", ] +[[package]] +name = "near_schemafy_core" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d7a1f809a319578773329389529dbf8c8f0abfbb05a429b37f437105f7caf6" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "near_schemafy_lib" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c39ccae55df51adaa1a4e567b7a79ab4380826a695121cebf41f518076d8c3dd" +dependencies = [ + "Inflector", + "near_schemafy_core", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "syn 1.0.109", + "uriparse", +] + [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "newline-converter" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f71d09d5c87634207f894c6b31b6a2b2c64ea3bdcf71bd5599fdbbe1600c00f" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "nix" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.4", + "libc", + "memoffset 0.7.1", +] [[package]] name = "nom" @@ -2457,12 +3684,25 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "overload", - "winapi", + "windows-sys 0.59.0", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint 0.4.6", + "num-complex", + "num-integer", + "num-iter", + "num-rational 0.4.2", + "num-traits", ] [[package]] @@ -2476,13 +3716,48 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", + "num-integer", "num-traits", ] @@ -2493,51 +3768,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg", - "num-bigint", + "num-bigint 0.3.3", "num-integer", "num-traits", "serde", ] +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint 0.4.6", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.5.2", "libc", ] +[[package]] +name = "object" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "open" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" dependencies = [ - "bitflags 2.4.1", - "cfg-if 1.0.0", + "bitflags 2.10.0", + "cfg-if 1.0.4", "foreign-types", "libc", "once_cell", @@ -2553,23 +3865,33 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + +[[package]] +name = "openssl-src" +version = "300.5.4+3.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "a507b3792995dae9b0df8a1c1e3771e8418b7c2d9f0baeba32e6fe8b06c7cb72" +dependencies = [ + "cc", +] [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -2590,7 +3912,7 @@ dependencies = [ "percent-encoding", "pin-project", "rand 0.8.5", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -2607,7 +3929,7 @@ dependencies = [ "http", "opentelemetry", "prost", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", "tonic-build", @@ -2623,22 +3945,50 @@ dependencies = [ ] [[package]] -name = "os_str_bytes" -version = "6.6.1" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "overload" -version = "0.1.1" +name = "ordered-float" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" +dependencies = [ + "borsh", + "num-traits", + "rand 0.8.5", + "serde", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "owo-colors" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -2646,15 +3996,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-link", ] [[package]] @@ -2668,6 +4018,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "pathdiff" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" + [[package]] name = "pbkdf2" version = "0.11.0" @@ -2675,9 +4031,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest 0.10.7", - "hmac", + "hmac 0.12.1", "password-hash", - "sha2", + "sha2 0.10.9", ] [[package]] @@ -2693,54 +4049,54 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.12.1", ] [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ - "siphasher", + "siphasher 1.0.1", ] [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -2748,11 +4104,22 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand 2.3.0", + "futures-io", +] + [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "plain" @@ -2761,10 +4128,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] -name = "platforms" -version = "3.4.0" +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if 1.0.4", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" +dependencies = [ + "cfg-if 1.0.4", + "concurrent-queue", + "hermit-abi 0.5.2", + "pin-project-lite", + "rustix 1.1.2", + "windows-sys 0.61.2", +] + +[[package]] +name = "potential_utf" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] [[package]] name = "powerfmt" @@ -2774,9 +4174,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] [[package]] name = "precomputed-hash" @@ -2790,6 +4193,30 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa06bd51638b6e76ac9ba9b6afb4164fa647bd2916d722f2623fbb6d1ed8bdba" +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "prettytable" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46480520d1b77c9a3482d39939fcf96831537a250ec62d4fd8fbdf8e0302e781" +dependencies = [ + "csv", + "encode_unicode", + "is-terminal", + "lazy_static", + "term", + "unicode-width", +] + [[package]] name = "primitive-types" version = "0.10.1" @@ -2802,20 +4229,21 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "0.1.5" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "toml", + "once_cell", + "toml_edit 0.19.15", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit", + "toml_edit 0.23.7", ] [[package]] @@ -2844,26 +4272,26 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.74" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "fnv", "lazy_static", "memchr", "parking_lot", "protobuf", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2884,7 +4312,7 @@ checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck 0.3.3", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -2903,7 +4331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -2927,13 +4355,19 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "radium" version = "0.7.0" @@ -2962,6 +4396,7 @@ dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.4", + "serde", ] [[package]] @@ -2999,7 +4434,8 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.16", + "serde", ] [[package]] @@ -3011,24 +4447,55 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rayon" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.10.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom 0.2.16", + "libredox", + "thiserror 1.0.69", +] + +[[package]] +name = "redox_users" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.16", "libredox", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -3041,56 +4508,61 @@ dependencies = [ ] [[package]] -name = "regex" -version = "1.10.2" +name = "ref-cast" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "ref-cast-impl", ] [[package]] -name = "regex-automata" -version = "0.1.10" +name = "ref-cast-impl" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ - "regex-syntax 0.6.29", + "proc-macro2", + "quote", + "syn 2.0.111", ] [[package]] -name = "regex-automata" -version = "0.4.3" +name = "regex" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex-syntax" -version = "0.6.29" +name = "regex-automata" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -3108,9 +4580,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -3124,16 +4598,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", - "getrandom 0.2.11", + "cfg-if 1.0.4", + "getrandom 0.2.16", "libc", - "spin 0.9.8", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3145,6 +4619,12 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "rustc-demangle" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -3153,31 +4633,58 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.28" +version = "0.37.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6" +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.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.10.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.10.0", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.11.0", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -3185,6 +4692,15 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -3197,30 +4713,39 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "schemars" -version = "0.8.16" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" dependencies = [ "dyn-clone", "schemars_derive", @@ -3228,16 +4753,40 @@ dependencies = [ "serde_json", ] +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.111", ] [[package]] @@ -3269,7 +4818,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] @@ -3294,20 +4843,39 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" +checksum = "4473013577ec77b4ee3668179ef1186df3146e2cf2d927bd200974c6fe60fd99" dependencies = [ "cc", ] +[[package]] +name = "secret-service" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5204d39df37f06d1944935232fd2dfe05008def7ca599bf28c0800366c8a8f9" +dependencies = [ + "aes", + "cbc", + "futures-util", + "generic-array", + "hkdf", + "num", + "once_cell", + "rand 0.8.5", + "serde", + "sha2 0.10.9", + "zbus", +] + [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.10.0", "core-foundation", "core-foundation-sys", "libc", @@ -3316,9 +4884,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ "core-foundation-sys", "libc", @@ -3326,65 +4894,87 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" dependencies = [ "serde", + "serde_core", ] [[package]] name = "serde" -version = "1.0.194" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.194" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.111", ] [[package]] name = "serde_json" -version = "1.0.110" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fbd975230bada99c8bb618e0c365c2eefa219158d5c6c29610fd09ff1833257" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.12.1", "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", +] + +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", ] [[package]] @@ -3401,16 +4991,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" dependencies = [ - "base64 0.21.5", + "base64 0.22.1", "chrono", - "hex", + "hex 0.4.3", "indexmap 1.9.3", - "indexmap 2.1.0", - "serde", + "indexmap 2.12.1", + "schemars 0.9.0", + "schemars 1.1.0", + "serde_core", "serde_json", "serde_with_macros", "time", @@ -3418,23 +5010,23 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" dependencies = [ - "darling", + "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "serde_yaml" -version = "0.9.30" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.12.1", "itoa", "ryu", "serde", @@ -3447,18 +5039,31 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "cpufeatures", "digest 0.10.7", ] [[package]] name = "sha2" -version = "0.10.8" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if 1.0.4", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "cpufeatures", "digest 0.10.7", ] @@ -3482,41 +5087,115 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shell-escape" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shellexpand" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" +dependencies = [ + "dirs 6.0.0", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc" +dependencies = [ + "libc", + "mio 0.8.11", + "signal-hook", +] + [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + [[package]] name = "signature" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "siphasher" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + +[[package]] +name = "slip10" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28724a6e6f70b0cb115c580891483da6f3aa99e6a353598303a57f89d23aa6bc" dependencies = [ - "autocfg", + "ed25519-dalek 1.0.1", + "hmac 0.9.0", + "sha2 0.9.9", ] [[package]] name = "smallvec" -version = "1.11.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "smart-default" @@ -3529,6 +5208,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "smart-default" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "socket2" version = "0.4.10" @@ -3541,19 +5231,23 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "spin" -version = "0.5.2" +name = "socket2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] [[package]] name = "spin" @@ -3563,9 +5257,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "static_assertions" @@ -3575,12 +5269,11 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "string_cache" -version = "0.8.7" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" dependencies = [ "new_debug_unreachable", - "once_cell", "parking_lot", "phf_shared", "precomputed-hash", @@ -3589,9 +5282,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -3604,9 +5297,9 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "strum_macros" @@ -3623,22 +5316,22 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symbolic-common" @@ -3663,7 +5356,7 @@ dependencies = [ "elementtree", "fallible-iterator", "flate2", - "gimli", + "gimli 0.26.2", "goblin", "lazy_static", "lazycell", @@ -3677,7 +5370,7 @@ dependencies = [ "serde_json", "smallvec", "symbolic-common", - "thiserror", + "thiserror 1.0.69", "wasmparser", "zip 0.5.13", ] @@ -3695,9 +5388,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.46" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -3705,15 +5398,20 @@ dependencies = [ ] [[package]] -name = "syn_derive" -version = "0.1.8" +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "synstructure" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] @@ -3745,9 +5443,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" dependencies = [ "filetime", "libc", @@ -3756,70 +5454,104 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall", - "rustix", + "fastrand 2.3.0", + "getrandom 0.3.4", + "once_cell", + "rustix 1.1.2", "windows-sys 0.52.0", ] +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] -name = "textwrap" -version = "0.16.0" +name = "thiserror" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] [[package]] name = "thiserror" -version = "1.0.56" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +dependencies = [ + "thiserror-impl 2.0.17", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.111", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ - "cfg-if 1.0.0", - "once_cell", + "cfg-if 1.0.4", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", ] [[package]] name = "time" -version = "0.3.31" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -3828,24 +5560,35 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" dependencies = [ + "num-conv", "time-core", ] +[[package]] +name = "tinystr" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -3858,28 +5601,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "autocfg", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.1.0", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.10", + "socket2 0.6.1", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-io-timeout" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76" dependencies = [ "pin-project-lite", "tokio", @@ -3887,13 +5628,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] @@ -3919,9 +5660,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -3944,42 +5685,79 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.5.11" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", + "serde_spanned", + "toml_datetime 0.6.11", + "toml_edit 0.19.15", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.12.1", + "serde", + "serde_spanned", + "toml_datetime 0.6.11", + "winnow 0.5.40", +] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.23.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" dependencies = [ - "indexmap 2.1.0", - "toml_datetime", - "winnow", + "indexmap 2.12.1", + "toml_datetime 0.7.3", + "toml_parser", + "winnow 0.7.14", +] + +[[package]] +name = "toml_parser" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +dependencies = [ + "winnow 0.7.14", ] [[package]] @@ -4039,7 +5817,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.17", "tower-layer", "tower-service", "tracing", @@ -4047,21 +5825,21 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" dependencies = [ "log", "pin-project-lite", @@ -4071,37 +5849,47 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 2.0.17", "time", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.111", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" dependencies = [ "once_cell", "valuable", ] +[[package]] +name = "tracing-error" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" +dependencies = [ + "tracing", + "tracing-subscriber", +] + [[package]] name = "tracing-futures" version = "0.2.5" @@ -4150,14 +5938,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "sharded-slab", "smallvec", "thread_local", @@ -4166,15 +5954,6 @@ dependencies = [ "tracing-log 0.2.0", ] -[[package]] -name = "treediff" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" -dependencies = [ - "serde_json", -] - [[package]] name = "try-lock" version = "0.2.5" @@ -4183,9 +5962,20 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.17.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] [[package]] name = "uint" @@ -4195,42 +5985,48 @@ checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", - "hex", + "hex 0.4.3", "static_assertions", ] -[[package]] -name = "unicode-bidi" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-xid" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -4244,7 +6040,7 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "flate2", "log", "once_cell", @@ -4254,11 +6050,21 @@ dependencies = [ "webpki-roots", ] +[[package]] +name = "uriparse" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0200d0fc04d809396c2ad43f3c95da3582a2556eba8d453c1087f4120ee352ff" +dependencies = [ + "fnv", + "lazy_static", +] + [[package]] name = "url" -version = "2.5.0" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", @@ -4266,11 +6072,17 @@ dependencies = [ "serde", ] +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" @@ -4280,9 +6092,9 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -4303,9 +6115,25 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +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" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] [[package]] name = "want" @@ -4324,52 +6152,50 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasm-bindgen" -version = "0.2.89" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", + "wit-bindgen", ] [[package]] -name = "wasm-bindgen-backend" -version = "0.2.89" +name = "wasm-bindgen" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ - "bumpalo", - "log", + "cfg-if 1.0.4", "once_cell", - "proc-macro2", - "quote", - "syn 2.0.46", + "rustversion", + "wasm-bindgen-macro", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4377,22 +6203,25 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.46", - "wasm-bindgen-backend", + "syn 2.0.111", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasmparser" @@ -4402,9 +6231,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -4412,9 +6241,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "wee_alloc" @@ -4437,7 +6266,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix", + "rustix 0.38.44", ] [[package]] @@ -4458,11 +6287,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -4473,11 +6302,61 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.52.0" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-targets 0.52.0", + "windows-link", ] [[package]] @@ -4495,7 +6374,34 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", ] [[package]] @@ -4515,17 +6421,35 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -4536,9 +6460,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -4548,9 +6478,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -4560,9 +6496,27 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -4572,9 +6526,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -4584,9 +6544,15 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -4596,9 +6562,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -4608,15 +6580,30 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "winnow" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winnow" -version = "0.5.31" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] @@ -4627,10 +6614,22 @@ version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.4", "windows-sys 0.48.0", ] +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "writeable" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" + [[package]] name = "wyz" version = "0.5.1" @@ -4642,26 +6641,179 @@ dependencies = [ [[package]] name = "xattr" -version = "1.2.0" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" +dependencies = [ + "libc", + "rustix 1.1.2", +] + +[[package]] +name = "xdg-home" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "linux-raw-sys", - "rustix", + "windows-sys 0.59.0", ] [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" + +[[package]] +name = "yoke" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "synstructure", +] + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex 0.4.3", + "nix", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "synstructure", +] [[package]] name = "zeroize" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] [[package]] name = "zeropool-bn" @@ -4676,6 +6828,39 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "zerotrie" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "zip" version = "0.5.13" @@ -4685,7 +6870,7 @@ dependencies = [ "byteorder", "crc32fast", "flate2", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4701,7 +6886,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "flate2", - "hmac", + "hmac 0.12.1", "pbkdf2", "sha1", "time", @@ -4719,11 +6904,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" dependencies = [ - "zstd-safe 7.2.1", + "zstd-safe 7.2.4", ] [[package]] @@ -4738,19 +6923,57 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.1" +version = "7.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", ] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5879410..ca21bf6 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.73.0" +channel = "1.85.0" components = ["rustfmt"] targets = ["wasm32-unknown-unknown"] diff --git a/src/lib.rs b/src/lib.rs index 307bcd5..59172b4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -112,6 +112,24 @@ impl SourceScan { return self.contracts.get(&account_id); } + /// Returns all verified contracts that have the given code_hash. + /// Useful when the same contract code is deployed to multiple accounts - + /// if the code is verified on one account, this shows it's verified everywhere. + pub fn get_contracts_by_code_hash( + &self, + code_hash: String, + ) -> Vec<(AccountId, VerifiedContract)> { + self.contracts + .iter() + .filter(|(_, contract)| contract.code_hash == code_hash) + .collect() + } + + /// Returns the total count of verified contracts. + pub fn get_contracts_count(&self) -> u64 { + self.contracts.len() + } + pub fn search( &self, key: String, @@ -512,4 +530,65 @@ mod tests { VoteType::Downvote )); } + + #[test] + fn test_get_contracts_by_code_hash() { + let context = get_context(accounts(0)); + testing_env!(context.build()); + + let mut contract = SourceScan::new(); + + // Add contracts with the same code_hash + contract.set_contract( + accounts(1), + "cid1".to_string(), + "same_hash".to_string(), + 100, + "Rust".to_string(), + ); + contract.set_contract( + accounts(2), + "cid2".to_string(), + "same_hash".to_string(), + 200, + "Rust".to_string(), + ); + // Add contract with different code_hash + contract.set_contract( + accounts(3), + "cid3".to_string(), + "different_hash".to_string(), + 300, + "Rust".to_string(), + ); + + // Query by code_hash + let results = contract.get_contracts_by_code_hash("same_hash".to_string()); + assert_eq!(results.len(), 2); + + let results_different = contract.get_contracts_by_code_hash("different_hash".to_string()); + assert_eq!(results_different.len(), 1); + + let results_none = contract.get_contracts_by_code_hash("nonexistent".to_string()); + assert_eq!(results_none.len(), 0); + } + + #[test] + fn test_get_contracts_count() { + let context = get_context(accounts(0)); + testing_env!(context.build()); + + let mut contract = SourceScan::new(); + + assert_eq!(contract.get_contracts_count(), 0); + + add_contract(&mut contract, accounts(1)); + assert_eq!(contract.get_contracts_count(), 1); + + add_contract(&mut contract, accounts(2)); + assert_eq!(contract.get_contracts_count(), 2); + + contract.purge_contract(accounts(1)); + assert_eq!(contract.get_contracts_count(), 1); + } } From 7bbaa700ec1de08364e662a52fc9e048ac3ed2d7 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 2 Dec 2025 12:41:43 +0100 Subject: [PATCH 35/36] build: update docker image to 0.17.0-rust-1.86.0 --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 24d0b1c..e3b9583 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,14 +13,14 @@ crate-type = ["cdylib", "rlib"] [package.metadata.near.reproducible_build] # docker image, descriptor of build environment -image = "sourcescan/cargo-near:0.7.0-rust-1.80.0" +image = "sourcescan/cargo-near:0.17.0-rust-1.86.0" # tag after colon above serves only descriptive purpose; image is identified by digest -image_digest = "sha256:60b6c83c305f689117675502ef6d2a82cabb32e2428ab80925bcdb526260dd9c" -# build command inside of docker container +image_digest = "sha256:1784ca6310f3496f0048356ce420921c8f5fdf71ee8124d43a2e1ceb1f70db8a" +# build command inside of docker container # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags, # the command may be any combination of flags of `cargo-near`, # supported by respective version of binary inside the container besides `--no-locked` flag -container_build_command = ["cargo", "near", "build"] +container_build_command = ["cargo", "near", "build", "--locked"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From e0b1ee20a7b518fdd591c4f09a6919fab0f48de0 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 2 Dec 2025 12:42:56 +0100 Subject: [PATCH 36/36] build: fix container build command for newer image --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e3b9583..c3c99ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ image_digest = "sha256:1784ca6310f3496f0048356ce420921c8f5fdf71ee8124d43a2e1ceb1 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags, # the command may be any combination of flags of `cargo-near`, # supported by respective version of binary inside the container besides `--no-locked` flag -container_build_command = ["cargo", "near", "build", "--locked"] +container_build_command = ["cargo", "near", "build", "non-reproducible-wasm", "--locked"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies]