From 996333dedf0cc8948bdbd0c140a6f0ab0c05a2e4 Mon Sep 17 00:00:00 2001 From: Phuong Nguyen Date: Wed, 29 May 2024 14:59:07 -0700 Subject: [PATCH 1/4] Upgrade near-sdk to 5.1.0 --- contract/Cargo.lock | 295 +---------- contract/Cargo.toml | 2 +- integration-tests/chain-signatures/Cargo.lock | 301 +---------- node/Cargo.lock | 500 +++--------------- node/Cargo.toml | 2 +- 5 files changed, 115 insertions(+), 985 deletions(-) diff --git a/contract/Cargo.lock b/contract/Cargo.lock index 4cb408c5e..a6a10a0ff 100644 --- a/contract/Cargo.lock +++ b/contract/Cargo.lock @@ -648,16 +648,6 @@ dependencies = [ "hashbrown 0.11.2", ] -[[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.5.0" @@ -674,21 +664,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", @@ -719,17 +696,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" @@ -741,17 +707,6 @@ 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" @@ -3220,16 +3175,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "near-account-id" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0cb40869cab7f5232f934f45db35bffe0f2d2a7cb0cd0346202fbe4ebf2dd7" -dependencies = [ - "borsh 0.10.3", - "serde", -] - [[package]] name = "near-account-id" version = "1.0.0" @@ -3237,7 +3182,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" dependencies = [ "borsh 1.5.0", - "schemars", "serde", ] @@ -3344,18 +3288,6 @@ dependencies = [ "url", ] -[[package]] -name = "near-config-utils" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5523e7dce493c45bc3241eb3100d943ec471852f9b1f84b46a34789eadf17031" -dependencies = [ - "anyhow", - "json_comments", - "thiserror", - "tracing", -] - [[package]] name = "near-config-utils" version = "0.20.1" @@ -3380,33 +3312,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-crypto" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6b382b626e7e0cd372d027c6672ac97b4b6ee6114288c9e58d8180b935d315" -dependencies = [ - "blake2", - "borsh 0.10.3", - "bs58 0.4.0", - "c2-chacha", - "curve25519-dalek 3.2.1", - "derive_more", - "ed25519-dalek 1.0.1", - "hex 0.4.3", - "near-account-id 0.17.0", - "near-config-utils 0.17.0", - "near-stdx 0.17.0", - "once_cell", - "primitive-types", - "rand 0.7.3", - "secp256k1", - "serde", - "serde_json", - "subtle", - "thiserror", -] - [[package]] name = "near-crypto" version = "0.20.1" @@ -3421,7 +3326,7 @@ dependencies = [ "derive_more", "ed25519-dalek 2.1.1", "hex 0.4.3", - "near-account-id 1.0.0", + "near-account-id", "near-config-utils 0.20.1", "near-stdx 0.20.1", "once_cell", @@ -3448,7 +3353,7 @@ dependencies = [ "derive_more", "ed25519-dalek 2.1.1", "hex 0.4.3", - "near-account-id 1.0.0", + "near-account-id", "near-config-utils 0.21.2", "near-stdx 0.21.2", "once_cell", @@ -3461,15 +3366,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "near-fmt" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44c842c6cfcd9b8c387cccd4cd0619a5f21920cde5d5c292af3cc5d40510672" -dependencies = [ - "near-primitives-core 0.17.0", -] - [[package]] name = "near-fmt" version = "0.20.1" @@ -3570,32 +3466,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "near-o11y" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7d35397b02b131c188c72f3885e97daeccab134ec2fc8cc0073a94cf1cfe19" -dependencies = [ - "actix", - "atty", - "clap", - "near-crypto 0.17.0", - "near-primitives-core 0.17.0", - "once_cell", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry-semantic-conventions", - "prometheus", - "serde", - "strum 0.24.1", - "thiserror", - "tokio", - "tracing", - "tracing-appender", - "tracing-opentelemetry", - "tracing-subscriber", -] - [[package]] name = "near-o11y" version = "0.20.1" @@ -3661,7 +3531,7 @@ dependencies = [ "assert_matches", "borsh 1.5.0", "enum-map", - "near-account-id 1.0.0", + "near-account-id", "near-primitives-core 0.20.1", "num-rational 0.3.2", "serde", @@ -3680,7 +3550,7 @@ dependencies = [ "assert_matches", "borsh 1.5.0", "enum-map", - "near-account-id 1.0.0", + "near-account-id", "near-primitives-core 0.21.2", "num-rational 0.3.2", "serde", @@ -3690,43 +3560,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "near-primitives" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f7051aaf199adc4d068620fca6d5f70f906a1540d03a8bb3701271f8881835" -dependencies = [ - "arbitrary", - "borsh 0.10.3", - "bytesize", - "cfg-if 1.0.0", - "chrono", - "derive_more", - "easy-ext 0.2.9", - "enum-map", - "hex 0.4.3", - "near-crypto 0.17.0", - "near-fmt 0.17.0", - "near-primitives-core 0.17.0", - "near-rpc-error-macro 0.17.0", - "near-stdx 0.17.0", - "near-vm-errors", - "num-rational 0.3.2", - "once_cell", - "primitive-types", - "rand 0.8.5", - "reed-solomon-erasure", - "serde", - "serde_json", - "serde_with", - "serde_yaml", - "smart-default 0.6.0", - "strum 0.24.1", - "thiserror", - "time", - "tracing", -] - [[package]] name = "near-primitives" version = "0.20.1" @@ -3811,28 +3644,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-primitives-core" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775fec19ef51a341abdbf792a9dda5b4cb89f488f681b2fd689b9321d24db47b" -dependencies = [ - "arbitrary", - "base64 0.21.7", - "borsh 0.10.3", - "bs58 0.4.0", - "derive_more", - "enum-map", - "near-account-id 0.17.0", - "num-rational 0.3.2", - "serde", - "serde_repr", - "serde_with", - "sha2 0.10.8", - "strum 0.24.1", - "thiserror", -] - [[package]] name = "near-primitives-core" version = "0.20.1" @@ -3845,7 +3656,7 @@ dependencies = [ "bs58 0.4.0", "derive_more", "enum-map", - "near-account-id 1.0.0", + "near-account-id", "num-rational 0.3.2", "serde", "serde_repr", @@ -3867,7 +3678,7 @@ dependencies = [ "bs58 0.4.0", "derive_more", "enum-map", - "near-account-id 1.0.0", + "near-account-id", "num-rational 0.3.2", "serde", "serde_repr", @@ -3877,17 +3688,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "near-rpc-error-core" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c1eda300e2e78f4f945ae58117d49e806899f4a51ee2faa09eda5ebc2e6571" -dependencies = [ - "quote", - "serde", - "syn 2.0.66", -] - [[package]] name = "near-rpc-error-core" version = "0.20.1" @@ -3910,18 +3710,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "near-rpc-error-macro" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d2dadd765101c77e664029dd6fbec090e696877d4ae903c620d02ceda4969a" -dependencies = [ - "fs2", - "near-rpc-error-core 0.17.0", - "serde", - "syn 2.0.66", -] - [[package]] name = "near-rpc-error-macro" version = "0.20.1" @@ -3961,25 +3749,19 @@ dependencies = [ [[package]] name = "near-sdk" -version = "5.0.0-alpha.1" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62385d178cbf20d7b62277e0ffe5d65b133989994240b2789d5510fa7de332da" +checksum = "520234cfdf04a805ac2f04715889d096eb83fdd5b99ca7d0f8027ae473f891a8" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "borsh 1.5.0", - "bs58 0.4.0", - "near-abi", - "near-account-id 1.0.0", - "near-crypto 0.17.0", + "bs58 0.5.1", + "near-account-id", "near-gas", - "near-primitives 0.17.0", - "near-primitives-core 0.17.0", "near-sdk-macros", "near-sys", "near-token", - "near-vm-logic", "once_cell", - "schemars", "serde", "serde_json", "wee_alloc", @@ -3987,9 +3769,9 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e9b23d9d7757ade258921c9cbc7923542e64d9d3b52a6cd91f746c77cb0a0f" +checksum = "ee2fe3fc30068c5f20e89b0985d6104c5cc1c6742dbc6efbf352be4189b9bbf7" dependencies = [ "Inflector", "darling", @@ -4019,12 +3801,6 @@ dependencies = [ "url", ] -[[package]] -name = "near-stdx" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6540152fba5e96fe5d575b79e8cd244cf2add747bb01362426bdc069bc3a23bc" - [[package]] name = "near-stdx" version = "0.20.1" @@ -4051,7 +3827,6 @@ checksum = "7b68f3f8a2409f72b43efdbeff8e820b81e70824c49fee8572979d789d1683fb" dependencies = [ "borsh 1.5.0", "interactive-clap", - "schemars", "serde", ] @@ -4119,43 +3894,6 @@ dependencies = [ "tracing", ] -[[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 0.24.1", - "thiserror", -] - -[[package]] -name = "near-vm-logic" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7487c678ed1963a0ecd5033f72bb41caa58debd6fe8025a9bef6e1a6a519a" -dependencies = [ - "borsh 0.10.3", - "ed25519-dalek 1.0.1", - "near-account-id 0.17.0", - "near-crypto 0.17.0", - "near-fmt 0.17.0", - "near-o11y 0.17.0", - "near-primitives 0.17.0", - "near-primitives-core 0.17.0", - "near-stdx 0.17.0", - "near-vm-errors", - "ripemd", - "serde", - "sha2 0.10.8", - "sha3", - "zeropool-bn", -] - [[package]] name = "near-vm-runner" version = "0.20.1" @@ -4288,7 +4026,7 @@ dependencies = [ "json-patch", "libc", "near-abi-client", - "near-account-id 1.0.0", + "near-account-id", "near-crypto 0.21.2", "near-gas", "near-jsonrpc-client 0.9.0", @@ -7881,7 +7619,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/contract/Cargo.toml b/contract/Cargo.toml index 2773b124d..c86516017 100644 --- a/contract/Cargo.toml +++ b/contract/Cargo.toml @@ -8,7 +8,7 @@ crate-type = ["cdylib", "lib"] [dependencies] borsh = "1.3.0" -near-sdk = "=5.0.0-alpha.1" +near-sdk = { version = "=5.1.0", features = ["legacy"] } serde = { version = "1", features = ["derive"] } serde_json = "1" schemars = "0.8" diff --git a/integration-tests/chain-signatures/Cargo.lock b/integration-tests/chain-signatures/Cargo.lock index 5af37e6d2..6fc8a1656 100644 --- a/integration-tests/chain-signatures/Cargo.lock +++ b/integration-tests/chain-signatures/Cargo.lock @@ -1236,16 +1236,6 @@ dependencies = [ "hashbrown 0.11.2", ] -[[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.5.0" @@ -1262,21 +1252,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", @@ -1307,17 +1284,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" @@ -1329,17 +1295,6 @@ 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" @@ -4036,7 +3991,7 @@ dependencies = [ "mpc-contract", "mpc-keys", "mpc-recovery-node", - "near-account-id 1.0.0", + "near-account-id", "near-crypto 0.21.2", "near-fetch", "near-jsonrpc-client 0.9.0", @@ -4650,7 +4605,7 @@ dependencies = [ "local-ip-address", "mpc-contract", "mpc-keys", - "near-account-id 1.0.0", + "near-account-id", "near-crypto 0.21.2", "near-fetch", "near-lake-framework", @@ -4757,16 +4712,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "near-account-id" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0cb40869cab7f5232f934f45db35bffe0f2d2a7cb0cd0346202fbe4ebf2dd7" -dependencies = [ - "borsh 0.10.3", - "serde", -] - [[package]] name = "near-account-id" version = "1.0.0" @@ -4774,7 +4719,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" dependencies = [ "borsh 1.5.0", - "schemars", "serde", ] @@ -4881,18 +4825,6 @@ dependencies = [ "url 2.5.0", ] -[[package]] -name = "near-config-utils" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5523e7dce493c45bc3241eb3100d943ec471852f9b1f84b46a34789eadf17031" -dependencies = [ - "anyhow", - "json_comments", - "thiserror", - "tracing", -] - [[package]] name = "near-config-utils" version = "0.20.1" @@ -4917,33 +4849,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-crypto" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6b382b626e7e0cd372d027c6672ac97b4b6ee6114288c9e58d8180b935d315" -dependencies = [ - "blake2", - "borsh 0.10.3", - "bs58 0.4.0", - "c2-chacha", - "curve25519-dalek 3.2.0", - "derive_more", - "ed25519-dalek 1.0.1", - "hex 0.4.3", - "near-account-id 0.17.0", - "near-config-utils 0.17.0", - "near-stdx 0.17.0", - "once_cell", - "primitive-types 0.10.1", - "rand 0.7.3", - "secp256k1 0.27.0", - "serde", - "serde_json", - "subtle", - "thiserror", -] - [[package]] name = "near-crypto" version = "0.20.1" @@ -4958,7 +4863,7 @@ dependencies = [ "derive_more", "ed25519-dalek 2.1.1", "hex 0.4.3", - "near-account-id 1.0.0", + "near-account-id", "near-config-utils 0.20.1", "near-stdx 0.20.1", "once_cell", @@ -4985,7 +4890,7 @@ dependencies = [ "derive_more", "ed25519-dalek 2.1.1", "hex 0.4.3", - "near-account-id 1.0.0", + "near-account-id", "near-config-utils 0.21.2", "near-stdx 0.21.2", "once_cell", @@ -5004,7 +4909,7 @@ version = "0.2.0" source = "git+https://github.com/ChaoticTempest/fetch.git#20c8825f47cb88b61a961be3ccbfc262bff45db9" dependencies = [ "base64 0.22.1", - "near-account-id 1.0.0", + "near-account-id", "near-crypto 0.21.2", "near-gas", "near-jsonrpc-client 0.9.0", @@ -5018,15 +4923,6 @@ dependencies = [ "tokio-retry", ] -[[package]] -name = "near-fmt" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44c842c6cfcd9b8c387cccd4cd0619a5f21920cde5d5c292af3cc5d40510672" -dependencies = [ - "near-primitives-core 0.17.0", -] - [[package]] name = "near-fmt" version = "0.20.1" @@ -5186,32 +5082,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "near-o11y" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7d35397b02b131c188c72f3885e97daeccab134ec2fc8cc0073a94cf1cfe19" -dependencies = [ - "actix", - "atty", - "clap", - "near-crypto 0.17.0", - "near-primitives-core 0.17.0", - "once_cell", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry-semantic-conventions", - "prometheus", - "serde", - "strum 0.24.1", - "thiserror", - "tokio", - "tracing", - "tracing-appender", - "tracing-opentelemetry", - "tracing-subscriber", -] - [[package]] name = "near-o11y" version = "0.20.1" @@ -5277,7 +5147,7 @@ dependencies = [ "assert_matches", "borsh 1.5.0", "enum-map", - "near-account-id 1.0.0", + "near-account-id", "near-primitives-core 0.20.1", "num-rational 0.3.2", "serde", @@ -5296,7 +5166,7 @@ dependencies = [ "assert_matches", "borsh 1.5.0", "enum-map", - "near-account-id 1.0.0", + "near-account-id", "near-primitives-core 0.21.2", "num-rational 0.3.2", "serde", @@ -5306,43 +5176,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "near-primitives" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f7051aaf199adc4d068620fca6d5f70f906a1540d03a8bb3701271f8881835" -dependencies = [ - "arbitrary", - "borsh 0.10.3", - "bytesize", - "cfg-if 1.0.0", - "chrono", - "derive_more", - "easy-ext 0.2.9", - "enum-map", - "hex 0.4.3", - "near-crypto 0.17.0", - "near-fmt 0.17.0", - "near-primitives-core 0.17.0", - "near-rpc-error-macro 0.17.0", - "near-stdx 0.17.0", - "near-vm-errors", - "num-rational 0.3.2", - "once_cell", - "primitive-types 0.10.1", - "rand 0.8.5", - "reed-solomon-erasure", - "serde", - "serde_json", - "serde_with 3.8.1", - "serde_yaml", - "smart-default 0.6.0", - "strum 0.24.1", - "thiserror", - "time", - "tracing", -] - [[package]] name = "near-primitives" version = "0.20.1" @@ -5427,28 +5260,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-primitives-core" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775fec19ef51a341abdbf792a9dda5b4cb89f488f681b2fd689b9321d24db47b" -dependencies = [ - "arbitrary", - "base64 0.21.7", - "borsh 0.10.3", - "bs58 0.4.0", - "derive_more", - "enum-map", - "near-account-id 0.17.0", - "num-rational 0.3.2", - "serde", - "serde_repr", - "serde_with 3.8.1", - "sha2 0.10.8", - "strum 0.24.1", - "thiserror", -] - [[package]] name = "near-primitives-core" version = "0.20.1" @@ -5461,7 +5272,7 @@ dependencies = [ "bs58 0.4.0", "derive_more", "enum-map", - "near-account-id 1.0.0", + "near-account-id", "num-rational 0.3.2", "serde", "serde_repr", @@ -5483,7 +5294,7 @@ dependencies = [ "bs58 0.4.0", "derive_more", "enum-map", - "near-account-id 1.0.0", + "near-account-id", "num-rational 0.3.2", "serde", "serde_repr", @@ -5493,17 +5304,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "near-rpc-error-core" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c1eda300e2e78f4f945ae58117d49e806899f4a51ee2faa09eda5ebc2e6571" -dependencies = [ - "quote", - "serde", - "syn 2.0.65", -] - [[package]] name = "near-rpc-error-core" version = "0.20.1" @@ -5526,18 +5326,6 @@ dependencies = [ "syn 2.0.65", ] -[[package]] -name = "near-rpc-error-macro" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d2dadd765101c77e664029dd6fbec090e696877d4ae903c620d02ceda4969a" -dependencies = [ - "fs2", - "near-rpc-error-core 0.17.0", - "serde", - "syn 2.0.65", -] - [[package]] name = "near-rpc-error-macro" version = "0.20.1" @@ -5577,25 +5365,19 @@ dependencies = [ [[package]] name = "near-sdk" -version = "5.0.0-alpha.1" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62385d178cbf20d7b62277e0ffe5d65b133989994240b2789d5510fa7de332da" +checksum = "520234cfdf04a805ac2f04715889d096eb83fdd5b99ca7d0f8027ae473f891a8" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "borsh 1.5.0", - "bs58 0.4.0", - "near-abi", - "near-account-id 1.0.0", - "near-crypto 0.17.0", + "bs58 0.5.1", + "near-account-id", "near-gas", - "near-primitives 0.17.0", - "near-primitives-core 0.17.0", "near-sdk-macros", "near-sys", "near-token", - "near-vm-logic", "once_cell", - "schemars", "serde", "serde_json", "wee_alloc", @@ -5603,9 +5385,9 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e9b23d9d7757ade258921c9cbc7923542e64d9d3b52a6cd91f746c77cb0a0f" +checksum = "ee2fe3fc30068c5f20e89b0985d6104c5cc1c6742dbc6efbf352be4189b9bbf7" dependencies = [ "Inflector", "darling 0.20.9", @@ -5635,12 +5417,6 @@ dependencies = [ "url 2.5.0", ] -[[package]] -name = "near-stdx" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6540152fba5e96fe5d575b79e8cd244cf2add747bb01362426bdc069bc3a23bc" - [[package]] name = "near-stdx" version = "0.20.1" @@ -5667,7 +5443,6 @@ checksum = "7b68f3f8a2409f72b43efdbeff8e820b81e70824c49fee8572979d789d1683fb" dependencies = [ "borsh 1.5.0", "interactive-clap", - "schemars", "serde", ] @@ -5735,43 +5510,6 @@ dependencies = [ "tracing", ] -[[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 0.24.1", - "thiserror", -] - -[[package]] -name = "near-vm-logic" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7487c678ed1963a0ecd5033f72bb41caa58debd6fe8025a9bef6e1a6a519a" -dependencies = [ - "borsh 0.10.3", - "ed25519-dalek 1.0.1", - "near-account-id 0.17.0", - "near-crypto 0.17.0", - "near-fmt 0.17.0", - "near-o11y 0.17.0", - "near-primitives 0.17.0", - "near-primitives-core 0.17.0", - "near-stdx 0.17.0", - "near-vm-errors", - "ripemd", - "serde", - "sha2 0.10.8", - "sha3", - "zeropool-bn", -] - [[package]] name = "near-vm-runner" version = "0.20.1" @@ -5904,7 +5642,7 @@ dependencies = [ "json-patch", "libc", "near-abi-client", - "near-account-id 1.0.0", + "near-account-id", "near-crypto 0.21.2", "near-gas", "near-jsonrpc-client 0.9.0", @@ -10333,7 +10071,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/node/Cargo.lock b/node/Cargo.lock index 0a8942c28..71aede27f 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -450,17 +450,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "auto_ops" version = "0.3.0" @@ -570,7 +559,7 @@ dependencies = [ "once_cell", "percent-encoding 2.3.1", "regex-lite", - "sha2 0.10.8", + "sha2", "tracing", "url 2.5.0", ] @@ -664,7 +653,7 @@ dependencies = [ "p256 0.11.1", "percent-encoding 2.3.1", "ring 0.17.8", - "sha2 0.10.8", + "sha2", "subtle", "time", "tracing", @@ -699,7 +688,7 @@ dependencies = [ "md-5", "pin-project-lite", "sha1", - "sha2 0.10.8", + "sha2", "tracing", ] @@ -1037,15 +1026,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -1079,16 +1059,6 @@ dependencies = [ "hashbrown 0.11.2", ] -[[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.5.0" @@ -1105,21 +1075,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", @@ -1150,17 +1107,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" @@ -1173,21 +1119,19 @@ dependencies = [ ] [[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" +name = "bs58" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bs58" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] [[package]] name = "bumpalo" @@ -1709,19 +1653,6 @@ dependencies = [ "cipher 0.4.4", ] -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "4.1.2" @@ -1939,7 +1870,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", "const-oid", "crypto-common", "subtle", @@ -2043,15 +1974,6 @@ dependencies = [ "spki 0.7.3", ] -[[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" @@ -2061,30 +1983,16 @@ dependencies = [ "signature 2.2.0", ] -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", -] - [[package]] name = "ed25519-dalek" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.2", - "ed25519 2.2.3", + "curve25519-dalek", + "ed25519", "rand_core 0.6.4", - "sha2 0.10.8", + "sha2", "subtle", ] @@ -2768,15 +2676,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" @@ -2842,7 +2741,7 @@ dependencies = [ "p256 0.13.2", "rand_core 0.6.4", "serde", - "sha2 0.10.8", + "sha2", "subtle", "x25519-dalek", "zeroize", @@ -3092,7 +2991,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -3159,7 +3058,7 @@ dependencies = [ "elliptic-curve 0.13.8", "once_cell", "serdect", - "sha2 0.10.8", + "sha2", "signature 2.2.0", ] @@ -3485,12 +3384,12 @@ dependencies = [ "local-ip-address", "mpc-contract", "mpc-keys", - "near-account-id 1.0.0", - "near-crypto 0.21.2", + "near-account-id", + "near-crypto", "near-fetch", "near-lake-framework", "near-lake-primitives", - "near-primitives 0.21.2", + "near-primitives", "near-sdk", "once_cell", "prometheus", @@ -3498,7 +3397,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "thiserror", "tokio", "tokio-retry", @@ -3531,28 +3430,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "near-abi" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c49593c9e94454a2368a4c0a511bf4bf1413aff4d23f16e1d8f4e64b5215351" -dependencies = [ - "borsh 1.5.0", - "schemars", - "semver 1.0.23", - "serde", -] - -[[package]] -name = "near-account-id" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0cb40869cab7f5232f934f45db35bffe0f2d2a7cb0cd0346202fbe4ebf2dd7" -dependencies = [ - "borsh 0.10.3", - "serde", -] - [[package]] name = "near-account-id" version = "1.0.0" @@ -3560,7 +3437,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" dependencies = [ "borsh 1.5.0", - "schemars", "serde", ] @@ -3583,31 +3459,19 @@ dependencies = [ "bytesize", "chrono", "derive_more", - "near-config-utils 0.21.2", - "near-crypto 0.21.2", + "near-config-utils", + "near-crypto", "near-parameters", - "near-primitives 0.21.2", + "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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5523e7dce493c45bc3241eb3100d943ec471852f9b1f84b46a34789eadf17031" -dependencies = [ - "anyhow", - "json_comments", - "thiserror", - "tracing", -] - [[package]] name = "near-config-utils" version = "0.21.2" @@ -3620,33 +3484,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-crypto" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6b382b626e7e0cd372d027c6672ac97b4b6ee6114288c9e58d8180b935d315" -dependencies = [ - "blake2", - "borsh 0.10.3", - "bs58", - "c2-chacha", - "curve25519-dalek 3.2.0", - "derive_more", - "ed25519-dalek 1.0.1", - "hex", - "near-account-id 0.17.0", - "near-config-utils 0.17.0", - "near-stdx 0.17.0", - "once_cell", - "primitive-types", - "rand 0.7.3", - "secp256k1", - "serde", - "serde_json", - "subtle", - "thiserror", -] - [[package]] name = "near-crypto" version = "0.21.2" @@ -3655,15 +3492,15 @@ checksum = "3d927e95742aea981b9fd60996fbeba3b61e90acafd54c2c3c2a4ed40065ff03" dependencies = [ "blake2", "borsh 1.5.0", - "bs58", + "bs58 0.4.0", "c2-chacha", - "curve25519-dalek 4.1.2", + "curve25519-dalek", "derive_more", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "hex", - "near-account-id 1.0.0", - "near-config-utils 0.21.2", - "near-stdx 0.21.2", + "near-account-id", + "near-config-utils", + "near-stdx", "once_cell", "primitive-types", "rand 0.7.3", @@ -3680,12 +3517,12 @@ version = "0.2.0" source = "git+https://github.com/ChaoticTempest/fetch.git#20c8825f47cb88b61a961be3ccbfc262bff45db9" dependencies = [ "base64 0.22.1", - "near-account-id 1.0.0", - "near-crypto 0.21.2", + "near-account-id", + "near-crypto", "near-gas", "near-jsonrpc-client", "near-jsonrpc-primitives", - "near-primitives 0.21.2", + "near-primitives", "near-token", "serde", "serde_json", @@ -3694,22 +3531,13 @@ dependencies = [ "tokio-retry", ] -[[package]] -name = "near-fmt" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44c842c6cfcd9b8c387cccd4cd0619a5f21920cde5d5c292af3cc5d40510672" -dependencies = [ - "near-primitives-core 0.17.0", -] - [[package]] name = "near-fmt" version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a9aa862014eeedb79df494b1b8080c5b51cd014f978183e08a7918a50350558" dependencies = [ - "near-primitives-core 0.21.2", + "near-primitives-core", ] [[package]] @@ -3729,7 +3557,7 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a584b253186387b648312d9510ebbece3ebb974335a71d52be6645521e4ec4e" dependencies = [ - "near-primitives 0.21.2", + "near-primitives", "serde", "serde_json", ] @@ -3744,9 +3572,9 @@ dependencies = [ "lazy_static", "log", "near-chain-configs", - "near-crypto 0.21.2", + "near-crypto", "near-jsonrpc-primitives", - "near-primitives 0.21.2", + "near-primitives", "reqwest", "serde", "serde_json", @@ -3761,9 +3589,9 @@ checksum = "63ba17af2bc4208fdc4f6a8088842ad1f0165ac46d8259db6a2719f15d039e06" dependencies = [ "arbitrary", "near-chain-configs", - "near-crypto 0.21.2", - "near-primitives 0.21.2", - "near-rpc-error-macro 0.21.2", + "near-crypto", + "near-primitives", + "near-rpc-error-macro", "serde", "serde_json", "thiserror", @@ -3807,42 +3635,16 @@ version = "0.8.0-beta.3" source = "git+https://github.com/near/near-lake-framework-rs?branch=dmd/bump-dependencies#e4eaa0c1b1c1d63c45963474db7ee82c38557d54" dependencies = [ "anyhow", - "near-crypto 0.21.2", + "near-crypto", "near-indexer-primitives", - "near-primitives 0.21.2", - "near-primitives-core 0.21.2", + "near-primitives", + "near-primitives-core", "paste", "serde", "serde_json", "thiserror", ] -[[package]] -name = "near-o11y" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7d35397b02b131c188c72f3885e97daeccab134ec2fc8cc0073a94cf1cfe19" -dependencies = [ - "actix", - "atty", - "clap", - "near-crypto 0.17.0", - "near-primitives-core 0.17.0", - "once_cell", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry-semantic-conventions", - "prometheus", - "serde", - "strum 0.24.1", - "thiserror", - "tokio", - "tracing", - "tracing-appender", - "tracing-opentelemetry", - "tracing-subscriber", -] - [[package]] name = "near-o11y" version = "0.21.2" @@ -3852,9 +3654,9 @@ dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto 0.21.2", - "near-fmt 0.21.2", - "near-primitives-core 0.21.2", + "near-crypto", + "near-fmt", + "near-primitives-core", "once_cell", "opentelemetry", "opentelemetry-otlp", @@ -3880,8 +3682,8 @@ dependencies = [ "assert_matches", "borsh 1.5.0", "enum-map", - "near-account-id 1.0.0", - "near-primitives-core 0.21.2", + "near-account-id", + "near-primitives-core", "num-rational", "serde", "serde_repr", @@ -3890,43 +3692,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "near-primitives" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f7051aaf199adc4d068620fca6d5f70f906a1540d03a8bb3701271f8881835" -dependencies = [ - "arbitrary", - "borsh 0.10.3", - "bytesize", - "cfg-if 1.0.0", - "chrono", - "derive_more", - "easy-ext", - "enum-map", - "hex", - "near-crypto 0.17.0", - "near-fmt 0.17.0", - "near-primitives-core 0.17.0", - "near-rpc-error-macro 0.17.0", - "near-stdx 0.17.0", - "near-vm-errors", - "num-rational", - "once_cell", - "primitive-types", - "rand 0.8.5", - "reed-solomon-erasure", - "serde", - "serde_json", - "serde_with 3.8.1", - "serde_yaml", - "smart-default", - "strum 0.24.1", - "thiserror", - "time", - "tracing", -] - [[package]] name = "near-primitives" version = "0.21.2" @@ -3943,13 +3708,13 @@ dependencies = [ "easy-ext", "enum-map", "hex", - "near-crypto 0.21.2", - "near-fmt 0.21.2", - "near-o11y 0.21.2", + "near-crypto", + "near-fmt", + "near-o11y", "near-parameters", - "near-primitives-core 0.21.2", - "near-rpc-error-macro 0.21.2", - "near-stdx 0.21.2", + "near-primitives-core", + "near-rpc-error-macro", + "near-stdx", "near-vm-runner", "num-rational", "once_cell", @@ -3969,28 +3734,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-primitives-core" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775fec19ef51a341abdbf792a9dda5b4cb89f488f681b2fd689b9321d24db47b" -dependencies = [ - "arbitrary", - "base64 0.21.7", - "borsh 0.10.3", - "bs58", - "derive_more", - "enum-map", - "near-account-id 0.17.0", - "num-rational", - "serde", - "serde_repr", - "serde_with 3.8.1", - "sha2 0.10.8", - "strum 0.24.1", - "thiserror", -] - [[package]] name = "near-primitives-core" version = "0.21.2" @@ -4000,30 +3743,19 @@ dependencies = [ "arbitrary", "base64 0.21.7", "borsh 1.5.0", - "bs58", + "bs58 0.4.0", "derive_more", "enum-map", - "near-account-id 1.0.0", + "near-account-id", "num-rational", "serde", "serde_repr", "serde_with 3.8.1", - "sha2 0.10.8", + "sha2", "strum 0.24.1", "thiserror", ] -[[package]] -name = "near-rpc-error-core" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c1eda300e2e78f4f945ae58117d49e806899f4a51ee2faa09eda5ebc2e6571" -dependencies = [ - "quote", - "serde", - "syn 2.0.66", -] - [[package]] name = "near-rpc-error-core" version = "0.21.2" @@ -4035,18 +3767,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "near-rpc-error-macro" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d2dadd765101c77e664029dd6fbec090e696877d4ae903c620d02ceda4969a" -dependencies = [ - "fs2", - "near-rpc-error-core 0.17.0", - "serde", - "syn 2.0.66", -] - [[package]] name = "near-rpc-error-macro" version = "0.21.2" @@ -4054,32 +3774,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa8db2fd2a6dbab8c56908e983f41570341e391daddb0d4c430746c6971107e3" dependencies = [ "fs2", - "near-rpc-error-core 0.21.2", + "near-rpc-error-core", "serde", "syn 2.0.66", ] [[package]] name = "near-sdk" -version = "5.0.0-alpha.1" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62385d178cbf20d7b62277e0ffe5d65b133989994240b2789d5510fa7de332da" +checksum = "520234cfdf04a805ac2f04715889d096eb83fdd5b99ca7d0f8027ae473f891a8" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "borsh 1.5.0", - "bs58", - "near-abi", - "near-account-id 1.0.0", - "near-crypto 0.17.0", + "bs58 0.5.1", + "near-account-id", "near-gas", - "near-primitives 0.17.0", - "near-primitives-core 0.17.0", "near-sdk-macros", "near-sys", "near-token", - "near-vm-logic", "once_cell", - "schemars", "serde", "serde_json", "wee_alloc", @@ -4087,9 +3801,9 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e9b23d9d7757ade258921c9cbc7923542e64d9d3b52a6cd91f746c77cb0a0f" +checksum = "ee2fe3fc30068c5f20e89b0985d6104c5cc1c6742dbc6efbf352be4189b9bbf7" dependencies = [ "Inflector", "darling 0.20.9", @@ -4102,12 +3816,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "near-stdx" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6540152fba5e96fe5d575b79e8cd244cf2add747bb01362426bdc069bc3a23bc" - [[package]] name = "near-stdx" version = "0.21.2" @@ -4127,7 +3835,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b68f3f8a2409f72b43efdbeff8e820b81e70824c49fee8572979d789d1683fb" dependencies = [ "borsh 1.5.0", - "schemars", "serde", ] @@ -4195,43 +3902,6 @@ dependencies = [ "tracing", ] -[[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 0.24.1", - "thiserror", -] - -[[package]] -name = "near-vm-logic" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7487c678ed1963a0ecd5033f72bb41caa58debd6fe8025a9bef6e1a6a519a" -dependencies = [ - "borsh 0.10.3", - "ed25519-dalek 1.0.1", - "near-account-id 0.17.0", - "near-crypto 0.17.0", - "near-fmt 0.17.0", - "near-o11y 0.17.0", - "near-primitives 0.17.0", - "near-primitives-core 0.17.0", - "near-stdx 0.17.0", - "near-vm-errors", - "ripemd", - "serde", - "sha2 0.10.8", - "sha3", - "zeropool-bn", -] - [[package]] name = "near-vm-runner" version = "0.21.2" @@ -4241,16 +3911,16 @@ dependencies = [ "anyhow", "base64 0.21.7", "borsh 1.5.0", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "enum-map", "finite-wasm", "loupe", "memoffset 0.8.0", "near-cache", - "near-crypto 0.21.2", + "near-crypto", "near-parameters", - "near-primitives-core 0.21.2", - "near-stdx 0.21.2", + "near-primitives-core", + "near-stdx", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", @@ -4266,7 +3936,7 @@ dependencies = [ "serde", "serde_repr", "serde_with 3.8.1", - "sha2 0.10.8", + "sha2", "sha3", "strum 0.24.1", "thiserror", @@ -4422,7 +4092,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", ] @@ -4571,7 +4241,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -4786,7 +4456,7 @@ checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", - "hermit-abi 0.3.9", + "hermit-abi", "pin-project-lite", "rustix 0.38.34", "tracing", @@ -5881,19 +5551,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" @@ -7576,7 +7233,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.2", + "curve25519-dalek", "rand_core 0.6.4", ] @@ -7659,7 +7316,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/node/Cargo.toml b/node/Cargo.toml index 2ae896b84..487d24a5c 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -47,7 +47,7 @@ near-fetch = { git = "https://github.com/ChaoticTempest/fetch.git" } near-lake-framework = { git = "https://github.com/near/near-lake-framework-rs", branch = "dmd/bump-dependencies" } near-lake-primitives = { git = "https://github.com/near/near-lake-framework-rs", branch = "dmd/bump-dependencies" } near-primitives = "0.21.2" -near-sdk = "=5.0.0-alpha.1" +near-sdk = { version = "=5.1.0", features = ["legacy"] } mpc-contract = { path = "../contract" } mpc-keys = { path = "../keys" } From 092adb2dcb30fc34b8206f7b80700c8fa9ea0a0e Mon Sep 17 00:00:00 2001 From: Phuong Nguyen Date: Wed, 29 May 2024 15:40:41 -0700 Subject: [PATCH 2/4] Upgrade borsh to 1.5.0 --- contract/Cargo.toml | 2 +- integration-tests/chain-signatures/Cargo.lock | 2 +- keys/Cargo.lock | 109 ++---------------- keys/Cargo.toml | 2 +- keys/src/hpke.rs | 12 +- node/Cargo.lock | 2 +- 6 files changed, 24 insertions(+), 105 deletions(-) diff --git a/contract/Cargo.toml b/contract/Cargo.toml index c86516017..b85561dbb 100644 --- a/contract/Cargo.toml +++ b/contract/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" crate-type = ["cdylib", "lib"] [dependencies] -borsh = "1.3.0" +borsh = "1.5.0" near-sdk = { version = "=5.1.0", features = ["legacy"] } serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/integration-tests/chain-signatures/Cargo.lock b/integration-tests/chain-signatures/Cargo.lock index 6fc8a1656..34216b76a 100644 --- a/integration-tests/chain-signatures/Cargo.lock +++ b/integration-tests/chain-signatures/Cargo.lock @@ -4573,7 +4573,7 @@ dependencies = [ name = "mpc-keys" version = "0.1.0" dependencies = [ - "borsh 0.9.3", + "borsh 1.5.0", "hpke", "rand 0.8.5", "serde", diff --git a/keys/Cargo.lock b/keys/Cargo.lock index 18f3a618b..44e124f08 100644 --- a/keys/Cargo.lock +++ b/keys/Cargo.lock @@ -37,17 +37,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "base16ct" version = "0.2.0" @@ -65,47 +54,11 @@ dependencies = [ [[package]] name = "borsh" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" -dependencies = [ - "borsh-derive", - "hashbrown", -] - -[[package]] -name = "borsh-derive" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" +checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "cfg_aliases", ] [[package]] @@ -120,6 +73,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chacha20" version = "0.9.1" @@ -225,7 +184,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -328,15 +287,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - [[package]] name = "hex" version = "0.4.3" @@ -410,12 +360,6 @@ dependencies = [ "serde", ] -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - [[package]] name = "opaque-debug" version = "0.3.1" @@ -476,15 +420,6 @@ dependencies = [ "elliptic-curve", ] -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - [[package]] name = "proc-macro2" version = "1.0.83" @@ -578,7 +513,7 @@ checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -598,17 +533,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.66" @@ -620,15 +544,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "typenum" version = "1.17.0" @@ -690,5 +605,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] diff --git a/keys/Cargo.toml b/keys/Cargo.toml index b45de18bd..678273f7c 100644 --- a/keys/Cargo.toml +++ b/keys/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" crate-type = ["cdylib", "lib"] [dependencies] -borsh = { version = "0.9.3" } +borsh = "1.5.0" hpke = { version = "0.11", features = ["serde_impls", "std"] } serde = { version = "1", features = ["derive"] } rand = { version = "0.8" } diff --git a/keys/src/hpke.rs b/keys/src/hpke.rs index e19058e00..f2f6a5f3a 100644 --- a/keys/src/hpke.rs +++ b/keys/src/hpke.rs @@ -1,3 +1,5 @@ +use std::io; + use borsh::{self, BorshDeserialize, BorshSerialize}; use hpke::{ aead::{AeadTag, ChaCha20Poly1305}, @@ -85,10 +87,12 @@ impl BorshSerialize for PublicKey { } impl BorshDeserialize for PublicKey { - fn deserialize(buf: &mut &[u8]) -> std::io::Result { - Ok(Self::from_bytes( - & as BorshDeserialize>::deserialize(buf)?, - )) + fn deserialize_reader(reader: &mut R) -> io::Result { + as BorshDeserialize>::deserialize_reader(reader).and_then(|buf| { + Ok(Self::from_bytes( + & as BorshDeserialize>::deserialize(&mut buf.as_slice())?, + )) + }) } } diff --git a/node/Cargo.lock b/node/Cargo.lock index 71aede27f..4eb4d8de4 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -3352,7 +3352,7 @@ dependencies = [ name = "mpc-keys" version = "0.1.0" dependencies = [ - "borsh 0.9.3", + "borsh 1.5.0", "hpke", "rand 0.8.5", "serde", From c1976933b7bac011500f78acef6d5739bb072170 Mon Sep 17 00:00:00 2001 From: Phuong Nguyen Date: Wed, 29 May 2024 16:42:36 -0700 Subject: [PATCH 3/4] Upgrade hyper-rustls to 0.24 from 0.23, and fix RUSTSEC-2024-0336 --- .github/workflows/unit.yml | 2 + integration-tests/chain-signatures/Cargo.lock | 107 ++++-------------- integration-tests/chain-signatures/build.rs | 1 - integration-tests/fastauth/Cargo.lock | 72 ++---------- mpc-recovery/Cargo.lock | 70 ++---------- mpc-recovery/Cargo.toml | 2 +- node/Cargo.lock | 107 ++++-------------- node/Cargo.toml | 2 +- 8 files changed, 65 insertions(+), 298 deletions(-) diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index f8e271c18..20ed7cd6a 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -77,6 +77,8 @@ jobs: run: | cargo audit --ignore RUSTSEC-2020-0071 --ignore RUSTSEC-2023-0052 --ignore RUSTSEC-2022-0093 --ignore RUSTSEC-2023-0071 --ignore RUSTSEC-2024-0019 - name: Run Audit (Chain Signatures) + # even if previous audit step fails, run this audit step to ensure all crates are audited + if: always() working-directory: integration-tests/chain-signatures run: | cargo audit --ignore RUSTSEC-2020-0071 --ignore RUSTSEC-2023-0052 --ignore RUSTSEC-2022-0093 --ignore RUSTSEC-2023-0071 --ignore RUSTSEC-2024-0019 diff --git a/integration-tests/chain-signatures/Cargo.lock b/integration-tests/chain-signatures/Cargo.lock index 34216b76a..1aee38fff 100644 --- a/integration-tests/chain-signatures/Cargo.lock +++ b/integration-tests/chain-signatures/Cargo.lock @@ -550,7 +550,7 @@ dependencies = [ "hex 0.4.3", "http 0.2.12", "hyper", - "ring 0.17.8", + "ring", "time", "tokio", "tracing", @@ -717,7 +717,7 @@ dependencies = [ "once_cell", "p256 0.11.1", "percent-encoding 2.3.1", - "ring 0.17.8", + "ring", "sha2 0.10.8", "subtle", "time", @@ -825,7 +825,7 @@ dependencies = [ "http-body 0.4.6", "http-body 1.0.0", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "once_cell", "pin-project-lite", "pin-utils", @@ -3388,7 +3388,7 @@ dependencies = [ "google-apis-common", "http 0.2.12", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools 0.10.5", "mime", "serde", @@ -3408,7 +3408,7 @@ dependencies = [ "google-apis-common", "http 0.2.12", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools 0.10.5", "mime", "serde", @@ -3735,21 +3735,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http 0.2.12", - "hyper", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", -] - [[package]] name = "hyper-rustls" version = "0.24.2" @@ -3763,7 +3748,7 @@ dependencies = [ "rustls 0.21.12", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -4599,7 +4584,7 @@ dependencies = [ "highway", "hkdf", "hyper", - "hyper-rustls 0.23.2", + "hyper-rustls", "itertools 0.12.1", "k256", "local-ip-address", @@ -6992,7 +6977,7 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -7011,7 +6996,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tower-service", "url 2.5.0", "wasm-bindgen", @@ -7042,21 +7027,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -7068,7 +7038,7 @@ dependencies = [ "getrandom 0.2.15", "libc", "spin 0.9.8", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] @@ -7217,18 +7187,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.12" @@ -7236,7 +7194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-webpki 0.101.7", "sct", ] @@ -7248,7 +7206,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-pki-types", "rustls-webpki 0.102.4", "subtle", @@ -7288,8 +7246,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -7298,9 +7256,9 @@ version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -7419,8 +7377,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -8503,17 +8461,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -8907,12 +8854,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -9633,16 +9574,6 @@ dependencies = [ "url 2.5.0", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "webpki-roots" version = "0.25.4" @@ -9944,7 +9875,7 @@ dependencies = [ "futures", "http 0.2.12", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools 0.12.1", "log", "percent-encoding 2.3.1", diff --git a/integration-tests/chain-signatures/build.rs b/integration-tests/chain-signatures/build.rs index 50432152e..4c3c0300c 100644 --- a/integration-tests/chain-signatures/build.rs +++ b/integration-tests/chain-signatures/build.rs @@ -71,7 +71,6 @@ async fn build_multichain(release: bool) -> anyhow::Result { async fn build_multichain_contract(release: bool) -> anyhow::Result { let target_dir = target_dir().context("could not find /target while building contract")?; - // We use a different target directory to stop the different rustflags between targets from clobbering the build cache build_package( release, PACKAGE_CONTRACT, diff --git a/integration-tests/fastauth/Cargo.lock b/integration-tests/fastauth/Cargo.lock index c554dc7cb..efe8eb58c 100644 --- a/integration-tests/fastauth/Cargo.lock +++ b/integration-tests/fastauth/Cargo.lock @@ -2372,7 +2372,7 @@ dependencies = [ "google-apis-common", "http", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools", "mime", "serde", @@ -2392,7 +2392,7 @@ dependencies = [ "google-apis-common", "http", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools", "mime", "serde", @@ -2621,21 +2621,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", -] - [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2646,10 +2631,10 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.12", + "rustls", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -3243,7 +3228,7 @@ dependencies = [ "google-secretmanager1", "hex 0.4.3", "hyper", - "hyper-rustls 0.23.2", + "hyper-rustls", "jsonwebtoken", "lazy_static", "multi-party-eddsa", @@ -5368,7 +5353,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -5378,7 +5363,7 @@ dependencies = [ "once_cell", "percent-encoding 2.3.1", "pin-project-lite", - "rustls 0.21.12", + "rustls", "rustls-pemfile", "serde", "serde_json", @@ -5387,7 +5372,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tower-service", "url 2.5.0", "wasm-bindgen", @@ -5495,18 +5480,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.12" @@ -6579,24 +6552,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.12", + "rustls", "tokio", ] @@ -7092,7 +7054,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.21.12", + "rustls", "rustls-webpki", "url 2.5.0", "webpki-roots", @@ -7286,16 +7248,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "webpki-roots" version = "0.25.4" @@ -7569,11 +7521,11 @@ dependencies = [ "futures", "http", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools", "log", "percent-encoding 2.3.1", - "rustls 0.21.12", + "rustls", "rustls-pemfile", "seahash", "serde", diff --git a/mpc-recovery/Cargo.lock b/mpc-recovery/Cargo.lock index 36b13d170..3fdcc85cc 100644 --- a/mpc-recovery/Cargo.lock +++ b/mpc-recovery/Cargo.lock @@ -1306,7 +1306,7 @@ dependencies = [ "google-apis-common", "http", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools", "mime", "serde", @@ -1326,7 +1326,7 @@ dependencies = [ "google-apis-common", "http", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools", "mime", "serde", @@ -1521,21 +1521,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", -] - [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1546,10 +1531,10 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.12", + "rustls", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -1842,7 +1827,7 @@ dependencies = [ "google-secretmanager1", "hex 0.4.3", "hyper", - "hyper-rustls 0.23.2", + "hyper-rustls", "jsonwebtoken", "lazy_static", "multi-party-eddsa", @@ -3156,7 +3141,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -3166,7 +3151,7 @@ dependencies = [ "once_cell", "percent-encoding 2.3.1", "pin-project-lite", - "rustls 0.21.12", + "rustls", "rustls-pemfile", "serde", "serde_json", @@ -3175,7 +3160,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tower-service", "url 2.5.0", "wasm-bindgen", @@ -3268,18 +3253,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.12" @@ -3993,24 +3966,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.12", + "rustls", "tokio", ] @@ -4548,16 +4510,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "webpki-roots" version = "0.25.4" @@ -4768,11 +4720,11 @@ dependencies = [ "futures", "http", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools", "log", "percent-encoding 2.3.1", - "rustls 0.21.12", + "rustls", "rustls-pemfile", "seahash", "serde", diff --git a/mpc-recovery/Cargo.toml b/mpc-recovery/Cargo.toml index 1da185cb6..7a08b701a 100644 --- a/mpc-recovery/Cargo.toml +++ b/mpc-recovery/Cargo.toml @@ -25,7 +25,7 @@ google-datastore1 = "5" google-secretmanager1 = "5" hex = "0.4.3" hyper = { version = "0.14", features = ["full"] } -hyper-rustls = { version = "=0.23", features = ["http2"] } +hyper-rustls = { version = "=0.24", features = ["http2"] } jsonwebtoken = "8.3.0" lazy_static = "1.4.0" opentelemetry = { version = "0.20.0", features = ["rt-tokio", "trace"] } diff --git a/node/Cargo.lock b/node/Cargo.lock index 4eb4d8de4..9c90719b9 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -485,7 +485,7 @@ dependencies = [ "hex", "http 0.2.12", "hyper", - "ring 0.17.8", + "ring", "time", "tokio", "tracing", @@ -652,7 +652,7 @@ dependencies = [ "once_cell", "p256 0.11.1", "percent-encoding 2.3.1", - "ring 0.17.8", + "ring", "sha2", "subtle", "time", @@ -760,7 +760,7 @@ dependencies = [ "http-body 0.4.6", "http-body 1.0.0", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "once_cell", "pin-project-lite", "pin-utils", @@ -2547,7 +2547,7 @@ dependencies = [ "google-apis-common", "http 0.2.12", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools 0.10.5", "mime", "serde", @@ -2567,7 +2567,7 @@ dependencies = [ "google-apis-common", "http 0.2.12", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools 0.10.5", "mime", "serde", @@ -2839,21 +2839,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http 0.2.12", - "hyper", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", -] - [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2867,7 +2852,7 @@ dependencies = [ "rustls 0.21.12", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -3378,7 +3363,7 @@ dependencies = [ "highway", "hkdf", "hyper", - "hyper-rustls 0.23.2", + "hyper-rustls", "itertools 0.12.1", "k256", "local-ip-address", @@ -4917,7 +4902,7 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -4936,7 +4921,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tower-service", "url 2.5.0", "wasm-bindgen", @@ -4967,21 +4952,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -4993,7 +4963,7 @@ dependencies = [ "getrandom 0.2.15", "libc", "spin 0.9.8", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] @@ -5120,18 +5090,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.12" @@ -5139,7 +5097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-webpki 0.101.7", "sct", ] @@ -5151,7 +5109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-pki-types", "rustls-webpki 0.102.4", "subtle", @@ -5191,8 +5149,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -5201,9 +5159,9 @@ version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -5263,8 +5221,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -6024,17 +5982,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -6360,12 +6307,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -6989,16 +6930,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "webpki-roots" version = "0.25.4" @@ -7255,7 +7186,7 @@ dependencies = [ "futures", "http 0.2.12", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools 0.12.1", "log", "percent-encoding 2.3.1", diff --git a/node/Cargo.toml b/node/Cargo.toml index 487d24a5c..217d909d8 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -26,7 +26,7 @@ hex = "0.4.3" hkdf = "0.12.4" highway = "1.1.0" hyper = { version = "0.14", features = ["full"] } -hyper-rustls = { version = "=0.23", features = ["http2"] } +hyper-rustls = { version = "=0.24", features = ["http2"] } k256 = { version = "0.13.1", features = ["sha256", "ecdsa", "serde"] } local-ip-address = "0.5.4" rand = "0.8" From 4879239d37ebfeb501266daeabd4db5336169d5c Mon Sep 17 00:00:00 2001 From: Phuong Nguyen Date: Wed, 29 May 2024 20:59:56 -0700 Subject: [PATCH 4/4] Try different feature flag --- contract/Cargo.lock | 5 + contract/Cargo.toml | 2 +- integration-tests/chain-signatures/Cargo.lock | 5 + node/Cargo.lock | 297 +++++++++++++++--- node/Cargo.toml | 2 +- 5 files changed, 272 insertions(+), 39 deletions(-) diff --git a/contract/Cargo.lock b/contract/Cargo.lock index a6a10a0ff..b0df7b758 100644 --- a/contract/Cargo.lock +++ b/contract/Cargo.lock @@ -3757,10 +3757,15 @@ dependencies = [ "borsh 1.5.0", "bs58 0.5.1", "near-account-id", + "near-crypto 0.20.1", "near-gas", + "near-parameters 0.20.1", + "near-primitives 0.20.1", + "near-primitives-core 0.20.1", "near-sdk-macros", "near-sys", "near-token", + "near-vm-runner 0.20.1", "once_cell", "serde", "serde_json", diff --git a/contract/Cargo.toml b/contract/Cargo.toml index b85561dbb..a4f411f3f 100644 --- a/contract/Cargo.toml +++ b/contract/Cargo.toml @@ -8,7 +8,7 @@ crate-type = ["cdylib", "lib"] [dependencies] borsh = "1.5.0" -near-sdk = { version = "=5.1.0", features = ["legacy"] } +near-sdk = { version = "=5.1.0", features = ["legacy", "unit-testing"] } serde = { version = "1", features = ["derive"] } serde_json = "1" schemars = "0.8" diff --git a/integration-tests/chain-signatures/Cargo.lock b/integration-tests/chain-signatures/Cargo.lock index 1aee38fff..b2ba33e32 100644 --- a/integration-tests/chain-signatures/Cargo.lock +++ b/integration-tests/chain-signatures/Cargo.lock @@ -5358,10 +5358,15 @@ dependencies = [ "borsh 1.5.0", "bs58 0.5.1", "near-account-id", + "near-crypto 0.20.1", "near-gas", + "near-parameters 0.20.1", + "near-primitives 0.20.1", + "near-primitives-core 0.20.1", "near-sdk-macros", "near-sys", "near-token", + "near-vm-runner 0.20.1", "once_cell", "serde", "serde_json", diff --git a/node/Cargo.lock b/node/Cargo.lock index 9c90719b9..148d7fe14 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -3370,11 +3370,11 @@ dependencies = [ "mpc-contract", "mpc-keys", "near-account-id", - "near-crypto", + "near-crypto 0.21.2", "near-fetch", "near-lake-framework", "near-lake-primitives", - "near-primitives", + "near-primitives 0.21.2", "near-sdk", "once_cell", "prometheus", @@ -3444,10 +3444,10 @@ dependencies = [ "bytesize", "chrono", "derive_more", - "near-config-utils", - "near-crypto", - "near-parameters", - "near-primitives", + "near-config-utils 0.21.2", + "near-crypto 0.21.2", + "near-parameters 0.21.2", + "near-primitives 0.21.2", "num-rational", "once_cell", "serde", @@ -3457,6 +3457,18 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-config-utils" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae1eaab1d545a9be7a55b6ef09f365c2017f93a03063547591d12c0c6d27e58" +dependencies = [ + "anyhow", + "json_comments", + "thiserror", + "tracing", +] + [[package]] name = "near-config-utils" version = "0.21.2" @@ -3469,6 +3481,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-crypto" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2991d2912218a80ec0733ac87f84fa803accea105611eea209d4419271957667" +dependencies = [ + "blake2", + "borsh 1.5.0", + "bs58 0.4.0", + "c2-chacha", + "curve25519-dalek", + "derive_more", + "ed25519-dalek", + "hex", + "near-account-id", + "near-config-utils 0.20.1", + "near-stdx 0.20.1", + "once_cell", + "primitive-types", + "rand 0.7.3", + "secp256k1", + "serde", + "serde_json", + "subtle", + "thiserror", +] + [[package]] name = "near-crypto" version = "0.21.2" @@ -3484,8 +3523,8 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils", - "near-stdx", + "near-config-utils 0.21.2", + "near-stdx 0.21.2", "once_cell", "primitive-types", "rand 0.7.3", @@ -3503,11 +3542,11 @@ source = "git+https://github.com/ChaoticTempest/fetch.git#20c8825f47cb88b61a961b dependencies = [ "base64 0.22.1", "near-account-id", - "near-crypto", + "near-crypto 0.21.2", "near-gas", "near-jsonrpc-client", "near-jsonrpc-primitives", - "near-primitives", + "near-primitives 0.21.2", "near-token", "serde", "serde_json", @@ -3516,13 +3555,22 @@ dependencies = [ "tokio-retry", ] +[[package]] +name = "near-fmt" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7d998dfc1e04001608899b2498ad5a782c7d036b73769d510de21964db99286" +dependencies = [ + "near-primitives-core 0.20.1", +] + [[package]] name = "near-fmt" version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a9aa862014eeedb79df494b1b8080c5b51cd014f978183e08a7918a50350558" dependencies = [ - "near-primitives-core", + "near-primitives-core 0.21.2", ] [[package]] @@ -3542,7 +3590,7 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a584b253186387b648312d9510ebbece3ebb974335a71d52be6645521e4ec4e" dependencies = [ - "near-primitives", + "near-primitives 0.21.2", "serde", "serde_json", ] @@ -3557,9 +3605,9 @@ dependencies = [ "lazy_static", "log", "near-chain-configs", - "near-crypto", + "near-crypto 0.21.2", "near-jsonrpc-primitives", - "near-primitives", + "near-primitives 0.21.2", "reqwest", "serde", "serde_json", @@ -3574,9 +3622,9 @@ checksum = "63ba17af2bc4208fdc4f6a8088842ad1f0165ac46d8259db6a2719f15d039e06" dependencies = [ "arbitrary", "near-chain-configs", - "near-crypto", - "near-primitives", - "near-rpc-error-macro", + "near-crypto 0.21.2", + "near-primitives 0.21.2", + "near-rpc-error-macro 0.21.2", "serde", "serde_json", "thiserror", @@ -3620,16 +3668,44 @@ version = "0.8.0-beta.3" source = "git+https://github.com/near/near-lake-framework-rs?branch=dmd/bump-dependencies#e4eaa0c1b1c1d63c45963474db7ee82c38557d54" dependencies = [ "anyhow", - "near-crypto", + "near-crypto 0.21.2", "near-indexer-primitives", - "near-primitives", - "near-primitives-core", + "near-primitives 0.21.2", + "near-primitives-core 0.21.2", "paste", "serde", "serde_json", "thiserror", ] +[[package]] +name = "near-o11y" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d20762631bc8253030013bbae9b5f0542691edc1aa6722f1e8141cc9b928ae5b" +dependencies = [ + "actix", + "base64 0.21.7", + "clap", + "near-crypto 0.20.1", + "near-fmt 0.20.1", + "near-primitives-core 0.20.1", + "once_cell", + "opentelemetry", + "opentelemetry-otlp", + "opentelemetry-semantic-conventions", + "prometheus", + "serde", + "serde_json", + "strum 0.24.1", + "thiserror", + "tokio", + "tracing", + "tracing-appender", + "tracing-opentelemetry", + "tracing-subscriber", +] + [[package]] name = "near-o11y" version = "0.21.2" @@ -3639,9 +3715,9 @@ dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto", - "near-fmt", - "near-primitives-core", + "near-crypto 0.21.2", + "near-fmt 0.21.2", + "near-primitives-core 0.21.2", "once_cell", "opentelemetry", "opentelemetry-otlp", @@ -3658,6 +3734,25 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "near-parameters" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9f16a59b6c3e69b0585be951af6fe42a0ba86c0e207cb8c63badd19efd16680" +dependencies = [ + "assert_matches", + "borsh 1.5.0", + "enum-map", + "near-account-id", + "near-primitives-core 0.20.1", + "num-rational", + "serde", + "serde_repr", + "serde_yaml", + "strum 0.24.1", + "thiserror", +] + [[package]] name = "near-parameters" version = "0.21.2" @@ -3668,7 +3763,7 @@ dependencies = [ "borsh 1.5.0", "enum-map", "near-account-id", - "near-primitives-core", + "near-primitives-core 0.21.2", "num-rational", "serde", "serde_repr", @@ -3677,6 +3772,48 @@ dependencies = [ "thiserror", ] +[[package]] +name = "near-primitives" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0462b067732132babcc89d5577db3bfcb0a1bcfbaaed3f2db4c11cd033666314" +dependencies = [ + "arbitrary", + "base64 0.21.7", + "borsh 1.5.0", + "bytesize", + "cfg-if 1.0.0", + "chrono", + "derive_more", + "easy-ext", + "enum-map", + "hex", + "near-crypto 0.20.1", + "near-fmt 0.20.1", + "near-o11y 0.20.1", + "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", + "rand 0.8.5", + "rand_chacha 0.3.1", + "reed-solomon-erasure", + "serde", + "serde_json", + "serde_with 3.8.1", + "serde_yaml", + "sha3", + "smart-default", + "strum 0.24.1", + "thiserror", + "time", + "tracing", +] + [[package]] name = "near-primitives" version = "0.21.2" @@ -3693,14 +3830,14 @@ dependencies = [ "easy-ext", "enum-map", "hex", - "near-crypto", - "near-fmt", - "near-o11y", - "near-parameters", - "near-primitives-core", - "near-rpc-error-macro", - "near-stdx", - "near-vm-runner", + "near-crypto 0.21.2", + "near-fmt 0.21.2", + "near-o11y 0.21.2", + "near-parameters 0.21.2", + "near-primitives-core 0.21.2", + "near-rpc-error-macro 0.21.2", + "near-stdx 0.21.2", + "near-vm-runner 0.21.2", "num-rational", "once_cell", "primitive-types", @@ -3719,6 +3856,28 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-primitives-core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8443eb718606f572c438be6321a097a8ebd69f8e48d953885b4f16601af88225" +dependencies = [ + "arbitrary", + "base64 0.21.7", + "borsh 1.5.0", + "bs58 0.4.0", + "derive_more", + "enum-map", + "near-account-id", + "num-rational", + "serde", + "serde_repr", + "serde_with 3.8.1", + "sha2", + "strum 0.24.1", + "thiserror", +] + [[package]] name = "near-primitives-core" version = "0.21.2" @@ -3741,6 +3900,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "near-rpc-error-core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80fca203c51edd9595ec14db1d13359fb9ede32314990bf296b6c5c4502f6ab7" +dependencies = [ + "quote", + "serde", + "syn 2.0.66", +] + [[package]] name = "near-rpc-error-core" version = "0.21.2" @@ -3752,6 +3922,18 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "near-rpc-error-macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897a445de2102f6732c8a185d922f5e3bf7fd0a41243ce40854df2197237f799" +dependencies = [ + "fs2", + "near-rpc-error-core 0.20.1", + "serde", + "syn 2.0.66", +] + [[package]] name = "near-rpc-error-macro" version = "0.21.2" @@ -3759,7 +3941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa8db2fd2a6dbab8c56908e983f41570341e391daddb0d4c430746c6971107e3" dependencies = [ "fs2", - "near-rpc-error-core", + "near-rpc-error-core 0.21.2", "serde", "syn 2.0.66", ] @@ -3774,10 +3956,15 @@ dependencies = [ "borsh 1.5.0", "bs58 0.5.1", "near-account-id", + "near-crypto 0.20.1", "near-gas", + "near-parameters 0.20.1", + "near-primitives 0.20.1", + "near-primitives-core 0.20.1", "near-sdk-macros", "near-sys", "near-token", + "near-vm-runner 0.20.1", "once_cell", "serde", "serde_json", @@ -3801,6 +3988,12 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "near-stdx" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "855fd5540e3b4ff6fedf12aba2db1ee4b371b36f465da1363a6d022b27cb43b8" + [[package]] name = "near-stdx" version = "0.21.2" @@ -3887,6 +4080,36 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-vm-runner" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56c80bdb1954808f59bd36a9112377197b38d424991383bf05f52d0fe2e0da5" +dependencies = [ + "base64 0.21.7", + "borsh 1.5.0", + "ed25519-dalek", + "enum-map", + "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", + "once_cell", + "prefix-sum-vec", + "ripemd", + "serde", + "serde_repr", + "serde_with 3.8.1", + "sha2", + "sha3", + "strum 0.24.1", + "thiserror", + "tracing", + "zeropool-bn", +] + [[package]] name = "near-vm-runner" version = "0.21.2" @@ -3902,10 +4125,10 @@ dependencies = [ "loupe", "memoffset 0.8.0", "near-cache", - "near-crypto", - "near-parameters", - "near-primitives-core", - "near-stdx", + "near-crypto 0.21.2", + "near-parameters 0.21.2", + "near-primitives-core 0.21.2", + "near-stdx 0.21.2", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", diff --git a/node/Cargo.toml b/node/Cargo.toml index 217d909d8..f5b79e916 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -47,7 +47,7 @@ near-fetch = { git = "https://github.com/ChaoticTempest/fetch.git" } near-lake-framework = { git = "https://github.com/near/near-lake-framework-rs", branch = "dmd/bump-dependencies" } near-lake-primitives = { git = "https://github.com/near/near-lake-framework-rs", branch = "dmd/bump-dependencies" } near-primitives = "0.21.2" -near-sdk = { version = "=5.1.0", features = ["legacy"] } +near-sdk = { version = "=5.1.0", features = ["legacy", "unit-testing"] } mpc-contract = { path = "../contract" } mpc-keys = { path = "../keys" }