Merge branch 'master' into grim

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	api/Cargo.toml
#	config/Cargo.toml
#	controller/Cargo.toml
#	impls/Cargo.toml
#	libwallet/Cargo.toml
#	util/Cargo.toml

Cargo.toml

@@ -41,10 +41,10 @@ grin_wallet_util = { path = "./util", version = "5.4.0-alpha.1" }
 ##### Grin Imports
 
 # For Release
-#grin_core = "5.3.3"
-#grin_keychain = "5.3.3"
-#grin_util = "5.3.3"
-#grin_api = "5.3.3"
+#grin_core = "5.4.0"
+#grin_keychain = "5.4.0"
+#grin_util = "5.4.0"
+#grin_api = "5.4.0"
 
 # For beta release
 

api/Cargo.toml

@@ -30,9 +30,9 @@ grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
 ##### Grin Imports
 
 # For Release
-#grin_core = "5.3.3"
-#grin_keychain = "5.3.3"
-#grin_util = "5.3.3"
+#grin_core = "5.4.0"
+#grin_keychain = "5.4.0"
+#grin_util = "5.4.0"
 
 # For beta release
 

config/Cargo.toml

@@ -21,8 +21,8 @@ grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
 ##### Grin Imports
 
 # For Release
-#grin_core = "5.3.3"
-#grin_util = "5.3.3"
+#grin_core = "5.4.0"
+#grin_util = "5.4.0"
 
 # For beta release
 

controller/Cargo.toml

@@ -39,10 +39,10 @@ grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
 ##### Grin Imports
 
 # For Release
-#grin_core = "5.3.3"
-#grin_keychain = "5.3.3"
-#grin_util = "5.3.3"
-#grin_api = "5.3.3"
+#grin_core = "5.4.0"
+#grin_keychain = "5.4.0"
+#grin_util = "5.4.0"
+#grin_api = "5.4.0"
 
 # For beta release
 
@@ -78,7 +78,7 @@ remove_dir_all = "0.7"
 ##### Grin Imports
 
 # For Release
-# grin_chain = "5.3.3"
+#grin_chain = "5.4.0"
 
 # For beta release
 
@@ -93,5 +93,5 @@ remove_dir_all = "0.7"
 # Monorepo deps
 grin_chain = { path = "../../node/chain"}
 
-##### 
+#####
 

impls/Cargo.toml

@@ -43,12 +43,12 @@ grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" }
 ##### Grin Imports
 
 # For Release
-#grin_core = "5.3.3"
-#grin_keychain = "5.3.3"
-#grin_chain = "5.3.3"
-#grin_util = "5.3.3"
-#grin_api = "5.3.3"
-#grin_store = "5.3.3"
+#grin_core = "5.4.0"
+#grin_keychain = "5.4.0"
+#grin_chain = "5.4.0"
+#grin_util = "5.4.0"
+#grin_api = "5.4.0"
+#grin_store = "5.4.0"
 
 # For beta release
 

libwallet/Cargo.toml

@@ -46,10 +46,10 @@ grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
 ##### Grin Imports
 
 # For Release
-#grin_core = "5.3.3"
-#grin_keychain = "5.3.3"
-#grin_util = "5.3.3"
-#grin_store = "5.3.3"
+#grin_core = "5.4.0"
+#grin_keychain = "5.4.0"
+#grin_util = "5.4.0"
+#grin_store = "5.4.0"
 
 # For beta release
 
@@ -76,4 +76,4 @@ grin_keychain = { path = "../../node/keychain"}
 grin_util = { path = "../../node/util"}
 grin_store = { path = "../../node/store"}
 
-##### 
+#####

util/Cargo.toml

@@ -21,7 +21,7 @@ thiserror = "1"
 ##### Grin Imports
 
 # For Release
-#grin_util = "5.3.3"
+#grin_util = "5.4.0"
 
 # For beta release
 
@@ -31,6 +31,7 @@ thiserror = "1"
 # grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
 
 # For local testing
+
 # grin_util = { path = "../../grin/util"}
 
 # Monorepo deps