Skip to content

Commit a9adf57

Browse files
Integrate Spark into QT (#1263)
* integrate spark * update default of Requested payments history, combine mintspark trans, update nTxFee * update spark address book * fix bug for spark address book * add default spark address into spark address book * update migrateLelantusToSpark * fix spendspark crash * update typo * integrate Anonymize All * merge remote branch firo * fix migrateLelantusToSpark * remove close X of the migrate dialog * remove close X of the private dialog * fix the migration issues * fix the migration issues * update for verifying migration * update for verifying migration * update calculating estimated fee of spendspark * fix mintspark/spendspark from an another wallet * fix crash if using the existing wallet * fix bug 1282 & 1288 * Add output spark address & amount * Merge remote-tracking branch 'firo/spark' into spark * remove i * remove addresstype * fix edit spark label, size of address col in transaction history * Version bump * Fix Spark address view on recieverequestdialog * Merge conflict fixed * Review commit resolved * Remove sensitive data from Coin --------- Co-authored-by: levonpetrosyan93 <[email protected]> Co-authored-by: levonpetrosyan93 <[email protected]>
1 parent d784332 commit a9adf57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+3343
-499
lines changed

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 0)
44
define(_CLIENT_VERSION_MINOR, 14)
55
define(_CLIENT_VERSION_REVISION, 12)
6-
define(_CLIENT_VERSION_BUILD, 4)
6+
define(_CLIENT_VERSION_BUILD, 5)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2023)
99
define(_COPYRIGHT_HOLDERS,[The %s developers])

src/Makefile.qt.include

+6-3
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ QT_MOC_CPP = \
200200
qt/moc_lelantuscoincontroldialog.cpp \
201201
qt/moc_automintmodel.cpp \
202202
qt/moc_automintnotification.cpp \
203-
qt/moc_pcodemodel.cpp
203+
qt/moc_pcodemodel.cpp \
204+
qt/moc_sparkmodel.cpp
204205

205206
BITCOIN_MM = \
206207
qt/macdockiconhandler.mm \
@@ -298,7 +299,8 @@ BITCOIN_QT_H = \
298299
qt/lelantusmodel.h \
299300
qt/lelantusdialog.h \
300301
qt/lelantuscoincontroldialog.h \
301-
qt/automintmodel.h
302+
qt/automintmodel.h \
303+
qt/sparkmodel.h
302304

303305
RES_ICONS = \
304306
qt/res/icons/add.png \
@@ -491,7 +493,8 @@ BITCOIN_QT_WALLET_CPP = \
491493
qt/lelantusmodel.cpp \
492494
qt/lelantusdialog.cpp \
493495
qt/lelantuscoincontroldialog.cpp \
494-
qt/automintmodel.cpp
496+
qt/automintmodel.cpp \
497+
qt/sparkmodel.cpp
495498

496499
FIRO_QT_ELYSIUM_CPP = \
497500
qt/elyassetsdialog.cpp \

src/clientversion.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define CLIENT_VERSION_MAJOR 0
1818
#define CLIENT_VERSION_MINOR 14
1919
#define CLIENT_VERSION_REVISION 12
20-
#define CLIENT_VERSION_BUILD 4
20+
#define CLIENT_VERSION_BUILD 5
2121

2222
//! Set to true for release, false for prerelease or test build
2323
#define CLIENT_VERSION_IS_RELEASE true

src/libspark/coin.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ Coin::Coin(
5656
// Type-specific elements
5757
//
5858

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

60+
if (this->type == COIN_TYPE_MINT) {
61+
this->v = v;
6262
// Encrypt recipient data
6363
MintCoinRecipientData r;
6464
r.d = address.get_d();

0 commit comments

Comments
 (0)