diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9f20672cf..6790fcd8e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,7 +40,7 @@ jobs: etc/eth-contracts etc/tests/uniswap - name: Install dependencies - run: cargo make -V || cargo install cargo-make + run: cargo +stable make -V || cargo +stable install cargo-make - name: Build main contract run: | case ${{ matrix.profile }} in @@ -80,7 +80,7 @@ jobs: target/ key: ${{ matrix.profile }}-cargo-modexp-test - name: Install dependencies - run: cargo make -V || cargo install cargo-make + run: cargo +stable make -V || cargo +stable install cargo-make - name: Test ${{ matrix.profile }} bench-modexp run: cargo make --profile ${{ matrix.profile }} bench-modexp diff --git a/CHANGES.md b/CHANGES.md index 059da95c8..233c1fe09 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [3.6.0] 2024-02-06 + +### Fixes + +- Fixed underflow in the modexp gas calculation by [@guidovranken]. ([#883]) +- Prevented subtraction underflow in th xcc module by [@guidovranken]. ([#888]) +- Fixed balance and gas overflows in the xcc module by [@guidovranken]. ([#889]) + +### Changes + +- CI was updated by changing self-hosted runner to the GitHub heavy by [@aleksuss]. ([#881]) +- Removed a logic of fee calculation in the eth-connector by [@karim-en]. ([#882]) +- Version of the rust nightly was updated to 2023-12-15 by [@RomanHodulak]. ([#885]) + +[#881]: https://github.com/aurora-is-near/aurora-engine/pull/881 +[#882]: https://github.com/aurora-is-near/aurora-engine/pull/882 +[#883]: https://github.com/aurora-is-near/aurora-engine/pull/883 +[#885]: https://github.com/aurora-is-near/aurora-engine/pull/885 +[#888]: https://github.com/aurora-is-near/aurora-engine/pull/888 +[#889]: https://github.com/aurora-is-near/aurora-engine/pull/889 + ## [3.5.0] 2023-12-06 ### Additions @@ -587,8 +608,9 @@ struct SubmitResult { ## [1.0.0] - 2021-05-12 -[Unreleased]: https://github.com/aurora-is-near/aurora-engine/compare/3.5.0...develop -[3.5.0]: https://github.com/aurora-is-near/aurora-engine/compare/3.5.0...3.4.0 +[Unreleased]: https://github.com/aurora-is-near/aurora-engine/compare/3.6.0...develop +[3.6.0]: https://github.com/aurora-is-near/aurora-engine/compare/3.5.0...3.6.0 +[3.5.0]: https://github.com/aurora-is-near/aurora-engine/compare/3.4.0...3.5.0 [3.4.0]: https://github.com/aurora-is-near/aurora-engine/compare/3.3.1...3.4.0 [3.3.1]: https://github.com/aurora-is-near/aurora-engine/compare/3.3.0...3.3.1 [3.3.0]: https://github.com/aurora-is-near/aurora-engine/compare/3.2.0...3.3.0 diff --git a/Cargo.lock b/Cargo.lock index 566f2f125..71344eb13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,7 +17,7 @@ dependencies = [ "actix-macros", "actix-rt", "actix_derive", - "bitflags 2.4.0", + "bitflags 2.4.2", "bytes", "crossbeam-channel", "futures-core", @@ -30,7 +30,7 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", - "tokio-util 0.7.9", + "tokio-util 0.7.10", ] [[package]] @@ -40,7 +40,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -61,16 +61,7 @@ checksum = "7c7db3d5a9718568e4cf4a537cfd7070e6e6ff7481510d0237fb529ac850f6d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", -] - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli 0.26.2", + "syn 2.0.48", ] [[package]] @@ -79,7 +70,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.28.0", + "gimli 0.28.1", ] [[package]] @@ -101,24 +92,25 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.12", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -153,64 +145,63 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "3fde6067df7359f2d6335ec1a50c1f8f825801687d10da0cc4c6b08e3f6afd15" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" dependencies = [ "derive_arbitrary", ] @@ -233,6 +224,12 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + [[package]] name = "async-stream" version = "0.3.5" @@ -252,18 +249,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -279,7 +276,7 @@ dependencies = [ [[package]] name = "aurora-engine" -version = "3.5.0" +version = "3.6.0" dependencies = [ "aurora-engine-hashchain", "aurora-engine-modexp", @@ -347,7 +344,7 @@ name = "aurora-engine-sdk" version = "1.0.0" dependencies = [ "aurora-engine-types", - "base64 0.21.4", + "base64 0.21.7", "sha2 0.10.8", "sha3", ] @@ -390,12 +387,11 @@ dependencies = [ "git2", "hex", "libsecp256k1", - "near-crypto 0.17.0", - "near-primitives 0.17.0", - "near-primitives-core 0.17.0", + "near-crypto 0.20.0", + "near-parameters", + "near-primitives 0.20.0", + "near-primitives-core 0.20.0", "near-sdk", - "near-vm-errors 0.17.0", - "near-vm-logic 0.17.0", "near-vm-runner", "rand 0.8.5", "reqwest", @@ -443,7 +439,7 @@ dependencies = [ name = "aurora-engine-types" version = "1.0.0" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "borsh 0.10.3", "borsh 0.9.3", "bs58 0.5.0", @@ -495,12 +491,12 @@ version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line 0.21.0", + "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.32.1", + "object", "rustc-demangle", ] @@ -518,9 +514,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -573,7 +569,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -584,9 +580,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitvec" @@ -661,6 +657,16 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "borsh" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +dependencies = [ + "borsh-derive 1.3.1", + "cfg_aliases", +] + [[package]] name = "borsh-derive" version = "0.9.3" @@ -687,6 +693,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "borsh-derive" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.48", + "syn_derive", +] + [[package]] name = "borsh-derive-internal" version = "0.9.3" @@ -758,12 +778,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", - "regex-automata 0.4.1", + "regex-automata 0.4.3", "serde", ] @@ -876,7 +896,7 @@ dependencies = [ "clap 3.2.25", "colored", "env_logger", - "libloading", + "libloading 0.7.4", "log", "near-abi", "rustc_version", @@ -889,9 +909,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" dependencies = [ "serde", ] @@ -946,6 +966,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 = "chrono" version = "0.4.31" @@ -1009,13 +1035,13 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.8.1", ] [[package]] @@ -1037,24 +1063,23 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", - "clap_derive 4.3.12", - "once_cell", + "clap_derive 4.4.7", ] [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.1", + "clap_lex 0.6.0", "strsim", ] @@ -1073,14 +1098,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -1094,9 +1119,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "colorchoice" @@ -1106,11 +1131,10 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" dependencies = [ - "is-terminal", "lazy_static", "windows-sys 0.48.0", ] @@ -1129,9 +1153,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1139,9 +1163,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpp_demangle" @@ -1154,37 +1178,37 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.91.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115" +checksum = "2b5bb9245ec7dcc04d03110e538d31f0969d301c9d673145f4b4d5c3478539a3" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.91.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" +checksum = "ebb18d10e5ddac43ba4ca8fd4e310938569c3e484cc01b6372b27dc5bb4dfd28" dependencies = [ - "arrayvec 0.7.4", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", - "cranelift-egraph", + "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.26.2", + "gimli 0.28.1", + "hashbrown 0.14.3", "log", "regalloc2", "smallvec", @@ -1193,47 +1217,43 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.91.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639307b45434ad112a98f8300c0f0ab085cbefcd767efcdef9ef19d4c0756e74" +checksum = "7a3ce6d22982c1b9b6b012654258bab1a13947bb12703518bef06b1a4867c3d6" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.91.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7" +checksum = "47220fd4f9a0ce23541652b6f16f83868d282602c600d14934b2a4c166b4bd80" [[package]] -name = "cranelift-egraph" -version = "0.91.1" +name = "cranelift-control" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624b54323b06e675293939311943ba82d323bb340468ce1889be5da7932c8d73" +checksum = "ed5a4c42672aea9b6e820046b52e47a1c05d3394a6cdf4cb3c3c4b702f954bd2" dependencies = [ - "cranelift-entity", - "fxhash", - "hashbrown 0.12.3", - "indexmap 1.9.3", - "log", - "smallvec", + "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.91.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c" +checksum = "0b4e9a3296fc827f9d35135dc2c0c8dd8d8359eb1ef904bae2d55d5bcb0c9f94" dependencies = [ "serde", + "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.91.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" +checksum = "33ec537d0f0b8e084517f3e7bfa1d89af343d7c7df455573fca9f272d4e01267" dependencies = [ "cranelift-codegen", "log", @@ -1243,15 +1263,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.91.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +checksum = "45bab6d69919d210a50331d35cc6ce111567bc040aebac63a8ae130d0400a075" [[package]] name = "cranelift-native" -version = "0.91.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba392fd53b1bf6d45bf1d97f7e13bb8ba8424f19d66d80e60a0d594c2bb2636e" +checksum = "f32e81605f352cf37af5463f11cd7deec7b6572741931a8d372f7fdd4a744f5d" dependencies = [ "cranelift-codegen", "libc", @@ -1260,9 +1280,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.91.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016abecc42cc114b924fa3fc306267f566076cefd3e43b891c510c8085c0811e" +checksum = "0edaa4cbec1bc787395c074233df2652dd62f3e29d3ee60329514a0a51e6b045" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1270,7 +1290,7 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser 0.95.0", + "wasmparser 0.115.0", "wasmtime-types", ] @@ -1292,7 +1312,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.3.19", + "clap 4.4.18", "criterion-plot", "is-terminal", "itertools", @@ -1321,46 +1341,37 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1401,6 +1412,35 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms", + "rand_core 0.6.4", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "darling" version = "0.20.3" @@ -1422,7 +1462,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -1433,7 +1473,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -1445,24 +1485,34 @@ dependencies = [ "uuid 0.8.2", ] +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "uuid 1.6.1", +] + [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ + "powerfmt", "serde", ] [[package]] name = "derive_arbitrary" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -1533,9 +1583,9 @@ checksum = "f0bc8fbe9441c17c9f46f75dfe27fa1ddb6c68a461ccaed0481419219d4f10d3" [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "dynasm" @@ -1575,7 +1625,16 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.6.4", +] + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "signature 2.2.0", ] [[package]] @@ -1584,14 +1643,27 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", - "ed25519", + "curve25519-dalek 3.2.1", + "ed25519 1.5.3", "rand 0.7.3", "serde", "sha2 0.9.9", "zeroize", ] +[[package]] +name = "ed25519-dalek" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +dependencies = [ + "curve25519-dalek 4.1.1", + "ed25519 2.2.3", + "rand_core 0.6.4", + "sha2 0.10.8", + "subtle", +] + [[package]] name = "either" version = "1.9.0" @@ -1651,29 +1723,29 @@ dependencies = [ [[package]] name = "enum-map" -version = "2.6.3" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.14.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "enumset" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e875f1719c16de097dee81ed675e2d9bb63096823ed3f0ca827b7dea3028bbbb" +checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" dependencies = [ "enumset_derive", ] @@ -1687,7 +1759,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -1717,12 +1789,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1767,7 +1839,7 @@ dependencies = [ "ethereum-types", "hash-db", "hash256-std-hasher", - "parity-scale-codec 3.6.5", + "parity-scale-codec 3.6.9", "rlp", "scale-info", "serde", @@ -1803,7 +1875,7 @@ dependencies = [ "evm-gasometer", "evm-runtime", "log", - "parity-scale-codec 3.6.5", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "rlp", "scale-info", @@ -1816,7 +1888,7 @@ name = "evm-core" version = "0.39.1" source = "git+https://github.com/aurora-is-near/sputnikvm.git?tag=v0.39.1#0334a09d6b6e83ff3a8da992e33f29ba95e0c9fe" dependencies = [ - "parity-scale-codec 3.6.5", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "scale-info", "serde", @@ -1851,37 +1923,49 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "fiat-crypto" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" + [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] name = "finite-wasm" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f27c2426a53dc2e378578b37f004c8760dbe86dc193dad3c486cd9f8e9fe04" +checksum = "6d81b511929c2669eaf64e36471cf27c2508133e62ade9d49e608e8d675e7854" dependencies = [ "bitvec 1.0.1", "dissimilar", "num-traits", "prefix-sum-vec", "thiserror", - "wasm-encoder 0.26.0", - "wasmparser 0.104.0", + "wasm-encoder 0.27.0", + "wasmparser 0.105.0", "wasmprinter", ] @@ -1923,9 +2007,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1954,9 +2038,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2000,9 +2084,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -2014,9 +2098,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2024,15 +2108,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2041,38 +2125,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2095,6 +2179,19 @@ dependencies = [ "byteorder", ] +[[package]] +name = "fxprof-processed-profile" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" +dependencies = [ + "bitflags 2.4.2", + "debugid 0.8.0", + "fxhash", + "serde", + "serde_json", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -2118,9 +2215,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2133,16 +2230,21 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ - "fallible-iterator", + "fallible-iterator 0.2.0", "indexmap 1.9.3", "stable_deref_trait", ] [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +dependencies = [ + "fallible-iterator 0.3.0", + "indexmap 2.1.0", + "stable_deref_trait", +] [[package]] name = "git2" @@ -2150,7 +2252,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "libc", "libgit2-sys", "log", @@ -2178,9 +2280,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -2188,10 +2290,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", - "tokio-util 0.7.9", + "tokio-util 0.7.10", "tracing", ] @@ -2222,7 +2324,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -2231,7 +2333,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -2240,14 +2342,17 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", ] [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash 0.8.7", +] [[package]] name = "heck" @@ -2275,9 +2380,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -2320,18 +2425,18 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -2340,9 +2445,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -2369,9 +2474,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -2384,7 +2489,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -2418,16 +2523,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2464,9 +2569,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2487,7 +2592,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.6.5", + "parity-scale-codec 3.6.9", ] [[package]] @@ -2538,12 +2643,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.3", "serde", ] @@ -2556,32 +2661,21 @@ dependencies = [ "generic-array", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.3", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ - "hermit-abi 0.3.3", - "rustix 0.38.18", - "windows-sys 0.48.0", + "hermit-abi 0.3.4", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -2604,9 +2698,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" @@ -2625,9 +2719,9 @@ checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -2646,15 +2740,15 @@ dependencies = [ [[package]] name = "json_comments" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ee439ee368ba4a77ac70d04f14015415af8600d6c894dc1f11bd79758c57d5" +checksum = "9dbbfed4e59ba9750e15ba154fdfd9329cee16ff3df539c2666b70f58cc32105" [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -2665,7 +2759,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] @@ -2682,9 +2776,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "libgit2-sys" @@ -2710,6 +2804,27 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] + [[package]] name = "librocksdb-sys" version = "0.11.0+8.1.1" @@ -2790,9 +2905,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" dependencies = [ "cc", "libc", @@ -2802,21 +2917,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2828,35 +2937,6 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "loupe" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d" -dependencies = [ - "loupe-derive", - "rustversion", -] - -[[package]] -name = "loupe-derive" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] - [[package]] name = "lz4-sys" version = "1.9.4" @@ -2897,9 +2977,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memfd" @@ -2907,7 +2987,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.18", + "rustix", ] [[package]] @@ -2930,17 +3010,26 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] [[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memory_units" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] @@ -2966,9 +3055,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -3038,12 +3127,13 @@ dependencies = [ ] [[package]] -name = "near-cache" -version = "0.17.0" +name = "near-account-id" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b93fc90f75d3bb22eb6587130173630547b08e769f2936d15dc7c62b925343b" +checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" dependencies = [ - "lru", + "borsh 1.3.1", + "serde", ] [[package]] @@ -3055,9 +3145,9 @@ dependencies = [ "anyhow", "chrono", "derive_more", - "near-config-utils", + "near-config-utils 0.17.0", "near-crypto 0.17.0", - "near-o11y", + "near-o11y 0.17.0", "near-primitives 0.17.0", "num-rational 0.3.2", "once_cell", @@ -3080,6 +3170,18 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-config-utils" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91114c2e5549a588656ebd3647023ba65781955c81b26382158f011632e87b10" +dependencies = [ + "anyhow", + "json_comments", + "thiserror", + "tracing", +] + [[package]] name = "near-crypto" version = "0.14.0" @@ -3091,9 +3193,9 @@ dependencies = [ "borsh 0.9.3", "bs58 0.4.0", "c2-chacha", - "curve25519-dalek", + "curve25519-dalek 3.2.1", "derive_more", - "ed25519-dalek", + "ed25519-dalek 1.0.1", "near-account-id 0.14.0", "once_cell", "parity-secp256k1", @@ -3116,13 +3218,40 @@ dependencies = [ "borsh 0.10.3", "bs58 0.4.0", "c2-chacha", - "curve25519-dalek", + "curve25519-dalek 3.2.1", "derive_more", - "ed25519-dalek", + "ed25519-dalek 1.0.1", "hex", "near-account-id 0.17.0", - "near-config-utils", - "near-stdx", + "near-config-utils 0.17.0", + "near-stdx 0.17.0", + "once_cell", + "primitive-types 0.10.1", + "rand 0.7.3", + "secp256k1", + "serde", + "serde_json", + "subtle", + "thiserror", +] + +[[package]] +name = "near-crypto" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e30b00f193047834bcab85e6a7a08dddba9a13efcff9fdd6fdb383b9bca6f129" +dependencies = [ + "blake2", + "borsh 1.3.1", + "bs58 0.4.0", + "c2-chacha", + "curve25519-dalek 4.1.1", + "derive_more", + "ed25519-dalek 2.1.0", + "hex", + "near-account-id 1.0.0", + "near-config-utils 0.20.0", + "near-stdx 0.20.0", "once_cell", "primitive-types 0.10.1", "rand 0.7.3", @@ -3142,13 +3271,22 @@ dependencies = [ "near-primitives-core 0.17.0", ] +[[package]] +name = "near-fmt" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12c527706c68c4e6fa8a6fa67a97ee2dbd61db8ecfd4b8e90e7be7d0814d33e9" +dependencies = [ + "near-primitives-core 0.20.0", +] + [[package]] name = "near-gas" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dac82d80f9dba5d879876ccee0fc8f4d91ca82552bad545e9f9714c5da49e4c" +checksum = "14e75c875026229902d065e4435804497337b631ec69ba746b102954273e9ad1" dependencies = [ - "borsh 0.9.3", + "borsh 1.3.1", "schemars", "serde", ] @@ -3196,7 +3334,7 @@ checksum = "af7d35397b02b131c188c72f3885e97daeccab134ec2fc8cc0073a94cf1cfe19" dependencies = [ "actix", "atty", - "clap 4.3.19", + "clap 4.4.18", "near-crypto 0.17.0", "near-primitives-core 0.17.0", "once_cell", @@ -3214,6 +3352,53 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "near-o11y" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d680f56489eee8ddac5a6828ac97893728046a9d5cc76388f89141da4e542cc" +dependencies = [ + "actix", + "base64 0.21.7", + "clap 4.4.18", + "near-crypto 0.20.0", + "near-fmt 0.20.0", + "near-primitives-core 0.20.0", + "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-parameters" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ded008bbe48d6cc7617bfa19812179a4c15c763a9cdf61b87eb8a7bdbe10f1b" +dependencies = [ + "assert_matches", + "borsh 1.3.1", + "enum-map", + "near-account-id 1.0.0", + "near-primitives-core 0.20.0", + "num-rational 0.3.2", + "serde", + "serde_repr", + "serde_yaml", + "strum 0.24.1", + "thiserror", +] + [[package]] name = "near-primitives" version = "0.14.0" @@ -3259,10 +3444,10 @@ dependencies = [ "enum-map", "hex", "near-crypto 0.17.0", - "near-fmt", + "near-fmt 0.17.0", "near-primitives-core 0.17.0", "near-rpc-error-macro 0.17.0", - "near-stdx", + "near-stdx 0.17.0", "near-vm-errors 0.17.0", "num-rational 0.3.2", "once_cell", @@ -3280,6 +3465,48 @@ dependencies = [ "tracing", ] +[[package]] +name = "near-primitives" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5414b66630a38526902dc5d655581476610f6b0c64cffa49b1756fe64e519bc2" +dependencies = [ + "arbitrary", + "base64 0.21.7", + "borsh 1.3.1", + "bytesize", + "cfg-if 1.0.0", + "chrono", + "derive_more", + "easy-ext", + "enum-map", + "hex", + "near-crypto 0.20.0", + "near-fmt 0.20.0", + "near-o11y 0.20.0", + "near-parameters", + "near-primitives-core 0.20.0", + "near-rpc-error-macro 0.20.0", + "near-stdx 0.20.0", + "near-vm-runner", + "num-rational 0.3.2", + "once_cell", + "primitive-types 0.10.1", + "rand 0.8.5", + "rand_chacha 0.3.1", + "reed-solomon-erasure", + "serde", + "serde_json", + "serde_with", + "serde_yaml", + "sha3", + "smart-default", + "strum 0.24.1", + "thiserror", + "time", + "tracing", +] + [[package]] name = "near-primitives-core" version = "0.14.0" @@ -3304,7 +3531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775fec19ef51a341abdbf792a9dda5b4cb89f488f681b2fd689b9321d24db47b" dependencies = [ "arbitrary", - "base64 0.21.4", + "base64 0.21.7", "borsh 0.10.3", "bs58 0.4.0", "derive_more", @@ -3319,6 +3546,28 @@ dependencies = [ "thiserror", ] +[[package]] +name = "near-primitives-core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830f6932e0898e486b2bfb61b709a8a9d8d05c23d8398c5aeca62cb929cc2a56" +dependencies = [ + "arbitrary", + "base64 0.21.7", + "borsh 1.3.1", + "bs58 0.4.0", + "derive_more", + "enum-map", + "near-account-id 1.0.0", + "num-rational 0.3.2", + "serde", + "serde_repr", + "serde_with", + "sha2 0.10.8", + "strum 0.24.1", + "thiserror", +] + [[package]] name = "near-rpc-error-core" version = "0.14.0" @@ -3338,7 +3587,18 @@ checksum = "84c1eda300e2e78f4f945ae58117d49e806899f4a51ee2faa09eda5ebc2e6571" dependencies = [ "quote", "serde", - "syn 2.0.38", + "syn 2.0.48", +] + +[[package]] +name = "near-rpc-error-core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ec84c3da6dfefed08aad6920d45a09867c11a61f1c7f312d4be68ea7fc79fc" +dependencies = [ + "quote", + "serde", + "syn 2.0.48", ] [[package]] @@ -3361,7 +3621,19 @@ dependencies = [ "fs2", "near-rpc-error-core 0.17.0", "serde", - "syn 2.0.38", + "syn 2.0.48", +] + +[[package]] +name = "near-rpc-error-macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4393a80a2173a48e3ef284fdb63f6adb6cdde8f3bdf242aa9628b50a6f79e392" +dependencies = [ + "fs2", + "near-rpc-error-core 0.20.0", + "serde", + "syn 2.0.48", ] [[package]] @@ -3393,7 +3665,7 @@ dependencies = [ "near-primitives-core 0.14.0", "near-sdk-macros", "near-sys", - "near-vm-logic 0.14.0", + "near-vm-logic", "once_cell", "schemars", "serde", @@ -3414,22 +3686,22 @@ dependencies = [ ] [[package]] -name = "near-stable-hasher" +name = "near-stdx" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769a3c0fcaf0686efb1e103cb5a50c62653ac5c1312a6eb910f6c7fe0158e36f" +checksum = "6540152fba5e96fe5d575b79e8cd244cf2add747bb01362426bdc069bc3a23bc" [[package]] name = "near-stdx" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6540152fba5e96fe5d575b79e8cd244cf2add747bb01362426bdc069bc3a23bc" +checksum = "f6cc34a471c6e01f9dafa6aaa2d0553a3fe859dbb0d7fc73ca73f72731392226" [[package]] name = "near-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e307313276eaeced2ca95740b5639e1f3125b7c97f0a1151809d105f1aa8c6d3" +checksum = "397688591acf8d3ebf2c2485ba32d4b24fc10aad5334e3ad8ec0b7179bfdf06b" [[package]] name = "near-token" @@ -3488,52 +3760,39 @@ dependencies = [ "zeropool-bn", ] -[[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", - "near-account-id 0.17.0", - "near-crypto 0.17.0", - "near-fmt", - "near-o11y", - "near-primitives 0.17.0", - "near-primitives-core 0.17.0", - "near-stdx", - "near-vm-errors 0.17.0", - "ripemd", - "serde", - "sha2 0.10.8", - "sha3", - "zeropool-bn", -] - [[package]] name = "near-vm-runner" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a920e3ca5afa0f0a9016c7cde95030eb60c63f2f3834f691614f12aebb11909" +checksum = "26f13ed25ccb25f066790290b5aca1800d87da2c4d0916217a17bc8f3ad00cdf" dependencies = [ "anyhow", - "borsh 0.10.3", + "base64 0.21.7", + "borsh 1.3.1", + "ed25519-dalek 2.1.0", + "enum-map", "finite-wasm", - "loupe", - "memoffset 0.6.5", - "near-cache", - "near-primitives 0.17.0", - "near-stable-hasher", - "near-vm-errors 0.17.0", - "near-vm-logic 0.17.0", + "memoffset 0.8.0", + "near-crypto 0.20.0", + "near-parameters", + "near-primitives-core 0.20.0", + "near-stdx 0.20.0", + "num-rational 0.3.2", "once_cell", "parity-wasm 0.41.0", "parity-wasm 0.42.2", "prefix-sum-vec", "pwasm-utils", + "ripemd", "serde", + "serde_repr", + "serde_with", + "sha2 0.10.8", + "sha3", + "strum 0.24.1", + "thiserror", "tracing", + "wasm-encoder 0.27.0", "wasmer-compiler-near", "wasmer-compiler-singlepass-near", "wasmer-engine-near", @@ -3542,6 +3801,7 @@ dependencies = [ "wasmer-vm-near", "wasmparser 0.78.2", "wasmtime", + "zeropool-bn", ] [[package]] @@ -3551,7 +3811,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a14e772e49ba9644c06dad20f635b6463f74d378fa19822bfc35fef479c72e5" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.7", "borsh 0.10.3", "bs58 0.5.0", "cargo-near", @@ -3726,36 +3986,27 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.4", "libc", ] [[package]] name = "object" -version = "0.29.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", - "hashbrown 0.12.3", - "indexmap 1.9.3", - "memchr", -] - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ + "hashbrown 0.14.3", + "indexmap 2.1.0", "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -3771,11 +4022,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3792,7 +4043,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -3803,9 +4054,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -3863,9 +4114,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "overload" @@ -3889,15 +4140,15 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec 0.7.4", "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.6.5", + "parity-scale-codec-derive 3.6.9", "serde", ] @@ -3915,11 +4166,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 1.0.109", @@ -3928,8 +4179,7 @@ dependencies = [ [[package]] name = "parity-secp256k1" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fca4f82fccae37e8bbdaeb949a4a218a1bbc485d11598f193d2a908042e5fc1" +source = "git+https://github.com/paritytech/rust-secp256k1?rev=d05fd8e#d05fd8e152f8d110b587906e3d854196b086e42a" dependencies = [ "arrayvec 0.5.2", "cc", @@ -3961,13 +4211,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -4007,7 +4257,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13f4d162ecaaa1467de5afbe62d597757b674b51da8bb4e587430c5fdb2af7aa" dependencies = [ - "fallible-iterator", + "fallible-iterator 0.2.0", "scroll 0.10.2", "uuid 0.8.2", ] @@ -4020,9 +4270,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -4031,7 +4281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.2", + "indexmap 2.1.0", ] [[package]] @@ -4078,7 +4328,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -4095,9 +4345,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "plain" @@ -4105,6 +4355,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +[[package]] +name = "platforms" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" + [[package]] name = "plotters" version = "0.3.5" @@ -4140,7 +4396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" dependencies = [ "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "futures-util", "log", "tokio", @@ -4153,10 +4409,10 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "byteorder", "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "hmac 0.12.1", "md-5", "memchr", @@ -4172,10 +4428,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" dependencies = [ "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "postgres-protocol", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -4196,12 +4458,12 @@ checksum = "aa06bd51638b6e76ac9ba9b6afb4164fa647bd2916d722f2623fbb6d1ed8bdba" [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -4245,7 +4507,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.0", ] [[package]] @@ -4274,9 +4554,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -4397,9 +4677,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -4475,7 +4755,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.12", ] [[package]] @@ -4489,9 +4769,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -4499,9 +4779,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4509,30 +4789,21 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.12", + "libredox", "thiserror", ] @@ -4547,26 +4818,27 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.5.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ - "fxhash", + "hashbrown 0.13.2", "log", + "rustc-hash", "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.10.0" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.1", - "regex-syntax 0.8.1", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -4580,13 +4852,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.1", + "regex-syntax 0.8.2", ] [[package]] @@ -4597,9 +4869,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "region" @@ -4624,11 +4896,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -4662,17 +4934,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", + "getrandom 0.2.12", "libc", - "once_cell", - "spin", + "spin 0.9.8", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -4686,26 +4957,27 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.42" +version = "0.7.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" dependencies = [ "bitvec 1.0.1", "bytecheck", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", "rkyv_derive", "seahash", "tinyvec", - "uuid 1.4.1", + "uuid 1.6.1", ] [[package]] name = "rkyv_derive" -version = "0.7.42" +version = "0.7.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" dependencies = [ "proc-macro2", "quote", @@ -4773,36 +5045,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.16" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.38.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.10", - "windows-sys 0.48.0", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -4812,9 +5070,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -4828,9 +5086,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -4843,22 +5101,22 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" +checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" dependencies = [ "bitvec 1.0.1", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec 3.6.5", + "parity-scale-codec 3.6.9", "scale-info-derive", ] [[package]] name = "scale-info-derive" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" +checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -4868,18 +5126,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "schemars" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "dyn-clone", "schemars_derive", @@ -4889,9 +5147,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -4928,14 +5186,14 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -4991,31 +5249,31 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -5031,9 +5289,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -5042,13 +5300,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -5065,15 +5323,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_json", "serde_with_macros", @@ -5082,23 +5340,23 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -5161,9 +5419,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" @@ -5180,6 +5438,12 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" + [[package]] name = "simdutf8" version = "0.1.4" @@ -5209,9 +5473,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.11.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" [[package]] name = "smart-default" @@ -5226,9 +5490,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -5236,9 +5500,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -5250,6 +5514,18 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -5308,7 +5584,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros 0.25.2", + "strum_macros 0.25.3", ] [[package]] @@ -5326,15 +5602,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -5349,7 +5625,7 @@ version = "8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f551f902d5642e58039aee6a9021a61037926af96e071816361644983966f540" dependencies = [ - "debugid", + "debugid 0.7.3", "memmap2", "stable_deref_trait", "uuid 0.8.2", @@ -5364,7 +5640,7 @@ dependencies = [ "bitvec 1.0.1", "dmsort", "elementtree", - "fallible-iterator", + "fallible-iterator 0.2.0", "flate2", "gimli 0.26.2", "goblin", @@ -5398,15 +5674,27 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -5447,64 +5735,62 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if 1.0.0", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.38.18", - "windows-sys 0.48.0", + "redox_syscall", + "rustix", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "test-case" -version = "3.2.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" dependencies = [ "test-case-macros", ] [[package]] name = "test-case-core" -version = "3.2.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" dependencies = [ "cfg-if 1.0.0", - "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "test-case-macros" -version = "3.2.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", "test-case-core", ] @@ -5516,22 +5802,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -5546,12 +5832,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -5565,9 +5852,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -5620,7 +5907,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.4.10", "tokio-macros", "windows-sys 0.48.0", ] @@ -5643,7 +5930,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -5665,7 +5952,7 @@ dependencies = [ "async-trait", "byteorder", "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "futures-channel", "futures-util", "log", @@ -5676,9 +5963,9 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand 0.8.5", - "socket2 0.5.4", + "socket2 0.5.5", "tokio", - "tokio-util 0.7.9", + "tokio-util 0.7.10", "whoami", ] @@ -5720,9 +6007,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -5743,9 +6030,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" @@ -5753,7 +6040,29 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", "toml_datetime", "winnow", ] @@ -5815,7 +6124,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.9", + "tokio-util 0.7.10", "tower-layer", "tower-service", "tracing", @@ -5835,11 +6144,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -5848,31 +6156,32 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", + "thiserror", "time", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -5890,12 +6199,23 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -5909,15 +6229,15 @@ dependencies = [ "opentelemetry", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.1.4", "tracing-subscriber", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -5928,7 +6248,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", ] [[package]] @@ -5952,9 +6272,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -5976,9 +6296,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -6003,23 +6323,23 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "flate2", "log", "once_cell", @@ -6031,9 +6351,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -6055,9 +6375,9 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "uuid" -version = "1.4.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" [[package]] name = "valuable" @@ -6089,9 +6409,9 @@ dependencies = [ [[package]] name = "walrus" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc27d837c587f863d99515dc8cae7cef1098bd1d99fa29373e3660c12766265e" +checksum = "2c03529cd0c4400a2449f640d2f27cd1b48c3065226d15e26d98e4429ab0adb7" dependencies = [ "anyhow", "gimli 0.26.2", @@ -6138,9 +6458,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -6148,24 +6468,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -6175,9 +6495,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6185,28 +6505,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wasm-encoder" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05d0b6fcd0aeb98adf16e7975331b3c17222aa815148f5b976370ce589d80ef" +checksum = "e77053dc709db790691d3732cfc458adc5acc881dec524965c608effdcd9c581" dependencies = [ "leb128", ] @@ -6220,11 +6540,20 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-encoder" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca90ba1b5b0a70d3d49473c5579951f3bddc78d47b59256d2f9d4922b150aca" +dependencies = [ + "leb128", +] + [[package]] name = "wasmer-compiler-near" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d09dc0ba83ddaceb9b0846ed11a6c26a449b69fa2709e0335d268f44491921" +checksum = "46fdae7245128f284476e6db9653ef0a15b011975091bcd7f9d7303132409662" dependencies = [ "enumset", "rkyv", @@ -6238,9 +6567,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-singlepass-near" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f34bf0625219766759851c1f92e0797787b8b10b424c0a273ee4e0328a2ff7" +checksum = "ac4af0e438015585eb27b2c6f6869c58c540bfe27408b686b1778470bf301050" dependencies = [ "byteorder", "dynasm", @@ -6257,9 +6586,9 @@ dependencies = [ [[package]] name = "wasmer-engine-near" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8353167be3099f3bd033cb9c8479a02d69917777cf4c2e52a09946d5582457" +checksum = "4048411cabb2c94c7d8d11d9d0282cc6b15308b61ebc1e122c40e89865ebb5c5" dependencies = [ "backtrace", "enumset", @@ -6276,9 +6605,9 @@ dependencies = [ [[package]] name = "wasmer-engine-universal-near" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34fb4f6af2209a36c5e6ed407c9e057fdd2e722e762f702dbd8575896349c62" +checksum = "c5f31c3d2850ac7957406d3c9581d9435ea8126a26478709fa7e931b6f562b4d" dependencies = [ "cfg-if 1.0.0", "enumset", @@ -6295,9 +6624,9 @@ dependencies = [ [[package]] name = "wasmer-types-near" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1131dfac4d92947acef554a75b433122ca635414c23934f53434ec0efc5994d" +checksum = "1ba154adffb0fbd33f5dabd3788a1744d846b43e6e090d44269c7ee8fa5743e4" dependencies = [ "indexmap 1.9.3", "rkyv", @@ -6306,9 +6635,9 @@ dependencies = [ [[package]] name = "wasmer-vm-near" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a47f13d5c412974a38bba01a8b009e1e49bffbee45387198403b269a74d7374" +checksum = "70a5585596f6e9915d606de944aece51626736fb1191aefb5b2ef108c6f7604a" dependencies = [ "backtrace", "cc", @@ -6344,9 +6673,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wasmparser" -version = "0.95.0" +version = "0.105.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +checksum = "83be9e0b3f9570dc1979a33ae7b89d032c73211564232b99976553e5c155ec32" dependencies = [ "indexmap 1.9.3", "url", @@ -6354,183 +6683,234 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.104.0" +version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a396af81a7c56ad976131d6a35e4b693b78a1ea0357843bd436b4577e254a7d" +checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" dependencies = [ - "indexmap 1.9.3", - "url", + "indexmap 2.1.0", + "semver", ] [[package]] name = "wasmprinter" -version = "0.2.56" +version = "0.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731da2505d5437cd5d6feb09457835f76186be13be7677fe00781ae99d5bbe8a" +checksum = "50b0e5ed7a74a065637f0d7798ce5f29cadb064980d24b0c82af5200122fa0d8" dependencies = [ "anyhow", - "wasmparser 0.104.0", + "wasmparser 0.105.0", ] [[package]] name = "wasmtime" -version = "4.0.1" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a556932766120e2969c94a2d26ce47005451ac27236d418a11118c3ad5459905" +checksum = "ca54f6090ce46973f33a79f265924b204f248f91aec09229bce53d19d567c1a6" dependencies = [ "anyhow", "bincode", + "bumpalo", "cfg-if 1.0.0", - "indexmap 1.9.3", + "fxprof-processed-profile", + "indexmap 2.1.0", "libc", "log", - "object 0.29.0", + "object", "once_cell", "paste", "psm", "serde", + "serde_derive", + "serde_json", "target-lexicon", - "wasmparser 0.95.0", + "wasm-encoder 0.35.0", + "wasmparser 0.115.0", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-asm-macros" -version = "4.0.1" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa5d2ec8e75db6907b46bfdd4980aefc6666854c4693a20f89b8417fe9c80d8" +checksum = "54984bc0b5689da87a43d7c181d23092b4d5cfcbb7ae3eb6b917dd55865d95e6" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cranelift" -version = "4.0.1" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a9ec65dec790ec8602c263a1da12de073cc46cb07ffa3fc28295d2238365b6" +checksum = "1cf3cee8be02f5006d21b773ffd6802f96a0b7d661ff2ad8a01fb93df458b1aa" dependencies = [ "anyhow", + "cfg-if 1.0.0", "cranelift-codegen", + "cranelift-control", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.26.2", + "gimli 0.28.1", "log", - "object 0.29.0", + "object", "target-lexicon", "thiserror", - "wasmparser 0.95.0", + "wasmparser 0.115.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "14.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420fd2a69bc162957f4c94f21c7fa08ecf60d916f4e87b56332507c555da381d" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-control", + "cranelift-native", + "gimli 0.28.1", + "object", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "4.0.1" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2137f0cdc6eed2f734c0d6f6a024af0e7a7208fa95e88501b72ca3c957bd0ba1" +checksum = "fb6a445ce2b2810127caee6c1b79b8da4ae57712b05556a674592c18b7500a14" dependencies = [ "anyhow", "cranelift-entity", - "gimli 0.26.2", - "indexmap 1.9.3", + "gimli 0.28.1", + "indexmap 2.1.0", "log", - "object 0.29.0", + "object", "serde", + "serde_derive", "target-lexicon", "thiserror", - "wasmparser 0.95.0", + "wasmparser 0.115.0", "wasmtime-types", ] [[package]] name = "wasmtime-jit" -version = "4.0.1" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbaffeaba705c0bfd681402e7629c9b611451e4c6ca3373a06293e846bb062" +checksum = "1f0f6586c61125fbfc13c3108c3dd565d21f314dd5bac823b9a5b7ab576d21f1" dependencies = [ - "addr2line 0.17.0", + "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", "cpp_demangle", - "gimli 0.26.2", + "gimli 0.28.1", "log", - "object 0.29.0", + "object", "rustc-demangle", + "rustix", "serde", + "serde_derive", "target-lexicon", "wasmtime-environ", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-jit-debug" -version = "4.0.1" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17981d189925fcb3a449a18b330141865df3aa025c030c4572962e10daa9707f" +checksum = "109a9e46afe33580b952b14a4207354355f19bcdf0b47485b397b68409eaf553" dependencies = [ "once_cell", + "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "3.0.1" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f32b3f9e2b3b65fc9551240c81d69db8636b267ea5750ffc75e8a16d01680b0" +checksum = "f67e6be36375c39cff57ed3b137ab691afbf2d9ba8ee1c01f77888413f218749" dependencies = [ "cfg-if 1.0.0", "libc", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-runtime" -version = "4.0.1" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a777df20249db2c4c54a4a709b5620c9021fda238f4c9b03fe7f77feac9cff" +checksum = "1d07986b2327b5e7f535ed638fbde25990fc8f85400194fda0d26db71c7b685e" dependencies = [ "anyhow", "cc", "cfg-if 1.0.0", - "indexmap 1.9.3", + "indexmap 2.1.0", "libc", "log", "mach", "memfd", - "memoffset 0.6.5", + "memoffset 0.9.0", "paste", "rand 0.8.5", - "rustix 0.36.16", + "rustix", + "sptr", + "wasm-encoder 0.35.0", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.42.0", + "wasmtime-versioned-export-macros", + "wasmtime-wmemcheck", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-types" -version = "4.0.1" +version = "14.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6410892daeb7e69d5af6055c9c07d9f5d1e159539a6e3f649e932fe0d9008a5b" +checksum = "e810a0d2e869abd1cb42bd232990f6bd211672b3d202d2ae7e70ffb97ed70ea3" dependencies = [ "cranelift-entity", "serde", + "serde_derive", "thiserror", - "wasmparser 0.95.0", + "wasmparser 0.115.0", +] + +[[package]] +name = "wasmtime-versioned-export-macros" +version = "14.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b5575a75e711ca6c36bb9ad647c93541cdc8e34218031acba5da3f35919dd3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] +[[package]] +name = "wasmtime-wmemcheck" +version = "14.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dafab2db172a53e23940e0fa3078c202f567ee5f13f4b42f66b694fab43c658" + [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -6538,9 +6918,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "wee_alloc" @@ -6563,7 +6943,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.18", + "rustix", ] [[package]] @@ -6608,36 +6988,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.52.0", ] [[package]] @@ -6650,18 +7006,12 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.0", ] [[package]] @@ -6680,10 +7030,19 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" +name = "windows-targets" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] [[package]] name = "windows_aarch64_gnullvm" @@ -6692,10 +7051,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +name = "windows_aarch64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -6704,10 +7063,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] -name = "windows_i686_gnu" -version = "0.42.2" +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -6716,10 +7075,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -6728,10 +7087,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +name = "windows_i686_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -6740,10 +7099,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -6752,10 +7111,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -6763,11 +7122,17 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" -version = "0.5.16" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -6799,11 +7164,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] @@ -6812,6 +7179,26 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "zeroize" version = "1.3.0" @@ -6829,7 +7216,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index e975287a7..74a76270f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,14 +44,13 @@ ibig = { version = "0.3", default-features = false, features = ["num-traits"] } impl-serde = { version = "0.4", default-features = false} lazy_static = "1" libsecp256k1 = { version = "0.7", default-features = false } -near-crypto = "0.17" +near-crypto = "0.20" near-gas = "0.2" -near-primitives = "0.17" -near-primitives-core = "0.17" +near-parameters = "0.20" +near-primitives = "0.20" +near-primitives-core = "0.20" near-sdk = "4" -near-vm-errors = "0.17" -near-vm-logic = "0.17" -near-vm-runner = { version = "0.17", default-features = false, features = [ "wasmer2_vm", "wasmtime_vm" ] } +near-vm-runner = { version = "0.20", features = [ "wasmtime_vm", "wasmer2_vm" ] } near-workspaces = "0.9" num = { version = "0.4", default-features = false, features = ["alloc"] } postgres = "0.19" @@ -72,6 +71,9 @@ test-case = "3.1" walrus = "0.20" wee_alloc = { version = "0.4", default-features = false } +[patch.crates-io] +parity-secp256k1 = { git = 'https://github.com/paritytech/rust-secp256k1', rev = "d05fd8e" } + [workspace] resolver = "2" members = [ diff --git a/Makefile.toml b/Makefile.toml index 0842927cd..ca2be8969 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -16,7 +16,7 @@ skip_core_tasks = true CARGO = "cargo" ENGINE_CARGO_TARGET = "wasm32-unknown-unknown" SWEEP_DAYS = 30 -BUILDER_HASH_COMMIT = "00226858199419aaa8c99f756bd192851666fb36" # https://hub.docker.com/r/nearprotocol/contract-builder/tags +BUILDER_HASH_COMMIT = "13430592a7be246dd5a29439791f4081e0107ff3" # https://hub.docker.com/r/nearprotocol/contract-builder/tags [tasks.sweep] category = "Cleanup" diff --git a/VERSION b/VERSION index 1545d9665..40c341bdc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.0 +3.6.0 diff --git a/engine-hashchain/src/bloom.rs b/engine-hashchain/src/bloom.rs index 4db7012fa..48b12f205 100644 --- a/engine-hashchain/src/bloom.rs +++ b/engine-hashchain/src/bloom.rs @@ -2,10 +2,7 @@ //! Link: //! //! Reimplemented here since there is a large mismatch in types and dependencies. -#![allow( - clippy::expl_impl_clone_on_copy, -// TODO: rust-2023-08-24 clippy::incorrect_clone_impl_on_copy_type -)] +#![allow(clippy::expl_impl_clone_on_copy, clippy::non_canonical_clone_impl)] use aurora_engine_sdk::keccak; use aurora_engine_types::borsh::{self, BorshDeserialize, BorshSerialize}; diff --git a/engine-modexp/src/mpnat.rs b/engine-modexp/src/mpnat.rs index 917030a6c..463582e5f 100644 --- a/engine-modexp/src/mpnat.rs +++ b/engine-modexp/src/mpnat.rs @@ -843,7 +843,7 @@ fn test_mp_nat_be() { let output = mp.to_big_endian(); let hex_output = hex::encode(output); let trimmed = match hex_input.trim_start_matches('0') { - x if x.is_empty() => "00", + "" => "00", x => x, }; assert_eq!(hex_output, trimmed) diff --git a/engine-precompiles/src/modexp.rs b/engine-precompiles/src/modexp.rs index 299b147fa..2b01a506c 100644 --- a/engine-precompiles/src/modexp.rs +++ b/engine-precompiles/src/modexp.rs @@ -38,7 +38,7 @@ impl ModExp { Ok(U256::from(exp.bits()) - U256::from(1)) } else { // else > 32 - Ok(U256::from(8) * U256::from(exp_len - 32) + U256::from(exp.bits()) - U256::from(1)) + Ok(U256::from(8) * U256::from(exp_len - 32) + U256::from(exp.bits().saturating_sub(1))) } } @@ -726,4 +726,12 @@ mod tests { ModExp::::new().run(&input, Some(EthGas::new(100_000)), &new_context(), false); assert!(res.is_ok()); } + + #[test] + fn test_calc_iter_count_underflow() { + let input = hex::decode("0000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002600"); + let gas = ModExp::::required_gas(&input.unwrap()).unwrap(); + let min_gas = EthGas::new(65536); + assert_eq!(gas, min_gas); + } } diff --git a/engine-precompiles/src/prelude.rs b/engine-precompiles/src/prelude.rs index 1e6b68f3e..af822bfc8 100644 --- a/engine-precompiles/src/prelude.rs +++ b/engine-precompiles/src/prelude.rs @@ -1,6 +1,5 @@ pub use aurora_engine_sdk as sdk; -pub use aurora_engine_types::account_id::*; -pub use aurora_engine_types::borsh::{BorshDeserialize, BorshSerialize}; +pub use aurora_engine_types::borsh::BorshSerialize; pub use aurora_engine_types::parameters; pub use aurora_engine_types::storage; pub use aurora_engine_types::types; diff --git a/engine-precompiles/src/xcc.rs b/engine-precompiles/src/xcc.rs index 8bfa7e660..1ced7b25c 100644 --- a/engine-precompiles/src/xcc.rs +++ b/engine-precompiles/src/xcc.rs @@ -138,7 +138,10 @@ impl HandleBasedPrecompile for CrossContractCall { CrossContractCallArgs::Eager(call) => { let call_gas = call.total_gas(); let attached_near = call.total_near(); - let callback_count = call.promise_count() - 1; + let callback_count = call + .promise_count() + .checked_sub(1) + .ok_or_else(|| ExitError::Other(Cow::from(consts::ERR_INVALID_INPUT)))?; let router_exec_cost = costs::ROUTER_EXEC_BASE + NearGas::new(callback_count * costs::ROUTER_EXEC_PER_CALLBACK.as_u64()); let promise = PromiseCreateArgs { @@ -148,7 +151,7 @@ impl HandleBasedPrecompile for CrossContractCall { .try_to_vec() .map_err(|_| ExitError::Other(Cow::from(consts::ERR_SERIALIZE)))?, attached_balance: ZERO_YOCTO, - attached_gas: router_exec_cost + call_gas, + attached_gas: router_exec_cost.saturating_add(call_gas), }; (promise, attached_near) } diff --git a/engine-sdk/src/prelude.rs b/engine-sdk/src/prelude.rs index 1da66d09b..64d633d38 100644 --- a/engine-sdk/src/prelude.rs +++ b/engine-sdk/src/prelude.rs @@ -1,5 +1,4 @@ -pub use aurora_engine_types::types::{Address, NearGas, PromiseResult, STORAGE_PRICE_PER_BYTE}; -pub use aurora_engine_types::{ - borsh::{BorshDeserialize, BorshSerialize}, - vec, Vec, H256, U256, -}; +pub use aurora_engine_types::types::{Address, NearGas, STORAGE_PRICE_PER_BYTE}; +#[cfg(feature = "contract")] +pub use aurora_engine_types::U256; +pub use aurora_engine_types::{vec, Vec, H256}; diff --git a/engine-standalone-storage/src/diff.rs b/engine-standalone-storage/src/diff.rs index c9a4c7111..09affb56b 100644 --- a/engine-standalone-storage/src/diff.rs +++ b/engine-standalone-storage/src/diff.rs @@ -83,3 +83,11 @@ impl Diff { Self::try_from_slice(bytes) } } + +impl<'diff> IntoIterator for &'diff Diff { + type Item = (&'diff Vec, &'diff DiffValue); + type IntoIter = btree_map::Iter<'diff, Vec, DiffValue>; + fn into_iter(self) -> Self::IntoIter { + self.0.iter() + } +} diff --git a/engine-standalone-storage/src/lib.rs b/engine-standalone-storage/src/lib.rs index c4dd5d302..9519831e6 100644 --- a/engine-standalone-storage/src/lib.rs +++ b/engine-standalone-storage/src/lib.rs @@ -255,7 +255,7 @@ impl Storage { let diff_bytes = diff.try_to_bytes().unwrap(); action(&mut batch, &storage_key, &diff_bytes); - for (key, value) in diff.iter() { + for (key, value) in diff { let storage_key = construct_engine_key(key, block_height, tx_included.position); let value_bytes = value.try_to_bytes().unwrap(); action(&mut batch, &storage_key, &value_bytes); diff --git a/engine-tests-connector/src/connector.rs b/engine-tests-connector/src/connector.rs index 7eb80cd9a..7411180f5 100644 --- a/engine-tests-connector/src/connector.rs +++ b/engine-tests-connector/src/connector.rs @@ -267,6 +267,64 @@ async fn test_ft_transfer_call_eth() -> anyhow::Result<()> { Ok(()) } +#[tokio::test] +async fn test_ft_transfer_call_without_fee() -> anyhow::Result<()> { + let contract = TestContract::new().await?; + contract.call_deposit_eth_to_near().await?; + + let user_acc = contract + .create_sub_account(DEPOSITED_RECIPIENT_NAME) + .await?; + assert_eq!( + contract.get_eth_on_near_balance(user_acc.id()).await?.0, + DEPOSITED_AMOUNT, + ); + assert_eq!( + contract + .get_eth_on_near_balance(contract.engine_contract.id()) + .await? + .0, + 0, + ); + + let transfer_amount: U128 = 50.into(); + let message = RECIPIENT_ETH_ADDRESS; + let memo: Option = None; + let res = user_acc + .call(contract.engine_contract.id(), "ft_transfer_call") + .args_json(json!({ + "receiver_id": contract.engine_contract.id(), + "amount": transfer_amount, + "memo": memo, + "msg": message, + })) + .gas(DEFAULT_GAS) + .deposit(ONE_YOCTO) + .transact() + .await?; + assert!(res.is_success()); + + assert_eq!( + contract.get_eth_on_near_balance(user_acc.id()).await?.0, + DEPOSITED_AMOUNT - transfer_amount.0, + ); + assert_eq!( + contract + .get_eth_on_near_balance(contract.engine_contract.id()) + .await? + .0, + transfer_amount.0, + ); + assert_eq!( + contract + .get_eth_balance(&validate_eth_address(RECIPIENT_ETH_ADDRESS),) + .await?, + transfer_amount.0, + ); + assert_eq!(contract.total_supply().await?, DEPOSITED_AMOUNT); + Ok(()) +} + #[tokio::test] async fn test_ft_transfer_call_without_message() -> anyhow::Result<()> { let contract = TestContract::new().await?; @@ -438,8 +496,7 @@ async fn test_deposit_with_0x_prefix() -> anyhow::Result<()> { let message = [CONTRACT_ACC, ":", "0x", &recipient_address_encoded].concat(); let fee: Fee = Fee::new(NEP141Wei::new(0)); let token_message_data = - TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee) - .unwrap(); + TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap(); let deposit_event = DepositedEvent { eth_custodian_address, diff --git a/engine-tests-connector/src/utils.rs b/engine-tests-connector/src/utils.rs index 6cecebf3d..a2c354573 100644 --- a/engine-tests-connector/src/utils.rs +++ b/engine-tests-connector/src/utils.rs @@ -132,6 +132,7 @@ impl TestContract { "metadata": metadata, "account_with_access_right": account_with_access_right, "owner_id": owner_id, + "min_proof_acceptance_height": 0, })) .gas(DEFAULT_GAS) .transact() diff --git a/engine-tests/Cargo.toml b/engine-tests/Cargo.toml index c0465bee0..e227fc41c 100644 --- a/engine-tests/Cargo.toml +++ b/engine-tests/Cargo.toml @@ -36,11 +36,10 @@ git2.workspace = true hex.workspace = true libsecp256k1.workspace = true near-crypto.workspace = true +near-parameters.workspace = true near-primitives-core.workspace = true near-primitives.workspace = true near-sdk.workspace = true -near-vm-errors.workspace = true -near-vm-logic.workspace = true near-vm-runner.workspace = true rand.workspace = true reqwest.workspace = true diff --git a/engine-tests/src/prelude.rs b/engine-tests/src/prelude.rs index e0db0162e..223b999ff 100644 --- a/engine-tests/src/prelude.rs +++ b/engine-tests/src/prelude.rs @@ -4,7 +4,6 @@ mod v0 { pub use aurora_engine::parameters; pub use aurora_engine_sdk as sdk; pub use aurora_engine_transactions as transactions; - pub use aurora_engine_types::parameters::*; pub use aurora_engine_types::storage; pub use aurora_engine_types::types::*; pub use aurora_engine_types::*; diff --git a/engine-tests/src/tests/contract_call.rs b/engine-tests/src/tests/contract_call.rs index eae6dce4f..854b96bb9 100644 --- a/engine-tests/src/tests/contract_call.rs +++ b/engine-tests/src/tests/contract_call.rs @@ -42,7 +42,7 @@ fn setup_test() -> (AuroraRunner, Signer, Address, Tester) { } #[test] -#[should_panic] +#[should_panic(expected = "ERR_ARG_PARSE")] fn test_deploy_erc20_token_with_invalid_account_id() { let mut runner = deploy_runner(); let invalid_nep141 = "_"; diff --git a/engine-tests/src/tests/erc20.rs b/engine-tests/src/tests/erc20.rs index ecd1bfeed..6a2fd1347 100644 --- a/engine-tests/src/tests/erc20.rs +++ b/engine-tests/src/tests/erc20.rs @@ -92,9 +92,7 @@ fn erc20_mint_out_of_gas() { .unwrap(); utils::validate_address_balance_and_nonce( &runner, - sdk::types::near_account_to_evm_address( - runner.context.predecessor_account_id.as_ref().as_bytes(), - ), + sdk::types::near_account_to_evm_address(runner.context.predecessor_account_id.as_bytes()), Wei::new_u64(GAS_LIMIT * GAS_PRICE), U256::zero(), ) diff --git a/engine-tests/src/tests/erc20_connector.rs b/engine-tests/src/tests/erc20_connector.rs index 67547f51a..e35ae8250 100644 --- a/engine-tests/src/tests/erc20_connector.rs +++ b/engine-tests/src/tests/erc20_connector.rs @@ -7,7 +7,7 @@ use aurora_engine_types::borsh::{BorshDeserialize, BorshSerialize}; use aurora_engine_types::parameters::engine::{SubmitResult, TransactionStatus}; use ethabi::Token; use libsecp256k1::SecretKey; -use near_vm_logic::VMOutcome; +use near_vm_runner::logic::VMOutcome; use serde_json::json; use sha3::Digest; @@ -1020,8 +1020,7 @@ pub mod workspace { let message = recipient_id.to_string(); let fee: Fee = Fee::new(NEP141Wei::new(0)); let token_message_data = - TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee) - .unwrap(); + TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap(); let deposit_event = DepositedEvent { eth_custodian_address, diff --git a/engine-tests/src/tests/modexp.rs b/engine-tests/src/tests/modexp.rs index 07c1bc4f8..80c738548 100644 --- a/engine-tests/src/tests/modexp.rs +++ b/engine-tests/src/tests/modexp.rs @@ -1,5 +1,5 @@ use aurora_engine::engine::EngineError; -use near_primitives_core::contract::ContractCode; +use near_vm_runner::ContractCode; use rand::{Rng, SeedableRng}; use super::sanity::initialize_transfer; @@ -71,12 +71,13 @@ fn bench_modexp() { "Aurora not least:\n{result:?}" ); + // TODO: Aurora not least anymore after switching to the nightly-2023-12-15. // Typical example with U256-sized inputs. let input = BenchInput::random(32); let result = context.bench(&input); assert_eq!( result.least(), - Implementation::Aurora, + Implementation::IBig, // FIXME: Should be Aurora. "Aurora not least:\n{result:?}" ); } diff --git a/engine-tests/src/tests/one_inch.rs b/engine-tests/src/tests/one_inch.rs index 04dba36a9..a6d2b01ab 100644 --- a/engine-tests/src/tests/one_inch.rs +++ b/engine-tests/src/tests/one_inch.rs @@ -4,7 +4,7 @@ use crate::utils::one_inch::liquidity_protocol; use crate::utils::{self, assert_gas_bound}; use aurora_engine_types::borsh::BorshDeserialize; use libsecp256k1::SecretKey; -use near_vm_logic::VMOutcome; +use near_vm_runner::logic::VMOutcome; use std::sync::Once; const INITIAL_BALANCE: Wei = Wei::new_u64(1_000_000); @@ -22,7 +22,7 @@ fn test_1inch_liquidity_protocol() { let (result, profile, deployer_address) = helper.create_mooniswap_deployer(); assert!(result.gas_used >= 5_100_000); // more than 5.1M EVM gas used - assert_gas_bound(profile.all_gas(), 10); // less than 10 NEAR Tgas used + assert_gas_bound(profile.all_gas(), 11); // less than 11 NEAR Tgas used let (result, profile, pool_factory) = helper.create_pool_factory(&deployer_address); assert!(result.gas_used >= 2_800_000); // more than 2.8M EVM gas used diff --git a/engine-tests/src/tests/repro.rs b/engine-tests/src/tests/repro.rs index 2615e8c44..6eff3ad92 100644 --- a/engine-tests/src/tests/repro.rs +++ b/engine-tests/src/tests/repro.rs @@ -26,7 +26,7 @@ fn repro_GdASJ3KESs() { block_timestamp: 1_645_717_564_644_206_730, input_path: "src/tests/res/input_GdASJ3KESs.hex", evm_gas_used: 706_713, - near_gas_used: 121, + near_gas_used: 116, }); } @@ -51,7 +51,7 @@ fn repro_8ru7VEA() { block_timestamp: 1_648_829_935_343_349_589, input_path: "src/tests/res/input_8ru7VEA.hex", evm_gas_used: 1_732_181, - near_gas_used: 219, + near_gas_used: 210, }); } @@ -71,7 +71,7 @@ fn repro_FRcorNv() { block_timestamp: 1_650_960_438_774_745_116, input_path: "src/tests/res/input_FRcorNv.hex", evm_gas_used: 1_239_721, - near_gas_used: 178, + near_gas_used: 170, }); } @@ -88,7 +88,7 @@ fn repro_5bEgfRQ() { block_timestamp: 1_651_073_772_931_594_646, input_path: "src/tests/res/input_5bEgfRQ.hex", evm_gas_used: 6_414_105, - near_gas_used: 649, + near_gas_used: 655, }); } @@ -106,7 +106,7 @@ fn repro_D98vwmi() { block_timestamp: 1_651_753_443_421_003_245, input_path: "src/tests/res/input_D98vwmi.hex", evm_gas_used: 1_035_348, - near_gas_used: 180, + near_gas_used: 172, }); } @@ -125,7 +125,7 @@ fn repro_Emufid2() { block_timestamp: 1_662_118_048_636_713_538, input_path: "src/tests/res/input_Emufid2.hex", evm_gas_used: 1_156_364, - near_gas_used: 282, + near_gas_used: 296, }); } diff --git a/engine-tests/src/tests/sanity.rs b/engine-tests/src/tests/sanity.rs index 462fb097d..5e38b8fa4 100644 --- a/engine-tests/src/tests/sanity.rs +++ b/engine-tests/src/tests/sanity.rs @@ -9,6 +9,7 @@ use aurora_engine_types::borsh::{BorshDeserialize, BorshSerialize}; use aurora_engine_types::parameters::connector::FungibleTokenMetadata; use aurora_engine_types::H160; use libsecp256k1::SecretKey; +use near_vm_runner::ContractCode; use rand::RngCore; use std::path::{Path, PathBuf}; @@ -304,7 +305,7 @@ fn test_deploy_largest_contract() { ); // Less than 12 NEAR Tgas - utils::assert_gas_bound(profile.all_gas(), 10); + utils::assert_gas_bound(profile.all_gas(), 11); } #[test] @@ -455,7 +456,7 @@ fn test_solidity_pure_bench() { base_path.join("target/wasm32-unknown-unknown/release/benchmark_contract.wasm"); utils::rust::compile(base_path); let contract_bytes = std::fs::read(output_path).unwrap(); - let code = near_primitives_core::contract::ContractCode::new(contract_bytes, None); + let code = ContractCode::new(contract_bytes, None); let mut context = runner.context.clone(); context.input = loop_limit.to_le_bytes().to_vec(); let outcome = near_vm_runner::run( @@ -466,7 +467,6 @@ fn test_solidity_pure_bench() { &runner.wasm_config, &runner.fees_config, &[], - runner.current_protocol_version, Some(&runner.cache), ) .unwrap(); @@ -907,9 +907,8 @@ fn test_transfer_charging_gas_success() { let expected_source_balance = INITIAL_BALANCE - TRANSFER_AMOUNT - spent_amount; let expected_dest_balance = TRANSFER_AMOUNT; let expected_relayer_balance = spent_amount; - let relayer_address = sdk::types::near_account_to_evm_address( - runner.context.predecessor_account_id.as_ref().as_bytes(), - ); + let relayer_address = + sdk::types::near_account_to_evm_address(runner.context.predecessor_account_id.as_bytes()); // validate post-state utils::validate_address_balance_and_nonce( @@ -969,9 +968,8 @@ fn test_eth_transfer_charging_gas_not_enough_balance() { ); // validate post-state - let relayer = sdk::types::near_account_to_evm_address( - runner.context.predecessor_account_id.as_ref().as_bytes(), - ); + let relayer = + sdk::types::near_account_to_evm_address(runner.context.predecessor_account_id.as_bytes()); utils::validate_address_balance_and_nonce( &runner, diff --git a/engine-tests/src/tests/silo.rs b/engine-tests/src/tests/silo.rs index 613ac99d9..8b0244ccd 100644 --- a/engine-tests/src/tests/silo.rs +++ b/engine-tests/src/tests/silo.rs @@ -258,9 +258,8 @@ fn test_relayer_balance_after_transfer() { .submit_with_signer(&mut source_account, transaction) .unwrap(); - let relayer = sdk::types::near_account_to_evm_address( - runner.context.predecessor_account_id.as_ref().as_bytes(), - ); + let relayer = + sdk::types::near_account_to_evm_address(runner.context.predecessor_account_id.as_bytes()); // validate post-state validate_address_balance_and_nonce( diff --git a/engine-tests/src/tests/standalone/sync.rs b/engine-tests/src/tests/standalone/sync.rs index 1a14a1633..767398151 100644 --- a/engine-tests/src/tests/standalone/sync.rs +++ b/engine-tests/src/tests/standalone/sync.rs @@ -191,7 +191,7 @@ fn test_consume_deploy_message() { }) .unwrap(); let mut deployed_address = Address::zero(); - for (key, value) in diff.iter() { + for (key, value) in &diff { match value.value() { Some(bytes) if bytes == code.as_slice() => { deployed_address = Address::try_from_slice(&key[2..22]).unwrap(); @@ -472,8 +472,7 @@ fn mock_proof(recipient_address: Address, deposit_amount: Wei) -> aurora_engine: let fee = Fee::new(NEP141Wei::new(0)); let message = ["aurora", ":", recipient_address.encode().as_str()].concat(); let token_message_data: TokenMessageData = - TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee) - .unwrap(); + TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap(); let deposit_event = DepositedEvent { eth_custodian_address, diff --git a/engine-tests/src/tests/standalone/tracing.rs b/engine-tests/src/tests/standalone/tracing.rs index bdcbcf72e..d9051cfc4 100644 --- a/engine-tests/src/tests/standalone/tracing.rs +++ b/engine-tests/src/tests/standalone/tracing.rs @@ -37,7 +37,7 @@ fn test_evm_tracing_with_storage() { // Move it over to the same address as it exists on mainnet let mut diff = engine_standalone_storage::Diff::default(); - for (key, value) in runner.get_current_state().iter() { + for (key, value) in runner.get_current_state() { if key.len() >= 22 && &key[2..22] == contract_address.as_bytes() { let mut new_key = key.clone(); new_key[2..22].copy_from_slice(weth_address.as_bytes()); diff --git a/engine-tests/src/tests/standard_precompiles.rs b/engine-tests/src/tests/standard_precompiles.rs index 0f965e6a3..069d21b9e 100644 --- a/engine-tests/src/tests/standard_precompiles.rs +++ b/engine-tests/src/tests/standard_precompiles.rs @@ -30,7 +30,7 @@ fn test_standard_precompiles() { #[test] fn profile_ecrecover() { let profile = precompile_execution_profile("test_ecrecover"); - utils::assert_gas_bound(profile.all_gas(), 6); + utils::assert_gas_bound(profile.all_gas(), 5); } #[test] @@ -60,25 +60,25 @@ fn profile_modexp() { #[test] fn profile_ecadd() { let profile = precompile_execution_profile("test_ecadd"); - utils::assert_gas_bound(profile.all_gas(), 6); + utils::assert_gas_bound(profile.all_gas(), 5); } #[test] fn profile_ecmul() { let profile = precompile_execution_profile("test_ecmul"); - utils::assert_gas_bound(profile.all_gas(), 7); + utils::assert_gas_bound(profile.all_gas(), 6); } #[test] fn profile_ecpair() { let profile = precompile_execution_profile("test_ecpair"); - utils::assert_gas_bound(profile.all_gas(), 102); + utils::assert_gas_bound(profile.all_gas(), 115); } #[test] fn profile_blake2f() { let profile = precompile_execution_profile("test_blake2f"); - utils::assert_gas_bound(profile.all_gas(), 6); + utils::assert_gas_bound(profile.all_gas(), 5); } fn initialize() -> (AuroraRunner, Signer, PrecompilesContract) { diff --git a/engine-tests/src/tests/uniswap.rs b/engine-tests/src/tests/uniswap.rs index ed97ae29f..ffae3ab1c 100644 --- a/engine-tests/src/tests/uniswap.rs +++ b/engine-tests/src/tests/uniswap.rs @@ -38,7 +38,7 @@ fn test_uniswap_input_multihop() { let (_amount_out, _evm_gas, profile) = context.exact_input(&tokens, INPUT_AMOUNT.into()); - assert_eq!(115, profile.all_gas() / 1_000_000_000_000); + assert_eq!(109, profile.all_gas() / 1_000_000_000_000); } #[test] @@ -49,7 +49,7 @@ fn test_uniswap_exact_output() { let (_result, profile) = context.add_equal_liquidity(LIQUIDITY_AMOUNT.into(), &token_a, &token_b); - utils::assert_gas_bound(profile.all_gas(), 32); + utils::assert_gas_bound(profile.all_gas(), 31); let wasm_fraction = 100 * profile.wasm_gas() / profile.all_gas(); assert!( (40..=50).contains(&wasm_fraction), @@ -58,11 +58,11 @@ fn test_uniswap_exact_output() { let (_amount_in, profile) = context.exact_output_single(&token_a, &token_b, OUTPUT_AMOUNT.into()); - utils::assert_gas_bound(profile.all_gas(), 17); + utils::assert_gas_bound(profile.all_gas(), 16); let wasm_fraction = 100 * profile.wasm_gas() / profile.all_gas(); assert!( - (45..=55).contains(&wasm_fraction), - "{wasm_fraction}% is not between 45% and 55%", + (40..=50).contains(&wasm_fraction), + "{wasm_fraction}% is not between 40% and 50%", ); } diff --git a/engine-tests/src/tests/xcc.rs b/engine-tests/src/tests/xcc.rs index 14db5aa69..dac671d2c 100644 --- a/engine-tests/src/tests/xcc.rs +++ b/engine-tests/src/tests/xcc.rs @@ -11,8 +11,8 @@ use aurora_engine_types::parameters::{ use aurora_engine_types::types::{Address, EthGas, NearGas, Wei, Yocto}; use aurora_engine_types::U256; use aurora_engine_workspace::types::NearToken; -use near_primitives::transaction::Action; -use near_primitives_core::contract::ContractCode; +use near_vm_runner::logic::mocks::mock_external::MockAction; +use near_vm_runner::ContractCode; use std::fs; use std::path::Path; @@ -217,18 +217,18 @@ fn test_xcc_schedule_gas() { #[test] fn test_xcc_exec_gas() { let mut router = deploy_router(); + router.ext.underlying.action_log.clear(); // we need to clear logs here to remove old entries. + + let create_promise_chain = |base_promise: &PromiseCreateArgs, callback_count| -> NearPromise { + (0..callback_count).fold( + NearPromise::Simple(SimpleNearPromise::Create(base_promise.clone())), + |result, _| NearPromise::Then { + base: Box::new(result), + callback: SimpleNearPromise::Create(base_promise.clone()), + }, + ) + }; - let create_promise_chain = - |base_promise: &PromiseCreateArgs, callback_count: usize| -> NearPromise { - let mut result = NearPromise::Simple(SimpleNearPromise::Create(base_promise.clone())); - for _ in 0..callback_count { - result = NearPromise::Then { - base: Box::new(result), - callback: SimpleNearPromise::Create(base_promise.clone()), - }; - } - result - }; let promise = PromiseCreateArgs { target_account_id: "some_account.near".parse().unwrap(), method: "some_method".into(), @@ -258,27 +258,28 @@ fn test_xcc_exec_gas() { router_exec_cost ); - assert_eq!( - outcome.action_receipts.len(), - usize::try_from(args.promise_count()).unwrap() - ); - for (target_account_id, receipt) in outcome.action_receipts { - assert_eq!( - target_account_id.as_str(), - promise.target_account_id.as_ref() - ); - assert_eq!(receipt.actions.len(), 1); - let action = &receipt.actions[0]; + for action in &router.ext.underlying.action_log { match action { - Action::FunctionCall(function_call) => { - assert_eq!(function_call.method_name, promise.method); - assert_eq!(function_call.args, promise.args); - assert_eq!(function_call.deposit, promise.attached_balance.as_u128()); - assert_eq!(function_call.gas, promise.attached_gas.as_u64()); + MockAction::FunctionCallWeight { + method_name, + args, + attached_deposit, + prepaid_gas, + .. + } => { + assert_eq!(method_name, promise.method.as_bytes()); + assert_eq!(args, &promise.args); + assert_eq!(attached_deposit, &promise.attached_balance.as_u128()); + assert_eq!(prepaid_gas, &promise.attached_gas.as_u64()); + } + MockAction::CreateReceipt { receiver_id, .. } => { + assert_eq!(receiver_id.as_bytes(), promise.target_account_id.as_bytes()); } other => panic!("Unexpected action {other:?}"), }; } + + router.ext.underlying.action_log.clear(); } } diff --git a/engine-tests/src/utils/mocked_external.rs b/engine-tests/src/utils/mocked_external.rs index d3fcd3560..f93348842 100644 --- a/engine-tests/src/utils/mocked_external.rs +++ b/engine-tests/src/utils/mocked_external.rs @@ -1,6 +1,9 @@ -use near_vm_errors::VMLogicError; -use near_vm_logic::mocks::mock_external::MockedExternal; -use near_vm_logic::StorageGetMode; +use near_crypto::PublicKey; +use near_primitives_core::hash::CryptoHash; +use near_primitives_core::types::GasWeight; +use near_vm_runner::logic::mocks::mock_external::MockedExternal; +use near_vm_runner::logic::types::{AccountId, Balance, Gas, ReceiptIndex}; +use near_vm_runner::logic::{StorageGetMode, TrieNodesCount, VMLogicError}; use std::cell::Cell; /// Derived from mainnet data reported here: `https://hackmd.io/@birchmd/r1HRjr0P9` @@ -47,7 +50,7 @@ impl MockedExternalWithTrie { } } -impl near_vm_logic::External for MockedExternalWithTrie { +impl near_vm_runner::logic::External for MockedExternalWithTrie { fn storage_set(&mut self, key: &[u8], value: &[u8]) -> Result<(), VMLogicError> { self.increment_new_trie_node_count(MAINNET_AVERAGE_TRIE_DEPTH); self.underlying.storage_set(key, value) @@ -57,7 +60,7 @@ impl near_vm_logic::External for MockedExternalWithTrie { &'a self, key: &[u8], mode: StorageGetMode, - ) -> Result>, VMLogicError> { + ) -> Result>, VMLogicError> { self.increment_new_trie_node_count(MAINNET_AVERAGE_TOUCHED_TRIE_PER_READ); self.increment_cached_trie_node_count(MAINNET_AVERAGE_READ_CACHED_TRIE_PER_READ); self.underlying.storage_get(key, mode) @@ -76,27 +79,134 @@ impl near_vm_logic::External for MockedExternalWithTrie { self.underlying.storage_has_key(key, mode) } - fn generate_data_id(&mut self) -> near_primitives::hash::CryptoHash { + fn generate_data_id(&mut self) -> CryptoHash { self.underlying.generate_data_id() } - fn get_trie_nodes_count(&self) -> near_primitives::types::TrieNodesCount { + fn get_trie_nodes_count(&self) -> TrieNodesCount { let db_reads = self.new_trie_node_count.get(); let mem_reads = self.cached_trie_node_count.get(); - near_primitives::types::TrieNodesCount { + + TrieNodesCount { db_reads, mem_reads, } } - fn validator_stake( - &self, - account_id: &near_primitives::types::AccountId, - ) -> Result, VMLogicError> { + fn validator_stake(&self, account_id: &AccountId) -> Result, VMLogicError> { self.underlying.validator_stake(account_id) } - fn validator_total_stake(&self) -> Result { + fn validator_total_stake(&self) -> Result { self.underlying.validator_total_stake() } + + fn create_receipt( + &mut self, + receipt_indices: Vec, + receiver_id: AccountId, + ) -> Result { + self.underlying.create_receipt(receipt_indices, receiver_id) + } + + fn append_action_create_account( + &mut self, + receipt_index: ReceiptIndex, + ) -> Result<(), VMLogicError> { + self.underlying.append_action_create_account(receipt_index) + } + + fn append_action_deploy_contract( + &mut self, + receipt_index: ReceiptIndex, + code: Vec, + ) -> Result<(), VMLogicError> { + self.underlying + .append_action_deploy_contract(receipt_index, code) + } + + fn append_action_function_call_weight( + &mut self, + receipt_index: ReceiptIndex, + method_name: Vec, + args: Vec, + attached_deposit: Balance, + prepaid_gas: Gas, + gas_weight: GasWeight, + ) -> Result<(), VMLogicError> { + self.underlying.append_action_function_call_weight( + receipt_index, + method_name, + args, + attached_deposit, + prepaid_gas, + gas_weight, + ) + } + + fn append_action_transfer( + &mut self, + receipt_index: ReceiptIndex, + amount: Balance, + ) -> Result<(), VMLogicError> { + self.underlying + .append_action_transfer(receipt_index, amount) + } + + fn append_action_stake( + &mut self, + receipt_index: ReceiptIndex, + stake: Balance, + public_key: PublicKey, + ) { + self.underlying + .append_action_stake(receipt_index, stake, public_key); + } + + fn append_action_add_key_with_full_access( + &mut self, + receipt_index: ReceiptIndex, + public_key: PublicKey, + nonce: u64, + ) { + self.underlying + .append_action_add_key_with_full_access(receipt_index, public_key, nonce); + } + + fn append_action_add_key_with_function_call( + &mut self, + receipt_index: ReceiptIndex, + public_key: PublicKey, + nonce: u64, + allowance: Option, + receiver_id: AccountId, + method_names: Vec>, + ) -> Result<(), VMLogicError> { + self.underlying.append_action_add_key_with_function_call( + receipt_index, + public_key, + nonce, + allowance, + receiver_id, + method_names, + ) + } + + fn append_action_delete_key(&mut self, receipt_index: ReceiptIndex, public_key: PublicKey) { + self.underlying + .append_action_delete_key(receipt_index, public_key); + } + + fn append_action_delete_account( + &mut self, + receipt_index: ReceiptIndex, + beneficiary_id: AccountId, + ) -> Result<(), VMLogicError> { + self.underlying + .append_action_delete_account(receipt_index, beneficiary_id) + } + + fn get_receipt_receiver(&self, receipt_index: ReceiptIndex) -> &AccountId { + self.underlying.get_receipt_receiver(receipt_index) + } } diff --git a/engine-tests/src/utils/mod.rs b/engine-tests/src/utils/mod.rs index a3361bfe5..a8fd9014b 100644 --- a/engine-tests/src/utils/mod.rs +++ b/engine-tests/src/utils/mod.rs @@ -13,17 +13,15 @@ use aurora_engine_types::parameters::silo::FixedGasArgs; use aurora_engine_types::types::{EthGas, PromiseResult}; use evm::ExitFatal; use libsecp256k1::{self, Message, PublicKey, SecretKey}; -use near_primitives::runtime::config_store::RuntimeConfigStore; +use near_parameters::vm::VMKind; +use near_parameters::{RuntimeConfigStore, RuntimeFeesConfig}; use near_primitives::version::PROTOCOL_VERSION; -use near_primitives_core::config::VMConfig; -use near_primitives_core::contract::ContractCode; -use near_primitives_core::profile::ProfileDataV3; -use near_primitives_core::runtime::fees::RuntimeFeesConfig; -use near_vm_errors::{FunctionCallError, HostError}; -use near_vm_logic::mocks::mock_external::MockedExternal; -use near_vm_logic::types::ReturnData; -use near_vm_logic::{VMContext, VMOutcome, ViewConfig}; -use near_vm_runner::MockCompiledContractCache; +use near_primitives_core::config::ViewConfig; +use near_vm_runner::logic::errors::FunctionCallError; +use near_vm_runner::logic::mocks::mock_external::MockedExternal; +use near_vm_runner::logic::types::ReturnData; +use near_vm_runner::logic::{Config, HostError, VMContext, VMOutcome}; +use near_vm_runner::{ContractCode, MockCompiledContractCache, ProfileDataV3}; use rlp::RlpStream; use std::borrow::Cow; @@ -88,7 +86,7 @@ pub struct AuroraRunner { pub cache: MockCompiledContractCache, pub ext: mocked_external::MockedExternalWithTrie, pub context: VMContext, - pub wasm_config: VMConfig, + pub wasm_config: Config, pub fees_config: RuntimeFeesConfig, pub current_protocol_version: u32, pub previous_logs: Vec, @@ -150,7 +148,6 @@ impl<'a> OneShotAuroraRunner<'a> { &self.base.wasm_config, &self.base.fees_config, &[], - self.base.current_protocol_version, Some(&self.base.cache), ) .unwrap(); @@ -212,10 +209,10 @@ impl AuroraRunner { .promise_results .iter() .map(|p| match p { - PromiseResult::Failed => near_vm_logic::types::PromiseResult::Failed, - PromiseResult::NotReady => near_vm_logic::types::PromiseResult::NotReady, + PromiseResult::Failed => near_vm_runner::logic::types::PromiseResult::Failed, + PromiseResult::NotReady => near_vm_runner::logic::types::PromiseResult::NotReady, PromiseResult::Successful(bytes) => { - near_vm_logic::types::PromiseResult::Successful(bytes.clone()) + near_vm_runner::logic::types::PromiseResult::Successful(bytes.clone()) } }) .collect(); @@ -227,7 +224,6 @@ impl AuroraRunner { &self.wasm_config, &self.fees_config, &vm_promise_results, - self.current_protocol_version, Some(&self.cache), ) .unwrap(); @@ -333,7 +329,7 @@ impl AuroraRunner { let aurora_balance_key = [ ft_key.as_slice(), - self.context.current_account_id.as_ref().as_bytes(), + self.context.current_account_id.as_bytes(), ] .concat(); let aurora_balance_value = { @@ -489,9 +485,11 @@ impl AuroraRunner { ) -> Result<(TransactionStatus, ExecutionProfile), EngineError> { let input = args.try_to_vec().unwrap(); let mut runner = self.one_shot(); + runner.context.view_config = Some(ViewConfig { max_gas_burnt: u64::MAX, }); + let (outcome, profile) = runner.profiled_call("view", "viewer", input)?; let status = TransactionStatus::try_from_slice(&outcome.return_data.as_value().unwrap()).unwrap(); @@ -580,7 +578,7 @@ impl AuroraRunner { panic!("The standalone state has fewer amount of keys: {fake_trie_len} vs {stand_alone_len}\nDiff: {diff:?}"); } - for (key, value) in standalone_state.iter() { + for (key, value) in standalone_state { let trie_value = self.ext.underlying.fake_trie.get(key).map(Vec::as_slice); let standalone_value = value.value(); assert_eq!( @@ -629,9 +627,16 @@ impl Default for AuroraRunner { fn default() -> Self { let evm_wasm_bytes = Self::get_engine_code(); // Fetch config (mainly costs) for the latest protocol version. - let runtime_config_store = RuntimeConfigStore::new(None); + let runtime_config_store = RuntimeConfigStore::test(); let runtime_config = runtime_config_store.get_config(PROTOCOL_VERSION); - let wasm_config = runtime_config.wasm_config.clone(); + let mut wasm_config = runtime_config.wasm_config.clone(); + + if cfg!(not(target_arch = "x86_64")) { + wasm_config.vm_kind = VMKind::Wasmtime; + } else { + wasm_config.vm_kind = VMKind::Wasmer2; + } + let origin_account_id: near_primitives::types::AccountId = DEFAULT_AURORA_ACCOUNT_ID.parse().unwrap(); @@ -656,8 +661,8 @@ impl Default for AuroraRunner { attached_deposit: 0, prepaid_gas: 10u64.pow(18), random_seed: vec![], - view_config: None, output_data_receivers: vec![], + view_config: None, }, wasm_config, fees_config: RuntimeFeesConfig::test(), diff --git a/engine-tests/src/utils/one_inch/mod.rs b/engine-tests/src/utils/one_inch/mod.rs index a35947a35..51768a9d3 100644 --- a/engine-tests/src/utils/one_inch/mod.rs +++ b/engine-tests/src/utils/one_inch/mod.rs @@ -68,6 +68,7 @@ pub fn download_and_compile_solidity_sources( while !*ready { ready = CV.wait(ready).unwrap(); } + drop(ready); sources_dir.join("artifacts/contracts") } diff --git a/engine-tests/src/utils/standalone/mocks/mod.rs b/engine-tests/src/utils/standalone/mocks/mod.rs index fd998fb39..1ee409089 100644 --- a/engine-tests/src/utils/standalone/mocks/mod.rs +++ b/engine-tests/src/utils/standalone/mocks/mod.rs @@ -3,8 +3,6 @@ use aurora_engine::engine; use aurora_engine::engine::Engine; #[cfg(not(feature = "ext-connector"))] use aurora_engine::parameters::InitCallArgs; -#[cfg(not(feature = "ext-connector"))] -use aurora_engine_modexp::ModExpAlgorithm; use aurora_engine_sdk::env::{Env, DEFAULT_PREPAID_GAS}; use aurora_engine_sdk::io::IO; #[cfg(not(feature = "ext-connector"))] @@ -114,19 +112,13 @@ pub fn mint_evm_account( }; #[cfg(not(feature = "ext-connector"))] - deposit(io, &engine, &env.current_account_id(), address, balance); + deposit(io, &env.current_account_id(), address, balance); engine.apply(std::iter::once(state_change), std::iter::empty(), false); } #[cfg(not(feature = "ext-connector"))] -fn deposit( - mut io: I, - engine: &Engine, - aurora_account_id: &AccountId, - address: Address, - balance: Wei, -) { +fn deposit(mut io: I, aurora_account_id: &AccountId, address: Address, balance: Wei) { const DEFAULT_GAS: u64 = 300_000_000_000_000; let deposit_args = aurora_engine_types::parameters::connector::FinishDepositCallArgs { new_owner_id: aurora_account_id.clone(), @@ -165,7 +157,7 @@ fn deposit( hex::encode(address.as_bytes()) ), }; - connector.ft_on_transfer(engine, &transfer_args).unwrap(); + connector.ft_on_transfer(&transfer_args).unwrap(); } #[cfg(not(feature = "ext-connector"))] diff --git a/engine-tests/src/utils/standalone/mod.rs b/engine-tests/src/utils/standalone/mod.rs index d22592836..5a07ca70a 100644 --- a/engine-tests/src/utils/standalone/mod.rs +++ b/engine-tests/src/utils/standalone/mod.rs @@ -196,7 +196,7 @@ impl StandaloneRunner { pub fn submit_raw( &mut self, method_name: &str, - ctx: &near_vm_logic::VMContext, + ctx: &near_vm_runner::logic::VMContext, promise_results: &[PromiseResult], block_random_value: Option, ) -> Result { @@ -204,9 +204,9 @@ impl StandaloneRunner { env.block_height = ctx.block_height; env.attached_deposit = ctx.attached_deposit; env.block_timestamp = env::Timestamp::new(ctx.block_timestamp); - env.predecessor_account_id = ctx.predecessor_account_id.as_ref().parse().unwrap(); - env.current_account_id = ctx.current_account_id.as_ref().parse().unwrap(); - env.signer_account_id = ctx.signer_account_id.as_ref().parse().unwrap(); + env.predecessor_account_id = ctx.predecessor_account_id.as_str().parse().unwrap(); + env.current_account_id = ctx.current_account_id.as_str().parse().unwrap(); + env.signer_account_id = ctx.signer_account_id.as_str().parse().unwrap(); env.prepaid_gas = NearGas::new(ctx.prepaid_gas); if let Some(value) = block_random_value { env.random_seed = value; diff --git a/engine-tests/src/utils/workspace.rs b/engine-tests/src/utils/workspace.rs index 2476b21d2..105178717 100644 --- a/engine-tests/src/utils/workspace.rs +++ b/engine-tests/src/utils/workspace.rs @@ -71,7 +71,8 @@ async fn init_eth_connector(aurora: &EngineContract) -> anyhow::Result<()> { "eth_custodian_address": "096DE9C2B8A5B8c22cEe3289B101f6960d68E51E", "metadata": metadata, "account_with_access_right": aurora.id(), - "owner_id": aurora.id() + "owner_id": aurora.id(), + "min_proof_acceptance_height": 0 }); let result = contract diff --git a/engine-types/src/parameters/engine.rs b/engine-types/src/parameters/engine.rs index cb9ad34fd..fecc51a2f 100644 --- a/engine-types/src/parameters/engine.rs +++ b/engine-types/src/parameters/engine.rs @@ -501,6 +501,6 @@ mod tests { "upgrade_delay_blocks": 19 }); let arguments = NewCallArgs::deserialize(&serde_json::to_vec(&outdated).unwrap()); - assert!(matches!(arguments, Err(_))); + assert!(arguments.is_err()); } } diff --git a/engine-types/src/parameters/promise.rs b/engine-types/src/parameters/promise.rs index 1ec0c2c20..7cf35c0c5 100644 --- a/engine-types/src/parameters/promise.rs +++ b/engine-types/src/parameters/promise.rs @@ -31,7 +31,10 @@ impl PromiseArgs { pub fn total_gas(&self) -> NearGas { match self { Self::Create(call) => call.attached_gas, - Self::Callback(cb) => cb.base.attached_gas + cb.callback.attached_gas, + Self::Callback(cb) => cb + .base + .attached_gas + .saturating_add(cb.callback.attached_gas), Self::Recursive(p) => p.total_gas(), } } @@ -40,7 +43,10 @@ impl PromiseArgs { pub fn total_near(&self) -> Yocto { match self { Self::Create(call) => call.attached_balance, - Self::Callback(cb) => cb.base.attached_balance + cb.callback.attached_balance, + Self::Callback(cb) => cb + .base + .attached_balance + .saturating_add(cb.callback.attached_balance), Self::Recursive(p) => p.total_near(), } } @@ -68,7 +74,7 @@ impl SimpleNearPromise { None } }) - .sum(); + .fold(0, u64::saturating_add); NearGas::new(total) } } @@ -89,7 +95,7 @@ impl SimpleNearPromise { PromiseAction::Transfer { amount } => Some(amount.as_u128()), _ => None, }) - .sum(); + .fold(0, u128::saturating_add); Yocto::new(total) } } @@ -122,9 +128,12 @@ impl NearPromise { pub fn total_gas(&self) -> NearGas { match self { Self::Simple(x) => x.total_gas(), - Self::Then { base, callback } => base.total_gas() + callback.total_gas(), + Self::Then { base, callback } => base.total_gas().saturating_add(callback.total_gas()), Self::And(promises) => { - let total = promises.iter().map(|p| p.total_gas().as_u64()).sum(); + let total = promises + .iter() + .map(|p| p.total_gas().as_u64()) + .fold(0, u64::saturating_add); NearGas::new(total) } } @@ -134,9 +143,14 @@ impl NearPromise { pub fn total_near(&self) -> Yocto { match self { Self::Simple(x) => x.total_near(), - Self::Then { base, callback } => base.total_near() + callback.total_near(), + Self::Then { base, callback } => { + base.total_near().saturating_add(callback.total_near()) + } Self::And(promises) => { - let total = promises.iter().map(|p| p.total_near().as_u128()).sum(); + let total = promises + .iter() + .map(|p| p.total_near().as_u128()) + .fold(0, u128::saturating_add); Yocto::new(total) } } diff --git a/engine-types/src/types/balance.rs b/engine-types/src/types/balance.rs index d5b217f63..c4c4e6cb1 100644 --- a/engine-types/src/types/balance.rs +++ b/engine-types/src/types/balance.rs @@ -91,6 +91,11 @@ impl Yocto { pub const fn as_u128(self) -> u128 { self.0 } + + #[must_use] + pub const fn saturating_add(self, rhs: Self) -> Self { + Self(self.0.saturating_add(rhs.0)) + } } impl Serialize for Yocto { diff --git a/engine-types/src/types/gas.rs b/engine-types/src/types/gas.rs index 6a53c1fe9..d36dd7e70 100644 --- a/engine-types/src/types/gas.rs +++ b/engine-types/src/types/gas.rs @@ -49,6 +49,11 @@ impl NearGas { pub const fn as_u64(self) -> u64 { self.0 } + + #[must_use] + pub const fn saturating_add(self, rhs: Self) -> Self { + Self(self.0.saturating_add(rhs.0)) + } } #[derive( diff --git a/engine/Cargo.toml b/engine/Cargo.toml index 275a9fda6..b05740fa9 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aurora-engine" -version = "3.5.0" +version = "3.6.0" authors.workspace = true edition.workspace = true homepage.workspace = true diff --git a/engine/src/contract_methods/connector/deposit_event.rs b/engine/src/contract_methods/connector/deposit_event.rs index 324504657..2a77f00f3 100644 --- a/engine/src/contract_methods/connector/deposit_event.rs +++ b/engine/src/contract_methods/connector/deposit_event.rs @@ -18,9 +18,16 @@ pub type EventParams = Vec; #[derive(BorshSerialize, BorshDeserialize)] #[cfg_attr(not(target_arch = "wasm32"), derive(Debug, PartialEq, Eq))] pub struct FtTransferMessageData { - pub relayer: AccountId, pub recipient: Address, - pub fee: Fee, + #[deprecated] + pub fee: Option, +} + +#[derive(BorshSerialize, BorshDeserialize)] +#[cfg_attr(not(target_arch = "wasm32"), derive(Debug, PartialEq, Eq))] +pub struct FtTransferFee { + pub relayer: AccountId, + pub amount: Fee, } impl FtTransferMessageData { @@ -29,6 +36,27 @@ impl FtTransferMessageData { pub fn parse_on_transfer_message( message: &str, ) -> Result { + if message.len() == 40 { + // Parse message to determine recipient + let recipient = { + // Message format: + // Recipient of the transaction - 40 characters (Address in hex) + let mut address_bytes = [0; 20]; + hex::decode_to_slice(message, &mut address_bytes) + .map_err(|_| errors::ParseOnTransferMessageError::InvalidHexData)?; + Address::from_array(address_bytes) + }; + + #[allow(deprecated)] + return Ok(Self { + recipient, + fee: None, + }); + } + + // This logic is for backward compatibility to parse the message of the deprecated format. + // "{relayer_id}:0000000000000000000000000000000000000000000000000000000000000000{hex_address}" + // Split message by separator let (account, msg) = message .split_once(':') @@ -57,36 +85,43 @@ impl FtTransferMessageData { let fee_u128: u128 = U256::from_little_endian(&data[..32]) .try_into() .map_err(|_| errors::ParseOnTransferMessageError::OverflowNumber)?; - let fee: Fee = fee_u128.into(); + let fee_amount: Fee = fee_u128.into(); // Get recipient Eth address from message slice let recipient = Address::try_from_slice(&data[32..]).unwrap(); + #[allow(deprecated)] Ok(Self { - relayer: account_id, recipient, - fee, + fee: Some(FtTransferFee { + relayer: account_id, + amount: fee_amount, + }), }) } /// Encode to String with specific rules #[must_use] pub fn encode(&self) -> String { - // The first data section should contain fee data. - // Pay attention, that for compatibility reasons we used U256 type. - // It means 32 bytes for fee data and 20 bytes for address. - let mut data = [0; 52]; - U256::from(self.fee.as_u128()).to_little_endian(&mut data[..32]); - // Second data section should contain Eth address. - data[32..].copy_from_slice(self.recipient.as_bytes()); - // Add `:` separator between relayer_id and the data encoded in hex. - format!("{}:{}", self.relayer, hex::encode(data)) + #[allow(deprecated)] + self.fee.as_ref().map_or_else( + || hex::encode(self.recipient.as_bytes()), + |fee| { + // The first data section should contain fee data. + // Pay attention, that for compatibility reasons we used U256 type. + // It means 32 bytes for fee data and 20 bytes for address. + let mut data = [0; 52]; + U256::from(fee.amount.as_u128()).to_little_endian(&mut data[..32]); + // Second data section should contain Eth address. + data[32..].copy_from_slice(self.recipient.as_bytes()); + // Add `:` separator between relayer_id and the data encoded in hex. + format!("{}:{}", fee.relayer, hex::encode(data)) + }, + ) } /// Prepare message for `ft_transfer_call` -> `ft_on_transfer` pub fn prepare_message_for_on_transfer( - relayer_account_id: &AccountId, - fee: Fee, recipient: String, ) -> Result { let address = if recipient.len() == 42 { @@ -103,10 +138,10 @@ impl FtTransferMessageData { let recipient_address = Address::decode(&address) .map_err(errors::ParseEventMessageError::EthAddressValidationError)?; + #[allow(deprecated)] Ok(Self { - relayer: relayer_account_id.clone(), recipient: recipient_address, - fee, + fee: None, }) } } @@ -135,7 +170,6 @@ impl TokenMessageData { /// parsing for `ft_on_transfer` message parsing with correct and validated data. pub fn parse_event_message_and_prepare_token_message_data( message: &str, - fee: Fee, ) -> Result { let data: Vec<_> = message.split(':').collect(); // Data array can contain 1 or 2 elements @@ -150,11 +184,7 @@ impl TokenMessageData { Ok(Self::Near(account_id)) } else { let raw_message = data[1].into(); - let message = FtTransferMessageData::prepare_message_for_on_transfer( - &account_id, - fee, - raw_message, - )?; + let message = FtTransferMessageData::prepare_message_for_on_transfer(raw_message)?; Ok(Self::Eth { receiver_id: account_id, @@ -287,7 +317,6 @@ impl DepositedEvent { let token_message_data = TokenMessageData::parse_event_message_and_prepare_token_message_data( &event_message_data, - fee, )?; Ok(Self { @@ -318,6 +347,16 @@ mod tests { assert_eq!(expect_message, actual_message); } + #[test] + fn test_decoded_and_then_encoded_message_without_fee_does_not_change() { + let expect_message = "000000000000000000000000000000000000dead"; + let message_data = + FtTransferMessageData::parse_on_transfer_message(expect_message).unwrap(); + let actual_message = message_data.encode(); + + assert_eq!(expect_message, actual_message); + } + #[test] fn test_parsing_message_with_incorrect_amount_of_parts() { let message = "foo"; @@ -348,6 +387,16 @@ mod tests { assert_eq!(expected_error_message, actual_error_message); } + #[test] + fn test_parsing_message_without_fee_with_invalid_hex_data() { + let message = "g00000000000000000000000000000000000dead"; + let error = FtTransferMessageData::parse_on_transfer_message(message).unwrap_err(); + let expected_error_message = errors::ERR_INVALID_ON_TRANSFER_MESSAGE_HEX; + let actual_error_message = error.as_ref(); + + assert_eq!(expected_error_message, actual_error_message); + } + #[test] fn test_parsing_message_with_invalid_length_of_hex_data() { let message = "foo:dead"; @@ -371,13 +420,11 @@ mod tests { #[test] fn test_eth_token_message_data_decodes_recipient_correctly() { - let fee = Fee::new(NEP141Wei::new(0)); let address = Address::zero(); let message = format!("aurora:{}", address.encode()); let token_message_data = - TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee) - .unwrap(); + TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap(); let actual_recipient = token_message_data.recipient().to_string(); let expected_recipient = "aurora"; @@ -386,13 +433,11 @@ mod tests { #[test] fn test_eth_token_message_data_decodes_recipient_correctly_with_prefix() { - let fee = Fee::new(NEP141Wei::new(0)); let address = Address::zero(); let message = format!("aurora:0x{}", address.encode()); let token_message_data = - TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee) - .unwrap(); + TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap(); let actual_recipient = token_message_data.recipient().to_string(); let expected_recipient = "aurora"; @@ -401,12 +446,10 @@ mod tests { #[test] fn test_near_token_message_data_decodes_recipient_correctly() { - let fee = Fee::new(NEP141Wei::new(0)); let message = "aurora"; let token_message_data = - TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee) - .unwrap(); + TokenMessageData::parse_event_message_and_prepare_token_message_data(message).unwrap(); let actual_recipient = token_message_data.recipient().to_string(); let expected_recipient = "aurora"; @@ -415,11 +458,10 @@ mod tests { #[test] fn test_token_message_data_fails_with_too_many_parts() { - let fee = Fee::new(NEP141Wei::new(0)); let message = "aurora:foo:bar"; let parse_error = - TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee) + TokenMessageData::parse_event_message_and_prepare_token_message_data(message) .unwrap_err(); let actual_parse_error = parse_error.as_ref(); let expected_parse_error = errors::ERR_INVALID_EVENT_MESSAGE_FORMAT; @@ -429,11 +471,10 @@ mod tests { #[test] fn test_token_message_data_fails_with_invalid_account() { - let fee = Fee::new(NEP141Wei::new(0)); let message = "INVALID"; let parse_error = - TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee) + TokenMessageData::parse_event_message_and_prepare_token_message_data(message) .unwrap_err(); let actual_parse_error = parse_error.as_ref(); let expected_parse_error = errors::ERR_INVALID_ACCOUNT_ID; @@ -443,11 +484,10 @@ mod tests { #[test] fn test_eth_token_message_data_fails_with_invalid_address_length() { - let fee = Fee::new(NEP141Wei::new(0)); let message = "aurora:0xINVALID"; let parse_error = - TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee) + TokenMessageData::parse_event_message_and_prepare_token_message_data(message) .unwrap_err(); let actual_parse_error = std::str::from_utf8(parse_error.as_ref()).unwrap(); let expected_parse_error = AddressError::IncorrectLength.to_string(); @@ -457,11 +497,10 @@ mod tests { #[test] fn test_eth_token_message_data_fails_with_invalid_address() { - let fee = Fee::new(NEP141Wei::new(0)); let message = "aurora:0xINVALID_ADDRESS_WITH_CORRECT_LENGTH_HERE"; let parse_error = - TokenMessageData::parse_event_message_and_prepare_token_message_data(message, fee) + TokenMessageData::parse_event_message_and_prepare_token_message_data(message) .unwrap_err(); let actual_parse_error = std::str::from_utf8(parse_error.as_ref()).unwrap(); let expected_parse_error = AddressError::FailedDecodeHex.to_string(); @@ -477,8 +516,7 @@ mod tests { let fee = Fee::new(NEP141Wei::new(0)); let message = ["aurora", ":", recipient_address.encode().as_str()].concat(); let token_message_data: TokenMessageData = - TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee) - .unwrap(); + TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap(); let expected_deposited_event = DepositedEvent { eth_custodian_address, diff --git a/engine/src/contract_methods/connector/external.rs b/engine/src/contract_methods/connector/external.rs index 132f665b6..86a8b58d5 100644 --- a/engine/src/contract_methods/connector/external.rs +++ b/engine/src/contract_methods/connector/external.rs @@ -12,7 +12,6 @@ use crate::prelude::{ sdk, AccountId, Address, EthConnectorStorageId, NearGas, ToString, Vec, Yocto, }; use crate::state; -use aurora_engine_modexp::ModExpAlgorithm; use aurora_engine_sdk::env::{Env, DEFAULT_PREPAID_GAS}; use aurora_engine_sdk::io::{StorageIntermediate, IO}; use aurora_engine_sdk::promise::PromiseHandler; @@ -25,7 +24,6 @@ use aurora_engine_types::parameters::connector::{ use aurora_engine_types::parameters::engine::errors::ParseArgsError; use aurora_engine_types::parameters::engine::SubmitResult; use aurora_engine_types::parameters::{PromiseWithCallbackArgs, WithdrawCallArgs}; -use aurora_engine_types::types::ZERO_WEI; use function_name::named; /// NEAR Gas for calling `finish_deposit` promise. Used in the `deposit` logic. @@ -166,7 +164,7 @@ pub fn ft_on_transfer( let mut eth_connector = EthConnectorContract::init(io)?; let output = if predecessor_account_id == eth_connector.get_eth_connector_contract_account() { - eth_connector.ft_on_transfer(&engine, &args)?; + eth_connector.ft_on_transfer(&args)?; None } else { let result = engine.receive_erc20_tokens( @@ -415,9 +413,8 @@ impl EthConnectorContract { } /// `ft_on_transfer` callback function. - pub fn ft_on_transfer( + pub fn ft_on_transfer( &mut self, - engine: &Engine, args: &NEP141FtOnTransferArgs, ) -> Result<(), errors::FtTransferCallError> { sdk::log!("Call ft_on_transfer"); @@ -425,19 +422,8 @@ impl EthConnectorContract { let message_data = FtTransferMessageData::parse_on_transfer_message(&args.msg) .map_err(errors::FtTransferCallError::MessageParseFailed)?; let amount = Wei::new_u128(args.amount.as_u128()); - // Special case when predecessor_account_id is current_account_id - let fee = Wei::from(message_data.fee); - // Mint fee to relayer - let relayer = engine.get_relayer(message_data.relayer.as_bytes()); - - let mint_amount = if relayer.is_some() && fee > ZERO_WEI { - self.mint_eth_on_aurora(relayer.unwrap(), fee)?; - amount - fee - } else { - amount - }; - - self.mint_eth_on_aurora(message_data.recipient, mint_amount)?; + + self.mint_eth_on_aurora(message_data.recipient, amount)?; self.io.return_output(b"\"0\""); Ok(()) diff --git a/engine/src/contract_methods/connector/internal.rs b/engine/src/contract_methods/connector/internal.rs index c9431df8e..36d9ba93e 100644 --- a/engine/src/contract_methods/connector/internal.rs +++ b/engine/src/contract_methods/connector/internal.rs @@ -14,7 +14,7 @@ use crate::engine::Engine; use crate::hashchain::with_hashchain; use crate::prelude::{format, sdk, ToString, Vec}; use crate::state; -use aurora_engine_modexp::{AuroraModExp, ModExpAlgorithm}; +use aurora_engine_modexp::AuroraModExp; use aurora_engine_sdk::io::StorageIntermediate; use aurora_engine_sdk::promise::PromiseHandler; use aurora_engine_sdk::{env::Env, io::IO}; @@ -227,7 +227,7 @@ pub fn ft_on_transfer( .map_err(Into::::into)?; let output = if predecessor_account_id == current_account_id { - EthConnectorContract::init(io)?.ft_on_transfer(&engine, &args)?; + EthConnectorContract::init(io)?.ft_on_transfer(&args)?; None } else { let result = engine.receive_erc20_tokens( @@ -904,10 +904,6 @@ impl EthConnectorContract { if args.receiver_id == current_account_id { let message_data = FtTransferMessageData::parse_on_transfer_message(&args.msg) .map_err(errors::FtTransferCallError::MessageParseFailed)?; - // Check is transfer amount > fee - if message_data.fee.as_u128() >= args.amount.as_u128() { - return Err(errors::FtTransferCallError::InsufficientAmountForFee); - } // Additional check for overflowing before `ft_on_transfer` calling. // But skip checking for overflowing for the relayer. @@ -1009,9 +1005,8 @@ impl EthConnectorContract { } /// `ft_on_transfer` callback function. - pub fn ft_on_transfer( + pub fn ft_on_transfer( &mut self, - engine: &Engine, args: &NEP141FtOnTransferArgs, ) -> Result<(), errors::FtTransferCallError> { sdk::log!("Call ft_on_transfer"); @@ -1019,22 +1014,6 @@ impl EthConnectorContract { let message_data = FtTransferMessageData::parse_on_transfer_message(&args.msg) .map_err(errors::FtTransferCallError::MessageParseFailed)?; let amount = Wei::new_u128(args.amount.as_u128()); - // Special case when predecessor_account_id is current_account_id - let fee = Wei::from(message_data.fee); - // Mint fee to relayer - let relayer = engine.get_relayer(message_data.relayer.as_bytes()); - let (amount, relayer_fee) = relayer - .filter(|_| fee > aurora_engine_types::types::ZERO_WEI) - .map_or(Ok((amount, None)), |address| { - amount.checked_sub(fee).map_or( - Err(errors::FtTransferCallError::InsufficientAmountForFee), - |amount| Ok((amount, Some((address, fee)))), - ) - })?; - - if let Some((address, fee)) = relayer_fee { - self.mint_eth_on_aurora(address, fee)?; - } self.mint_eth_on_aurora(message_data.recipient, amount)?; self.save_ft_contract(); diff --git a/engine/src/contract_methods/connector/mod.rs b/engine/src/contract_methods/connector/mod.rs index c8ae381cc..c5cd3804a 100644 --- a/engine/src/contract_methods/connector/mod.rs +++ b/engine/src/contract_methods/connector/mod.rs @@ -609,8 +609,7 @@ mod tests { let fee = Fee::new(NEP141Wei::new(0)); let message = ["aurora", ":", recipient_address.encode().as_str()].concat(); let token_message_data: TokenMessageData = - TokenMessageData::parse_event_message_and_prepare_token_message_data(&message, fee) - .unwrap(); + TokenMessageData::parse_event_message_and_prepare_token_message_data(&message).unwrap(); let deposit_event = DepositedEvent { eth_custodian_address, diff --git a/engine/src/lib.rs b/engine/src/lib.rs index f85c94fca..180f5e69a 100644 --- a/engine/src/lib.rs +++ b/engine/src/lib.rs @@ -96,10 +96,7 @@ mod contract { const CODE_STAGE_KEY: &[u8; 10] = b"CODE_STAGE"; // TODO: rust-2023-08-24 #[allow(clippy::empty_line_after_doc_comments)] - /// /// ADMINISTRATIVE METHODS - /// - /// Sets the configuration for the Engine. /// Should be called on deployment. #[no_mangle] @@ -283,10 +280,7 @@ mod contract { } // TODO: rust-2023-08-24 #[allow(clippy::empty_line_after_doc_comments)] - /// /// MUTATIVE METHODS - /// - /// Deploy code into the EVM. #[no_mangle] pub extern "C" fn deploy_code() { @@ -1034,10 +1028,7 @@ mod contract { } // TODO: rust-2023-08-24#[allow(clippy::empty_line_after_doc_comments)] - /// /// Utility methods. - /// - fn internal_get_upgrade_index() -> u64 { let io = Runtime; match io.read_u64(&bytes_to_key(KeyPrefix::Config, CODE_STAGE_KEY)) { diff --git a/engine/src/pausables.rs b/engine/src/pausables.rs index 9b8e4b257..b46e0021b 100644 --- a/engine/src/pausables.rs +++ b/engine/src/pausables.rs @@ -230,7 +230,7 @@ mod tests { } #[test] - #[should_panic] + #[should_panic(expected = "PrecompileFlags value is corrupted")] fn test_no_precompile_is_paused_if_storage_contains_too_few_bytes() { let key = EnginePrecompilesPauser::::storage_key(); let storage = RefCell::new(Storage::default()); diff --git a/engine/src/prelude.rs b/engine/src/prelude.rs index e5684a44c..9dc6f3795 100644 --- a/engine/src/prelude.rs +++ b/engine/src/prelude.rs @@ -1,7 +1,6 @@ mod v0 { pub use aurora_engine_precompiles as precompiles; pub use aurora_engine_sdk as sdk; - pub use aurora_engine_sdk::types::*; pub use aurora_engine_transactions as transactions; pub use aurora_engine_types::account_id::*; pub use aurora_engine_types::borsh::{BorshDeserialize, BorshSerialize}; diff --git a/etc/eth-contracts/yarn.lock b/etc/eth-contracts/yarn.lock index 7e4380121..2930176a5 100644 --- a/etc/eth-contracts/yarn.lock +++ b/etc/eth-contracts/yarn.lock @@ -5482,9 +5482,9 @@ flow-stoplight@^1.0.0: integrity sha1-SiksW8/4s5+mzAyxqFPYbyfu/3s= follow-redirects@^1.12.1: - version "1.15.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== + version "1.15.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" + integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== for-each@^0.3.3, for-each@~0.3.3: version "0.3.3" diff --git a/etc/tests/fibonacci/Cargo.toml b/etc/tests/fibonacci/Cargo.toml index f8b8bcbc0..571282865 100644 --- a/etc/tests/fibonacci/Cargo.toml +++ b/etc/tests/fibonacci/Cargo.toml @@ -17,3 +17,6 @@ panic = "abort" [dependencies] near-sdk = "4.1" serde = "1" + +[patch.crates-io] +parity-secp256k1 = { git = 'https://github.com/paritytech/rust-secp256k1', rev = "d05fd8e" } diff --git a/etc/tests/ft-receiver/Cargo.toml b/etc/tests/ft-receiver/Cargo.toml index ff30589ab..6c246ae24 100644 --- a/etc/tests/ft-receiver/Cargo.toml +++ b/etc/tests/ft-receiver/Cargo.toml @@ -10,3 +10,6 @@ crate-type = ["cdylib", "rlib"] [dependencies] near-sdk = "4.1" near-contract-standards = "4.1" + +[patch.crates-io] +parity-secp256k1 = { git = 'https://github.com/paritytech/rust-secp256k1', rev = "d05fd8e" } diff --git a/etc/tests/modexp-bench/Cargo.toml b/etc/tests/modexp-bench/Cargo.toml index d37a60ae1..aa664c9f3 100644 --- a/etc/tests/modexp-bench/Cargo.toml +++ b/etc/tests/modexp-bench/Cargo.toml @@ -18,3 +18,6 @@ panic = "abort" aurora-engine-modexp = { path = "../../../engine-modexp", default-features = false, features = ["bench", "std"] } hex = { version = "0.4", default-features = false, features = ["alloc"] } near-sdk = "4.1" + +[patch.crates-io] +parity-secp256k1 = { git = 'https://github.com/paritytech/rust-secp256k1', rev = "d05fd8e" } diff --git a/etc/xcc-router/Cargo.lock b/etc/xcc-router/Cargo.lock index c9d30e2b7..d1305679b 100644 --- a/etc/xcc-router/Cargo.lock +++ b/etc/xcc-router/Cargo.lock @@ -963,8 +963,7 @@ dependencies = [ [[package]] name = "parity-secp256k1" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fca4f82fccae37e8bbdaeb949a4a218a1bbc485d11598f193d2a908042e5fc1" +source = "git+https://github.com/paritytech/rust-secp256k1?rev=d05fd8e#d05fd8e152f8d110b587906e3d854196b086e42a" dependencies = [ "arrayvec 0.5.2", "cc", diff --git a/etc/xcc-router/Cargo.toml b/etc/xcc-router/Cargo.toml index c9fe89312..1a514a25f 100644 --- a/etc/xcc-router/Cargo.toml +++ b/etc/xcc-router/Cargo.toml @@ -18,6 +18,9 @@ panic = "abort" aurora-engine-types = { path = "../../engine-types", default-features = false, features = ["borsh-compat"] } near-sdk = "4.1" +[patch.crates-io] +parity-secp256k1 = { git = 'https://github.com/paritytech/rust-secp256k1', rev = "d05fd8e" } + [features] default = [] all-promise-actions = [] diff --git a/rust-toolchain b/rust-toolchain index 23462d93c..3d82f8d97 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2023-03-13" +channel = "nightly-2023-12-15" targets = ["wasm32-unknown-unknown"]