Skip to content

Commit 05fe0a1

Browse files
ghostlanderghostlander
committed
Orbitcoin Next
1 parent 32498d4 commit 05fe0a1

File tree

107 files changed

+1362
-4252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1362
-4252
lines changed

‎README.md‎

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,14 @@
11

2-
NovaCoin official development tree
3-
4-
NovaCoin - a hybrid scrypt PoW + PoS based cryptocurrency.
5-
6-
* 10 minutes stake spacing
7-
* 30 minutes PoW spacing
8-
* Balanced PoW blocks and stakes weighting
9-
* The PoW subsidy halves every x64 multiply of PoW difficulty
10-
* The PoS interest halves every x64 multiply of PoS difficulty
11-
* Maximum PoW reward is 100 coins
12-
* Maximum PoS reward is 10 coins
13-
* ~ 2 billion total coins
14-
15-
Development process
16-
===========================
17-
18-
Developers work in their own trees, then submit pull requests when
19-
they think their feature or bug fix is ready.
20-
21-
The patch will be accepted if there is broad consensus that it is a
22-
good thing. Developers should expect to rework and resubmit patches
23-
if they don't match the project's coding conventions (see coding.txt)
24-
or are controversial.
25-
26-
The master branch is regularly built and tested, but is not guaranteed
27-
to be completely stable. Tags are regularly created to indicate new
28-
official, stable release versions of NovaCoin.
29-
30-
Feature branches are created when there are major new features being
31-
worked on by several people.
32-
33-
From time to time a pull request will become outdated. If this occurs, and
34-
the pull is no longer automatically mergeable; a comment on the pull will
35-
be used to issue a warning of closure. The pull will be closed 15 days
36-
after the warning if action is not taken by the author. Pull requests closed
37-
in this manner will have their corresponding issue labeled 'stagnant'.
38-
39-
Issues with no commits will be given a similar warning, and closed after
40-
15 days from their last activity. Issues closed in this manner will be
41-
labeled 'stale'.
2+
Orbitcoin official development tree
3+
4+
Orbitcoin (ORB), a hybrid Scrypt PoW + PoS based cryptocurrency.
5+
6+
* 30 seconds target for PoS blocks
7+
* 12 minutes target for PoW blocks
8+
* balanced weighting
9+
* 0.25 ORB per PoW block reward currently
10+
* PoW block reward halves yearly
11+
* 0% PoS block reward
12+
* difficulty retargets every block
13+
* default P2P port is 15298
14+
* default RPC port is 15299

novacoin-qt.pro renamed to orbitcoin-qt.pro

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
TEMPLATE = app
2-
TARGET = novacoin-qt
3-
VERSION = 0.7.5
2+
TARGET = orbitcoin-qt
3+
VERSION = 1.4.0.0
44
INCLUDEPATH += src src/json src/qt
55
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
66
CONFIG += no_include_pwd
@@ -31,13 +31,6 @@ contains(RELEASE, 1) {
3131
}
3232
}
3333

34-
!win32 {
35-
# for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection
36-
QMAKE_CXXFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
37-
QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
38-
# We need to exclude this for Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
39-
# This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
40-
}
4134
# for extra security on Windows: enable ASLR and DEP via GCC linker flags
4235
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
4336
win32:QMAKE_LFLAGS += -static-libgcc -static-libstdc++
@@ -123,10 +116,10 @@ QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) cl
123116

124117
contains(USE_O3, 1) {
125118
message(Building O3 optimization flag)
126-
QMAKE_CXXFLAGS_RELEASE -= -O2
127-
QMAKE_CFLAGS_RELEASE -= -O2
128-
QMAKE_CXXFLAGS += -O3
129-
QMAKE_CFLAGS += -O3
119+
QMAKE_CXXFLAGS_RELEASE -= -O2 -fomit-frame-pointer -fno-stack-protector
120+
QMAKE_CFLAGS_RELEASE -= -O2 -fomit-frame-pointer -fno-stack-protector
121+
QMAKE_CXXFLAGS += -O3 -fomit-frame-pointer -fno-stack-protector
122+
QMAKE_CFLAGS += -O3 -fomit-frame-pointer -fno-stack-protector
130123
}
131124

