Core/grin-wallet
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin-wallet.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Version Info API Function tweak, remove 'min_compat_version' from slate (#123)

Browse source 
* change slate version function to return list of supported slate formats

* rustfmt

* remove min_compat_version
This commit is contained in:
Yeastplume 2019-05-30 09:34:04 +01:00 committed by GitHub
parent 757dfd0d91
commit af16dea6e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 43 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Cargo.lock generated
View file

@ -875,6 +875,8 @@ dependencies = [
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
"strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2092,6 +2094,22 @@ name = "strsim"
version = "0.8.0" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "strum"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "strum_macros"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "supercow" name = "supercow"
version = "0.1.0" version = "0.1.0"
@ -2896,6 +2914,8 @@ dependencies = [
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
"checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b" "checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
"checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f"
"checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e"
"checksum supercow 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "171758edb47aa306a78dfa4ab9aeb5167405bd4e3dc2b64e88f6a84bbe98bd63" "checksum supercow 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "171758edb47aa306a78dfa4ab9aeb5167405bd4e3dc2b64e88f6a84bbe98bd63"
"checksum syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)" = "846620ec526c1599c070eff393bfeeeb88a93afa2513fc3b49f1fea84cf7b0ed" "checksum syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)" = "846620ec526c1599c070eff393bfeeeb88a93afa2513fc3b49f1fea84cf7b0ed"
"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"

17
api/src/foreign_rpc.rs
View file

@ -50,8 +50,12 @@ pub trait ForeignRpc {
"jsonrpc": "2.0", "jsonrpc": "2.0",
"result": { "result": {
"Ok": { "Ok": {
"default_slate_version": 2, "foreign_api_version": 2,
"foreign_api_version": 2 "supported_slate_versions": [
"V0",
"V1",
"V2"
]
} }
} }
} }
@ -168,7 +172,6 @@ pub trait ForeignRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }
@ -207,8 +210,7 @@ pub trait ForeignRpc {
{ {
"version_info": { "version_info": {
"version": 2, "version": 2,
"orig_version": 2, "orig_version": 2
"min_compat_version": 0
}, },
"num_participants": 2, "num_participants": 2,
"id": "0436430c-2b02-624c-2032-570501212b00", "id": "0436430c-2b02-624c-2032-570501212b00",
@ -331,7 +333,6 @@ pub trait ForeignRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }
@ -365,8 +366,7 @@ pub trait ForeignRpc {
"params": [{ "params": [{
"version_info": { "version_info": {
"version": 2, "version": 2,
"orig_version": 2, "orig_version": 2
"min_compat_version": 0
}, },
"num_participants": 2, "num_participants": 2,
"id": "0436430c-2b02-624c-2032-570501212b00", "id": "0436430c-2b02-624c-2032-570501212b00",
@ -499,7 +499,6 @@ pub trait ForeignRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }

10
api/src/owner_rpc.rs
View file

@ -389,7 +389,6 @@ pub trait OwnerRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }
@ -469,7 +468,6 @@ pub trait OwnerRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }
@ -533,7 +531,6 @@ pub trait OwnerRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }
@ -617,7 +614,6 @@ pub trait OwnerRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }
@ -686,7 +682,6 @@ pub trait OwnerRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }
@ -725,8 +720,7 @@ pub trait OwnerRpc {
{ {
"version_info": { "version_info": {
"version": 2, "version": 2,
"orig_version": 2, "orig_version": 2
"min_compat_version": 0
}, },
"num_participants": 2, "num_participants": 2,
"id": "0436430c-2b02-624c-2032-570501212b00", "id": "0436430c-2b02-624c-2032-570501212b00",
@ -860,7 +854,6 @@ pub trait OwnerRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }
@ -1119,7 +1112,6 @@ pub trait OwnerRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000" "offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
}, },
"version_info": { "version_info": {
"min_compat_version": 0,
"orig_version": 2, "orig_version": 2,
"version": 2 "version": 2
} }

2
libwallet/Cargo.toml
View file

@ -22,6 +22,8 @@ log = "0.4"
uuid = { version = "0.7", features = ["serde", "v4"] } uuid = { version = "0.7", features = ["serde", "v4"] }
chrono = { version = "0.4.4", features = ["serde"] } chrono = { version = "0.4.4", features = ["serde"] }
lazy_static = "1" lazy_static = "1"
strum = "0.15"
strum_macros = "0.15"
grin_wallet_util = { path = "../util", version = "1.1.0-beta.3" } grin_wallet_util = { path = "../util", version = "1.1.0-beta.3" }

8
libwallet/src/api_impl/foreign.rs
View file

@ -13,12 +13,14 @@
// limitations under the License. // limitations under the License.
//! Generic implementation of owner API functions //! Generic implementation of owner API functions
use strum::IntoEnumIterator;
use crate::grin_keychain::Keychain; use crate::grin_keychain::Keychain;
use crate::internal::{tx, updater}; use crate::internal::{tx, updater};
use crate::slate_versions::SlateVersion;
use crate::{ use crate::{
slate_versions, BlockFees, CbData, Error, ErrorKind, NodeClient, Slate, TxLogEntryType, BlockFees, CbData, Error, ErrorKind, NodeClient, Slate, TxLogEntryType, VersionInfo,
VersionInfo, WalletBackend, WalletBackend,
}; };
const FOREIGN_API_VERSION: u16 = 2; const FOREIGN_API_VERSION: u16 = 2;
@ -28,7 +30,7 @@ const USER_MESSAGE_MAX_LEN: usize = 256;
pub fn check_version() -> VersionInfo { pub fn check_version() -> VersionInfo {
VersionInfo { VersionInfo {
foreign_api_version: FOREIGN_API_VERSION, foreign_api_version: FOREIGN_API_VERSION,
default_slate_version: slate_versions::CURRENT_SLATE_VERSION, supported_slate_versions: SlateVersion::iter().collect(),
} }
} }

3
libwallet/src/api_impl/types.rs
View file

@ -18,6 +18,7 @@ use crate::grin_core::core::{Output, TxKernel};
use crate::grin_core::libtx::secp_ser; use crate::grin_core::libtx::secp_ser;
use crate::grin_keychain::Identifier; use crate::grin_keychain::Identifier;
use crate::grin_util::secp::pedersen; use crate::grin_util::secp::pedersen;
use crate::slate_versions::SlateVersion;
use crate::types::OutputData; use crate::types::OutputData;
/// Send TX API Args /// Send TX API Args
@ -218,5 +219,5 @@ pub struct VersionInfo {
/// API version /// API version
pub foreign_api_version: u16, pub foreign_api_version: u16,
/// Slate version /// Slate version
pub default_slate_version: u16, pub supported_slate_versions: Vec<SlateVersion>,
} }

4
libwallet/src/lib.rs
View file

@ -39,6 +39,10 @@ extern crate log;
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
extern crate strum;
#[macro_use]
extern crate strum_macros;
pub mod api_impl; pub mod api_impl;
mod error; mod error;
mod internal; mod internal;

9
libwallet/src/slate.rs
View file

@ -185,8 +185,6 @@ pub struct VersionCompatInfo {
pub version: u16, pub version: u16,
/// Original version this slate was converted from /// Original version this slate was converted from
pub orig_version: u16, pub orig_version: u16,
/// Minimum version this slate is compatible with
pub min_compat_version: u16,
} }
/// Helper just to facilitate serialization /// Helper just to facilitate serialization
@ -240,7 +238,6 @@ impl Slate {
version_info: VersionCompatInfo { version_info: VersionCompatInfo {
version: CURRENT_SLATE_VERSION, version: CURRENT_SLATE_VERSION,
orig_version: CURRENT_SLATE_VERSION, orig_version: CURRENT_SLATE_VERSION,
min_compat_version: 0,
}, },
} }
} }
@ -816,15 +813,12 @@ impl From<&VersionCompatInfo> for VersionCompatInfoV2 {
let VersionCompatInfo { let VersionCompatInfo {
version, version,
orig_version, orig_version,
min_compat_version,
} = data; } = data;
let version = *version; let version = *version;
let orig_version = *orig_version; let orig_version = *orig_version;
let min_compat_version = *min_compat_version;
VersionCompatInfoV2 { VersionCompatInfoV2 {
version, version,
orig_version, orig_version,
min_compat_version,
} }
} }
} }
@ -969,15 +963,12 @@ impl From<&VersionCompatInfoV2> for VersionCompatInfo {
let VersionCompatInfoV2 { let VersionCompatInfoV2 {
version, version,
orig_version, orig_version,
min_compat_version,
} = data; } = data;
let version = *version; let version = *version;
let orig_version = *orig_version; let orig_version = *orig_version;
let min_compat_version = *min_compat_version;
VersionCompatInfo { VersionCompatInfo {
version, version,
orig_version, orig_version,
min_compat_version,
} }
} }
} }

