Skip to content

Commit

Permalink
Merge pull request #115 from who-biz/ver-bump-3.5.0
Browse files Browse the repository at this point in the history 
Version bump (3.5.0), update checkpoints to height 2.2M
  • Loading branch information
@who-biz
who-biz authored Nov 21, 2023
2 parents ebf5432 + ef84d4f commit 7f530ea
Show file tree
Hide file tree
Showing 15 changed files with 86 additions and 71 deletions.
22 changes: 11 additions & 11 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -50,14 +50,14 @@ reqwest = "0.11.11"

tokio = { version = "1.32", features = ["full"] }

epic_api = { path = "./api", version = "3.4.0" }
epic_config = { path = "./config", version = "3.4.0" }
epic_core = { path = "./core", version = "3.4.0" }
epic_keychain = { path = "./keychain", version = "3.4.0" }
epic_p2p = { path = "./p2p", version = "3.4.0" }
epic_servers = { path = "./servers", version = "3.4.0" }
epic_util = { path = "./util", version = "3.4.0" }
epic_chain = { path = "./chain", version = "3.4.0" }
epic_api = { path = "./api", version = "3.5.0" }
epic_config = { path = "./config", version = "3.5.0" }
epic_core = { path = "./core", version = "3.5.0" }
epic_keychain = { path = "./keychain", version = "3.5.0" }
epic_p2p = { path = "./p2p", version = "3.5.0" }
epic_servers = { path = "./servers", version = "3.5.0" }
epic_util = { path = "./util", version = "3.5.0" }
epic_chain = { path = "./chain", version = "3.5.0" }