132125
*-g++-32 {
@@ -165,17 +158,6 @@ HEADERS += src/qt/bitcoingui.h \
165158
src/kernel.h \
166159
src/scrypt.h \
167160
src/pbkdf2.h \
168-
src/zerocoin/Accumulator.h \
169-
src/zerocoin/AccumulatorProofOfKnowledge.h \
170-
src/zerocoin/Coin.h \
171-
src/zerocoin/CoinSpend.h \
172-
src/zerocoin/Commitment.h \
173-
src/zerocoin/ParamGeneration.h \
174-
src/zerocoin/Params.h \
175-
src/zerocoin/SerialNumberSignatureOfKnowledge.h \
176-
src/zerocoin/SpendMetaData.h \
177-
src/zerocoin/ZeroTest.h \
178-
src/zerocoin/Zerocoin.h \
179161
src/serialize.h \
180162
src/strlcpy.h \
181163
src/main.h \
@@ -301,17 +283,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
301283
src/scrypt-x86.S \
302284
src/scrypt-x86_64.S \
303285
src/scrypt.cpp \
304-
src/pbkdf2.cpp \
305-
src/zerocoin/Accumulator.cpp \
306-
src/zerocoin/AccumulatorProofOfKnowledge.cpp \
307-
src/zerocoin/Coin.cpp \
308-
src/zerocoin/CoinSpend.cpp \
309-
src/zerocoin/Commitment.cpp \
310-
src/zerocoin/ParamGeneration.cpp \
311-
src/zerocoin/Params.cpp \
312-
src/zerocoin/SerialNumberSignatureOfKnowledge.cpp \
313-
src/zerocoin/SpendMetaData.cpp \
314-
src/zerocoin/ZeroTest.cpp
286+
src/pbkdf2.cpp
315287

316288
RESOURCES += \
317289
src/qt/bitcoin.qrc
@@ -413,7 +385,7 @@ macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
413385
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
414386
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
415387
macx:ICON = src/qt/res/icons/bitcoin.icns
416-
macx:TARGET = "NovaCoin-Qt"
388+
macx:TARGET = "Orbitcoin-Qt"
417389
macx:QMAKE_CFLAGS_THREAD += -pthread
418390
macx:QMAKE_LFLAGS_THREAD += -pthread
419391
macx:QMAKE_CXXFLAGS_THREAD += -pthread

‎src/alert.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ using namespace std;
1616
map<uint256, CAlert> mapAlerts;
1717
CCriticalSection cs_mapAlerts;
1818

19-
static const char* pszMainKey = "043fa441fd4203d03f5df2b75ea14e36f20d39f43e7a61aa7552ab9bcd7ecb0e77a3be4585b13fcdaa22ef6e51f1ff6f2929bec2494385b086fb86610e33193195";
19+
static const char* pszMainKey = "04fbfee41b55b5464f7042d34aa718bc7830da84e581e0b061d88fbf1dd5af090b9e7aaa6674e0fbef0854fd62cd8c9e02e50a7dfaa906a4a6dbeef8579fb406f6";
2020

2121
// TestNet alerts pubKey
22-
static const char* pszTestKey = "0471dc165db490094d35cde15b1f5d755fa6ad6f2b5ed0f340e3f17f57389c3c2af113a8cbcc885bde73305a553b5640c83021128008ddf882e856336269080496";
23-
24-
// TestNet alerts private key
25-
// "308201130201010420b665cff1884e53da26376fd1b433812c9a5a8a4d5221533b15b9629789bb7e42a081a53081a2020101302c06072a8648ce3d0101022100fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f300604010004010704410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8022100fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141020101a1440342000471dc165db490094d35cde15b1f5d755fa6ad6f2b5ed0f340e3f17f57389c3c2af113a8cbcc885bde73305a553b5640c83021128008ddf882e856336269080496"
22+
static const char* pszTestKey = "04f4d972a3d5575c5373c0a9993d2fd36d89f829eec58c9fa9bd592e53e19fe268a8de77aab88dba1c912577675dae0b1928cd7ea88cbff7b737f4221ca4342497";
2623

2724
void CUnsignedAlert::SetNull()
2825
{

‎src/base58.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ class CBitcoinAddress : public CBase58Data
276276
public:
277277
enum
278278
{
279-
PUBKEY_ADDRESS = 8,
280-
SCRIPT_ADDRESS = 20,
279+
PUBKEY_ADDRESS = 115, // Orbitcoin: addresses begin with 'o'
280+
SCRIPT_ADDRESS = 8,
281281
PUBKEY_ADDRESS_TEST = 111,
282282
SCRIPT_ADDRESS_TEST = 196,
283283
};

‎src/bitcoinrpc.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void ThreadRPCServer3(void* parg);
4343

4444
static inline unsigned short GetDefaultRPCPort()
4545
{
46-
return GetBoolArg("-testnet", false) ? 18344 : 8344;
46+
return GetBoolArg("-testnet", false) ? 25299 : 15299;
4747
}
4848

4949
Object JSONRPCError(int code, const string& message)
@@ -219,12 +219,12 @@ Value stop(const Array& params, bool fHelp)
219219
throw runtime_error(
220220
"stop <detach>\n"
221221
"<detach> is true or false to detach the database or not for this stop only\n"
222-
"Stop NovaCoin server (and possibly override the detachdb config value).");
222+
"Stop Orbitcoin server (and possibly override the detachdb config value).");
223223
// Shutdown will take long enough that the response should get back
224224
if (params.size() > 0)
225225
bitdb.SetDetach(params[0].get_bool());
226226
StartShutdown();
227-
return "NovaCoin server stopping";
227+
return "Orbitcoin server stopping";
228228
}
229229