2
libwallet/src/slate_versions/mod.rs
View file

@ -30,7 +30,7 @@ pub mod v2;
pub const CURRENT_SLATE_VERSION: u16 = 2; pub const CURRENT_SLATE_VERSION: u16 = 2;
/// Existing versions of the slate /// Existing versions of the slate
#[derive(Debug, PartialEq, PartialOrd, Eq, Ord)] #[derive(EnumIter, Serialize, Deserialize, Clone, Debug, PartialEq, PartialOrd, Eq, Ord)]
pub enum SlateVersion { pub enum SlateVersion {
/// V0 /// V0
V0, V0,

5
libwallet/src/slate_versions/v2.rs
View file

@ -33,7 +33,6 @@
//! * VersionCompatInfo struct created with fields and added to beginning of struct //! * VersionCompatInfo struct created with fields and added to beginning of struct
//! version: u16 //! version: u16
//! orig_verion: u16, //! orig_verion: u16,
//! min_compat_version: u16
use crate::grin_core::core::transaction::{KernelFeatures, OutputFeatures}; use crate::grin_core::core::transaction::{KernelFeatures, OutputFeatures};
use crate::grin_core::libtx::secp_ser; use crate::grin_core::libtx::secp_ser;
@ -84,8 +83,6 @@ pub struct VersionCompatInfoV2 {
pub version: u16, pub version: u16,
/// Original version this slate was converted from /// Original version this slate was converted from
pub orig_version: u16, pub orig_version: u16,
/// Minimum version this slate is compatible with
pub min_compat_version: u16,
} }
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
@ -338,13 +335,11 @@ impl From<SlateV1> for SlateV2 {
} = slate; } = slate;
let tx = TransactionV2::from(tx); let tx = TransactionV2::from(tx);
let version = 2; let version = 2;
let min_compat_version = 0;
let orig_version = orig_version as u16; let orig_version = orig_version as u16;
let participant_data = map_vec!(participant_data, |data| ParticipantDataV2::from(data)); let participant_data = map_vec!(participant_data, |data| ParticipantDataV2::from(data));
let version_info = VersionCompatInfoV2 { let version_info = VersionCompatInfoV2 {
version, version,
orig_version, orig_version,
min_compat_version,
}; };
SlateV2 { SlateV2 {
num_participants, num_participants,