From 64dfdff8ea938dc1f47c6ab1c4ce1657857ec5eb Mon Sep 17 00:00:00 2001 From: Vlad Frolov Date: Tue, 28 Jan 2025 23:33:12 +0100 Subject: [PATCH] upgraded Rust to 1.84 --- .github/workflows/main.yml | 4 +- Cargo.lock | 405 ++++++++++++++++++++++++++++--------- Cargo.toml | 23 +-- rust-toolchain.toml | 2 +- 4 files changed, 326 insertions(+), 108 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ca6614..0ca2db9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,8 +15,8 @@ jobs: - name: Install cargo-near run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/latest/download/cargo-near-installer.sh | sh - name: Build community factory contract - run: cd community-factory && cargo near build reproducible-wasm + run: cd community-factory && cargo near build non-reproducible-wasm - name: Build devhub contract - run: cargo near build reproducible-wasm + run: cargo near build non-reproducible-wasm - name: Unit tests run: cargo test diff --git a/Cargo.lock b/Cargo.lock index ee6759d..c43fbdb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -100,7 +100,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -225,7 +225,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", "syn_derive", ] @@ -354,7 +354,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.44", ] [[package]] @@ -486,14 +486,30 @@ dependencies = [ ] [[package]] -name = "crossbeam-utils" -version = "0.8.17" +name = "crossbeam-deque" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ - "cfg-if 1.0.0", + "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 = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + [[package]] name = "crunchy" version = "0.2.2" @@ -534,7 +550,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -558,7 +574,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -569,7 +585,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -599,7 +615,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -791,7 +807,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -1379,7 +1395,7 @@ dependencies = [ "jsonptr", "serde", "serde_json", - "thiserror", + "thiserror 1.0.44", ] [[package]] @@ -1436,7 +1452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.48.1", + "windows-targets 0.52.6", ] [[package]] @@ -1619,11 +1635,11 @@ dependencies = [ "bytesize", "chrono", "derive_more", - "near-config-utils", - "near-crypto", - "near-parameters", - "near-primitives", - "near-time", + "near-config-utils 0.26.0", + "near-crypto 0.26.0", + "near-parameters 0.26.0", + "near-primitives 0.26.0", + "near-time 0.26.0", "num-rational", "once_cell", "serde", @@ -1642,15 +1658,27 @@ checksum = "d96c1682d13e9a8a62ea696395bf17afc4ed4b60535223251168217098c27a50" dependencies = [ "anyhow", "json_comments", - "thiserror", + "thiserror 1.0.44", + "tracing", +] + +[[package]] +name = "near-config-utils" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bedc768765dd8229a1d960c94f517317f40771a003e78916124784c7d6ea9d74" +dependencies = [ + "anyhow", + "json_comments", + "thiserror 2.0.11", "tracing", ] [[package]] name = "near-contract-standards" -version = "5.5.0" +version = "5.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b985c4df43237b6ae533a6451cfa13de1f12f79f7d6254ba376f0ccd017286" +checksum = "6b8bc68a8c2bac5e44b38e322e41cadeefe33f766993bf067375b63cc860a73b" dependencies = [ "near-sdk", ] @@ -1669,8 +1697,8 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils", - "near-stdx", + "near-config-utils 0.26.0", + "near-stdx 0.26.0", "once_cell", "primitive-types", "rand", @@ -1678,7 +1706,32 @@ dependencies = [ "serde", "serde_json", "subtle", - "thiserror", + "thiserror 1.0.44", +] + +[[package]] +name = "near-crypto" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4374804fdd45ac84c9e7cc3183312c98560c5518d81e6d8e2d92b77587e5a9f3" +dependencies = [ + "blake2", + "borsh", + "bs58 0.4.0", + "curve25519-dalek", + "derive_more", + "ed25519-dalek", + "hex", + "near-account-id", + "near-config-utils 0.28.0", + "near-schema-checker-lib", + "near-stdx 0.28.0", + "primitive-types", + "secp256k1", + "serde", + "serde_json", + "subtle", + "thiserror 2.0.11", ] [[package]] @@ -1687,7 +1740,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a36518bfcf2177096d4298d9158ba698ffd6944cb035ecc0938b098337b933c" dependencies = [ - "near-primitives-core", + "near-primitives-core 0.26.0", +] + +[[package]] +name = "near-fmt" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14f36eee2dcb0ecd8febb9f198e0e1fa768c834db9e1982ad2acfcd04b45acf" +dependencies = [ + "near-primitives-core 0.28.0", ] [[package]] @@ -1711,13 +1773,13 @@ dependencies = [ "lazy_static", "log", "near-chain-configs", - "near-crypto", + "near-crypto 0.26.0", "near-jsonrpc-primitives", - "near-primitives", + "near-primitives 0.26.0", "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 1.0.44", ] [[package]] @@ -1728,12 +1790,12 @@ checksum = "2b24bfd0fedef42e07daa79e463a7908e9abee4f6de3532e0e1dde45f6951657" dependencies = [ "arbitrary", "near-chain-configs", - "near-crypto", - "near-primitives", + "near-crypto 0.26.0", + "near-primitives 0.26.0", "near-rpc-error-macro", "serde", "serde_json", - "thiserror", + "thiserror 1.0.44", "time", ] @@ -1746,13 +1808,32 @@ dependencies = [ "borsh", "enum-map", "near-account-id", - "near-primitives-core", + "near-primitives-core 0.26.0", + "num-rational", + "serde", + "serde_repr", + "serde_yaml", + "strum 0.24.1", + "thiserror 1.0.44", +] + +[[package]] +name = "near-parameters" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1279baa276725971d5e2b80c524d1aa42d5ad8bccf8901466fd579374cf58a14" +dependencies = [ + "borsh", + "enum-map", + "near-account-id", + "near-primitives-core 0.28.0", + "near-schema-checker-lib", "num-rational", "serde", "serde_repr", "serde_yaml", "strum 0.24.1", - "thiserror", + "thiserror 2.0.11", ] [[package]] @@ -1773,14 +1854,14 @@ dependencies = [ "enum-map", "hex", "itertools", - "near-crypto", - "near-fmt", - "near-parameters", - "near-primitives-core", + "near-crypto 0.26.0", + "near-fmt 0.26.0", + "near-parameters 0.26.0", + "near-primitives-core 0.26.0", "near-rpc-error-macro", - "near-stdx", + "near-stdx 0.26.0", "near-structs-checker-lib", - "near-time", + "near-time 0.26.0", "num-rational", "once_cell", "ordered-float", @@ -1793,7 +1874,47 @@ dependencies = [ "sha3", "smart-default", "strum 0.24.1", - "thiserror", + "thiserror 1.0.44", + "tracing", + "zstd 0.13.2", +] + +[[package]] +name = "near-primitives" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab6ecc354e61c40b044c8b553c187383a587a1679d2e594f0b98ca58dbfb6e3" +dependencies = [ + "arbitrary", + "base64 0.21.2", + "bitvec", + "borsh", + "bytes", + "bytesize", + "cfg-if 1.0.0", + "chrono", + "derive_more", + "easy-ext", + "enum-map", + "hex", + "itertools", + "near-crypto 0.28.0", + "near-fmt 0.28.0", + "near-parameters 0.28.0", + "near-primitives-core 0.28.0", + "near-schema-checker-lib", + "near-stdx 0.28.0", + "near-time 0.28.0", + "num-rational", + "ordered-float", + "primitive-types", + "serde", + "serde_json", + "serde_with", + "sha3", + "smart-default", + "strum 0.24.1", + "thiserror 2.0.11", "tracing", "zstd 0.13.2", ] @@ -1816,7 +1937,28 @@ dependencies = [ "serde", "serde_repr", "sha2", - "thiserror", + "thiserror 1.0.44", +] + +[[package]] +name = "near-primitives-core" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d597af103bb7881d1fb9031fb126cfe6c1acb9c9a6c8296dca45b5b3beb0893d" +dependencies = [ + "arbitrary", + "base64 0.21.2", + "borsh", + "bs58 0.4.0", + "derive_more", + "enum-map", + "near-account-id", + "near-schema-checker-lib", + "num-rational", + "serde", + "serde_repr", + "sha2", + "thiserror 2.0.11", ] [[package]] @@ -1827,7 +1969,7 @@ checksum = "df598b0785a3e36d7e4fb73afcdf20536988b13d07cead71dfa777db4783e552" dependencies = [ "quote", "serde", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -1838,7 +1980,7 @@ checksum = "647ef261df99ad877c08c97af2f10368c8b8cde0968250d3482a5a249e9f3926" dependencies = [ "near-rpc-error-core", "serde", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -1854,21 +1996,43 @@ dependencies = [ "tokio", ] +[[package]] +name = "near-schema-checker-core" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a48405425eca34de98e680416310df33fdb75768a78481cc75b43172b2748613" + +[[package]] +name = "near-schema-checker-lib" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb720bf5cc256af687a9eb7a6e05baf3668dc75cfd43098e83ba1b3d3900f08" +dependencies = [ + "near-schema-checker-core", + "near-schema-checker-macro", +] + +[[package]] +name = "near-schema-checker-macro" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41a159cbf732acc0279febdde046d9036330a32a951796bce42f9529bce799d" + [[package]] name = "near-sdk" -version = "5.5.0" +version = "5.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e296b02c85539c16659e171242d6c6bbea87eec7c9ef860d8dfd3fb3168a18a" +checksum = "befb9df6da1a6a0b6656388c0db76084867062a87f1cbc066c188a8e360b6463" dependencies = [ "base64 0.22.1", "borsh", "bs58 0.5.0", "near-account-id", - "near-crypto", + "near-crypto 0.28.0", "near-gas", - "near-parameters", - "near-primitives", - "near-primitives-core", + "near-parameters 0.28.0", + "near-primitives 0.28.0", + "near-primitives-core 0.28.0", "near-sdk-macros", "near-sys", "near-token", @@ -1881,9 +2045,9 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "5.5.0" +version = "5.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0adc79466aa556f56a995c0db34a933b32597ab92bbb0e526597118899c8bcaf" +checksum = "1268c4fc56bf53d70c200261fb8d57c6c1c6692243660f5f889c7fa4cf5771d2" dependencies = [ "Inflector", "darling", @@ -1893,7 +2057,7 @@ dependencies = [ "serde_json", "strum 0.26.1", "strum_macros 0.26.1", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -1902,6 +2066,12 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d5c43f6181873287ddaa25edcc2943d0f2d5da9588231516f2ed0549db1fbac" +[[package]] +name = "near-stdx" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a91674768828a593f4bac4aeca9334c4b56fe19344a2ccf7bd795b2325f0b5e" + [[package]] name = "near-structs-checker-core" version = "0.26.0" @@ -1942,6 +2112,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "near-time" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92bf9dffb11126e8db9a6a51bcb330c8584d0bab0d6d14c20cf2ff1f16d684d" +dependencies = [ + "serde", + "time", +] + [[package]] name = "near-token" version = "0.3.0" @@ -1954,9 +2134,9 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a2fecdbec69a1748bd80aa0d73e4de0064d2d8097f429677d3e37a6bde3b2d" +checksum = "f311723579af3d3cd8e9b5b25efade1b8f5b5e0dd2819ed8ee581e7c7855a76d" dependencies = [ "blst", "borsh", @@ -1964,12 +2144,13 @@ dependencies = [ "ed25519-dalek", "enum-map", "lru", - "near-crypto", - "near-parameters", - "near-primitives-core", - "near-stdx", + "near-crypto 0.28.0", + "near-parameters 0.28.0", + "near-primitives-core 0.28.0", + "near-schema-checker-lib", + "near-stdx 0.28.0", "num-rational", - "once_cell", + "rayon", "ripemd", "rustix", "serde", @@ -1978,7 +2159,7 @@ dependencies = [ "sha3", "strum 0.24.1", "tempfile", - "thiserror", + "thiserror 2.0.11", "tracing", "zeropool-bn", ] @@ -2000,11 +2181,11 @@ dependencies = [ "libc", "near-abi-client", "near-account-id", - "near-crypto", + "near-crypto 0.26.0", "near-gas", "near-jsonrpc-client", "near-jsonrpc-primitives", - "near-primitives", + "near-primitives 0.26.0", "near-sandbox-utils", "near-token", "rand", @@ -2013,7 +2194,7 @@ dependencies = [ "serde_json", "sha2", "tempfile", - "thiserror", + "thiserror 1.0.44", "tokio", "tokio-retry", "tracing", @@ -2164,7 +2345,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -2267,7 +2448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.44", "ucd-trie", ] @@ -2291,7 +2472,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -2331,7 +2512,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -2430,18 +2611,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -2484,6 +2665,26 @@ dependencies = [ "serde", ] +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -2510,7 +2711,7 @@ checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", "redox_syscall 0.2.16", - "thiserror", + "thiserror 1.0.44", ] [[package]] @@ -2772,7 +2973,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -2853,7 +3054,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -2887,7 +3088,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -2928,7 +3129,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -3131,7 +3332,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -3177,7 +3378,7 @@ dependencies = [ "serde_json", "smallvec", "symbolic-common", - "thiserror", + "thiserror 1.0.44", "wasmparser", "zip 0.5.13", ] @@ -3195,9 +3396,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -3213,7 +3414,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -3282,7 +3483,16 @@ version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.44", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", ] [[package]] @@ -3293,7 +3503,18 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] @@ -3378,7 +3599,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -3490,7 +3711,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -3663,7 +3884,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", "wasm-bindgen-shared", ] @@ -3697,7 +3918,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4067,7 +4288,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -4087,7 +4308,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.96", ] [[package]] @@ -4112,7 +4333,7 @@ dependencies = [ "byteorder", "crc32fast", "flate2", - "thiserror", + "thiserror 1.0.44", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 9f708d3..9bf7ee1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ members = ["devhub_common", "discussions", "community", "community-factory"] repository = "https://github.com/NEAR-DevHub/neardevhub-contract" [workspace.dependencies] -near-sdk = "5.5.0" -near-contract-standards = "5.5.0" +near-sdk = "5.7.0" +near-contract-standards = "5.7.0" devhub_common = { path = "./devhub_common" } cargo-near-build = "0.1.0" @@ -20,18 +20,13 @@ repository.workspace = true [lib] crate-type = ["cdylib"] -# fields to configure build with WASM reproducibility, according to specs -# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md +# fields to configure build with WASM reproducibility, according to specs +# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md [package.metadata.near.reproducible_build] # docker image, descriptor of build environment -image = "sourcescan/cargo-near:0.8.2-rust-1.81.0" +image = "sourcescan/cargo-near:0.13.2-rust-1.84.0" # tag after colon above serves only descriptive purpose; image is identified by digest -image_digest = "sha256:3b5e6efa1d0cef710009f9cc20c845d316187cc170455edc5ba7fdf471c19655" -# 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"] +image_digest = "sha256:b41cb89907f92b114da9e2be4e109bff30ab792c22ddcbd2a4cff8e340cb9acb" [dependencies] near-sdk = { workspace = true, features = ["unstable"] } @@ -44,12 +39,14 @@ html-escape = "0.2.13" near-sdk = { workspace = true, features = ["unit-testing"] } insta = { version = "1.31.0", features = ["json", "redactions"] } regex = "1" -near-workspaces = { version = "0.14.0", features = ["unstable"], default-features = false } +near-workspaces = { version = "0.14.0", features = [ + "unstable", +], default-features = false } cargo-near-build.workspace = true tokio = { version = "1.10.0", features = ["full"] } anyhow = "1.0" -# this profile is important as it applies to contract members of workspace: +# this profile is important as it applies to contract members of workspace: # ["discussions", "community", "community-factory"] [profile.release] codegen-units = 1 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b7b4667..e54357a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.81.0" +channel = "1.84.0" components = ["rustfmt", "clippy", "rust-analyzer"] targets = ["wasm32-unknown-unknown"]