nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #175: gui: bump liana for release

Browse Source 
9fa3cde2991a9ea66ba0f5e2b1da3f40e3d8165e bump liana:master (edouard)

Pull request description:

  TODO: bump this branch again, after milestone is done

ACKs for top commit:
  edouardparis:
    Self-ACK 9fa3cde2991a9ea66ba0f5e2b1da3f40e3d8165e

Tree-SHA512: 55941cba40ffc1ff82ea43a7b46fca40e424a529a76c727ae25a276b88fca2b5a45c9481d43cb30298662b4b1b04a121969cee6407b92b91db7b8dec012e6eb0
This commit is contained in:
edouard 2022-12-09 08:08:40 +01:00
commit d0abaec485
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/Cargo.lock generated
View File

@ -1646,7 +1646,7 @@ dependencies = [
[[package]]
name = "liana"
version = "0.0.1"
source = "git+https://github.com/revault/liana?branch=master#38e342c8cd4c7d5d9d497013aa466fe62c0e3a4b"
source = "git+https://github.com/revault/liana?branch=master#d385e99726733851da9101557cf2dfcbe4c2a2a0"
dependencies = [
"backtrace",
"base64",
@ -1902,8 +1902,8 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniscript"
version = "8.0.0"
source = "git+https://github.com/darosior/rust-miniscript?branch=multipath_descriptors_on_8.0#a63d5a263a9006b4d29342012133a3bc919765ba"
version = "9.0.0"
source = "git+https://github.com/darosior/rust-miniscript?branch=multipath_descriptors_on_9.0#3104519501ce6ad15b36dcec759936f4d3bd3980"
dependencies = [
"bitcoin",
"serde",

2
gui/src/app/mod.rs
View File

@ -119,7 +119,7 @@ impl App {
self.cache.spend_txs = txs.clone();
}
Message::Info(Ok(info)) => {
self.cache.blockheight = info.blockheight;
self.cache.blockheight = info.block_height;
self.cache.rescan_progress = info.rescan_progress;
}
Message::StartRescan(Ok(())) => {

2
gui/src/app/state/spend/step.rs
View File

@ -288,7 +288,7 @@ impl ChooseCoins {
};
// nValue size + scriptPubKey CompactSize + OP_0 + PUSH32 + <wit program>
const CHANGE_TXO_SIZE: usize = 8 + 1 + 1 + 1 + 32;
let satisfaction_vsize = cfg.main_descriptor.change_descriptor().max_sat_weight() / 4;
let satisfaction_vsize = cfg.main_descriptor.max_sat_weight() / 4;
let transaction_size =
tx_template.vsize() + satisfaction_vsize * tx_template.input.len() + CHANGE_TXO_SIZE;

2
gui/src/main.rs
View File

@ -164,7 +164,7 @@ impl Application for GUI {
if let loader::Message::Synced(info, coins, spend_txs, daemon) = *msg {
let cache = Cache {
network: daemon.config().bitcoin_config.network,
blockheight: info.blockheight,
blockheight: info.block_height,
coins,
spend_txs,
..Default::default()