From e7485ab5f1ad5160a42c4230bb523ca3558e7adc Mon Sep 17 00:00:00 2001 From: Ignotus Peverell Date: Tue, 15 Jan 2019 16:24:29 +0000 Subject: [PATCH] Version bump to 1.0.0 --- Cargo.lock | 132 ++++++++++++++++++++--------------------- Cargo.toml | 22 +++---- api/Cargo.toml | 14 ++--- chain/Cargo.toml | 10 ++-- config/Cargo.toml | 12 ++-- core/Cargo.toml | 6 +- core/src/genesis.rs | 101 +++++++++++++++++++++++++++---- etc/gen_gen/Cargo.toml | 4 +- keychain/Cargo.toml | 4 +- p2p/Cargo.toml | 10 ++-- pool/Cargo.toml | 12 ++-- servers/Cargo.toml | 20 +++---- src/bin/grin.yml | 2 +- store/Cargo.toml | 6 +- util/Cargo.toml | 2 +- wallet/Cargo.toml | 18 +++--- 16 files changed, 226 insertions(+), 149 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 313f5d0c29..ccb25d0799 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -663,7 +663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "grin" -version = "0.5.2" +version = "1.0.0" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "built 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -675,16 +675,16 @@ dependencies = [ "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_api 0.5.2", - "grin_chain 0.5.2", - "grin_config 0.5.2", - "grin_core 0.5.2", - "grin_keychain 0.5.2", - "grin_p2p 0.5.2", - "grin_servers 0.5.2", - "grin_store 0.5.2", - "grin_util 0.5.2", - "grin_wallet 0.5.2", + "grin_api 1.0.0", + "grin_chain 1.0.0", + "grin_config 1.0.0", + "grin_core 1.0.0", + "grin_keychain 1.0.0", + "grin_p2p 1.0.0", + "grin_servers 1.0.0", + "grin_store 1.0.0", + "grin_util 1.0.0", + "grin_wallet 1.0.0", "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "linefeed 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -698,17 +698,17 @@ dependencies = [ [[package]] name = "grin_api" -version = "0.5.2" +version = "1.0.0" dependencies = [ "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_chain 0.5.2", - "grin_core 0.5.2", - "grin_p2p 0.5.2", - "grin_pool 0.5.2", - "grin_store 0.5.2", - "grin_util 0.5.2", + "grin_chain 1.0.0", + "grin_core 1.0.0", + "grin_p2p 1.0.0", + "grin_pool 1.0.0", + "grin_store 1.0.0", + "grin_util 1.0.0", "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.17 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "grin_chain" -version = "0.5.2" +version = "1.0.0" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -738,10 +738,10 @@ dependencies = [ "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 0.5.2", - "grin_keychain 0.5.2", - "grin_store 0.5.2", - "grin_util 0.5.2", + "grin_core 1.0.0", + "grin_keychain 1.0.0", + "grin_store 1.0.0", + "grin_util 1.0.0", "lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -752,14 +752,14 @@ dependencies = [ [[package]] name = "grin_config" -version = "0.5.2" +version = "1.0.0" dependencies = [ "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 0.5.2", - "grin_p2p 0.5.2", - "grin_servers 0.5.2", - "grin_util 0.5.2", - "grin_wallet 0.5.2", + "grin_core 1.0.0", + "grin_p2p 1.0.0", + "grin_servers 1.0.0", + "grin_util 1.0.0", + "grin_wallet 1.0.0", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)", @@ -769,7 +769,7 @@ dependencies = [ [[package]] name = "grin_core" -version = "0.5.2" +version = "1.0.0" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -778,8 +778,8 @@ dependencies = [ "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_keychain 0.5.2", - "grin_util 0.5.2", + "grin_keychain 1.0.0", + "grin_util 1.0.0", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -794,12 +794,12 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "0.5.2" +version = "1.0.0" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_util 0.5.2", + "grin_util 1.0.0", "hmac 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -815,16 +815,16 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "0.5.2" +version = "1.0.0" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 0.5.2", - "grin_pool 0.5.2", - "grin_store 0.5.2", - "grin_util 0.5.2", + "grin_core 1.0.0", + "grin_pool 1.0.0", + "grin_store 1.0.0", + "grin_util 1.0.0", "lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -836,15 +836,15 @@ dependencies = [ [[package]] name = "grin_pool" -version = "0.5.2" +version = "1.0.0" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_chain 0.5.2", - "grin_core 0.5.2", - "grin_keychain 0.5.2", - "grin_store 0.5.2", - "grin_util 0.5.2", + "grin_chain 1.0.0", + "grin_core 1.0.0", + "grin_keychain 1.0.0", + "grin_store 1.0.0", + "grin_util 1.0.0", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)", @@ -867,21 +867,21 @@ dependencies = [ [[package]] name = "grin_servers" -version = "0.5.2" +version = "1.0.0" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_api 0.5.2", - "grin_chain 0.5.2", - "grin_core 0.5.2", - "grin_keychain 0.5.2", - "grin_p2p 0.5.2", - "grin_pool 0.5.2", - "grin_store 0.5.2", - "grin_util 0.5.2", - "grin_wallet 0.5.2", + "grin_api 1.0.0", + "grin_chain 1.0.0", + "grin_core 1.0.0", + "grin_keychain 1.0.0", + "grin_p2p 1.0.0", + "grin_pool 1.0.0", + "grin_store 1.0.0", + "grin_util 1.0.0", + "grin_wallet 1.0.0", "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.17 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-staticfile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -897,7 +897,7 @@ dependencies = [ [[package]] name = "grin_store" -version = "0.5.2" +version = "1.0.0" dependencies = [ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -906,8 +906,8 @@ dependencies = [ "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 0.5.2", - "grin_util 0.5.2", + "grin_core 1.0.0", + "grin_util 1.0.0", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -919,7 +919,7 @@ dependencies = [ [[package]] name = "grin_util" -version = "0.5.2" +version = "1.0.0" dependencies = [ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -939,7 +939,7 @@ dependencies = [ [[package]] name = "grin_wallet" -version = "0.5.2" +version = "1.0.0" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -947,12 +947,12 @@ dependencies = [ "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_api 0.5.2", - "grin_chain 0.5.2", - "grin_core 0.5.2", - "grin_keychain 0.5.2", - "grin_store 0.5.2", - "grin_util 0.5.2", + "grin_api 1.0.0", + "grin_chain 1.0.0", + "grin_core 1.0.0", + "grin_keychain 1.0.0", + "grin_store 1.0.0", + "grin_util 1.0.0", "hyper 0.12.17 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "prettytable-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 1449e983d9..4db859cb4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -36,14 +36,14 @@ linefeed = "0.5" failure = "0.1" failure_derive = "0.1" -grin_api = { path = "./api", version = "0.5.2" } -grin_config = { path = "./config", version = "0.5.2" } -grin_core = { path = "./core", version = "0.5.2" } -grin_keychain = { path = "./keychain", version = "0.5.2" } -grin_p2p = { path = "./p2p", version = "0.5.2" } -grin_servers = { path = "./servers", version = "0.5.2" } -grin_util = { path = "./util", version = "0.5.2" } -grin_wallet = { path = "./wallet", version = "0.5.2" } +grin_api = { path = "./api", version = "1.0.0" } +grin_config = { path = "./config", version = "1.0.0" } +grin_core = { path = "./core", version = "1.0.0" } +grin_keychain = { path = "./keychain", version = "1.0.0" } +grin_p2p = { path = "./p2p", version = "1.0.0" } +grin_servers = { path = "./servers", version = "1.0.0" } +grin_util = { path = "./util", version = "1.0.0" } +grin_wallet = { path = "./wallet", version = "1.0.0" } [build-dependencies] built = "0.3" @@ -52,5 +52,5 @@ flate2 = "1.0" tar = "0.4" [dev-dependencies] -grin_chain = { path = "./chain", version = "0.5.2" } -grin_store = { path = "./store", version = "0.5.2" } +grin_chain = { path = "./chain", version = "1.0.0" } +grin_store = { path = "./store", version = "1.0.0" } diff --git a/api/Cargo.toml b/api/Cargo.toml index 1a5045bf86..aa8ab5dd35 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_api" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -30,9 +30,9 @@ futures = "0.1.21" rustls = "0.13" url = "1.7.0" -grin_core = { path = "../core", version = "0.5.2" } -grin_chain = { path = "../chain", version = "0.5.2" } -grin_p2p = { path = "../p2p", version = "0.5.2" } -grin_pool = { path = "../pool", version = "0.5.2" } -grin_store = { path = "../store", version = "0.5.2" } -grin_util = { path = "../util", version = "0.5.2" } +grin_core = { path = "../core", version = "1.0.0" } +grin_chain = { path = "../chain", version = "1.0.0" } +grin_p2p = { path = "../p2p", version = "1.0.0" } +grin_pool = { path = "../pool", version = "1.0.0" } +grin_store = { path = "../store", version = "1.0.0" } +grin_util = { path = "../util", version = "1.0.0" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 06df32a185..8e419a041f 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_chain" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -22,10 +22,10 @@ serde_derive = "1" chrono = "0.4.4" lru-cache = "0.1" -grin_core = { path = "../core", version = "0.5.2" } -grin_keychain = { path = "../keychain", version = "0.5.2" } -grin_store = { path = "../store", version = "0.5.2" } -grin_util = { path = "../util", version = "0.5.2" } +grin_core = { path = "../core", version = "1.0.0" } +grin_keychain = { path = "../keychain", version = "1.0.0" } +grin_store = { path = "../store", version = "1.0.0" } +grin_util = { path = "../util", version = "1.0.0" } [dev-dependencies] env_logger = "0.5" diff --git a/config/Cargo.toml b/config/Cargo.toml index 763381b1f6..b2628bc58c 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_config" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -16,11 +16,11 @@ serde_derive = "1" toml = "0.4" dirs = "1.0.3" -grin_core = { path = "../core", version = "0.5.2" } -grin_servers = { path = "../servers", version = "0.5.2" } -grin_p2p = { path = "../p2p", version = "0.5.2" } -grin_util = { path = "../util", version = "0.5.2" } -grin_wallet = { path = "../wallet", version = "0.5.2" } +grin_core = { path = "../core", version = "1.0.0" } +grin_servers = { path = "../servers", version = "1.0.0" } +grin_p2p = { path = "../p2p", version = "1.0.0" } +grin_util = { path = "../util", version = "1.0.0" } +grin_wallet = { path = "../wallet", version = "1.0.0" } [dev-dependencies] pretty_assertions = "0.5.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index aec225eb7a..f317bebe19 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_core" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -28,5 +28,5 @@ uuid = { version = "0.6", features = ["serde", "v4"] } log = "0.4" chrono = "0.4.4" -grin_keychain = { path = "../keychain", version = "0.5.2" } -grin_util = { path = "../util", version = "0.5.2" } +grin_keychain = { path = "../keychain", version = "1.0.0" } +grin_util = { path = "../util", version = "1.0.0" } diff --git a/core/src/genesis.rs b/core/src/genesis.rs index aeb52754aa..d22d8fbad0 100644 --- a/core/src/genesis.rs +++ b/core/src/genesis.rs @@ -170,20 +170,42 @@ pub fn genesis_floo() -> core::Block { pub fn genesis_main() -> core::Block { let gen = core::Block::with_header(core::BlockHeader { height: 0, -timestamp: Utc.ymd(2019, 1, 15).and_hms(16, 1, 26), -prev_root: Hash::from_hex("0000000000000000002a8bc32f43277fe9c063b9c99ea252b483941dcd06e217").unwrap(), -output_root: Hash::from_hex("fa7566d275006c6c467876758f2bc87e4cebd2020ae9cf9f294c6217828d6872").unwrap(), -range_proof_root: Hash::from_hex("1b7fff259aee3edfb5867c4775e4e1717826b843cda6685e5140442ece7bfc2e").unwrap(), -kernel_root: Hash::from_hex("e8bb096a73cbe6e099968965f5342fc1702ee2802802902286dcf0f279e326bf").unwrap(), -total_kernel_offset: BlindingFactor::from_hex("0000000000000000000000000000000000000000000000000000000000000000").unwrap(), + timestamp: Utc.ymd(2019, 1, 15).and_hms(16, 1, 26), + prev_root: Hash::from_hex( + "0000000000000000002a8bc32f43277fe9c063b9c99ea252b483941dcd06e217", + ) + .unwrap(), + output_root: Hash::from_hex( + "fa7566d275006c6c467876758f2bc87e4cebd2020ae9cf9f294c6217828d6872", + ) + .unwrap(), + range_proof_root: Hash::from_hex( + "1b7fff259aee3edfb5867c4775e4e1717826b843cda6685e5140442ece7bfc2e", + ) + .unwrap(), + kernel_root: Hash::from_hex( + "e8bb096a73cbe6e099968965f5342fc1702ee2802802902286dcf0f279e326bf", + ) + .unwrap(), + total_kernel_offset: BlindingFactor::from_hex( + "0000000000000000000000000000000000000000000000000000000000000000", + ) + .unwrap(), output_mmr_size: 1, kernel_mmr_size: 1, pow: ProofOfWork { total_difficulty: Difficulty::from_num(2_u64.pow(34)), secondary_scaling: 1856, -nonce: 41, + nonce: 41, proof: Proof { -nonces: vec![4391451, 36730677, 38198400, 38797304, 60700446, 72910191, 73050441, 110099816, 140885802, 145512513, 149311222, 149994636, 157557529, 160778700, 162870981, 179649435, 194194460, 227378628, 230933064, 252046196, 272053956, 277878683, 288331253, 290266880, 293973036, 305315023, 321927758, 353841539, 356489212, 373843111, 381697287, 389274717, 403108317, 409994705, 411629694, 431823422, 441976653, 521469643, 521868369, 523044572, 524964447, 530250249], + nonces: vec![ + 4391451, 36730677, 38198400, 38797304, 60700446, 72910191, 73050441, 110099816, + 140885802, 145512513, 149311222, 149994636, 157557529, 160778700, 162870981, + 179649435, 194194460, 227378628, 230933064, 252046196, 272053956, 277878683, + 288331253, 290266880, 293973036, 305315023, 321927758, 353841539, 356489212, + 373843111, 381697287, 389274717, 403108317, 409994705, 411629694, 431823422, + 441976653, 521469643, 521868369, 523044572, 524964447, 530250249, + ], edge_bits: 29, }, }, @@ -193,15 +215,70 @@ nonces: vec![4391451, 36730677, 38198400, 38797304, 60700446, 72910191, 73050441 features: core::KernelFeatures::Coinbase, fee: 0, lock_height: 0, -excess: Commitment::from_vec(util::from_hex("096385d86c5cfda718aa0b7295be0adf7e5ac051edfe130593a2a257f09f78a3b1".to_string()).unwrap()), -excess_sig: Signature::from_raw_data(&[80, 208, 41, 171, 28, 224, 250, 121, 60, 192, 213, 232, 111, 199, 111, 105, 18, 22, 54, 165, 107, 33, 186, 113, 186, 100, 12, 42, 72, 106, 42, 20, 67, 253, 188, 178, 228, 246, 21, 168, 253, 18, 22, 179, 41, 63, 250, 218, 80, 132, 75, 67, 244, 11, 108, 27, 188, 251, 212, 166, 233, 103, 117, 237]).unwrap(), + excess: Commitment::from_vec( + util::from_hex( + "096385d86c5cfda718aa0b7295be0adf7e5ac051edfe130593a2a257f09f78a3b1".to_string(), + ) + .unwrap(), + ), + excess_sig: Signature::from_raw_data(&[ + 80, 208, 41, 171, 28, 224, 250, 121, 60, 192, 213, 232, 111, 199, 111, 105, 18, 22, 54, + 165, 107, 33, 186, 113, 186, 100, 12, 42, 72, 106, 42, 20, 67, 253, 188, 178, 228, 246, + 21, 168, 253, 18, 22, 179, 41, 63, 250, 218, 80, 132, 75, 67, 244, 11, 108, 27, 188, + 251, 212, 166, 233, 103, 117, 237, + ]) + .unwrap(), }; let output = core::Output { features: core::OutputFeatures::Coinbase, -commit: Commitment::from_vec(util::from_hex("08b7e57c448db5ef25aa119dde2312c64d7ff1b890c416c6dda5ec73cbfed2edea".to_string()).unwrap()), + commit: Commitment::from_vec( + util::from_hex( + "08b7e57c448db5ef25aa119dde2312c64d7ff1b890c416c6dda5ec73cbfed2edea".to_string(), + ) + .unwrap(), + ), proof: RangeProof { plen: SINGLE_BULLET_PROOF_SIZE, -proof: [147, 48, 173, 140, 222, 32, 95, 49, 124, 101, 55, 236, 169, 107, 134, 98, 147, 160, 72, 150, 21, 169, 162, 119, 180, 211, 165, 151, 200, 115, 84, 76, 130, 71, 73, 50, 182, 65, 224, 106, 200, 113, 150, 4, 238, 82, 232, 149, 232, 205, 70, 33, 182, 191, 184, 87, 128, 205, 155, 236, 206, 20, 208, 112, 11, 131, 166, 100, 219, 47, 82, 162, 108, 66, 95, 215, 119, 173, 136, 148, 76, 223, 255, 56, 4, 58, 39, 147, 237, 77, 154, 166, 126, 54, 203, 253, 85, 133, 87, 159, 198, 157, 218, 147, 4, 24, 175, 94, 175, 96, 54, 84, 246, 247, 81, 37, 141, 45, 252, 140, 33, 19, 193, 113, 225, 48, 243, 30, 193, 230, 204, 226, 167, 24, 228, 53, 41, 143, 206, 93, 100, 255, 225, 189, 52, 100, 253, 124, 135, 207, 169, 32, 147, 133, 91, 224, 52, 191, 228, 67, 158, 146, 139, 217, 42, 215, 127, 208, 160, 224, 3, 85, 238, 29, 26, 156, 235, 30, 208, 196, 8, 220, 253, 186, 140, 88, 62, 117, 152, 220, 112, 10, 170, 159, 145, 67, 32, 151, 37, 154, 64, 95, 91, 115, 21, 162, 247, 101, 136, 97, 227, 52, 155, 176, 220, 139, 248, 131, 114, 106, 33, 95, 1, 73, 222, 214, 97, 62, 90, 192, 103, 12, 12, 82, 2, 36, 125, 124, 39, 200, 167, 208, 59, 219, 3, 201, 207, 84, 85, 70, 63, 155, 66, 207, 135, 64, 62, 49, 248, 56, 60, 196, 244, 154, 52, 198, 42, 228, 89, 245, 128, 26, 158, 237, 79, 14, 227, 223, 213, 245, 91, 112, 17, 192, 202, 227, 147, 196, 116, 171, 214, 248, 199, 150, 91, 155, 95, 255, 49, 4, 221, 78, 57, 84, 32, 119, 192, 200, 221, 47, 143, 252, 235, 107, 181, 152, 81, 45, 144, 80, 109, 10, 113, 132, 242, 15, 20, 152, 207, 69, 135, 135, 242, 50, 132, 181, 72, 136, 201, 190, 65, 109, 16, 63, 118, 4, 6, 53, 122, 22, 182, 216, 65, 163, 3, 213, 201, 91, 107, 71, 77, 45, 127, 15, 234, 10, 42, 118, 200, 151, 221, 33, 16, 233, 48, 63, 84, 104, 65, 105, 66, 17, 71, 104, 76, 111, 24, 25, 195, 60, 239, 63, 56, 236, 153, 90, 80, 132, 80, 192, 44, 209, 135, 47, 128, 101, 253, 238, 114, 49, 9, 193, 139, 29, 210, 221, 222, 117, 130, 85, 70, 236, 240, 223, 7, 147, 195, 83, 178, 12, 148, 108, 214, 65, 34, 206, 168, 193, 22, 244, 50, 51, 104, 153, 161, 106, 210, 74, 42, 175, 203, 143, 144, 14, 9, 161, 20, 113, 53, 252, 242, 165, 76, 191, 129, 219, 48, 138, 71, 160, 138, 73, 199, 124, 19, 14, 93, 197, 230, 97, 205, 85, 165, 204, 105, 230, 7, 5, 90, 91, 8, 17, 27, 246, 26, 98, 234, 87, 120, 248, 81, 25, 4, 54, 51, 241, 202, 184, 199, 86, 215, 86, 197, 163, 72, 81, 2, 74, 195, 17, 165, 150, 177, 205, 145, 155, 188, 164, 50, 38, 240, 186, 5, 127, 107, 87, 222, 47, 105, 85, 176, 130, 60, 56, 38, 222, 127, 96, 150, 193, 193, 182, 185, 184, 228, 6, 62, 22, 69, 192, 191, 243, 47, 128, 86, 26, 170, 149, 157, 151, 18, 15, 188, 46, 205, 157, 43, 226, 139, 208, 193, 120, 17, 220, 89, 168, 128, 73, 246, 216, 149, 46, 233, 160, 160, 32, 118, 147, 200, 156, 163, 173, 17, 151, 233, 191, 223, 192, 59, 233, 216, 69, 174, 168, 214, 99, 150, 146, 23, 227, 180, 148, 206, 233, 230, 82, 188, 159, 135, 19, 226, 253, 92, 177, 132, 56, 72, 244, 108, 58, 106, 176, 36, 208, 227, 213, 124, 164, 84, 84, 205, 189, 164, 20, 173, 170, 131, 95, 161, 71, 222, 180, 255, 183, 18, 156, 243, 168, 216, 103, 38, 160, 20, 71, 148], + proof: [ + 147, 48, 173, 140, 222, 32, 95, 49, 124, 101, 55, 236, 169, 107, 134, 98, 147, 160, + 72, 150, 21, 169, 162, 119, 180, 211, 165, 151, 200, 115, 84, 76, 130, 71, 73, 50, + 182, 65, 224, 106, 200, 113, 150, 4, 238, 82, 232, 149, 232, 205, 70, 33, 182, 191, + 184, 87, 128, 205, 155, 236, 206, 20, 208, 112, 11, 131, 166, 100, 219, 47, 82, + 162, 108, 66, 95, 215, 119, 173, 136, 148, 76, 223, 255, 56, 4, 58, 39, 147, 237, + 77, 154, 166, 126, 54, 203, 253, 85, 133, 87, 159, 198, 157, 218, 147, 4, 24, 175, + 94, 175, 96, 54, 84, 246, 247, 81, 37, 141, 45, 252, 140, 33, 19, 193, 113, 225, + 48, 243, 30, 193, 230, 204, 226, 167, 24, 228, 53, 41, 143, 206, 93, 100, 255, 225, + 189, 52, 100, 253, 124, 135, 207, 169, 32, 147, 133, 91, 224, 52, 191, 228, 67, + 158, 146, 139, 217, 42, 215, 127, 208, 160, 224, 3, 85, 238, 29, 26, 156, 235, 30, + 208, 196, 8, 220, 253, 186, 140, 88, 62, 117, 152, 220, 112, 10, 170, 159, 145, 67, + 32, 151, 37, 154, 64, 95, 91, 115, 21, 162, 247, 101, 136, 97, 227, 52, 155, 176, + 220, 139, 248, 131, 114, 106, 33, 95, 1, 73, 222, 214, 97, 62, 90, 192, 103, 12, + 12, 82, 2, 36, 125, 124, 39, 200, 167, 208, 59, 219, 3, 201, 207, 84, 85, 70, 63, + 155, 66, 207, 135, 64, 62, 49, 248, 56, 60, 196, 244, 154, 52, 198, 42, 228, 89, + 245, 128, 26, 158, 237, 79, 14, 227, 223, 213, 245, 91, 112, 17, 192, 202, 227, + 147, 196, 116, 171, 214, 248, 199, 150, 91, 155, 95, 255, 49, 4, 221, 78, 57, 84, + 32, 119, 192, 200, 221, 47, 143, 252, 235, 107, 181, 152, 81, 45, 144, 80, 109, 10, + 113, 132, 242, 15, 20, 152, 207, 69, 135, 135, 242, 50, 132, 181, 72, 136, 201, + 190, 65, 109, 16, 63, 118, 4, 6, 53, 122, 22, 182, 216, 65, 163, 3, 213, 201, 91, + 107, 71, 77, 45, 127, 15, 234, 10, 42, 118, 200, 151, 221, 33, 16, 233, 48, 63, 84, + 104, 65, 105, 66, 17, 71, 104, 76, 111, 24, 25, 195, 60, 239, 63, 56, 236, 153, 90, + 80, 132, 80, 192, 44, 209, 135, 47, 128, 101, 253, 238, 114, 49, 9, 193, 139, 29, + 210, 221, 222, 117, 130, 85, 70, 236, 240, 223, 7, 147, 195, 83, 178, 12, 148, 108, + 214, 65, 34, 206, 168, 193, 22, 244, 50, 51, 104, 153, 161, 106, 210, 74, 42, 175, + 203, 143, 144, 14, 9, 161, 20, 113, 53, 252, 242, 165, 76, 191, 129, 219, 48, 138, + 71, 160, 138, 73, 199, 124, 19, 14, 93, 197, 230, 97, 205, 85, 165, 204, 105, 230, + 7, 5, 90, 91, 8, 17, 27, 246, 26, 98, 234, 87, 120, 248, 81, 25, 4, 54, 51, 241, + 202, 184, 199, 86, 215, 86, 197, 163, 72, 81, 2, 74, 195, 17, 165, 150, 177, 205, + 145, 155, 188, 164, 50, 38, 240, 186, 5, 127, 107, 87, 222, 47, 105, 85, 176, 130, + 60, 56, 38, 222, 127, 96, 150, 193, 193, 182, 185, 184, 228, 6, 62, 22, 69, 192, + 191, 243, 47, 128, 86, 26, 170, 149, 157, 151, 18, 15, 188, 46, 205, 157, 43, 226, + 139, 208, 193, 120, 17, 220, 89, 168, 128, 73, 246, 216, 149, 46, 233, 160, 160, + 32, 118, 147, 200, 156, 163, 173, 17, 151, 233, 191, 223, 192, 59, 233, 216, 69, + 174, 168, 214, 99, 150, 146, 23, 227, 180, 148, 206, 233, 230, 82, 188, 159, 135, + 19, 226, 253, 92, 177, 132, 56, 72, 244, 108, 58, 106, 176, 36, 208, 227, 213, 124, + 164, 84, 84, 205, 189, 164, 20, 173, 170, 131, 95, 161, 71, 222, 180, 255, 183, 18, + 156, 243, 168, 216, 103, 38, 160, 20, 71, 148, + ], }, }; gen.with_reward(output, kernel) diff --git a/etc/gen_gen/Cargo.toml b/etc/gen_gen/Cargo.toml index e514f836c4..f053cda1ea 100644 --- a/etc/gen_gen/Cargo.toml +++ b/etc/gen_gen/Cargo.toml @@ -15,12 +15,12 @@ path = "src/bin/gen_gen.rs" [dependencies] chrono = "0.4.4" -cuckoo_miner = "0.5.2" +cuckoo_miner = "1.0.0" curl = "0.4.19" grin_core = { path = "../../core" } grin_chain = { path = "../../chain" } grin_keychain = { path = "../../keychain" } -grin_miner_plugin = "0.5.2" +grin_miner_plugin = "1.0.0" grin_store = { path = "../../store" } grin_util = { path = "../../util" } grin_wallet = { path = "../../wallet" } diff --git a/keychain/Cargo.toml b/keychain/Cargo.toml index ad07cf8aad..62ff7bd15e 100644 --- a/keychain/Cargo.toml +++ b/keychain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_keychain" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -27,4 +27,4 @@ sha2 = "0.7" pbkdf2 = "0.2" -grin_util = { path = "../util", version = "0.5.2" } +grin_util = { path = "../util", version = "1.0.0" } diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 30e391ffac..4b5164b07e 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_p2p" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -22,9 +22,9 @@ serde_derive = "1" log = "0.4" chrono = { version = "0.4.4", features = ["serde"] } -grin_core = { path = "../core", version = "0.5.2" } -grin_store = { path = "../store", version = "0.5.2" } -grin_util = { path = "../util", version = "0.5.2" } +grin_core = { path = "../core", version = "1.0.0" } +grin_store = { path = "../store", version = "1.0.0" } +grin_util = { path = "../util", version = "1.0.0" } [dev-dependencies] -grin_pool = { path = "../pool", version = "0.5.2" } +grin_pool = { path = "../pool", version = "1.0.0" } diff --git a/pool/Cargo.toml b/pool/Cargo.toml index 3b78fc2606..65701e26cd 100644 --- a/pool/Cargo.toml +++ b/pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_pool" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -17,10 +17,10 @@ serde_derive = "1" log = "0.4" chrono = "0.4.4" -grin_core = { path = "../core", version = "0.5.2" } -grin_keychain = { path = "../keychain", version = "0.5.2" } -grin_store = { path = "../store", version = "0.5.2" } -grin_util = { path = "../util", version = "0.5.2" } +grin_core = { path = "../core", version = "1.0.0" } +grin_keychain = { path = "../keychain", version = "1.0.0" } +grin_store = { path = "../store", version = "1.0.0" } +grin_util = { path = "../util", version = "1.0.0" } [dev-dependencies] -grin_chain = { path = "../chain", version = "0.5.2" } +grin_chain = { path = "../chain", version = "1.0.0" } diff --git a/servers/Cargo.toml b/servers/Cargo.toml index 2289e83881..d47280ef14 100644 --- a/servers/Cargo.toml +++ b/servers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_servers" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -25,15 +25,15 @@ chrono = "0.4.4" bufstream = "~0.1" jsonrpc-core = "~8.0" -grin_api = { path = "../api", version = "0.5.2" } -grin_chain = { path = "../chain", version = "0.5.2" } -grin_core = { path = "../core", version = "0.5.2" } -grin_keychain = { path = "../keychain", version = "0.5.2" } -grin_p2p = { path = "../p2p", version = "0.5.2" } -grin_pool = { path = "../pool", version = "0.5.2" } -grin_store = { path = "../store", version = "0.5.2" } -grin_util = { path = "../util", version = "0.5.2" } -grin_wallet = { path = "../wallet", version = "0.5.2" } +grin_api = { path = "../api", version = "1.0.0" } +grin_chain = { path = "../chain", version = "1.0.0" } +grin_core = { path = "../core", version = "1.0.0" } +grin_keychain = { path = "../keychain", version = "1.0.0" } +grin_p2p = { path = "../p2p", version = "1.0.0" } +grin_pool = { path = "../pool", version = "1.0.0" } +grin_store = { path = "../store", version = "1.0.0" } +grin_util = { path = "../util", version = "1.0.0" } +grin_wallet = { path = "../wallet", version = "1.0.0" } [dev-dependencies] blake2-rfc = "0.2" diff --git a/src/bin/grin.yml b/src/bin/grin.yml index bbdfd191b3..166e65cc4d 100644 --- a/src/bin/grin.yml +++ b/src/bin/grin.yml @@ -1,5 +1,5 @@ name: grin -version: "0.5.2" +version: "1.0.0" about: Lightweight implementation of the MimbleWimble protocol. author: The Grin Team diff --git a/store/Cargo.toml b/store/Cargo.toml index 6d24783299..3c8c3537e1 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_store" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -22,8 +22,8 @@ serde = "1" serde_derive = "1" log = "0.4" -grin_core = { path = "../core", version = "0.5.2" } -grin_util = { path = "../util", version = "0.5.2" } +grin_core = { path = "../core", version = "1.0.0" } +grin_util = { path = "../util", version = "1.0.0" } [dev-dependencies] chrono = "0.4.4" diff --git a/util/Cargo.toml b/util/Cargo.toml index 8e13fce1d4..575ef7308c 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_util" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml index a75a3c7e08..104ebdda2e 100644 --- a/wallet/Cargo.toml +++ b/wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet" -version = "0.5.2" +version = "1.0.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -31,13 +31,13 @@ uuid = { version = "0.6", features = ["serde", "v4"] } url = "1.7.0" chrono = { version = "0.4.4", features = ["serde"] } -grin_api = { path = "../api", version = "0.5.2" } -grin_core = { path = "../core", version = "0.5.2" } -grin_keychain = { path = "../keychain", version = "0.5.2" } -grin_store = { path = "../store", version = "0.5.2" } -grin_util = { path = "../util", version = "0.5.2" } -grin_chain = { path = "../chain", version = "0.5.2" } +grin_api = { path = "../api", version = "1.0.0" } +grin_core = { path = "../core", version = "1.0.0" } +grin_keychain = { path = "../keychain", version = "1.0.0" } +grin_store = { path = "../store", version = "1.0.0" } +grin_util = { path = "../util", version = "1.0.0" } +grin_chain = { path = "../chain", version = "1.0.0" } [dev-dependencies] -grin_store = { path = "../store", version = "0.5.2" } -#grin_config = { path = "../config", version = "0.5.2" } +grin_store = { path = "../store", version = "1.0.0" } +#grin_config = { path = "../config", version = "1.0.0" }