From 73c177562827d91d7c4c73232fff84770f49b573 Mon Sep 17 00:00:00 2001 From: Amir Abrams Date: Sat, 12 Nov 2016 17:43:35 -0600 Subject: [PATCH 1/3] list_of -> boost::assign::list_of --- src/chainparams.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index e13008e..3743a0d 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -86,11 +86,11 @@ class CMainParams : public CChainParams { vSeeds.push_back(CDNSSeedData("bitcointx.io", "btxseed6.bitcointx.io")); vSeeds.push_back(CDNSSeedData("bitcointx.io", "btxseed7.bitcointx.io")); - base58Prefixes[PUBKEY_ADDRESS] = list_of(35); - base58Prefixes[SCRIPT_ADDRESS] = list_of(85); - base58Prefixes[SECRET_KEY] = list_of(153); - base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x88)(0xB2)(0x1E); - base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x88)(0xAD)(0xE4); + base58Prefixes[PUBKEY_ADDRESS] = boost::assign::list_of(35); + base58Prefixes[SCRIPT_ADDRESS] = boost::assign::list_of(85); + base58Prefixes[SECRET_KEY] = boost::assign::list_of(153); + base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E); + base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4); convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main)); From e2bb24525c3231acad4e988ba603494cd896308e Mon Sep 17 00:00:00 2001 From: Amir Abrams Date: Sat, 12 Nov 2016 17:45:06 -0600 Subject: [PATCH 2/3] Bump Version to 2.1.6 --- src/clientversion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/clientversion.h b/src/clientversion.h index fbac221..b142a26 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -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 2 #define CLIENT_VERSION_MINOR 1 -#define CLIENT_VERSION_REVISION 5 +#define CLIENT_VERSION_REVISION 6 #define CLIENT_VERSION_BUILD 0 // Set to true for release, false for prerelease or test build From d3efaf7a8da6fe3c866bd0affd6471a5b2515121 Mon Sep 17 00:00:00 2001 From: Amir Abrams Date: Sat, 12 Nov 2016 17:55:44 -0600 Subject: [PATCH 3/3] [Params] Add convert_to_container for list_of Add convert_to_container so boost::assign::list_of becomes vector --- src/chainparams.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 3743a0d..0f4e946 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -89,8 +89,8 @@ class CMainParams : public CChainParams { base58Prefixes[PUBKEY_ADDRESS] = boost::assign::list_of(35); base58Prefixes[SCRIPT_ADDRESS] = boost::assign::list_of(85); base58Prefixes[SECRET_KEY] = boost::assign::list_of(153); - base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E); - base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4); + base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E).convert_to_container >(); + base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container >(); convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main));