Commit cc67f0d0 authored by squbs's avatar squbs

ensure BIP32/BIP44 compatability

parent 272eba5e
......@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 14)
define(_CLIENT_VERSION_REVISION, 7)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_BUILD, 2)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2017)
define(_COPYRIGHT_HOLDERS,[%s developers])
......
......@@ -168,8 +168,8 @@ NEW **mainnet** merkle root: 15343d9e3cfff44854ec63cc588d5a1ed6ea971085c2be97acb
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,63);
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5);
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,204);
base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0xA2)(0xAE)(0xC9)(0xA6).convert_to_container<std::vector<unsigned char> >();
base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x46)(0x00)(0x2A)(0x10).convert_to_container<std::vector<unsigned char> >();
base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E).convert_to_container<std::vector<unsigned char> >();
base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container<std::vector<unsigned char> >();
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
......
......@@ -18,8 +18,8 @@
//! These need to be macros, as clientversion.cpp's and straks*-res.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 14
#define CLIENT_VERSION_REVISION 5
#define CLIENT_VERSION_BUILD 0
#define CLIENT_VERSION_REVISION 7
#define CLIENT_VERSION_BUILD 1
//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
......@@ -28,7 +28,7 @@
* Copyright year (2009-this)
* Todo: update this when changing our copyright comments in the source
*/
#define COPYRIGHT_YEAR 2017
#define COPYRIGHT_YEAR 2018
#endif //HAVE_CONFIG_H
......
......@@ -9,7 +9,7 @@
/* #undef AC_APPLE_UNIVERSAL_BUILD */
/* Version Build */
#define CLIENT_VERSION_BUILD 1
#define CLIENT_VERSION_BUILD 2
/* Version is release */
#define CLIENT_VERSION_IS_RELEASE true
......
......@@ -2278,7 +2278,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
if(blockRewardTargetCount != 2) {
LogPrintf("MPA: block coinbase transaction invalid non-zero vouts: %d\n", blockRewardTargetCount);
missingMNPayment = true;
//TODO: reimplement synchronization **wait** for ALL nodes
//missingMNPayment = true;
}
}
}
......
......@@ -9,7 +9,7 @@
* network protocol versioning
*/
static const int PROTOCOL_VERSION = 70101;
static const int PROTOCOL_VERSION = 70102;
//! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;
......@@ -18,7 +18,7 @@ static const int INIT_PROTO_VERSION = 209;
static const int GETHEADERS_VERSION = 31800;
//! disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION = 70100;
static const int MIN_PEER_PROTO_VERSION = 70101;
/**TODO-- */
//! minimum peer version accepted by DarksendPool
static const int MIN_POOL_PEER_PROTO_VERSION = 70110;
......@@ -33,7 +33,7 @@ static const int MIN_MNW_PEER_PROTO_VERSION = 70101;
// V1 - Last protocol version before update
// V2 - Newest protocol version
static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70100;
static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70101;
static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70102;
//TODO-- ends
//! nTime field added to CAddress, starting with this version;
......
......@@ -97,7 +97,7 @@ enum WalletFeature
FEATURE_COMPRPUBKEY = 60000, // compressed public keys
FEATURE_HD = 130000, // Hierarchical key derivation after BIP32 (HD Wallet)
FEATURE_LATEST = 61000// HD is optional, use FEATURE_COMPRPUBKEY as latest version
FEATURE_LATEST = 61001// HD is optional, use FEATURE_COMPRPUBKEY as latest version
};
enum AvailableCoinsType
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment