[current/v5.3.x] 5.3.x Version of Rust 1.80 updates (#3797)

* Update grin_secp to 0.7.14 (#3788)

* Update versioning on master to 5.4.0-alpha.0

* Update versioning on master to 5.4.0-alpha.0 (#3789)

* Remove Merkle Proof Generation from Foreign API `get_outputs` (#3792)

* Update versioning on master to 5.4.0-alpha.0

* Remove merkle proof generation from foreign API

* Rust 1.80+ fixes & accumulated warning cleanup (#3796)

* Update versioning on master to 5.4.0-alpha.0

* updates for 1.80 and other accumulated warnings

* further warning cleanups

* move dead code tag to function defn rather than module

* Chain type field (#3790)

* Adding chain type field into get_status rpc

* formatting

* update version for next build

---------

Co-authored-by: aglkm <39521015+aglkm@users.noreply.github.com>

Author: Yeastplume

.cargo/config renamed to .cargo/config.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin"
-version = "5.3.2"
+version = "5.3.3"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
 license = "Apache-2.0"
@@ -24,31 +24,31 @@ blake2-rfc = "0.2"
 chrono = "0.4.11"
 clap = { version = "2.33", features = ["yaml"] }
 ctrlc = { version = "3.1", features = ["termination"] }
-cursive_table_view = "0.14.0"
+cursive_table_view = "0.15.0"
 humansize = "1.1.0"
 serde = "1"
 futures = "0.3.19"
 serde_json = "1"
 log = "0.4"
 term = "0.6"
 
-grin_api = { path = "./api", version = "5.3.2" }
-grin_config = { path = "./config", version = "5.3.2" }
-grin_chain = { path = "./chain", version = "5.3.2" }
-grin_core = { path = "./core", version = "5.3.2" }
-grin_keychain = { path = "./keychain", version = "5.3.2" }
-grin_p2p = { path = "./p2p", version = "5.3.2" }
-grin_servers = { path = "./servers", version = "5.3.2" }
-grin_util = { path = "./util", version = "5.3.2" }
+grin_api = { path = "./api", version = "5.3.3" }
+grin_config = { path = "./config", version = "5.3.3" }
+grin_chain = { path = "./chain", version = "5.3.3" }
+grin_core = { path = "./core", version = "5.3.3" }
+grin_keychain = { path = "./keychain", version = "5.3.3" }
+grin_p2p = { path = "./p2p", version = "5.3.3" }
+grin_servers = { path = "./servers", version = "5.3.3" }
+grin_util = { path = "./util", version = "5.3.3" }
 
 [dependencies.cursive]
-version = "0.20"
+version = "0.21"
 default-features = false
 features = ["pancurses-backend"]
 
 [build-dependencies]
-built = { version = "0.4", features = ["git2"]}
+built = { version = "0.7", features = ["git2"]}
 
 [dev-dependencies]
-grin_chain = { path = "./chain", version = "5.3.2" }
-grin_store = { path = "./store", version = "5.3.2" }
+grin_chain = { path = "./chain", version = "5.3.3" }
+grin_store = { path = "./store", version = "5.3.3" }

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "grin_api"
-version = "5.3.2"
+version = "5.3.3"
 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"
@@ -30,9 +30,9 @@ rustls = "0.17"
 url = "2.1"
 bytes = "0.5"
 
-grin_core = { path = "../core", version = "5.3.2" }
-grin_chain = { path = "../chain", version = "5.3.2" }
-grin_p2p = { path = "../p2p", version = "5.3.2" }
-grin_pool = { path = "../pool", version = "5.3.2" }
-grin_store = { path = "../store", version = "5.3.2" }
-grin_util = { path = "../util", version = "5.3.2" }
+grin_core = { path = "../core", version = "5.3.3" }
+grin_chain = { path = "../chain", version = "5.3.3" }
+grin_p2p = { path = "../p2p", version = "5.3.3" }
+grin_pool = { path = "../pool", version = "5.3.3" }
+grin_store = { path = "../store", version = "5.3.3" }
+grin_util = { path = "../util", version = "5.3.3" }

Cargo.toml

@@ -49,6 +49,7 @@ pub trait OwnerRpc: Sync + Send {
 		"jsonrpc": "2.0",
 		"result": {
 			"Ok": {
+			"chain": "main",
 			"protocol_version": "2",
 			"user_agent": "MW/Grin 2.x.x",
 			"connections": "8",

api/Cargo.toml

@@ -16,7 +16,7 @@ use crate::chain;
 use crate::core::core::hash::Hashed;
 use crate::core::core::merkle_proof::MerkleProof;
 use crate::core::core::{FeeFields, KernelFeatures, TxKernel};
-use crate::core::{core, ser};
+use crate::core::{core, global, ser};
 use crate::p2p;
 use crate::util::secp::pedersen;
 use crate::util::{self, ToHex};
@@ -68,6 +68,8 @@ impl Tip {
 /// Status page containing different server information
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Status {
+	// The chain type
+	pub chain: String,
 	// The protocol version
 	pub protocol_version: u32,
 	// The user user agent
@@ -91,6 +93,7 @@ impl Status {
 		sync_info: Option<serde_json::Value>,
 	) -> Status {
 		Status {
+			chain: global::get_chain_type().shortname(),
 			protocol_version: ser::ProtocolVersion::local().into(),
 			user_agent: p2p::msg::USER_AGENT.to_string(),
 			connections: connections,

api/src/owner_rpc.rs

@@ -1,6 +1,6 @@
 [package]
 name = "grin_chain"
-version = "5.3.2"
+version = "5.3.3"
 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"
@@ -23,10 +23,10 @@ chrono = "0.4.11"
 lru-cache = "0.1"
 lazy_static = "1"
 
-grin_core = { path = "../core", version = "5.3.2" }
-grin_keychain = { path = "../keychain", version = "5.3.2" }
-grin_store = { path = "../store", version = "5.3.2" }
-grin_util = { path = "../util", version = "5.3.2" }
+grin_core = { path = "../core", version = "5.3.3" }
+grin_keychain = { path = "../keychain", version = "5.3.3" }
+grin_store = { path = "../store", version = "5.3.3" }
+grin_util = { path = "../util", version = "5.3.3" }
 
 [dev-dependencies]
 env_logger = "0.7"

api/src/types.rs

@@ -29,6 +29,8 @@ use grin_keychain as keychain;
 use std::fs;
 use std::sync::Arc;
 
+#[allow(dead_code)]
+#[cfg(test)]
 pub fn clean_output_dir(dir_name: &str) {
 	let _ = fs::remove_dir_all(dir_name);
 }

chain/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_config"
-version = "5.3.2"
+version = "5.3.3"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
 license = "Apache-2.0"
@@ -16,10 +16,10 @@ serde_derive = "1"
 toml = "0.5"
 dirs = "2.0"
 
-grin_core = { path = "../core", version = "5.3.2" }
-grin_servers = { path = "../servers", version = "5.3.2" }
-grin_p2p = { path = "../p2p", version = "5.3.2" }
-grin_util = { path = "../util", version = "5.3.2" }
+grin_core = { path = "../core", version = "5.3.3" }
+grin_servers = { path = "../servers", version = "5.3.3" }
+grin_p2p = { path = "../p2p", version = "5.3.3" }
+grin_util = { path = "../util", version = "5.3.3" }
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"

chain/tests/chain_test_helper.rs

@@ -1,6 +1,6 @@
 [package]
 name = "grin_core"
-version = "5.3.2"
+version = "5.3.3"
 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"
@@ -28,8 +28,8 @@ chrono = { version = "0.4.11", features = ["serde"] }
 zeroize = { version = "1.1", features =["zeroize_derive"] }
 bytes = "0.5"
 
-keychain = { package = "grin_keychain", path = "../keychain", version = "5.3.2" }
-util = { package = "grin_util", path = "../util", version = "5.3.2" }
+keychain = { package = "grin_keychain", path = "../keychain", version = "5.3.3" }
+util = { package = "grin_util", path = "../util", version = "5.3.3" }
 
 [dev-dependencies]
 serde_json = "1"