From d4e2a2203e9c67d0b34b10a7ffc4d05f515c93e3 Mon Sep 17 00:00:00 2001 From: Evgeny Ukhanov Date: Mon, 5 Aug 2024 20:05:50 +0200 Subject: [PATCH 1/3] Bump near to v2.0.0 --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8569c73..7008ba2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -595,7 +595,7 @@ dependencies = [ [[package]] name = "aurora-refiner" -version = "0.28.2-2.1.0-rc.2" +version = "0.28.2-2.0.0" dependencies = [ "actix", "anyhow", @@ -621,7 +621,7 @@ dependencies = [ [[package]] name = "aurora-refiner-app-integration-tests" -version = "0.28.2-2.1.0-rc.2" +version = "0.28.2-2.0.0" dependencies = [ "anyhow", "tempfile", @@ -632,7 +632,7 @@ dependencies = [ [[package]] name = "aurora-refiner-lib" -version = "0.28.2-2.1.0-rc.2" +version = "0.28.2-2.0.0" dependencies = [ "anyhow", "aurora-engine", @@ -666,7 +666,7 @@ dependencies = [ [[package]] name = "aurora-refiner-types" -version = "0.28.2-2.1.0-rc.2" +version = "0.28.2-2.0.0" dependencies = [ "aurora-engine", "aurora-engine-sdk", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "aurora-standalone-engine" -version = "0.28.2-2.1.0-rc.2" +version = "0.28.2-2.0.0" dependencies = [ "anyhow", "aurora-engine", diff --git a/Cargo.toml b/Cargo.toml index 043a544..7189ce3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ resolver = "2" [workspace.package] authors = ["Aurora Labs "] -version = "0.28.2-2.1.0-rc.2" +version = "0.28.2-2.0.0" edition = "2021" homepage = "https://github.com/aurora-is-near/aurora-standalone" repository = "https://github.com/aurora-is-near/aurora-standalone" From eea705a7c2f6796e4b1d564e57380e79da86a974 Mon Sep 17 00:00:00 2001 From: Oleksandr Anyshchenko Date: Tue, 6 Aug 2024 09:54:49 +0100 Subject: [PATCH 2/3] chore: bump aurora and nearcore --- Cargo.lock | 436 +++++++++++++++++++++++------------------------------ Cargo.toml | 22 +-- 2 files changed, 200 insertions(+), 258 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7008ba2..2533dfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -495,8 +495,8 @@ dependencies = [ [[package]] name = "aurora-engine" -version = "3.6.3" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.3#932412d1863dd8d4f9e4c1521d94364f08ce0eb7" +version = "3.6.4" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.4#28396c14c8b9820218a066f1fcd1e66981b306d0" dependencies = [ "aurora-engine-hashchain", "aurora-engine-modexp", @@ -518,7 +518,7 @@ dependencies = [ [[package]] name = "aurora-engine-hashchain" version = "1.0.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.3#932412d1863dd8d4f9e4c1521d94364f08ce0eb7" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.4#28396c14c8b9820218a066f1fcd1e66981b306d0" dependencies = [ "aurora-engine-sdk", "aurora-engine-types", @@ -529,7 +529,7 @@ dependencies = [ [[package]] name = "aurora-engine-modexp" version = "1.0.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.3#932412d1863dd8d4f9e4c1521d94364f08ce0eb7" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.4#28396c14c8b9820218a066f1fcd1e66981b306d0" dependencies = [ "hex", "num", @@ -538,7 +538,7 @@ dependencies = [ [[package]] name = "aurora-engine-precompiles" version = "1.0.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.3#932412d1863dd8d4f9e4c1521d94364f08ce0eb7" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.4#28396c14c8b9820218a066f1fcd1e66981b306d0" dependencies = [ "aurora-engine-modexp", "aurora-engine-sdk", @@ -557,7 +557,7 @@ dependencies = [ [[package]] name = "aurora-engine-sdk" version = "1.0.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.3#932412d1863dd8d4f9e4c1521d94364f08ce0eb7" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.4#28396c14c8b9820218a066f1fcd1e66981b306d0" dependencies = [ "aurora-engine-types", "base64 0.21.7", @@ -568,7 +568,7 @@ dependencies = [ [[package]] name = "aurora-engine-transactions" version = "1.0.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.3#932412d1863dd8d4f9e4c1521d94364f08ce0eb7" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.4#28396c14c8b9820218a066f1fcd1e66981b306d0" dependencies = [ "aurora-engine-precompiles", "aurora-engine-sdk", @@ -581,7 +581,7 @@ dependencies = [ [[package]] name = "aurora-engine-types" version = "1.0.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.3#932412d1863dd8d4f9e4c1521d94364f08ce0eb7" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.4#28396c14c8b9820218a066f1fcd1e66981b306d0" dependencies = [ "base64 0.21.7", "borsh 1.5.1", @@ -676,8 +676,8 @@ dependencies = [ "derive_builder 0.20.0", "fixed-hash 0.8.0", "impl-serde 0.4.0", - "near-crypto 2.1.0-rc.2", - "near-primitives 2.1.0-rc.2", + "near-crypto 2.0.0", + "near-primitives 2.0.0", "serde", "serde_json", "sha3", @@ -1388,18 +1388,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "blst" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" -dependencies = [ - "cc", - "glob", - "threadpool", - "zeroize", -] - [[package]] name = "borsh" version = "0.9.3" @@ -2488,7 +2476,7 @@ dependencies = [ [[package]] name = "engine-standalone-storage" version = "0.1.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.3#932412d1863dd8d4f9e4c1521d94364f08ce0eb7" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.4#28396c14c8b9820218a066f1fcd1e66981b306d0" dependencies = [ "aurora-engine", "aurora-engine-modexp", @@ -2508,7 +2496,7 @@ dependencies = [ [[package]] name = "engine-standalone-tracing" version = "0.1.0" -source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.3#932412d1863dd8d4f9e4c1521d94364f08ce0eb7" +source = "git+https://github.com/aurora-is-near/aurora-engine.git?tag=3.6.4#28396c14c8b9820218a066f1fcd1e66981b306d0" dependencies = [ "aurora-engine-types", "evm", @@ -4063,8 +4051,8 @@ dependencies = [ [[package]] name = "near-async" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "derive_more", @@ -4072,7 +4060,7 @@ dependencies = [ "near-async-derive", "near-o11y", "near-performance-metrics", - "near-time 2.1.0-rc.2", + "near-time 2.0.0", "once_cell", "serde", "serde_json", @@ -4083,8 +4071,8 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "proc-macro2", "quote", @@ -4093,16 +4081,16 @@ dependencies = [ [[package]] name = "near-cache" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ - "lru 0.12.3", + "lru 0.7.8", ] [[package]] name = "near-chain" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "assert_matches", @@ -4114,22 +4102,22 @@ dependencies = [ "enum-map", "itertools 0.10.5", "itoa", - "lru 0.12.3", + "lru 0.7.8", "near-async", "near-cache", "near-chain-configs", "near-chain-primitives", "near-client-primitives", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-epoch-manager", "near-mainnet-res", "near-network", "near-o11y", - "near-parameters 2.1.0-rc.2", + "near-parameters 2.0.0", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "near-store", "near-vm-runner", "node-runtime", @@ -4148,19 +4136,19 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "anyhow", "bytesize", "chrono", "derive_more", - "near-config-utils 2.1.0-rc.2", - "near-crypto 2.1.0-rc.2", + "near-async", + "near-config-utils 2.0.0", + "near-crypto 2.0.0", "near-o11y", - "near-parameters 2.1.0-rc.2", - "near-primitives 2.1.0-rc.2", - "near-time 2.1.0-rc.2", + "near-parameters 2.0.0", + "near-primitives 2.0.0", "num-rational 0.3.2", "once_cell", "serde", @@ -4173,12 +4161,12 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ - "near-crypto 2.1.0-rc.2", - "near-primitives 2.1.0-rc.2", - "near-time 2.1.0-rc.2", + "near-async", + "near-crypto 2.0.0", + "near-primitives 2.0.0", "thiserror", "time", "tracing", @@ -4186,8 +4174,8 @@ dependencies = [ [[package]] name = "near-chunks" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "borsh 1.5.1", @@ -4195,19 +4183,19 @@ dependencies = [ "derive_more", "futures", "itertools 0.10.5", - "lru 0.12.3", + "lru 0.7.8", "near-async", "near-chain", "near-chain-configs", "near-chunks-primitives", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-epoch-manager", "near-network", "near-o11y", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "near-store", "once_cell", "rand 0.8.5", @@ -4219,17 +4207,17 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "near-chain-primitives", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", ] [[package]] name = "near-client" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "actix-rt", @@ -4242,7 +4230,7 @@ dependencies = [ "derive_more", "futures", "itertools 0.10.5", - "lru 0.12.3", + "lru 0.7.8", "near-async", "near-cache", "near-chain", @@ -4250,16 +4238,16 @@ dependencies = [ "near-chain-primitives", "near-chunks", "near-client-primitives", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-dyn-configs", "near-epoch-manager", "near-network", "near-o11y", - "near-parameters 2.1.0-rc.2", + "near-parameters 2.0.0", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "near-store", "near-telemetry", "near-vm-runner", @@ -4286,17 +4274,17 @@ dependencies = [ [[package]] name = "near-client-primitives" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "chrono", + "near-async", "near-chain-configs", "near-chain-primitives", "near-chunks-primitives", - "near-crypto 2.1.0-rc.2", - "near-primitives 2.1.0-rc.2", - "near-time 2.1.0-rc.2", + "near-crypto 2.0.0", + "near-primitives 2.0.0", "serde", "serde_json", "strum 0.24.1", @@ -4320,8 +4308,8 @@ dependencies = [ [[package]] name = "near-config-utils" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "anyhow", "json_comments", @@ -4356,8 +4344,8 @@ dependencies = [ [[package]] name = "near-crypto" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "blake2", "borsh 1.5.1", @@ -4367,8 +4355,8 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils 2.1.0-rc.2", - "near-stdx 2.1.0-rc.2", + "near-config-utils 2.0.0", + "near-stdx 2.0.0", "once_cell", "primitive-types 0.10.1", "secp256k1", @@ -4380,15 +4368,15 @@ dependencies = [ [[package]] name = "near-dyn-configs" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "anyhow", + "near-async", "near-chain-configs", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-o11y", - "near-primitives 2.1.0-rc.2", - "near-time 2.1.0-rc.2", + "near-primitives 2.0.0", "once_cell", "prometheus", "serde", @@ -4400,17 +4388,17 @@ dependencies = [ [[package]] name = "near-epoch-manager" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "borsh 1.5.1", "itertools 0.10.5", "near-cache", "near-chain-configs", "near-chain-primitives", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-o11y", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "near-store", "num-rational 0.3.2", "once_cell", @@ -4433,16 +4421,16 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ - "near-primitives-core 2.1.0-rc.2", + "near-primitives-core 2.0.0", ] [[package]] name = "near-indexer" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "anyhow", @@ -4450,12 +4438,12 @@ dependencies = [ "lazy_static", "near-chain-configs", "near-client", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-dyn-configs", - "near-indexer-primitives 2.1.0-rc.2", + "near-indexer-primitives 2.0.0", "near-o11y", - "near-parameters 2.1.0-rc.2", - "near-primitives 2.1.0-rc.2", + "near-parameters 2.0.0", + "near-primitives 2.0.0", "near-store", "nearcore", "node-runtime", @@ -4480,18 +4468,18 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "serde", "serde_json", ] [[package]] name = "near-jsonrpc" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "actix-cors", @@ -4509,8 +4497,8 @@ dependencies = [ "near-jsonrpc-primitives", "near-network", "near-o11y", - "near-primitives 2.1.0-rc.2", - "near-rpc-error-macro 2.1.0-rc.2", + "near-primitives 2.0.0", + "near-rpc-error-macro 2.0.0", "once_cell", "serde", "serde_json", @@ -4522,29 +4510,29 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix-http", "awc", "futures", "near-jsonrpc-primitives", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "serde", "serde_json", ] [[package]] name = "near-jsonrpc-primitives" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "arbitrary", "near-chain-configs", "near-client-primitives", - "near-crypto 2.1.0-rc.2", - "near-primitives 2.1.0-rc.2", - "near-rpc-error-macro 2.1.0-rc.2", + "near-crypto 2.0.0", + "near-primitives 2.0.0", + "near-rpc-error-macro 2.0.0", "serde", "serde_json", "thiserror", @@ -4578,19 +4566,19 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "near-account-id", "near-chain-configs", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "serde_json", ] [[package]] name = "near-network" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "anyhow", @@ -4602,20 +4590,19 @@ dependencies = [ "chrono", "crossbeam-channel", "derive_more", - "enum-map", "futures", "futures-util", "im", "itertools 0.10.5", - "lru 0.12.3", + "lru 0.7.8", "near-async", "near-chain-configs", - "near-crypto 2.1.0-rc.2", - "near-fmt 2.1.0-rc.2", + "near-crypto 2.0.0", + "near-fmt 2.0.0", "near-o11y", "near-performance-metrics", "near-performance-metrics-macros", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "near-store", "once_cell", "opentelemetry", @@ -4641,14 +4628,14 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto 2.1.0-rc.2", - "near-primitives-core 2.1.0-rc.2", + "near-crypto 2.0.0", + "near-primitives-core 2.0.0", "once_cell", "opentelemetry", "opentelemetry-otlp", @@ -4685,13 +4672,13 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "borsh 1.5.1", "enum-map", "near-account-id", - "near-primitives-core 2.1.0-rc.2", + "near-primitives-core 2.0.0", "num-rational 0.3.2", "serde", "serde_repr", @@ -4702,8 +4689,8 @@ dependencies = [ [[package]] name = "near-performance-metrics" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "bitflags 1.3.2", @@ -4718,8 +4705,8 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "quote", "syn 2.0.72", @@ -4727,13 +4714,13 @@ dependencies = [ [[package]] name = "near-pool" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "borsh 1.5.1", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-o11y", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "once_cell", "rand 0.8.5", ] @@ -4782,8 +4769,8 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4794,17 +4781,16 @@ dependencies = [ "chrono", "derive_more", "easy-ext", - "enum-map", "hex", "itertools 0.10.5", - "near-crypto 2.1.0-rc.2", - "near-fmt 2.1.0-rc.2", - "near-parameters 2.1.0-rc.2", - "near-primitives-core 2.1.0-rc.2", - "near-rpc-error-macro 2.1.0-rc.2", - "near-stdx 2.1.0-rc.2", - "near-structs-checker-lib", - "near-time 2.1.0-rc.2", + "near-crypto 2.0.0", + "near-fmt 2.0.0", + "near-parameters 2.0.0", + "near-primitives-core 2.0.0", + "near-rpc-error-macro 2.0.0", + "near-stdx 2.0.0", + "near-time 2.0.0", + "near-vm-runner", "num-rational 0.3.2", "once_cell", "ordered-float", @@ -4845,8 +4831,8 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4855,7 +4841,6 @@ dependencies = [ "derive_more", "enum-map", "near-account-id", - "near-structs-checker-lib", "num-rational 0.3.2", "serde", "serde_repr", @@ -4865,8 +4850,8 @@ dependencies = [ [[package]] name = "near-rosetta-rpc" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "actix-cors", @@ -4880,11 +4865,11 @@ dependencies = [ "near-chain-configs", "near-client", "near-client-primitives", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-network", "near-o11y", - "near-parameters 2.1.0-rc.2", - "near-primitives 2.1.0-rc.2", + "near-parameters 2.0.0", + "near-primitives 2.0.0", "node-runtime", "paperclip", "serde", @@ -4907,8 +4892,8 @@ dependencies = [ [[package]] name = "near-rpc-error-core" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "quote", "serde", @@ -4928,10 +4913,10 @@ dependencies = [ [[package]] name = "near-rpc-error-macro" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ - "near-rpc-error-core 2.1.0-rc.2", + "near-rpc-error-core 2.0.0", "serde", "syn 2.0.72", ] @@ -4944,13 +4929,13 @@ checksum = "29e1897481272eb144328abd51ca9f59b5b558e7a6dc6e2177c8c9bb18fbd818" [[package]] name = "near-stdx" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" [[package]] name = "near-store" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "actix-rt", @@ -4964,15 +4949,15 @@ dependencies = [ "hex", "itertools 0.10.5", "itoa", - "lru 0.12.3", + "lru 0.7.8", + "near-async", "near-chain-configs", - "near-crypto 2.1.0-rc.2", - "near-fmt 2.1.0-rc.2", + "near-crypto 2.0.0", + "near-fmt 2.0.0", "near-o11y", - "near-parameters 2.1.0-rc.2", - "near-primitives 2.1.0-rc.2", - "near-stdx 2.1.0-rc.2", - "near-time 2.1.0-rc.2", + "near-parameters 2.0.0", + "near-primitives 2.0.0", + "near-stdx 2.0.0", "near-vm-runner", "num_cpus", "once_cell", @@ -4991,29 +4976,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-structs-checker-core" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" - -[[package]] -name = "near-structs-checker-lib" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" -dependencies = [ - "near-structs-checker-core", - "near-structs-checker-macro", -] - -[[package]] -name = "near-structs-checker-macro" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" - [[package]] name = "near-telemetry" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "awc", @@ -5043,8 +5009,8 @@ dependencies = [ [[package]] name = "near-time" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "once_cell", "serde", @@ -5054,8 +5020,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "enumset", "finite-wasm", @@ -5070,8 +5036,8 @@ dependencies = [ [[package]] name = "near-vm-compiler-singlepass" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -5091,8 +5057,8 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -5114,23 +5080,22 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "anyhow", - "blst", "borsh 1.5.1", "bytesize", "ed25519-dalek", "enum-map", "finite-wasm", - "lru 0.12.3", + "lru 0.7.8", "memoffset 0.8.0", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-o11y", - "near-parameters 2.1.0-rc.2", - "near-primitives-core 2.1.0-rc.2", - "near-stdx 2.1.0-rc.2", + "near-parameters 2.0.0", + "near-primitives-core 2.0.0", + "near-stdx 2.0.0", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", @@ -5169,8 +5134,8 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "indexmap 1.9.3", "num-traits", @@ -5180,8 +5145,8 @@ dependencies = [ [[package]] name = "near-vm-vm" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "backtrace", "cc", @@ -5201,18 +5166,18 @@ dependencies = [ [[package]] name = "near-wallet-contract" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "anyhow", - "near-primitives-core 2.1.0-rc.2", + "near-primitives-core 2.0.0", "near-vm-runner", ] [[package]] name = "nearcore" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "actix", "actix-rt", @@ -5236,8 +5201,8 @@ dependencies = [ "near-chunks", "near-client", "near-client-primitives", - "near-config-utils 2.1.0-rc.2", - "near-crypto 2.1.0-rc.2", + "near-config-utils 2.0.0", + "near-crypto 2.0.0", "near-dyn-configs", "near-epoch-manager", "near-jsonrpc", @@ -5245,10 +5210,10 @@ dependencies = [ "near-mainnet-res", "near-network", "near-o11y", - "near-parameters 2.1.0-rc.2", + "near-parameters 2.0.0", "near-performance-metrics", "near-pool", - "near-primitives 2.1.0-rc.2", + "near-primitives 2.0.0", "near-rosetta-rpc", "near-store", "near-telemetry", @@ -5301,15 +5266,15 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.1.0-rc.2" -source = "git+https://github.com/near/nearcore?tag=2.1.0-rc.2#37359fda087bbb3692b592d2cd07d4c705b66005" +version = "2.0.0" +source = "git+https://github.com/near/nearcore?tag=2.0.0#1e199ded60b51fa8d4f1001491a0c39c92393ff0" dependencies = [ "borsh 1.5.1", - "near-crypto 2.1.0-rc.2", + "near-crypto 2.0.0", "near-o11y", - "near-parameters 2.1.0-rc.2", - "near-primitives 2.1.0-rc.2", - "near-primitives-core 2.1.0-rc.2", + "near-parameters 2.0.0", + "near-primitives 2.0.0", + "near-primitives-core 2.0.0", "near-store", "near-vm-runner", "near-wallet-contract", @@ -7652,15 +7617,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "tikv-jemalloc-sys" version = "0.5.4+5.3.0-patched" @@ -9178,20 +9134,6 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] [[package]] name = "zeropool-bn" diff --git a/Cargo.toml b/Cargo.toml index 7189ce3..f32ee49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,14 +19,14 @@ license = "CC0-1.0" [workspace.dependencies] actix = "0.13" anyhow = "1" -aurora-engine = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", default-features = false, features = ["std", "tracing", "log", "impl-serde"] } -aurora-engine-transactions = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", default-features = false, features = ["std", "impl-serde"] } -aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", default-features = false, features = ["std", "impl-serde"] } -aurora-engine-sdk = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", default-features = false, features = ["std"] } -aurora-engine-modexp = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", default-features = false, features = ["std"] } -aurora-engine-hashchain = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", default-features = false, features = ["std"] } -engine-standalone-storage = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", default-features = false } -engine-standalone-tracing = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", default-features = false, features = ["impl-serde"] } +aurora-engine = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", default-features = false, features = ["std", "tracing", "log", "impl-serde"] } +aurora-engine-transactions = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", default-features = false, features = ["std", "impl-serde"] } +aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", default-features = false, features = ["std", "impl-serde"] } +aurora-engine-sdk = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", default-features = false, features = ["std"] } +aurora-engine-modexp = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", default-features = false, features = ["std"] } +aurora-engine-hashchain = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", default-features = false, features = ["std"] } +engine-standalone-storage = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", default-features = false } +engine-standalone-tracing = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", default-features = false, features = ["impl-serde"] } borsh = { version = "1", features = ["borsh-derive"] } byteorder = "1" clap = { version = "4", features = ["derive"] } @@ -37,9 +37,9 @@ hex = "0.4" impl-serde = "0.4" lazy_static = "1" lru = "0.12" -near-crypto = { git = "https://github.com/near/nearcore", tag = "2.1.0-rc.2" } -near-indexer = { git = "https://github.com/near/nearcore", tag = "2.1.0-rc.2" } -near-primitives = { git = "https://github.com/near/nearcore", tag = "2.1.0-rc.2" } +near-crypto = { git = "https://github.com/near/nearcore", tag = "2.0.0" } +near-indexer = { git = "https://github.com/near/nearcore", tag = "2.0.0" } +near-primitives = { git = "https://github.com/near/nearcore", tag = "2.0.0" } near-lake-framework = "0.7" prometheus = "0.13" rlp = "0.5" From 3c249c95cab2858bd16a99987dc725fc49efce48 Mon Sep 17 00:00:00 2001 From: Oleksandr Anyshchenko Date: Tue, 6 Aug 2024 12:15:48 +0100 Subject: [PATCH 3/3] chore: fix neard argument --- etc/integration-tests/src/nearcore_utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/integration-tests/src/nearcore_utils.rs b/etc/integration-tests/src/nearcore_utils.rs index f22821d..f3dbbd5 100644 --- a/etc/integration-tests/src/nearcore_utils.rs +++ b/etc/integration-tests/src/nearcore_utils.rs @@ -84,7 +84,7 @@ pub async fn create_localnet_configs( "--home", nearcore_home, "localnet", - "--non-validators-archival", + "--non-validators", "1", "--validators", "1",