Skip to content

Go-Live Updates 1#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AuCRHI merged 4 commits into from
Mar 31, 2019
Merged

Go-Live Updates 1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1032e40
Update Readme
CryptoCoderz Mar 26, 2019
5084f4e
GUI unit refactoring
CryptoCoderz Mar 27, 2019
55574eb
Go-Live Updates 1
CryptoCoderz Mar 31, 2019
14394ca
Go-Live Updates 2
CryptoCoderz Mar 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DigitalNote.pro
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
7 changes: 1 addition & 6 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -146,7 +142,6 @@ on a patch set.
<<
Developer Discord can be found at https://discord.gg/eSb7nEx.

=======
Testing
-------

Expand All@@ -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.
not straightforward.
4 changes: 2 additions & 2 deletions src/blockparams.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/qt/bitcoinunits.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
}
Expand Down
11 changes: 4 additions & 7 deletions src/util.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1209,15 +1209,12 @@ void ReadConfigFile(map<string, string>& 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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/version.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down