Skip to content

Commit

Permalink
Remove voting output from inputs (#1628)
Browse files Browse the repository at this point in the history
* Remove voting output from inputs, so it doesn't get spent when not calling a function related to it

* Fix deadlock

* Remove voting output from consolidation and claiming

* Bump client

* Update src/account/operations/output_claiming.rs

* Update src/account/operations/output_consolidation.rs

* Update src/account/operations/output_consolidation.rs

Co-authored-by: Thibault Martinez <[email protected]>
  • Loading branch information
Thoralf-M and thibault-martinez authored Nov 30, 2022
1 parent 4e33d66 commit cfc2b3b
Show file tree
Hide file tree
Showing 9 changed files with 314 additions and 305 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ backtrace = { version = "0.3.66", default-features = false, features = [ "std" ]
futures = { version = "0.3.25", default-features = false }
getset = { version = "0.1.2", default-features = false }
# iota-client = { version = "2.0.1-rc.4", default-features = false, features = [ "message_interface", "tls" ] }
iota-client = { git = "https://github.com/iotaledger/iota.rs", rev = "2afcae5b840b3ef070bc9267848548c6c98df1c3", default-features = false, features = [ "message_interface", "tls" ] }
iota-client = { git = "https://github.com/iotaledger/iota.rs", rev = "3715998ad6b81904308402b79ad64e559b5a79dc", default-features = false, features = [ "message_interface", "tls" ] }
iota-crypto = { version = "0.15.3", default-features = false, features = [ "std", "chacha", "blake2b", "ed25519", "random", "slip10", "bip39", "bip39-en" ] }
log = { version = "0.4.17", default-features = false }
packable = { version = "0.7.0", default-features = false, features = [ "serde", "primitive-types" ] }
Expand Down
6 changes: 3 additions & 3 deletions bindings/java/iota-wallet-java/lib/native/Cargo.lock

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

6 changes: 3 additions & 3 deletions bindings/nodejs/Cargo.lock

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

6 changes: 3 additions & 3 deletions bindings/python/Cargo.lock

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

Loading

0 comments on commit cfc2b3b

Please sign in to comment.