-
-
Notifications
You must be signed in to change notification settings - Fork 355
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Integrate Spark into QT #1263
Merged
Merged
Integrate Spark into QT #1263
Changes from 39 commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
50e78f3
integrate spark
giangnamnabka aed27fc
update default of Requested payments history, combine mintspark trans…
giangnamnabka df01abf
update spark address book
giangnamnabka 21b6a75
Merge branch 'firoorg:spark' into spark
giangnamnabka ce05786
fix bug for spark address book
giangnamnabka a889fbb
add default spark address into spark address book
giangnamnabka 5d645ab
update migrateLelantusToSpark
giangnamnabka 5416ce8
fix spendspark crash
giangnamnabka 5bf5bc2
merge remote branch firo
giangnamnabka 3b3d297
update typo
giangnamnabka e903a7c
integrate Anonymize All
giangnamnabka 59cca0a
fix spendspark crash
giangnamnabka 220d50c
merge remote branch firo
giangnamnabka 220e1ef
fix migrateLelantusToSpark
giangnamnabka c783ab6
remove close X of the migrate dialog
giangnamnabka 0c8eedd
remove close X of the private dialog
giangnamnabka 28d55c8
fix the migration issues
giangnamnabka 7f8e5ee
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka e4472c9
fix the migration issues
giangnamnabka 6027bf7
update for verifying migration
giangnamnabka c2f5d36
update for verifying migration
giangnamnabka 6eeab06
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka 6db76fc
update calculating estimated fee of spendspark
giangnamnabka df3f55b
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka 2369172
fix mintspark/spendspark from an another wallet
giangnamnabka 46b0b78
merging firo/spark into firo_spark/spark
giangnamnabka a53d200
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka 019fb01
fix crash if using the existing wallet
giangnamnabka 0f292f6
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka 1f97151
fix bug 1282 & 1288
giangnamnabka c85236d
Add output spark address & amount
giangnamnabka 8195e51
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka 7c7d1d0
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka a0841cd
remove i
giangnamnabka ad85818
remove addresstype
giangnamnabka 92d4c4e
fix edit spark label, size of address col in transaction history
giangnamnabka 546836f
Merge remote-tracking branch 'firo_master/spark' into spark
levonpetrosyan93 6e64131
Version bump
levonpetrosyan93 cb88319
Fix Spark address view on recieverequestdialog
levonpetrosyan93 ea82e86
Merge branch 'firoorg:spark' into spark
levonpetrosyan93 f8792ef
Merge conflict fixed
levonpetrosyan93 1ba7553
Review commit resolved
levonpetrosyan93 0aec9fc
Remove sensitive data from Coin
levonpetrosyan93 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -102,6 +102,7 @@ class Coin { | |
GroupElement S, K, C; // serial commitment, recovery key, value commitment | ||
AEADEncryptedData r_; // encrypted recipient data | ||
uint64_t v; // value | ||
Address address; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove this too. |
||
std::vector<unsigned char> serial_context; // context to which the serial commitment should be bound (not serialized, but inferred) | ||
|
||
// Serialization depends on the coin type | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not agree to do this change, Very risky to add v and address into Spark::Coin, even if we don't serailize them, wallet knows this data inside CSparkMintMeta, please use it to get this data, and revert this two lines.