Merge pull request #76 from mceme/masterendecrypt

superblock on
mceme · Dec 4, 2020 · f9dfe67 · f9dfe67
2 parents 113315c + 01a1b80
commit f9dfe67
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -27,7 +27,7 @@
  * Todo: update this when changing our copyright comments in the source
  */
 #define COPYRIGHT_YEAR 2017
-#define COPYRIGHT_YEARIMG 2020
+#define COPYRIGHT_YEARIMG 2021
 
 #endif //HAVE_CONFIG_H
 

diff --git a/src/masternode-payments.h b/src/masternode-payments.h
@@ -23,8 +23,8 @@ static const int MNPAYMENTS_SIGNATURES_TOTAL            = 10;
 //  vote for masternode and be elected as a payment winner
 // V1 - Last protocol version before update
 // V2 - Newest protocol version
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70215;
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70218;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70220;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70221;
 
 extern CCriticalSection cs_vecPayees;
 extern CCriticalSection cs_mapMasternodeBlocks;

diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp
@@ -65,9 +65,6 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
         	{
 
 
-
-
-
     		 std::string delimiter = ":img:";
 
     		 std::string mimg = encodestr.substr(5);// remove mimg:
@@ -77,7 +74,7 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
     		  std::size_t pos = mimg.find(delimiter);      // position of ":img:" in str
 
 
-
+              if(pos>0){ // check exists :img:
     		 std::string message =  mimg.substr (0, pos);
 
     		 //LogPrintf("message: %s", message);
@@ -89,11 +86,17 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
 
 
     		 encodestr=imgbase64;
+              }   // end check exists :img:
+
         	}
 
     	if(ismessagetpye2 == "m:" || ismessagetpye5 == "from:")
         	 { //message
 
+    		if(ismessagetpye2 == "m:"){
+    		     encodestr = encodestr.substr(2);// remove m:
+    		}
+
         		 ui->DownloadButton->setVisible(false);
         		 desc = desc + "<br><b><b>"+encodestr.c_str();
         		 ui->detailText->setHtml(desc);

diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
@@ -81,7 +81,7 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
         return false;
     if(datetime < dateFrom || datetime > dateTo)
         return false;
-    if (!address.contains(addrPrefix, Qt::CaseInsensitive) && addrPrefix2.isEmpty() &&  !label.contains(addrPrefix, Qt::CaseInsensitive))
+    if (!address.contains(addrPrefix, Qt::CaseInsensitive) && addrPrefix2.isEmpty() && !label.contains(addrPrefix, Qt::CaseInsensitive) && !qimgbase64.contains(addrPrefix, Qt::CaseInsensitive))
         return false;
 
 

diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -589,6 +589,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
         	if(qimgbase64.size()>2) {
         		QString mensage = qimgbase64.section(":", 0, 0, QString::SectionSkipEmpty);
         	     if(mensage=="m") qimgbase64 = qimgbase64.mid(2);
+        	     if(mensage=="mimg") qimgbase64 = qimgbase64.mid(5);
         	     if(mensage=="from") qimgbase64 = qimgbase64.mid(40);
         	}
 

diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
@@ -107,7 +107,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
 
     addressWidget = new QLineEdit(this);
 #if QT_VERSION >= 0x040700
-    addressWidget->setPlaceholderText(tr("Enter address or label to search"));
+    addressWidget->setPlaceholderText(tr("Enter address or message to search"));
 #endif
     addressWidget->setObjectName("addressWidget");
     hlayout->addWidget(addressWidget);

diff --git a/src/spork.h b/src/spork.h
@@ -33,7 +33,7 @@ static const int64_t SPORK_2_INSTANTSEND_ENABLED_DEFAULT                = 0;
 static const int64_t SPORK_3_INSTANTSEND_BLOCK_FILTERING_DEFAULT        = 0;            // ON
 static const int64_t SPORK_5_INSTANTSEND_MAX_VALUE_DEFAULT              = 10000;         // 10000 IMG
 static const int64_t SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT     = 1533081600;// 01/07/2018
-static const int64_t SPORK_9_SUPERBLOCKS_ENABLED_DEFAULT                = 4070908800ULL;// OFF
+static const int64_t SPORK_9_SUPERBLOCKS_ENABLED_DEFAULT                = 0; // ON
 static const int64_t SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT      = 4070908800ULL;// OFF
 static const int64_t SPORK_12_RECONSIDER_BLOCKS_DEFAULT                 = 0;            // 0 BLOCKS
 static const int64_t SPORK_13_OLD_SUPERBLOCK_FLAG_DEFAULT               = 4070908800ULL;// OFF

diff --git a/src/version.h b/src/version.h
@@ -10,7 +10,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70220;
+static const int PROTOCOL_VERSION = 70221;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -19,7 +19,7 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 70215;
+static const int MIN_PEER_PROTO_VERSION = 70220;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this