From 1032e40e6ebe7633342bce5490536875c852f988 Mon Sep 17 00:00:00 2001 From: CryptoCoderz Date: Tue, 26 Mar 2019 13:57:08 -0700 Subject: [PATCH 1/4] Update Readme Changelog - Cleaned up Readme --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index c24f1710..b92e09f2 100644 --- a/README.md +++ b/README.md @@ -41,10 +41,6 @@ DigitalNote uses Berkeley DB 6.2.32, QT5.11, to compile -======= -BUILD LINUX ------------ -1) git clone https://github.com/DigitalNoteXDN/DigitalNote-1 General Specs @@ -146,7 +142,6 @@ on a patch set. << Developer Discord can be found at https://discord.gg/eSb7nEx. -======= Testing ------- @@ -169,4 +164,4 @@ in Python, that are run automatically on the build server. Changes should be tested by somebody other than the developer who wrote the code. This is especially important for large or high-risk changes. It is useful to add a test plan to the pull request description if testing the changes is -not straightforward. \ No newline at end of file +not straightforward. From 5084f4e8d4d7635e8a02b9674739cdf6e0b5704f Mon Sep 17 00:00:00 2001 From: CryptoCoderz Date: Tue, 26 Mar 2019 21:07:20 -0700 Subject: [PATCH 2/4] GUI unit refactoring Changelog - Refactored GUI wallet --- src/qt/bitcoinunits.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 7135b7b7..cf27236a 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -74,9 +74,9 @@ int DigitalNoteUnits::amountDigits(int unit) { switch(unit) { - case XDN: return 8; // 21,000,000 (# digits, without commas) - case mXDN: return 11; // 21,000,000,000 - case uXDN: return 14; // 21,000,000,000,000 + case XDN: return 11; // 21,000,000,000 (# digits, without commas) + case mXDN: return 14; // 21,000,000,000,000 + case uXDN: return 17; // 21,000,000,000,000,000 default: return 0; } } @@ -85,9 +85,9 @@ int DigitalNoteUnits::decimals(int unit) { switch(unit) { - case XDN: return 8; - case mXDN: return 5; - case uXDN: return 2; + case XDN: return 6; // Minimum 100 DigitalNoteoshi's GUI hard limit + case mXDN: return 3; + case uXDN: return 0; default: return 0; } } From 55574ebf09f0a0023d8a246f0b66e0b2d9379a8c Mon Sep 17 00:00:00 2001 From: CryptoCoderz Date: Sat, 30 Mar 2019 23:20:38 -0700 Subject: [PATCH 3/4] Go-Live Updates 1 Changelog - Payments activation for Masternodes and DevOps - Updated Nodes - Updated GUI factoring display for units --- src/blockparams.h | 4 ++-- src/qt/bitcoinunits.cpp | 6 +++--- src/util.cpp | 11 ++++------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/blockparams.h b/src/blockparams.h index f183668c..2f01165b 100644 --- a/src/blockparams.h +++ b/src/blockparams.h @@ -12,12 +12,12 @@ #include "bignum.h" #define START_MASTERNODE_PAYMENTS_TESTNET 9993058800 // OFF (NOT TOGGLED) -#define START_MASTERNODE_PAYMENTS 9993058800 // OFF (NOT TOGGLED) +#define START_MASTERNODE_PAYMENTS 1554494400 // OFF (Friday, April 5, 2019 1:00:00 PM GMT-07:00 | PDT) #define STOP_MASTERNODE_PAYMENTS_TESTNET 9993058800 // OFF (NOT TOGGLED) #define STOP_MASTERNODE_PAYMENTS 9993058800 // OFF (NOT TOGGLED) #define START_DEVOPS_PAYMENTS_TESTNET 9993058800 // OFF (NOT TOGGLED) -#define START_DEVOPS_PAYMENTS 9993058800 // OFF (NOT TOGGLED) +#define START_DEVOPS_PAYMENTS 1554494400 // OFF (Friday, April 5, 2019 1:00:00 PM GMT-07:00 | PDT) #define STOP_DEVOPS_PAYMENTS_TESTNET 9993058800 // OFF (NOT TOGGLED) #define STOP_DEVOPS_PAYMENTS 9993058800 // OFF (NOT TOGGLED) diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index cf27236a..71bb1224 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -85,9 +85,9 @@ int DigitalNoteUnits::decimals(int unit) { switch(unit) { - case XDN: return 6; // Minimum 100 DigitalNoteoshi's GUI hard limit - case mXDN: return 3; - case uXDN: return 0; + case XDN: return 8; + case mXDN: return 5; + case uXDN: return 2; default: return 0; } } diff --git a/src/util.cpp b/src/util.cpp index 72e03fbc..91c9bbdc 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1209,15 +1209,12 @@ void ReadConfigFile(map& mapSettingsRet, std::string str(s, 32); fprintf(ConfFile, "rpcpassword=%s\n", str.c_str()); - fprintf(ConfFile, "port=51441\n"); - fprintf(ConfFile, "rpcport=51221\n"); + fprintf(ConfFile, "port=18092\n"); + fprintf(ConfFile, "rpcport=18094\n"); fprintf(ConfFile, "rpcconnect=127.0.0.1\n"); fprintf(ConfFile, "rpcallowip=127.0.0.1\n"); - // fprintf(ConfFile, "addnode=cryptonode.online\n"); - // fprintf(ConfFile, "addnode=178.128.242.233\n"); - // fprintf(ConfFile, "addnode=142.93.108.48\n"); - // fprintf(ConfFile, "addnode=159.203.240.221\n"); - // fprintf(ConfFile, "addnode=188.166.109.87\n"); + fprintf(ConfFile, "addnode=157.230.107.144\n"); + fprintf(ConfFile, "addnode=138.197.161.183\n"); fclose(ConfFile); } From 14394ca8b849025850c96097945c5471aeedfc4b Mon Sep 17 00:00:00 2001 From: CryptoCoderz Date: Sun, 31 Mar 2019 01:13:49 -0700 Subject: [PATCH 4/4] Go-Live Updates 2 Changelog - Version bump for go-live payment activation --- DigitalNote.pro | 2 +- src/clientversion.h | 2 +- src/version.cpp | 2 +- src/version.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DigitalNote.pro b/DigitalNote.pro index 02fa0a97..52c710cd 100644 --- a/DigitalNote.pro +++ b/DigitalNote.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = DigitalNote-qt -VERSION = 1.0.0.0 +VERSION = 1.0.1.0 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor QT += core gui widgets network printsupport DEFINES += ENABLE_WALLET diff --git a/src/clientversion.h b/src/clientversion.h index 8e0c7b95..56197ad6 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -8,7 +8,7 @@ // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 0 +#define CLIENT_VERSION_REVISION 1 #define CLIENT_VERSION_BUILD 0 // Set to true for release, false for prerelease or test build diff --git a/src/version.cpp b/src/version.cpp index c08aede0..05d95fcc 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -36,7 +36,7 @@ const std::string CLIENT_NAME("DigitalNoteoshi"); // git will put "#define GIT_ARCHIVE 1" on the next line inside archives. #define GIT_ARCHIVE 1 #ifdef GIT_ARCHIVE -# define GIT_COMMIT_ID "XDN" +# define GIT_COMMIT_ID "XDN-" #endif #define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \ diff --git a/src/version.h b/src/version.h index 783d5820..7491125d 100644 --- a/src/version.h +++ b/src/version.h @@ -30,7 +30,7 @@ static const int DATABASE_VERSION = 70509; // // network protocol versioning // -static const int PROTOCOL_VERSION = 62006; +static const int PROTOCOL_VERSION = 62007; // intial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209;