Skip to content

Commit

Permalink
v0.12.3.6-2E9BAw31-P:70211 (#39)
Browse files Browse the repository at this point in the history
01Coin v0.12.3.6 - Protocol 70211 stabilization
  • Loading branch information
camenlx authored Sep 23, 2019
1 parent 61e3ca8 commit b9db0d2
Show file tree
Hide file tree
Showing 34 changed files with 1,007 additions and 520 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,5 @@ make
# CLion
.idea
cmake-build-debug
# vscode
.vscode
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![ZeroOne](doc/splash.png)

01coin Community v0.12.3.5
01coin Community v0.12.3.6
==================================

[Bitcointalk ANN thread](https://bitcointalk.org/index.php?topic=3457534.0)
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 12)
define(_CLIENT_VERSION_REVISION, 3)
define(_CLIENT_VERSION_BUILD, 5)
define(_CLIENT_VERSION_BUILD, 6)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2019)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
2 changes: 1 addition & 1 deletion contrib/seeds/makeseeds.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

MAX_SEEDS_PER_ASN=4

MIN_PROTOCOL_VERSION = 70210
MIN_PROTOCOL_VERSION = 70211
MAX_LAST_SEEN_DIFF = 60 * 60 * 24 * 1 # 1 day
MAX_LAST_PAID_DIFF = 60 * 60 * 24 * 30 # 1 month

Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ PROJECT_NAME = "ZeroOne Core"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 0.12.3.3
PROJECT_NUMBER = 0.12.3.6

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
6 changes: 3 additions & 3 deletions doc/README_windows.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ZeroOne Core 0.12.1
ZeroOne Core 0.12.3
=====================

Intro
Expand All @@ -18,6 +18,6 @@ However, it downloads and stores the entire history of ZeroOne transactions;
depending on the speed of your computer and network connection, the synchronization
process can take anywhere from a few hours to a day or more.

See the zeroone wiki at:
https://zeroonecoin.atlassian.net/wiki/
See the zeroone kb at:
http://kb.01coin.io/
for more help and information.
18 changes: 11 additions & 7 deletions doc/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 01coin version 0.12.3.4
# 01coin version 0.12.3.6

Release is now available from:

Expand All @@ -19,19 +19,23 @@ If you are running an older version, shut it down. Wait until it has completely

### Downgrade warning

Downgrade to a version < 0.12.3.4
Downgrade to a version < 0.12.3.6

Because release 0.12.3.4 is a mandatory upgrade release, downgrading to an earlier version is not supported.
Because release 0.12.3.6 is a mandatory upgrade release, downgrading to an earlier version is not supported.


## Notable changes