cursive = { version = "0.16", default-features = false, features = [
"pancurses-backend",
Expand All @@ -75,5 +75,5 @@ harness = false
built = "0.3"

[dev-dependencies]
epic_store = { path = "./store", version = "3.4.0" }
epic_store = { path = "./store", version = "3.5.0" }
cucumber_rust = { version = "^0.5.1", default-features = false }
14 changes: 7 additions & 7 deletions api/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_api"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "APIs for epic, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -42,9 +42,9 @@ bytes = "0.5"



epic_core = { path = "../core", version = "3.4.0" }
epic_chain = { path = "../chain", version = "3.4.0" }
epic_p2p = { path = "../p2p", version = "3.4.0" }
epic_pool = { path = "../pool", version = "3.4.0" }
epic_store = { path = "../store", version = "3.4.0" }
epic_util = { path = "../util", version = "3.4.0" }
epic_core = { path = "../core", version = "3.5.0" }
epic_chain = { path = "../chain", version = "3.5.0" }
epic_p2p = { path = "../p2p", version = "3.5.0" }
epic_pool = { path = "../pool", version = "3.5.0" }
epic_store = { path = "../store", version = "3.5.0" }
epic_util = { path = "../util", version = "3.5.0" }
10 changes: 5 additions & 5 deletions chain/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_chain"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Chain implementation for epic, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -27,10 +27,10 @@ lazy_static = "1"
regex = "1"
bigint = "4.4.1"

epic_core = { path = "../core", version = "3.4.0" }
epic_keychain = { path = "../keychain", version = "3.4.0" }
epic_store = { path = "../store", version = "3.4.0" }
epic_util = { path = "../util", version = "3.4.0" }
epic_core = { path = "../core", version = "3.5.0" }
epic_keychain = { path = "../keychain", version = "3.5.0" }
epic_store = { path = "../store", version = "3.5.0" }
epic_util = { path = "../util", version = "3.5.0" }

[dev-dependencies]
env_logger = "0.5"
Expand Down
4 changes: 2 additions & 2 deletions chain/src/types.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,9 +505,9 @@ impl BlockchainCheckpoints {
.unwrap(),
},
Checkpoint {
height: 2050000,
height: 2200000,
block_hash: Hash::from_hex(
"1a51bb18562e120f33783e53a70c449fd14197ac77082dc23d664c7f47a744c9",
"1243520890d08026daba8207ed3d67186da64d2b71b5c1e2dd26d34092dee6ba",
)
.unwrap(),
},
Expand Down
10 changes: 5 additions & 5 deletions config/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_config"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Configuration for epic, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -16,10 +16,10 @@ serde_derive = "1"
toml = "0.4"
dirs = "1.0.3"

epic_core = { path = "../core", version = "3.4.0" }
epic_servers = { path = "../servers", version = "3.4.0" }
epic_p2p = { path = "../p2p", version = "3.4.0" }
epic_util = { path = "../util", version = "3.4.0" }
epic_core = { path = "../core", version = "3.5.0" }
epic_servers = { path = "../servers", version = "3.5.0" }
epic_p2p = { path = "../p2p", version = "3.5.0" }
epic_util = { path = "../util", version = "3.5.0" }

[dev-dependencies]
pretty_assertions = "0.5.1"
6 changes: 3 additions & 3 deletions core/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_core"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Chain implementation for epic, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -36,8 +36,8 @@ keccak-hash = "0.2.0"
sha2 = "0.8.0"
zeroize = "1.3.0"

keychain = { package = "epic_keychain", path = "../keychain", version = "3.4.0" }
util = { package = "epic_util", path = "../util", version = "3.4.0" }
keychain = { package = "epic_keychain", path = "../keychain", version = "3.5.0" }
util = { package = "epic_util", path = "../util", version = "3.5.0" }
randomx = { git = "https://github.com/EpicCash/randomx-rust.git", tag = "v0.1.1" }
progpow = { git = "https://github.com/EpicCash/progpow-rust.git", tag = "v0.1.0" }

Expand Down
15 changes: 15 additions & 0 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
epic (3.5.0) focal; urgency=high

[ Epic Team ]
* Numerous dependency updates and refactoring
* Greatly reduced blockchain sync time
* Options to customize how much PoW to verify while syncing
* Reduce CPU usage for node server
* Fixes compiler warnings
* Improved stratum async code
* Greatly improved handling of OrphanBlockPool
* Addition of blockchain checkpoints for fastsync mode
* Tolerate reorgs in HeaderSync, fix endless loop

-- Epic Team <[email protected]> Wed, 21 Nov 2023 12:00:00 +0000

epic (3.4.0) focal; urgency=high

[ Epic Team ]
Expand Down
4 changes: 2 additions & 2 deletions keychain/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_keychain"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Chain implementation for epic, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -27,4 +27,4 @@ ripemd160 = "0.9"
sha2 = "0.9"
pbkdf2 = "0.8"

epic_util = { path = "../util", version = "3.4.0" }
epic_util = { path = "../util", version = "3.5.0" }
12 changes: 6 additions & 6 deletions p2p/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_p2p"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Chain implementation for epic, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -23,10 +23,10 @@ tempfile = "3.0.5"
log = "0.4"
chrono = { version = "0.4.31", features = ["serde"] }

epic_core = { path = "../core", version = "3.4.0" }
epic_store = { path = "../store", version = "3.4.0" }
epic_util = { path = "../util", version = "3.4.0" }
epic_chain = { path = "../chain", version = "3.4.0" }
epic_core = { path = "../core", version = "3.5.0" }
epic_store = { path = "../store", version = "3.5.0" }
epic_util = { path = "../util", version = "3.5.0" }
epic_chain = { path = "../chain", version = "3.5.0" }

[dev-dependencies]
epic_pool = { path = "../pool", version = "3.4.0" }
epic_pool = { path = "../pool", version = "3.5.0" }
12 changes: 6 additions & 6 deletions pool/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_pool"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Chain implementation for epic, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -19,10 +19,10 @@ chrono = "0.4.31"
failure = "0.1"
failure_derive = "0.1"

epic_core = { path = "../core", version = "3.4.0" }
epic_keychain = { path = "../keychain", version = "3.4.0" }
epic_store = { path = "../store", version = "3.4.0" }
epic_util = { path = "../util", version = "3.4.0" }
epic_core = { path = "../core", version = "3.5.0" }
epic_keychain = { path = "../keychain", version = "3.5.0" }
epic_store = { path = "../store", version = "3.5.0" }
epic_util = { path = "../util", version = "3.5.0" }

[dev-dependencies]
epic_chain = { path = "../chain", version = "3.4.0" }
epic_chain = { path = "../chain", version = "3.5.0" }
18 changes: 9 additions & 9 deletions servers/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_servers"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -37,11 +37,11 @@ trust-dns-resolver = "0.11.1"
walkdir = "2.2.9"


epic_api = { path = "../api", version = "3.4.0" }
epic_chain = { path = "../chain", version = "3.4.0" }
epic_core = { path = "../core", version = "3.4.0" }
epic_keychain = { path = "../keychain", version = "3.4.0" }
epic_p2p = { path = "../p2p", version = "3.4.0" }
epic_pool = { path = "../pool", version = "3.4.0" }
epic_store = { path = "../store", version = "3.4.0" }
epic_util = { path = "../util", version = "3.4.0" }
epic_api = { path = "../api", version = "3.5.0" }
epic_chain = { path = "../chain", version = "3.5.0" }
epic_core = { path = "../core", version = "3.5.0" }
epic_keychain = { path = "../keychain", version = "3.5.0" }
epic_p2p = { path = "../p2p", version = "3.5.0" }
epic_pool = { path = "../pool", version = "3.5.0" }
epic_store = { path = "../store", version = "3.5.0" }
epic_util = { path = "../util", version = "3.5.0" }
2 changes: 1 addition & 1 deletion src/bin/epic.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: epic
version: "3.4.0"
version: "3.5.0"
about: Lightweight implementation of the MimbleWimble protocol.
author: The Epic Team

Expand Down
6 changes: 3 additions & 3 deletions store/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_store"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -25,8 +25,8 @@ serde = "1"
serde_derive = "1"
log = "0.4"

epic_core = { path = "../core", version = "3.4.0" }
epic_util = { path = "../util", version = "3.4.0" }
epic_core = { path = "../core", version = "3.5.0" }
epic_util = { path = "../util", version = "3.5.0" }

[dev-dependencies]
chrono = "0.4.31"
Expand Down
2 changes: 1 addition & 1 deletion util/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "epic_util"
version = "3.4.0"
version = "3.5.0"
authors = ["Epic Foundation <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down

0 comments on commit 7f530ea

Please sign in to comment.