Merge pull request #8 from B3-Coin/master

merged master branch
B3-Coin · Nov 14, 2017 · 4083ff4 · 4083ff4
2 parents 25a1b4d + 6752166
commit 4083ff4
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ B3-Coin is a PoS-based and Proof-Of-Trust(Burnt/Fundamental Nodes) cryptocurrenc
 
 Development process
 ===========================
-# Warning: This branch is highly experimental, please use release branch for services purposes (v2.0)
+# Warning: This branch is highly experimental, please use release branch for services purposes (v3.0)
 
 Developers work in their own trees, then submit pull requests when
 they think their feature or bug fix is ready.

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       3
 #define CLIENT_VERSION_MINOR       0
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       0
+#define CLIENT_VERSION_BUILD       1
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

diff --git a/src/main.cpp b/src/main.cpp
@@ -729,9 +729,9 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CTransaction &tx, bool fLimitFree,
 
         if((tx.GetValueIn(mapInputs) - tx.GetValueOut()) >= FUNDAMENTALNODEAMOUNT){
             nFees = tx.GetValueIn(mapInputs) - FUNDAMENTALNODEAMOUNT - tx.GetValueOut();
-            LogPrintf("Fundamental transaction ");
+            LogPrintf("Fundamental transaction\n");
         } else{
-            LogPrintf(" Not Fundamental transaction ");
+            LogPrintf("Not Fundamental transaction\n");
             nFees = tx.GetValueIn(mapInputs) - tx.GetValueOut();
         }
 
@@ -1633,10 +1633,10 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, MapPrevTx inputs, map<uint256, CTx
 
             if((nValueIn - GetValueOut()) >= FUNDAMENTALNODEAMOUNT ){
                 nTxFee = nValueIn - FUNDAMENTALNODEAMOUNT - GetValueOut();
-                LogPrintf("ConnectInputs : Funamental Transaction");
+                LogPrintf("ConnectInputs : Funamental Transaction\n");
             } else{
                 nTxFee = nValueIn - GetValueOut();
-                LogPrintf("ConnectInputs : Not a Funamental Transaction");
+                LogPrintf("ConnectInputs : Not a Funamental Transaction\n");
             }
 
 
@@ -1790,20 +1790,20 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
             //check if burnt txn for fundamental node
             if((nTxValueIn - nTxValueOut) >= FUNDAMENTALNODEAMOUNT ){
                 IsFnBurntTxn = true;
-                //LogPrintf("IsFnBurntTxn is true now");
+                //LogPrintf("IsFnBurntTxn is true now\n");
             }else {
-                //LogPrintf("IsFnBurntTxn is flase Now, for FNamount = %d, nTxValueIn = %d, nTxValurOut = %d", FUNDAMENTALNODEAMOUNT, nTxValueIn, nTxValueOut);
+                //LogPrintf("IsFnBurntTxn is flase Now, for FNamount = %d, nTxValueIn = %d, nTxValurOut = %d\n", FUNDAMENTALNODEAMOUNT, nTxValueIn, nTxValueOut);
             }
 
             nValueIn += nTxValueIn;
             nValueOut += nTxValueOut;
             if (!tx.IsCoinStake()){
                 if(!IsFnBurntTxn){
                     nFees += nTxValueIn - nTxValueOut;
-                    //LogPrintf("ConnectBlock : Not a Funamental Transaction nFees = %d", nFees);
+                    //LogPrintf("ConnectBlock : Not a Funamental Transaction nFees = %d\n", nFees);
                 } else{
                     nFees += nTxValueIn - FUNDAMENTALNODEAMOUNT - nTxValueOut;
-                    //LogPrintf("ConnectBlock : Funamental Transaction, nFees = %d", nFees);
+                    //LogPrintf("ConnectBlock : Funamental Transaction, nFees = %d\n", nFees);
                 }
                 //nFees += nTxValueIn - nTxValueOut;
             }

diff --git a/src/makefile.unix b/src/makefile.unix
@@ -33,12 +33,12 @@ LIBS += \
    -l ssl \
    -l crypto
 
-I#fndef USE_UPNP
-#	override USE_UPNP = -
-#endif
+ifndef USE_UPNP
+	override USE_UPNP = -
+endif
 #ifneq (${USE_UPNP}, -)
 #	LIBS += -l miniupnpc
-	DEFS += -DUSE_UPNP=$(USE_UPNP)
+#	DEFS += -DUSE_UPNP=$(USE_UPNP)
 #endif
 
 LIBS+= \

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -164,21 +164,22 @@ void SendCoinsDialog::on_sendButton_clicked()
     }
 
     fNewRecipientAllowed = false;
-    if(!IsTimeGood){
-        int ret = QMessageBox::warning(this, tr("Fundamental node Payment"),
-                                        tr("Fundamental node implementation is not started yet\n"
 
-                                           "Please wait till appropriate time."),
-                                        QMessageBox::Ok);
+    if(IsFundamentNodePayment){
 
-        if(ret == QMessageBox::Ok){
-            fNewRecipientAllowed = true;
-            return;
-        }
-    }
+                if(!IsTimeGood){
+                    int ret = QMessageBox::warning(this, tr("Fundamental node Payment"),
+                                                    tr("Fundamental node implementation is not started yet\n"
 
-    if(IsFundamentNodePayment){
+                                                       "Please wait till appropriate time."),
+                                                    QMessageBox::Ok);
 
+                    if(ret == QMessageBox::Ok){
+                        fNewRecipientAllowed = true;
+                        return;
+                    }
+                }
+
                 int ret = QMessageBox::warning(this, tr("Fundamental node Payment"),
                                                 tr("You are about to do burning for Fundamentalnode payment, Please make sure that you send excatly 2500001 excluding fees\n"