From 27974494a5f9f2fd3e534456dbf0bbe001bff1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Chuda=C5=9B?= <18039094+staffik@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:48:32 +0100 Subject: [PATCH] 2.4 mainnet release (#12580) --- Cargo.lock | 178 ++++++++++++++++----------------- Cargo.toml | 2 +- core/primitives/src/version.rs | 2 +- 3 files changed, 91 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a3d20ba0d34..83a7ab2ad14 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1321,7 +1321,7 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chainsync-loadtest" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "anyhow", @@ -1485,7 +1485,7 @@ dependencies = [ [[package]] name = "cold-store-tool" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "borsh 1.2.0", @@ -1518,7 +1518,7 @@ dependencies = [ [[package]] name = "congestion-model" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "bytesize", "chrono", @@ -2360,7 +2360,7 @@ dependencies = [ [[package]] name = "estimator-warehouse" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "chrono", @@ -2762,7 +2762,7 @@ dependencies = [ [[package]] name = "genesis-csv-to-json" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "chrono", "clap", @@ -2779,7 +2779,7 @@ dependencies = [ [[package]] name = "genesis-populate" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "borsh 1.2.0", "clap", @@ -3194,7 +3194,7 @@ dependencies = [ [[package]] name = "indexer-example" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "anyhow", @@ -3269,7 +3269,7 @@ dependencies = [ [[package]] name = "integration-tests" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "actix-rt", @@ -3418,7 +3418,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "keypair-generator" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "clap", "near-crypto", @@ -3852,7 +3852,7 @@ dependencies = [ [[package]] name = "mock-node" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "actix-rt", @@ -3922,7 +3922,7 @@ dependencies = [ [[package]] name = "near-actix-test-utils" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix-rt", "near-store", @@ -3930,7 +3930,7 @@ dependencies = [ [[package]] name = "near-amend-genesis" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "borsh 1.2.0", @@ -3949,7 +3949,7 @@ dependencies = [ [[package]] name = "near-async" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "derive-enum-from-into", @@ -3970,7 +3970,7 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "pretty_assertions", "proc-macro2", @@ -3980,7 +3980,7 @@ dependencies = [ [[package]] name = "near-cache" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "bencher", "lru 0.12.3", @@ -3989,7 +3989,7 @@ dependencies = [ [[package]] name = "near-chain" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "assert_matches", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "bytesize", @@ -4065,7 +4065,7 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "near-crypto", "near-primitives", @@ -4077,7 +4077,7 @@ dependencies = [ [[package]] name = "near-chunks" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "assert_matches", @@ -4110,7 +4110,7 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "near-chain-primitives", "near-primitives", @@ -4118,7 +4118,7 @@ dependencies = [ [[package]] name = "near-client" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "actix-rt", @@ -4179,7 +4179,7 @@ dependencies = [ [[package]] name = "near-client-primitives" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "chrono", @@ -4199,7 +4199,7 @@ dependencies = [ [[package]] name = "near-config-utils" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "json_comments", @@ -4209,7 +4209,7 @@ dependencies = [ [[package]] name = "near-crypto" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "blake2", "bolero", @@ -4237,7 +4237,7 @@ dependencies = [ [[package]] name = "near-database-tool" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "borsh 1.2.0", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "near-dyn-configs" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "near-chain-configs", @@ -4281,7 +4281,7 @@ dependencies = [ [[package]] name = "near-epoch-manager" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "borsh 1.2.0", "chrono", @@ -4307,7 +4307,7 @@ dependencies = [ [[package]] name = "near-flat-storage" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "borsh 1.2.0", @@ -4325,14 +4325,14 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "near-primitives-core", ] [[package]] name = "near-fork-network" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "anyhow", @@ -4358,7 +4358,7 @@ dependencies = [ [[package]] name = "near-indexer" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "anyhow", @@ -4384,7 +4384,7 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "near-primitives", "serde", @@ -4393,7 +4393,7 @@ dependencies = [ [[package]] name = "near-jsonrpc" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "actix-cors", @@ -4423,7 +4423,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-adversarial-primitives" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "near-primitives", "serde", @@ -4431,7 +4431,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix-http", "awc", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-fuzz" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "arbitrary", @@ -4462,7 +4462,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "arbitrary", "near-chain-configs", @@ -4478,7 +4478,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-tests" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "awc", @@ -4502,7 +4502,7 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "near-account-id", "near-chain-configs", @@ -4512,7 +4512,7 @@ dependencies = [ [[package]] name = "near-mirror" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "actix-rt", @@ -4557,7 +4557,7 @@ dependencies = [ [[package]] name = "near-network" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "anyhow", @@ -4618,7 +4618,7 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "base64 0.21.0", @@ -4647,7 +4647,7 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "assert_matches", "borsh 1.2.0", @@ -4667,7 +4667,7 @@ dependencies = [ [[package]] name = "near-performance-metrics" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "bitflags 1.3.2", @@ -4682,7 +4682,7 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "quote", "syn 2.0.87", @@ -4690,7 +4690,7 @@ dependencies = [ [[package]] name = "near-ping" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix-web", "anyhow", @@ -4708,7 +4708,7 @@ dependencies = [ [[package]] name = "near-pool" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "borsh 1.2.0", "near-crypto", @@ -4719,7 +4719,7 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "arbitrary", "assert_matches", @@ -4768,7 +4768,7 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "arbitrary", "base64 0.21.0", @@ -4790,7 +4790,7 @@ dependencies = [ [[package]] name = "near-replay-archive-tool" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "borsh 1.2.0", @@ -4812,7 +4812,7 @@ dependencies = [ [[package]] name = "near-rosetta-rpc" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "actix-cors", @@ -4845,14 +4845,14 @@ dependencies = [ [[package]] name = "near-schema-checker-core" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "inventory", ] [[package]] name = "near-schema-checker-lib" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "inventory", "near-schema-checker-core", @@ -4861,7 +4861,7 @@ dependencies = [ [[package]] name = "near-schema-checker-macro" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "proc-macro2", "quote", @@ -4870,11 +4870,11 @@ dependencies = [ [[package]] name = "near-stable-hasher" -version = "2.4.0-rc.2" +version = "2.4.0" [[package]] name = "near-state-parts" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "chrono", @@ -4893,7 +4893,7 @@ dependencies = [ [[package]] name = "near-state-parts-dump-check" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "actix-web", @@ -4915,11 +4915,11 @@ dependencies = [ [[package]] name = "near-stdx" -version = "2.4.0-rc.2" +version = "2.4.0" [[package]] name = "near-store" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "actix-rt", @@ -4967,7 +4967,7 @@ dependencies = [ [[package]] name = "near-telemetry" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "awc", @@ -4985,7 +4985,7 @@ dependencies = [ [[package]] name = "near-test-contracts" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "arbitrary", "rand", @@ -4996,7 +4996,7 @@ dependencies = [ [[package]] name = "near-time" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "serde", "serde_json", @@ -5006,7 +5006,7 @@ dependencies = [ [[package]] name = "near-undo-block" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "chrono", @@ -5022,7 +5022,7 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "enumset", "finite-wasm", @@ -5038,7 +5038,7 @@ dependencies = [ [[package]] name = "near-vm-compiler-singlepass" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -5059,7 +5059,7 @@ dependencies = [ [[package]] name = "near-vm-compiler-test-derive" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "pretty_assertions", "proc-macro2", @@ -5070,7 +5070,7 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -5091,7 +5091,7 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "arbitrary", @@ -5165,7 +5165,7 @@ dependencies = [ [[package]] name = "near-vm-runner-fuzz" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "arbitrary", "libfuzzer-sys", @@ -5179,7 +5179,7 @@ dependencies = [ [[package]] name = "near-vm-test-api" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "cfg-if 1.0.0", @@ -5208,14 +5208,14 @@ dependencies = [ [[package]] name = "near-vm-test-generator" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", ] [[package]] name = "near-vm-types" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "bolero", "indexmap 1.9.2", @@ -5226,7 +5226,7 @@ dependencies = [ [[package]] name = "near-vm-vm" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "backtrace", "cc", @@ -5246,7 +5246,7 @@ dependencies = [ [[package]] name = "near-vm-wast" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "near-vm-test-api", @@ -5256,7 +5256,7 @@ dependencies = [ [[package]] name = "near-wallet-contract" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "near-primitives-core", @@ -5265,7 +5265,7 @@ dependencies = [ [[package]] name = "nearcore" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "actix-rt", @@ -5333,7 +5333,7 @@ dependencies = [ [[package]] name = "neard" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "anyhow", @@ -5404,7 +5404,7 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "assert_matches", "borsh 1.2.0", @@ -6324,7 +6324,7 @@ dependencies = [ [[package]] name = "protocol-schema-check" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "inventory", "near-chain", @@ -6653,7 +6653,7 @@ dependencies = [ [[package]] name = "restaked" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "clap", "integration-tests", @@ -6758,7 +6758,7 @@ dependencies = [ [[package]] name = "runtime-params-estimator" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "borsh 1.2.0", @@ -6799,7 +6799,7 @@ dependencies = [ [[package]] name = "runtime-tester" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "bolero", "cpu-time", @@ -6826,7 +6826,7 @@ dependencies = [ [[package]] name = "runtime-tester-fuzz" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "libfuzzer-sys", "runtime-tester", @@ -7445,7 +7445,7 @@ dependencies = [ [[package]] name = "speedy_sync" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "borsh 1.2.0", "clap", @@ -7488,7 +7488,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state-viewer" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "actix", "anyhow", @@ -7539,7 +7539,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "storage-usage-delta-calculator" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "near-chain-configs", @@ -7554,7 +7554,7 @@ dependencies = [ [[package]] name = "store-validator" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "clap", "near-chain", @@ -7731,7 +7731,7 @@ dependencies = [ [[package]] name = "testlib" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "near-chain", "near-chain-configs", @@ -7744,7 +7744,7 @@ dependencies = [ [[package]] name = "themis" -version = "2.4.0-rc.2" +version = "2.4.0" dependencies = [ "anyhow", "cargo_metadata", diff --git a/Cargo.toml b/Cargo.toml index ad3518e1f34..ba889ee988a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "2.4.0-rc.2" # managed by cargo-workspaces, see below +version = "2.4.0" # managed by cargo-workspaces, see below authors = ["Near Inc "] edition = "2021" rust-version = "1.82.0" diff --git a/core/primitives/src/version.rs b/core/primitives/src/version.rs index 6f05230e6be..e317cc0b2d8 100644 --- a/core/primitives/src/version.rs +++ b/core/primitives/src/version.rs @@ -76,7 +76,7 @@ pub const PROTOCOL_UPGRADE_SCHEDULE: LazyLock = let protocol_version = 73; // Sunday let datetime = - ProtocolUpgradeVotingSchedule::parse_datetime("2024-11-24 15:00:00").unwrap(); + ProtocolUpgradeVotingSchedule::parse_datetime("2024-12-15 12:00:00").unwrap(); let schedule = vec![(datetime, protocol_version)]; ProtocolUpgradeVotingSchedule::new_from_env_or_schedule(PROTOCOL_VERSION, schedule).unwrap() });