Merge remote-tracking branch 'origin/spark' into client-api

firoorg · Nov 15, 2023 · 1b390e2 · 1b390e2
2 parents 880c2df + 33e39f6
commit 1b390e2
Show file tree

Hide file tree

Showing 64 changed files with 3,252 additions and 662 deletions.
diff --git a/configure.ac b/configure.ac
@@ -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])

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -200,7 +200,8 @@ QT_MOC_CPP = \
   qt/moc_createtokendialog.cpp \
   qt/moc_elysiumprivatesenddialog.cpp \
   qt/moc_minttokendialog.cpp \
-  qt/moc_managetokendialog.cpp
+  qt/moc_managetokendialog.cpp \
+  qt/moc_sparkmodel.cpp
 
 BITCOIN_MM = \
   qt/macdockiconhandler.mm \
@@ -298,7 +299,8 @@ BITCOIN_QT_H = \
   qt/createtokendialog.h \
   qt/elysiumprivatesenddialog.h \
   qt/minttokendialog.h \
-  qt/managetokendialog.h
+  qt/managetokendialog.h \
+  qt/sparkmodel.h
 
 RES_ICONS = \
   qt/res/icons/add.png \
@@ -341,6 +343,8 @@ RES_ICONS = \
   qt/res/icons/hd_disabled.png \
   qt/res/icons/hd_enabled.png \
   qt/res/icons/history.png \
+  qt/res/icons/ic_info.png \
+  qt/res/icons/ic_warning.png \
   qt/res/icons/info.png \
   qt/res/icons/key.png \
   qt/res/icons/lock_closed.png \
@@ -361,8 +365,10 @@ RES_ICONS = \
   qt/res/icons/overview.png \
   qt/res/icons/quit.png \
   qt/res/icons/receive.png \
+  qt/res/icons/refresh.png \
   qt/res/icons/remove.png \
   qt/res/icons/send.png \
+  qt/res/icons/spark.png \
   qt/res/icons/synced.png \
   qt/res/icons/tools.png \
   qt/res/icons/transaction0.png \
@@ -495,7 +501,8 @@ BITCOIN_QT_WALLET_CPP = \
   qt/createtokendialog.cpp \
   qt/elysiumprivatesenddialog.cpp \
   qt/minttokendialog.cpp \
-  qt/managetokendialog.cpp
+  qt/managetokendialog.cpp \
+  qt/sparkmodel.cpp
 
 FIRO_QT_ELYSIUM_CPP = \
   qt/elyassetsdialog.cpp \

diff --git a/src/client-api/wallet.cpp b/src/client-api/wallet.cpp
@@ -986,14 +986,14 @@ UniValue editaddressbook(Type type, const UniValue& data, const UniValue& auth,
 UniValue getAvailableSparkBalance(Type type, const UniValue& data, const UniValue& auth, bool fHelp)
 {
     UniValue retval(UniValue::VOBJ);
-    retval.push_back(Pair("amount", pwalletMain->GetAvailableSparkBalance()));
+    retval.push_back(Pair("amount", pwalletMain->sparkWallet->getAvailableBalance()));
     return retval;
 }
 
 UniValue getUnconfirmedSparkBalance(Type type, const UniValue& data, const UniValue& auth, bool fHelp)
 {
     UniValue retval(UniValue::VOBJ);
-    retval.push_back(Pair("amount", pwalletMain->GetUnconfirmedSparkBalance()));
+    retval.push_back(Pair("amount", pwalletMain->sparkWallet->getUnconfirmedBalance()));
     return retval;
 }
 

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -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

diff --git a/src/libspark/coin.cpp b/src/libspark/coin.cpp
@@ -56,9 +56,9 @@ Coin::Coin(
 	// Type-specific elements
 	//
 
-	if (this->type == COIN_TYPE_MINT) {
-		this->v = v;
 
+	if (this->type == COIN_TYPE_MINT) {
+        this->v = v;
 		// Encrypt recipient data
 		MintCoinRecipientData r;
 		r.d = address.get_d();

diff --git a/src/libspark/mint_transaction.cpp b/src/libspark/mint_transaction.cpp
@@ -44,7 +44,7 @@ MintTransaction::MintTransaction(
         } else {
             Coin coin;
             coin.type = 0;
-            coin.r_.ciphertext.resize(32);
+            coin.r_.ciphertext.resize(82); // max possible size
             coin.r_.key_commitment.resize(64);
             coin.r_.tag.resize(16);
             coin.v = 0;