update version

This commit is contained in:
creating2morrow 2023-05-12 20:39:49 -04:00
parent 0a9e7371bf
commit 4e72ad028d
16 changed files with 76 additions and 187 deletions

205
Cargo.lock generated
View file

@ -269,15 +269,6 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "block-buffer"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"generic-array",
]
[[package]]
name = "block-buffer"
version = "0.10.4"
@ -314,9 +305,9 @@ checksum = "b00b8763668c99f8d9101b8a0dd82106f58265464531a79b2cef0d9a30c17dd2"
[[package]]
name = "bumpalo"
version = "3.12.1"
version = "3.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b"
[[package]]
name = "bytemuck"
@ -483,16 +474,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "codespan-reporting"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
dependencies = [
"termcolor",
"unicode-width",
]
[[package]]
name = "color_quant"
version = "1.1.0"
@ -673,50 +654,6 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
[[package]]
name = "cxx"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
dependencies = [
"cc",
"cxxbridge-flags",
"cxxbridge-macro",
"link-cplusplus",
]
[[package]]
name = "cxx-build"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
dependencies = [
"cc",
"codespan-reporting",
"once_cell",
"proc-macro2",
"quote",
"scratch",
"syn 2.0.15",
]
[[package]]
name = "cxxbridge-flags"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
[[package]]
name = "cxxbridge-macro"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.15",
]
[[package]]
name = "deflate"
version = "0.8.6"
@ -760,44 +697,35 @@ dependencies = [
"syn 2.0.15",
]
[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
"generic-array",
]
[[package]]
name = "digest"
version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
"block-buffer 0.10.4",
"block-buffer",
"crypto-common",
"subtle",
]
[[package]]
name = "digest_auth"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa30657988b2ced88f68fe490889e739bf98d342916c33ed3100af1d6f1cbc9c"
checksum = "3054f4e81d395e50822796c5e99ca522e6ba7be98947d6d4b0e5e61640bdb894"
dependencies = [
"digest 0.9.0",
"digest",
"hex",
"md-5",
"rand",
"sha2 0.9.9",
"sha2",
]
[[package]]
name = "diqwest"
version = "1.1.1"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e5169a8000168e1ed2347ddd48be77530e1d976625008e89f9c3e4a35169d46"
checksum = "8f5dfddb8994d223bf5b62e0c556d163f96ec07f87908a49c53984901b6157bc"
dependencies = [
"async-trait",
"digest_auth",
@ -1432,7 +1360,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
"digest 0.10.6",
"digest",
]
[[package]]
@ -1528,12 +1456,11 @@ dependencies = [
[[package]]
name = "iana-time-zone-haiku"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
"cxx",
"cxx-build",
"cc",
]
[[package]]
@ -1686,11 +1613,11 @@ checksum = "6204285f77fe7d9784db3fdc449ecce1a0114927a51d5a41c4c7a292011c015f"
dependencies = [
"base64 0.13.1",
"crypto-common",
"digest 0.10.6",
"digest",
"hmac",
"serde",
"serde_json",
"sha2 0.10.6",
"sha2",
]
[[package]]
@ -1713,9 +1640,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.142"
version = "0.2.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
[[package]]
name = "libgpg-error-sys"
@ -1748,15 +1675,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "link-cplusplus"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
dependencies = [
"cc",
]
[[package]]
name = "linux-raw-sys"
version = "0.3.7"
@ -1838,13 +1756,11 @@ dependencies = [
[[package]]
name = "md-5"
version = "0.9.1"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15"
checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
dependencies = [
"block-buffer 0.9.0",
"digest 0.9.0",
"opaque-debug",
"digest",
]
[[package]]
@ -2011,7 +1927,7 @@ dependencies = [
[[package]]
name = "nevmes"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"env_logger",
"nevmes_auth",
@ -2024,7 +1940,7 @@ dependencies = [
[[package]]
name = "nevmes_auth"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"env_logger",
"log 0.4.17",
@ -2034,7 +1950,7 @@ dependencies = [
[[package]]
name = "nevmes_contact"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"env_logger",
"log 0.4.17",
@ -2044,7 +1960,7 @@ dependencies = [
[[package]]
name = "nevmes_core"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"chrono",
"clap",
@ -2063,13 +1979,13 @@ dependencies = [
"schedule_recv",
"serde",
"serde_json",
"sha2 0.10.6",
"sha2",
"tokio",
]
[[package]]
name = "nevmes_gui"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"chrono",
"console_error_panic_hook",
@ -2083,7 +1999,7 @@ dependencies = [
"qrcode",
"reqwest",
"serde",
"sha2 0.10.6",
"sha2",
"tokio",
"tracing",
"tracing-subscriber",
@ -2093,7 +2009,7 @@ dependencies = [
[[package]]
name = "nevmes_message"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"env_logger",
"log 0.4.17",
@ -2285,12 +2201,6 @@ version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
version = "0.10.52"
@ -2504,9 +2414,9 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.26"
version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
dependencies = [
"proc-macro2",
]
@ -2851,12 +2761,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scratch"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
[[package]]
name = "sctk-adwaita"
version = "0.5.4"
@ -2895,18 +2799,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.162"
version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6"
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.162"
version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [
"proc-macro2",
"quote",
@ -2945,19 +2849,6 @@ dependencies = [
"serde",
]
[[package]]
name = "sha2"
version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
dependencies = [
"block-buffer 0.9.0",
"cfg-if",
"cpufeatures",
"digest 0.9.0",
"opaque-debug",
]
[[package]]
name = "sha2"
version = "0.10.6"
@ -2966,7 +2857,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
dependencies = [
"cfg-if",
"cpufeatures",
"digest 0.10.6",
"digest",
]
[[package]]
@ -3134,9 +3025,9 @@ dependencies = [
[[package]]
name = "system-deps"
version = "6.0.5"
version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055"
checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2"
dependencies = [
"cfg-expr",
"heck",
@ -3294,9 +3185,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.28.0"
version = "1.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
dependencies = [
"autocfg",
"bytes",
@ -3430,9 +3321,9 @@ dependencies = [
[[package]]
name = "tracing-core"
version = "0.1.30"
version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
"valuable",
@ -3536,12 +3427,6 @@ dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-width"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "unicode-xid"
version = "0.2.4"
@ -4009,9 +3894,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winit"
version = "0.28.4"
version = "0.28.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "654fd36bd7ea8681c03b70b0748b749d3fe230063c06b3db3ba2af284065a468"
checksum = "94c9651471cd576737671fbf7081edfea43de3e06846dd9bd4e49ea803c9f55f"
dependencies = [
"android-activity",
"bitflags 1.3.2",
@ -4104,9 +3989,9 @@ dependencies = [
[[package]]
name = "xml-rs"
version = "0.8.5"
version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "374b609fb36c36ce3501094dc0548f7df5d8d102224b65bc59812e4a5425d571"
checksum = "dc95a04ea24f543cd9be5aab44f963fa35589c99e18415c38fb2b17e133bf8d2"
[[package]]
name = "yansi"

View file

@ -1,6 +1,6 @@
[package]
name = "nevmes"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -1189,7 +1189,7 @@ dependencies = [
[[package]]
name = "nevmes_auth"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"env_logger",
"log 0.4.17",
@ -1199,7 +1199,7 @@ dependencies = [
[[package]]
name = "nevmes_core"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"chrono",
"clap",

View file

@ -1,6 +1,6 @@
[package]
name = "nevmes_auth"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -1189,7 +1189,7 @@ dependencies = [
[[package]]
name = "nevmes_contact"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"env_logger",
"log 0.4.17",
@ -1199,7 +1199,7 @@ dependencies = [
[[package]]
name = "nevmes_core"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"chrono",
"clap",

View file

@ -1,6 +1,6 @@
[package]
name = "nevmes_contact"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -1189,7 +1189,7 @@ dependencies = [
[[package]]
name = "nevmes_core"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"chrono",
"clap",

View file

@ -1,6 +1,6 @@
[package]
name = "nevmes_core"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -616,7 +616,9 @@ pub async fn estimate_fee() -> u128 {
let mut v_fee: Vec<u128> = Vec::new();
loop {
debug!("current height: {}", height);
if v_fee.len() >= 30 { break; }
if v_fee.len() >= 30 {
break;
}
let r_height = monero::get_height().await;
height = r_height.height - count;
let block = monero::get_block(height).await;

4
nevmes-gui/Cargo.lock generated
View file

@ -2409,7 +2409,7 @@ dependencies = [
[[package]]
name = "nevmes_core"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"chrono",
"clap",
@ -2434,7 +2434,7 @@ dependencies = [
[[package]]
name = "nevmes_gui"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"bytemuck",
"chrono",

View file

@ -1,6 +1,6 @@
[package]
name = "nevmes_gui"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
authors = ["emilk", "creating2morrow"]
license = "MIT OR Apache-2.0"
edition = "2021"

View file

@ -197,7 +197,8 @@ impl eframe::App for AddressBookApp {
if self.s_invoice.pay_threshold > 0 {
send_can_transfer_req(
self.can_transfer_tx.clone(),
ctx.clone(), self.s_invoice.pay_threshold
ctx.clone(),
self.s_invoice.pay_threshold,
);
self.is_estimating_fee = true;
}
@ -296,7 +297,8 @@ impl eframe::App for AddressBookApp {
if self.s_invoice.address != utils::empty_string() && self.can_transfer {
if ui.button("Approve").clicked() {
// activate xmr "transfer", check the hash, update db and refresh
// Note it is simply disabled on insufficient funds as calcd by fee estimator
// Note it is simply disabled on insufficient funds as calcd by fee
// estimator
let d: reqres::Destination = reqres::Destination { address, amount };
send_payment_req(
self.payment_tx.clone(),

View file

@ -39,7 +39,7 @@ fn main() -> Result<(), eframe::Error> {
})
});
eframe::run_native(
"nevmes-gui-v0.3.0-alpha",
"nevmes-gui-v0.4.0-alpha",
options,
Box::new(|cc| Box::new(nevmes_gui::WrapApp::new(cc))),
)

View file

@ -1189,7 +1189,7 @@ dependencies = [
[[package]]
name = "nevmes_core"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"chrono",
"clap",
@ -1214,7 +1214,7 @@ dependencies = [
[[package]]
name = "nevmes_message"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
dependencies = [
"env_logger",
"log 0.4.17",

View file

@ -1,6 +1,6 @@
[package]
name = "nevmes_message"
version = "0.3.0-alpha"
version = "0.4.0-alpha"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html