Merge pull request #72 from IamLupo/master

Version 2.0.0.3
DigitalNoteXDN · Aug 5, 2021 · 97d6a5b · 97d6a5b
2 parents e34ff8e + aa6c897
commit 97d6a5b
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ src/DigitalNoted
 *.patch
 *.gch
 *.exe
+*.qm
 .DigitalNote
 DigitalNoted
 DigitalNote-qt

diff --git a/DigitalNote.daemon.pro b/DigitalNote.daemon.pro
@@ -20,6 +20,7 @@ include(include/msse2.pri)
 include(include/daemon/qt_settings.pri)
 include(include/daemon/headers.pri)
 include(include/daemon/sources.pri)
+include(include/daemon/translations.pri)
 
 ## Compile Options
 include(include/options/use_update_alternatives.pri)

diff --git a/DigitalNote_config.pri b/DigitalNote_config.pri
@@ -1,7 +1,7 @@
 DIGITALNOTE_VERSION_MAJOR = 2
 DIGITALNOTE_VERSION_MINOR = 0
 DIGITALNOTE_VERSION_REVISION = 0
-DIGITALNOTE_VERSION_BUILD = 2
+DIGITALNOTE_VERSION_BUILD = 3
 
 DIGITALNOTE_LIB_LEVELDB_DIR = $${DIGITALNOTE_PATH}/src/leveldb
 DIGITALNOTE_LIB_LEVELDB_NEW_DIR = $${DIGITALNOTE_PATH}/src/leveldb-2.11

diff --git a/include/daemon/translations.pri b/include/daemon/translations.pri
@@ -0,0 +1,3 @@
+# for lrelease/lupdate
+# also add new translations to src/qt/bitcoin.qrc under translations/
+TRANSLATIONS = $${DIGITALNOTE_PATH}/src/qt/locale/empty.ts
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       2
 #define CLIENT_VERSION_MINOR       0
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       2
+#define CLIENT_VERSION_BUILD       3
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -240,40 +240,44 @@ CBlock* CreateNewBlock(CReserveKey& reservekey, bool fProofOfStake, int64_t* pFe
 
                 if (!txPrev.ReadFromDisk(txdb, txin.prevout, txindex))
                 {
-                    // This should never happen; all transactions in the memory
-                    // pool should connect to either transactions in the chain
-                    // or other transactions in the memory pool.
-                    if (!mempool.mapTx.count(txin.prevout.hash))
-                    {
-                        LogPrintf("ERROR: mempool transaction missing input\n");
-
-						if (fDebug)
+					#ifdef ENABLE_ORPHAN_TRANSACTIONS
+						// This should never happen; all transactions in the memory
+						// pool should connect to either transactions in the chain
+						// or other transactions in the memory pool.
+						if (!mempool.mapTx.count(txin.prevout.hash))
 						{
-							assert("mempool transaction missing input" == 0);
-                        }
-
-						fMissingInputs = true;
-
-						if (porphan)
+							LogPrintf("ERROR: mempool transaction missing input\n");
+
+							if (fDebug)
+							{
+								assert("mempool transaction missing input" == 0);
+							}
+
+							fMissingInputs = true;
+
+							if (porphan)
+							{
+								vOrphan.pop_back();
+							}
+
+							break;
+						}
+
+						// Has to wait for dependencies
+						if (!porphan)
 						{
-                            vOrphan.pop_back();
+							// Use list for automatic deletion
+							vOrphan.push_back(COrphan(&tx));
+							porphan = &vOrphan.back();
 						}
 
-						break;
-                    }
-
-                    // Has to wait for dependencies
-                    if (!porphan)
-                    {
-                        // Use list for automatic deletion
-                        vOrphan.push_back(COrphan(&tx));
-                        porphan = &vOrphan.back();
-                    }
-
-					mapDependers[txin.prevout.hash].push_back(porphan);
-                    porphan->setDependsOn.insert(txin.prevout.hash);
-                    nTotalIn += mempool.mapTx[txin.prevout.hash].vout[txin.prevout.n].nValue;
-
+						mapDependers[txin.prevout.hash].push_back(porphan);
+						porphan->setDependsOn.insert(txin.prevout.hash);
+						nTotalIn += mempool.mapTx[txin.prevout.hash].vout[txin.prevout.n].nValue;
+					#else // ENABLE_ORPHAN_TRANSACTIONS
+						fMissingInputs = true;
+					#endif // ENABLE_ORPHAN_TRANSACTIONS
+
 					continue;
                 }
 
@@ -297,16 +301,20 @@ CBlock* CreateNewBlock(CReserveKey& reservekey, bool fProofOfStake, int64_t* pFe
             // client code rounds up the size to the nearest 1K. That's good, because it gives an
             // incentive to create smaller transactions.
             double dFeePerKb =  double(nTotalIn-tx.GetValueOut()) / (double(nTxSize)/1000.0);
-
-            if (porphan)
-            {
-                porphan->dPriority = dPriority;
-                porphan->dFeePerKb = dFeePerKb;
-            }
-            else
-			{
-                vecPriority.push_back(TxPriority(dPriority, dFeePerKb, &(*mi).second));
-			}
+
+			#ifdef ENABLE_ORPHAN_TRANSACTIONS
+				if (porphan)
+				{
+					porphan->dPriority = dPriority;
+					porphan->dFeePerKb = dFeePerKb;
+				}
+				else
+				{
+					vecPriority.push_back(TxPriority(dPriority, dFeePerKb, &(*mi).second));
+				}
+			#else // ENABLE_ORPHAN_TRANSACTIONS
+				vecPriority.push_back(TxPriority(dPriority, dFeePerKb, &(*mi).second));
+			#endif // ENABLE_ORPHAN_TRANSACTIONS
         }
 
         // Collect transactions into block

diff --git a/src/qt/locale/empty.ts b/src/qt/locale/empty.ts
@@ -0,0 +1,3 @@
+<?xml version="1.0" ?><!DOCTYPE TS>
+<TS language="ky" version="2.1">
+</TS>