Skip to content
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 43 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
50e78f3
integrate spark
giangnamnabka May 24, 2023
aed27fc
update default of Requested payments history, combine mintspark trans…
giangnamnabka May 25, 2023
df01abf
update spark address book
giangnamnabka May 30, 2023
21b6a75
Merge branch 'firoorg:spark' into spark
giangnamnabka May 30, 2023
ce05786
fix bug for spark address book
giangnamnabka May 31, 2023
a889fbb
add default spark address into spark address book
giangnamnabka May 31, 2023
5d645ab
update migrateLelantusToSpark
giangnamnabka May 31, 2023
5416ce8
fix spendspark crash
giangnamnabka Jun 4, 2023
5bf5bc2
merge remote branch firo
giangnamnabka Jun 5, 2023
3b3d297
update typo
giangnamnabka Jun 5, 2023
e903a7c
integrate Anonymize All
giangnamnabka Jun 8, 2023
59cca0a
fix spendspark crash
giangnamnabka Jun 4, 2023
220d50c
merge remote branch firo
giangnamnabka Jun 8, 2023
220e1ef
fix migrateLelantusToSpark
giangnamnabka Jun 8, 2023
c783ab6
remove close X of the migrate dialog
giangnamnabka Jun 9, 2023
0c8eedd
remove close X of the private dialog
giangnamnabka Jun 12, 2023
28d55c8
fix the migration issues
giangnamnabka Jun 14, 2023
7f8e5ee
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka Jun 14, 2023
e4472c9
fix the migration issues
giangnamnabka Jun 14, 2023
6027bf7
update for verifying migration
giangnamnabka Jun 16, 2023
c2f5d36
update for verifying migration
giangnamnabka Jun 17, 2023
6eeab06
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka Jun 20, 2023
6db76fc
update calculating estimated fee of spendspark
giangnamnabka Jun 20, 2023
df3f55b
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka Jun 21, 2023
2369172
fix mintspark/spendspark from an another wallet
giangnamnabka Jun 22, 2023
46b0b78
merging firo/spark into firo_spark/spark
giangnamnabka Jun 26, 2023
a53d200
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka Jul 4, 2023
019fb01
fix crash if using the existing wallet
giangnamnabka Jul 13, 2023
0f292f6
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka Jul 13, 2023
1f97151
fix bug 1282 & 1288
giangnamnabka Aug 3, 2023
c85236d
Add output spark address & amount
giangnamnabka Aug 24, 2023
8195e51
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka Aug 25, 2023
7c7d1d0
Merge remote-tracking branch 'firo/spark' into spark
giangnamnabka Aug 25, 2023
a0841cd
remove i
giangnamnabka Aug 27, 2023
ad85818
remove addresstype
giangnamnabka Aug 28, 2023
92d4c4e
fix edit spark label, size of address col in transaction history
giangnamnabka Sep 7, 2023
546836f
Merge remote-tracking branch 'firo_master/spark' into spark
levonpetrosyan93 Sep 18, 2023
6e64131
Version bump
levonpetrosyan93 Sep 18, 2023
cb88319
Fix Spark address view on recieverequestdialog
levonpetrosyan93 Oct 15, 2023
ea82e86
Merge branch 'firoorg:spark' into spark
levonpetrosyan93 Nov 5, 2023
f8792ef
Merge conflict fixed
levonpetrosyan93 Nov 5, 2023
1ba7553
Review commit resolved
levonpetrosyan93 Nov 6, 2023
0aec9fc
Remove sensitive data from Coin
levonpetrosyan93 Nov 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 14)
define(_CLIENT_VERSION_REVISION, 12)
define(_CLIENT_VERSION_BUILD, 4)
define(_CLIENT_VERSION_BUILD, 5)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
9 changes: 6 additions & 3 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ QT_MOC_CPP = \
qt/moc_lelantuscoincontroldialog.cpp \
qt/moc_automintmodel.cpp \
qt/moc_automintnotification.cpp \
qt/moc_pcodemodel.cpp
qt/moc_pcodemodel.cpp \
qt/moc_sparkmodel.cpp

BITCOIN_MM = \
qt/macdockiconhandler.mm \
Expand Down Expand Up @@ -298,7 +299,8 @@ BITCOIN_QT_H = \
qt/lelantusmodel.h \
qt/lelantusdialog.h \
qt/lelantuscoincontroldialog.h \
qt/automintmodel.h
qt/automintmodel.h \
qt/sparkmodel.h

RES_ICONS = \
qt/res/icons/add.png \
Expand Down Expand Up @@ -491,7 +493,8 @@ BITCOIN_QT_WALLET_CPP = \
qt/lelantusmodel.cpp \
qt/lelantusdialog.cpp \
qt/lelantuscoincontroldialog.cpp \
qt/automintmodel.cpp
qt/automintmodel.cpp \
qt/sparkmodel.cpp

FIRO_QT_ELYSIUM_CPP = \
qt/elyassetsdialog.cpp \
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 14
#define CLIENT_VERSION_REVISION 12
#define CLIENT_VERSION_BUILD 4
#define CLIENT_VERSION_BUILD 5

//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
4 changes: 2 additions & 2 deletions src/libspark/coin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ Coin::Coin(
// Type-specific elements
//

this->v = v;
this->address = address;
Copy link
Contributor

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.

if (this->type == COIN_TYPE_MINT) {
this->v = v;

// Encrypt recipient data
MintCoinRecipientData r;
r.d = address.get_d();
Expand Down
1 change: 1 addition & 0 deletions src/libspark/coin.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Contributor

Choose a reason for hiding this comment

The 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
Expand Down
Loading