Skip to content

Commit

Permalink
Merge branch 'dev' into better_scan_handling_in_send_addresses_inner
Browse files Browse the repository at this point in the history
  • Loading branch information
zancas committed Oct 27, 2023
2 parents 46d03b3 + b93c7b2 commit b30dbbb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
zingocli/regtest/data/zcashd/regtest/
zingocli/regtest/data/lightwalletd/
zingocli/regtest/data/zingo/
zingocli/regtest/logs/
zingocli/regtest/zingo-wallet.dat
zingocli/regtest/bin
target
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ Zingo-CLI does automatic note and utxo management, which means it doesn't allow
* Run `rustup update` to get the latest version of Rust if you already have it installed
* Rustfmt
* Run `rustup component add rustfmt` to add rustfmt
* Build tools
* Build Tools
* Please install the build tools for your platform. On Ubuntu `sudo apt install build-essential gcc`
* Protobuf Compiler
* Please install the protobuf compiler for your platform. On Ubuntu `sudo apt install protobuf-compiler`
* OpenSSL Dev
* Please install development packages of openssl. On Ubuntu `sudo apt install libssl-dev`

```
git clone https://github.com/zingolabs/zingolib.git
Expand Down
2 changes: 1 addition & 1 deletion zingolib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[features]
default = ["embed_params", "deprecations"]
deprecations = ["lightclient-deprecated"]
lightclient-deprecated = []
default = ["embed_params"]
embed_params = []

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions zingolib/src/wallet/transactions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -866,11 +866,11 @@ impl TransactionMetadataSet {
if !transaction_metadata
.outgoing_tx_data
.iter()
.any(|known_metadatum| *dbg!(known_metadatum) == outgoing_metadatum)
.any(|known_metadatum| *known_metadatum == outgoing_metadatum)
{
transaction_metadata
.outgoing_tx_data
.push(dbg!(outgoing_metadatum));
.push(outgoing_metadatum);
}
}
} else {
Expand Down

0 comments on commit b30dbbb

Please sign in to comment.