From c62db09e32845c0ab5627a73a593c1153fa26d0d Mon Sep 17 00:00:00 2001 From: Shane Bammel Date: Wed, 5 Jun 2024 18:11:53 -0500 Subject: [PATCH] Prepare stable release --- .cargo/config.toml | 2 ++ Cargo.lock | 11 +++++++---- Cargo.toml | 6 +++--- beacon_node/Cargo.toml | 7 ++----- boot_node/Cargo.toml | 4 ++-- common/lighthouse_version/src/lib.rs | 4 ++-- lcli/Cargo.toml | 4 ++-- lighthouse/Cargo.toml | 4 ++-- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index dac016300..bd4f060a6 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -2,3 +2,5 @@ # Set the number of arenas to 16 when using jemalloc. JEMALLOC_SYS_WITH_MALLOC_CONF = "abort_conf:true,narenas:16" +[net] +git-fetch-with-cli = true # use the `git` executable for git operations diff --git a/Cargo.lock b/Cargo.lock index 42f261a32..fa7d95a19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -790,7 +790,7 @@ dependencies = [ [[package]] name = "beacon_node" -version = "5.1.3" +version = "2.5.0" dependencies = [ "beacon_chain", "clap", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "boot_node" -version = "5.1.3" +version = "2.5.0" dependencies = [ "beacon_node", "clap", @@ -2611,6 +2611,7 @@ dependencies = [ [[package]] name = "ethereum_ssz" version = "0.5.3" +source = "git+https://gitlab.com/pulsechaincom/ethereum_ssz.git?tag=v0.5.3#bf50584d4706a019a1cf72c0059d85d0932824c0" dependencies = [ "ethereum-types 0.14.1", "itertools", @@ -2620,6 +2621,7 @@ dependencies = [ [[package]] name = "ethereum_ssz_derive" version = "0.5.3" +source = "git+https://gitlab.com/pulsechaincom/ethereum_ssz.git?tag=v0.5.3#bf50584d4706a019a1cf72c0059d85d0932824c0" dependencies = [ "darling", "proc-macro2", @@ -4284,7 +4286,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lcli" -version = "5.1.3" +version = "2.5.0" dependencies = [ "account_utils", "beacon_chain", @@ -4860,7 +4862,7 @@ dependencies = [ [[package]] name = "lighthouse" -version = "5.1.3" +version = "2.5.0" dependencies = [ "account_manager", "account_utils", @@ -7806,6 +7808,7 @@ dependencies = [ [[package]] name = "ssz_types" version = "0.5.4" +source = "git+https://gitlab.com/pulsechaincom/ssz_types.git?tag=v0.5.4#aa3dbb6adeef5c889475179d0e651cffd997c270" dependencies = [ "arbitrary", "derivative", diff --git a/Cargo.toml b/Cargo.toml index a03483faa..adf0d6e05 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,8 +115,8 @@ error-chain = "0.12" ethereum-types = "0.14" ethereum_hashing = "1.0.0-beta.2" ethereum_serde_utils = "0.5.2" -ethereum_ssz = { path = "../ethereum_ssz/ssz" } -ethereum_ssz_derive = { path = "../ethereum_ssz/ssz_derive" } +ethereum_ssz = { git = "https://gitlab.com/pulsechaincom/ethereum_ssz.git", tag = "v0.5.3" } +ethereum_ssz_derive = { git = "https://gitlab.com/pulsechaincom/ethereum_ssz.git", tag = "v0.5.3" } ethers-core = "1" ethers-providers = { version = "1", default-features = false } exit-future = "0.2" @@ -155,7 +155,7 @@ slog-term = "2" sloggers = { version = "2", features = ["json"] } smallvec = "1.11.2" snap = "1" -ssz_types = { path = "../ssz_types" } +ssz_types = { git = "https://gitlab.com/pulsechaincom/ssz_types.git", tag = "v0.5.4" } strum = { version = "0.24", features = ["derive"] } superstruct = "0.6" syn = "1" diff --git a/beacon_node/Cargo.toml b/beacon_node/Cargo.toml index 7cc6e2b6a..3dd47c6e2 100644 --- a/beacon_node/Cargo.toml +++ b/beacon_node/Cargo.toml @@ -1,10 +1,7 @@ [package] name = "beacon_node" -version = "5.1.3" -authors = [ - "Paul Hauner ", - "Age Manning ", "Age Manning "] +version = "2.5.0" +authors = ["The PulseChain Team", "Sigma Prime "] edition = { workspace = true } [dependencies] diff --git a/common/lighthouse_version/src/lib.rs b/common/lighthouse_version/src/lib.rs index d2a701276..c129be2b7 100644 --- a/common/lighthouse_version/src/lib.rs +++ b/common/lighthouse_version/src/lib.rs @@ -17,8 +17,8 @@ pub const VERSION: &str = git_version!( // NOTE: using --match instead of --exclude for compatibility with old Git "--match=thiswillnevermatchlol" ], - prefix = "Lighthouse/v5.1.3-", - fallback = "Lighthouse/v5.1.3" + prefix = "Lighthouse-Pulse/v2.5.0-", + fallback = "Lighthouse-Pulse/v2.5.0" ); /// Returns `VERSION`, but with platform information appended to the end. diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml index 2aba106e5..4f871a979 100644 --- a/lcli/Cargo.toml +++ b/lcli/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "lcli" description = "Lighthouse CLI (modeled after zcli)" -version = "5.1.3" -authors = ["Paul Hauner "] +version = "2.5.0" +authors = ["The PulseChain Team", "Paul Hauner "] edition = { workspace = true } [features] diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml index 54faa03a3..f5ff9b806 100644 --- a/lighthouse/Cargo.toml +++ b/lighthouse/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "lighthouse" -version = "5.1.3" -authors = ["Sigma Prime "] +version = "2.5.0" +authors = ["The PulseChain Team", "Sigma Prime "] edition = { workspace = true } autotests = false rust-version = "1.75.0"