Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"

This reverts commit cdd63fb565.

impls/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_impls"
-version = "5.4.0-contracts.0"
+version = "5.4.0-alpha.1"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Concrete types derived from libwallet traits"
 license = "Apache-2.0"
@@ -36,19 +36,19 @@ sysinfo = "0.29"
 base64 = "0.12.0"
 url = "2.1"
 
-grin_wallet_util = { path = "../util", version = "5.4.0-contracts.0" }
-grin_wallet_config = { path = "../config", version = "5.4.0-contracts.0" }
-grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-contracts.0" }
+grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
+grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
+grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" }
 
 ##### Grin Imports
 
 # For Release
-# grin_core = "5.4.0-contracts.0"
-# grin_keychain = "5.4.0-contracts.0"
-# grin_chain = "5.4.0-contracts.0"
-# grin_util = "5.4.0-contracts.0"
-# grin_api = "5.4.0-contracts.0"
-# grin_store = "5.4.0-contracts.0"
+# grin_core = "5.4.0-alpha.1"
+# grin_keychain = "5.4.0-alpha.1"
+# grin_chain = "5.4.0-alpha.1"
+# grin_util = "5.4.0-alpha.1"
+# grin_api = "5.4.0-alpha.1"
+# grin_store = "5.4.0-alpha.1"
 
 # For beta release
 

impls/src/adapters/http.rs

@@ -179,10 +179,6 @@ impl HttpSlateSender {
 			return Err(Error::ClientCallback(report));
 		}
 
-		if supported_slate_versions.contains(&"V5".to_owned()) {
-			return Ok(SlateVersion::V5);
-		}
-
 		if supported_slate_versions.contains(&"V4".to_owned()) {
 			return Ok(SlateVersion::V4);
 		}
@@ -227,7 +223,6 @@ impl SlateSender for HttpSlateSender {
 		self.launch_tor()?;
 
 		let slate_send = match self.check_other_version(&url_str)? {
-			SlateVersion::V5 => VersionedSlate::into_version(slate.clone(), SlateVersion::V5)?,
 			SlateVersion::V4 => VersionedSlate::into_version(slate.clone(), SlateVersion::V4)?,
 		};
 		// Note: not using easy-jsonrpc as don't want the dependencies in this crate

impls/src/adapters/mod.rs

@@ -17,7 +17,7 @@ pub mod http;
 mod slatepack;
 
 pub use self::file::PathToSlate;
-pub use self::http::HttpSlateSender;
+pub use self::http::{HttpSlateSender, SchemeNotHttp};
 pub use self::slatepack::PathToSlatepack;
 
 use crate::config::WalletConfig;

impls/src/backends/lmdb.rs

@@ -21,6 +21,8 @@ use std::io::{Read, Write};
 use std::marker::PhantomData;
 use std::path::Path;
 
+use uuid::Uuid;
+
 use crate::blake2::blake2b::{Blake2b, Blake2bResult};
 
 use crate::keychain::{ChildNumber, ExtKeychain, Identifier, Keychain, SwitchCommitmentType};
@@ -316,41 +318,9 @@ where
 		Box::new(iter)
 	}
 
-	// TODO: I think this can be deleted
-	// fn get_tx_log_entry(&self, u: &Uuid) -> Result<Option<TxLogEntry>, Error> {
-	// 	let key = to_key(TX_LOG_ENTRY_PREFIX, &mut u.as_bytes().to_vec());
-
-	// 	self.db.get_ser(&key, None).map_err(|e| e.into())
-	// }
-
-	fn get_tx_log_entry(
-		&self,
-		parent_id: Identifier,
-		log_id: u32,
-	) -> Result<Option<TxLogEntry>, Error> {
-		let tx_log_key = to_key_u64(
-			TX_LOG_ENTRY_PREFIX,
-			&mut parent_id.to_bytes().to_vec(),
-			log_id as u64,
-		);
-		self.db.get_ser(&tx_log_key, None).map_err(|e| e.into())
-		/*
-		fn save_tx_log_entry(
-			&mut self,
-			tx_in: TxLogEntry,
-			parent_id: &Identifier,
-		) -> Result<(), Error> {
-			let tx_log_key = to_key_u64(
-				TX_LOG_ENTRY_PREFIX,
-				&mut parent_id.to_bytes().to_vec(),
-				tx_in.id as u64,
-			);
-			self.db
-				.borrow()
-				.as_ref()
-				.unwrap()
-				.put_ser(&tx_log_key, &tx_in)?;
-			*/
+	fn get_tx_log_entry(&self, u: &Uuid) -> Result<Option<TxLogEntry>, Error> {
+		let key = to_key(TX_LOG_ENTRY_PREFIX, &mut u.as_bytes().to_vec());
+		self.db.get_ser(&key, None).map_err(|e| e.into())
 	}
 
 	// TODO - fix this awkward conversion between PrefixIterator and our Box<dyn Iterator>

impls/src/node_clients/resp_types.rs

@@ -14,7 +14,7 @@
 // Derived from https://github.com/apoelstra/rust-jsonrpc
 
 //! JSON RPC Types for V2 node client
-#[allow(dead_code)]
+
 #[derive(Debug, Deserialize)]
 pub struct GetTipResp {
 	pub height: u64,