Refactor transaction creation.

Author: sproxet

src/Makefile.test.include

@@ -192,7 +192,8 @@ BITCOIN_TESTS += \
   wallet/test/lelantus_tests.cpp \
   wallet/test/sigma_tests.cpp \
   wallet/test/mnemonic_tests.cpp \
-  wallet/test/txbuilder_tests.cpp
+  wallet/test/sigmatxbuilder_tests.cpp \
+  wallet/test/createtransaction_tests.cpp
 endif
 
 test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) -ltor

src/elysium/elysium.cpp

@@ -2291,7 +2291,7 @@ int elysium::WalletTxBuilder(
     switch (inputMode) {
     case InputMode::NORMAL:
         // Ask the wallet to create the transaction (note mining fee determined by Bitcoin Core params)
-        if (!pwalletMain->CreateTransaction(vecRecipients, wtxNew, reserveKey, nFeeRet, nChangePosInOut, strFailReason, &coinControl)) {
+        if (!pwalletMain->CreateTransaction(vecRecipients, wtxNew, &reserveKey, nFeeRet, nChangePosInOut, strFailReason, &coinControl)) {
             PrintToLog("%s: ERROR: wallet transaction creation failed: %s\n", __func__, strFailReason);
             return MP_ERR_CREATE_TX;
         }

src/llmq/quorums_instantsend.h

@@ -75,9 +75,6 @@ class CInstantSendDb
 class CInstantSendManager : public CRecoveredSigsListener
 {
 private:
-    CCriticalSection cs;
-    CInstantSendDb db;
-
     std::thread workThread;
     CThreadInterrupt workInterrupt;
 
@@ -113,6 +110,9 @@ class CInstantSendManager : public CRecoveredSigsListener
     std::atomic_bool isNewInstantSendEnabled{false};
 
 public:
+    CCriticalSection cs;
+    CInstantSendDb db;
+
     CInstantSendManager(CDBWrapper& _llmqDb);
     ~CInstantSendManager();
 

src/primitives/transaction.h

@@ -170,7 +170,7 @@ class CTxOut
 public:
     CAmount nValue;
     CScript scriptPubKey;
-    int nRounds;
+    int nRounds = -10;
 
     CTxOut()
     {

src/qt/walletmodel.cpp

@@ -344,7 +344,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
 
         CWalletTx *newTx = transaction.getTransaction();
         CReserveKey *keyChange = transaction.getPossibleKeyChange();
-        bool fCreated = wallet->CreateTransaction(vecSend, *newTx, *keyChange, nFeeRequired, nChangePosRet, strFailReason, coinControl);
+        bool fCreated = wallet->CreateTransaction(vecSend, *newTx, keyChange, nFeeRequired, nChangePosRet, strFailReason, coinControl);
         transaction.setTransactionFee(nFeeRequired);
         if (fSubtractFeeFromAmount && fCreated)
             transaction.reassignAmounts(nChangePosRet);

src/rpc/rpcevo.cpp

@@ -213,7 +213,7 @@ static void FundSpecialTx(CWallet* pwallet, CMutableTransaction& tx, const Speci
     int nChangePos = -1;
     std::string strFailReason;
 
-    if (!pwallet->CreateTransaction(vecSend, wtx, reservekey, nFee, nChangePos, strFailReason, &coinControl, false, tx.vExtraPayload.size())) {
+    if (!pwallet->CreateTransaction(vecSend, wtx, &reservekey, nFee, nChangePos, strFailReason, &coinControl, false, tx.vExtraPayload.size())) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
     }
 

src/script/script.cpp

@@ -211,6 +211,16 @@ unsigned int CScript::GetSigOpCount(const CScript& scriptSig) const
     return subscript.GetSigOpCount(true);
 }
 
+bool CScript::IsPayToPublicKey() const {
+    if (size() != 35) return false;
+
+    opcodetype opcode;
+    const_iterator pc = begin();
+    GetOp(pc, opcode);
+    GetOp(pc, opcode);
+    return opcode == OP_CHECKSIG;
+}
+
 bool CScript::IsNormalPaymentScript() const
 {
     if(this->size() != 25) return false;

src/script/script.h

@@ -653,6 +653,7 @@ class CScript : public CScriptBase
     unsigned int GetSigOpCount(const CScript& scriptSig) const;
     bool IsNormalPaymentScript() const;
 
+    bool IsPayToPublicKey() const;
     bool IsPayToPublicKeyHash() const;
 
     bool IsPayToScriptHash() const;

src/sync.cpp

@@ -8,7 +8,7 @@
 #include "utilstrencodings.h"
 
 #include <stdio.h>
-
+#include <set>
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
 
@@ -57,7 +57,7 @@ struct CLockLocation {
 
 typedef std::vector<std::pair<void*, CLockLocation> > LockStack;
 typedef std::map<std::pair<void*, void*>, LockStack> LockOrders;
-typedef std::set<std::pair<void*, void*> > InvLockOrders;
+typedef std::set<std::pair<void*, void*>> InvLockOrders;
 
 struct LockData {
     // Very ugly hack: as the global constructs and destructors run single
@@ -164,7 +164,7 @@ void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLi
         if (i.first == cs) {
             fprintf(stderr, "Assertion failed: lock %s held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str());
             abort();
-        }
+       }
     }
 }
 

src/test/test_bitcoin.cpp

@@ -114,8 +114,8 @@ TestingSetup::TestingSetup(const std::string& chainName, std::string suf) : Basi
 
         // Init HD mint
 
-        // Create new keyUser and set as default key
-        // generate a new master key
+        pwalletMain->GenerateNewMnemonic();
+
         CPubKey masterPubKey = pwalletMain->GenerateNewHDMasterKey();
         pwalletMain->SetHDMasterKey(masterPubKey);
         CPubKey newDefaultKey;