Skip to content

Commit

Permalink
Re-launch floonet (mimblewimble#2249)
Browse files Browse the repository at this point in the history
*  Fix secondary scaling bugs;  rename is_testnet -> is_floonet (mimblewimble#2215)
* add global::is_mainnet()
* use it to change pre-genesis pow type
* rename is_testnet -> is_floonet
* Support multiple chain configurations (mimblewimble#2217)
* Support multiple chain configurations
Supports generating the proper configuration for each chain type
(mainnet, floonet, usernet). Will run them by default under
their respective root directory (~/.grin/main, ~/.grin/floo, etc).
Assigned default ports for mainnet, overriding them to keep Floonet
ports unchanged.
For now, starting on mainnet will abort.
* Fixed usernet command line help message. Fixes mimblewimble#2217
* Differing magic numbers for each chain type (mimblewimble#2208)
* stick to e=H(R|P|m) when use schnorr signature (mimblewimble#2200)
* stick to e=H(R|P|m) when use schnorr signature
* (1)add verify_slate_messages for wallet receive (2)log the message content
* remove debug log on verify_slate_messages
* verify the sender's message signature when receive_tx in wallet listen
* Revert "remove debug log on verify_slate_messages"

This reverts commit 65ea32a.

* Revert "rustfmt"

This reverts commit c380ab9.

* Revert "(1)add verify_slate_messages for wallet receive (2)log the message content"

This reverts commit 9584ca7.

* [re-floonet] Keychain Floonet BIP32 version/network option (mimblewimble#2235)

* add 'is_floonet' property to keychain
* fix hex encoding and tests

* Fix couple floonet loose ends (mimblewimble#2230)

* Fix couple floonet loose ends. Fixes mimblewimble#2216
* Doc fix for sig message

* Refuse unkown kernel features (mimblewimble#2244)

* Minor: magic number change for re-floonet

* Set pre genesis is_secondary to true (mimblewimble#2247)

* Minor: tx validation error display underlying

* New floonet genesis

* genesis rustfmt

* Use chain-specific config for wallet toml gen

* Fix default wallet_listener_url

* New more reasonable genesis block, bumped version

* genesis rustfmt

* Couple minor fixes to genesis generation script
  • Loading branch information
ignopeverell committed Dec 28, 2018
1 parent 80f7ae6 commit 9234e3c
Show file tree
Hide file tree
Showing 57 changed files with 529 additions and 435 deletions.
133 changes: 67 additions & 66 deletions Cargo.lock

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

22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin"
version = "0.4.2"
version = "0.5.0"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -35,14 +35,14 @@ term = "0.5"
failure = "0.1"
failure_derive = "0.1"

grin_api = { path = "./api", version = "0.4.2" }
grin_config = { path = "./config", version = "0.4.2" }
grin_core = { path = "./core", version = "0.4.2" }
grin_keychain = { path = "./keychain", version = "0.4.2" }
grin_p2p = { path = "./p2p", version = "0.4.2" }
grin_servers = { path = "./servers", version = "0.4.2" }
grin_util = { path = "./util", version = "0.4.2" }
grin_wallet = { path = "./wallet", version = "0.4.2" }
grin_api = { path = "./api", version = "0.5.0" }
grin_config = { path = "./config", version = "0.5.0" }
grin_core = { path = "./core", version = "0.5.0" }
grin_keychain = { path = "./keychain", version = "0.5.0" }
grin_p2p = { path = "./p2p", version = "0.5.0" }
grin_servers = { path = "./servers", version = "0.5.0" }
grin_util = { path = "./util", version = "0.5.0" }
grin_wallet = { path = "./wallet", version = "0.5.0" }

[build-dependencies]
built = "0.3"
Expand All @@ -51,5 +51,5 @@ flate2 = "1.0"
tar = "0.4"

[dev-dependencies]
grin_chain = { path = "./chain", version = "0.4.2" }
grin_store = { path = "./store", version = "0.4.2" }
grin_chain = { path = "./chain", version = "0.5.0" }
grin_store = { path = "./store", version = "0.5.0" }
14 changes: 7 additions & 7 deletions api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_api"
version = "0.4.2"
version = "0.5.0"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -30,9 +30,9 @@ futures = "0.1.21"
rustls = "0.13"
url = "1.7.0"

grin_core = { path = "../core", version = "0.4.2" }
grin_chain = { path = "../chain", version = "0.4.2" }
grin_p2p = { path = "../p2p", version = "0.4.2" }
grin_pool = { path = "../pool", version = "0.4.2" }
grin_store = { path = "../store", version = "0.4.2" }
grin_util = { path = "../util", version = "0.4.2" }
grin_core = { path = "../core", version = "0.5.0" }
grin_chain = { path = "../chain", version = "0.5.0" }
grin_p2p = { path = "../p2p", version = "0.5.0" }
grin_pool = { path = "../pool", version = "0.5.0" }
grin_store = { path = "../store", version = "0.5.0" }
grin_util = { path = "../util", version = "0.5.0" }
10 changes: 5 additions & 5 deletions chain/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_chain"
version = "0.4.2"
version = "0.5.0"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -22,10 +22,10 @@ serde_derive = "1"
chrono = "0.4.4"
lru-cache = "0.1"

grin_core = { path = "../core", version = "0.4.2" }
grin_keychain = { path = "../keychain", version = "0.4.2" }
grin_store = { path = "../store", version = "0.4.2" }
grin_util = { path = "../util", version = "0.4.2" }
grin_core = { path = "../core", version = "0.5.0" }
grin_keychain = { path = "../keychain", version = "0.5.0" }
grin_store = { path = "../store", version = "0.5.0" }
grin_util = { path = "../util", version = "0.5.0" }

[dev-dependencies]
env_logger = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion chain/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ pub enum ErrorKind {
#[fail(display = "Genesis Block Required")]
GenesisBlockRequired,
/// Error from underlying tx handling
#[fail(display = "Transaction Error")]
#[fail(display = "Transaction Validation Error: {:?}", _0)]
Transaction(transaction::Error),
/// Anything else
#[fail(display = "Other Error: {}", _0)]
Expand Down
2 changes: 1 addition & 1 deletion chain/tests/data_file_integrity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ fn data_files() {
//new block so chain references should be freed
{
let chain = setup(chain_dir);
let keychain = ExtKeychain::from_random_seed().unwrap();
let keychain = ExtKeychain::from_random_seed(false).unwrap();

for n in 1..4 {
let prev = chain.head_header().unwrap();
Expand Down
Loading

0 comments on commit 9234e3c

Please sign in to comment.