author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
714,098 | 01.01.2018 11:37:02 | 18,000 | 6205345f2bd8078471f79dfb83927223e10f8eda | finish removing chat/radio before tor finalization | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "#include \"notificator.h\"\n#include \"guiutil.h\"\n#include \"rpcconsole.h\"\n-#include \"chatwindow.h\"\n-#include \"radio.h\"\n#ifdef Q_OS_MAC\n#include \"macdockiconhandler.h\"\n@@ -251,7 +249,6 @@ void BitcoinGUI::createActions()\nconnect(blockAction, SIGNAL(triggered()), this, SLOT(gotoBlockBrowser()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(gotoOverviewPage()));\n- // connect(chatAction, SIGNAL(triggered()), this, SLOT(gotoChatPage()));\nconnect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(gotoSendCoinsPage()));\nconnect(receiveCoinsAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\n@@ -260,7 +257,6 @@ void BitcoinGUI::createActions()\nconnect(historyAction, SIGNAL(triggered()), this, SLOT(gotoHistoryPage()));\nconnect(addressBookAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(addressBookAction, SIGNAL(triggered()), this, SLOT(gotoAddressBookPage()));\n- // connect(radioAction, SIGNAL(triggered()), this, SLOT(gotoRadioPage()));\nquitAction = new QAction(QIcon(\":/icons/quit\"), tr(\"E&xit\"), this);\nquitAction->setToolTip(tr(\"Quit application\"));\n@@ -349,8 +345,6 @@ void BitcoinGUI::createToolBars()\ntoolbar->addAction(historyAction);\ntoolbar->addAction(addressBookAction);\ntoolbar->addAction(blockAction);\n- // toolbar->addAction(chatAction);\n- // toolbar->addAction(radioAction);\nQToolBar *toolbar2 = addToolBar(tr(\"Actions toolbar\"));\n@@ -413,14 +407,12 @@ void BitcoinGUI::setWalletModel(WalletModel *walletModel)\n// Put transaction list in tabs\ntransactionView->setModel(walletModel);\n- chatWindow->setModel(clientModel);\noverviewPage->setModel(walletModel, this);\naddressBookPage->setModel(walletModel->getAddressTableModel());\nreceiveCoinsPage->setModel(walletModel->getAddressTableModel());\nsendCoinsPage->setModel(walletModel);\nsignVerifyMessageDialog->setModel(walletModel);\nblockBrowser->setModel(clientModel);\n- radioPage->setModel(walletModel);\nsetEncryptionStatus(walletModel->getEncryptionStatus());\nconnect(walletModel, SIGNAL(encryptionStatusChanged(int)), this, SLOT(setEncryptionStatus(int)));\n"
}
]
| C++ | MIT License | vergecurrency/verge | finish removing chat/radio before tor finalization |
714,098 | 01.01.2018 11:40:28 | 18,000 | 2a43cd401b02b9b98e9b598b9e77e023644bdaf5 | more chat removal | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.qt.include",
"new_path": "src/Makefile.qt.include",
"diff": "@@ -32,7 +32,6 @@ QT_MOC_CPP = \\\nqt/moc_blockbrowser.cpp \\\nqt/moc_clientmodel.cpp \\\nqt/moc_csvmodelwriter.cpp \\\n- qt/moc_serveur.cpp \\\nqt/moc_editaddressdialog.cpp \\\nqt/moc_guiutil.cpp \\\nqt/moc_macdockiconhandler.cpp \\\n@@ -102,7 +101,6 @@ BITCOIN_QT_H = \\\nqt/transactionrecord.h \\\nqt/transactiontablemodel.h \\\nqt/transactionview.h \\\n- qt/serveur.h \\\nqt/walletmodel.h\nRES_ICONS = \\\n@@ -162,7 +160,6 @@ BITCOIN_QT_CPP = \\\nqt/blockbrowser.cpp \\\nqt/clientmodel.cpp \\\nqt/csvmodelwriter.cpp \\\n- qt/serveur.cpp \\\nqt/guiutil.cpp \\\nqt/monitoreddatamapper.cpp \\\nqt/notificator.cpp \\\n@@ -181,7 +178,6 @@ BITCOIN_QT_CPP += \\\nqt/blockbrowser.cpp \\\nqt/editaddressdialog.cpp \\\nqt/overviewpage.cpp \\\n- qt/serveur.cpp \\\nqt/sendcoinsdialog.cpp \\\nqt/sendcoinsentry.cpp \\\nqt/signverifymessagedialog.cpp \\\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/serveur.cpp",
"new_path": null,
"diff": "-/*Copyright (C) 2009 Cleriot Simon\n-*\n-* This program is free software; you can redistribute it and/or\n-* modify it under the terms of the GNU Lesser General Public\n-* License as published by the Free Software Foundation; either\n-* version 2.1 of the License, or (at your option) any later version.\n-*\n-* This program is distributed in the hope that it will be useful,\n-* but WITHOUT ANY WARRANTY; without even the implied warranty of\n-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n-* Lesser General Public License for more details.\n-*\n-* You should have received a copy of the GNU Lesser General Public\n-* License along with this program; if not, write to the Free Software\n-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA*/\n-#include <QScrollBar>\n-#include \"serveur.h\"\n-#include \"chatwindow.h\"\n- QStringList users;\n- bool delist = true;\n-Serveur::Serveur()\n-{\n- connect(this, SIGNAL(readyRead()), this, SLOT(readServeur()));\n- connect(this, SIGNAL(connected()), this, SLOT(connected()));\n- connect(this, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(errorSocket(QAbstractSocket::SocketError)));\n-\n- updateUsers=false;\n-}\n-\n-void Serveur::errorSocket(QAbstractSocket::SocketError error)\n-{\n- switch(error)\n- {\n- case QAbstractSocket::HostNotFoundError:\n- affichage->append(tr(\"<em>ERROR : can't find freenode server.</em>\"));\n- break;\n- case QAbstractSocket::ConnectionRefusedError:\n- affichage->append(tr(\"<em>ERROR : server refused connection</em>\"));\n- break;\n- case QAbstractSocket::RemoteHostClosedError:\n- affichage->append(tr(\"<em>ERROR : server cut connection</em>\"));\n- break;\n- default:\n- affichage->append(tr(\"<em>ERROR : \") + this->errorString() + tr(\"</em>\"));\n- }\n-}\n-\n-void Serveur::connected()\n-{\n- affichage->append(\"Connecting...\");\n-\n- sendData(\"USER \"+pseudo+\" localhost \"+serveur+\" :\"+pseudo);\n- sendData(\"NICK \"+pseudo);\n- affichage->append(\"Connected to freenode.\");\n-}\n-\n-void Serveur::joins()\n-{\n- join(\"#verge\");\n-}\n-\n-void Serveur::readServeur()\n-{\n- QString message=QString::fromUtf8(this->readAll());\n-\n- QString currentChan=tab->tabText(tab->currentIndex());\n-\n- if(message.startsWith(\"PING :\"))\n- {\n- QStringList liste=message.split(\" \");\n- QString msg=\"PONG \"+liste.at(1);\n- sendData(msg);\n- }\n- else if(message.contains(\"Nickname is already in use.\"))\n- {\n- pseudo=pseudo+\"_2\";\n- pseudo.remove(\"\\r\\n\");\n- sendData(\"NICK \"+pseudo);\n- emit pseudoChanged(pseudo);\n- ecrire(\"-> Name changed to \"+pseudo);\n- }\n- else if(updateUsers==true)\n- {\n- updateUsersList(\"\",message);\n- }\n-\n- QStringList list=message.split(\"\\r\\n\");\n- foreach(QString msg,list)\n- {\n- if(msg.contains(QRegExp(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ PRIVMSG ([a-zA-Z0-9\\\\#]+) :(.+)\")))\n- {\n- QRegExp reg(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ PRIVMSG ([a-zA-Z0-9\\\\#]+) :(.+)\");\n- QString msg2=msg;\n- ecrire(msg.replace(reg,\"\\\\2 <b><\\\\1></b> \\\\3\"),\"\",msg2.replace(reg,\"\\\\2 <\\\\1> \\\\3\"));\n- }\n- else if(msg.contains(QRegExp(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ JOIN ([a-zA-Z0-9\\\\#]+)\")))\n- {\n- QRegExp reg(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ JOIN ([a-zA-Z0-9\\\\#]+)\");\n- QString msg2=msg;\n- ecrire(msg.replace(reg,\"\\\\2 <i>-> \\\\1 join \\\\2</i><br />\"),\"\",msg2.replace(reg,\"-> \\\\1 join \\\\2\"));\n- updateUsersList(msg.replace(reg,\"\\\\2\"));\n- }\n- else if(msg.contains(QRegExp(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ PART ([a-zA-Z0-9\\\\#]+)\")))\n- {\n- QRegExp reg(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ PART ([a-zA-Z0-9\\\\#]+) :(.+)\");\n- QString msg2=msg;\n- ecrire(msg.replace(reg,\"\\\\2 <i>-> \\\\1 quit \\\\2 (\\\\3)</i><br />\"),\"\",msg2.replace(reg,\"-> \\\\1 quit \\\\2\"));\n- updateUsersList(msg.replace(reg,\"\\\\2\"));\n- }\n- else if(msg.contains(QRegExp(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ QUIT (.+)\")))\n- {\n- QRegExp reg(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ QUIT (.+)\");\n- QString msg2=msg;\n- ecrire(msg.replace(reg,\"\\\\2 <i>-> \\\\1 quit this server (\\\\2)</i><br />\"),\"\",msg2.replace(reg,\"-> \\\\1 left\"));\n- updateUsersList(msg.replace(reg,\"\\\\2\"));\n- }\n- else if(msg.contains(QRegExp(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ NICK :(.+)\")))\n- {\n- QRegExp reg(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ NICK :(.+)\");\n- QString msg2=msg;\n- ecrire(msg.replace(reg,\"<i>\\\\1 is now called \\\\2</i><br />\"),\"\",msg2.replace(reg,\"-> \\\\1 is now called \\\\2\"));\n- updateUsersList(currentChan);\n- }\n- else if(msg.contains(QRegExp(\":([a-zA-Z0-9]+)\\\\![a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ KICK ([a-zA-Z0-9\\\\#]+) ([a-zA-Z0-9]+) :(.+)\")))\n- {\n- QRegExp reg(\":([a-zA-Z0-9]+)\\\\!~[a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ KICK ([a-zA-Z0-9\\\\#]+) ([a-zA-Z0-9]+) :(.+)\");\n- QString msg2=msg;\n- ecrire(msg.replace(reg,\"\\\\2 <i>-> \\\\1 kicked \\\\3 (\\\\4)</i><br />\"),\"\",msg2.replace(reg,\"-> \\\\1 quit \\\\3\"));\n- updateUsersList(msg.replace(reg,\"\\\\2\"));\n- }\n- else if(msg.contains(QRegExp(\":([a-zA-Z0-9]+)\\\\![a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ NOTICE ([a-zA-Z0-9]+) :(.+)\")))\n- {\n- if(conversations.contains(currentChan))\n- {\n- QRegExp reg(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ NOTICE [a-zA-Z0-9]+ :(.+)\");\n- ecrire(msg.replace(reg,\"<b>[NOTICE] <i>\\\\1</i> : \\\\2 <br />\"),currentChan);\n- }\n- else if(currentChan==serveur)\n- {\n- QRegExp reg(\":([a-zA-Z0-9]+)\\\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\\\/\\\\.-]+ NOTICE [a-zA-Z0-9]+ :(.+)\");\n- ecrire(msg.replace(reg,\"<b>[NOTICE] <i>\\\\1</i> : \\\\2 <br />\"));\n- }\n- }\n- else if(msg.contains(\"/MOTD command.\"))\n- {\n- joins();\n- }\n- else if(msg.contains(QRegExp(\"= ([a-zA-Z0-9\\\\#]+) :\")))\n- {\n-\n- QStringList msg3 = msg.split(\"= \");\n- QStringList msg4 = msg3[1].split(\" :\");\n- updateUsersList(msg4[0],msg);\n- }\n- else\n- {\n- QString trimmedMsg = msg.trimmed();\n- QStringList splitMsg = trimmedMsg.split(\" \");\n- if((splitMsg.size() > 7 && (splitMsg.at(3)+splitMsg.at(4)+splitMsg.at(5)+splitMsg.at(6)+splitMsg.at(7)).toStdString() == \"#verge:Endof/NAMESlist.\") ||\n- (splitMsg.size() > 7 && (splitMsg.at(3)+splitMsg.at(4)+splitMsg.at(5)+splitMsg.at(6)+splitMsg.at(7)).toStdString() == \"#verge:Endof/WHOlist.\") ||\n- (splitMsg.size() > 1 && splitMsg.at(0).toStdString() == \"PING\"))\n- return;\n- ecrire(trimmedMsg, QString::fromStdString(\"Console/PM\"));\n- }\n- }\n-}\n-\n-\n-void Serveur::sendData(QString txt)\n-{\n- if(this->state()==QAbstractSocket::ConnectedState)\n- {\n- this->write((txt+\"\\r\\n\").toUtf8());\n- }\n-}\n-\n-QString Serveur::parseCommande(QString comm,bool serveur)\n-{\n- if(comm.startsWith(\"/\"))\n- {\n- comm.remove(0,1);\n- QString pref=comm.split(\" \").first();\n- QStringList args=comm.split(\" \");\n- args.removeFirst();\n- QString destChan=tab->tabText(tab->currentIndex());\n- QString msg=args.join(\" \");\n-\n- if(pref==\"me\")\n- return \"PRIVMSG \"+destChan+\" \u0001ACTION \" + msg + \"\u0001\";\n- else if(pref==\"join\")\n- {\n- join(msg);\n- return \" \";\n- }\n- else if(pref==\"part\")\n- {\n- tab->removeTab(tab->currentIndex());\n-\n- if(msg == \"\")\n- {\n- if(msg.startsWith(\"#\"))\n- destChan=msg.split(\" \").first();\n-\n- if(msgQuit==\"\")\n- return \"PART \"+destChan+\" using IrcLightClient\";\n- else\n- return \"PART \"+destChan+\" \"+msgQuit;\n- }\n- else\n- return \"PART \"+destChan+\" \"+msg;\n-\n- conversations.remove(destChan);\n- }\n- else if(pref==\"kick\")\n- {\n- QStringList tableau=msg.split(\" \");\n- QString c1,c2,c3;\n- if(tableau.count() > 0) c1=\" \"+tableau.first();\n- else c1=\"\";\n- if(tableau.count() > 1) c2=\" \"+tableau.at(1);\n- else c2=\"\";\n- if(tableau.count() > 2) c3=\" \"+tableau.at(2);\n- else c3=\"\";\n-\n- if(c1.startsWith(\"#\"))\n- return \"KICK\"+c1+c2+c3;\n- else\n- return \"KICK \"+destChan+c1+c2;\n- }\n- else if(pref==\"update\")\n- {\n- updateUsers=true;\n- return \"NAMES \"+destChan;\n- }\n- else if(pref==\"ns\")\n- {\n- return \"NICKSERV \"+msg;\n- }\n- else if(pref==\"nick\")\n- {\n- emit pseudoChanged(msg);\n- ecrire(\"-> Nickname changed to \"+msg);\n- return \"NICK \"+msg;\n- }\n- else\n- return pref+\" \"+msg;\n- }\n- else if(!serveur)\n- {\n- QString destChan=tab->tabText(tab->currentIndex());\n- if(comm.endsWith(\"<br />\"))\n- comm=comm.remove(QRegExp(\"<br />$\"));\n- ecrire(\"<b><\"+pseudo+\"></b> \"+comm,destChan);\n-\n- return \"PRIVMSG \"+destChan+\" :\"+comm;\n- }\n- else\n- {\n- return \"\";\n- }\n-}\n-\n-void Serveur::join(QString chan)\n-{\n- affichage->append(\"Joining \"+ chan +\" channel\");\n- emit joinTab();\n- QTextEdit *textEdit=new QTextEdit;\n- int index=tab->insertTab(tab->currentIndex()+1,textEdit,chan);\n- tab->setTabToolTip(index,serveur);\n- tab->setCurrentIndex(index);\n-\n- textEdit->setReadOnly(true);\n-\n- conversations.insert(chan,textEdit);\n-\n- sendData(\"JOIN \"+chan);\n-\n- emit tabJoined();\n-}\n-void Serveur::leave(QString chan)\n-{\n- sendData(parseCommande(\"/part \"+chan+ \" \"+msgQuit));\n-}\n-\n-void Serveur::ecrire(QString txt,QString destChan,QString msgTray)\n-{\n- if(destChan.toStdString() == \"Console/PM\")\n- {\n- affichage->setHtml(affichage->toHtml()+txt);\n- QScrollBar *sb = affichage->verticalScrollBar();\n- sb->setValue(sb->maximum());\n- }\n- else if(destChan!=\"\")\n- {\n- conversations[destChan]->setHtml(conversations[destChan]->toHtml()+txt);\n- QScrollBar *sb = conversations[destChan]->verticalScrollBar();\n- sb->setValue(sb->maximum());\n- }\n- else if(txt.startsWith(\"#\"))\n- {\n- QString dest=txt.split(\" \").first();\n- QStringList list=txt.split(\" \");\n- list.removeFirst();\n- txt=list.join(\" \");\n- conversations[dest]->setHtml(conversations[dest]->toHtml()+txt);\n- QScrollBar *sb = conversations[dest]->verticalScrollBar();\n- sb->setValue(sb->maximum());\n- }\n- else\n- {\n- affichage->setHtml(affichage->toHtml()+txt);\n- QScrollBar *sb = affichage->verticalScrollBar();\n- sb->setValue(sb->maximum());\n- }\n-}\n-\n-void Serveur::updateUsersList(QString chan,QString message)\n-{\n- message = message.replace(\"\\r\\n\",\"\");\n- message = message.replace(\"\\r\",\"\");\n- if(chan!=serveur)\n- {\n- if(updateUsers==true || message != \"\")\n- {\n- QString liste2=message.replace(\":\",\"\");\n- QStringList liste=liste2.split(\" \");\n-\n- if (delist == true) users.clear();\n-\n- for(int i=5; i < liste.count(); i++)\n- {\n- users.append(liste.at(i));\n- }\n- updateUsers=false;\n- if (liste.count() < 53) delist = true;\n- else delist = false;\n- QStringListModel *model = new QStringListModel(users);\n- userList->setModel(model);\n- userList->update();\n- }\n- else\n- {\n- updateUsers=true;\n- sendData(\"NAMES \"+chan);\n- }\n- }\n- else\n- {\n- QStringListModel model;\n- userList->setModel(&model);\n- userList->update();\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/serveur.h",
"new_path": null,
"diff": "-/*Copyright (C) 2009 Cleriot Simon\n-*\n-* This program is free software; you can redistribute it and/or\n-* modify it under the terms of the GNU Lesser General Public\n-* License as published by the Free Software Foundation; either\n-* version 2.1 of the License, or (at your option) any later version.\n-*\n-* This program is distributed in the hope that it will be useful,\n-* but WITHOUT ANY WARRANTY; without even the implied warranty of\n-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n-* Lesser General Public License for more details.\n-*\n-* You should have received a copy of the GNU Lesser General Public\n-* License along with this program; if not, write to the Free Software\n-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA*/\n-\n-#ifndef SERVEUR_H\n-#define SERVEUR_H\n-\n-\n-#include <QListView>\n-#include <QTextEdit>\n-#include <QtGui>\n-#include <QtNetwork>\n-#include <QWidget>\n-#include <QSystemTrayIcon>\n-\n-class Serveur : public QTcpSocket\n-{\n- Q_OBJECT\n-\n- public:\n- Serveur();\n- QTextEdit *affichage;\n- QListView *userList;\n- QString pseudo,serveur,msgQuit;\n- int port;\n- QTabWidget *tab;\n- QMap<QString,QTextEdit *> conversations;\n- QSystemTrayIcon *tray;\n-\n- bool updateUsers;\n-\n- QString parseCommande(QString comm,bool serveur=false);\n-\n- QWidget *parent;\n-\n-\n- signals:\n- void pseudoChanged(QString newPseudo);\n- void joinTab();\n- void tabJoined();\n-\n- public slots:\n- void readServeur();\n- void errorSocket(QAbstractSocket::SocketError);\n- void connected();\n- void joins();\n- void sendData(QString txt);\n- void join(QString chan);\n- void leave(QString chan);\n- void ecrire(QString txt,QString destChan=\"\",QString msgTray=\"\");\n- void updateUsersList(QString chan=\"\",QString message=\"\");\n-\n- //void tabChanged(int index);\n-};\n-\n-#endif // SERVEUR_H\n"
},
{
"change_type": "DELETE",
"old_path": "src/serveur.h",
"new_path": null,
"diff": "-/*Copyright (C) 2009 Cleriot Simon\n-*\n-* This program is free software; you can redistribute it and/or\n-* modify it under the terms of the GNU Lesser General Public\n-* License as published by the Free Software Foundation; either\n-* version 2.1 of the License, or (at your option) any later version.\n-*\n-* This program is distributed in the hope that it will be useful,\n-* but WITHOUT ANY WARRANTY; without even the implied warranty of\n-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n-* Lesser General Public License for more details.\n-*\n-* You should have received a copy of the GNU Lesser General Public\n-* License along with this program; if not, write to the Free Software\n-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA*/\n-\n-#ifndef SERVEUR_H\n-#define SERVEUR_H\n-\n-#include <QWidget>\n-#include <QListView>\n-#include <QTextEdit>\n-#include <QtGui>\n-#include <QtNetwork>\n-#include <QSystemTrayIcon>\n-\n-class Serveur : public QTcpSocket\n-{\n- Q_OBJECT\n-\n- public:\n- Serveur();\n- QTextEdit *affichage;\n- QListView *userList;\n- QString pseudo,serveur,msgQuit;\n- int port;\n- QTabWidget *tab;\n- QMap<QString,QTextEdit *> conversations;\n- QSystemTrayIcon *tray;\n-\n- bool updateUsers;\n-\n- QString parseCommande(QString comm,bool serveur=false);\n-\n- QWidget *parent;\n-\n-\n- signals:\n- void pseudoChanged(QString newPseudo);\n- void joinTab();\n- void tabJoined();\n-\n- public slots:\n- void readServeur();\n- void errorSocket(QAbstractSocket::SocketError);\n- void connected();\n- void joins();\n- void sendData(QString txt);\n- void join(QString chan);\n- void leave(QString chan);\n- void ecrire(QString txt,QString destChan=\"\",QString msgTray=\"\");\n- void updateUsersList(QString chan=\"\",QString message=\"\");\n-\n- //void tabChanged(int index);\n-};\n-\n-#endif // SERVEUR_H\n\\ No newline at end of file\n"
}
]
| C++ | MIT License | vergecurrency/verge | more chat removal |
714,098 | 01.01.2018 12:49:54 | 18,000 | ab84d904a1f8a4c66fb9858c38de33fd29610e7b | sendtostealthaddress in nonstring param type | [
{
"change_type": "MODIFY",
"old_path": "src/bitcoinrpc.cpp",
"new_path": "src/bitcoinrpc.cpp",
"diff": "@@ -1176,6 +1176,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri\nif (strMethod == \"setgenerate\" && n > 0) ConvertTo<bool>(params[0]);\nif (strMethod == \"setgenerate\" && n > 1) ConvertTo<boost::int64_t>(params[1]);\nif (strMethod == \"sendtoaddress\" && n > 1) ConvertTo<double>(params[1]);\n+ if (strMethod == \"sendtostealthaddress\" && n > 1) ConvertTo<double>(params[1]);\nif (strMethod == \"settxfee\" && n > 0) ConvertTo<double>(params[0]);\nif (strMethod == \"getreceivedbyaddress\" && n > 1) ConvertTo<boost::int64_t>(params[1]);\nif (strMethod == \"getreceivedbyaccount\" && n > 1) ConvertTo<boost::int64_t>(params[1]);\n"
}
]
| C++ | MIT License | vergecurrency/verge | sendtostealthaddress in nonstring param type |
714,098 | 01.01.2018 13:27:56 | 18,000 | e7dfc5f778c32f48c8d2817deebc97b37df237fe | fix address input length to accomodate stealth tx | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/sendcoinsentry.ui",
"new_path": "src/qt/forms/sendcoinsentry.ui",
"diff": "<item>\n<widget class=\"QValidatedLineEdit\" name=\"payTo\">\n<property name=\"toolTip\">\n- <string>The address to send the payment to (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5)</string>\n+ <string>The address to send the payment to (e.g. DDd1pVWr8PPAw1z7DRwoUW6maWh5SsnCcp)</string>\n</property>\n<property name=\"maxLength\">\n- <number>34</number>\n+ <number>80</number>\n</property>\n</widget>\n</item>\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix address input length to accomodate stealth tx |
714,098 | 01.01.2018 16:07:35 | 18,000 | e3612923a51016fc78e470d9e15a744d6ad64cb5 | fix stealth in editaddress tab | [
{
"change_type": "MODIFY",
"old_path": "src/qt/editaddressdialog.cpp",
"new_path": "src/qt/editaddressdialog.cpp",
"diff": "@@ -19,16 +19,24 @@ EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :\ncase NewReceivingAddress:\nsetWindowTitle(tr(\"New receiving address\"));\nui->addressEdit->setEnabled(false);\n+ ui->addressEdit->setVisible(false);\n+ ui->stealthCB->setEnabled(true);\n+ ui->stealthCB->setVisible(true);\nbreak;\ncase NewSendingAddress:\nsetWindowTitle(tr(\"New sending address\"));\n+ ui->stealthCB->setVisible(false);\nbreak;\ncase EditReceivingAddress:\nsetWindowTitle(tr(\"Edit receiving address\"));\n- ui->addressEdit->setDisabled(true);\n+ ui->addressEdit->setEnabled(false);\n+ ui->addressEdit->setVisible(true);\n+ ui->stealthCB->setEnabled(false);\n+ ui->stealthCB->setVisible(true);\nbreak;\ncase EditSendingAddress:\nsetWindowTitle(tr(\"Edit sending address\"));\n+ ui->stealthCB->setVisible(false);\nbreak;\n}\n@@ -44,9 +52,12 @@ EditAddressDialog::~EditAddressDialog()\nvoid EditAddressDialog::setModel(AddressTableModel *model)\n{\nthis->model = model;\n+ if(!model)\n+ return;\nmapper->setModel(model);\nmapper->addMapping(ui->labelEdit, AddressTableModel::Label);\nmapper->addMapping(ui->addressEdit, AddressTableModel::Address);\n+ mapper->addMapping(ui->stealthCB, AddressTableModel::Type);\n}\nvoid EditAddressDialog::loadRow(int row)\n@@ -62,10 +73,14 @@ bool EditAddressDialog::saveCurrentRow()\n{\ncase NewReceivingAddress:\ncase NewSendingAddress:\n+ {\n+ int typeInd = ui->stealthCB->isChecked() ? AddressTableModel::AT_Stealth : AddressTableModel::AT_Normal;\naddress = model->addRow(\nmode == NewSendingAddress ? AddressTableModel::Send : AddressTableModel::Receive,\nui->labelEdit->text(),\n- ui->addressEdit->text());\n+ ui->addressEdit->text(),\n+ typeInd);\n+ }\nbreak;\ncase EditReceivingAddress:\ncase EditSendingAddress:\n@@ -86,31 +101,33 @@ void EditAddressDialog::accept()\n{\nswitch(model->getEditStatus())\n{\n- case AddressTableModel::DUPLICATE_ADDRESS:\n+ case AddressTableModel::OK:\n+ // Failed with unknown reason. Just reject.\n+ break;\n+ case AddressTableModel::NO_CHANGES:\n+ // No changes were made during edit operation. Just reject.\n+ break;\n+ case AddressTableModel::INVALID_ADDRESS:\nQMessageBox::warning(this, windowTitle(),\n- tr(\"The entered address \\\"%1\\\" is already in the address book.\").arg(ui->addressEdit->text()),\n+ tr(\"The entered address \\\"%1\\\" is not a valid Fantom address.\").arg(ui->addressEdit->text()),\nQMessageBox::Ok, QMessageBox::Ok);\nbreak;\n- case AddressTableModel::INVALID_ADDRESS:\n+ case AddressTableModel::DUPLICATE_ADDRESS:\nQMessageBox::warning(this, windowTitle(),\n- tr(\"The entered address \\\"%1\\\" is not a valid VERGE address.\").arg(ui->addressEdit->text()),\n+ tr(\"The entered address \\\"%1\\\" is already in the address book.\").arg(ui->addressEdit->text()),\nQMessageBox::Ok, QMessageBox::Ok);\n- return;\n+ break;\ncase AddressTableModel::WALLET_UNLOCK_FAILURE:\nQMessageBox::critical(this, windowTitle(),\ntr(\"Could not unlock wallet.\"),\nQMessageBox::Ok, QMessageBox::Ok);\n- return;\n+ break;\ncase AddressTableModel::KEY_GENERATION_FAILURE:\nQMessageBox::critical(this, windowTitle(),\ntr(\"New key generation failed.\"),\nQMessageBox::Ok, QMessageBox::Ok);\n- return;\n- case AddressTableModel::OK:\n- // Failed with unknown reason. Just reject.\nbreak;\n}\n-\nreturn;\n}\nQDialog::accept();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/editaddressdialog.h",
"new_path": "src/qt/editaddressdialog.h",
"diff": "#include <QDialog>\n-QT_BEGIN_NAMESPACE\n-class QDataWidgetMapper;\n-QT_END_NAMESPACE\n-\nnamespace Ui {\nclass EditAddressDialog;\n}\nclass AddressTableModel;\n+QT_BEGIN_NAMESPACE\n+class QDataWidgetMapper;\n+QT_END_NAMESPACE\n+\n/** Dialog for editing an address and associated information.\n*/\nclass EditAddressDialog : public QDialog\n@@ -32,10 +32,10 @@ public:\nvoid setModel(AddressTableModel *model);\nvoid loadRow(int row);\n- void accept();\n-\nQString getAddress() const;\nvoid setAddress(const QString &address);\n+public slots:\n+ void accept();\nprivate:\nbool saveCurrentRow();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/rpcwallet.cpp",
"new_path": "src/rpcwallet.cpp",
"diff": "@@ -1776,7 +1776,7 @@ Value getnewstealthaddress(const Array& params, bool fHelp)\nif (fHelp || params.size() > 1)\nthrow runtime_error(\n\"getnewstealthaddress [label]\\n\"\n- \"Returns a new OpalCoin stealth address for receiving payments anonymously. \");\n+ \"Returns a new Verge stealth address for receiving payments anonymously. \");\nif (pwalletMain->IsLocked())\nthrow runtime_error(\"Failed: Wallet must be unlocked.\");\n@@ -1978,7 +1978,7 @@ Value sendtostealthaddress(const Array& params, bool fHelp)\nif (!sxAddr.SetEncoded(sEncoded))\n{\n- result.push_back(Pair(\"result\", \"Invalid OpalCoin stealth address.\"));\n+ result.push_back(Pair(\"result\", \"Invalid Verge stealth address.\"));\nreturn result;\n};\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix stealth in editaddress tab |
714,098 | 01.01.2018 16:20:27 | 18,000 | 5d36e4e7381dec2c607cf7b56a973ce03fc8c9fb | more stealth updates for gui | [
{
"change_type": "MODIFY",
"old_path": "src/qt/addresstablemodel.cpp",
"new_path": "src/qt/addresstablemodel.cpp",
"diff": "@@ -21,10 +21,11 @@ struct AddressTableEntry\nType type;\nQString label;\nQString address;\n+ bool stealth;\nAddressTableEntry() {}\n- AddressTableEntry(Type type, const QString &label, const QString &address):\n- type(type), label(label), address(address) {}\n+ AddressTableEntry(Type type, const QString &label, const QString &address, const bool &stealth = false):\n+ type(type), label(label), address(address), stealth(stealth) {}\n};\nstruct AddressTableEntryLessThan\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/addresstablemodel.h",
"new_path": "src/qt/addresstablemodel.h",
"diff": "@@ -20,7 +20,7 @@ public:\nenum EAddressType {\nAT_Unknown = 0, /**< User specified label */\n- AT_Normal = 1, /**< Bitcoin address */\n+ AT_Normal = 1, /**< Verge Public address */\nAT_Stealth = 2, /**< Stealth address */\nAT_BIP32 = 3, /**< BIP32 address */\nAT_Group = 4, /**< BIP32 address */\n@@ -28,7 +28,8 @@ public:\nenum ColumnIndex {\nLabel = 0, /**< User specified label */\n- Address = 1 /**< Bitcoin address */\n+ Address = 1 /**< Verge Public address */\n+ Type = 2 /** < Verge Stealth Address */\n};\nenum RoleIndex {\n@@ -38,6 +39,7 @@ public:\n/** Return status of edit/insert operation */\nenum EditStatus {\nOK,\n+ NO_CHANGES, /**< No changes were made during edit operation */\nINVALID_ADDRESS, /**< Unparseable address */\nDUPLICATE_ADDRESS, /**< Address already in address book */\nWALLET_UNLOCK_FAILURE, /**< Wallet could not be unlocked to create new receiving address */\n@@ -62,7 +64,7 @@ public:\n/* Add an address to the model.\nReturns the added address on success, and an empty string otherwise.\n*/\n- QString addRow(const QString &type, const QString &label, const QString &address);\n+ QString addRow(const QString &type, const QString &label, const QString &address, int addressType);\n/* Look up label for address in address book, if not found return empty string.\n*/\n@@ -85,9 +87,6 @@ private:\n/** Notify listeners that data changed. */\nvoid emitDataChanged(int index);\n-signals:\n- void defaultAddressChanged(const QString &address);\n-\npublic slots:\n/* Update address list from core.\n*/\n"
}
]
| C++ | MIT License | vergecurrency/verge | more stealth updates for gui |
714,098 | 01.01.2018 16:33:45 | 18,000 | 141fbe765386bf44ec962f8897a9b8f994458e15 | fix table model for addr | [
{
"change_type": "MODIFY",
"old_path": "src/qt/addresstablemodel.cpp",
"new_path": "src/qt/addresstablemodel.cpp",
"diff": "#include \"addresstablemodel.h\"\n+\n#include \"guiutil.h\"\n#include \"walletmodel.h\"\n#include \"base58.h\"\n#include <QFont>\n-#include <QColor>\n+#include <QDebug>\nconst QString AddressTableModel::Send = \"S\";\nconst QString AddressTableModel::Receive = \"R\";\n@@ -69,7 +70,19 @@ public:\nQString::fromStdString(strName),\nQString::fromStdString(address.ToString())));\n}\n+\n+ std::set<CStealthAddress>::iterator it;\n+ for (it = wallet->stealthAddresses.begin(); it != wallet->stealthAddresses.end(); ++it)\n+ {\n+ bool fMine = !(it->scan_secret.size() < 1);\n+ cachedAddressTable.append(AddressTableEntry(fMine ? AddressTableEntry::Receiving : AddressTableEntry::Sending,\n+ QString::fromStdString(it->label),\n+ QString::fromStdString(it->Encoded()),\n+ true));\n+ };\n}\n+ // qLowerBound() and qUpperBound() require our cachedAddressTable list to be sorted in asc order\n+ qSort(cachedAddressTable.begin(), cachedAddressTable.end(), AddressTableEntryLessThan());\n}\nvoid updateEntry(const QString &address, const QString &label, bool isMine, int status)\n@@ -89,7 +102,7 @@ public:\ncase CT_NEW:\nif(inModel)\n{\n- OutputDebugStringF(\"Warning: AddressTablePriv::updateEntry: Got CT_NOW, but entry is already in model\\n\");\n+ qDebug() << \"AddressTablePriv::updateEntry : Warning: Got CT_NEW, but entry is already in model\";\nbreak;\n}\nparent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex);\n@@ -99,7 +112,7 @@ public:\ncase CT_UPDATED:\nif(!inModel)\n{\n- OutputDebugStringF(\"Warning: AddressTablePriv::updateEntry: Got CT_UPDATED, but entry is not in model\\n\");\n+ qDebug() << \"AddressTablePriv::updateEntry : Warning: Got CT_UPDATED, but entry is not in model\";\nbreak;\n}\nlower->type = newEntryType;\n@@ -109,7 +122,7 @@ public:\ncase CT_DELETED:\nif(!inModel)\n{\n- OutputDebugStringF(\"Warning: AddressTablePriv::updateEntry: Got CT_DELETED, but entry is not in model\\n\");\n+ qDebug() << \"AddressTablePriv::updateEntry : Warning: Got CT_DELETED, but entry is not in model\";\nbreak;\n}\nparent->beginRemoveRows(QModelIndex(), lowerIndex, upperIndex-1);\n@@ -216,24 +229,58 @@ bool AddressTableModel::setData(const QModelIndex & index, const QVariant & valu\nAddressTableEntry *rec = static_cast<AddressTableEntry*>(index.internalPointer());\neditStatus = OK;\n-\n+ std::string strTemp, strValue;\nif(role == Qt::EditRole)\n{\nswitch(index.column())\n{\ncase Label:\n- wallet->SetAddressBookName(CBitcoinAddress(rec->address.toStdString()).Get(), value.toString().toStdString());\n- rec->label = value.toString();\n+ // Do nothing, if old label == new label\n+ if(rec->label == value.toString())\n+ {\n+ editStatus = NO_CHANGES;\n+ return false;\n+ }\n+\n+ strTemp = rec->address.toStdString();\n+ if (IsStealthAddress(strTemp))\n+ {\n+ strValue = value.toString().toStdString();\n+ wallet->UpdateStealthAddress(strTemp, strValue, false);\n+ } else\n+ {\n+ wallet->SetAddressBookName(CBitcoinAddress(strTemp).Get(), value.toString().toStdString());\n+ }\nbreak;\ncase Address:\n+ std::string sTemp = value.toString().toStdString();\n+ if (IsStealthAddress(sTemp))\n+ {\n+ printf(\"TODO\\n\");\n+ editStatus = INVALID_ADDRESS;\n+ return false;\n+ }\n+ // Do nothing, if old address == new address\n+ if(CBitcoinAddress(rec->address.toStdString()) == CBitcoinAddress(value.toString().toStdString()))\n+ {\n+ editStatus = NO_CHANGES;\n+ return false;\n+ }\n// Refuse to set invalid address, set error status and return false\n- if(!walletModel->validateAddress(value.toString()))\n+ else if(!walletModel->validateAddress(value.toString()))\n{\neditStatus = INVALID_ADDRESS;\nreturn false;\n}\n+ // Check for duplicate addresses to prevent accidental deletion of addresses, if you try\n+ // to paste an existing address over another address (with a different label)\n+ else if(wallet->mapAddressBook.count(CBitcoinAddress(value.toString().toStdString()).Get()))\n+ {\n+ editStatus = DUPLICATE_ADDRESS;\n+ return false;\n+ }\n// Double-check that we're not overwriting a receiving address\n- if(rec->type == AddressTableEntry::Sending)\n+ else if(rec->type == AddressTableEntry::Sending)\n{\n{\nLOCK(wallet->cs_wallet);\n@@ -245,7 +292,6 @@ bool AddressTableModel::setData(const QModelIndex & index, const QVariant & valu\n}\nbreak;\n}\n-\nreturn true;\n}\nreturn false;\n@@ -296,11 +342,11 @@ QModelIndex AddressTableModel::index(int row, int column, const QModelIndex & pa\nvoid AddressTableModel::updateEntry(const QString &address, const QString &label, bool isMine, int status)\n{\n- // Update address book model from Bitcoin core\n+ // Update address book model from Verge Core\npriv->updateEntry(address, label, isMine, status);\n}\n-QString AddressTableModel::addRow(const QString &type, const QString &label, const QString &address)\n+QString AddressTableModel::addRow(const QString &type, const QString &label, const QString &address, int addressType)\n{\nstd::string strLabel = label.toStdString();\nstd::string strAddress = address.toStdString();\n@@ -309,11 +355,36 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con\nif(type == Send)\n{\n- if(!walletModel->validateAddress(address))\n+ if (strAddress.length() > 75)\n+ {\n+ CStealthAddress sxAddr;\n+ if (!sxAddr.SetEncoded(strAddress))\n{\neditStatus = INVALID_ADDRESS;\nreturn QString();\n}\n+\n+ // -- Check for duplicate addresses\n+ {\n+ LOCK(wallet->cs_wallet);\n+\n+ if (wallet->stealthAddresses.count(sxAddr))\n+ {\n+ editStatus = DUPLICATE_ADDRESS;\n+ return QString();\n+ };\n+\n+ sxAddr.label = strLabel;\n+ wallet->AddStealthAddress(sxAddr);\n+ }\n+\n+ } else\n+ {\n+ if (!walletModel->validateAddress(address))\n+ {\n+ editStatus = INVALID_ADDRESS;\n+ return QString();\n+ };\n// Check for duplicate addresses\n{\nLOCK(wallet->cs_wallet);\n@@ -321,6 +392,9 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con\n{\neditStatus = DUPLICATE_ADDRESS;\nreturn QString();\n+ };\n+\n+ wallet->SetAddressBookName(CBitcoinAddress(strAddress).Get(), strLabel);\n}\n}\n}\n@@ -328,29 +402,47 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con\n{\n// Generate a new address to associate with given label\nWalletModel::UnlockContext ctx(walletModel->requestUnlock());\n+\nif(!ctx.isValid())\n{\n// Unlock wallet failed or was cancelled\neditStatus = WALLET_UNLOCK_FAILURE;\nreturn QString();\n}\n- CPubKey newKey;\n- if(!wallet->GetKeyFromPool(newKey, true))\n+\n+ if (addressType == AT_Stealth)\n+ {\n+ CStealthAddress newStealthAddr;\n+ std::string sError;\n+ if (!wallet->NewStealthAddress(sError, strLabel, newStealthAddr)\n+ || !wallet->AddStealthAddress(newStealthAddr))\n{\neditStatus = KEY_GENERATION_FAILURE;\nreturn QString();\n}\n- strAddress = CBitcoinAddress(newKey.GetID()).ToString();\n- }\n- else\n+ strAddress = newStealthAddr.Encoded();\n+ } else\n+ {\n+ CPubKey newKey;\n+ if(!wallet->GetKeyFromPool(newKey))\n{\n+ editStatus = KEY_GENERATION_FAILURE;\nreturn QString();\n}\n- // Add entry\n+ strAddress = CBitcoinAddress(newKey.GetID()).ToString();\n+\n{\nLOCK(wallet->cs_wallet);\nwallet->SetAddressBookName(CBitcoinAddress(strAddress).Get(), strLabel);\n}\n+ }\n+ }\n+ else\n+ {\n+ return QString();\n+ }\n+\n+\nreturn QString::fromStdString(strAddress);\n}\n@@ -377,13 +469,30 @@ QString AddressTableModel::labelForAddress(const QString &address) const\n{\n{\nLOCK(wallet->cs_wallet);\n- CBitcoinAddress address_parsed(address.toStdString());\n+ std::string sAddr = address.toStdString();\n+\n+ if (sAddr.length() > 75)\n+ {\n+ CStealthAddress sxAddr;\n+ if (!sxAddr.SetEncoded(sAddr))\n+ return QString();\n+\n+ std::set<CStealthAddress>::iterator it;\n+ it = wallet->stealthAddresses.find(sxAddr);\n+ if (it == wallet->stealthAddresses.end())\n+ return QString();\n+\n+ return QString::fromStdString(it->label);\n+ } else\n+ {\n+ CBitcoinAddress address_parsed(sAddr);\nstd::map<CTxDestination, std::string>::iterator mi = wallet->mapAddressBook.find(address_parsed.Get());\nif (mi != wallet->mapAddressBook.end())\n{\nreturn QString::fromStdString(mi->second);\n}\n}\n+ }\nreturn QString();\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix table model for addr |
714,098 | 01.01.2018 17:39:01 | 18,000 | 51584d29e932ba6c576efeeff5fe14dfa74f6e29 | address book cleanup | [
{
"change_type": "MODIFY",
"old_path": "src/qt/editaddressdialog.cpp",
"new_path": "src/qt/editaddressdialog.cpp",
"diff": "@@ -109,7 +109,7 @@ void EditAddressDialog::accept()\nbreak;\ncase AddressTableModel::INVALID_ADDRESS:\nQMessageBox::warning(this, windowTitle(),\n- tr(\"The entered address \\\"%1\\\" is not a valid Fantom address.\").arg(ui->addressEdit->text()),\n+ tr(\"The entered address \\\"%1\\\" is not a valid Verge address.\").arg(ui->addressEdit->text()),\nQMessageBox::Ok, QMessageBox::Ok);\nbreak;\ncase AddressTableModel::DUPLICATE_ADDRESS:\n"
}
]
| C++ | MIT License | vergecurrency/verge | address book cleanup |
714,120 | 02.01.2018 01:05:38 | 18,000 | c5130db5bdce043a65c32e71800043501af73611 | fix context menu items | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -205,43 +205,43 @@ void BitcoinGUI::createActions()\n{\nQActionGroup *tabGroup = new QActionGroup(this);\n- overviewAction = new QAction(QIcon(\":/icons/overview\"), \"\", this);\n+ overviewAction = new QAction(QIcon(\":/icons/overview\"), tr(\"&Overview\"), this);\noverviewAction->setToolTip(tr(\"Show general overview of wallet\"));\noverviewAction->setCheckable(true);\noverviewAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_1));\ntabGroup->addAction(overviewAction);\n- sendCoinsAction = new QAction(QIcon(\":/icons/send\"), \"\", this);\n+ sendCoinsAction = new QAction(QIcon(\":/icons/send\"), tr(\"&Send coins\"), this);\nsendCoinsAction->setToolTip(tr(\"Send coins to a VERGE address\"));\nsendCoinsAction->setCheckable(true);\nsendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));\ntabGroup->addAction(sendCoinsAction);\n- receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), \"\", this);\n+ receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), tr(\"&Receive coins\"), this);\nreceiveCoinsAction->setToolTip(tr(\"Show the list of addresses for receiving payments\"));\nreceiveCoinsAction->setCheckable(true);\nreceiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));\ntabGroup->addAction(receiveCoinsAction);\n- historyAction = new QAction(QIcon(\":/icons/history\"), \"\", this);\n+ historyAction = new QAction(QIcon(\":/icons/history\"), tr(\"&Transactions\"), this);\nhistoryAction->setToolTip(tr(\"Browse transaction history\"));\nhistoryAction->setCheckable(true);\nhistoryAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));\ntabGroup->addAction(historyAction);\n- addressBookAction = new QAction(QIcon(\":/icons/address-book\"), \"\", this);\n+ addressBookAction = new QAction(QIcon(\":/icons/address-book\"), tr(\"&Address Book\"), this);\naddressBookAction->setToolTip(tr(\"Edit the list of stored addresses and labels\"));\naddressBookAction->setCheckable(true);\naddressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));\ntabGroup->addAction(addressBookAction);\n- blockAction = new QAction(QIcon(\":/icons/block\"), \"\", this);\n+ blockAction = new QAction(QIcon(\":/icons/block\"), tr(\"&Block Explorer\"), this);\nblockAction->setToolTip(tr(\"Explore the BlockChain\"));\nblockAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));\nblockAction->setCheckable(true);\ntabGroup->addAction(blockAction);\n- exportAction = new QAction(QIcon(\":/icons/export\"), \"\", this);\n+ exportAction = new QAction(QIcon(\":/icons/export\"), tr(\"&Export...\"), this);\nexportAction->setToolTip(tr(\"Export the data in the current tab to a file\"));\nopenRPCConsoleAction = new QAction(QIcon(\":/icons/debugwindow\"), tr(\"&Debug window\"), this);\nopenRPCConsoleAction->setToolTip(tr(\"Open debugging and diagnostic console\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix context menu items |
714,098 | 02.01.2018 03:13:29 | 18,000 | bda636d1c656a76e5e901fa3c03a2fe34f048dd3 | remove qtwebkit & webkitwidgets | [
{
"change_type": "MODIFY",
"old_path": "src/m4/bitcoin_qt.m4",
"new_path": "src/m4/bitcoin_qt.m4",
"diff": "@@ -236,8 +236,8 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[\nQT_LIB_PREFIX=Qt\nbitcoin_qt_got_major_vers=4\nfi\n- qt5_modules=\"Qt5Core Qt5Gui Qt5Network Qt5Widgets Qt5WebKit Qt5WebKitWidgets\"\n- qt4_modules=\"QtCore QtGui QtNetwork QtWebKit QtWidgets\"\n+ qt5_modules=\"Qt5Core Qt5Gui Qt5Network Qt5Widgets\"\n+ qt4_modules=\"QtCore QtGui QtNetwork QtWidgets\"\nBITCOIN_QT_CHECK([\nif test x$bitcoin_qt_want_version == xqt5 || ( test x$bitcoin_qt_want_version == xauto && test x$auto_priority_version == xqt5 ); then\nPKG_CHECK_MODULES([QT], [$qt5_modules], [QT_INCLUDES=\"$QT_CFLAGS\"; have_qt=yes],[have_qt=no])\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove qtwebkit & webkitwidgets |
714,098 | 02.01.2018 03:14:01 | 18,000 | 887d5352537decc7428212b8a37ae8a06b3c06cc | remove webkit | [
{
"change_type": "MODIFY",
"old_path": "contrib/docker/centos7/Dockerfile",
"new_path": "contrib/docker/centos7/Dockerfile",
"diff": "@@ -21,7 +21,7 @@ RUN echo \"/usr/local/lib\" >> /etc/ld.so.conf && \\\nENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH\n-RUN yum install -y qt5-qtbase-devel qt5-qttools-devel qt5-qtwebkit-devel qt5-qtwebsockets qrencode-devel\n+RUN yum install -y qt5-qtbase-devel qt5-qttools-devel qt5-qtwebsockets qrencode-devel\nRUN git clone https://github.com/vergecurrency/verge /coin/git\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove webkit |
714,098 | 02.01.2018 03:17:40 | 18,000 | f756845fa086762a8ec4fc3a6b50406f61bbc3aa | remove webkit & webkitwidgets | [
{
"change_type": "MODIFY",
"old_path": "building/mac/build.sh",
"new_path": "building/mac/build.sh",
"diff": "export PKG_CONFIG_PATH=/usr/local/opt/[email protected]/lib/pkgconfig\nexport PATH=/usr/local/opt/[email protected]/bin:$PATH\n-export QT_CFLAGS=\"-I/usr/local/opt/[email protected]/lib/QtWebKitWidgets.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtDBus.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtWidgets.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtWebKit.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtNetwork.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtGui.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtCore.framework/Versions/5/Headers -I. -I/usr/local/opt/[email protected]/mkspecs/macx-clang -F/usr/local/opt/[email protected]/lib\"\n-export QT_LIBS=\"-F/usr/local/opt/[email protected]/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL -framework QtNetwork -framework QtWebKit -framework QtWebKitWidgets -framework QtDBus\"\n+export QT_CFLAGS=\"-I/usr/local/opt/[email protected]/lib/QtDBus.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtWidgets.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtNetwork.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtGui.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtCore.framework/Versions/5/Headers -I. -I/usr/local/opt/[email protected]/mkspecs/macx-clang -F/usr/local/opt/[email protected]/lib\"\n+export QT_LIBS=\"-F/usr/local/opt/[email protected]/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL -framework QtNetwork -framework QtDBus\"\n./autogen.sh\n./configure --with-gui=qt5 --with-boost=$(brew --prefix [email protected])\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove webkit & webkitwidgets |
714,131 | 02.01.2018 16:11:46 | -3,600 | 5a9a8980c3d5c8ddca0a975297645a717b5a7892 | Fix editbox truncating stealth addresses | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoinaddressvalidator.h",
"new_path": "src/qt/bitcoinaddressvalidator.h",
"diff": "@@ -14,7 +14,7 @@ public:\nState validate(QString &input, int &pos) const;\n- static const int MaxAddressLength = 35;\n+ static const int MaxAddressLength = 102;\nsignals:\npublic slots:\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/sendcoinsentry.ui",
"new_path": "src/qt/forms/sendcoinsentry.ui",
"diff": "<string>The address to send the payment to (e.g. DDd1pVWr8PPAw1z7DRwoUW6maWh5SsnCcp)</string>\n</property>\n<property name=\"maxLength\">\n- <number>80</number>\n+ <number>102</number>\n</property>\n</widget>\n</item>\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix editbox truncating stealth addresses |
714,131 | 02.01.2018 16:12:22 | -3,600 | 3c572fe74d0efaeace5230ab7b2e47841de8ba91 | fix fail on CreateTransaction for stealth addresses | [
{
"change_type": "MODIFY",
"old_path": "src/qt/walletmodel.cpp",
"new_path": "src/qt/walletmodel.cpp",
"diff": "@@ -240,8 +240,6 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie\n};\nvecSend.push_back(make_pair(scriptP, 0));\n-\n- continue;\n}; // else drop through to normal\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix fail on CreateTransaction for stealth addresses |
714,131 | 02.01.2018 16:50:24 | -3,600 | 346a45dad3f84a63b9e927319b124a0edd934a04 | fixed -O0 hurting performance too much to be usable for debugging | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -163,11 +163,11 @@ AC_ARG_ENABLE([debug],\nif test \"x$enable_debug\" = xyes; then\nif test \"x$GCC\" = xyes; then\n- CFLAGS=\"-g3 -O0 -DDEBUG\"\n+ CFLAGS=\"-g3 -Og -DDEBUG\"\nfi\nif test \"x$GXX\" = xyes; then\n- CXXFLAGS=\"-g3 -O0 -DDEBUG\"\n+ CXXFLAGS=\"-g3 -Og -DDEBUG\"\nfi\nfi\n"
}
]
| C++ | MIT License | vergecurrency/verge | fixed -O0 hurting performance too much to be usable for debugging |
714,131 | 02.01.2018 20:35:41 | -3,600 | 5bf423732382b20a8526121924133d13ddb1584f | more sane logic of key search in Unlock | [
{
"change_type": "MODIFY",
"old_path": "src/keystore.cpp",
"new_path": "src/keystore.cpp",
"diff": "@@ -108,13 +108,16 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)\nkey.SetPubKey(vchPubKey);\nkey.SetSecret(vchSecret);\nif (key.GetPubKey() == vchPubKey)\n- break;\n- }\n+ {\nvMasterKey = vMasterKeyIn;\n- }\nNotifyStatusChanged(this);\nreturn true;\n}\n+ }\n+ }\n+\n+ return false;\n+}\nbool CCryptoKeyStore::AddKey(const CKey& key)\n{\n"
}
]
| C++ | MIT License | vergecurrency/verge | more sane logic of key search in Unlock |
714,131 | 02.01.2018 20:37:19 | -3,600 | 3adc83aa00cac25109fc5ce463266053bcee1d0d | fix for stealth addresses disappearing | [
{
"change_type": "MODIFY",
"old_path": "src/walletdb.cpp",
"new_path": "src/walletdb.cpp",
"diff": "@@ -242,6 +242,12 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,\n// wtx.hashBlock.ToString().substr(0,20).c_str(),\n// wtx.mapValue[\"message\"].c_str());\n}\n+ else if (strType == \"sxAddr\")\n+ {\n+ CStealthAddress sxAddr;\n+ ssValue >> sxAddr;\n+ pwallet->stealthAddresses.insert(sxAddr);\n+ }\nelse if (strType == \"acentry\")\n{\nstring strAccount;\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix for stealth addresses disappearing |
714,138 | 03.01.2018 00:53:01 | -3,600 | bb418f994e506ec04fe412577fea7b0668908128 | Add -algo to --help | [
{
"change_type": "MODIFY",
"old_path": "src/init.cpp",
"new_path": "src/init.cpp",
"diff": "@@ -216,6 +216,7 @@ std::string HelpMessage()\n\" -pid=<file> \" + _(\"Specify pid file (default: VERGEd.pid)\") + \"\\n\" +\n\" -gen \" + _(\"Generate coins\") + \"\\n\" +\n\" -gen=0 \" + _(\"Don't generate coins\") + \"\\n\" +\n+ \" -algo=<algo> \" + _(\"Set mining algorithm <algo> (x17, scrypt, groestl, lyra or blake, default: scrypt)\") + \"\\n\" +\n\" -datadir=<dir> \" + _(\"Specify data directory\") + \"\\n\" +\n\" -wallet=<dir> \" + _(\"Specify wallet file (within data directory)\") + \"\\n\" +\n\" -dbcache=<n> \" + _(\"Set database cache size in megabytes (default: 25)\") + \"\\n\" +\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add -algo to --help |
714,128 | 03.01.2018 04:00:27 | 0 | 88aaf1b3686dd7ad69453d9fdcd520fa83f1a72e | Add Stealth TX Fixes | [
{
"change_type": "MODIFY",
"old_path": "src/main.cpp",
"new_path": "src/main.cpp",
"diff": "@@ -377,25 +377,37 @@ bool CTransaction::ReadFromDisk(COutPoint prevout)\nbool CTransaction::IsStandard() const\n{\n- if (nVersion > CTransaction::CURRENT_VERSION)\n+ if (nVersion > CTransaction::CURRENT_VERSION) {\n+ printf(\"CTransaction::IsStandard() : nVersion > CTransaction::CURRENT_VERSION \\n\");\nreturn false;\n+ }\nBOOST_FOREACH(const CTxIn& txin, vin)\n{\n// Biggest 'standard' txin is a 3-signature 3-of-3 CHECKMULTISIG\n// pay-to-script-hash, which is 3 ~80-byte signatures, 3\n// ~65-byte public keys, plus a few script ops.\n- if (txin.scriptSig.size() > 500)\n+ if (txin.scriptSig.size() > 500) {\n+ printf(\"CTransaction::IsStandard() : txin Script Size > 500 \\n\");\nreturn false;\n- if (!txin.scriptSig.IsPushOnly())\n+ }\n+ if (!txin.scriptSig.IsPushOnly()) {\n+ printf(\"CTransaction::IsStandard() : txin Script Sig is not push only \\n\");\nreturn false;\n}\n+ }\n+\n+ txnouttype whichType;\nBOOST_FOREACH(const CTxOut& txout, vout) {\n- if (!::IsStandard(txout.scriptPubKey))\n+ if (!::IsStandard(txout.scriptPubKey, whichType)) {\n+ printf(\"CTransaction::IsStandard() : Vout is non standard\\n\");\nreturn false;\n- if (txout.nValue == 0)\n+ }\n+ if (whichType != TX_NULL_DATA && txout.nValue == 0) {\n+ printf(\"CTransaction::IsStandard() : txout nValue is 0 and tx is of non-null data \\n\");\nreturn false;\n}\n+ }\nreturn true;\n}\n@@ -557,7 +569,7 @@ bool CTransaction::CheckTransaction() const\nreturn DoS(100, error(\"CTransaction::CheckTransaction() : txout empty for user transaction\"));\n// ppcoin: enforce minimum output amount\n- if ((!txout.IsEmpty()) && txout.nValue < MIN_TXOUT_AMOUNT) {\n+ if (txout.nValue < 0) {\nprintf(\"minamount: %s nValue: %s\", FormatMoney(MIN_TXOUT_AMOUNT).c_str(), FormatMoney(txout.nValue).c_str());\nreturn DoS(100, error(\"CTransaction::CheckTransaction() : txout.nValue below minimum\"));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/script.cpp",
"new_path": "src/script.cpp",
"diff": "@@ -102,6 +102,7 @@ const char* GetTxnOutputType(txnouttype t)\ncase TX_PUBKEYHASH: return \"pubkeyhash\";\ncase TX_SCRIPTHASH: return \"scripthash\";\ncase TX_MULTISIG: return \"multisig\";\n+ case TX_NULL_DATA: return \"nulldata\";\n}\nreturn NULL;\n}\n@@ -1232,6 +1233,11 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi\n// Sender provides N pubkeys, receivers provides M signatures\nmTemplates.insert(make_pair(TX_MULTISIG, CScript() << OP_SMALLINTEGER << OP_PUBKEYS << OP_SMALLINTEGER << OP_CHECKMULTISIG));\n+\n+ // Empty, provably prunable, data-carrying output\n+ mTemplates.insert(make_pair(TX_NULL_DATA, CScript() << OP_RETURN));\n+ mTemplates.insert(make_pair(TX_NULL_DATA, CScript() << OP_RETURN << OP_SMALLDATA));\n+ mTemplates.insert(make_pair(TX_NULL_DATA, CScript() << OP_RETURN << OP_SMALLDATA << OP_RETURN << OP_SMALLDATA));\n}\n// Shortcut for pay-to-script-hash, which are more constrained than the other types:\n@@ -1316,6 +1322,16 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi\nelse\nbreak;\n}\n+ else if (opcode2 == OP_SMALLDATA)\n+ {\n+ // small pushdata, <= MAX_OP_RETURN_RELAY bytes\n+ if (vch1.size() > MAX_OP_RETURN_RELAY)\n+ break;\n+ }\n+ else if (opcode2 == OP_RETURN)\n+ {\n+ return true;\n+ }\nelse if (opcode1 != opcode2 || vch1 != vch2)\n{\n// Others must match exactly\n@@ -1379,6 +1395,8 @@ bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash\n{\ncase TX_NONSTANDARD:\nreturn false;\n+ case TX_NULL_DATA:\n+ return false;\ncase TX_PUBKEY:\nkeyID = CPubKey(vSolutions[0]).GetID();\nreturn Sign1(keyID, keystore, hash, nHashType, scriptSigRet);\n@@ -1407,6 +1425,8 @@ int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned c\n{\nswitch (t)\n{\n+ case TX_NULL_DATA:\n+ return -1;\ncase TX_NONSTANDARD:\nreturn -1;\ncase TX_PUBKEY:\n@@ -1423,6 +1443,27 @@ int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned c\nreturn -1;\n}\n+\n+bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType)\n+{\n+ vector<valtype> vSolutions;\n+ if (!Solver(scriptPubKey, whichType, vSolutions))\n+ return false;\n+\n+ if (whichType == TX_MULTISIG)\n+ {\n+ unsigned char m = vSolutions.front()[0];\n+ unsigned char n = vSolutions.back()[0];\n+ // Support up to x-of-3 multisig txns as standard\n+ if (n < 1 || n > 3)\n+ return false;\n+ if (m < 1 || m > n)\n+ return false;\n+ }\n+\n+ return whichType != TX_NONSTANDARD;\n+}\n+\nbool IsStandard(const CScript& scriptPubKey)\n{\nvector<valtype> vSolutions;\n@@ -1488,6 +1529,8 @@ bool IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)\nCKeyID keyID;\nswitch (whichType)\n{\n+ case TX_NULL_DATA:\n+ return false;\ncase TX_NONSTANDARD:\nreturn false;\ncase TX_PUBKEY:\n@@ -1524,6 +1567,10 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)\nif (!Solver(scriptPubKey, whichType, vSolutions))\nreturn false;\n+ if (whichType == TX_NULL_DATA){\n+ // This is data, not addresses\n+ return false;\n+ }\nif (whichType == TX_PUBKEY)\n{\naddressRet = CPubKey(vSolutions[0]).GetID();\n@@ -1780,6 +1827,10 @@ static CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo,\n{\nswitch (txType)\n{\n+ case TX_NULL_DATA:\n+ // Don't know anything about this, assume bigger one is correct:\n+ if (sigs1.size() >= sigs2.size())\n+ return PushAll(sigs1);\ncase TX_NONSTANDARD:\n// Don't know anything about this, assume bigger one is correct:\nif (sigs1.size() >= sigs2.size())\n"
},
{
"change_type": "MODIFY",
"old_path": "src/script.h",
"new_path": "src/script.h",
"diff": "@@ -20,6 +20,7 @@ typedef std::vector<unsigned char> valtype;\nclass CTransaction;\nstatic const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes\n+static const unsigned int MAX_OP_RETURN_RELAY = 48; // bytes\n/** Signature hash types/flags */\nenum\n@@ -39,6 +40,7 @@ enum txnouttype\nTX_PUBKEYHASH,\nTX_SCRIPTHASH,\nTX_MULTISIG,\n+ TX_NULL_DATA,\n};\nclass CNoDestination {\n@@ -195,6 +197,7 @@ enum opcodetype\n// template matching params\n+ OP_SMALLDATA = 0xf9,\nOP_SMALLINTEGER = 0xfa,\nOP_PUBKEYS = 0xfb,\nOP_PUBKEYHASH = 0xfd,\n@@ -591,6 +594,7 @@ public:\nbool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, const CTransaction& txTo, unsigned int nIn, int nHashType);\nbool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::vector<unsigned char> >& vSolutionsRet);\nint ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned char> >& vSolutions);\n+bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType);\nbool IsStandard(const CScript& scriptPubKey);\nbool IsMine(const CKeyStore& keystore, const CScript& scriptPubKey);\nbool IsMine(const CKeyStore& keystore, const CTxDestination &dest);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1455,12 +1455,16 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\nint64 nValue = 0;\nBOOST_FOREACH (const PAIRTYPE(CScript, int64)& s, vecSend)\n{\n- if (nValue < 0)\n+ if (nValue < 0) {\n+ printf(\"CreateTransaction() : nValue < 0 \\n\");\nreturn false;\n+ }\nnValue += s.second;\n}\n- if (vecSend.empty() || nValue < 0)\n+ if (vecSend.empty() || nValue < 0) {\n+ printf(\"CreateTransaction() : vecSend is empty or nValue < 0 \\n\");\nreturn false;\n+ }\nwtxNew.BindWallet(this);\n@@ -1483,17 +1487,15 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\n// vouts to the payees\nBOOST_FOREACH (const PAIRTYPE(CScript, int64)& s, vecSend)\n{\n- CTxOut txout(s.second, s.first);\n- if (txout.nValue <= MIN_RELAY_TX_FEE)\n- return false;\n-\n- wtxNew.vout.push_back(txout);\n+ wtxNew.vout.push_back(CTxOut(s.second, s.first));\n}\n// Choose coins to use\nset<pair<const CWalletTx*,unsigned int> > setCoins;\nint64 nValueIn = 0;\n- if (!SelectCoins(nTotalValue, wtxNew.nTime, setCoins, nValueIn))\n+ if (!SelectCoins(nTotalValue, wtxNew.nTime, setCoins, nValueIn)) {\n+ printf(\"CreateTransaction() : SelectCoins Failed \\n\");\nreturn false;\n+ }\nBOOST_FOREACH(PAIRTYPE(const CWalletTx*, unsigned int) pcoin, setCoins)\n{\nint64 nCredit = pcoin.first->vout[pcoin.second].nValue;\n@@ -1551,18 +1553,23 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\n// Sign\nint nIn = 0;\nBOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins)\n- if (!SignSignature(*this, *coin.first, wtxNew, nIn++))\n+ if (!SignSignature(*this, *coin.first, wtxNew, nIn++)) {\n+ printf(\"CreateTransaction() : Sign Signatue Failed \\n\");\nreturn false;\n+ }\n// Limit size\nunsigned int nBytes = ::GetSerializeSize(*(CTransaction*)&wtxNew, SER_NETWORK, PROTOCOL_VERSION);\n- if (nBytes >= MAX_BLOCK_SIZE_GEN/5)\n+ if (nBytes >= MAX_BLOCK_SIZE_GEN/5) {\n+ printf(\"CreateTransaction() : Transaction too large \\n\");\nreturn false;\n+ }\ndPriority /= nBytes;\n// Check that enough fee is included\nint64 nPayFee = nTransactionFee * (1 + (int64)nBytes / 1000);\n- int64 nMinFee = wtxNew.GetMinFee(1, false, GMF_SEND);\n+ bool fAllowFree = CTransaction::AllowFree(dPriority);\n+ int64 nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND);\nif (nFeeRet < max(nPayFee, nMinFee))\n{\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add Stealth TX Fixes |
714,124 | 03.01.2018 14:36:26 | -3,600 | 7ff19225af97e996504f37b2e4e395f8bea8fff4 | fixing translation engine | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.qt.include",
"new_path": "src/Makefile.qt.include",
"diff": "@@ -4,7 +4,12 @@ noinst_LIBRARIES += qt/libbitcoinqt.a\n# bitcoin qt core #\nQT_TS = \\\nqt/locale/bitcoin_en.ts \\\n- qt/locale/bitcoin_ru.ts\n+ qt/locale/bitcoin_es.ts \\\n+ qt/locale/bitcoin_fr.ts \\\n+ qt/locale/bitcoin_nb.ts \\\n+ qt/locale/bitcoin_nl.ts \\\n+ qt/locale/bitcoin_ru.ts \\\n+ qt/locale/bitcoin_tr.ts\nQT_FORMS_UI = \\\nqt/forms/aboutdialog.ui \\\n@@ -65,6 +70,9 @@ QT_MOC = \\\nQT_QRC_CPP = qt/qrc_bitcoin.cpp\nQT_QRC = qt/bitcoin.qrc\n+QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp\n+QT_QRC_LOCALE = qt/bitcoin_locale.qrc\n+\nBITCOIN_QT_H = \\\nqt/aboutdialog.h \\\n@@ -267,16 +275,17 @@ translate: qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP)\n$(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)\n@test -f $(RCC)\n- @test -f $(@D)/$(<F) || cp -f $< $(@D)\n- $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale $(@D)/$(<F) | \\\n+ @cp -f $< $(@D)/temp_$(<F)\n+ $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale $(@D)/temp_$(<F) | \\\n$(SED) -e '/^\\*\\*.*Created:/d' -e '/^\\*\\*.*by:/d' > $@\n+ @rm $(@D)/temp_$(<F)\n$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)\n@test -f $(RCC)\n$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \\\n$(SED) -e '/^\\*\\*.*Created:/d' -e '/^\\*\\*.*by:/d' > $@\n-CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno\n+CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc\nCLEANFILES += $(CLEAN_QT)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoin.cpp",
"new_path": "src/qt/bitcoin.cpp",
"diff": "@@ -122,6 +122,7 @@ int main(int argc, char *argv[])\nQ_INIT_RESOURCE(bitcoin);\n+ Q_INIT_RESOURCE(bitcoin_locale);\nQApplication app(argc, argv);\n// Install global event filter that makes sure that long tooltips can be word-wrapped\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoin.qrc",
"new_path": "src/qt/bitcoin.qrc",
"diff": "-<RCC>\n+<!DOCTYPE RCC><RCC version=\"1.0\">\n<qresource prefix=\"/icons\">\n<file alias=\"bitcoin\">res/icons/verge.png</file>\n<file alias=\"address-book\">res/icons/address-book.png</file>\n<file alias=\"spinner-033\">res/movies/spinner-033.png</file>\n<file alias=\"spinner-034\">res/movies/spinner-034.png</file>\n</qresource>\n- <qresource prefix=\"/translations\">\n- <file alias=\"en\">locale/bitcoin_en.ts</file>\n- <file alias=\"ru\">locale/bitcoin_ru.ts</file>\n- </qresource>\n</RCC>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/qt/bitcoin_locale.qrc",
"diff": "+<!DOCTYPE RCC><RCC version=\"1.0\">\n+ <qresource prefix=\"/translations\">\n+ <file alias=\"en\">locale/bitcoin_en.qm</file>\n+ <file alias=\"es\">locale/bitcoin_es.qm</file>\n+ <file alias=\"fr\">locale/bitcoin_fr.qm</file>\n+ <file alias=\"nb\">locale/bitcoin_nb.qm</file>\n+ <file alias=\"nl\">locale/bitcoin_nl.qm</file>\n+ <file alias=\"ru\">locale/bitcoin_ru.qm</file>\n+ <file alias=\"tr\">locale/bitcoin_tr.qm</file>\n+ </qresource>\n+</RCC>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/locale/bitcoin_nl.ts",
"new_path": "src/qt/locale/bitcoin_nl.ts",
"diff": "@@ -1642,7 +1642,7 @@ Address: %4\n<message>\n<location line=\"+2\"/>\n<source>%1 confirmations</source>\n- <translation>%1 bevestigingen/translation>\n+ <translation>%1 bevestigingen</translation>\n</message>\n<message>\n<location line=\"+18\"/>\n"
}
]
| C++ | MIT License | vergecurrency/verge | fixing translation engine |
714,130 | 03.01.2018 19:37:11 | 0 | ca8b60c88519702654c4658dca25d1bd86ac9f20 | adding issue and pull request template | [
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/ISSUE_TEMPLATE.md",
"diff": "+# Issue Template\n+\n+## Context\n+\n+<!-- How has this issue affected you? What are you trying to accomplish?\n+\n+Providing context helps us come up with a solution that is most useful in the real world -->\n+\n+## Prerequisites\n+\n+* [ ] Are you running the latest version?\n+\n+## User Story:\n+\n+* \"I'm submitting a ... \"\n+ - [ ] bug report\n+ - [ ] feature request\n+ - [ ] support request\n+ - [ ] translation request\n+\n+<!-- Please delete (for bugs) or (for features) sections that are not relevant to the Issue you are creating.\n+\n+Please provide any relevant information about your setup. This is important in case the issue is not reproducible except for under certain conditions. Provide a general summary of the issue in the title of your issue -->\n+\n+## Expected Behavior\n+\n+<!-- If you're describing a bug, tell us what should happen. If you're suggesting a change/improvement, tell us how it should work. -->\n+\n+## Current Behavior\n+\n+<!-- If describing a bug, tell us what happens instead of the expected behavior. If suggesting a change/improvement, explain the difference from current behavior. -->\n+\n+## Screenshots\n+\n+<!-- If the issue is related to the GUI, screenshots can be added to this issue via drag & drop. -->\n+\n+## Possible Solution\n+\n+<!-- Not obligatory, but suggest a fix/reason for the bug or ideas how to implement the addition or change. -->\n+\n+## Steps to Reproduce (for bugs)\n+\n+<!-- Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant. -->\n+\n+* Steps :\n+1.\n+2.\n+3.\n+4.\n+\n+## Your Environment\n+\n+<!-- Include as many relevant details about the environment you experienced the bug in. -->\n+\n+* Verge Release:\n+* CPU:\n+* GPU:\n+* RAM:\n+* OS:\n+ - [ ] I'm using Mac\n+ - [ ] I'm using Linux\n+ - [ ] I'm using Mac\n+\n+## Any extra information that might be useful in the debugging process.\n+\n+<!-- This is normally the contents of a `debug.log` or `config.log` file. -->\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/PULL_REQUEST_TEMPLATE.md",
"diff": "+<!--- Provide a general summary of your changes in the Title above -->\n+\n+## Description\n+<!--- Describe your changes in detail -->\n+\n+## Related Issue\n+<!--- This project only accepts pull requests related to open issues -->\n+<!--- If suggesting a new feature or change, please discuss it in an issue first -->\n+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->\n+<!--- Please link to the issue here: -->\n+\n+## Motivation and Context\n+<!--- Why is this change required? What problem does it solve? -->\n+\n+## How Has This Been Tested?\n+<!--- Please describe in detail how you tested your changes. -->\n+<!--- Include details of your testing environment, and the tests you ran to -->\n+<!--- see how your change affects other areas of the code, etc. -->\n+\n+## Screenshots (if appropriate):\n+\n+## Types of changes\n+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->\n+- [ ] Bug fix (non-breaking change which fixes an issue)\n+- [ ] New feature (non-breaking change which adds functionality)\n+- [ ] Breaking change (fix or feature that would cause existing functionality to change)\n+\n+## Checklist:\n+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->\n+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->\n+- [ ] My code follows the code style of this project.\n+- [ ] My change requires a change to the documentation.\n+- [ ] I have updated the documentation accordingly.\n"
}
]
| C++ | MIT License | vergecurrency/verge | adding issue and pull request template |
714,138 | 03.01.2018 23:05:14 | -3,600 | d7e7d0c4bcdb596286f43664ce021576518b00c2 | move out build instructions to doc | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -144,82 +144,9 @@ You can also check out this [Linux Wallet Video Tutorial](https://www.youtube.co\n## Building From Source\n-### Linux Wallet on Ubuntu/Debian\n-\n-Here is a quick short hand way:\n-\n-```shell\n-sudo rm -Rf ~/VERGE #(if you already have it)\n-sudo apt-get -y install git && cd ~ && git clone https://github.com/vergecurrency/VERGE && cd VERGE && sh go.sh\n-```\n-\n-The _slightly_ longer version:\n-\n-1. Install the dependencies. **Note**: If you are on debian, you will also need to `apt-get install libcanberra-gtk-module`.\n-\n- ```shell\n- sudo add-apt-repository ppa:bitcoin/bitcoin\n- sudo apt-get update\n- sudo apt-get install \\\n- libdb4.8-dev libdb4.8++-dev build-essential \\\n- libtool autotools-dev automake pkg-config libssl-dev libevent-dev \\\n- bsdmainutils git libboost-all-dev libminiupnpc-dev libqt5gui5 \\\n- libqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev \\\n- qttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev\n- ```\n-\n-2. Clone the git repository and compile the daemon and gui wallet:\n-\n- ```shell\n- git clone https://github.com/vergecurrency/verge && cd verge && ./autogen.sh && ./configure && make\n- ```\n-\n-> **Note**: If you get a \"memory exhausted\" error, make a swap file. (https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04)\n-\n-\n-### Mac OS X Wallet\n-\n-> **Note:** This has only been confirmed to work on OS X Sierra (10.12) and OS X High Sierra (10.13) with XCode 9.2 and `Apple LLVM version 9.0.0 (clang-900.0.39.2)`.\n-\n-1. Ensure you have mysql and boost installed.\n-\n- ```shell\n- brew install mysql boost\n- ```\n-\n-2. Ensure you have python 2.7 installed and in your path (OS X comes with this by default)\n-\n- ```shell\n- python --version\n- ```\n-\n-3. Export the required environment variables\n-\n- ```shell\n- export VERGE_PLATFORM='mac'\n- export CXX=clang++\n- export CC=clang\n- ```\n-\n-4. Run your build commands\n-\n- ```shell\n- ./building/common.sh\n- ./building/mac/requirements.sh\n- ./building/mac/build.sh\n- ```\n-\n-5. Grab a :coffee: and wait it out\n-\n-6. Create the `.dmg` file\n-\n- ```shell\n- ./building/mac/dist.sh\n- ```\n-\n-### Windows Wallet\n-\n-TODO. Take a look as [building/windows](./building/windows).\n+* [Linux Instructions](doc/build-verge-linux.md)\n+* [OS X Instructions](doc/build-verge-osx.md)\n+* [Windows Instructions](doc/build-verge-win.md)\n## Docker Images\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "doc/build-verge-linux.md",
"diff": "+### Building Linux Wallet on Ubuntu/Debian\n+\n+Here is a quick short hand way:\n+\n+```shell\n+sudo rm -Rf ~/VERGE #(if you already have it)\n+sudo apt-get -y install git && cd ~ && git clone https://github.com/vergecurrency/VERGE && cd VERGE && sh go.sh\n+```\n+\n+The _slightly_ longer version:\n+\n+1. Install the dependencies. **Note**: If you are on debian, you will also need to `apt-get install libcanberra-gtk-module`.\n+\n+ ```shell\n+ sudo add-apt-repository ppa:bitcoin/bitcoin\n+ sudo apt-get update\n+ sudo apt-get install \\\n+ libdb4.8-dev libdb4.8++-dev build-essential \\\n+ libtool autotools-dev automake pkg-config libssl-dev libevent-dev \\\n+ bsdmainutils git libboost-all-dev libminiupnpc-dev libqt5gui5 \\\n+ libqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev \\\n+ qttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev\n+ ```\n+\n+2. Clone the git repository and compile the daemon and gui wallet:\n+\n+ ```shell\n+ git clone https://github.com/vergecurrency/verge && cd verge && ./autogen.sh && ./configure && make\n+ ```\n+\n+> **Note**: If you get a \"memory exhausted\" error, make a swap file. (https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04)\n+\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "doc/build-verge-osx.md",
"diff": "+### Building Mac OS X Wallet\n+\n+> **Note:** This has only been confirmed to work on OS X Sierra (10.12) and OS X High Sierra (10.13) with XCode 9.2 and `Apple LLVM version 9.0.0 (clang-900.0.39.2)`.\n+\n+1. Ensure you have mysql and boost installed.\n+\n+ ```shell\n+ brew install mysql boost\n+ ```\n+\n+2. Ensure you have python 2.7 installed and in your path (OS X comes with this by default)\n+\n+ ```shell\n+ python --version\n+ ```\n+\n+3. Export the required environment variables\n+\n+ ```shell\n+ export VERGE_PLATFORM='mac'\n+ export CXX=clang++\n+ export CC=clang\n+ ```\n+\n+4. Run your build commands\n+\n+ ```shell\n+ ./building/common.sh\n+ ./building/mac/requirements.sh\n+ ./building/mac/build.sh\n+ ```\n+\n+5. Grab a :coffee: and wait it out\n+\n+6. Create the `.dmg` file\n+\n+ ```shell\n+ ./building/mac/dist.sh\n+ ```\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "doc/build-verge-win.md",
"diff": "+### Building Windows Wallet\n+\n+TODO. Take a look at [building/windows](./../building/windows).\n"
}
]
| C++ | MIT License | vergecurrency/verge | move out build instructions to doc |
714,138 | 04.01.2018 00:00:40 | -3,600 | 2527e36de9ecde7994dd5b06ee8fc2f229ede946 | Initial start of dev notes | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -148,6 +148,10 @@ You can also check out this [Linux Wallet Video Tutorial](https://www.youtube.co\n* [OS X Instructions](doc/build-verge-osx.md)\n* [Windows Instructions](doc/build-verge-win.md)\n+## Developer Notes\n+\n+Can be found [here](./doc/dev-notes.md)\n+\n## Docker Images\nCheck out the [`contrib/readme`](https://github.com/vergecurrency/VERGE/tree/master/contrib/docker) for more information.\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "doc/dev-notes.md",
"diff": "+# VERGE [XVG] Developer Notes\n+\n+## Debugging\n+\n+Prepend debug output with timestamp\n+```\n+-logtimestamps\n+```\n+\n+Send trace/debug info to console instead of debug.log file\n+```\n+-printtoconsole\n+```\n+\n+Output extra network debugging information\n+```\n+-debugnet\n+```\n+\n+Output extra debugging information. Implies all other -debug* options\n+```\n+-debug\n+```\n+\n+## Useful Commands\n+\n+Display information about the node and the network\n+```\n+./VERGEd getinfo\n+```\n+\n+\n+## Coding Style\n+\n+See [Code Style](./code-style.md)\n"
}
]
| C++ | MIT License | vergecurrency/verge | Initial start of dev notes |
714,131 | 04.01.2018 00:40:28 | -3,600 | 1724b9675c4d0c0f234d8fedf4d4e494b8f11433 | more fixes for stealth tx | [
{
"change_type": "MODIFY",
"old_path": "src/qt/walletmodel.cpp",
"new_path": "src/qt/walletmodel.cpp",
"diff": "@@ -142,7 +142,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie\nreturn OK;\n}\n- std::vector<std::pair<CScript, int64_t> > vecSend;\n+ std::vector<std::pair<CScript, int64> > vecSend;\nstd::map<int, std::string> mapStealthNarr;\n@@ -151,6 +151,20 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie\n{\nstd::string sAddr = rcp.address.toStdString();\n+ if(!validateAddress(rcp.address))\n+ {\n+ return InvalidAddress;\n+ }\n+\n+ setAddress.insert(rcp.address);\n+\n+ if(rcp.amount <= 0)\n+ {\n+ return InvalidAmount;\n+ }\n+\n+ total += rcp.amount;\n+\nif (rcp.typeInd == AddressTableModel::AT_Stealth)\n{\nCStealthAddress sxAddr;\n@@ -161,25 +175,24 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie\nec_point pkSendTo;\nec_point ephem_pubkey;\n-\nif (GenerateRandomSecret(ephem_secret) != 0)\n{\nprintf(\"GenerateRandomSecret failed.\\n\");\nreturn Aborted;\n- };\n+ }\nif (StealthSecret(ephem_secret, sxAddr.scan_pubkey, sxAddr.spend_pubkey, secretShared, pkSendTo) != 0)\n{\nprintf(\"Could not generate receiving public key.\\n\");\nreturn Aborted;\n- };\n+ }\nCPubKey cpkTo(pkSendTo);\nif (!cpkTo.IsValid())\n{\nprintf(\"Invalid public key generated.\\n\");\nreturn Aborted;\n- };\n+ }\nCKeyID ckidTo = cpkTo.GetID();\n@@ -189,14 +202,14 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie\n{\nprintf(\"Could not generate ephem public key.\\n\");\nreturn Aborted;\n- };\n+ }\nif (fDebug)\n{\nprintf(\"Stealth send to generated pubkey %\" PRIszu \": %s\\n\", pkSendTo.size(), HexStr(pkSendTo).c_str());\nprintf(\"hash %s\\n\", addrTo.ToString().c_str());\nprintf(\"ephem_pubkey %\" PRIszu \": %s\\n\", ephem_pubkey.size(), HexStr(ephem_pubkey).c_str());\n- };\n+ }\nCScript scriptPubKey;\nscriptPubKey.SetDestination(addrTo.Get());\n@@ -240,20 +253,19 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie\n};\nvecSend.push_back(make_pair(scriptP, 0));\n- }; // else drop through to normal\n- }\n- if(!validateAddress(rcp.address))\n- {\n- return InvalidAddress;\n+ continue;\n}\n- setAddress.insert(rcp.address);\n-\n- if(rcp.amount <= 0)\n+ else\n{\n- return InvalidAmount;\n+ printf(\"Couldn't parse stealth address!\\n\");\n+ return Aborted;\n+ } // else drop through to normal\n}\n- total += rcp.amount;\n+\n+ CScript scriptPubKey;\n+ scriptPubKey.SetDestination(CBitcoinAddress(rcp.address.toStdString()).Get());\n+ vecSend.push_back(make_pair(scriptPubKey, rcp.amount));\n}\nif(recipients.size() > setAddress.size())\n@@ -276,15 +288,6 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie\nCWalletTx wtx;\n- // Sendmany\n- std::vector<std::pair<CScript, int64> > vecSend;\n- foreach(const SendCoinsRecipient &rcp, recipients)\n- {\n- CScript scriptPubKey;\n- scriptPubKey.SetDestination(CBitcoinAddress(rcp.address.toStdString()).Get());\n- vecSend.push_back(make_pair(scriptPubKey, rcp.amount));\n- }\n-\nCReserveKey keyChange(wallet);\nint64 nFeeRequired = 0;\nbool fCreated = wallet->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1470,8 +1470,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\n// txdb must be opened before the mapWallet lock\n{\n- // nFeeRet = 0.01*COIN;\n- nFeeRet = nTransactionFee;\n+ nFeeRet = max(10*CENT, nTransactionFee);\nwhile (true)\n{\nwtxNew.vin.clear();\n@@ -1538,7 +1537,19 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\nscriptChange.SetDestination(vchPubKey.GetID());\n// Insert change txn at random position:\n- vector<CTxOut>::iterator position = wtxNew.vout.begin() + GetRandInt(wtxNew.vout.size());\n+ vector<CTxOut>::iterator position = wtxNew.vout.begin() + GetRandInt(wtxNew.vout.size() + 1);\n+\n+ // -- don't put change output between value and narration outputs\n+ if (position > wtxNew.vout.begin() && position < wtxNew.vout.end())\n+ {\n+ while (position > wtxNew.vout.begin())\n+ {\n+ if (position->nValue != 0)\n+ break;\n+ position--;\n+ };\n+ };\n+\nwtxNew.vout.insert(position, CTxOut(nChange, scriptChange));\n}\nelse\n"
}
]
| C++ | MIT License | vergecurrency/verge | more fixes for stealth tx |
714,128 | 04.01.2018 01:00:05 | 0 | 69fe25a4533773317a766e3bdc7e207f8d00ae3c | Add TX Fee for Stealth Narration and only include when needed | [
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1956,10 +1956,10 @@ bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std\nvecSend.push_back(make_pair(scriptPubKey, nValue));\nCScript scriptP = CScript() << OP_RETURN << P;\n- if (narr.size() > 0)\n+ if (narr.size() > 0) {\nscriptP = scriptP << OP_RETURN << narr;\n-\n- vecSend.push_back(make_pair(scriptP, 0));\n+ vecSend.push_back(make_pair(scriptP, nTransactionFee));\n+ }\n// -- shuffle inputs, change output won't mix enough as it must be not fully random for plantext narrations\nstd::random_shuffle(vecSend.begin(), vecSend.end());\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add TX Fee for Stealth Narration and only include when needed |
714,128 | 04.01.2018 02:03:34 | 0 | 630a5b5f059da414834847ab204b4442911d4a66 | Disable Stake Miner, Clean up OP_RETURN code | [
{
"change_type": "MODIFY",
"old_path": "src/net.cpp",
"new_path": "src/net.cpp",
"diff": "@@ -1864,8 +1864,8 @@ void StartNode(void* parg)\nprintf(\"Error; NewThread(ThreadDumpAddress) failed\\n\");\n// ppcoin: mint proof-of-stake blocks in the background\n- if (!NewThread(ThreadStakeMinter, pwalletMain))\n- printf(\"Error: NewThread(ThreadStakeMinter) failed\\n\");\n+ //if (!NewThread(ThreadStakeMinter, pwalletMain))\n+ // printf(\"Error: NewThread(ThreadStakeMinter) failed\\n\");\n// Generate coins in the background\nGenerateBitcoins(GetBoolArg(\"-gen\", false), pwalletMain);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/script.cpp",
"new_path": "src/script.cpp",
"diff": "@@ -1394,7 +1394,6 @@ bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash\nswitch (whichTypeRet)\n{\ncase TX_NONSTANDARD:\n- return false;\ncase TX_NULL_DATA:\nreturn false;\ncase TX_PUBKEY:\n@@ -1425,9 +1424,8 @@ int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned c\n{\nswitch (t)\n{\n- case TX_NULL_DATA:\n- return -1;\ncase TX_NONSTANDARD:\n+ case TX_NULL_DATA:\nreturn -1;\ncase TX_PUBKEY:\nreturn 1;\n@@ -1529,9 +1527,8 @@ bool IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)\nCKeyID keyID;\nswitch (whichType)\n{\n- case TX_NULL_DATA:\n- return false;\ncase TX_NONSTANDARD:\n+ case TX_NULL_DATA:\nreturn false;\ncase TX_PUBKEY:\nkeyID = CPubKey(vSolutions[0]).GetID();\n@@ -1567,10 +1564,6 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)\nif (!Solver(scriptPubKey, whichType, vSolutions))\nreturn false;\n- if (whichType == TX_NULL_DATA){\n- // This is data, not addresses\n- return false;\n- }\nif (whichType == TX_PUBKEY)\n{\naddressRet = CPubKey(vSolutions[0]).GetID();\n@@ -1640,6 +1633,11 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vecto\nif (!Solver(scriptPubKey, typeRet, vSolutions))\nreturn false;\n+ if (typeRet == TX_NULL_DATA){\n+ // This is data, not addresses\n+ return false;\n+ }\n+\nif (typeRet == TX_MULTISIG)\n{\nnRequiredRet = vSolutions.front()[0];\n@@ -1827,11 +1825,8 @@ static CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo,\n{\nswitch (txType)\n{\n- case TX_NULL_DATA:\n- // Don't know anything about this, assume bigger one is correct:\n- if (sigs1.size() >= sigs2.size())\n- return PushAll(sigs1);\ncase TX_NONSTANDARD:\n+ case TX_NULL_DATA:\n// Don't know anything about this, assume bigger one is correct:\nif (sigs1.size() >= sigs2.size())\nreturn PushAll(sigs1);\n"
}
]
| C++ | MIT License | vergecurrency/verge | Disable Stake Miner, Clean up OP_RETURN code |
714,117 | 03.01.2018 21:13:27 | 18,000 | ea94a30174a63d06bde61b23b727ff4fb1cc3508 | about dialog UI improvement | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/aboutdialog.ui",
"new_path": "src/qt/forms/aboutdialog.ui",
"diff": "<x>0</x>\n<y>0</y>\n<width>593</width>\n- <height>319</height>\n+ <height>339</height>\n</rect>\n</property>\n<property name=\"windowTitle\">\n</item>\n<item>\n<layout class=\"QVBoxLayout\" name=\"verticalLayout_2\">\n- <item>\n- <spacer name=\"verticalSpacer_2\">\n- <property name=\"orientation\">\n- <enum>Qt::Vertical</enum>\n- </property>\n- <property name=\"sizeHint\" stdset=\"0\">\n- <size>\n- <width>20</width>\n- <height>40</height>\n- </size>\n- </property>\n- </spacer>\n- </item>\n<item>\n<layout class=\"QHBoxLayout\" name=\"horizontalLayout\">\n<item>\n</widget>\n</item>\n<item>\n+ <widget class=\"QScrollArea\" name=\"scrollArea\">\n+ <property name=\"widgetResizable\">\n+ <bool>true</bool>\n+ </property>\n+ <widget class=\"QWidget\" name=\"scrollAreaWidgetContents\">\n+ <property name=\"geometry\">\n+ <rect>\n+ <x>0</x>\n+ <y>0</y>\n+ <width>415</width>\n+ <height>312</height>\n+ </rect>\n+ </property>\n+ <layout class=\"QGridLayout\" name=\"gridLayout\">\n+ <item row=\"0\" column=\"0\">\n<widget class=\"QLabel\" name=\"label_2\">\n<property name=\"cursor\">\n<cursorShape>IBeamCursor</cursorShape>\n</property>\n<property name=\"text\">\n- <string>\n-This is experimental software. If you don't treat it as such, you're likely to put an eye out!\n-\n-Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.\n+ <string>Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.\nThis product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young ([email protected]) and UPnP software written by Thomas Bernard.\n-Offical Website: http://VERGEcurrency.com\n+Offical Website: https://VERGEcurrency.com\nSpecial Thanks to: Sunerok, CryptoRekt, MKinney, BearSylla, Hypermist, Pallas1, FuzzBawls, BuZz, glodfinch, InfernoMan, AhmedBodi, BitSpill, MentalCollatz, and the -entire- #VERGE irc community!\n@@ -125,32 +124,14 @@ HTP!</string>\n</property>\n</widget>\n</item>\n- <item>\n- <spacer name=\"verticalSpacer\">\n- <property name=\"orientation\">\n- <enum>Qt::Vertical</enum>\n- </property>\n- <property name=\"sizeHint\" stdset=\"0\">\n- <size>\n- <width>20</width>\n- <height>40</height>\n- </size>\n- </property>\n- </spacer>\n+ </layout>\n+ </widget>\n+ </widget>\n</item>\n<item>\n<widget class=\"QDialogButtonBox\" name=\"buttonBox\">\n<property name=\"styleSheet\">\n- <string notr=\"true\">\n-border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #0b3b47;\n-min-height: 25px;\n-max-height: 25px;\n-min-width: 100px;\n-max-width: 100px;</string>\n+ <string notr=\"true\"/>\n</property>\n<property name=\"orientation\">\n<enum>Qt::Horizontal</enum>\n"
}
]
| C++ | MIT License | vergecurrency/verge | about dialog UI improvement |
714,128 | 04.01.2018 02:29:45 | 0 | d202f737be0e8fca397e560acf58f96220aa6734 | More Cleanup and Solver Fix | [
{
"change_type": "MODIFY",
"old_path": "src/script.cpp",
"new_path": "src/script.cpp",
"diff": "@@ -1330,7 +1330,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi\n}\nelse if (opcode2 == OP_RETURN)\n{\n- return true;\n+ break;\n}\nelse if (opcode1 != opcode2 || vch1 != vch2)\n{\n@@ -1464,23 +1464,8 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType)\nbool IsStandard(const CScript& scriptPubKey)\n{\n- vector<valtype> vSolutions;\ntxnouttype whichType;\n- if (!Solver(scriptPubKey, whichType, vSolutions))\n- return false;\n-\n- if (whichType == TX_MULTISIG)\n- {\n- unsigned char m = vSolutions.front()[0];\n- unsigned char n = vSolutions.back()[0];\n- // Support up to x-of-3 multisig txns as standard\n- if (n < 1 || n > 3)\n- return false;\n- if (m < 1 || m > n)\n- return false;\n- }\n-\n- return whichType != TX_NONSTANDARD;\n+ return IsStandard(scriptPubKey, whichType);\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | More Cleanup and Solver Fix |
714,120 | 03.01.2018 22:51:37 | 18,000 | d27304ad1ce60debda47fdb3a07e3511fe90233d | remove unwanted UI element on new address | [
{
"change_type": "MODIFY",
"old_path": "src/qt/editaddressdialog.cpp",
"new_path": "src/qt/editaddressdialog.cpp",
"diff": "@@ -20,6 +20,7 @@ EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :\nsetWindowTitle(tr(\"New receiving address\"));\nui->addressEdit->setEnabled(false);\nui->addressEdit->setVisible(false);\n+ ui->addressEditLabel->setVisible(false);\nui->stealthCB->setEnabled(true);\nui->stealthCB->setVisible(true);\nbreak;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/editaddressdialog.ui",
"new_path": "src/qt/forms/editaddressdialog.ui",
"diff": "<x>0</x>\n<y>0</y>\n<width>457</width>\n- <height>126</height>\n+ <height>173</height>\n</rect>\n</property>\n<property name=\"windowTitle\">\n@@ -46,16 +46,6 @@ max-height: 25px;</string>\n</property>\n</widget>\n</item>\n- <item row=\"1\" column=\"0\">\n- <widget class=\"QLabel\" name=\"label_2\">\n- <property name=\"text\">\n- <string>&Address</string>\n- </property>\n- <property name=\"buddy\">\n- <cstring>addressEdit</cstring>\n- </property>\n- </widget>\n- </item>\n<item row=\"1\" column=\"1\">\n<widget class=\"QLineEdit\" name=\"addressEdit\">\n<property name=\"toolTip\">\n@@ -75,9 +65,6 @@ max-height: 25px;</string>\n</item>\n<item row=\"2\" column=\"0\">\n<widget class=\"QCheckBox\" name=\"stealthCB\">\n- <property name=\"text\">\n- <string>Stealth Address</string>\n- </property>\n<property name=\"styleSheet\">\n<string notr=\"true\">\nborder-top-left-radius: 5px;\n@@ -88,6 +75,19 @@ border: 2px solid #000000;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n+ <property name=\"text\">\n+ <string>Stealth Address</string>\n+ </property>\n+ </widget>\n+ </item>\n+ <item row=\"1\" column=\"0\">\n+ <widget class=\"QLabel\" name=\"addressEditLabel\">\n+ <property name=\"text\">\n+ <string>&Address</string>\n+ </property>\n+ <property name=\"buddy\">\n+ <cstring>addressEdit</cstring>\n+ </property>\n</widget>\n</item>\n</layout>\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove unwanted UI element on new address |
714,120 | 03.01.2018 23:56:10 | 18,000 | 76b8b3e74ebd4910debf625b9bdc8a940bc36d35 | correct minheight, alight right | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/aboutdialog.ui",
"new_path": "src/qt/forms/aboutdialog.ui",
"diff": "<x>0</x>\n<y>0</y>\n<width>593</width>\n- <height>442</height>\n+ <height>495</height>\n</rect>\n</property>\n+ <property name=\"minimumSize\">\n+ <size>\n+ <width>593</width>\n+ <height>495</height>\n+ </size>\n+ </property>\n<property name=\"windowTitle\">\n<string>About VERGE</string>\n</property>\n@@ -138,7 +144,7 @@ HTP!</string>\n</property>\n</spacer>\n</item>\n- <item alignment=\"Qt::AlignLeft\">\n+ <item>\n<widget class=\"QDialogButtonBox\" name=\"buttonBox\">\n<property name=\"autoFillBackground\">\n<bool>false</bool>\n"
}
]
| C++ | MIT License | vergecurrency/verge | correct minheight, alight right |
714,120 | 04.01.2018 00:35:44 | 18,000 | f7e07bcb5d743f0db8bf4adbd98afabb5d5389bd | sign/verify clear button on sign message dialog | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/signverifymessagedialog.ui",
"new_path": "src/qt/forms/signverifymessagedialog.ui",
"diff": "<x>0</x>\n<y>0</y>\n<width>700</width>\n- <height>380</height>\n+ <height>401</height>\n</rect>\n</property>\n<property name=\"windowTitle\">\n<item>\n<widget class=\"QTabWidget\" name=\"tabWidget\">\n<property name=\"currentIndex\">\n- <number>1</number>\n+ <number>0</number>\n</property>\n<widget class=\"QWidget\" name=\"tabSignMessage\">\n<attribute name=\"title\">\n@@ -80,7 +80,7 @@ border-bottom-right-radius: 5px;\n<string/>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>\n</property>\n<property name=\"shortcut\">\n@@ -106,7 +106,7 @@ border-bottom-right-radius: 5px;</string>\n<string/>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>\n</property>\n<property name=\"shortcut\">\n@@ -179,7 +179,7 @@ border-bottom-right-radius: 5px;\n<string/>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>\n</property>\n<property name=\"autoDefault\">\n@@ -193,55 +193,60 @@ border-bottom-right-radius: 5px;\n<layout class=\"QHBoxLayout\" name=\"horizontalLayout_3_SM\">\n<item>\n<widget class=\"QPushButton\" name=\"signMessageButton_SM\">\n+ <property name=\"minimumSize\">\n+ <size>\n+ <width>110</width>\n+ <height>0</height>\n+ </size>\n+ </property>\n<property name=\"toolTip\">\n<string>Sign the message to prove you own this VERGE address</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #000000;\n-min-width: 100px;\n-max-width: 100px;\n-</string>\n+ <string notr=\"true\"/>\n</property>\n<property name=\"text\">\n<string>&Sign Message</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>\n</property>\n<property name=\"autoDefault\">\n<bool>false</bool>\n</property>\n+ <property name=\"default\">\n+ <bool>false</bool>\n+ </property>\n</widget>\n</item>\n<item>\n<widget class=\"QPushButton\" name=\"clearButton_SM\">\n+ <property name=\"minimumSize\">\n+ <size>\n+ <width>110</width>\n+ <height>0</height>\n+ </size>\n+ </property>\n<property name=\"toolTip\">\n<string>Reset all sign message fields</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #000000;\n-min-width: 90px;\n-max-width: 90px;</string>\n+ <string notr=\"true\"/>\n</property>\n<property name=\"text\">\n<string>Clear &All</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>\n</property>\n<property name=\"autoDefault\">\n<bool>false</bool>\n</property>\n+ <property name=\"default\">\n+ <bool>false</bool>\n+ </property>\n</widget>\n</item>\n<item>\n@@ -354,7 +359,7 @@ border-bottom-right-radius: 5px;\n<string/>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>\n</property>\n<property name=\"shortcut\">\n@@ -397,56 +402,63 @@ max-height: 25px;</string>\n<layout class=\"QHBoxLayout\" name=\"horizontalLayout_2_VM\">\n<item>\n<widget class=\"QPushButton\" name=\"verifyMessageButton_VM\">\n+ <property name=\"minimumSize\">\n+ <size>\n+ <width>120</width>\n+ <height>0</height>\n+ </size>\n+ </property>\n<property name=\"toolTip\">\n<string>Verify the message to ensure it was signed with the specified VERGE address</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #000000;\n-min-width: 100px;\n-max-width: 100px;\n-</string>\n+ <string notr=\"true\"/>\n</property>\n<property name=\"text\">\n<string>&Verify Message</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset>\n</property>\n<property name=\"autoDefault\">\n<bool>false</bool>\n</property>\n+ <property name=\"default\">\n+ <bool>false</bool>\n+ </property>\n</widget>\n</item>\n<item>\n<widget class=\"QPushButton\" name=\"clearButton_VM\">\n+ <property name=\"minimumSize\">\n+ <size>\n+ <width>120</width>\n+ <height>0</height>\n+ </size>\n+ </property>\n<property name=\"toolTip\">\n<string>Reset all verify message fields</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #000000;\n-min-width: 100px;\n-max-width: 100px;\n-</string>\n+ <string notr=\"true\"/>\n</property>\n<property name=\"text\">\n<string>Clear &All</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>\n</property>\n<property name=\"autoDefault\">\n<bool>false</bool>\n</property>\n+ <property name=\"default\">\n+ <bool>false</bool>\n+ </property>\n+ <property name=\"flat\">\n+ <bool>false</bool>\n+ </property>\n</widget>\n</item>\n<item>\n@@ -506,8 +518,6 @@ max-width: 100px;\n<header>qvalidatedlineedit.h</header>\n</customwidget>\n</customwidgets>\n- <resources>\n- <include location=\"../bitcoin.qrc\"/>\n- </resources>\n+ <resources/>\n<connections/>\n</ui>\n"
}
]
| C++ | MIT License | vergecurrency/verge | sign/verify clear button on sign message dialog |
714,131 | 04.01.2018 06:57:06 | -3,600 | f33986ab90ac7fa46d2de111824497eb3ac7bf34 | fixed stealth tx | [
{
"change_type": "MODIFY",
"old_path": "src/script.cpp",
"new_path": "src/script.cpp",
"diff": "@@ -1330,7 +1330,8 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi\n}\nelse if (opcode2 == OP_RETURN)\n{\n- break;\n+ typeRet = TX_NULL_DATA;\n+ return true;\n}\nelse if (opcode1 != opcode2 || vch1 != vch2)\n{\n"
}
]
| C++ | MIT License | vergecurrency/verge | fixed stealth tx |
714,123 | 04.01.2018 02:35:02 | 28,800 | c2f593d8ab0627855ad006856a999f9024f25899 | Fix for
removed StakeMint Item | [
{
"change_type": "MODIFY",
"old_path": "src/qt/transactionview.cpp",
"new_path": "src/qt/transactionview.cpp",
"diff": "@@ -74,7 +74,6 @@ TransactionView::TransactionView(QWidget *parent) :\ntypeWidget->addItem(tr(\"Sent to\"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) |\nTransactionFilterProxy::TYPE(TransactionRecord::SendToOther));\ntypeWidget->addItem(tr(\"To yourself\"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf));\n- typeWidget->addItem(tr(\"Mined\"), TransactionFilterProxy::TYPE(TransactionRecord::StakeMint));\ntypeWidget->addItem(tr(\"Mined\"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));\ntypeWidget->addItem(tr(\"Other\"), TransactionFilterProxy::TYPE(TransactionRecord::Other));\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix for #349
removed StakeMint Item |
714,115 | 04.01.2018 09:52:21 | 18,000 | 7fe48f4a5bfbaabcbc4cb207c8e9d55db0e471e4 | Add build instructions for Fedora
Tested on a clean Fedora 27 install. | [
{
"change_type": "MODIFY",
"old_path": "doc/build-verge-linux.md",
"new_path": "doc/build-verge-linux.md",
"diff": "@@ -31,3 +31,21 @@ The _slightly_ longer version:\n> **Note**: If you get a \"memory exhausted\" error, make a swap file. (https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04)\n+### Building Linux Wallet on Fedora 27\n+\n+This should also work on some previous Fedoras if you replace `dnf` with `yum`.\n+\n+1. Install dependencies\n+```\n+sudo dnf install git automake boost-devel qt5-devel qrencode-devel libdb4-cxx-devel miniupnpc-devel protobuf-devel gcc gcc-c++ openssl-devel\n+```\n+2. Clone source and build\n+```\n+git clone https://github.com/vergecurrency/VERGE.git\n+cd VERGE\n+./autogen.sh\n+./configure --with-gui=qt5\n+make -j4 # number of CPU cores to use for compiling\n+sudo make install\n+```\n+3. Run `VERGE-qt`\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add build instructions for Fedora
Tested on a clean Fedora 27 install. |
714,121 | 04.01.2018 17:46:25 | -3,600 | 401babcd37f78d3bd83406c3ca9235ba198ca611 | backport: Bitcoin - optimize CScript.FindAndDelete | [
{
"change_type": "MODIFY",
"old_path": "src/script.h",
"new_path": "src/script.h",
"diff": "@@ -492,17 +492,26 @@ public:\nint nFound = 0;\nif (b.empty())\nreturn nFound;\n- iterator pc = begin();\n+ CScript result;\n+ iterator pc = begin(), pc2 = begin();\nopcodetype opcode;\ndo\n{\n- while (end() - pc >= (long)b.size() && memcmp(&pc[0], &b[0], b.size()) == 0)\n+ result.insert(result.end(), pc2, pc);\n+ while (static_cast<size_t>(end() - pc) >= b.size() && std::equal(b.begin(), b.end(), pc))\n{\n- erase(pc, pc + b.size());\n+ pc = pc + b.size();\n++nFound;\n}\n+ pc2 = pc;\n+ } while (GetOp(pc, opcode));\n+\n+ if (nFound > 0)\n+ {\n+ result.insert(result.end(), pc2, end());\n+ *this = result;\n}\n- while (GetOp(pc, opcode));\n+\nreturn nFound;\n}\nint Find(opcodetype op) const\n"
}
]
| C++ | MIT License | vergecurrency/verge | backport: Bitcoin - optimize CScript.FindAndDelete |
714,138 | 05.01.2018 00:19:51 | -3,600 | 207e93b410612dada93498ec5e77879aa18a73f7 | Remove duplicated and unused func ThreadStakeMinter | [
{
"change_type": "MODIFY",
"old_path": "src/net.cpp",
"new_path": "src/net.cpp",
"diff": "@@ -1288,26 +1288,6 @@ void static ProcessOneShot()\n}\n}\n-// ppcoin: stake minter thread\n-void static ThreadStakeMinter(void* parg)\n-{\n- printf(\"ThreadStakeMinter started\\n\");\n- CWallet* pwallet = (CWallet*)parg;\n- try\n- {\n- vnThreadsRunning[THREAD_MINTER]++;\n- VERGEMiner(pwallet, true);\n- vnThreadsRunning[THREAD_MINTER]--;\n- }\n- catch (std::exception& e) {\n- vnThreadsRunning[THREAD_MINTER]--;\n- PrintException(&e, \"ThreadStakeMinter()\");\n- } catch (...) {\n- vnThreadsRunning[THREAD_MINTER]--;\n- PrintException(NULL, \"ThreadStakeMinter()\");\n- }\n- printf(\"ThreadStakeMinter exiting, %d threads remaining\\n\", vnThreadsRunning[THREAD_MINTER]);\n-}\nvoid ThreadOpenConnections2(void* parg)\n{\n@@ -1864,6 +1844,7 @@ void StartNode(void* parg)\nprintf(\"Error; NewThread(ThreadDumpAddress) failed\\n\");\n// ppcoin: mint proof-of-stake blocks in the background\n+ // TODO: remove? or use ThreadVERGEMiner in main.cpp as it is a duplicated function of ThreadStakeMinter?\n//if (!NewThread(ThreadStakeMinter, pwalletMain))\n// printf(\"Error: NewThread(ThreadStakeMinter) failed\\n\");\n"
}
]
| C++ | MIT License | vergecurrency/verge | Remove duplicated and unused func ThreadStakeMinter |
714,138 | 05.01.2018 00:23:06 | -3,600 | d8523ab4b50e65466da3cf1911617bc3a8f775eb | Remove unused variable in ChangeWalletPassphrase | [
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -118,7 +118,6 @@ bool CWallet::Unlock(const SecureString& strWalletPassphrase)\nbool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase)\n{\n- bool fWasLocked = IsLocked();\n{\nLOCK(cs_wallet);\n"
}
]
| C++ | MIT License | vergecurrency/verge | Remove unused variable in ChangeWalletPassphrase |
714,138 | 05.01.2018 00:45:26 | -3,600 | 7bcdabeff17b496856435662f6c70279b0b8bb9c | Remove compiler warning in switch case | [
{
"change_type": "MODIFY",
"old_path": "src/qt/sendcoinsdialog.cpp",
"new_path": "src/qt/sendcoinsdialog.cpp",
"diff": "@@ -155,6 +155,8 @@ void SendCoinsDialog::on_sendButton_clicked()\ntr(\"Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.\"),\nQMessageBox::Ok, QMessageBox::Ok);\nbreak;\n+ case WalletModel::NarrationTooLong: //nothing to do? Added to avoid compiler warning\n+ break;\ncase WalletModel::Aborted: // User aborted, nothing to do\nbreak;\ncase WalletModel::OK:\n"
}
]
| C++ | MIT License | vergecurrency/verge | Remove compiler warning in switch case |
714,136 | 04.01.2018 18:25:29 | 25,200 | 661838478da208b6bc7b1e43d67e6fa8e6ec3361 | fix small typo in a comment | [
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -2202,7 +2202,7 @@ bool CWallet::FindStealthTransactions(const CTransaction& tx, mapValue_t& mapNar\nif (it->scan_secret.size() != ec_secret_size)\ncontinue; // stealth address is not owned\n- //printf(\"it->Encodeded() %s\\n\", it->Encoded().c_str());\n+ //printf(\"it->Encoded() %s\\n\", it->Encoded().c_str());\nmemcpy(&sScan.e[0], &it->scan_secret[0], ec_secret_size);\nif (StealthSecret(sScan, vchEphemPK, it->spend_pubkey, sShared, pkExtracted) != 0)\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix small typo in a comment |
714,117 | 04.01.2018 21:05:02 | 18,000 | eaec83e384eb5753c9f148295d1c932b5591e3e9 | adding binary to gitignore | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -17,6 +17,9 @@ src/config/verge-config.h\nsrc/VERGEd\nsrc/qt/VERGE-qt\n+VERGEd\n+VERGE-qt\n+\nMakefile.in\naclocal.m4\nautom4te.cache/\n"
},
{
"change_type": "DELETE",
"old_path": "VERGE-qt",
"new_path": "VERGE-qt",
"diff": "Binary files a/VERGE-qt and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "VERGEd",
"new_path": "VERGEd",
"diff": "Binary files a/VERGEd and /dev/null differ\n"
}
]
| C++ | MIT License | vergecurrency/verge | adding binary to gitignore |
714,117 | 06.01.2018 10:02:53 | 18,000 | 615ddb5af76aae5ae46e98101701cfd99f5b0414 | ekryski review | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/blockbrowser.ui",
"new_path": "src/qt/forms/blockbrowser.ui",
"diff": "</layout>\n</item>\n<item row=\"1\" column=\"0\">\n- <layout class=\"QGridLayout\" name=\"gridLayout_3\" rowstretch=\"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\" columnstretch=\"0,1\">\n+ <layout class=\"QGridLayout\" name=\"gridLayout_3\" rowstretch=\"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\" columnstretch=\"0,0\">\n<property name=\"sizeConstraint\">\n<enum>QLayout::SetDefaultConstraint</enum>\n</property>\n<property name=\"horizontalSpacing\">\n<number>18</number>\n</property>\n- <item row=\"14\" column=\"0\">\n- <widget class=\"QLabel\" name=\"valueLabel\">\n+ <item row=\"17\" column=\"0\">\n+ <widget class=\"QLabel\" name=\"inputLabel\">\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">Value out: </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Inputs: </span></p></body></html></string>\n</property>\n- </widget>\n- </item>\n- <item row=\"13\" column=\"1\">\n- <widget class=\"QLabel\" name=\"txID\">\n- <property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">000 </span></p></body></html></string>\n+ <property name=\"alignment\">\n+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>\n</property>\n</widget>\n</item>\n- <item row=\"10\" column=\"1\">\n- <widget class=\"QLabel\" name=\"pawBox\">\n+ <item row=\"13\" column=\"0\">\n+ <widget class=\"QLabel\" name=\"txLabel\">\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">0000 KH/s </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Transaction ID: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n- <item row=\"6\" column=\"1\">\n- <widget class=\"QLabel\" name=\"nonceBox\">\n+ <item row=\"3\" column=\"1\">\n+ <widget class=\"QLabel\" name=\"heightLabel\">\n<property name=\"text\">\n<string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n- <item row=\"8\" column=\"1\">\n- <widget class=\"QLabel\" name=\"timeBox\">\n+ <item row=\"4\" column=\"1\">\n+ <widget class=\"QLabel\" name=\"hashBox\">\n+ <property name=\"enabled\">\n+ <bool>true</bool>\n+ </property>\n+ <property name=\"sizePolicy\">\n+ <sizepolicy hsizetype=\"Preferred\" vsizetype=\"Preferred\">\n+ <horstretch>0</horstretch>\n+ <verstretch>0</verstretch>\n+ </sizepolicy>\n+ </property>\n+ <property name=\"minimumSize\">\n+ <size>\n+ <width>0</width>\n+ <height>0</height>\n+ </size>\n+ </property>\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0x0 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n- <item row=\"4\" column=\"0\">\n- <widget class=\"QLabel\" name=\"hashLabel\">\n- <property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">Block Hash: </span></p></body></html></string>\n+ <item row=\"18\" column=\"0\">\n+ <spacer name=\"verticalSpacer\">\n+ <property name=\"orientation\">\n+ <enum>Qt::Vertical</enum>\n</property>\n- </widget>\n+ <property name=\"sizeHint\" stdset=\"0\">\n+ <size>\n+ <width>20</width>\n+ <height>40</height>\n+ </size>\n+ </property>\n+ </spacer>\n</item>\n- <item row=\"13\" column=\"0\">\n- <widget class=\"QLabel\" name=\"txLabel\">\n+ <item row=\"13\" column=\"1\">\n+ <widget class=\"QLabel\" name=\"txID\">\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">Transaction ID: </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">000 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"12\" column=\"1\">\n<widget class=\"QPushButton\" name=\"txButton\">\n<property name=\"styleSheet\">\n- <string notr=\"true\"/>\n+ <string notr=\"true\">min-width: 230px;\n+max-width: 230px;</string>\n</property>\n<property name=\"text\">\n<string>Decode Transaction</string>\n</property>\n</widget>\n</item>\n- <item row=\"3\" column=\"1\">\n- <widget class=\"QLabel\" name=\"heightLabel\">\n+ <item row=\"7\" column=\"1\">\n+ <widget class=\"QLabel\" name=\"bitsBox\">\n<property name=\"text\">\n<string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n</property>\n</property>\n</widget>\n</item>\n- <item row=\"9\" column=\"0\">\n- <widget class=\"QLabel\" name=\"hardLabel\">\n+ <item row=\"14\" column=\"0\">\n+ <widget class=\"QLabel\" name=\"valueLabel\">\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">Block Difficulty: </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Value out: </span></p></body></html></string>\n+ </property>\n+ </widget>\n+ </item>\n+ <item row=\"4\" column=\"0\">\n+ <widget class=\"QLabel\" name=\"hashLabel\">\n+ <property name=\"text\">\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block Hash: </span></p></body></html></string>\n+ </property>\n+ </widget>\n+ </item>\n+ <item row=\"8\" column=\"1\">\n+ <widget class=\"QLabel\" name=\"timeBox\">\n+ <property name=\"text\">\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n+ </property>\n+ </widget>\n+ </item>\n+ <item row=\"6\" column=\"1\">\n+ <widget class=\"QLabel\" name=\"nonceBox\">\n+ <property name=\"text\">\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"1\" column=\"1\">\n<widget class=\"QPushButton\" name=\"blockButton\">\n<property name=\"styleSheet\">\n- <string notr=\"true\"/>\n+ <string notr=\"true\">min-width: 230px;\n+max-width: 230px;</string>\n</property>\n<property name=\"text\">\n<string>Jump to Block</string>\n</property>\n</widget>\n</item>\n+ <item row=\"9\" column=\"0\">\n+ <widget class=\"QLabel\" name=\"hardLabel\">\n+ <property name=\"text\">\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block Difficulty: </span></p></body></html></string>\n+ </property>\n+ </widget>\n+ </item>\n<item row=\"1\" column=\"0\">\n<widget class=\"QSpinBox\" name=\"heightBox\">\n<property name=\"sizePolicy\">\n</property>\n</widget>\n</item>\n- <item row=\"4\" column=\"1\">\n- <widget class=\"QLabel\" name=\"hashBox\">\n- <property name=\"enabled\">\n- <bool>true</bool>\n- </property>\n- <property name=\"sizePolicy\">\n- <sizepolicy hsizetype=\"Preferred\" vsizetype=\"Preferred\">\n- <horstretch>0</horstretch>\n- <verstretch>0</verstretch>\n- </sizepolicy>\n- </property>\n- <property name=\"minimumSize\">\n- <size>\n- <width>0</width>\n- <height>0</height>\n- </size>\n- </property>\n- <property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">0x0 </span></p></body></html></string>\n- </property>\n- </widget>\n- </item>\n- <item row=\"7\" column=\"1\">\n- <widget class=\"QLabel\" name=\"bitsBox\">\n- <property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n- </property>\n- </widget>\n- </item>\n- <item row=\"17\" column=\"0\">\n- <widget class=\"QLabel\" name=\"inputLabel\">\n- <property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">Inputs: </span></p></body></html></string>\n- </property>\n- <property name=\"alignment\">\n- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>\n- </property>\n- </widget>\n- </item>\n- <item row=\"9\" column=\"1\">\n- <widget class=\"QLabel\" name=\"hardBox\">\n+ <item row=\"5\" column=\"0\">\n+ <widget class=\"QLabel\" name=\"merkleLabel\">\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">0.00 </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block Merkle: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n- <item row=\"5\" column=\"0\">\n- <widget class=\"QLabel\" name=\"merkleLabel\">\n+ <item row=\"10\" column=\"1\">\n+ <widget class=\"QLabel\" name=\"pawBox\">\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">Block Merkle: </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0000 KH/s </span></p></body></html></string>\n</property>\n</widget>\n</item>\n</property>\n</widget>\n</item>\n- <item row=\"18\" column=\"0\">\n- <spacer name=\"verticalSpacer\">\n- <property name=\"orientation\">\n- <enum>Qt::Vertical</enum>\n- </property>\n- <property name=\"sizeHint\" stdset=\"0\">\n- <size>\n- <width>20</width>\n- <height>40</height>\n- </size>\n+ <item row=\"9\" column=\"1\">\n+ <widget class=\"QLabel\" name=\"hardBox\">\n+ <property name=\"text\">\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0.00 </span></p></body></html></string>\n</property>\n- </spacer>\n+ </widget>\n</item>\n<item row=\"17\" column=\"1\">\n<widget class=\"QLabel\" name=\"inputBox\">\n</property>\n</widget>\n</item>\n+ <item row=\"18\" column=\"1\">\n+ <spacer name=\"horizontalSpacer\">\n+ <property name=\"orientation\">\n+ <enum>Qt::Horizontal</enum>\n+ </property>\n+ <property name=\"sizeHint\" stdset=\"0\">\n+ <size>\n+ <width>40</width>\n+ <height>20</height>\n+ </size>\n+ </property>\n+ </spacer>\n+ </item>\n</layout>\n</item>\n</layout>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/multisigdialog.ui",
"new_path": "src/qt/forms/multisigdialog.ui",
"diff": "<item>\n<widget class=\"QTabWidget\" name=\"tabWidget\">\n<property name=\"currentIndex\">\n- <number>0</number>\n+ <number>1</number>\n</property>\n<widget class=\"QWidget\" name=\"tabCreateAddress\">\n<attribute name=\"title\">\n<rect>\n<x>0</x>\n<y>0</y>\n- <width>1283</width>\n- <height>310</height>\n+ <width>1255</width>\n+ <height>269</height>\n</rect>\n</property>\n<layout class=\"QVBoxLayout\" name=\"verticalLayout_3\">\n<string>&Add public key...</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/add</normaloff>:/icons/add</iconset>\n</property>\n</widget>\n<string>Clear all</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>\n</property>\n<property name=\"autoRepeatDelay\">\n<string/>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>\n</property>\n<property name=\"autoDefault\">\n<string/>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>\n</property>\n<property name=\"autoDefault\">\n<rect>\n<x>0</x>\n<y>0</y>\n- <width>613</width>\n- <height>221</height>\n+ <width>587</width>\n+ <height>173</height>\n</rect>\n</property>\n<layout class=\"QVBoxLayout\" name=\"verticalLayout_4\">\n<string>Add input...</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/add</normaloff>:/icons/add</iconset>\n</property>\n</widget>\n<rect>\n<x>0</x>\n<y>0</y>\n- <width>612</width>\n- <height>193</height>\n+ <width>586</width>\n+ <height>141</height>\n</rect>\n</property>\n<layout class=\"QVBoxLayout\" name=\"verticalLayout_5\">\n<string>Add output...</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/add</normaloff>:/icons/add</iconset>\n</property>\n</widget>\n<string/>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>\n</property>\n<property name=\"autoDefault\">\n<string/>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>\n</property>\n<property name=\"shortcut\">\n<string>Sign transaction</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>\n</property>\n</widget>\n<string/>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>\n</property>\n<property name=\"autoDefault\">\n<string>Send transaction</string>\n</property>\n<property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n+ <iconset>\n<normaloff>:/icons/send</normaloff>:/icons/send</iconset>\n</property>\n</widget>\n"
}
]
| C++ | MIT License | vergecurrency/verge | ekryski review |
714,098 | 31.12.2017 02:39:24 | 18,000 | a0da447f3b539a55d03ab1626d0fdb7c346dc979 | updates to tor | [
{
"change_type": "MODIFY",
"old_path": "src/net.cpp",
"new_path": "src/net.cpp",
"diff": "using namespace std;\nusing namespace boost;\n-extern \"C\" { int tor_main(int argc, char *argv[]); }\n+extern \"C\" {\n+ int tor_main(int argc, char *argv[]);\n+}\nstatic const int MAX_OUTBOUND_CONNECTIONS = 16;\n@@ -53,6 +55,7 @@ struct LocalServiceInfo {\n// Global state variables\n//\nbool fClient = false;\n+bool fDiscover = true;\nbool fUseUPnP = false;\nuint64 nLocalServices = (fClient ? 0 : NODE_NETWORK);\nstatic CCriticalSection cs_mapLocalHost;\n"
}
]
| C++ | MIT License | vergecurrency/verge | updates to tor |
714,098 | 03.01.2018 02:35:34 | 18,000 | dd908c8809c066904fe6a5f0b23c5ae2152e0d7b | remove subdir conf | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -13,7 +13,7 @@ AC_CANONICAL_HOST\nAH_TOP([#ifndef VERGE_CONFIG_H])\nAH_TOP([#define VERGE_CONFIG_H])\nAH_BOTTOM([#endif //VERGE_CONFIG_H])\n-AX_SUBDIRS_CONFIGURE([tor], [[--disable-unittests], [--disable-system-torrc], [--disable-systemd], [--disable-lzma], [--disable-asciidoc], [--with-openssl-dir=$($PKG_CONFIG --variable=libdir openssl)], [CFLAGS=$($PKG_CONFIG --cflags openssl)]])\n+\n# This m4 will only be used if a system copy cannot be found. This is helpful\n# on systems where autotools are installed but the pkg-config macros are not in\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove subdir conf |
714,098 | 03.01.2018 09:00:47 | 18,000 | c1725780a106e7936d48b3715a595b469d3e0012 | temp tor instruction | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -178,6 +178,7 @@ The _slightly_ longer version:\n```shell\ngit clone https://github.com/vergecurrency/verge && cd verge && ./autogen.sh && ./configure && make\n```\n+(temp tor instructions: ./autogen.sh && ./configure --disable-unittests --disable-system-torrc --disable-systemd --disable-lzma --disable-asciidoc --with-openssl-dir=$(PKG_CONFIG --variable=libdir openssl) && make)\n> **Note**: If you get a \"memory exhausted\" error, make a swap file. (https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04)\n"
}
]
| C++ | MIT License | vergecurrency/verge | temp tor instruction |
714,131 | 05.01.2018 03:32:07 | -3,600 | 720be72c3d0389afa778752bc361f392c716a709 | fix for miniupnpc build | [
{
"change_type": "MODIFY",
"old_path": "src/net.cpp",
"new_path": "src/net.cpp",
"diff": "@@ -899,8 +899,6 @@ void ThreadSocketHandler2(void* parg)\n#ifdef USE_UPNP\nvoid ThreadMapPort(void* parg)\n{\n- IMPLEMENT_RANDOMIZE_STACK(ThreadMapPort(parg));\n-\n// Make this thread recognisable as the UPnP thread\nRenameThread(\"verge-UPnP\");\n@@ -1031,7 +1029,7 @@ void MapPort(bool use_upnp)\n{\nif (use_upnp && vnThreadsRunning[THREAD_UPNP] < 1)\n{\n- if (!CreateThread(ThreadMapPort, NULL))\n+ if (!NewThread(ThreadMapPort, NULL))\nprintf(\"Error: ThreadMapPort(ThreadMapPort) failed\\n\");\n}\n}\n@@ -1114,7 +1112,7 @@ void DumpAddresses()\nCAddrDB adb;\nadb.Write(addrman);\n- printf(\"Flushed %lld addresses to peers.dat %dms\\n\",\n+ printf(\"Flushed %d addresses to peers.dat %lldms\\n\",\naddrman.size(), GetTimeMillis() - nStart);\n}\n@@ -1181,7 +1179,6 @@ void ThreadOpenConnections2(void* parg)\n}\n// Initiate network connections\n- int64 nStart = GetTime();\nwhile (true)\n{\nProcessOneShot();\n@@ -1430,10 +1427,6 @@ void ThreadMessageHandler2(void* parg)\nif (!vNodesCopy.empty())\npnodeTrickle = vNodesCopy[GetRand(vNodesCopy.size())];\n- bool fSleep = true;\n-\n- //BOOST_FOREACH(CNode* pnode, vNodesCopy)\n-\nsize_t r = GetRandInt(vNodesCopy.size()-1); // randomise the order\nfor (size_t i = 0; i < vNodesCopy.size(); ++i)\n{\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix for miniupnpc build |
714,131 | 05.01.2018 04:54:24 | -3,600 | 48dd92a0ffdc03e76be071e65bb202bfd459093b | added tor libs | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.am",
"new_path": "src/Makefile.am",
"diff": "@@ -236,7 +236,17 @@ VERGEd_LDADD = \\\n$(LIBBITCOIN_COMMON) \\\n$(LIBBITCOIN_UTIL) \\\n$(LIBLEVELDB) \\\n- $(LIBMEMENV)\n+ $(LIBMEMENV) \\\n+ ../tor/src/or/libtor.a \\\n+ ../tor/src/common/libor.a \\\n+ ../tor/src/common/libor-ctime.a \\\n+ ../tor/src/common/libor-crypto.a \\\n+ ../tor/src/common/libor-event.a \\\n+ ../tor/src/trunnel/libor-trunnel.a \\\n+ ../tor/src/common/libcurve25519_donna.a \\\n+ ../tor/src/ext/ed25519/donna/libed25519_donna.a \\\n+ ../tor/src/ext/ed25519/ref10/libed25519_ref10.a \\\n+ ../tor/src/ext/keccak-tiny/libkeccak-tiny.a\nif HAVE_SSE2\nlibbitcoin_sse2_a_SOURCES = scrypt-sse2.cpp\n"
}
]
| C++ | MIT License | vergecurrency/verge | added tor libs |
714,098 | 04.01.2018 23:38:24 | 18,000 | 9cff03d9a1b80863e1872b6fd5b7c4a167c48757 | create subdir configure | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/m4/ax_subdirs_configure.m4",
"diff": "+# ===========================================================================\n+# https://www.gnu.org/software/autoconf-archive/ax_subdirs_configure.html\n+# ===========================================================================\n+#\n+# SYNOPSIS\n+#\n+# AX_SUBDIRS_CONFIGURE( [subdirs], [mandatory arguments], [possibly merged arguments], [replacement arguments], [forbidden arguments])\n+#\n+# DESCRIPTION\n+#\n+# AX_SUBDIRS_CONFIGURE attempts to be the equivalent of AC_CONFIG_SUBDIRS\n+# with customizable options for configure scripts.\n+#\n+# Run the configure script for each directory from the comma-separated m4\n+# list 'subdirs'. This macro can be used multiple times. All arguments of\n+# this macro must be comma-separated lists.\n+#\n+# All command line arguments from the parent configure script will be\n+# given to the subdirectory configure script after the following\n+# modifications (in that order):\n+#\n+# 1. The arguments from the 'mandatory arguments' list shall always be\n+# appended to the argument list.\n+#\n+# 2. The arguments from the 'possibly merged arguments' list shall be\n+# added if not present in the arguments of the parent configure script or\n+# merged with the existing argument otherwise.\n+#\n+# 3. The arguments from the 'replacement arguments' list shall be added if\n+# not present in the arguments of the parent configure script or replace\n+# the existing argument otherwise.\n+#\n+# 4. The arguments from the 'forbidden arguments' list shall always be\n+# removed from the argument list.\n+#\n+# The lists 'mandatory arguments' and 'forbidden arguments' can hold any\n+# kind of argument. The 'possibly merged arguments' and 'replacement\n+# arguments' expect their arguments to be of the form --option-name=value.\n+#\n+# This macro aims to remain as close as possible to the AC_CONFIG_SUBDIRS\n+# macro. It corrects the paths for '--cache-file' and '--srcdir' and adds\n+# '--disable-option-checking' and '--silent' if necessary.\n+#\n+# This macro also sets the output variable subdirs_extra to the list of\n+# directories recorded with AX_SUBDIRS_CONFIGURE. This variable can be\n+# used in Makefile rules or substituted in configured files.\n+#\n+# This macro shall do nothing more than managing the arguments of the\n+# configure script. Just like when using AC_CONFIG_SUBDIRS, it is up to\n+# the user to check any requirements or define and substitute any required\n+# variable for the remainder of the project.\n+#\n+# Configure scripts recorded with AX_SUBDIRS_CONFIGURE may be executed\n+# before configure scripts recorded with AC_CONFIG_SUBDIRS.\n+#\n+# Without additional arguments, the behaviour of AX_SUBDIRS_CONFIGURE\n+# should be identical to the behaviour of AC_CONFIG_SUBDIRS, apart from\n+# the contents of the variables subdirs and subdirs_extra (except that\n+# AX_SUBDIRS_CONFIGURE expects a comma-separated m4 list):\n+#\n+# AC_CONFIG_SUBDIRS([something])\n+# AX_SUBDIRS_CONFIGURE([something])\n+#\n+# This macro may be called multiple times.\n+#\n+# Usage example:\n+#\n+# Let us assume our project has 4 dependencies, namely A, B, C and D. Here\n+# are some characteristics of our project and its dependencies:\n+#\n+# - A does not require any special option.\n+#\n+# - we want to build B with an optional feature which can be enabled with\n+# its configure script's option '--enable-special-feature'.\n+#\n+# - B's configure script is strange and has an option '--with-B=build'.\n+# After close inspection of its documentation, we don't want B to receive\n+# this option.\n+#\n+# - C and D both need B.\n+#\n+# - Just like our project, C and D can build B themselves with the option\n+# '--with-B=build'.\n+#\n+# - We want C and D to use the B we build instead of building it\n+# themselves.\n+#\n+# Our top-level configure script will be called as follows:\n+#\n+# $ <path/to/configure> --with-A=build --with-B=build --with-C=build \\\n+# --with-D=build --some-option\n+#\n+# Thus we have to make sure that:\n+#\n+# - neither B, C or D receive the option '--with-B=build'\n+#\n+# - C and D know where to find the headers and libraries of B.\n+#\n+# Under those conditions, we can use the AC_CONFIG_SUBDIRS macro for A,\n+# but need to use AX_SUBDIRS_CONFIGURE for B, C and D:\n+#\n+# - B must receive '--enable-special-feature' but cannot receive\n+# '--with-B=build'\n+#\n+# - C and D cannot receive '--with-B=build' (or else it would be built\n+# thrice) and need to be told where to find B (since we are building it,\n+# it would probably not be available in standard paths).\n+#\n+# Here is a configure.ac snippet that solves our problem:\n+#\n+# AC_CONFIG_SUBDIRS([dependencies/A])\n+# AX_SUBDIRS_CONFIGURE(\n+# [dependencies/B], [--enable-special-feature], [], [],\n+# [--with-B=build])\n+# AX_SUBDIRS_CONFIGURE(\n+# [[dependencies/C],[dependencies/D]],\n+# [],\n+# [[CPPFLAGS=-I${ac_top_srcdir}/dependencies/B -I${ac_top_builddir}/dependencies/B],\n+# [LDFLAGS=-L${ac_abs_top_builddir}/dependencies/B/.libs]],\n+# [--with-B=system],\n+# [])\n+#\n+# If using automake, the following can be added to the Makefile.am (we use\n+# both $(subdirs) and $(subdirs_extra) since our example above used both\n+# AC_CONFIG_SUBDIRS and AX_SUBDIRS_CONFIGURE):\n+#\n+# SUBDIRS = $(subdirs) $(subdirs_extra)\n+#\n+# LICENSE\n+#\n+# Copyright (c) 2017 Harenome Ranaivoarivony-Razanajato <[email protected]>\n+#\n+# This program is free software; you can redistribute it and/or modify it\n+# under the terms of the GNU General Public License as published by the\n+# Free Software Foundation; either version 3 of the License, or (at your\n+# option) any later version.\n+#\n+# This program is distributed in the hope that it will be useful, but\n+# WITHOUT ANY WARRANTY; without even the implied warranty of\n+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General\n+# Public License for more details.\n+#\n+# Under Section 7 of GPL version 3, you are granted additional permissions\n+# described in the Autoconf Configure Script Exception, version 3.0, as\n+# published by the Free Software Foundation.\n+#\n+# You should have received a copy of the GNU General Public License along\n+# with this program. If not, see <https://www.gnu.org/licenses/>.\n+\n+#serial 3\n+\n+AC_DEFUN([AX_SUBDIRS_CONFIGURE],\n+[\n+ dnl Calls to AC_CONFIG_SUBDIRS perform preliminary steps and build a list\n+ dnl '$subdirs' which is used later by _AC_OUTPUT_SUBDIRS (used by AC_OUTPUT)\n+ dnl to actually run the configure scripts.\n+ dnl This macro performs similiar preliminary steps but uses\n+ dnl AC_CONFIG_COMMANDS_PRE to delay the final tasks instead of building an\n+ dnl intermediary list and relying on another macro.\n+ dnl\n+ dnl Since each configure script can get different options, a special variable\n+ dnl named 'ax_sub_configure_args_<subdir>' is constructed for each\n+ dnl subdirectory.\n+\n+ # Various preliminary checks.\n+ AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])\n+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])\n+ AS_LITERAL_IF([$1], [],\n+ [AC_DIAGNOSE([syntax], [$0: you should use literals])])\n+\n+ m4_foreach(subdir_path, [$1],\n+ [\n+ ax_dir=\"subdir_path\"\n+\n+ dnl Build the argument list in a similiar fashion to AC_CONFIG_SUBDIRS.\n+ dnl A few arguments found in the final call to the configure script are not\n+ dnl added here because they rely on variables that may not yet be available\n+ dnl (see below the part that is similiar to _AC_OUTPUT_SUBDIRS).\n+ # Do not complain, so a configure script can configure whichever parts of a\n+ # large source tree are present.\n+ if test -d \"$srcdir/$ax_dir\"; then\n+ _AC_SRCDIRS([\"$ax_dir\"])\n+ # Remove --cache-file, --srcdir, and --disable-option-checking arguments\n+ # so they do not pile up.\n+ ax_args=\n+ ax_prev=\n+ eval \"set x $ac_configure_args\"\n+ shift\n+ for ax_arg; do\n+ if test -n \"$ax_prev\"; then\n+ ax_prev=\n+ continue\n+ fi\n+ case $ax_arg in\n+ -cache-file | --cache-file | --cache-fil | --cache-fi | --cache-f \\\n+ | --cache- | --cache | --cach | --cac | --ca | --c)\n+ ax_prev=cache_file ;;\n+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \\\n+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \\\n+ | --c=*)\n+ ;;\n+ --config-cache | -C)\n+ ;;\n+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)\n+ ax_prev=srcdir ;;\n+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)\n+ ;;\n+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)\n+ ax_prev=prefix ;;\n+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* \\\n+ | --p=*)\n+ ;;\n+ --disable-option-checking)\n+ ;;\n+ *) case $ax_arg in\n+ *\\'*) ax_arg=$(AS_ECHO([\"$ax_arg\"]) | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\");;\n+ esac\n+ AS_VAR_APPEND([ax_args], [\" '$ax_arg'\"]) ;;\n+ esac\n+ done\n+ # Always prepend --disable-option-checking to silence warnings, since\n+ # different subdirs can have different --enable and --with options.\n+ ax_args=\"--disable-option-checking $ax_args\"\n+ # Options that must be added as they are provided.\n+ m4_ifnblank([$2], [m4_foreach(opt, [$2], [AS_VAR_APPEND(ax_args, \" 'opt'\")\n+ ])])\n+ # New options that may need to be merged with existing options.\n+ m4_ifnblank([$3], [m4_foreach(opt, [$3],\n+ [ax_candidate=\"opt\"\n+ ax_candidate_flag=\"${ax_candidate%%=*}\"\n+ ax_candidate_content=\"${ax_candidate#*=}\"\n+ if test \"x$ax_candidate\" != \"x\" -a \"x$ax_candidate_flag\" != \"x\"; then\n+ if echo \"$ax_args\" | grep -- \"${ax_candidate_flag}=\" >/dev/null 2>&1; then\n+ [ax_args=$(echo $ax_args | sed \"s,\\(${ax_candidate_flag}=[^']*\\),\\1 ${ax_candidate_content},\")]\n+ else\n+ AS_VAR_APPEND(ax_args, \" 'opt'\")\n+ fi\n+ fi\n+ ])])\n+ # New options that must replace existing options.\n+ m4_ifnblank([$4], [m4_foreach(opt, [$4],\n+ [ax_candidate=\"opt\"\n+ ax_candidate_flag=\"${ax_candidate%%=*}\"\n+ ax_candidate_content=\"${ax_candidate#*=}\"\n+ if test \"x$ax_candidate\" != \"x\" -a \"x$ax_candidate_flag\" != \"x\"; then\n+ if echo \"$ax_args\" | grep -- \"${ax_candidate_flag}=\" >/dev/null 2>&1; then\n+ [ax_args=$(echo $ax_args | sed \"s,${ax_candidate_flag}=[^']*,${ax_candidate},\")]\n+ else\n+ AS_VAR_APPEND(ax_args, \" 'opt'\")\n+ fi\n+ fi\n+ ])])\n+ # Options that must be removed.\n+ m4_ifnblank([$5], [m4_foreach(opt, [$5], [ax_args=$(echo $ax_args | sed \"s,'opt',,\")\n+ ])])\n+ AS_VAR_APPEND([ax_args], [\" '--srcdir=$ac_srcdir'\"])\n+\n+ # Add the subdirectory to the list of target subdirectories.\n+ ax_subconfigures=\"$ax_subconfigures $ax_dir\"\n+ # Save the argument list for this subdirectory.\n+ dnl $1 is a path to some subdirectory: m4_bpatsubsts() is used to convert\n+ dnl $1 into a valid shell variable name.\n+ dnl For instance, \"ax_sub_configure_args_path/to/subdir\" becomes\n+ dnl \"ax_sub_configure_args_path_to_subdir\".\n+ ax_var=$(printf \"$ax_dir\" | tr -c \"0-9a-zA-Z_\" \"_\")\n+ eval \"ax_sub_configure_args_$ax_var=\\\"$ax_args\\\"\"\n+ eval \"ax_sub_configure_$ax_var=\\\"yes\\\"\"\n+ else\n+ AC_MSG_WARN([could not find source tree for $ax_dir])\n+ fi\n+\n+ dnl Add some more arguments to the argument list and then actually run the\n+ dnl configure script. This is mostly what happens in _AC_OUTPUT_SUBDIRS\n+ dnl except it does not iterate over an intermediary list.\n+ AC_CONFIG_COMMANDS_PRE(\n+ dnl This very line can not be quoted! m4_foreach has some work here.\n+ ax_dir=\"subdir_path\"\n+ [\n+ # Convert the path to the subdirectory into a shell variable name.\n+ ax_var=$(printf \"$ax_dir\" | tr -c \"0-9a-zA-Z_\" \"_\")\n+ ax_configure_ax_var=$(eval \"echo \\\"\\$ax_sub_configure_$ax_var\\\"\")\n+ if test \"$no_recursion\" != \"yes\" -a \"x$ax_configure_ax_var\" = \"xyes\"; then\n+ AC_SUBST([subdirs_extra], [\"$subdirs_extra $ax_dir\"])\n+ ax_msg=\"=== configuring in $ax_dir ($(pwd)/$ax_dir)\"\n+ _AS_ECHO_LOG([$ax_msg])\n+ _AS_ECHO([$ax_msg])\n+ AS_MKDIR_P([\"$ax_dir\"])\n+ _AC_SRCDIRS([\"$ax_dir\"])\n+\n+ ax_popdir=$(pwd)\n+ cd \"$ax_dir\"\n+\n+ # Check for guested configure; otherwise get Cygnus style configure.\n+ if test -f \"$ac_srcdir/configure.gnu\"; then\n+ ax_sub_configure=$ac_srcdir/configure.gnu\n+ elif test -f \"$ac_srcdir/configure\"; then\n+ ax_sub_configure=$ac_srcdir/configure\n+ elif test -f \"$ac_srcdir/configure.in\"; then\n+ # This should be Cygnus configure.\n+ ax_sub_configure=$ac_aux_dir/configure\n+ else\n+ AC_MSG_WARN([no configuration information is in $ax_dir])\n+ ax_sub_configure=\n+ fi\n+\n+ if test -n \"$ax_sub_configure\"; then\n+ # Get the configure arguments for the current configure.\n+ eval \"ax_sub_configure_args=\\\"\\$ax_sub_configure_args_${ax_var}\\\"\"\n+\n+ # Always prepend --prefix to ensure using the same prefix\n+ # in subdir configurations.\n+ ax_arg=\"--prefix=$prefix\"\n+ case $ax_arg in\n+ *\\'*) ax_arg=$(AS_ECHO([\"$ax_arg\"]) | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\");;\n+ esac\n+ ax_sub_configure_args=\"'$ax_arg' $ax_sub_configure_args\"\n+ if test \"$silent\" = yes; then\n+ ax_sub_configure_args=\"--silent $ax_sub_configure_args\"\n+ fi\n+ # Make the cache file name correct relative to the subdirectory.\n+ case $cache_file in\n+ [[\\\\/]]* | ?:[[\\\\/]]* )\n+ ax_sub_cache_file=$cache_file ;;\n+ *) # Relative name.\n+ ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;\n+ esac\n+\n+ AC_MSG_NOTICE([running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file])\n+ eval \"\\$SHELL \\\"$ax_sub_configure\\\" $ax_sub_configure_args --cache-file=\\\"$ax_sub_cache_file\\\"\" \\\n+ || AC_MSG_ERROR([$ax_sub_configure failed for $ax_dir])\n+ fi\n+\n+ cd \"$ax_popdir\"\n+ fi\n+ ])\n+ ])\n+])\n"
}
]
| C++ | MIT License | vergecurrency/verge | create subdir configure |
714,098 | 04.01.2018 23:39:54 | 18,000 | 409e0cca2fce619b6a0e87d016735a3d0b742477 | configure tor subdir | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -13,6 +13,7 @@ AC_CANONICAL_HOST\nAH_TOP([#ifndef VERGE_CONFIG_H])\nAH_TOP([#define VERGE_CONFIG_H])\nAH_BOTTOM([#endif //VERGE_CONFIG_H])\n+AX_SUBDIRS_CONFIGURE([tor], [[--disable-unittests], [--disable-system-torrc], [--disable-systemd], [--disable-lzma], [--disable-asciidoc], [--with-openssl-dir=$($PKG_CONFIG --variable=libdir openssl)], [CFLAGS=$($PKG_CONFIG --cflags openssl)]])\n# This m4 will only be used if a system copy cannot be found. This is helpful\n"
}
]
| C++ | MIT License | vergecurrency/verge | configure tor subdir |
714,098 | 05.01.2018 13:02:27 | 18,000 | fdbc2f07d0428ce830bc2139e99c3a14910008e8 | zlib and libevent | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.am",
"new_path": "src/Makefile.am",
"diff": "@@ -237,6 +237,8 @@ VERGEd_LDADD = \\\n$(LIBBITCOIN_UTIL) \\\n$(LIBLEVELDB) \\\n$(LIBMEMENV) \\\n+ $(ZLIB_LIBS) \\\n+ $(LIBEVENT_LIBS) \\\n../tor/src/or/libtor.a \\\n../tor/src/common/libor.a \\\n../tor/src/common/libor-ctime.a \\\n"
}
]
| C++ | MIT License | vergecurrency/verge | zlib and libevent |
714,131 | 05.01.2018 19:50:22 | -3,600 | ba6f815a677c8b720f2a12b1b25464228d5fd40f | fix tor configure error | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -13,7 +13,7 @@ AC_CANONICAL_HOST\nAH_TOP([#ifndef VERGE_CONFIG_H])\nAH_TOP([#define VERGE_CONFIG_H])\nAH_BOTTOM([#endif //VERGE_CONFIG_H])\n-AX_SUBDIRS_CONFIGURE([tor], [[--disable-unittests], [--disable-system-torrc], [--disable-systemd], [--disable-lzma], [--disable-asciidoc], [--with-openssl-dir=$($PKG_CONFIG --variable=libdir openssl)], [CFLAGS=$($PKG_CONFIG --cflags openssl)]])\n+AX_SUBDIRS_CONFIGURE([tor], [[--disable-unittests], [--disable-system-torrc], [--disable-systemd], [--disable-lzma], [--disable-asciidoc], [--with-openssl-dir=$($PKG_CONFIG --variable=libdir openssl)], [CFLAGS=$($PKG_CONFIG --cflags openssl) -fPIC]])\n# This m4 will only be used if a system copy cannot be found. This is helpful\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix tor configure error |
714,131 | 05.01.2018 20:40:45 | -3,600 | 61dd4088dc351ccb74995f4be3907e8e98f1463b | added tor libs to verge-qt | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.qt.include",
"new_path": "src/Makefile.qt.include",
"diff": "@@ -246,7 +246,19 @@ if ENABLE_WALLET\nqt_VERGE_qt_LDADD += $(LIBBITCOIN_WALLET)\nendif\nqt_VERGE_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_SSE2) $(LIBLEVELDB) $(LIBMEMENV) \\\n- $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)\n+ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) \\\n+ $(ZLIB_LIBS) \\\n+ $(LIBEVENT_LIBS) \\\n+ ../tor/src/or/libtor.a \\\n+ ../tor/src/common/libor.a \\\n+ ../tor/src/common/libor-ctime.a \\\n+ ../tor/src/common/libor-crypto.a \\\n+ ../tor/src/common/libor-event.a \\\n+ ../tor/src/trunnel/libor-trunnel.a \\\n+ ../tor/src/common/libcurve25519_donna.a \\\n+ ../tor/src/ext/ed25519/donna/libed25519_donna.a \\\n+ ../tor/src/ext/ed25519/ref10/libed25519_ref10.a \\\n+ ../tor/src/ext/keccak-tiny/libkeccak-tiny.a\nif TARGET_LINUX\nqt_VERGE_qt_LDADD += -lrt\nendif\n"
}
]
| C++ | MIT License | vergecurrency/verge | added tor libs to verge-qt |
714,131 | 05.01.2018 23:52:02 | -3,600 | 5012f977a27934a7a745b1111a54e51a0da10445 | tor hostname | [
{
"change_type": "MODIFY",
"old_path": "src/init.cpp",
"new_path": "src/init.cpp",
"diff": "@@ -603,12 +603,21 @@ bool AppInit2()\nreturn InitError(strprintf(_(\"Cannot resolve -externalip address: '%s'\"), strAddr.c_str()));\nAddLocal(CService(strAddr, GetListenPort(), fNameLookup), LOCAL_MANUAL);\n}\n- } else {\n+ }\n+ else\n+ {\nstring automatic_onion;\n- filesystem::path const hostname_path = GetDefaultDataDir() / \"onion\" / \"hostname\";\n-\n- if (!filesystem::exists(hostname_path)) {\n- return InitError(_(\"No external address found.\"));\n+ filesystem::path hostname_path = GetDataDir() / \"tor\" / \"onion\" / \"hostname\";\n+\n+ int attempts = 0;\n+ while (1) {\n+ if (filesystem::exists(hostname_path))\n+ break;\n+ ++attempts;\n+ boost::this_thread::sleep(boost::posix_time::seconds(2));\n+ if (attempts > 8)\n+ return InitError(_(\"Timed out waiting for onion hostname.\"));\n+ LogPrintf(\"No onion hostname yet, will retry in 2 seconds... (%d/8)\\n\", attempts);\n}\nifstream file(hostname_path.string().c_str());\n"
}
]
| C++ | MIT License | vergecurrency/verge | tor hostname |
714,131 | 06.01.2018 00:56:36 | -3,600 | c0fd7c3073b5c811ad3b078bef76a4341f4d9045 | more makefile changes | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -13,7 +13,7 @@ AC_CANONICAL_HOST\nAH_TOP([#ifndef VERGE_CONFIG_H])\nAH_TOP([#define VERGE_CONFIG_H])\nAH_BOTTOM([#endif //VERGE_CONFIG_H])\n-AX_SUBDIRS_CONFIGURE([tor], [[--disable-unittests], [--disable-system-torrc], [--disable-systemd], [--disable-lzma], [--disable-asciidoc], [--with-openssl-dir=$($PKG_CONFIG --variable=libdir openssl)], [CFLAGS=$($PKG_CONFIG --cflags openssl) -fPIC]])\n+AX_SUBDIRS_CONFIGURE([tor], [[--disable-unittests], [--disable-system-torrc], [--disable-systemd], [--disable-lzma], [--disable-asciidoc], [--with-openssl-dir=$($PKG_CONFIG --variable=libdir openssl)], [CFLAGS=$($PKG_CONFIG --cflags openssl) -fPIC -O2]])\n# This m4 will only be used if a system copy cannot be found. This is helpful\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Makefile.am",
"new_path": "src/Makefile.am",
"diff": "@@ -23,6 +23,7 @@ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPP\nLIBBITCOIN_SERVER=libbitcoin_server.a\nLIBBITCOIN_WALLET=libbitcoin_wallet.a\nLIBBITCOIN_COMMON=libbitcoin_common.a\n+\nLIBBITCOIN_UTIL=libbitcoin_util.a\nif HAVE_SSE2\nLIBBITCOIN_SSE2=libbitcoin_sse2.a\n@@ -261,8 +262,8 @@ VERGEd_LDADD += libbitcoin_wallet.a\nendif\nVERGEd_SOURCES = daemon.cpp\n-VERGEd_LDADD += $(BOOST_LIBS) $(BDB_LIBS)\n-VERGEd_CPPFLAGS = $(BITCOIN_INCLUDES)\n+VERGEd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(LIBEVENT_LDFLAGS) $(ZLIB_LDFLAGS)\n+VERGEd_CPPFLAGS = $(BITCOIN_INCLUDES) $(LIBEVENT_CFLAGS) $(ZLIB_CFLAGS)\nCLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno\n"
}
]
| C++ | MIT License | vergecurrency/verge | more makefile changes |
714,131 | 06.01.2018 01:47:32 | -3,600 | 73da7ae4be094c270be8afad9d2ddf1a59ceeb9b | use tor 0.3.2 | [
{
"change_type": "MODIFY",
"old_path": ".gitmodules",
"new_path": ".gitmodules",
"diff": "[submodule \"tor\"]\npath = tor\nurl = https://github.com/torproject/tor.git\n+ branch = maint-0.3.2\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "autogen.sh",
"new_path": "autogen.sh",
"diff": "@@ -4,7 +4,7 @@ pushd tor\ngit checkout -f\npopd\n-git submodule update --init\n+git submodule update --remote\nsrcdir=\"$(dirname $0)\"\ncd \"$srcdir\"\nautoreconf --install --force\n"
},
{
"change_type": "MODIFY",
"old_path": "tor",
"new_path": "tor",
"diff": "-Subproject commit bd9739bae6230440c07fc67174ad37f019dfc412\n+Subproject commit 9ef97a268b06fed7b07908823600911a2a6eadc1\n"
}
]
| C++ | MIT License | vergecurrency/verge | use tor 0.3.2 |
714,098 | 05.01.2018 23:07:54 | 18,000 | 6a152f44731cc5995b53e0a3d62df05ff70ae77d | added more pkg_checks
check for ncap and libseccomp | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -552,6 +552,8 @@ if test x$use_pkgconfig = xyes; then\n[\nPKG_CHECK_MODULES(LIBEVENT, [libevent], [], [AC_MSG_ERROR([libevent not found])])\nPKG_CHECK_MODULES(ZLIB, [zlib], [], [AC_MSG_ERROR([zlib not found])])\n+ PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp], [], [AC_MSG_ERROR([libseccomp not found])])\n+ PKG_CHECK_MODULES(NCAP, [ncap], [], [AC_MSG_ERROR([ncap not found])])\nPKG_CHECK_MODULES([SSL], [libssl], [INCLUDES=\"$INCLUDES $SSL_CFLAGS\"; LIBS=\"$LIBS $SSL_LIBS\"], [AC_MSG_ERROR(openssl not found.)])\nPKG_CHECK_MODULES([CRYPTO], [libcrypto], [INCLUDES=\"$INCLUDES $CRYPTO_CFLAGS\"; LIBS=\"$LIBS $CRYPTO_LIBS\"], [AC_MSG_ERROR(libcrypto not found.)])\nBITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])\n"
}
]
| C++ | MIT License | vergecurrency/verge | added more pkg_checks
check for ncap and libseccomp |
714,098 | 06.01.2018 00:23:47 | 18,000 | e862fe482c691b41e0bdc355f5295f942ca14250 | remove libcap mod check
PKG_CHECK_MODULES(LIBCAP, [libcap], [], [AC_MSG_ERROR([libcap not found])])
WHY U NO FIND THIS TRAVIS?! | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -553,7 +553,7 @@ if test x$use_pkgconfig = xyes; then\nPKG_CHECK_MODULES(LIBEVENT, [libevent], [], [AC_MSG_ERROR([libevent not found])])\nPKG_CHECK_MODULES(ZLIB, [zlib], [], [AC_MSG_ERROR([zlib not found])])\nPKG_CHECK_MODULES(LIBSECCOMP, [libseccomp], [], [AC_MSG_ERROR([libseccomp not found])])\n- PKG_CHECK_MODULES(LIBCAP, [libcap], [], [AC_MSG_ERROR([libcap not found])])\n+\nPKG_CHECK_MODULES([SSL], [libssl], [INCLUDES=\"$INCLUDES $SSL_CFLAGS\"; LIBS=\"$LIBS $SSL_LIBS\"], [AC_MSG_ERROR(openssl not found.)])\nPKG_CHECK_MODULES([CRYPTO], [libcrypto], [INCLUDES=\"$INCLUDES $CRYPTO_CFLAGS\"; LIBS=\"$LIBS $CRYPTO_LIBS\"], [AC_MSG_ERROR(libcrypto not found.)])\nBITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove libcap mod check
PKG_CHECK_MODULES(LIBCAP, [libcap], [], [AC_MSG_ERROR([libcap not found])])
WHY U NO FIND THIS TRAVIS?! |
714,131 | 06.01.2018 07:23:37 | -3,600 | 5ed1d50717ff87ce1d18a4ff505a9f5797a942e9 | socket stuff | [
{
"change_type": "MODIFY",
"old_path": "src/netbase.cpp",
"new_path": "src/netbase.cpp",
"diff": "@@ -170,7 +170,7 @@ bool static Socks4(const CService &addrDest, SOCKET& hSocket)\nprintf(\"SOCKS4 connecting %s\\n\", addrDest.ToString().c_str());\nif (!addrDest.IsIPv4())\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Proxy destination is not IPv4\");\n}\nchar pszSocks4IP[] = \"\\4\\1\\0\\0\\0\\0\\0\\0user\";\n@@ -178,7 +178,7 @@ bool static Socks4(const CService &addrDest, SOCKET& hSocket)\nsocklen_t len = sizeof(addr);\nif (!addrDest.GetSockAddr((struct sockaddr*)&addr, &len) || addr.sin_family != AF_INET)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Cannot get proxy destination address\");\n}\nmemcpy(pszSocks4IP + 2, &addr.sin_port, 2);\n@@ -189,18 +189,18 @@ bool static Socks4(const CService &addrDest, SOCKET& hSocket)\nint ret = send(hSocket, pszSocks4, nSize, MSG_NOSIGNAL);\nif (ret != nSize)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Error sending to proxy\");\n}\nchar pchRet[8];\nif (recv(hSocket, pchRet, 8, 0) != 8)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Error reading proxy response\");\n}\nif (pchRet[1] != 0x5a)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nif (pchRet[1] != 0x5b)\nprintf(\"ERROR: Proxy returned error %d\\n\", pchRet[1]);\nreturn false;\n@@ -214,7 +214,7 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)\nprintf(\"SOCKS5 connecting %s\\n\", strDest.c_str());\nif (strDest.size() > 255)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Hostname too long\");\n}\nchar pszSocks5Init[] = \"\\5\\1\\0\";\n@@ -224,18 +224,18 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)\nssize_t ret = send(hSocket, pszSocks5, nSize, MSG_NOSIGNAL);\nif (ret != nSize)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Error sending to proxy\");\n}\nchar pchRet1[2];\nif (recv(hSocket, pchRet1, 2, 0) != 2)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Error reading proxy response\");\n}\nif (pchRet1[0] != 0x05 || pchRet1[1] != 0x00)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Proxy failed to initialize\");\n}\nstring strSocks5(\"\\5\\1\");\n@@ -247,23 +247,23 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)\nret = send(hSocket, strSocks5.c_str(), strSocks5.size(), MSG_NOSIGNAL);\nif (ret != (ssize_t)strSocks5.size())\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Error sending to proxy\");\n}\nchar pchRet2[4];\nif (recv(hSocket, pchRet2, 4, 0) != 4)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Error reading proxy response\");\n}\nif (pchRet2[0] != 0x05)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Proxy failed to accept request\");\n}\nif (pchRet2[1] != 0x00)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nswitch (pchRet2[1])\n{\ncase 0x01: return error(\"Proxy error: general failure\");\n@@ -279,7 +279,7 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)\n}\nif (pchRet2[2] != 0x00)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Error: malformed proxy response\");\n}\nchar pchRet3[256];\n@@ -296,16 +296,16 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)\nret = recv(hSocket, pchRet3, nRecv, 0) != nRecv;\nbreak;\n}\n- default: closesocket(hSocket); return error(\"Error: malformed proxy response\");\n+ default: CloseSocket(hSocket); return error(\"Error: malformed proxy response\");\n}\nif (ret)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Error reading from proxy\");\n}\nif (recv(hSocket, pchRet3, 2, 0) != 2)\n{\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn error(\"Error reading from proxy\");\n}\nprintf(\"SOCKS5 connected %s\\n\", strDest.c_str());\n@@ -331,17 +331,8 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe\nsetsockopt(hSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&set, sizeof(int));\n#endif\n-#ifdef WIN32\n- u_long fNonblock = 1;\n- if (ioctlsocket(hSocket, FIONBIO, &fNonblock) == SOCKET_ERROR)\n-#else\n- int fFlags = fcntl(hSocket, F_GETFL, 0);\n- if (fcntl(hSocket, F_SETFL, fFlags | O_NONBLOCK) == -1)\n-#endif\n- {\n- closesocket(hSocket);\n- return false;\n- }\n+ if (!SetSocketNonBlocking(hSocket, true))\n+ return error(\"ConnectSocketDirectly: Setting socket to non-blocking failed, error %i\\n\", WSAGetLastError());\nif (connect(hSocket, (struct sockaddr*)&sockaddr, len) == SOCKET_ERROR)\n{\n@@ -359,13 +350,13 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe\nif (nRet == 0)\n{\nprintf(\"connection timeout\\n\");\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn false;\n}\nif (nRet == SOCKET_ERROR)\n{\nprintf(\"select() for connection failed: %i\\n\",WSAGetLastError());\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn false;\n}\nsocklen_t nRetSize = sizeof(nRet);\n@@ -376,13 +367,13 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe\n#endif\n{\nprintf(\"getsockopt() for connection failed: %i\\n\",WSAGetLastError());\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn false;\n}\nif (nRet != 0)\n{\nprintf(\"connect() failed after select(): %s\\n\",strerror(nRet));\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn false;\n}\n}\n@@ -393,26 +384,11 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe\n#endif\n{\nprintf(\"connect() failed: %i\\n\",WSAGetLastError());\n- closesocket(hSocket);\n+ CloseSocket(hSocket);\nreturn false;\n}\n}\n- // this isn't even strictly necessary\n- // CNode::ConnectNode immediately turns the socket back to non-blocking\n- // but we'll turn it back to blocking just in case\n-#ifdef WIN32\n- fNonblock = 0;\n- if (ioctlsocket(hSocket, FIONBIO, &fNonblock) == SOCKET_ERROR)\n-#else\n- fFlags = fcntl(hSocket, F_GETFL, 0);\n- if (fcntl(hSocket, F_SETFL, fFlags & !O_NONBLOCK) == SOCKET_ERROR)\n-#endif\n- {\n- closesocket(hSocket);\n- return false;\n- }\n-\nhSocketRet = hSocket;\nreturn true;\n}\n@@ -469,6 +445,48 @@ bool IsProxy(const CNetAddr &addr) {\nreturn false;\n}\n+bool CloseSocket(SOCKET& hSocket)\n+{\n+ if (hSocket == INVALID_SOCKET)\n+ return false;\n+#ifdef WIN32\n+ int ret = closesocket(hSocket);\n+#else\n+ int ret = close(hSocket);\n+#endif\n+ hSocket = INVALID_SOCKET;\n+ return ret != SOCKET_ERROR;\n+}\n+\n+bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking)\n+{\n+ if (fNonBlocking) {\n+#ifdef WIN32\n+ u_long nOne = 1;\n+ if (ioctlsocket(hSocket, FIONBIO, &nOne) == SOCKET_ERROR) {\n+#else\n+ int fFlags = fcntl(hSocket, F_GETFL, 0);\n+ if (fcntl(hSocket, F_SETFL, fFlags | O_NONBLOCK) == SOCKET_ERROR) {\n+#endif\n+ CloseSocket(hSocket);\n+ return false;\n+ }\n+ } else {\n+#ifdef WIN32\n+ u_long nZero = 0;\n+ if (ioctlsocket(hSocket, FIONBIO, &nZero) == SOCKET_ERROR) {\n+#else\n+ int fFlags = fcntl(hSocket, F_GETFL, 0);\n+ if (fcntl(hSocket, F_SETFL, fFlags & ~O_NONBLOCK) == SOCKET_ERROR) {\n+#endif\n+ CloseSocket(hSocket);\n+ return false;\n+ }\n+ }\n+\n+ return true;\n+}\n+\nbool ConnectSocket(const CService &addrDest, SOCKET& hSocketRet, int nTimeout)\n{\nproxyType proxy;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/netbase.h",
"new_path": "src/netbase.h",
"diff": "@@ -149,5 +149,7 @@ bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault =\nbool LookupNumeric(const char *pszName, CService& addr, int portDefault = 0);\nbool ConnectSocket(const CService &addr, SOCKET& hSocketRet, int nTimeout = nConnectTimeout);\nbool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest, int portDefault = 0, int nTimeout = nConnectTimeout);\n+bool CloseSocket(SOCKET& hSocket);\n+bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking);\n#endif\n"
}
]
| C++ | MIT License | vergecurrency/verge | socket stuff |
714,098 | 06.01.2018 12:10:05 | 18,000 | 6e6772cfb23b8a8ec5745e0188bdf569bb3dac29 | fix flags and order | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.am",
"new_path": "src/Makefile.am",
"diff": "@@ -260,13 +260,12 @@ VERGEd_LDADD += \\\n../tor/src/ext/ed25519/donna/libed25519_donna.a \\\n../tor/src/ext/ed25519/ref10/libed25519_ref10.a \\\n../tor/src/ext/keccak-tiny/libkeccak-tiny.a \\\n- $(ZLIB_LIBS) \\\n$(LIBEVENT_LIBS) \\\n$(LIBSECCOMP_LIBS) \\\n$(LIBCAP_LIBS)\n-VERGEd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(LIBEVENT_LDFLAGS) $(ZLIB_LDFLAGS)\n-VERGEd_CPPFLAGS = $(BITCOIN_INCLUDES) $(LIBEVENT_CFLAGS) $(ZLIB_CFLAGS)\n+VERGEd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(LIBEVENT_LDFLAGS) $(LIBSECCOMP_LDFLAGS) $(LIBCAP_LDFLAGS) $(ZLIB_LDFLAGS)\n+VERGEd_CPPFLAGS = $(BITCOIN_INCLUDES) $(LIBSECCOMP_CFLAGS) $(LIBCAP_CFLAGS) $(ZLIB_CFLAGS)\nCLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix flags and order |
714,131 | 06.01.2018 19:38:38 | -3,600 | c618330e3e22892b1988048deb93a346fd76c894 | libcap check added back | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -553,7 +553,7 @@ if test x$use_pkgconfig = xyes; then\nPKG_CHECK_MODULES(LIBEVENT, [libevent], [], [AC_MSG_ERROR([libevent not found])])\nPKG_CHECK_MODULES(ZLIB, [zlib], [], [AC_MSG_ERROR([zlib not found])])\nPKG_CHECK_MODULES(LIBSECCOMP, [libseccomp], [], [AC_MSG_ERROR([libseccomp not found])])\n-\n+ PKG_CHECK_MODULES(LIBCAP, [libcap], [], [AC_MSG_ERROR([libcap not found])])\nPKG_CHECK_MODULES([SSL], [libssl], [INCLUDES=\"$INCLUDES $SSL_CFLAGS\"; LIBS=\"$LIBS $SSL_LIBS\"], [AC_MSG_ERROR(openssl not found.)])\nPKG_CHECK_MODULES([CRYPTO], [libcrypto], [INCLUDES=\"$INCLUDES $CRYPTO_CFLAGS\"; LIBS=\"$LIBS $CRYPTO_LIBS\"], [AC_MSG_ERROR(libcrypto not found.)])\nBITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])\n"
}
]
| C++ | MIT License | vergecurrency/verge | libcap check added back |
714,131 | 07.01.2018 00:11:03 | -3,600 | 139ca7b3ae6c3c607c4f8d3726bc9b38c573a7ba | ports adjustments, timeouts etc. | [
{
"change_type": "MODIFY",
"old_path": "src/init.cpp",
"new_path": "src/init.cpp",
"diff": "@@ -38,7 +38,7 @@ enum BindFlags {\nCWallet* pwalletMain;\nCClientUIInterface uiInterface;\nCService addrOnion;\n-unsigned short const onion_port = 21102;\n+unsigned short const onion_port = 9089;\n//////////////////////////////////////////////////////////////////////////////\n//\n@@ -549,7 +549,6 @@ bool AppInit2()\n} while (false);\nCService addrOnion;\n- unsigned short const onion_port = 9077;\nif (mapArgs.count(\"-tor\") && mapArgs[\"-tor\"] != \"0\") {\naddrOnion = CService(mapArgs[\"-tor\"], onion_port);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/net.cpp",
"new_path": "src/net.cpp",
"diff": "@@ -1668,7 +1668,7 @@ static void run_tor() {\nargv.push_back(\"--HiddenServiceDir\");\nargv.push_back((tor_dir / \"onion\").string());\nargv.push_back(\"--HiddenServicePort\");\n- argv.push_back(\"37347\");\n+ argv.push_back(\"21102\");\nif (clientTransportPlugin) {\nprintf(\"Using OBFS4.\\n\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/netbase.cpp",
"new_path": "src/netbase.cpp",
"diff": "@@ -26,6 +26,7 @@ static proxyType proxyInfo[NET_MAX];\nstatic proxyType nameproxyInfo;\nstatic CCriticalSection cs_proxyInfos;\nint nConnectTimeout = 5000;\n+static const int SOCKS_RECV_TIMEOUT = 20 * 1000;\nbool fNameLookup = false;\nstatic const unsigned char pchIPv4[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };\n@@ -165,6 +166,59 @@ bool LookupNumeric(const char *pszName, CService& addr, int portDefault)\nreturn Lookup(pszName, addr, portDefault, false);\n}\n+timeval static MillisToTimeval(int64_t nTimeout)\n+{\n+ struct timeval timeout;\n+ timeout.tv_sec = nTimeout / 1000;\n+ timeout.tv_usec = (nTimeout % 1000) * 1000;\n+ return timeout;\n+}\n+\n+bool static Recv(SOCKET& hSocket, char* data, int timeout, size_t len)\n+{\n+ int64_t curTime = GetTimeMillis();\n+ int64_t endTime = curTime + timeout;\n+ const int64_t maxWait = 1000;\n+ while (len > 0 && curTime < endTime)\n+ {\n+ ssize_t ret = recv(hSocket, data, len, 0);\n+ if (ret > 0)\n+ {\n+ len -= ret;\n+ data += ret;\n+ }\n+ else if (ret == 0)\n+ {\n+ return false;\n+ }\n+ else\n+ {\n+ int nErr = WSAGetLastError();\n+ if (nErr == WSAEINPROGRESS || nErr == WSAEWOULDBLOCK || nErr == WSAEINVAL)\n+ {\n+ struct timeval tval = MillisToTimeval(std::min(endTime - curTime, maxWait));\n+ fd_set fdset;\n+ FD_ZERO(&fdset);\n+ FD_SET(hSocket, &fdset);\n+ int nRet = select(hSocket + 1, &fdset, NULL, NULL, &tval);\n+ if (nRet == SOCKET_ERROR)\n+ {\n+ return false;\n+ }\n+ }\n+ else\n+ {\n+ return false;\n+ }\n+ }\n+ if (fShutdown)\n+ return false;\n+\n+ curTime = GetTimeMillis();\n+ }\n+ return len == 0;\n+}\n+\nbool static Socks4(const CService &addrDest, SOCKET& hSocket)\n{\nprintf(\"SOCKS4 connecting %s\\n\", addrDest.ToString().c_str());\n@@ -193,7 +247,7 @@ bool static Socks4(const CService &addrDest, SOCKET& hSocket)\nreturn error(\"Error sending to proxy\");\n}\nchar pchRet[8];\n- if (recv(hSocket, pchRet, 8, 0) != 8)\n+ if (!Recv(hSocket, pchRet, SOCKS_RECV_TIMEOUT, 8))\n{\nCloseSocket(hSocket);\nreturn error(\"Error reading proxy response\");\n@@ -228,7 +282,7 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)\nreturn error(\"Error sending to proxy\");\n}\nchar pchRet1[2];\n- if (recv(hSocket, pchRet1, 2, 0) != 2)\n+ if (!Recv(hSocket, pchRet1, SOCKS_RECV_TIMEOUT, 2))\n{\nCloseSocket(hSocket);\nreturn error(\"Error reading proxy response\");\n@@ -251,7 +305,7 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)\nreturn error(\"Error sending to proxy\");\n}\nchar pchRet2[4];\n- if (recv(hSocket, pchRet2, 4, 0) != 4)\n+ if (!Recv(hSocket, pchRet2, SOCKS_RECV_TIMEOUT, 4))\n{\nCloseSocket(hSocket);\nreturn error(\"Error reading proxy response\");\n@@ -285,25 +339,25 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)\nchar pchRet3[256];\nswitch (pchRet2[3])\n{\n- case 0x01: ret = recv(hSocket, pchRet3, 4, 0) != 4; break;\n- case 0x04: ret = recv(hSocket, pchRet3, 16, 0) != 16; break;\n+ case 0x01: ret = Recv(hSocket, pchRet3, SOCKS_RECV_TIMEOUT, 4); break;\n+ case 0x04: ret = Recv(hSocket, pchRet3, SOCKS_RECV_TIMEOUT, 16); break;\ncase 0x03:\n{\n- ret = recv(hSocket, pchRet3, 1, 0) != 1;\n+ ret = Recv(hSocket, pchRet3, SOCKS_RECV_TIMEOUT, 1);\nif (ret)\nreturn error(\"Error reading from proxy\");\nint nRecv = pchRet3[0];\n- ret = recv(hSocket, pchRet3, nRecv, 0) != nRecv;\n+ ret = Recv(hSocket, pchRet3, SOCKS_RECV_TIMEOUT, nRecv);\nbreak;\n}\ndefault: CloseSocket(hSocket); return error(\"Error: malformed proxy response\");\n}\n- if (ret)\n+ if (!ret)\n{\nCloseSocket(hSocket);\nreturn error(\"Error reading from proxy\");\n}\n- if (recv(hSocket, pchRet3, 2, 0) != 2)\n+ if (!Recv(hSocket, pchRet3, SOCKS_RECV_TIMEOUT, 2))\n{\nCloseSocket(hSocket);\nreturn error(\"Error reading from proxy\");\n"
}
]
| C++ | MIT License | vergecurrency/verge | ports adjustments, timeouts etc. |
714,131 | 07.01.2018 02:29:19 | -3,600 | 433d1f2b9449df5908b1252dea367da8b9dfb4a4 | bring back miner | [
{
"change_type": "MODIFY",
"old_path": "src/net.cpp",
"new_path": "src/net.cpp",
"diff": "@@ -1787,6 +1787,9 @@ void StartNode(void* threadGroup)\n// Dump network addresses\nif (!NewThread(ThreadDumpAddress, NULL))\nprintf(\"Error; NewThread(ThreadDumpAddress) failed\\n\");\n+\n+ // Generate coins in the background\n+ GenerateBitcoins(GetBoolArg(\"-gen\", false), pwalletMain);\n}\nbool StopNode()\n"
}
]
| C++ | MIT License | vergecurrency/verge | bring back miner |
714,098 | 06.01.2018 22:17:28 | 18,000 | ef7b9bf504720ba2367df64c72e3bd3cb88c1ecf | udpate travis osx deps | [
{
"change_type": "MODIFY",
"old_path": "building/mac/requirements.sh",
"new_path": "building/mac/requirements.sh",
"diff": "@@ -5,7 +5,7 @@ brew uninstall qt5\nbrew install [email protected] pkg-config automake\n# Install some deps\n-brew install [email protected] protobuf miniupnpc openssl qrencode berkeley-db4\n+brew install [email protected] protobuf miniupnpc openssl qrencode berkeley-db4 libseccomp libcap\n# Make sure our stuff is linked in our path\nbrew link automake autoconf\n"
}
]
| C++ | MIT License | vergecurrency/verge | udpate travis osx deps |
714,131 | 07.01.2018 04:45:42 | -3,600 | df338f0750980948e1764a98951d6eca27a9e008 | hide additional part of stealth tx with 0 amount and no addr | [
{
"change_type": "MODIFY",
"old_path": "src/qt/transactionrecord.cpp",
"new_path": "src/qt/transactionrecord.cpp",
"diff": "@@ -124,6 +124,13 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *\n}\nint64 nValue = txout.nValue;\n+\n+ // Dont't show second part of stealth tx with amount zero and no address\n+ if (nValue < MIN_TXOUT_AMOUNT)\n+ {\n+ continue;\n+ }\n+\n/* Add fee to first output */\nif (nTxFee > 0)\n{\n"
}
]
| C++ | MIT License | vergecurrency/verge | hide additional part of stealth tx with 0 amount and no addr |
714,131 | 08.01.2018 00:44:18 | -3,600 | 6771b737cb89e4747ef03dd2f9a22a0edae34922 | Treat stealth tx null_data part as valid in ExtractDestination | [
{
"change_type": "MODIFY",
"old_path": "src/script.cpp",
"new_path": "src/script.cpp",
"diff": "@@ -1565,6 +1565,11 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)\naddressRet = CScriptID(uint160(vSolutions[0]));\nreturn true;\n}\n+ else if (whichType == TX_NULL_DATA)\n+ {\n+ return true;\n+ }\n+\n// Multisig txns have more than one address...\nreturn false;\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | Treat stealth tx null_data part as valid in ExtractDestination |
714,098 | 07.01.2018 19:46:36 | 18,000 | db15b875bacf0352cbc6477be9c7ee23bfe4d9c1 | more onion seeds | [
{
"change_type": "MODIFY",
"old_path": "src/net.cpp",
"new_path": "src/net.cpp",
"diff": "@@ -1050,6 +1050,10 @@ void MapPort(bool use_upnp)\n// hidden service seeds\nstatic const char *strMainNetOnionSeed[][1] = {\n// project-maintained nodes\n+ {\"5n4gl3kvntyanp63.onion\"},\n+ {\"5onui2lfl3iwdhrf.onion\"},\n+ {\"7sfrhwc6l4oohb5h.onion\"},\n+ {\"plxs66tqlzbnh3ua.onion\"},\n{\"ie4vffvggaz6xhbj.onion\"},\n{\"kw5bdikypbbxaf2g.onion\"},\n{\"n5ln6ke2vc47glpl.onion\"},\n"
}
]
| C++ | MIT License | vergecurrency/verge | more onion seeds |
714,098 | 08.01.2018 14:38:48 | 18,000 | 20a5b8b050f04058bce6489a6b4fe5668f7a28d7 | remove linux-only modules from configure
should fix travis for mac build | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -552,8 +552,6 @@ if test x$use_pkgconfig = xyes; then\n[\nPKG_CHECK_MODULES(LIBEVENT, [libevent], [], [AC_MSG_ERROR([libevent not found])])\nPKG_CHECK_MODULES(ZLIB, [zlib], [], [AC_MSG_ERROR([zlib not found])])\n- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp], [], [AC_MSG_ERROR([libseccomp not found])])\n- PKG_CHECK_MODULES(LIBCAP, [libcap], [], [AC_MSG_ERROR([libcap not found])])\nPKG_CHECK_MODULES([SSL], [libssl], [INCLUDES=\"$INCLUDES $SSL_CFLAGS\"; LIBS=\"$LIBS $SSL_LIBS\"], [AC_MSG_ERROR(openssl not found.)])\nPKG_CHECK_MODULES([CRYPTO], [libcrypto], [INCLUDES=\"$INCLUDES $CRYPTO_CFLAGS\"; LIBS=\"$LIBS $CRYPTO_LIBS\"], [AC_MSG_ERROR(libcrypto not found.)])\nBITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove linux-only modules from configure
should fix travis for mac build |
714,098 | 08.01.2018 20:50:38 | 18,000 | f0f6a3930e3ebf1151ec44f7f5bcaadd35018fa5 | add nix deps | [
{
"change_type": "MODIFY",
"old_path": "doc/build-verge-linux.md",
"new_path": "doc/build-verge-linux.md",
"diff": "@@ -16,8 +16,8 @@ The _slightly_ longer version:\nsudo apt-get update\nsudo apt-get install \\\nlibdb4.8-dev libdb4.8++-dev build-essential \\\n- libtool autotools-dev automake pkg-config libssl-dev libevent-dev \\\n- bsdmainutils git libboost-all-dev libminiupnpc-dev libqt5gui5 \\\n+ libtool autotools-dev automake pkg-config libssl-dev zlib1g-dev libz-dev libevent-dev \\\n+ bsdmainutils git libboost-all-dev libseccomp-dev libncap-dev libminiupnpc-dev libqt5gui5 \\\nlibqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev \\\nqttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev\n```\n"
}
]
| C++ | MIT License | vergecurrency/verge | add nix deps |
714,098 | 08.01.2018 22:46:34 | 18,000 | ce65a28cef3d69cfa70cbce41eea2f07a82078b1 | added libevent | [
{
"change_type": "MODIFY",
"old_path": "building/mac/requirements.sh",
"new_path": "building/mac/requirements.sh",
"diff": "@@ -5,7 +5,7 @@ brew uninstall qt5\nbrew install [email protected] pkg-config automake\n# Install some deps\n-brew install [email protected] protobuf miniupnpc openssl qrencode berkeley-db4 libseccomp libcap\n+brew install [email protected] protobuf miniupnpc openssl qrencode berkeley-db4 libevent libseccomp libcap\n# Make sure our stuff is linked in our path\nbrew link automake autoconf\n"
}
]
| C++ | MIT License | vergecurrency/verge | added libevent |
714,120 | 10.01.2018 09:12:08 | 18,000 | 19f1e020db47bd8879d5b9c8fcfc62fa35c82def | update readme, make clean | [
{
"change_type": "MODIFY",
"old_path": "building/linux/build.sh",
"new_path": "building/linux/build.sh",
"diff": "./autogen.sh\n./configure --with-gui=qt5\n+make clean\nmake\n"
},
{
"change_type": "MODIFY",
"old_path": "doc/build-verge-linux.md",
"new_path": "doc/build-verge-linux.md",
"diff": "@@ -17,7 +17,7 @@ The _slightly_ longer version:\nsudo apt-get install \\\nlibdb4.8-dev libdb4.8++-dev build-essential \\\nlibtool autotools-dev automake pkg-config libssl-dev zlib1g-dev libz-dev libevent-dev \\\n- bsdmainutils git libboost-all-dev libseccomp-dev libncap-dev libminiupnpc-dev libqt5gui5 \\\n+ bsdmainutils git libboost-all-dev libseccomp-dev libcap-dev libminiupnpc-dev libqt5gui5 \\\nlibqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev \\\nqttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev\n```\n"
}
]
| C++ | MIT License | vergecurrency/verge | update readme, make clean |
714,131 | 09.01.2018 04:22:17 | -3,600 | d9ee26b53626b9207e738d66fd9b17ec2ade4822 | wip osx build | [
{
"change_type": "MODIFY",
"old_path": "Makefile.am",
"new_path": "Makefile.am",
"diff": "@@ -8,6 +8,8 @@ BITCOIND_BIN=$(top_builddir)/src/VERGEd$(EXEEXT)\nBITCOIN_QT_BIN=$(top_builddir)/src/qt/VERGE-qt$(EXEEXT)\nBITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)\n+VERGE_QT_APP=VERGE-qt\n+VERGE_DAEMON=VERGEd\nOSX_APP=VERGE-Qt.app\nOSX_DMG=VERGE-Qt.dmg\nOSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus\n@@ -167,4 +169,5 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)\n.INTERMEDIATE: $(COVERAGE_INFO)\nclean-local:\n- rm -rf test_bitcoin.coverage/ total.coverage/ $(OSX_APP)\n+ rm -rf test_bitcoin.coverage/ total.coverage/ $(OSX_APP) $(VERGE_QT_APP) $(VERGE_DAEMON) release_$(VERGE_PLATFORM).zip\n+\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "building/mac/build.sh",
"new_path": "building/mac/build.sh",
"diff": "export PKG_CONFIG_PATH=/usr/local/opt/[email protected]/lib/pkgconfig\n+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig\nexport PATH=/usr/local/opt/[email protected]/bin:$PATH\nexport QT_CFLAGS=\"-I/usr/local/opt/[email protected]/lib/QtDBus.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtWidgets.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtNetwork.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtGui.framework/Versions/5/Headers -I/usr/local/opt/[email protected]/lib/QtCore.framework/Versions/5/Headers -I. -I/usr/local/opt/[email protected]/mkspecs/macx-clang -F/usr/local/opt/[email protected]/lib\"\nexport QT_LIBS=\"-F/usr/local/opt/[email protected]/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL -framework QtNetwork -framework QtDBus\"\n"
},
{
"change_type": "MODIFY",
"old_path": "building/mac/requirements.sh",
"new_path": "building/mac/requirements.sh",
"diff": "@@ -5,7 +5,7 @@ brew uninstall qt5\nbrew install [email protected] pkg-config automake\n# Install some deps\n-brew install [email protected] protobuf miniupnpc openssl qrencode berkeley-db4 libevent libseccomp libcap\n+brew install [email protected] protobuf miniupnpc openssl qrencode berkeley-db4 zlib\n# Make sure our stuff is linked in our path\nbrew link automake autoconf\n"
},
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -262,7 +262,7 @@ case $host in\nopenssl_prefix=`$BREW --prefix openssl`\nbdb_prefix=`$BREW --prefix berkeley-db4`\nexport PKG_CONFIG_PATH=\"$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH\"\n- CPPFLAGS=\"$CPPFLAGS -I$bdb_prefix/include\"\n+ CPPFLAGS=\"$CPPFLAGS -I$bdb_prefix/include -lstdc++\"\nLIBS=\"$LIBS -L$bdb_prefix/lib\"\nfi\nelse\n@@ -552,10 +552,6 @@ if test x$use_pkgconfig = xyes; then\n[\nPKG_CHECK_MODULES(LIBEVENT, [libevent], [], [AC_MSG_ERROR([libevent not found])])\nPKG_CHECK_MODULES(ZLIB, [zlib], [], [AC_MSG_ERROR([zlib not found])])\n- if test x$TARGET_OS = xlinux; then\n- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp], [], [AC_MSG_ERROR([libseccomp not found])])\n- PKG_CHECK_MODULES(LIBCAP, [libcap], [], [AC_MSG_ERROR([libcap not found])])\n- fi\nPKG_CHECK_MODULES([SSL], [libssl], [INCLUDES=\"$INCLUDES $SSL_CFLAGS\"; LIBS=\"$LIBS $SSL_LIBS\"], [AC_MSG_ERROR(openssl not found.)])\nPKG_CHECK_MODULES([CRYPTO], [libcrypto], [INCLUDES=\"$INCLUDES $CRYPTO_CFLAGS\"; LIBS=\"$LIBS $CRYPTO_LIBS\"], [AC_MSG_ERROR(libcrypto not found.)])\nBITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])\n"
},
{
"change_type": "MODIFY",
"old_path": "src/util.h",
"new_path": "src/util.h",
"diff": "@@ -118,6 +118,11 @@ T* alignup(T* p)\n#define MAX_PATH 1024\n#endif\n+#ifdef __APPLE__\n+#define MSG_NOSIGNAL 0\n+#define MSG_DONTWAIT 0\n+#endif\n+\ninline void MilliSleep(int64_t n)\n{\n#if BOOST_VERSION >= 105000\n"
}
]
| C++ | MIT License | vergecurrency/verge | wip osx build |
714,131 | 09.01.2018 05:31:18 | -3,600 | 6a75a1193aa4006ee790520778a7346ace95fa65 | final osx 4.0.1 | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -262,7 +262,7 @@ case $host in\nopenssl_prefix=`$BREW --prefix openssl`\nbdb_prefix=`$BREW --prefix berkeley-db4`\nexport PKG_CONFIG_PATH=\"$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH\"\n- CPPFLAGS=\"$CPPFLAGS -I$bdb_prefix/include -lstdc++\"\n+ CPPFLAGS=\"$CPPFLAGS -I$bdb_prefix/include\"\nLIBS=\"$LIBS -L$bdb_prefix/lib\"\nfi\nelse\n"
},
{
"change_type": "MODIFY",
"old_path": "src/util.h",
"new_path": "src/util.h",
"diff": "@@ -120,7 +120,6 @@ T* alignup(T* p)\n#ifdef __APPLE__\n#define MSG_NOSIGNAL 0\n-#define MSG_DONTWAIT 0\n#endif\ninline void MilliSleep(int64_t n)\n"
}
]
| C++ | MIT License | vergecurrency/verge | final osx 4.0.1 |
714,138 | 11.01.2018 00:37:18 | -3,600 | 8003133c26551da29289a7a9f2fcb45fa3ccd395 | Add fetch for submodules | [
{
"change_type": "MODIFY",
"old_path": "doc/build-verge-linux.md",
"new_path": "doc/build-verge-linux.md",
"diff": "@@ -4,7 +4,9 @@ Here is a quick short hand way:\n```shell\nsudo rm -Rf ~/VERGE #(if you already have it)\n-sudo apt-get -y install git && cd ~ && git clone https://github.com/vergecurrency/VERGE && cd VERGE && sh go.sh\n+sudo apt-get -y install git && cd ~ && \\\n+ git clone --recurse-submodules https://github.com/vergecurrency/VERGE \\\n+ && cd VERGE && sh go.sh\n```\nThe _slightly_ longer version:\n@@ -25,7 +27,8 @@ The _slightly_ longer version:\n2. Clone the git repository and compile the daemon and gui wallet:\n```shell\n- git clone https://github.com/vergecurrency/verge && cd verge && ./autogen.sh && ./configure && make\n+ git clone --recurse-submodules https://github.com/vergecurrency/verge && cd verge \\\n+ && ./autogen.sh && ./configure && make\n```\n> **Note**: If you get a \"memory exhausted\" error, make a swap file. (https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04)\n@@ -41,7 +44,7 @@ sudo dnf install git automake boost-devel qt5-devel qrencode-devel libdb4-cxx-de\n```\n2. Clone source and build\n```\n-git clone https://github.com/vergecurrency/VERGE.git\n+git clone --recurse-submodules https://github.com/vergecurrency/VERGE.git\ncd VERGE\n./autogen.sh\n./configure --with-gui=qt5\n"
},
{
"change_type": "MODIFY",
"old_path": "go.sh",
"new_path": "go.sh",
"diff": "@@ -128,7 +128,7 @@ fi\n#// Clone files from repo, Permissions and make\n-git clone https://github.com/vergecurrency/VERGE\n+git clone --recurse-submodules https://github.com/vergecurrency/VERGE\ncd VERGE\nsudo sh autogen.sh\nchmod 777 ~/VERGE/share/genbuild.sh\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add fetch for submodules |
714,138 | 11.01.2018 00:46:30 | -3,600 | 5dc20a1222f1a95e289c5c73966526d5edba12b9 | update osx build with git/submodule | [
{
"change_type": "MODIFY",
"old_path": "doc/build-verge-osx.md",
"new_path": "doc/build-verge-osx.md",
"diff": "> **Note:** This has only been confirmed to work on OS X Sierra (10.12) and OS X High Sierra (10.13) with XCode 9.2 and `Apple LLVM version 9.0.0 (clang-900.0.39.2)`.\n-1. Ensure you have mysql and boost installed.\n+\n+1. Ensure you have git installed\n+\n+ ```shell\n+ brew install git\n+ ```\n+2. Clone VERGE repository\n+\n+ ```shell\n+ git clone --recurse-submodules https://github.com/vergecurrency/VERGE\n+ ```\n+\n+3. Ensure you have mysql and boost installed.\n```shell\nbrew install mysql boost\n```\n-2. Ensure you have python 2.7 installed and in your path (OS X comes with this by default)\n+4. Ensure you have python 2.7 installed and in your path (OS X comes with this by default)\n```shell\npython --version\n```\n-3. Export the required environment variables\n+5. Export the required environment variables\n```shell\nexport VERGE_PLATFORM='mac'\nexport CC=clang\n```\n-4. Run your build commands\n+6. Run your build commands\n```shell\n./building/common.sh\n./building/mac/build.sh\n```\n-5. Grab a :coffee: and wait it out\n+7. Grab a :coffee: and wait it out\n-6. Create the `.dmg` file\n+8. Create the `.dmg` file\n```shell\n./building/mac/dist.sh\n"
}
]
| C++ | MIT License | vergecurrency/verge | update osx build with git/submodule |
714,131 | 12.01.2018 13:50:17 | -3,600 | 91bc8e1d610e5f773236d480b4a6a5ca8855ed94 | correct libcap package name in build instructions | [
{
"change_type": "MODIFY",
"old_path": "doc/build-verge-linux.md",
"new_path": "doc/build-verge-linux.md",
"diff": "@@ -19,7 +19,7 @@ The _slightly_ longer version:\nsudo apt-get install \\\nlibdb4.8-dev libdb4.8++-dev build-essential \\\nlibtool autotools-dev automake pkg-config libssl-dev zlib1g-dev libz-dev libevent-dev \\\n- bsdmainutils git libboost-all-dev libseccomp-dev libncap-dev libminiupnpc-dev libqt5gui5 \\\n+ bsdmainutils git libboost-all-dev libseccomp-dev libcap-dev libminiupnpc-dev libqt5gui5 \\\nlibqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev \\\nqttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev\n```\n"
}
]
| C++ | MIT License | vergecurrency/verge | correct libcap package name in build instructions |
714,092 | 12.01.2018 16:39:44 | -3,600 | 3c04d0ffd02a168a359b0e180ba292f32765b34d | Parsing UIInterface into the main loadBlockIndex.
We want update the given loading percentage with the given blocks and the all ready loaded blocks so that users know that loading status. | [
{
"change_type": "MODIFY",
"old_path": "src/init.cpp",
"new_path": "src/init.cpp",
"diff": "@@ -667,7 +667,7 @@ bool AppInit2()\nuiInterface.InitMessage(_(\"Loading block index...\"));\nprintf(\"Loading block index...\\n\");\nnStart = GetTimeMillis();\n- if (!LoadBlockIndex())\n+ if (!LoadBlockIndex(true, (&uiInterface)))\nreturn InitError(_(\"Error loading blkindex.dat\"));\n// as LoadBlockIndex can take several minutes, it's possible the user\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main.cpp",
"new_path": "src/main.cpp",
"diff": "@@ -2818,7 +2818,7 @@ FILE* AppendBlockFile(unsigned int& nFileRet)\nreturn NULL;\n}\n-bool LoadBlockIndex(bool fAllowNew)\n+bool LoadBlockIndex(bool fAllowNew,CClientUIInterface* uiInterface)\n{\nif (fTestNet)\n{\n@@ -2839,7 +2839,7 @@ bool LoadBlockIndex(bool fAllowNew)\n// Load block index\n//\nCTxDB txdb(\"cr\");\n- if (!txdb.LoadBlockIndex())\n+ if (!txdb.LoadBlockIndex(uiInterface))\nreturn false;\n//\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main.h",
"new_path": "src/main.h",
"diff": "#include \"hashx17.h\"\n#include \"Lyra2RE.h\"\n#include <list>\n+#include \"ui_interface.h\"\nclass CWallet;\nclass CBlock;\n@@ -104,7 +105,7 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock);\nbool CheckDiskSpace(uint64 nAdditionalBytes=0);\nFILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode=\"rb\");\nFILE* AppendBlockFile(unsigned int& nFileRet);\n-bool LoadBlockIndex(bool fAllowNew=true);\n+bool LoadBlockIndex(bool fAllowNew=true, CClientUIInterface* uiInterface=NULL);\nvoid PrintBlockTree();\nCBlockIndex* FindBlockByHeight(int nHeight);\nbool ProcessMessages(CNode* pfrom);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/txdb-leveldb.cpp",
"new_path": "src/txdb-leveldb.cpp",
"diff": "#include <boost/version.hpp>\n#include <boost/filesystem.hpp>\n#include <boost/filesystem/fstream.hpp>\n+#include <boost/format.hpp>\n#include <leveldb/env.h>\n#include <leveldb/cache.h>\n@@ -318,24 +319,54 @@ static CBlockIndex *InsertBlockIndex(uint256 hash)\nreturn pindexNew;\n}\n-bool CTxDB::LoadBlockIndex()\n+bool CTxDB::LoadBlockIndex(CClientUIInterface* uiInterface)\n{\nif (mapBlockIndex.size() > 0) {\n// Already loaded once in this session. It can happen during migration\n// from BDB.\nreturn true;\n}\n+\n// The block index is an in-memory structure that maps hashes to on-disk\n// locations where the contents of the block can be found. Here, we scan it\n// out of the DB and into mapBlockIndex.\nleveldb::Iterator *iterator = pdb->NewIterator(leveldb::ReadOptions());\n+\n// Seek to start key.\n+ // and count the full index size of the currently\n+ // loaded block chain.\nCDataStream ssStartKey(SER_DISK, CLIENT_VERSION);\nssStartKey << make_pair(string(\"blockindex\"), uint256(0));\niterator->Seek(ssStartKey.str());\n+ long full_count = 0;\n+ while (iterator->Valid())\n+ {\n+ CDataStream ssKey(SER_DISK, CLIENT_VERSION);\n+ ssKey.write(iterator->key().data(), iterator->key().size());\n+ string strType;\n+ ssKey >> strType;\n+ // Did we reach the end of the data to read?\n+ if (strType != \"blockindex\")\n+ break;\n+\n+ iterator->Next();\n+ full_count++;\n+ }\n+\n+ iterator = pdb->NewIterator(leveldb::ReadOptions());\n+ ssStartKey << make_pair(string(\"blockindex\"), uint256(0));\n+ iterator->Seek(ssStartKey.str());\n+\n+ long count = 0;\n// Now read each entry.\nwhile (iterator->Valid())\n{\n+ count++;\n+ // check if UI is given so update the percentage count by every percentage reached.\n+ if(uiInterface != NULL && count % (full_count / 100) == 0){\n+ const std::string & str = (boost::format(\"Loading indices: %1.0f%% ...\") % ((double(count) * 100)/ full_count)).str();\n+ uiInterface->InitMessage(str);\n+ }\nboost::this_thread::interruption_point();\n// Unpack keys and values.\nCDataStream ssKey(SER_DISK, CLIENT_VERSION);\n@@ -447,6 +478,7 @@ bool CTxDB::LoadBlockIndex()\nif (pindex->nHeight < nBestHeight-nCheckDepth)\nbreak;\nCBlock block;\n+\nif (!block.ReadFromDisk(pindex))\nreturn error(\"LoadBlockIndex() : block.ReadFromDisk failed\");\n// check level 1: verify block validity\n"
},
{
"change_type": "MODIFY",
"old_path": "src/txdb-leveldb.h",
"new_path": "src/txdb-leveldb.h",
"diff": "#include <leveldb/db.h>\n#include <leveldb/write_batch.h>\n+#include \"ui_interface.h\"\n// Class that provides access to a LevelDB. Note that this class is frequently\n// instantiated on the stack and then destroyed again, so instantiation has to\n@@ -201,7 +202,7 @@ public:\nbool WriteSyncCheckpoint(uint256 hashCheckpoint);\nbool ReadCheckpointPubKey(std::string& strPubKey);\nbool WriteCheckpointPubKey(const std::string& strPubKey);\n- bool LoadBlockIndex();\n+ bool LoadBlockIndex(CClientUIInterface* uiInterface=NULL);\nprivate:\nbool LoadBlockIndexGuts();\n};\n"
}
]
| C++ | MIT License | vergecurrency/verge | Parsing UIInterface into the main loadBlockIndex.
We want update the given loading percentage with the given blocks and the all ready loaded blocks so that users know that loading status. |
714,092 | 13.01.2018 11:42:37 | -3,600 | 3d193309a5e5d8931cee6505af0fed4a24ea3819 | Fixes a bug where the client could be reload because of
an empty database. | [
{
"change_type": "MODIFY",
"old_path": "src/txdb-leveldb.cpp",
"new_path": "src/txdb-leveldb.cpp",
"diff": "@@ -330,42 +330,46 @@ bool CTxDB::LoadBlockIndex(CClientUIInterface* uiInterface)\n// The block index is an in-memory structure that maps hashes to on-disk\n// locations where the contents of the block can be found. Here, we scan it\n// out of the DB and into mapBlockIndex.\n- leveldb::Iterator *iterator = pdb->NewIterator(leveldb::ReadOptions());\n+ leveldb::Iterator *it = pdb->NewIterator(leveldb::ReadOptions());\n// Seek to start key.\n// and count the full index size of the currently\n// loaded block chain.\nCDataStream ssStartKey(SER_DISK, CLIENT_VERSION);\nssStartKey << make_pair(string(\"blockindex\"), uint256(0));\n- iterator->Seek(ssStartKey.str());\n- long full_count = 0;\n- while (iterator->Valid())\n+ it->Seek(ssStartKey.str());\n+ static long full_count = 1;\n+ static long count = 0;\n+\n+ while (it->Valid())\n{\nCDataStream ssKey(SER_DISK, CLIENT_VERSION);\n- ssKey.write(iterator->key().data(), iterator->key().size());\n+ ssKey.write(it->key().data(), it->key().size());\nstring strType;\nssKey >> strType;\n// Did we reach the end of the data to read?\nif (strType != \"blockindex\")\nbreak;\n+ else\n+ full_count += 1;\n- iterator->Next();\n- full_count++;\n+ it->Next();\n}\n- iterator = pdb->NewIterator(leveldb::ReadOptions());\n+ leveldb::Iterator *iterator = pdb->NewIterator(leveldb::ReadOptions());\nssStartKey << make_pair(string(\"blockindex\"), uint256(0));\niterator->Seek(ssStartKey.str());\n- long count = 0;\n+ boost::format percentage_update(\"Loading indicies %2.f%% ...\");\n// Now read each entry.\nwhile (iterator->Valid())\n{\n- count++;\n+ count += 1;\n// check if UI is given so update the percentage count by every percentage reached.\n- if(uiInterface != NULL && count % (full_count / 100) == 0){\n- const std::string & str = (boost::format(\"Loading indices: %1.0f%% ...\") % ((double(count) * 100)/ full_count)).str();\n- uiInterface->InitMessage(str);\n+ if(uiInterface != NULL && full_count != 0 && count % 1000 == 0){\n+ uiInterface->InitMessage(\n+ boost::str(percentage_update % ((count * 100.0) / full_count))\n+ );\n}\nboost::this_thread::interruption_point();\n// Unpack keys and values.\n@@ -419,6 +423,7 @@ bool CTxDB::LoadBlockIndex(CClientUIInterface* uiInterface)\niterator->Next();\n}\ndelete iterator;\n+ delete it;\nboost::this_thread::interruption_point();\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fixes a bug where the client could be reload because of
an empty database. |
714,138 | 13.01.2018 16:28:26 | -3,600 | 01b090bf310f6a6817c95f8ca1cdb01b044e26e5 | enable test_bitcoin compilation | [
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -365,10 +365,6 @@ fi\nif test x$use_hardening != xno; then\nAX_CHECK_COMPILE_FLAG([-Wstack-protector],[HARDENED_CXXFLAGS=\"$HARDENED_CXXFLAGS -Wstack-protector\"])\nAX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS=\"$HARDENED_CXXFLAGS -fstack-protector-all\"])\n- if test x$TARGET_OS != xwindows; then\n- # Arch and Fedora complained that you should not have -fPIE without -fPIC\n- AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS=\"$HARDENED_CXXFLAGS -fPIE -fPIC\"])\n- fi\nAX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=2],[\nAX_CHECK_PREPROC_FLAG([-U_FORTIFY_SOURCE],[\n@@ -382,13 +378,20 @@ if test x$use_hardening != xno; then\nAX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS=\"$HARDENED_LDFLAGS -Wl,-z,relro\"])\nAX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS=\"$HARDENED_LDFLAGS -Wl,-z,now\"])\n- if test x$TARGET_OS = xlinux; then\n- # -pie will link successfully with MinGW, but it's unsupported and leads to undeterministic binaries\n- AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS=\"$HARDENED_LDFLAGS -pie\"])\n+ if test x$TARGET_OS != xwindows; then\n+ # Arch and Fedora complained that you should not have -fPIE without -fPIC\n+ AX_CHECK_COMPILE_FLAG([-fPIC],[HARDENED_CXXFLAGS=\"$HARDENED_CXXFLAGS -fPIC\"])\n+ AX_CHECK_LINK_FLAG([[-fno-pie]], [HARDENED_LDFLAGS=\"$HARDENED_LDFLAGS -fno-pie\"])\n+ #AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS=\"$HARDENED_CXXFLAGS -fPIE -fPIC\"])\nfi\n+ #if test x$TARGET_OS = xlinux; then\n+ # -pie will link successfully with MinGW, but it's unsupported and leads to undeterministic binaries\n+ #AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS=\"$HARDENED_LDFLAGS -pie\"])\n+ #fi\n+\nCXXFLAGS=\"$CXXFLAGS $HARDENED_CXXFLAGS\"\n- CFLAGS=\"$CFLAGS $HARDENED_CXXFLAGS\"\n+ #CFLAGS=\"$CFLAGS $HARDENED_CXXFLAGS\"\nCPPFLAGS=\"$CPPFLAGS $HARDENED_CPPFLAGS\"\nLDFLAGS=\"$LDFLAGS $HARDENED_LDFLAGS\"\nOBJCXXFLAGS=\"$CXXFLAGS\"\n@@ -456,7 +459,7 @@ if test x$use_tests = xyes; then\ndnl Determine if -DBOOST_TEST_DYN_LINK is needed\nAC_MSG_CHECKING([for dynamic linked boost test])\nTEMP_LIBS=\"$LIBS\"\n- LIBS=\"$LIBS $BOOST_UNIT_TEST_FRAMEWORK_LIB\"\n+ LIBS=\"$LIBS $BOOST_LDFLAGS $BOOST_UNIT_TEST_FRAMEWORK_LIB\"\nTEMP_CPPFLAGS=\"$CPPFLAGS\"\nCPPFLAGS=\"$CPPFLAGS $BOOST_CPPFLAGS\"\nAC_LINK_IFELSE([AC_LANG_SOURCE([\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Makefile.am",
"new_path": "src/Makefile.am",
"diff": "-AM_CPPFLAGS = $(INCLUDES)\n-AM_LDFLAGS = $(PTHREAD_CFLAGS)\n+#AM_CPPFLAGS = $(INCLUDES)\n+AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS)\n+AM_CXXFLAGS = $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS)\n+AM_CPPFLAGS = $(HARDENED_CPPFLAGS)\nif EMBEDDED_LEVELDB\n@@ -19,12 +21,23 @@ endif\nBITCOIN_CONFIG_INCLUDES=-I$(builddir)/config\nBITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)\n+TOR_LIBS=../tor/src/or/libtor.a \\\n+ ../tor/src/common/libor.a \\\n+ ../tor/src/common/libor-ctime.a \\\n+ ../tor/src/common/libor-crypto.a \\\n+ ../tor/src/common/libor-event.a \\\n+ ../tor/src/trunnel/libor-trunnel.a \\\n+ ../tor/src/common/libcurve25519_donna.a \\\n+ ../tor/src/ext/ed25519/donna/libed25519_donna.a \\\n+ ../tor/src/ext/ed25519/ref10/libed25519_ref10.a \\\n+ ../tor/src/ext/keccak-tiny/libkeccak-tiny.a\n+\nLIBBITCOIN_SERVER=libbitcoin_server.a\nLIBBITCOIN_WALLET=libbitcoin_wallet.a\nLIBBITCOIN_COMMON=libbitcoin_common.a\n-\nLIBBITCOIN_UTIL=libbitcoin_util.a\n+\nif HAVE_SSE2\nLIBBITCOIN_SSE2=libbitcoin_sse2.a\nendif\n@@ -139,7 +152,8 @@ obj/build.h: FORCE\nlibbitcoin_util_a-version.$(OBJEXT): obj/build.h\n# server: shared between bitcoind and bitcoin-qt\n-libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES)\n+libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)\n+libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)\nlibbitcoin_server_a_SOURCES = \\\naddrman.cpp \\\nalert.cpp \\\n@@ -163,7 +177,8 @@ libbitcoin_server_a_SOURCES = \\\n# wallet: shared between bitcoind and bitcoin-qt, but only linked\n# when wallet enabled\n-libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)\n+libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)\n+libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)\nlibbitcoin_wallet_a_SOURCES = \\\ncrypter.cpp \\\nrpcdump.cpp \\\n@@ -175,7 +190,8 @@ libbitcoin_wallet_a_SOURCES = \\\n$(BITCOIN_CORE_H)\n# common: shared between bitcoind, and bitcoin-qt and non-server tools\n-libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES)\n+libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)\n+libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)\nlibbitcoin_common_a_SOURCES = \\\nkey.cpp \\\nnetbase.cpp \\\n@@ -216,7 +232,8 @@ libbitcoin_common_a_SOURCES = \\\n# util: shared between all executables.\n# This library *must* be included to make sure that the glibc\n# backward-compatibility objects and their sanity checks are linked.\n-libbitcoin_util_a_CPPFLAGS = $(BITCOIN_INCLUDES)\n+libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)\n+libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)\nlibbitcoin_util_a_SOURCES = \\\nutil.cpp \\\nversion.cpp \\\n@@ -250,16 +267,7 @@ endif\nVERGEd_SOURCES = daemon.cpp\nVERGEd_LDADD += \\\n- ../tor/src/or/libtor.a \\\n- ../tor/src/common/libor.a \\\n- ../tor/src/common/libor-ctime.a \\\n- ../tor/src/common/libor-crypto.a \\\n- ../tor/src/common/libor-event.a \\\n- ../tor/src/trunnel/libor-trunnel.a \\\n- ../tor/src/common/libcurve25519_donna.a \\\n- ../tor/src/ext/ed25519/donna/libed25519_donna.a \\\n- ../tor/src/ext/ed25519/ref10/libed25519_ref10.a \\\n- ../tor/src/ext/keccak-tiny/libkeccak-tiny.a \\\n+ $(TOR_LIBS) \\\n$(LIBEVENT_LIBS) \\\n$(LIBSECCOMP_LIBS) \\\n$(LIBCAP_LIBS) \\\n@@ -291,6 +299,11 @@ clean-local:\n@test -f $(PROTOC)\n$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)\n+\n+if ENABLE_TESTS\n+include Makefile.test.include\n+endif\n+\nif ENABLE_QT\ninclude Makefile.qt.include\nendif\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Makefile.test.include",
"diff": "+bin_PROGRAMS += test_bitcoin\n+TESTS += test_bitcoin\n+TEST_SRCDIR = test\n+TEST_BINARY=test/test_bitcoin$(EXEEXT)\n+\n+\n+JSON_TEST_FILES = \\\n+ test/data/base58_encode_decode.json \\\n+ test/data/base58_keys_invalid.json \\\n+ test/data/base58_keys_valid.json \\\n+ test/data/script_invalid.json \\\n+ test/data/script_valid.json \\\n+ test/data/tx_invalid.json \\\n+ test/data/tx_valid.json\n+\n+#RAW_TEST_FILES = data/alertTests.raw\n+\n+BUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)\n+\n+# test_bitcoin binary #\n+\n+# TODO: add\n+#test/base58_tests.cpp\n+#test/key_tests.cpp\n+#test/miner_tests.cpp\n+#test/multisig_tests.cpp\n+#test/wallet_tests.cpp\n+#test/accounting_tests.cpp \\\n+test/allocator_tests.cpp \\\n+test/base32_tests.cpp \\\n+test/base64_tests.cpp \\\n+test/bignum_tests.cpp \\\n+test/Checkpoints_tests.cpp \\\n+test/DoS_tests.cpp \\\n+test/getarg_tests.cpp \\\n+test/mruset_tests.cpp \\\n+test/netbase_tests.cpp \\\n+test/rpc_tests.cpp \\\n+test/script_P2SH_tests.cpp \\\n+test/script_tests.cpp \\\n+test/sigopcount_tests.cpp \\\n+test/test_bitcoin.cpp \\\n+test/transaction_tests.cpp \\\n+test/uint160_tests.cpp \\\n+test/uint256_tests.cpp\n+\n+test_bitcoin_SOURCES = \\\n+ test/test_bitcoin.cpp \\\n+ test/util_tests.cpp \\\n+ $(JSON_TEST_FILES) $(RAW_TEST_FILES)\n+\n+if ENABLE_WALLET\n+test_bitcoin_SOURCES += \\\n+ #test/accounting_tests.cpp\n+endif\n+\n+\n+test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test $(TESTDEFS) \\\n+ $(EVENT_CFLAGS)\n+#test_bitcoin_CPPFLAGS += $(LIBEVENT_CFLAGS) $(LIBSECCOMP_CFLAGS) $(LIBCAP_CFLAGS) $(ZLIB_CFLAGS)\n+test_bitcoin_LDADD =\n+\n+\n+if ENABLE_WALLET\n+test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)\n+endif\n+\n+test_bitcoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) \\\n+ $(LIBLEVELDB) $(LIBMEMENV) \\\n+ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)\n+\n+\n+if HAVE_SSE2\n+test_bitcoin_LDADD += $(LIBBITCOIN_SSE2)\n+endif\n+\n+test_bitcoin_LDADD += $(TOR_LIBS) \\\n+ $(LIBEVENT_LIBS) \\\n+ $(LIBSECCOMP_LIBS) \\\n+ $(LIBCAP_LIBS) \\\n+ $(ZLIB_LIBS)\n+\n+test_bitcoin_LDADD += $(BDB_LIBS) $(LIBEVENT_LDFLAGS) $(LIBSECCOMP_LDFLAGS) $(LIBCAP_LDFLAGS) \\\n+ $(ZLIB_LDFLAGS)\n+test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)\n+test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)\n+\n+\n+nodist_test_bitcoin_SOURCES = $(BUILT_SOURCES)\n+\n+$(BITCOIN_TESTS): $(BUILT_SOURCES)\n+\n+CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(BUILT_SOURCES)\n+\n+CLEANFILES += $(CLEAN_BITCOIN_TEST)\n+\n+bitcoin_test: $(TEST_BINARY)\n+\n+bitcoin_test_check: $(TEST_BINARY) FORCE\n+ $(MAKE) check-TESTS TESTS=$^\n+\n+bitcoin_test_clean : FORCE\n+ rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)\n+\n+%.json.h: %.json\n+ @$(MKDIR_P) $(@D)\n+ @echo \"namespace json_tests{\" > $@\n+ @echo \"static unsigned const char $(*F)[] = {\" >> $@\n+ @$(HEXDUMP) -v -e '8/1 \"0x%02x, \"' -e '\"\\n\"' $< | $(SED) -e 's/0x ,//g' >> $@\n+ @echo \"};};\" >> $@\n+ @echo \"Generated $@\"\n"
},
{
"change_type": "DELETE",
"old_path": "src/test/Makefile.am",
"new_path": null,
"diff": "-include $(top_srcdir)/src/Makefile.include\n-\n-AM_CPPFLAGS += -I$(top_srcdir)/src\n-\n-bin_PROGRAMS = test_bitcoin\n-\n-TESTS = test_bitcoin\n-\n-JSON_TEST_FILES = \\\n- data/base58_encode_decode.json \\\n- data/base58_keys_invalid.json \\\n- data/base58_keys_valid.json \\\n- data/script_invalid.json \\\n- data/script_valid.json \\\n- data/tx_invalid.json \\\n- data/tx_valid.json\n-\n-#RAW_TEST_FILES = data/alertTests.raw\n-\n-BUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)\n-\n-# test_bitcoin binary #\n-test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(TESTDEFS)\n-test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_COMMON) \\\n- $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)\n-if ENABLE_WALLET\n-test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)\n-endif\n-test_bitcoin_LDADD += $(BDB_LIBS)\n-\n-test_bitcoin_SOURCES = \\\n- accounting_tests.cpp \\\n- allocator_tests.cpp \\\n- base32_tests.cpp \\\n- base58_tests.cpp \\\n- base64_tests.cpp \\\n- bignum_tests.cpp \\\n- Checkpoints_tests.cpp \\\n- DoS_tests.cpp \\\n- getarg_tests.cpp \\\n- key_tests.cpp \\\n- miner_tests.cpp \\\n- mruset_tests.cpp \\\n- multisig_tests.cpp \\\n- netbase_tests.cpp \\\n- rpc_tests.cpp \\\n- script_P2SH_tests.cpp \\\n- script_tests.cpp \\\n- sigopcount_tests.cpp \\\n- test_bitcoin.cpp \\\n- transaction_tests.cpp \\\n- uint160_tests.cpp \\\n- uint256_tests.cpp \\\n- util_tests.cpp \\\n- wallet_tests.cpp \\\n- $(JSON_TEST_FILES) $(RAW_TEST_FILES)\n-\n-if ENABLE_WALLET\n-test_bitcoin_SOURCES += \\\n- accounting_tests.cpp \\\n- wallet_tests.cpp\n-endif\n-\n-nodist_test_bitcoin_SOURCES = $(BUILT_SOURCES)\n-\n-CLEANFILES = *.gcda *.gcno $(BUILT_SOURCES)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/test_bitcoin.cpp",
"new_path": "src/test/test_bitcoin.cpp",
"diff": "#define BOOST_TEST_MODULE Bitcoin Test Suite\n#include <boost/test/unit_test.hpp>\n-#include \"dbx.h\"\n+#include \"db.h\"\n+#include \"txdb.h\"\n#include \"main.h\"\n#include \"wallet.h\"\n"
}
]
| C++ | MIT License | vergecurrency/verge | enable test_bitcoin compilation |
714,138 | 13.01.2018 23:16:03 | -3,600 | 7ad7488d8611a0757200a5178ccfb4c12946e1dc | Enable tests that does not need updating | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.test.include",
"new_path": "src/Makefile.test.include",
"diff": "@@ -17,50 +17,43 @@ JSON_TEST_FILES = \\\nBUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)\n-# test_bitcoin binary #\n-\n-# TODO: add\n+#TODO: needs updating\n#test/base58_tests.cpp\n#test/key_tests.cpp\n#test/miner_tests.cpp\n#test/multisig_tests.cpp\n#test/wallet_tests.cpp\n-#test/accounting_tests.cpp \\\n-test/allocator_tests.cpp \\\n-test/base32_tests.cpp \\\n-test/base64_tests.cpp \\\n-test/bignum_tests.cpp \\\n-test/Checkpoints_tests.cpp \\\n-test/DoS_tests.cpp \\\n-test/getarg_tests.cpp \\\n-test/mruset_tests.cpp \\\n-test/netbase_tests.cpp \\\n-test/rpc_tests.cpp \\\n-test/script_P2SH_tests.cpp \\\n-test/script_tests.cpp \\\n-test/sigopcount_tests.cpp \\\n-test/test_bitcoin.cpp \\\n-test/transaction_tests.cpp \\\n-test/uint160_tests.cpp \\\n-test/uint256_tests.cpp\n+#test/rpc_tests.cpp\n+#test/DoS_tests.cpp\n+#test/Checkpoints_tests.cpp\n+#test/script_tests.cpp\n+#test/transaction_tests.cpp\n+\ntest_bitcoin_SOURCES = \\\ntest/test_bitcoin.cpp \\\n- test/util_tests.cpp \\\n+ test/uint160_tests.cpp \\\n+ test/uint256_tests.cpp \\\n+ test/sigopcount_tests.cpp \\\n+ test/netbase_tests.cpp \\\n+ test/mruset_tests.cpp \\\n+ test/getarg_tests.cpp \\\n+ test/bignum_tests.cpp \\\n+ test/base64_tests.cpp \\\n+ test/base32_tests.cpp \\\n+ test/allocator_tests.cpp \\\n+ test/script_P2SH_tests.cpp \\\n$(JSON_TEST_FILES) $(RAW_TEST_FILES)\nif ENABLE_WALLET\ntest_bitcoin_SOURCES += \\\n- #test/accounting_tests.cpp\n+ test/accounting_tests.cpp\nendif\n-test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test $(TESTDEFS) \\\n- $(EVENT_CFLAGS)\n-#test_bitcoin_CPPFLAGS += $(LIBEVENT_CFLAGS) $(LIBSECCOMP_CFLAGS) $(LIBCAP_CFLAGS) $(ZLIB_CFLAGS)\n+test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test $(TESTDEFS) $(EVENT_CFLAGS)\ntest_bitcoin_LDADD =\n-\nif ENABLE_WALLET\ntest_bitcoin_LDADD += $(LIBBITCOIN_WALLET)\nendif\n@@ -85,7 +78,6 @@ test_bitcoin_LDADD += $(BDB_LIBS) $(LIBEVENT_LDFLAGS) $(LIBSECCOMP_LDFLAGS) $(L\ntest_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)\ntest_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)\n-\nnodist_test_bitcoin_SOURCES = $(BUILT_SOURCES)\n$(BITCOIN_TESTS): $(BUILT_SOURCES)\n"
}
]
| C++ | MIT License | vergecurrency/verge | Enable tests that does not need updating |
714,138 | 14.01.2018 00:34:49 | -3,600 | 35576d947a9d3b4762b8979d1298214c70233b0c | renaming to verge | [
{
"change_type": "MODIFY",
"old_path": "Makefile.am",
"new_path": "Makefile.am",
"diff": "@@ -30,9 +30,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \\\n$(top_srcdir)/contrib/macdeploy/DS_Store\nCOVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \\\n- leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \\\n+ leveldb_baseline.info test_verge_filtered.info total_coverage.info \\\nbaseline_filtered.info block_test_filtered.info \\\n- leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info\n+ leveldb_baseline_filtered.info test_verge_coverage.info test_verge.info\ndist-hook:\n-$(MAKE) -C $(top_distdir)/src/leveldb clean\n@@ -119,16 +119,16 @@ leveldb_baseline_filtered.info: leveldb_baseline.info\nbaseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info\n$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@\n-test_bitcoin.info: baseline_filtered_combined.info\n+test_verge.info: baseline_filtered_combined.info\n$(MAKE) -C src/ check\n- $(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@\n+ $(LCOV) -c -d $(abs_builddir)/src -t test_verge -o $@\n$(LCOV) -z -d $(abs_builddir)/src\n$(LCOV) -z -d $(abs_builddir)/src/leveldb\n-test_bitcoin_filtered.info: test_bitcoin.info\n+test_verge_filtered.info: test_verge.info\n$(LCOV) -r $< \"/usr/include/*\" -o $@\n-block_test.info: test_bitcoin_filtered.info\n+block_test.info: test_verge_filtered.info\n$(MKDIR_P) qa/tmp\n-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0\n$(LCOV) -c -d $(abs_builddir)/src --t VERGEJBlockTest -o $@\n@@ -138,13 +138,13 @@ block_test.info: test_bitcoin_filtered.info\nblock_test_filtered.info: block_test.info\n$(LCOV) -r $< \"/usr/include/*\" -o $@\n-test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info\n- $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@\n+test_verge_coverage.info: baseline_filtered_combined.info test_verge_filtered.info\n+ $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_verge_filtered.info -o $@\n-total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info\n- $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a block_test_filtered.info -o $@ | $(GREP) \"\\%\" | $(AWK) '{ print substr($$3,2,50) \"/\" $$5 }' > coverage_percent.txt\n+total_coverage.info: baseline_filtered_combined.info test_verge_filtered.info block_test_filtered.info\n+ $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_verge_filtered.info -a block_test_filtered.info -o $@ | $(GREP) \"\\%\" | $(AWK) '{ print substr($$3,2,50) \"/\" $$5 }' > coverage_percent.txt\n-test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info\n+test_verge.coverage/.dirstamp: test_verge_coverage.info\n$(GENHTML) -s $< -o $(@D)\n@touch $@\n@@ -152,7 +152,7 @@ total.coverage/.dirstamp: total_coverage.info\n$(GENHTML) -s $< -o $(@D)\n@touch $@\n-cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp\n+cov: test_verge.coverage/.dirstamp total.coverage/.dirstamp\nendif\n@@ -169,5 +169,5 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)\n.INTERMEDIATE: $(COVERAGE_INFO)\nclean-local:\n- rm -rf test_bitcoin.coverage/ total.coverage/ $(OSX_APP) $(VERGE_QT_APP) $(VERGE_DAEMON) release_$(VERGE_PLATFORM).zip\n+ rm -rf test_verge.coverage/ total.coverage/ $(OSX_APP) $(VERGE_QT_APP) $(VERGE_DAEMON) release_$(VERGE_PLATFORM).zip\n"
},
{
"change_type": "MODIFY",
"old_path": "configure.ac",
"new_path": "configure.ac",
"diff": "@@ -685,7 +685,7 @@ if test x$bitcoin_enable_qt != xno; then\nfi\nfi\n-AC_MSG_CHECKING([whether to build test_bitcoin])\n+AC_MSG_CHECKING([whether to build test_verge])\nif test x$use_tests = xyes; then\nAC_MSG_RESULT([yes])\nBUILD_TEST=\"test\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Makefile.test.include",
"new_path": "src/Makefile.test.include",
"diff": "-bin_PROGRAMS += test_bitcoin\n-TESTS += test_bitcoin\n+bin_PROGRAMS += test_verge\n+TESTS += test_verge\nTEST_SRCDIR = test\n-TEST_BINARY=test/test_bitcoin$(EXEEXT)\n+TEST_BINARY=test/test_verge$(EXEEXT)\nJSON_TEST_FILES = \\\n@@ -30,8 +30,8 @@ BUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)\n#test/transaction_tests.cpp\n-test_bitcoin_SOURCES = \\\n- test/test_bitcoin.cpp \\\n+test_verge_SOURCES = \\\n+ test/test_verge.cpp \\\ntest/uint160_tests.cpp \\\ntest/uint256_tests.cpp \\\ntest/sigopcount_tests.cpp \\\n@@ -46,53 +46,53 @@ test_bitcoin_SOURCES = \\\n$(JSON_TEST_FILES) $(RAW_TEST_FILES)\nif ENABLE_WALLET\n-test_bitcoin_SOURCES += \\\n+test_verge_SOURCES += \\\ntest/accounting_tests.cpp\nendif\n-test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test $(TESTDEFS) $(EVENT_CFLAGS)\n-test_bitcoin_LDADD =\n+test_verge_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test $(TESTDEFS) $(EVENT_CFLAGS)\n+test_verge_LDADD =\nif ENABLE_WALLET\n-test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)\n+test_verge_LDADD += $(LIBBITCOIN_WALLET)\nendif\n-test_bitcoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) \\\n+test_verge_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) \\\n$(LIBLEVELDB) $(LIBMEMENV) \\\n$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)\nif HAVE_SSE2\n-test_bitcoin_LDADD += $(LIBBITCOIN_SSE2)\n+test_verge_LDADD += $(LIBBITCOIN_SSE2)\nendif\n-test_bitcoin_LDADD += $(TOR_LIBS) \\\n+test_verge_LDADD += $(TOR_LIBS) \\\n$(LIBEVENT_LIBS) \\\n$(LIBSECCOMP_LIBS) \\\n$(LIBCAP_LIBS) \\\n$(ZLIB_LIBS)\n-test_bitcoin_LDADD += $(BDB_LIBS) $(LIBEVENT_LDFLAGS) $(LIBSECCOMP_LDFLAGS) $(LIBCAP_LDFLAGS) \\\n+test_verge_LDADD += $(BDB_LIBS) $(LIBEVENT_LDFLAGS) $(LIBSECCOMP_LDFLAGS) $(LIBCAP_LDFLAGS) \\\n$(ZLIB_LDFLAGS)\n-test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)\n-test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)\n+test_verge_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)\n+test_verge_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)\n-nodist_test_bitcoin_SOURCES = $(BUILT_SOURCES)\n+nodist_test_verge_SOURCES = $(BUILT_SOURCES)\n$(BITCOIN_TESTS): $(BUILT_SOURCES)\n-CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(BUILT_SOURCES)\n+CLEAN_VERGE_TEST = test/*.gcda test/*.gcno $(BUILT_SOURCES)\n-CLEANFILES += $(CLEAN_BITCOIN_TEST)\n+CLEANFILES += $(CLEAN_VERGE_TEST)\n-bitcoin_test: $(TEST_BINARY)\n+verge_test: $(TEST_BINARY)\n-bitcoin_test_check: $(TEST_BINARY) FORCE\n+verge_test_check: $(TEST_BINARY) FORCE\n$(MAKE) check-TESTS TESTS=$^\n-bitcoin_test_clean : FORCE\n- rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)\n+verge_test_clean : FORCE\n+ rm -f $(CLEAN_VERGE_TEST) $(test_test_verge_OBJECTS) $(TEST_BINARY)\n%.json.h: %.json\n@$(MKDIR_P) $(@D)\n"
},
{
"change_type": "RENAME",
"old_path": "src/test/test_bitcoin.cpp",
"new_path": "src/test/test_verge.cpp",
"diff": "-#define BOOST_TEST_MODULE Bitcoin Test Suite\n+#define BOOST_TEST_MODULE VERGE Test Suite\n#include <boost/test/unit_test.hpp>\n#include \"db.h\"\n"
}
]
| C++ | MIT License | vergecurrency/verge | renaming to verge |
714,138 | 14.01.2018 00:36:36 | -3,600 | 12b07f957171e590d29dfb7afa99feb9513cdb26 | Add initial stealth test | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.test.include",
"new_path": "src/Makefile.test.include",
"diff": "@@ -43,6 +43,7 @@ test_verge_SOURCES = \\\ntest/base32_tests.cpp \\\ntest/allocator_tests.cpp \\\ntest/script_P2SH_tests.cpp \\\n+ test/stealth_tests.cpp \\\n$(JSON_TEST_FILES) $(RAW_TEST_FILES)\nif ENABLE_WALLET\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/stealth_tests.cpp",
"diff": "+#include <boost/test/unit_test.hpp>\n+#include <boost/atomic.hpp>\n+#include \"stealth.h\"\n+\n+\n+BOOST_AUTO_TEST_SUITE(stealth_tests)\n+\n+// Credit to ShadowCoin Developers\n+BOOST_AUTO_TEST_CASE(stealth_key)\n+{\n+ const char *testAddr = \"smYjKTSpYSAznNCeRiRxb992ey8Xu11mowhp4ee4hBccqWwzRQfKfkCEnK3T7SjowDDmfmqWwZxiDkiPKpiEuw936H5yWYSqnhKL9N\";\n+\n+ CStealthAddress sxAddr;\n+\n+ BOOST_CHECK(true == sxAddr.SetEncoded(testAddr));\n+\n+ BOOST_CHECK(HexStr(sxAddr.scan_pubkey.begin(), sxAddr.scan_pubkey.end()) == \"029b62c32a5561946b1b43cce1235a3b47d82abde25807cb9df2a65a1941558a8d\");\n+ BOOST_CHECK(HexStr(sxAddr.spend_pubkey.begin(), sxAddr.spend_pubkey.end()) == \"02f0e2f682c8a07fdba7a3a97f823261008c7f53156c311d20216af0b6cc8148c3\");\n+\n+ BOOST_CHECK(sxAddr.Encoded() == testAddr);\n+\n+\n+\n+\n+}\n+\n+BOOST_AUTO_TEST_SUITE_END()\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add initial stealth test |
714,138 | 14.01.2018 16:09:01 | -3,600 | fc1ed4ca11dc0f5422f6781ad653b6f99355274b | output test-suite log after each build | [
{
"change_type": "MODIFY",
"old_path": "building/linux/build.sh",
"new_path": "building/linux/build.sh",
"diff": "./autogen.sh\n./configure --with-gui=qt5\nmake check\n+\n+# For debugging purposes\n+cat src/test-suite.log\n"
},
{
"change_type": "MODIFY",
"old_path": "building/mac/build.sh",
"new_path": "building/mac/build.sh",
"diff": "@@ -8,3 +8,6 @@ export QT_LIBS=\"-F/usr/local/opt/[email protected]/lib -framework QtWidgets -framework QtGu\n./autogen.sh\n./configure --with-gui=qt5 --with-boost=$(brew --prefix [email protected])\nmake check\n+\n+# For debugging purposes\n+cat src/test-suite.log\n"
},
{
"change_type": "MODIFY",
"old_path": "contrib/docker/forwindows/build.sh",
"new_path": "contrib/docker/forwindows/build.sh",
"diff": "@@ -15,4 +15,7 @@ export BOOST_ROOT=/tmp/boost_1_55_0\nmake check\n+# For debugging purposes\n+cat src/test-suite.log\n+\necho \"done\"\n"
}
]
| C++ | MIT License | vergecurrency/verge | output test-suite log after each build |
714,137 | 14.01.2018 12:41:45 | 28,800 | 2af178e016285b3faf635a72c61ba5d7e8a16545 | (fix): Added libevent brew installation for mac building of requirements | [
{
"change_type": "MODIFY",
"old_path": "building/mac/requirements.sh",
"new_path": "building/mac/requirements.sh",
"diff": "@@ -5,7 +5,7 @@ brew uninstall qt5\nbrew install [email protected] pkg-config automake\n# Install some deps\n-brew install [email protected] protobuf miniupnpc openssl qrencode berkeley-db4 zlib\n+brew install [email protected] protobuf miniupnpc openssl qrencode berkeley-db4 zlib libevent\n# Make sure our stuff is linked in our path\nbrew link automake autoconf\n"
}
]
| C++ | MIT License | vergecurrency/verge | (fix): Added libevent brew installation for mac building of requirements |
714,131 | 16.01.2018 05:27:10 | -3,600 | cb76a9a43e6403e70b3b467cde49bf9a15c3f5e1 | filter out unconfirmed txes from getbalance and getinfo | [
{
"change_type": "MODIFY",
"old_path": "src/rpcwallet.cpp",
"new_path": "src/rpcwallet.cpp",
"diff": "@@ -593,6 +593,7 @@ Value getbalance(const Array& params, bool fHelp)\nnBalance -= r.second;\nnBalance -= allFee;\nnBalance += allGeneratedMature;\n+ nBalance -= allGeneratedImmature;\n}\nreturn ValueFromAmount(nBalance);\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | filter out unconfirmed txes from getbalance and getinfo |
714,092 | 17.01.2018 00:02:50 | -3,600 | 2a1a36cb3a9be4a03547b2c3a67cf3ef756386c2 | Add buttons to automatically add X percent of the current balance | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/sendcoinsentry.ui",
"new_path": "src/qt/forms/sendcoinsentry.ui",
"diff": "</property>\n</widget>\n</item>\n+ <item row=\"5\" column=\"1\">\n+ <layout class=\"QGridLayout\" name=\"gridLayoutAmount\">\n+ <property name=\"spacing\">\n+ <number>12</number>\n+ </property>\n+ <item row=\"0\" column=\"0\">\n+ <widget class=\"BitcoinAmountField\" name=\"payAmount\"/>\n+ </item>\n+ <item row=\"0\" column=\"1\">\n+ <layout class=\"QHBoxLayout\" name=\"setAmountLimits\">\n+ <property name=\"spacing\">\n+ <number>0</number>\n+ </property>\n+ <item>\n+ <widget class=\"QToolButton\" name=\"quarteramount\">\n+ <property name=\"toolTip\">\n+ <string>Sets the value to 25% of you current wallet amount.</string>\n+ </property>\n+ <property name=\"text\">\n+ <string>25%</string>\n+ </property>\n+ </widget>\n+ </item>\n+ <item>\n+ <widget class=\"QToolButton\" name=\"halfamount\">\n+ <property name=\"toolTip\">\n+ <string>Sets the value to 50% of you current wallet amount.</string>\n+ </property>\n+ <property name=\"text\">\n+ <string>50%</string>\n+ </property>\n+ </widget>\n+ </item>\n+ <item>\n+ <widget class=\"QToolButton\" name=\"fullamount\">\n+ <property name=\"toolTip\">\n+ <string>Sets the value to 100% of you current wallet amount.</string>\n+ </property>\n+ <property name=\"text\">\n+ <string>100%</string>\n+ </property>\n+ </widget>\n+ </item>\n+ </layout>\n+ </item>\n+ </layout>\n+ </item>\n<item row=\"3\" column=\"0\">\n<widget class=\"QLabel\" name=\"label_2\">\n<property name=\"text\">\n<string>Pay &To:</string>\n</property>\n<property name=\"alignment\">\n- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>\n+ <set>Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter</set>\n</property>\n<property name=\"buddy\">\n<cstring>payTo</cstring>\n</property>\n</widget>\n</item>\n- <item row=\"5\" column=\"1\">\n- <widget class=\"BitcoinAmountField\" name=\"payAmount\"/>\n- </item>\n<item row=\"4\" column=\"1\">\n<layout class=\"QHBoxLayout\" name=\"horizontalLayout_2\">\n<property name=\"spacing\">\n</property>\n<property name=\"icon\">\n<iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/address-book_filled</normaloff>:/icons/address-book_filled</iconset>\n+ <normaloff>:/icons/address-book_filled</normaloff>:/icons/address-book_filled\n+ </iconset>\n</property>\n<property name=\"shortcut\">\n<string>Alt+A</string>\n</property>\n<property name=\"icon\">\n<iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>\n+ <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste\n+ </iconset>\n</property>\n<property name=\"shortcut\">\n<string>Alt+P</string>\n</property>\n<property name=\"icon\">\n<iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>\n+ <normaloff>:/icons/remove</normaloff>:/icons/remove\n+ </iconset>\n</property>\n</widget>\n</item>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/sendcoinsentry.cpp",
"new_path": "src/qt/sendcoinsentry.cpp",
"diff": "@@ -44,6 +44,27 @@ void SendCoinsEntry::on_pasteButton_clicked()\nui->payTo->setText(QApplication::clipboard()->text());\n}\n+void SendCoinsEntry::on_fullamount_clicked(){\n+ if(!model)\n+ return;\n+\n+ ui->payAmount->setValue(model->getAvailableAmount(1));\n+}\n+\n+void SendCoinsEntry::on_halfamount_clicked(){\n+ if(!model)\n+ return;\n+\n+ ui->payAmount->setValue(model->getAvailableAmount(2));\n+}\n+\n+void SendCoinsEntry::on_quarteramount_clicked(){\n+ if(!model)\n+ return;\n+\n+ ui->payAmount->setValue(model->getAvailableAmount(4));\n+}\n+\nvoid SendCoinsEntry::on_addressBookButton_clicked()\n{\nif(!model)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/sendcoinsentry.h",
"new_path": "src/qt/sendcoinsentry.h",
"diff": "@@ -44,6 +44,9 @@ private slots:\nvoid on_deleteButton_clicked();\nvoid on_payTo_textChanged(const QString &address);\nvoid on_addressBookButton_clicked();\n+ void on_fullamount_clicked();\n+ void on_halfamount_clicked();\n+ void on_quarteramount_clicked();\nvoid on_pasteButton_clicked();\nvoid updateDisplayUnit();\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add buttons to automatically add X percent of the current balance |
714,092 | 17.01.2018 00:11:15 | -3,600 | 2d0728d2167a68198670a6ba7022ee4ed3fc6a18 | Adding a calculation method to divide the current balance into splits like 25% or 50% etc. | [
{
"change_type": "MODIFY",
"old_path": "src/qt/walletmodel.cpp",
"new_path": "src/qt/walletmodel.cpp",
"diff": "#include \"walletdb.h\" // for BackupWallet\n#include \"base58.h\"\n#include \"smessage.h\"\n+#include \"util.h\"\n#include <QSet>\n#include <QTimer>\n@@ -52,6 +53,23 @@ qint64 WalletModel::getImmatureBalance() const\nreturn wallet->GetImmatureBalance();\n}\n+qint64 WalletModel::getAvailableAmount(int parts) const\n+{\n+ qint64 balance = getBalance();\n+ if(parts <= 0 || !MoneyRange(balance)){\n+ return 0;\n+ }\n+\n+ qint64 transaction_amount = (balance / parts) - nTransactionFee;\n+\n+ if(parts <= 0 || !MoneyRange(transaction_amount)){\n+ std::cout << \"Out of range error after calculation\" << std::endl;\n+ return 0;\n+ }\n+\n+ return transaction_amount;\n+}\n+\nint WalletModel::getNumTransactions() const\n{\nint numTransactions = 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/walletmodel.h",
"new_path": "src/qt/walletmodel.h",
"diff": "@@ -69,6 +69,7 @@ public:\nqint64 getBalance() const;\nqint64 getUnconfirmedBalance() const;\nqint64 getImmatureBalance() const;\n+ qint64 getAvailableAmount(int parts) const;\nint getNumTransactions() const;\nEncryptionStatus getEncryptionStatus() const;\n"
}
]
| C++ | MIT License | vergecurrency/verge | Adding a calculation method to divide the current balance into splits like 25% or 50% etc. |
714,135 | 17.01.2018 00:18:52 | -3,600 | df27717bf3db9d954694136e505770ca5342dc65 | Fix centos7 docker file
Added the latest packages needed to build the current version. | [
{
"change_type": "MODIFY",
"old_path": "contrib/docker/centos7/Dockerfile",
"new_path": "contrib/docker/centos7/Dockerfile",
"diff": "@@ -5,7 +5,7 @@ MAINTAINER Mike Kinney <[email protected]>\nRUN yum upgrade -y\nRUN yum install -y wget\nRUN yum install -y epel-release\n-RUN yum install -y autoconf automake gcc-c++ libdb4-cxx libdb4-cxx-devel boost-devel openssl-devel git bzip2 make file sudo\n+RUN yum install -y autoconf automake gcc-c++ libdb4-cxx libdb4-cxx-devel boost-devel openssl-devel git bzip2 make file sudo patch libevent-devel libseccomp-devel libcap-devel\nRUN cd /tmp && \\\nwget https://github.com/google/protobuf/releases/download/v2.6.0/protobuf-2.6.0.tar.bz2 && \\\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix centos7 docker file
Added the latest packages needed to build the current version. |
714,135 | 17.01.2018 01:12:42 | -3,600 | 698e0311d68762f7fb3b7962f80233283a077b6c | Fix fedora23 docker file
Added the latest packages needed to build the current version. Removed
manual Protobuf build and instead added package from repo. | [
{
"change_type": "MODIFY",
"old_path": "contrib/docker/fedora23/Dockerfile",
"new_path": "contrib/docker/fedora23/Dockerfile",
"diff": "@@ -2,28 +2,12 @@ FROM fedora:23\nMAINTAINER Mike Kinney <[email protected]>\n-# TODO: change from yum to dnf\n-RUN yum upgrade -y\n-RUN yum install -y wget\n-RUN wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-6.noarch.rpm\n-RUN rpm -ivh epel-release-7-6.noarch.rpm\n-RUN yum install -y autoconf automake gcc-c++ libdb4-cxx libdb4-cxx-devel boost-devel openssl-devel git bzip2 make file sudo tar\n-\n-RUN cd /tmp && \\\n- wget http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2 && \\\n- tar xf protobuf-2.5.0.tar.bz2 && \\\n- cd /tmp/protobuf-2.5.0 && \\\n- ./configure && \\\n- make -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare && \\\n- make install\n-\n-RUN echo \"/usr/local/lib\" >> /etc/ld.so.conf && \\\n- echo \"/usr/lib\" >> /etc/ld.so.conf && \\\n- ldconfig\n-\n-ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH\n-\n-RUN yum install -y qt5-qtbase-devel qt5-qttools-devel qt5-qtwebkit-devel qt5-qtwebsockets qrencode-devel\n+RUN dnf upgrade -y\n+RUN dnf install -y autoconf automake gcc-c++ libdb4-cxx libdb4-cxx-devel boost-devel openssl-devel git bzip2 make file sudo tar patch findutils libevent-devel libseccomp-devel libcap-devel\n+\n+RUN dnf install -y protobuf-lite-devel\n+\n+RUN dnf install -y qt5-qtbase-devel qt5-qttools-devel qt5-qtwebkit-devel qt5-qtwebsockets qrencode-devel\nRUN git clone https://github.com/vergecurrency/verge /coin/git\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix fedora23 docker file
Added the latest packages needed to build the current version. Removed
manual Protobuf build and instead added package from repo. |
714,135 | 17.01.2018 01:23:22 | -3,600 | 9d18526306d1af96855c7bda82f68f12e4f568c3 | Added fedora27 docker file based on fedora23
Probably cannot be used for redistribution since built with incompatible
berkelydb configure settings. | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/docker/fedora27/Dockerfile",
"diff": "+FROM fedora:27\n+\n+MAINTAINER Blpoing <[email protected]>\n+\n+RUN dnf upgrade -y\n+RUN dnf install -y autoconf automake gcc-c++ libdb4-cxx libdb4-cxx-devel boost-devel openssl-devel git bzip2 make file sudo tar patch findutils libevent-devel libseccomp-devel libcap-devel\n+\n+RUN dnf install -y protobuf-lite-devel\n+\n+RUN dnf install -y qt5-qtbase-devel qt5-qttools-devel qt5-qtwebkit-devel qt5-qtwebsockets qrencode-devel\n+\n+RUN git clone https://github.com/vergecurrency/verge /coin/git\n+\n+WORKDIR /coin/git\n+\n+RUN ./autogen.sh && ./configure --with-incompatible-bdb --with-gui=qt5 && make && mv src/VERGEd /coin/VERGEd\n+\n+WORKDIR /coin\n+VOLUME [\"/coin/home\"]\n+\n+ENV HOME /coin/home\n+\n+CMD [\"/coin/VERGEd\"]\n+\n+# P2P, RPC\n+EXPOSE 21102 20102\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/docker/fedora27/README.md",
"diff": "+To build:\n+---\n+ docker build --rm -t vergecurrency/verge:4.0.1-fedora27 .\n+\n+See the instructions in the ubunt14 docker for how to use\n+\n"
}
]
| C++ | MIT License | vergecurrency/verge | Added fedora27 docker file based on fedora23
Probably cannot be used for redistribution since built with incompatible
berkelydb configure settings. |
714,138 | 17.01.2018 11:30:38 | -3,600 | 909fa069e5efdb40084404ce946f508153d70bf9 | Fix wallet lock problem | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -72,6 +72,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nwalletModel(0),\nencryptWalletAction(0),\nunlockWalletAction(0),\n+ lockWalletAction(0),\nchangePassphraseAction(0),\naboutQtAction(0),\ntrayIcon(0),\n@@ -276,6 +277,7 @@ void BitcoinGUI::createActions()\nencryptWalletAction->setToolTip(tr(\"Encrypt or decrypt wallet\"));\nencryptWalletAction->setCheckable(true);\nunlockWalletAction = new QAction(QIcon(\":/icons/lock_open\"), tr(\"&Unlock Wallet...\"), this);\n+ lockWalletAction = new QAction(QIcon(\":/icons/lock_closed\"), tr(\"&Lock Wallet...\"), this);\nbackupWalletAction = new QAction(QIcon(\":/icons/filesave\"), tr(\"&Backup Wallet...\"), this);\nbackupWalletAction->setToolTip(tr(\"Backup wallet to another location\"));\nchangePassphraseAction = new QAction(QIcon(\":/icons/key\"), tr(\"&Change Passphrase...\"), this);\n@@ -292,6 +294,7 @@ void BitcoinGUI::createActions()\nconnect(backupWalletAction, SIGNAL(triggered()), this, SLOT(backupWallet()));\nconnect(changePassphraseAction, SIGNAL(triggered()), this, SLOT(changePassphrase()));\nconnect(unlockWalletAction, SIGNAL(triggered()), this, SLOT(unlockWalletForMinting()));\n+ connect(lockWalletAction, SIGNAL(triggered()), this, SLOT(unlockWalletForMinting()));\nconnect(signMessageAction, SIGNAL(triggered()), this, SLOT(gotoSignMessageTab()));\nconnect(verifyMessageAction, SIGNAL(triggered()), this, SLOT(gotoVerifyMessageTab()));\n}\n@@ -321,6 +324,8 @@ void BitcoinGUI::createMenuBar()\nsettings->addSeparator();\nsettings->addAction(unlockWalletAction);\nsettings->addSeparator();\n+ settings->addAction(lockWalletAction);\n+ settings->addSeparator();\nsettings->addAction(optionsAction);\nQMenu *help = appMenuBar->addMenu(tr(\"&Help\"));\n@@ -455,6 +460,7 @@ void BitcoinGUI::createTrayIcon()\ntrayIconMenu->addSeparator();\ntrayIconMenu->addAction(encryptWalletAction);\ntrayIconMenu->addAction(unlockWalletAction);\n+ trayIconMenu->addAction(lockWalletAction);\ntrayIconMenu->addAction(changePassphraseAction);\ntrayIconMenu->addSeparator();\ntrayIconMenu->addAction(optionsAction);\n@@ -832,6 +838,7 @@ void BitcoinGUI::setEncryptionStatus(int status)\nencryptWalletAction->setChecked(false);\nchangePassphraseAction->setEnabled(false);\nunlockWalletAction->setEnabled(false);\n+ lockWalletAction->setEnabled(false);\nencryptWalletAction->setEnabled(true);\nbreak;\ncase WalletModel::Unlocked:\n@@ -841,6 +848,7 @@ void BitcoinGUI::setEncryptionStatus(int status)\nencryptWalletAction->setChecked(true);\nchangePassphraseAction->setEnabled(true);\nunlockWalletAction->setEnabled(false);\n+ lockWalletAction->setEnabled(true);\nencryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported\nbreak;\ncase WalletModel::Locked:\n@@ -849,6 +857,7 @@ void BitcoinGUI::setEncryptionStatus(int status)\nlabelEncryptionIcon->setToolTip(tr(\"Wallet is <b>encrypted</b> and currently <b>locked</b>\"));\nencryptWalletAction->setChecked(true);\nunlockWalletAction->setEnabled(true);\n+ lockWalletAction->setEnabled(false);\nchangePassphraseAction->setEnabled(true);\nencryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported\nbreak;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.h",
"new_path": "src/qt/bitcoingui.h",
"diff": "@@ -91,6 +91,7 @@ private:\nQAction *exportAction;\nQAction *encryptWalletAction;\nQAction *unlockWalletAction;\n+ QAction *lockWalletAction;\nQAction *backupWalletAction;\nQAction *changePassphraseAction;\nQAction *aboutQtAction;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/rpcwallet.cpp",
"new_path": "src/rpcwallet.cpp",
"diff": "@@ -1498,7 +1498,7 @@ Value walletlock(const Array& params, bool fHelp)\n{\nLOCK(cs_nWalletUnlockTime);\n- //pwalletMain->Lock();\n+ pwalletMain->Lock();\nnWalletUnlockTime = 0;\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix wallet lock problem |
714,098 | 18.01.2018 19:34:59 | 18,000 | 56b0e0a622141dd8e5702eeff2919acd27f55f8c | hard fork
at block | [
{
"change_type": "MODIFY",
"old_path": "src/main.cpp",
"new_path": "src/main.cpp",
"diff": "@@ -568,8 +568,13 @@ bool CTransaction::CheckTransaction() const\nif (txout.IsEmpty() && !IsCoinBase() && !IsCoinStake())\nreturn DoS(100, error(\"CTransaction::CheckTransaction() : txout empty for user transaction\"));\n- // ppcoin: enforce minimum output amount\n- if (txout.nValue < 0) {\n+ if (nBestHeight < STEALTH_TX_SWITCH_BLOCK && !txout.IsEmpty() && txout.nValue < MIN_TXOUT_AMOUNT)\n+ {\n+ printf(\"minamount: %s nValue: %s\", FormatMoney(MIN_TXOUT_AMOUNT).c_str(), FormatMoney(txout.nValue).c_str());\n+ return DoS(100, error(\"CTransaction::CheckTransaction() : rejecting, stealth tx disabled until block 1824150\"));\n+ }\n+ else if (txout.nValue < 0)\n+ {\nprintf(\"minamount: %s nValue: %s\", FormatMoney(MIN_TXOUT_AMOUNT).c_str(), FormatMoney(txout.nValue).c_str());\nreturn DoS(100, error(\"CTransaction::CheckTransaction() : txout.nValue below minimum\"));\n}\n@@ -2034,12 +2039,12 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew)\nconst CBlockIndex* pindex = pindexBest;\nfor (int i = 0; i < 100 && pindex != NULL; i++)\n{\n- if (pindex->nVersion > (BLOCK_VERSION_DEFAULT | BLOCK_VERSION_SCRYPT | BLOCK_VERSION_GROESTL | BLOCK_VERSION_X17 | BLOCK_VERSION_BLAKE | BLOCK_VERSION_LYRA2RE))\n+ if (pindex->nVersion > (BLOCK_VERSION_STEALTH | BLOCK_VERSION_SCRYPT | BLOCK_VERSION_GROESTL | BLOCK_VERSION_X17 | BLOCK_VERSION_BLAKE | BLOCK_VERSION_LYRA2RE))\n++nUpgraded;\npindex = pindex->pprev;\n}\nif (nUpgraded > 0)\n- printf(\"SetBestChain: %d of last 100 blocks above version %d\\n\", nUpgraded, (BLOCK_VERSION_DEFAULT | BLOCK_VERSION_SCRYPT | BLOCK_VERSION_X17 | BLOCK_VERSION_BLAKE | BLOCK_VERSION_LYRA2RE));\n+ printf(\"SetBestChain: %d of last 100 blocks above version %d\\n\", nUpgraded, (BLOCK_VERSION_STEALTH | BLOCK_VERSION_SCRYPT | BLOCK_VERSION_X17 | BLOCK_VERSION_BLAKE | BLOCK_VERSION_LYRA2RE));\nif (nUpgraded > 100/2)\n// strMiscWarning is read by GetWarnings(), called by Qt and the JSON-RPC code to warn the user:\nstrMiscWarning = _(\"Warning: This version is obsolete, upgrade required!\");\n@@ -2337,8 +2342,18 @@ bool CBlock::AcceptBlock()\nnVersion != (BLOCK_VERSION_X17 | BLOCK_VERSION_DEFAULT) &&\nnVersion != (BLOCK_VERSION_BLAKE | BLOCK_VERSION_DEFAULT) &&\nnVersion != BLOCK_VERSION_DEFAULT && nHeight > MULTI_ALGO_SWITCH_BLOCK)\n-\n+ {\n+ if (nHeight <= STEALTH_TX_SWITCH_BLOCK ||\n+ (nVersion != (BLOCK_VERSION_LYRA2RE | BLOCK_VERSION_STEALTH) &&\n+ nVersion != (BLOCK_VERSION_SCRYPT | BLOCK_VERSION_STEALTH) &&\n+ nVersion != (BLOCK_VERSION_GROESTL | BLOCK_VERSION_STEALTH) &&\n+ nVersion != (BLOCK_VERSION_X17 | BLOCK_VERSION_STEALTH) &&\n+ nVersion != (BLOCK_VERSION_BLAKE | BLOCK_VERSION_STEALTH) &&\n+ nVersion != BLOCK_VERSION_STEALTH))\n+ {\nreturn error(\"CheckBlock() : rejected nVersion\");\n+ }\n+ }\n// Enforce rule that the coinbase starts with serialized block height\nCScript expect = CScript() << nHeight;\n@@ -4353,7 +4368,7 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int algo)\nif (!pblock.get())\nreturn NULL;\n- pblock->nVersion = BLOCK_VERSION_DEFAULT;\n+ pblock->nVersion = nBestHeight >= STEALTH_TX_SWITCH_BLOCK ? BLOCK_VERSION_STEALTH : BLOCK_VERSION_DEFAULT;\nswitch (algo)\n{\ncase ALGO_LYRA2RE:\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main.h",
"new_path": "src/main.h",
"diff": "@@ -30,6 +30,7 @@ class CRequestTracker;\nclass CNode;\nstatic const int MULTI_ALGO_SWITCH_BLOCK = 340000;\n+static const int STEALTH_TX_SWITCH_BLOCK = 1824150;\nstatic const unsigned int MAX_BLOCK_SIZE = 1000000;\nstatic const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2;\nstatic const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;\n@@ -145,6 +146,7 @@ enum\n{\n// primary version\nBLOCK_VERSION_DEFAULT = 2,\n+ BLOCK_VERSION_STEALTH = 4,\n// algo\nBLOCK_VERSION_ALGO_BROKEN = (10 << 11),\n@@ -903,7 +905,6 @@ class CBlockHeader\n{\npublic:\n// header\n- static const int CURRENT_VERSION = BLOCK_VERSION_DEFAULT;\nint nVersion;\nuint256 hashPrevBlock;\nuint256 hashMerkleRoot;\n@@ -929,7 +930,7 @@ public:\nvoid SetNull()\n{\n- nVersion = CBlockHeader::CURRENT_VERSION;\n+ nVersion = nBestHeight >= STEALTH_TX_SWITCH_BLOCK ? BLOCK_VERSION_STEALTH : BLOCK_VERSION_DEFAULT;\nhashPrevBlock = 0;\nhashMerkleRoot = 0;\nnTime = 0;\n"
}
]
| C++ | MIT License | vergecurrency/verge | hard fork
at block 1824150 |
714,098 | 18.01.2018 22:06:11 | 18,000 | f70b100df3a71d57824d824b3512887d5693e7e0 | picked too many cherries
heh. | [
{
"change_type": "MODIFY",
"old_path": "src/main.cpp",
"new_path": "src/main.cpp",
"diff": "@@ -568,13 +568,7 @@ bool CTransaction::CheckTransaction() const\nif (txout.IsEmpty() && !IsCoinBase() && !IsCoinStake())\nreturn DoS(100, error(\"CTransaction::CheckTransaction() : txout empty for user transaction\"));\n- if (nBestHeight < STEALTH_TX_SWITCH_BLOCK && !txout.IsEmpty() && txout.nValue < MIN_TXOUT_AMOUNT)\n- {\n- printf(\"minamount: %s nValue: %s\", FormatMoney(MIN_TXOUT_AMOUNT).c_str(), FormatMoney(txout.nValue).c_str());\n- return DoS(100, error(\"CTransaction::CheckTransaction() : rejecting, stealth tx disabled until block 1824150\"));\n- }\n- else if (txout.nValue < 0)\n- {\n+ if (txout.nValue < 0) {\nprintf(\"minamount: %s nValue: %s\", FormatMoney(MIN_TXOUT_AMOUNT).c_str(), FormatMoney(txout.nValue).c_str());\nreturn DoS(100, error(\"CTransaction::CheckTransaction() : txout.nValue below minimum\"));\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | picked too many cherries
heh. |
714,138 | 22.01.2018 00:59:37 | -3,600 | 1a428a79db1b51642be4306ee64f3b306745dcf4 | Add donate option | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/sendcoinsentry.ui",
"new_path": "src/qt/forms/sendcoinsentry.ui",
"diff": "</property>\n</widget>\n</item>\n+ <item>\n+ <widget class=\"QPushButton\" name=\"donateButton\">\n+ <property name=\"toolTip\">\n+ <string>Support the development</string>\n+ </property>\n+ <property name=\"text\">\n+ <string>Donate</string>\n+ </property>\n+ </widget>\n+ </item>\n<item>\n<widget class=\"QToolButton\" name=\"addressBookButton\">\n<property name=\"toolTip\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/sendcoinsentry.cpp",
"new_path": "src/qt/sendcoinsentry.cpp",
"diff": "@@ -97,6 +97,14 @@ void SendCoinsEntry::on_deleteButton_clicked()\nemit removeEntry(this);\n}\n+void SendCoinsEntry::on_donateButton_clicked()\n+{\n+ // Verge(XVG) development donation address\n+ QString addr = \"DDd1pVWr8PPAw1z7DRwoUW6maWh5SsnCcp\";\n+ ui->payTo->setText(addr);\n+ setFocus();\n+}\n+\nbool SendCoinsEntry::validate()\n{\n// Check input validity\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/sendcoinsentry.h",
"new_path": "src/qt/sendcoinsentry.h",
"diff": "@@ -41,6 +41,7 @@ signals:\nvoid removeEntry(SendCoinsEntry *entry);\nprivate slots:\n+ void on_donateButton_clicked();\nvoid on_deleteButton_clicked();\nvoid on_payTo_textChanged(const QString &address);\nvoid on_addressBookButton_clicked();\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add donate option |
714,138 | 22.01.2018 10:30:39 | -3,600 | db72589ff9983d50781f18494d748caba2b38947 | Add message to notify user of donation address being filled | [
{
"change_type": "MODIFY",
"old_path": "src/qt/sendcoinsentry.cpp",
"new_path": "src/qt/sendcoinsentry.cpp",
"diff": "@@ -103,6 +103,11 @@ void SendCoinsEntry::on_donateButton_clicked()\nQString addr = \"DDd1pVWr8PPAw1z7DRwoUW6maWh5SsnCcp\";\nui->payTo->setText(addr);\nsetFocus();\n+ QMessageBox::information(this, tr(\"Donate\"),\n+ tr(\"We believe in keeping Verge free and open.\"\n+ \" Any donations to help fuel the development effort are greatly appreciated!\"\n+ \"\\n\\nThe VERGE (XVG) donation address has been filled in.\"),\n+ QMessageBox::Ok, QMessageBox::Ok);\n}\nbool SendCoinsEntry::validate()\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add message to notify user of donation address being filled |
714,098 | 22.01.2018 16:30:47 | 18,000 | d0b064d647abfdf73a680a74aba36faf5906a80b | fix pushback | [
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1950,8 +1950,8 @@ bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std\nCScript scriptP = CScript() << OP_RETURN << P;\nif (narr.size() > 0) {\nscriptP = scriptP << OP_RETURN << narr;\n- vecSend.push_back(make_pair(scriptP, nTransactionFee));\n}\n+ vecSend.push_back(make_pair(scriptP, nTransactionFee));\n// -- shuffle inputs, change output won't mix enough as it must be not fully random for plantext narrations\nstd::random_shuffle(vecSend.begin(), vecSend.end());\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix pushback |
714,138 | 23.01.2018 10:58:49 | -3,600 | 4b774dbaae26bbf0a9e746f19e7e6266c0d71f50 | Fix spinbox input issue | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoinamountfield.cpp",
"new_path": "src/qt/bitcoinamountfield.cpp",
"diff": "@@ -131,6 +131,11 @@ void BitcoinAmountField::setValue(qint64 value)\nsetText(BitcoinUnits::format(currentUnit, value));\n}\n+void BitcoinAmountField::setValueWithoutComma(qint64 value)\n+{\n+ setText(BitcoinUnits::format(currentUnit, value, false, true));\n+}\n+\nvoid BitcoinAmountField::unitChanged(int idx)\n{\n// Use description tooltip for current unit for the combobox\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoinamountfield.h",
"new_path": "src/qt/bitcoinamountfield.h",
"diff": "@@ -19,6 +19,7 @@ public:\nqint64 value(bool *valid=0) const;\nvoid setValue(qint64 value);\n+ void setValueWithoutComma(qint64 value);\n/** Mark current value as invalid in UI. */\nvoid setValid(bool valid);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoinunits.cpp",
"new_path": "src/qt/bitcoinunits.cpp",
"diff": "@@ -85,7 +85,7 @@ int BitcoinUnits::decimals(int unit)\n}\n}\n-QString BitcoinUnits::format(int unit, qint64 n, bool fPlus)\n+QString BitcoinUnits::format(int unit, qint64 n, bool fPlus, bool fnoComma)\n{\n// Note: not using straight sprintf here because we do NOT want\n// localized number formatting.\n@@ -96,8 +96,14 @@ QString BitcoinUnits::format(int unit, qint64 n, bool fPlus)\nqint64 n_abs = (n > 0 ? n : -n);\nqint64 quotient = n_abs / coin;\nqint64 remainder = n_abs % coin;\n- //QString quotient_str = QString::number(quotient);\n- QString quotient_str = QLocale(QLocale::English).toString(quotient);\n+ QString quotient_str;\n+\n+ if (fnoComma)\n+ quotient_str = QString::number(quotient);\n+ else\n+ quotient_str = QLocale(QLocale::English).toString(quotient);\n+\n+\nQString remainder_str = QString::number(remainder).rightJustified(num_decimals, '0');\n// Right-trim excess zeros after the decimal point\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoinunits.h",
"new_path": "src/qt/bitcoinunits.h",
"diff": "@@ -42,7 +42,7 @@ public:\n//! Number of decimals left\nstatic int decimals(int unit);\n//! Format as string\n- static QString format(int unit, qint64 amount, bool plussign=false);\n+ static QString format(int unit, qint64 amount, bool plussign=false, bool noComma=false);\n//! Format as string (with unit)\nstatic QString formatWithUnit(int unit, qint64 amount, bool plussign=false);\n//! Parse string to coin amount\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/sendcoinsentry.cpp",
"new_path": "src/qt/sendcoinsentry.cpp",
"diff": "@@ -48,21 +48,21 @@ void SendCoinsEntry::on_fullamount_clicked(){\nif(!model)\nreturn;\n- ui->payAmount->setValue(model->getAvailableAmount(1));\n+ ui->payAmount->setValueWithoutComma(model->getAvailableAmount(1));\n}\nvoid SendCoinsEntry::on_halfamount_clicked(){\nif(!model)\nreturn;\n- ui->payAmount->setValue(model->getAvailableAmount(2));\n+ ui->payAmount->setValueWithoutComma(model->getAvailableAmount(2));\n}\nvoid SendCoinsEntry::on_quarteramount_clicked(){\nif(!model)\nreturn;\n- ui->payAmount->setValue(model->getAvailableAmount(4));\n+ ui->payAmount->setValueWithoutComma(model->getAvailableAmount(4));\n}\nvoid SendCoinsEntry::on_addressBookButton_clicked()\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix spinbox input issue |
714,131 | 23.01.2018 21:43:02 | -3,600 | d458840551d016e82bcff998fc2a5f2ca8a26c18 | additional check for stealth tx switch block | [
{
"change_type": "MODIFY",
"old_path": "src/main.cpp",
"new_path": "src/main.cpp",
"diff": "@@ -2329,13 +2329,13 @@ bool CBlock::AcceptBlock()\n}\n}\n- // Reject block.nVersion not BLOCK_VERSION_DEFAULT or BLOCK_VERSION_GROESTL or BLOCK_VERSION_SHA256D and is not genesis block\n- if (nVersion != (BLOCK_VERSION_LYRA2RE | BLOCK_VERSION_DEFAULT) &&\n+ if (nHeight > STEALTH_TX_SWITCH_BLOCK ||\n+ (nVersion != (BLOCK_VERSION_LYRA2RE | BLOCK_VERSION_DEFAULT) &&\nnVersion != (BLOCK_VERSION_SCRYPT | BLOCK_VERSION_DEFAULT) &&\nnVersion != (BLOCK_VERSION_GROESTL | BLOCK_VERSION_DEFAULT) &&\nnVersion != (BLOCK_VERSION_X17 | BLOCK_VERSION_DEFAULT) &&\nnVersion != (BLOCK_VERSION_BLAKE | BLOCK_VERSION_DEFAULT) &&\n- nVersion != BLOCK_VERSION_DEFAULT && nHeight > MULTI_ALGO_SWITCH_BLOCK)\n+ nVersion != BLOCK_VERSION_DEFAULT && nHeight > MULTI_ALGO_SWITCH_BLOCK))\n{\nif (nHeight <= STEALTH_TX_SWITCH_BLOCK ||\n(nVersion != (BLOCK_VERSION_LYRA2RE | BLOCK_VERSION_STEALTH) &&\n"
}
]
| C++ | MIT License | vergecurrency/verge | additional check for stealth tx switch block |
714,098 | 23.01.2018 22:43:01 | 18,000 | 2cae3f9a49c805815861c2d91d777e1881fbed3d | add post-fork checkpoint | [
{
"change_type": "MODIFY",
"old_path": "src/checkpoints.cpp",
"new_path": "src/checkpoints.cpp",
"diff": "@@ -46,6 +46,7 @@ namespace Checkpoints\n( 1000000, uint256(\"0x000000000049eaba3d6c29d9f45bc2a944b46eec005e2b038f1ee924f2f9c029\"))\n( 1100000, uint256(\"0xc766387a2e0cd6af995ea432518614824fe313e988598ea8b26f58efb99ebcdc\"))\n( 1145029, uint256(\"0x04def2ba205c1e5f4b33873bc9e5b0a54311370e823686aeb4d5aab0bf021899\"))\n+ ( 1824425, uint256(\"0x2f30b9c1d6e624c4a01f1309df5149ce32f77da4e71418429dc8ae50ee527a0f\")) //first after stealth fork!\n;\nstatic MapCheckpoints mapCheckpointsTestnet =\n"
}
]
| C++ | MIT License | vergecurrency/verge | add post-fork checkpoint |
714,091 | 24.01.2018 14:26:20 | 18,000 | 57f09dd6a645f6be585433b9c4ddbdb20d6920fb | Update go.sh
go.sh: ./configure: not found, Ubuntu was skiping line to run ./autogen.sh which was causing the ./configure error. changed code to install file accordingly. Also added missing dependencies and cleaned up list. | [
{
"change_type": "MODIFY",
"old_path": "go.sh",
"new_path": "go.sh",
"diff": "@@ -54,17 +54,21 @@ sudo apt-get -y install libcanberra-gtk-module\n# Dont need to check if bd is already installed, will override or pass by\n#results=$(find /usr/ -name libdb_cxx.so)\n#if [ -z $results ]; then\n-sudo apt-get -y install libdb4.8-dev libdb4.8++-dev\n+sudo apt-get -y install libdb4.8-dev libdb4.8++-dev build-essential\n#else\n#grep DB_VERSION_STRING $(find /usr/ -name db.h)\n#echo \"BerkeleyDb will not be installed its already there....\"\n#fi\n-sudo apt-get -y install git build-essential libtool autotools-dev autoconf automake pkg-config libssl-dev libevent-dev bsdmainutils git libprotobuf-dev protobuf-compiler libqrencode-dev\n+sudo apt-get -y install libtool autotools-dev automake pkg-config libssl-dev libevent-dev\n-sudo apt-get -y install libqt5gui5 libqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev qttools5-dev-tools\n+sudo apt-get -y install bsdmainutils git libboost-all-dev libminiupnpc-dev libqt5gui5\n-sudo apt-get -y install libminiupnpc-dev\n+sudo apt-get -y install libqt5core5a libqt5dbus5 libevent-dev qttools5-dev\n+\n+sudo apt-get -y install qttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev\n+\n+sudo apt-get -y install libseccomp-dev libcap-dev\n# Keep current version of libboost if already present\nresults=$(find /usr/ -name libboost_chrono.so)\n@@ -129,13 +133,12 @@ fi\n#// Clone files from repo, Permissions and make\ngit clone --recurse-submodules https://github.com/vergecurrency/VERGE\n+cd ~\ncd VERGE\n-sudo sh autogen.sh\n+sudo ./autogen.sh\nchmod 777 ~/VERGE/share/genbuild.sh\nchmod 777 ~/VERGE/src/leveldb/build_detect_platform\n-\n-\ngrep --include=*.hpp -r '/usr/' -e \"define BOOST_LIB_VERSION\"\nsudo rm wrd01.txt\n@@ -160,11 +163,15 @@ fi\necho \"You have choosen $answer\"\n+cd ~\n+\nif [ -d /usr/local/BerkeleyDB.4.8/include ]\nthen\n+cd VERGE\n./configure CPPFLAGS=\"-I/usr/local/BerkeleyDB.4.8/include -O2\" LDFLAGS=\"-L/usr/local/BerkeleyDB.4.8/lib\" --with-gui=qt5 --with-boost-libdir=$(dirname \"$(cat wrd0$answer.txt)\")\necho \"Using Berkeley Generic...\"\nelse\n+cd VERGE\n./configure --with-gui=qt5 --with-boost-libdir=$(dirname \"$(cat wrd0$answer.txt)\")\necho \"Using default system Berkeley...\"\nfi\n"
}
]
| C++ | MIT License | vergecurrency/verge | Update go.sh
go.sh: ./configure: not found, Ubuntu was skiping line to run ./autogen.sh which was causing the ./configure error. changed code to install file accordingly. Also added missing dependencies and cleaned up list. |
714,131 | 24.01.2018 23:30:37 | -3,600 | 2517c4101e9be3ea84a0fdee804496f03ccef1c7 | added flag for getinfo to include unconfirmed balance | [
{
"change_type": "MODIFY",
"old_path": "src/bitcoinrpc.cpp",
"new_path": "src/bitcoinrpc.cpp",
"diff": "@@ -1188,6 +1188,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri\nif (strMethod == \"getblock\" && n > 1) ConvertTo<bool>(params[1]);\nif (strMethod == \"getblockbynumber\" && n > 0) ConvertTo<boost::int64_t>(params[0]);\nif (strMethod == \"getblockbynumber\" && n > 1) ConvertTo<bool>(params[1]);\n+ if (strMethod == \"getinfo\" && n > 0) ConvertTo<bool>(params[0]);\nif (strMethod == \"getrawblockbynumber\" && n > 0) ConvertTo<boost::int64_t>(params[0]);\nif (strMethod == \"getblockhash\" && n > 0) ConvertTo<boost::int64_t>(params[0]);\nif (strMethod == \"move\" && n > 2) ConvertTo<double>(params[2]);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/rpcwallet.cpp",
"new_path": "src/rpcwallet.cpp",
"diff": "@@ -62,18 +62,26 @@ string AccountFromValue(const Value& value)\nValue getinfo(const Array& params, bool fHelp)\n{\n- if (fHelp || params.size() != 0)\n+ if (fHelp || params.size() > 1)\nthrow runtime_error(\n- \"getinfo\\n\"\n- \"Returns an object containing various state info.\");\n+ \"getinfo [include_unconfirmed=false]\\n\"\n+ \"Returns an object containing various state info.\"\n+ \"include_unconfirmed - if true balance will include unconfirmed transactions\");\nproxyType proxy;\nGetProxy(NET_IPV4, proxy);\n+ bool include_unconfirmed = false;\n+ if (params.size() == 1)\n+ include_unconfirmed = params[0].get_bool();\n+\nObject obj;\nobj.push_back(Pair(\"version\", FormatFullVersion()));\nobj.push_back(Pair(\"protocolversion\",(int)PROTOCOL_VERSION));\nobj.push_back(Pair(\"walletversion\", pwalletMain->GetVersion()));\n+ if (include_unconfirmed)\n+ obj.push_back(Pair(\"balance\", ValueFromAmount(pwalletMain->GetBalance() + pwalletMain->GetUnconfirmedBalance())));\n+ else\nobj.push_back(Pair(\"balance\", ValueFromAmount(pwalletMain->GetBalance())));\nobj.push_back(Pair(\"newmint\", ValueFromAmount(pwalletMain->GetNewMint())));\nobj.push_back(Pair(\"stake\", ValueFromAmount(pwalletMain->GetStake())));\n"
}
]
| C++ | MIT License | vergecurrency/verge | added flag for getinfo to include unconfirmed balance |
714,091 | 27.01.2018 11:17:20 | 18,000 | caefc39e6d14b48d2f31ad7f39c1bb38d46eff3a | update linux install "Easy Way"
added the title back to the "easy way" and Added notes to remind users to ensure permissions are set up on the default user to do this install. | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -150,6 +150,10 @@ You can also check out this [Linux Wallet Video Tutorial](https://www.youtube.co\n## Developer Notes\n+The Easy Method:\n+\n+> **Note**: Sometimes linux user permissions are not set up properly, and causes failed compiling in linux. Please ensure your user has access or do the install from root if these problems arise.\n+\n```shell\nsudo rm -Rf ~/VERGE #(if you already have it)\nsudo apt-get -y install git && cd ~ && git clone https://github.com/vergecurrency/VERGE && cd VERGE && sh go.sh\n"
}
]
| C++ | MIT License | vergecurrency/verge | update linux install "Easy Way"
added the title back to the "easy way" and Added notes to remind users to ensure permissions are set up on the default user to do this install. |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.