Skip to content
Permalink
Browse files

Merged in CORE-29 feature/SV-312-remove-abc-cashaddr-format (pull req…

…uest #59)

Feature/SV-312 remove abc cashaddr format (CORE-29)

Approved-by: Richard Mills <r.mills@nchain.com>
Approved-by: Arkadiusz Kolodziejski <a.kolodziejski@nchain.com>
  • Loading branch information...
Matej Trampuš Shaun O'Kane
Matej Trampuš authored and Shaun O'Kane committed Jun 7, 2019
2 parents 0f17a38 + 58705f7 commit ddc61e32ae191a9d2dedca47029632b81ab90c69
@@ -167,8 +167,6 @@ target_compile_definitions(util PUBLIC BOOST_SP_USE_STD_ATOMIC BOOST_AC_USE_STD_
add_library(common
amount.cpp
base58.cpp
cashaddr.cpp
cashaddrenc.cpp
chainparams.cpp
config.cpp
consensus/merkle.cpp
@@ -91,8 +91,6 @@ BITCOIN_CORE_H = \
bloom.h \
blockencodings.h \
blockfileinfostore.h \
cashaddr.h \
cashaddrenc.h \
chain.h \
chainparams.h \
chainparamsbase.h \
@@ -346,8 +344,6 @@ libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_common_a_SOURCES = \
amount.cpp \
base58.cpp \
cashaddr.cpp \
cashaddrenc.cpp \
chainparams.cpp \
config.cpp \
coins.cpp \
@@ -39,8 +39,6 @@ BITCOIN_TESTS =\
test/blockstatus_tests.cpp \
test/bloom_tests.cpp \
test/bswap_tests.cpp \
test/cashaddr_tests.cpp \
test/cashaddrenc_tests.cpp \
test/checkpoints_tests.cpp \
test/coins_tests.cpp \
test/compress_tests.cpp \
@@ -290,12 +290,12 @@ bool CBitcoinSecret::SetString(const std::string &strSecret) {
return SetString(strSecret.c_str());
}

std::string EncodeLegacyAddr(const CTxDestination &dest,
std::string EncodeBase58Addr(const CTxDestination &dest,
const CChainParams &params) {
return boost::apply_visitor(DestinationEncoder(params), dest);
}

CTxDestination DecodeLegacyAddr(const std::string &str,
CTxDestination DecodeBase58Addr(const std::string &str,
const CChainParams &params) {
return DecodeDestination(str, params);
}
@@ -155,7 +155,7 @@ typedef CBitcoinExtKeyBase<CExtPubKey, BIP32_EXTKEY_SIZE,
CChainParams::EXT_PUBLIC_KEY>
CBitcoinExtPubKey;

std::string EncodeLegacyAddr(const CTxDestination &dest, const CChainParams &);
CTxDestination DecodeLegacyAddr(const std::string &str, const CChainParams &);
std::string EncodeBase58Addr(const CTxDestination &dest, const CChainParams &);
CTxDestination DecodeBase58Addr(const std::string &str, const CChainParams &);

#endif // BITCOIN_BASE58_H

This file was deleted.

This file was deleted.

0 comments on commit ddc61e3

Please sign in to comment.
You can’t perform that action at this time.