Add coincontrol to sigma

noirofficial · Jun 30, 2020 · 6a0f525 · 6a0f525
1 parent 85a0e2e
commit 6a0f525
Show file tree

Hide file tree

Showing 19 changed files with 2,742 additions and 98 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -98,7 +98,8 @@ QT_FORMS_UI = \
   qt/forms/addressbookpage.ui \
   qt/forms/qrcodedialog.ui \
   qt/forms/zerocoinpage.ui \
-  qt/forms/sigmapage.ui \
+  qt/forms/sigmadialog.ui \
+  qt/forms/sigmacoincontroldialog.ui \
   qt/forms/askpassphrasedialog.ui \
   qt/forms/coincontroldialog.ui \
   qt/forms/manualmintdialog.ui \
@@ -129,7 +130,8 @@ QT_MOC_CPP = \
   qt/moc_qrcodedialog.cpp \
   qt/moc_transactionfees.cpp \
   qt/moc_zerocoinpage.cpp \
-  qt/moc_sigmapage.cpp \
+  qt/moc_sigmadialog.cpp \
+  qt/moc_sigmacoincontroldialog.cpp \
   qt/moc_addresstablemodel.cpp \
   qt/moc_askpassphrasedialog.cpp \
   qt/moc_bantablemodel.cpp \
@@ -206,7 +208,8 @@ BITCOIN_QT_H = \
   qt/transactionfees.h \
   Qt/qrcodedialog.h \
   qt/zerocoinpage.h \
-  qt/sigmapage.h \
+  qt/sigmadialog.h \
+  qt/sigmacoincontroldialog.h \
   qt/addresstablemodel.h \
   qt/askpassphrasedialog.h \
   qt/bantablemodel.h \
@@ -354,7 +357,8 @@ BITCOIN_QT_WALLET_CPP = \
   qt/qrcodedialog.cpp \
   qt/transactionfees.cpp \
   qt/zerocoinpage.cpp \
-  qt/sigmapage.cpp \
+  qt/sigmadialog.cpp \
+  qt/sigmacoincontroldialog.cpp \
   qt/addresstablemodel.cpp \
   qt/askpassphrasedialog.cpp \
   qt/manualmintdialog.cpp \

diff --git a/src/main.cpp b/src/main.cpp
@@ -1293,11 +1293,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool &pool, CValidationState &state, const C
         return false;
     }
 
-    //btzc
+    // zerocoin spends
     CZerocoinState *zcState = CZerocoinState::GetZerocoinState();
     CBigNum zcSpendSerial;
 
-    //sigma spends.
+    // sigma spends
     sigma::CSigmaState *sigmaState = sigma::CSigmaState::GetState();
     vector<Scalar> zcSpendSerialsV3;
     {