230230

@@ -340,7 +340,7 @@ string HTTPPost(const string& strMsg, const map<string,string>& mapRequestHeader
340340
{
341341
ostringstream s;
342342
s << "POST / HTTP/1.1\r\n"
343-
<< "User-Agent: novacoin-json-rpc/" << FormatFullVersion() << "\r\n"
343+
<< "User-Agent: orbitcoin-json-rpc/" << FormatFullVersion() << "\r\n"
344344
<< "Host: 127.0.0.1\r\n"
345345
<< "Content-Type: application/json\r\n"
346346
<< "Content-Length: " << strMsg.size() << "\r\n"
@@ -371,7 +371,7 @@ static string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
371371
if (nStatus == HTTP_UNAUTHORIZED)
372372
return strprintf("HTTP/1.0 401 Authorization Required\r\n"
373373
"Date: %s\r\n"
374-
"Server: novacoin-json-rpc/%s\r\n"
374+
"Server: orbitcoin-json-rpc/%s\r\n"
375375
"WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
376376
"Content-Type: text/html\r\n"
377377
"Content-Length: 296\r\n"
@@ -398,7 +398,7 @@ static string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
398398
"Connection: %s\r\n"
399399
"Content-Length: %"PRIszu"\r\n"
400400
"Content-Type: application/json\r\n"
401-
"Server: novacoin-json-rpc/%s\r\n"
401+
"Server: orbitcoin-json-rpc/%s\r\n"
402402
"\r\n"
403403
"%s",
404404
nStatus,
@@ -669,7 +669,7 @@ class AcceptedConnectionImpl : public AcceptedConnection
669669
void ThreadRPCServer(void* parg)
670670
{
671671
// Make this thread recognisable as the RPC listener
672-
RenameThread("bitcoin-rpclist");
672+
RenameThread("orb-rpclist");
673673

674674
try
675675
{
@@ -772,15 +772,15 @@ void ThreadRPCServer2(void* parg)
772772
{
773773
unsigned char rand_pwd[32];
774774
RAND_bytes(rand_pwd, 32);
775-
string strWhatAmI = "To use novacoind";
775+
string strWhatAmI = "To use orbitcoind";
776776
if (mapArgs.count("-server"))
777777
strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
778778
else if (mapArgs.count("-daemon"))
779779
strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\"");
780780
uiInterface.ThreadSafeMessageBox(strprintf(
781781
_("%s, you must set a rpcpassword in the configuration file:\n %s\n"
782782
"It is recommended you use the following random password:\n"
783-
"rpcuser=bitcoinrpc\n"
783+
"rpcuser=orbitcoinrpc\n"
784784
"rpcpassword=%s\n"
785785
"(you do not need to remember this password)\n"
786786
"If the file does not exist, create it with owner-readable-only file permissions.\n"),
@@ -969,7 +969,7 @@ static CCriticalSection cs_THREAD_RPCHANDLER;
969969
void ThreadRPCServer3(void* parg)
970970
{
971971
// Make this thread recognisable as the RPC handler
972-
RenameThread("bitcoin-rpchand");
972+
RenameThread("orb-rpchand");
973973

974974
{
975975
LOCK(cs_THREAD_RPCHANDLER);

‎src/checkpoints.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ namespace Checkpoints
2424
//
2525
static MapCheckpoints mapCheckpoints =
2626
boost::assign::map_list_of
27-
( 0, std::make_pair(hashGenesisBlock, 1360105017) )
28-
( 68600, std::make_pair(uint256("0xb646b0562080ab9411f85d4b2a1ca8b197c67ae170c5e328406871b44233cb06"), 1389867276) )
27+
( 0, std::make_pair(hashGenesisBlock, 1375030725) )
28+
( 433333, std::make_pair(uint256("0x2ecb07c0bb2e53f0af0bd79d24510e73de3be324e622bfef5dbe28896c37ad75"), 1392829201) )
2929
;
3030

3131
// TestNet has no checkpoints
3232
static MapCheckpoints mapCheckpointsTestnet =
3333
boost::assign::map_list_of
34-
( 0, std::make_pair(hashGenesisBlockTestNet, 1360105017) )
34+
( 0, std::make_pair(hashGenesisBlockTestNet, 1392724800) )
3535
;
3636

3737
bool CheckHardened(int nHeight, const uint256& hash)
@@ -362,7 +362,7 @@ namespace Checkpoints
362362
}
363363

364364
// ppcoin: sync-checkpoint master key
365-
const std::string CSyncCheckpoint::strMasterPubKey = "04a51b735f816de4ec3f891d5b38bbc91e1f7245c7c08d17990760b86b4d8fc3910a850ffecf73bfa8886f01739a0c4c4322201282d07b6e48ce931cc92af94850";
365+
const std::string CSyncCheckpoint::strMasterPubKey = "04f22b68d811c1550b948f13d67f109a2c2995712e4d8bda60bd1401046b9aa86d68cb627d07fb366b26d507e96343f6e4d027e1b8f6c6ae744b27e4a5d53a9bd1";
366366

367367
std::string CSyncCheckpoint::strMasterPrivKey = "";
368368

‎src/clientversion.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
//
77

88
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
9-
#define CLIENT_VERSION_MAJOR 0
10-
#define CLIENT_VERSION_MINOR 7
11-
#define CLIENT_VERSION_REVISION 5
12-
#define CLIENT_VERSION_BUILD 6
9+
#define CLIENT_VERSION_MAJOR 1
10+
#define CLIENT_VERSION_MINOR 4
11+
#define CLIENT_VERSION_REVISION 0
12+
#define CLIENT_VERSION_BUILD 0
1313

1414
// Converts the parameter X to a string after macro replacement on X has been performed.
1515
// Don't merge these into one macro!

0 commit comments

Comments
 (0)