github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 07:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

HF2 Slate Changes (#258)

Browse Source 
* Update slate version to V3, define PaymentInfoV3 and add needed serialization

* rustfmt

* add ttl and payment proof info to slate

* rustfmt

* add documentation for updated fields

* doc test fixes
This commit is contained in:
Yeastplume
2019-11-20 11:01:38 +00:00
committed by GitHub
parent e74c0e2571
commit 9c2177e3d9
13 changed files with 470 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
impls/src/adapters/http.rs
+1 -1
View File
@@ -111,7 +111,7 @@ impl HttpSlateSender {
return Err(ErrorKind::ClientCallback(report).into());
}
if !supported_slate_versions.contains(&"V2".to_owned()) {
if !supported_slate_versions.contains(&"V3".to_owned()) {
let report = format!("Unable to negotiate slate format with other wallet.");
error!("{}", report);
return Err(ErrorKind::ClientCallback(report).into());
impls/src/test_framework/testclient.rs
+5 -5
View File
@@ -26,7 +26,7 @@ use crate::core::{pow, ser};
use crate::keychain::Keychain;
use crate::libwallet;
use crate::libwallet::api_impl::foreign;
use crate::libwallet::slate_versions::v2::SlateV2;
use crate::libwallet::slate_versions::v3::SlateV3;
use crate::libwallet::{
NodeClient, NodeVersionInfo, Slate, TxWrapper, WalletInst, WalletLCProvider,
};
@@ -216,7 +216,7 @@ where
Some(w) => w,
};
let slate: SlateV2 = serde_json::from_str(&m.body).context(
let slate: SlateV3 = serde_json::from_str(&m.body).context(
libwallet::ErrorKind::ClientCallback("Error parsing TxWrapper".to_owned()),
)?;
@@ -239,7 +239,7 @@ where
sender_id: m.dest,
dest: m.sender_id,
method: m.method,
body: serde_json::to_string(&SlateV2::from(slate)).unwrap(),
body: serde_json::to_string(&SlateV3::from(slate)).unwrap(),
})
}
@@ -392,7 +392,7 @@ impl LocalWalletClient {
sender_id: self.id.clone(),
dest: dest.to_owned(),
method: "send_tx_slate".to_owned(),
body: serde_json::to_string(&SlateV2::from(slate)).unwrap(),
body: serde_json::to_string(&SlateV3::from(slate)).unwrap(),
};
{
let p = self.proxy_tx.lock();
@@ -403,7 +403,7 @@ impl LocalWalletClient {
let r = self.rx.lock();
let m = r.recv().unwrap();
trace!("Received send_tx_slate response: {:?}", m.clone());
let slate: SlateV2 = serde_json::from_str(&m.body).context(
let slate: SlateV3 = serde_json::from_str(&m.body).context(
libwallet::ErrorKind::ClientCallback("Parsing send_tx_slate response".to_owned()),
)?;
Ok(Slate::from(slate))