fixes and version update for final 1.0.0 build

mimblewimble · Jun 5, 2019 · ea4849a · ea4849a
1 parent 42befd2
commit ea4849a
Show file tree

Hide file tree

Showing 10 changed files with 147 additions and 125 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet"
-version = "1.1.0-beta.4"
+version = "1.1.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"
@@ -29,13 +29,13 @@ prettytable-rs = "0.7"
 log = "0.4"
 linefeed = "0.5"
 
-grin_wallet_api = { path = "./api", version = "1.1.0-beta.4" }
-grin_wallet_impls = { path = "./impls", version = "1.1.0-beta.4" }
-grin_wallet_libwallet = { path = "./libwallet", version = "1.1.0-beta.4" }
-grin_wallet_controller = { path = "./controller", version = "1.1.0-beta.4" }
-grin_wallet_config = { path = "./config", version = "1.1.0-beta.4" }
+grin_wallet_api = { path = "./api", version = "1.1.0" }
+grin_wallet_impls = { path = "./impls", version = "1.1.0" }
+grin_wallet_libwallet = { path = "./libwallet", version = "1.1.0" }
+grin_wallet_controller = { path = "./controller", version = "1.1.0" }
+grin_wallet_config = { path = "./config", version = "1.1.0" }
 
-grin_wallet_util = { path = "./util", version = "1.1.0-beta.4" }
+grin_wallet_util = { path = "./util", version = "1.1.0" }
 
 [build-dependencies]
 built = "0.3"
diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_api"
-version = "1.1.0-beta.4"
+version = "1.1.0"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Grin Wallet API"
 license = "Apache-2.0"
@@ -18,11 +18,11 @@ serde_json = "1"
 easy-jsonrpc = "0.5.1"
 chrono = { version = "0.4.4", features = ["serde"] }
 
-grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.4" }
-grin_wallet_config = { path = "../config", version = "1.1.0-beta.4" }
-grin_wallet_impls = { path = "../impls", version = "1.1.0-beta.4" }
+grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" }
+grin_wallet_config = { path = "../config", version = "1.1.0" }
+grin_wallet_impls = { path = "../impls", version = "1.1.0" }
 
-grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" }
+grin_wallet_util = { path = "../util", version = "1.1.0" }
 
 [dev-dependencies]
 serde_json = "1"

diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_config"
-version = "1.1.0-beta.4"
+version = "1.1.0"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ serde_derive = "1"
 toml = "0.4"
 dirs = "1.0.3"
 
-grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" }
+grin_wallet_util = { path = "../util", version = "1.1.0" }
 
 [dev-dependencies]
 pretty_assertions = "0.5.1"
diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_controller"
-version = "1.1.0-beta.4"
+version = "1.1.0"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Controllers for grin wallet instantiation"
 license = "Apache-2.0"
@@ -32,9 +32,9 @@ chrono = { version = "0.4.4", features = ["serde"] }
 easy-jsonrpc = "0.5.1"
 lazy_static = "1"
 
-grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" }
+grin_wallet_util = { path = "../util", version = "1.1.0" }
 
-grin_wallet_api = { path = "../api", version = "1.1.0-beta.4" }
-grin_wallet_impls = { path = "../impls", version = "1.1.0-beta.4" }
-grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.4" }
-grin_wallet_config = { path = "../config", version = "1.1.0-beta.4" }
+grin_wallet_api = { path = "../api", version = "1.1.0" }
+grin_wallet_impls = { path = "../impls", version = "1.1.0" }
+grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" }
+grin_wallet_config = { path = "../config", version = "1.1.0" }
diff --git a/impls/Cargo.toml b/impls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_impls"
-version = "1.1.0-beta.4"
+version = "1.1.0"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Concrete types derived from libwallet traits"
 license = "Apache-2.0"
@@ -26,7 +26,7 @@ tokio-retry = "0.1"
 uuid = { version = "0.7", features = ["serde", "v4"] }
 chrono = { version = "0.4.4", features = ["serde"] }
 
-grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" }
+grin_wallet_util = { path = "../util", version = "1.1.0" }
 
-grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.4" }
-grin_wallet_config = { path = "../config", version = "1.1.0-beta.4" }
+grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" }
+grin_wallet_config = { path = "../config", version = "1.1.0" }
diff --git a/impls/src/test_framework/mod.rs b/impls/src/test_framework/mod.rs
@@ -70,7 +70,7 @@ fn get_outputs_by_pmmr_index_local(
 		outputs: outputs
 			.2
 			.iter()
-			.map(|x| api::OutputPrintable::from_output(x, chain.clone(), None, true).unwrap())
+			.map(|x| api::OutputPrintable::from_output(x, chain.clone(), None, true, false).unwrap())
 			.collect(),
 	}
 }

diff --git a/libwallet/Cargo.toml b/libwallet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_libwallet"
-version = "1.1.0-beta.4"
+version = "1.1.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"
@@ -25,7 +25,7 @@ lazy_static = "1"
 strum = "0.15"
 strum_macros = "0.15"
 
-grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" }
+grin_wallet_util = { path = "../util", version = "1.1.0" }
 
 [dev-dependencies]
-grin_wallet_config = { path = "../config", version = "1.1.0-beta.4" }
+grin_wallet_config = { path = "../config", version = "1.1.0" }
diff --git a/libwallet/src/slate.rs b/libwallet/src/slate.rs
@@ -483,7 +483,7 @@ impl Slate {
 		let blind_offset = keychain.blind_sum(
 			&BlindSum::new()
 				.add_blinding_factor(BlindingFactor::from_secret_key(sec_key.clone()))
-				.sub_blinding_factor(self.tx.offset),
+				.sub_blinding_factor(self.tx.offset.clone()),
 		)?;
 		*sec_key = blind_offset.secret_key(&keychain.secp())?;
 		Ok(())
@@ -631,7 +631,7 @@ impl Slate {
 	where
 		K: Keychain,
 	{
-		let kernel_offset = self.tx.offset;
+		let kernel_offset = &self.tx.offset;
 
 		self.check_fees()?;
 
@@ -840,7 +840,7 @@ impl From<Transaction> for TransactionV2 {
 impl From<&Transaction> for TransactionV2 {
 	fn from(tx: &Transaction) -> TransactionV2 {
 		let Transaction { offset, body } = tx;
-		let offset = *offset;
+		let offset = offset.clone();
 		let body = TransactionBodyV2::from(body);
 		TransactionV2 { offset, body }
 	}

diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_util"
-version = "1.1.0-beta.4"
+version = "1.1.0"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Util, for generic utilities and to re-export grin crates"
 license = "Apache-2.0"
@@ -17,12 +17,12 @@ toml = "0.4"
 dirs = "1.0.3"
 
 # For Release
-#grin_core = "1.1.0-beta.1"
-#grin_keychain = "1.1.0-beta.1"
-#grin_chain = "1.1.0-beta.1"
-#grin_util = "1.1.0-beta.1"
-#grin_api = "1.1.0-beta.1"
-#grin_store = "1.1.0-beta.1"
+grin_core = "1.1.0"
+grin_keychain = "1.1.0"
+grin_chain = "1.1.0"
+grin_util = "1.1.0"
+grin_api = "1.1.0"
+grin_store = "1.1.0"
 
 # For beta release
 # grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v1.1.0-beta.2" }
@@ -33,12 +33,12 @@ dirs = "1.0.3"
 # grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v1.1.0-beta.2" }
 
 # For bleeding edge
-grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+# grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
 
 # For local testing
 #grin_core = { path = "../../grin/core", version= "1.1.0-beta.2"}