Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
Ash-L2L committed May 29, 2024
1 parent ba16ebd commit 5c7086f
Show file tree
Hide file tree
Showing 13 changed files with 1,691 additions and 698 deletions.
106 changes: 93 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ authors = [
"Nikita Chashchinskii <[email protected]>"
]
edition = "2021"
version = "0.8.9"
version = "0.9.0"

[workspace.dependencies.bip300301]
git = "https://github.com/Ash-L2L/bip300301.git"
rev = "64568dee7b89fe8c021226f10b17a18fe3386871"
rev = "5e12a72b7f72df33307e21d054c41652b556a9b3"

[workspace.dependencies.rustreexo]
git = "https://github.com/Ash-L2L/rustreexo.git"
Expand Down
6 changes: 4 additions & 2 deletions app/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,11 @@ impl App {
.await?;
// miner_write.generate().await?;
tracing::trace!("confirming bmm...");
if let Some((header, body)) = miner_write.confirm_bmm().await? {
if let Some((main_hash, header, body)) =
miner_write.confirm_bmm().await?
{
tracing::trace!("confirmed bmm, submitting block");
self.node.submit_block(&header, &body).await?;
self.node.submit_block(main_hash, &header, &body).await?;
}
drop(miner_write);
self.update_wallet()?;
Expand Down
2 changes: 1 addition & 1 deletion app/gui/parent_chain/info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ impl Info {
let mainchain_tip = app.runtime.block_on(async {
let mainchain_tip_blockhash = dc.get_mainchain_tip().await?;
dc.client
.getblock(&mainchain_tip_blockhash, None)
.getblock(mainchain_tip_blockhash, None)
.map_err(bip300301::Error::Jsonrpsee)
.await
})?;
Expand Down
Loading

0 comments on commit 5c7086f

Please sign in to comment.