- Enforces Spork 8 as of block 159551 (approx. Nov. 24)
- All masternode owners and miners should upgrade as soon as possible
- Node sw supports only protocol 70211
- ZOC SLIP44 CoinType 399, HD(m/44'/399'/0'/0/0)
- Sharky-miner-blocks are burnt, block reward not shared w/MN and w/no tx processed will become unmatured/unpsent/burned
- Several cleanups and optimizations to speedup and unfreeze mnsync asset stages
- All users, exchanges, masternode owners and miners should upgrade as soon as possible

### 0.12.3.4 Change log

See detailed [set of changes](https://github.com/zocteam/zeroonecoin/compare/v0.12.3.3...zocteam:v0.12.3.4).
### 0.12.3.6 Change log

See detailed [set of changes](https://github.com/zocteam/zeroonecoin/compare/v0.12.3.5...zocteam:v0.12.3.6).


## Credits
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/test_framework/mininode.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
MAX_INV_SZ = 50000
MAX_BLOCK_SIZE = 1000000

COIN = 100000000 # 1 btc in satoshis
COIN = 100000000 # 1 zoc in zuffs

NODE_NETWORK = (1 << 0)
NODE_GETUTXO = (1 << 1)
Expand Down
385 changes: 302 additions & 83 deletions src/chainparamsseeds.h

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions src/clientversion.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Copyright (c) 2012-2014 The Bitcoin Core developers
// Copyright (c) 2014-2019 The Dash Core developers
// Copyright (c) 2018-2019 The ZeroOne Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -18,9 +20,9 @@ const std::string CLIENT_NAME("ZeroOne Core");
/**
* Client version number
*/
#define CLIENT_VERSION_SUFFIX "w27"
// Date:"190702" = 0x2E8EE
#define BUILD_SUFFIX 2E8EE
#define CLIENT_VERSION_SUFFIX "w32"
// Date:"190914" = 0x2E9C2
#define BUILD_SUFFIX 2E9C2



Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 12
#define CLIENT_VERSION_REVISION 3
#define CLIENT_VERSION_BUILD 5
#define CLIENT_VERSION_BUILD 6

//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
35 changes: 4 additions & 31 deletions src/governance-object.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class CGovernanceObject;
class CGovernanceVote;

static const int MAX_GOVERNANCE_OBJECT_DATA_SIZE = 16 * 1024;
static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70208;
static const int GOVERNANCE_FILTER_PROTO_VERSION = 70208;
static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70211;
static const int GOVERNANCE_FILTER_PROTO_VERSION = 70211;

static const double GOVERNANCE_FILTER_FP_RATE = 0.001;

Expand Down Expand Up @@ -306,40 +306,13 @@ class CGovernanceObject
inline void SerializationOp(Stream& s, Operation ser_action)
{
// SERIALIZE DATA FOR SAVING/LOADING OR NETWORK FUNCTIONS
int nVersion = s.GetVersion();
READWRITE(nHashParent);
READWRITE(nRevision);
READWRITE(nTime);
READWRITE(nCollateralHash);
if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
// converting from/to old format
std::string strDataHex;
if (ser_action.ForRead()) {
READWRITE(LIMITED_STRING(strDataHex, MAX_GOVERNANCE_OBJECT_DATA_SIZE));
vchData = ParseHex(strDataHex);
} else {
strDataHex = HexStr(vchData);
READWRITE(LIMITED_STRING(strDataHex, MAX_GOVERNANCE_OBJECT_DATA_SIZE));
}
} else {
// using new format directly
READWRITE(vchData);
}
READWRITE(vchData);
READWRITE(nObjectType);
if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
// converting from/to old format
CTxIn txin;
if (ser_action.ForRead()) {
READWRITE(txin);
masternodeOutpoint = txin.prevout;
} else {
txin = CTxIn(masternodeOutpoint);
READWRITE(txin);
}
} else {
// using new format directly
READWRITE(masternodeOutpoint);
}
READWRITE(masternodeOutpoint);
if (!(s.GetType() & SER_GETHASH)) {
READWRITE(vchSig);
}
Expand Down
15 changes: 1 addition & 14 deletions src/governance-vote.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,20 +120,7 @@ class CGovernanceVote
template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action) {
int nVersion = s.GetVersion();
if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
// converting from/to old format
CTxIn txin{};
if (ser_action.ForRead()) {
READWRITE(txin);
masternodeOutpoint = txin.prevout;
} else {
txin = CTxIn(masternodeOutpoint);
READWRITE(txin);
}
} else {
// using new format directly
READWRITE(masternodeOutpoint);
}
READWRITE(masternodeOutpoint);
READWRITE(nParentHash);
READWRITE(nVoteOutcome);
READWRITE(nVoteSignal);
Expand Down
12 changes: 4 additions & 8 deletions src/governance.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2014-2017 The Dash Core developers
// Copyright (c) 2017-2018 The ZeroOne Core developers
// Copyright (c) 2018-2019 The ZeroOne Core developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -95,8 +95,6 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm

if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
LogPrint("gobject", "MNGOVERNANCESYNC -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
strprintf("Version must be %d or greater", MIN_GOVERNANCE_PEER_PROTO_VERSION)));
return;
}

Expand Down Expand Up @@ -140,8 +138,6 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm

if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
LogPrint("gobject", "MNGOVERNANCEOBJECT -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
strprintf("Version must be %d or greater", MIN_GOVERNANCE_PEER_PROTO_VERSION)));
return;
}

Expand Down Expand Up @@ -231,8 +227,7 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm

if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
LogPrint("gobject", "MNGOVERNANCEOBJECTVOTE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
strprintf("Version must be %d or greater", MIN_GOVERNANCE_PEER_PROTO_VERSION)));
return;
}

// Ignore such messages until masternode list is synced
Expand Down Expand Up @@ -1024,7 +1019,8 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
CNetMsgMaker msgMaker(pfrom->GetSendVersion());

if(pfrom->nVersion < GOVERNANCE_FILTER_PROTO_VERSION) {
connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNGOVERNANCESYNC, nHash));
// dont waste time with old nodes
//connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNGOVERNANCESYNC, nHash));
return;
}

Expand Down
4 changes: 1 addition & 3 deletions src/instantx.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2014-2017 The Dash Core developers
// Copyright (c) 2017-2018 The ZeroOne Core developers
// Copyright (c) 2018-2019 The ZeroOne Core developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -61,8 +61,6 @@ void CInstantSend::ProcessMessage(CNode* pfrom, const std::string& strCommand, C
{
if(pfrom->nVersion < MIN_INSTANTSEND_PROTO_VERSION) {
LogPrint("instantsend", "TXLOCKVOTE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
strprintf("Version must be %d or greater", MIN_INSTANTSEND_PROTO_VERSION)));
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/instantx.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static const int MAX_INSTANTSEND_DEPTH = 60;
/// Default number of "pseudo-confirmations" for an InstantSend tx
static const int DEFAULT_INSTANTSEND_DEPTH = 5;

static const int MIN_INSTANTSEND_PROTO_VERSION = 70210;
static const int MIN_INSTANTSEND_PROTO_VERSION = 70211;

/// For how long we are going to accept votes/locks
/// after we saw the first one for a specific transaction
Expand Down
Loading

0 comments on commit b9db0d2

Please sign in to comment.