Skip to content

Commit 2636381

Browse files
authored
Merge pull request #2 from CryptoCoderz/master
Go-Live Updates 1
2 parents 9639206 + 14394ca commit 2636381

File tree

8 files changed

+14
-22
lines changed

8 files changed

+14
-22
lines changed

DigitalNote.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
TEMPLATE = app
22
TARGET = DigitalNote-qt
3-
VERSION = 1.0.0.0
3+
VERSION = 1.0.1.0
44
INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
55
QT += core gui widgets network printsupport
66
DEFINES += ENABLE_WALLET

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ DigitalNote uses
4141
Berkeley DB 6.2.32,
4242
QT5.11,
4343
to compile
44-
=======
45-
BUILD LINUX
46-
-----------
47-
1) git clone https://github.com/DigitalNoteXDN/DigitalNote-1
4844

4945

5046
General Specs
@@ -146,7 +142,6 @@ on a patch set.
146142
<<
147143
Developer Discord can be found at https://discord.gg/eSb7nEx.
148144

149-
=======
150145
Testing
151146
-------
152147

@@ -169,4 +164,4 @@ in Python, that are run automatically on the build server.
169164
Changes should be tested by somebody other than the developer who wrote the
170165
code. This is especially important for large or high-risk changes. It is useful
171166
to add a test plan to the pull request description if testing the changes is
172-
not straightforward.
167+
not straightforward.

src/blockparams.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
#include "bignum.h"
1313

1414
#define START_MASTERNODE_PAYMENTS_TESTNET 9993058800 // OFF (NOT TOGGLED)
15-
#define START_MASTERNODE_PAYMENTS 9993058800 // OFF (NOT TOGGLED)
15+
#define START_MASTERNODE_PAYMENTS 1554494400 // OFF (Friday, April 5, 2019 1:00:00 PM GMT-07:00 | PDT)
1616
#define STOP_MASTERNODE_PAYMENTS_TESTNET 9993058800 // OFF (NOT TOGGLED)
1717
#define STOP_MASTERNODE_PAYMENTS 9993058800 // OFF (NOT TOGGLED)
1818

1919
#define START_DEVOPS_PAYMENTS_TESTNET 9993058800 // OFF (NOT TOGGLED)
20-
#define START_DEVOPS_PAYMENTS 9993058800 // OFF (NOT TOGGLED)
20+
#define START_DEVOPS_PAYMENTS 1554494400 // OFF (Friday, April 5, 2019 1:00:00 PM GMT-07:00 | PDT)
2121
#define STOP_DEVOPS_PAYMENTS_TESTNET 9993058800 // OFF (NOT TOGGLED)
2222
#define STOP_DEVOPS_PAYMENTS 9993058800 // OFF (NOT TOGGLED)
2323

src/clientversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
99
#define CLIENT_VERSION_MAJOR 1
1010
#define CLIENT_VERSION_MINOR 0
11-
#define CLIENT_VERSION_REVISION 0
11+
#define CLIENT_VERSION_REVISION 1
1212
#define CLIENT_VERSION_BUILD 0
1313

1414
// Set to true for release, false for prerelease or test build

src/qt/bitcoinunits.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ int DigitalNoteUnits::amountDigits(int unit)
7474
{
7575
switch(unit)
7676
{
77-
case XDN: return 8; // 21,000,000 (# digits, without commas)
78-
case mXDN: return 11; // 21,000,000,000
79-
case uXDN: return 14; // 21,000,000,000,000
77+
case XDN: return 11; // 21,000,000,000 (# digits, without commas)
78+
case mXDN: return 14; // 21,000,000,000,000
79+
case uXDN: return 17; // 21,000,000,000,000,000
8080
default: return 0;
8181
}
8282
}

src/util.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,15 +1209,12 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
12091209

12101210
std::string str(s, 32);
12111211
fprintf(ConfFile, "rpcpassword=%s\n", str.c_str());
1212-
fprintf(ConfFile, "port=51441\n");
1213-
fprintf(ConfFile, "rpcport=51221\n");
1212+
fprintf(ConfFile, "port=18092\n");
1213+
fprintf(ConfFile, "rpcport=18094\n");
12141214
fprintf(ConfFile, "rpcconnect=127.0.0.1\n");
12151215
fprintf(ConfFile, "rpcallowip=127.0.0.1\n");
1216-
// fprintf(ConfFile, "addnode=cryptonode.online\n");
1217-
// fprintf(ConfFile, "addnode=178.128.242.233\n");
1218-
// fprintf(ConfFile, "addnode=142.93.108.48\n");
1219-
// fprintf(ConfFile, "addnode=159.203.240.221\n");
1220-
// fprintf(ConfFile, "addnode=188.166.109.87\n");
1216+
fprintf(ConfFile, "addnode=157.230.107.144\n");
1217+
fprintf(ConfFile, "addnode=138.197.161.183\n");
12211218

12221219
fclose(ConfFile);
12231220
}

src/version.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const std::string CLIENT_NAME("DigitalNoteoshi");
3636
// git will put "#define GIT_ARCHIVE 1" on the next line inside archives.
3737
#define GIT_ARCHIVE 1
3838
#ifdef GIT_ARCHIVE
39-
# define GIT_COMMIT_ID "XDN"
39+
# define GIT_COMMIT_ID "XDN-"
4040
#endif
4141

4242
#define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \

src/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static const int DATABASE_VERSION = 70509;
3030
//
3131
// network protocol versioning
3232
//
33-
static const int PROTOCOL_VERSION = 62006;
33+
static const int PROTOCOL_VERSION = 62007;
3434

3535
// intial proto version, to be increased after version/verack negotiation
3636
static const int INIT_PROTO_VERSION = 209;

0 commit comments

Comments
 (0)