creating2morrow/neveko
1
0
Fork 0
mirror of https://github.com/creating2morrow/neveko.git synced 2024-10-30 00:27:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

debug kex msig orchestration

Browse source
This commit is contained in:
creating2morrow 2023-08-03 08:57:39 -04:00
parent 1cd5d814ef
commit 30f181946f
2 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
neveko-core/src/reqres.rs
View file

@ -44,11 +44,6 @@ pub struct XmrRpcMakeParams {
pub threshold: u8, pub threshold: u8,
} }
#[derive(Deserialize, Serialize, Debug)]
pub struct XmrRpcFinalizeParams {
pub multisig_info: Vec<String>,
}
#[derive(Deserialize, Serialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
pub struct XmrRpcImportParams { pub struct XmrRpcImportParams {
pub info: Vec<String>, pub info: Vec<String>,
@ -221,14 +216,6 @@ pub struct XmrRpcMakeRequest {
pub params: XmrRpcMakeParams, pub params: XmrRpcMakeParams,
} }
#[derive(Deserialize, Serialize, Debug)]
pub struct XmrRpcFinalizeRequest {
pub jsonrpc: String,
pub id: String,
pub method: String,
pub params: XmrRpcFinalizeParams,
}
#[derive(Deserialize, Serialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
pub struct XmrRpcImportRequest { pub struct XmrRpcImportRequest {
pub jsonrpc: String, pub jsonrpc: String,
@ -337,11 +324,6 @@ pub struct XmrRpcVersionResult {
pub version: u32, pub version: u32,
} }
#[derive(Deserialize, Debug)]
pub struct XmrRpcFinalizeResult {
pub address: String,
}
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub struct XmrRpcPrepareResult { pub struct XmrRpcPrepareResult {
pub multisig_info: String, pub multisig_info: String,
@ -865,21 +847,6 @@ impl Default for XmrRpcMakeResponse {
} }
} }
#[derive(Deserialize, Debug)]
pub struct XmrRpcFinalizeResponse {
pub result: XmrRpcFinalizeResult,
}
impl Default for XmrRpcFinalizeResponse {
fn default() -> Self {
XmrRpcFinalizeResponse {
result: XmrRpcFinalizeResult {
address: utils::empty_string(),
},
}
}
}
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub struct XmrRpcExportResponse { pub struct XmrRpcExportResponse {
pub result: XmrRpcExportResult, pub result: XmrRpcExportResult,

6
neveko-gui/src/apps/market.rs
View file

@ -389,7 +389,7 @@ impl eframe::App for MarketApp {
} }
}); });
} }
if self.msig.completed_prepare { if self.msig.completed_prepare && !self.msig.completed_make {
ui.horizontal(|ui| { ui.horizontal(|ui| {
ui.label("Make: \t\t\t\t\t\t"); ui.label("Make: \t\t\t\t\t\t");
if ui.button("Make").clicked() { if ui.button("Make").clicked() {
@ -424,7 +424,7 @@ impl eframe::App for MarketApp {
} }
}); });
} }
if self.msig.completed_make { if self.msig.completed_make && !self.msig.completed_kex_init {
ui.horizontal(|ui| { ui.horizontal(|ui| {
ui.label("Kex Exchange Initial: \t\t\t"); ui.label("Kex Exchange Initial: \t\t\t");
if ui.button("KEX-INIT").clicked() { if ui.button("KEX-INIT").clicked() {
@ -459,7 +459,7 @@ impl eframe::App for MarketApp {
} }
}); });
} }
if self.msig.completed_kex_init { if self.msig.completed_kex_init && !self.msig.completed_kex_final {
ui.horizontal(|ui| { ui.horizontal(|ui| {
ui.label("Kex Exchange Final: \t\t\t"); ui.label("Kex Exchange Final: \t\t\t");
if ui.button("KEX-FINAL").clicked() { if ui.button("KEX-FINAL").clicked() {