sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: consolidate P2PK{H} types to P2PK_OR_P2PKH

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2023-09-25 20:49:15 +05:30
parent f011c31b1a
commit 93ddd3f7e8
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addressindex.cpp
View File

@ -29,10 +29,10 @@ bool AddressBytesFromScript(const CScript& script, AddressType& address_type, ui
address_type = AddressType::P2SH; address_type = AddressType::P2SH;
address_bytes = uint160(TrimScriptP2SH(script)); address_bytes = uint160(TrimScriptP2SH(script));
} else if (script.IsPayToPublicKeyHash()) { } else if (script.IsPayToPublicKeyHash()) {
address_type = AddressType::P2PKH; address_type = AddressType::P2PK_OR_P2PKH;
address_bytes = uint160(TrimScriptP2PKH(script)); address_bytes = uint160(TrimScriptP2PKH(script));
} else if (script.IsPayToPublicKey()) { } else if (script.IsPayToPublicKey()) {
address_type = AddressType::P2PK; address_type = AddressType::P2PK_OR_P2PKH;
address_bytes = Hash160(TrimScriptP2PK(script)); address_bytes = Hash160(TrimScriptP2PK(script));
} else { } else {
address_type = AddressType::UNKNOWN; address_type = AddressType::UNKNOWN;

3
src/addressindex.h
View File

@ -19,8 +19,7 @@
class CScript; class CScript;
enum class AddressType : uint8_t { enum class AddressType : uint8_t {
P2PK = 1, P2PK_OR_P2PKH = 1,
P2PKH = 1,
P2SH = 2, P2SH = 2,
UNKNOWN = 0 UNKNOWN = 0

2
src/core_write.cpp
View File

@ -216,7 +216,7 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
auto spentInfo = it->second; auto spentInfo = it->second;
in.pushKV("value", ValueFromAmount(spentInfo.m_amount)); in.pushKV("value", ValueFromAmount(spentInfo.m_amount));
in.pushKV("valueSat", spentInfo.m_amount); in.pushKV("valueSat", spentInfo.m_amount);
if (spentInfo.m_address_type == AddressType::P2PK) { if (spentInfo.m_address_type == AddressType::P2PK_OR_P2PKH) {
in.pushKV("address", EncodeDestination(PKHash(spentInfo.m_address_bytes))); in.pushKV("address", EncodeDestination(PKHash(spentInfo.m_address_bytes)));
} else if (spentInfo.m_address_type == AddressType::P2SH) { } else if (spentInfo.m_address_type == AddressType::P2SH) {
in.pushKV("address", EncodeDestination(ScriptHash(spentInfo.m_address_bytes))); in.pushKV("address", EncodeDestination(ScriptHash(spentInfo.m_address_bytes)));

4
src/rpc/misc.cpp
View File

@ -598,7 +598,7 @@ static bool getAddressFromIndex(const AddressType& type, const uint160 &hash, st
{ {
if (type == AddressType::P2SH) { if (type == AddressType::P2SH) {
address = EncodeDestination(ScriptHash(hash)); address = EncodeDestination(ScriptHash(hash));
} else if (type == AddressType::P2PK) { } else if (type == AddressType::P2PK_OR_P2PKH) {
address = EncodeDestination(PKHash(hash)); address = EncodeDestination(PKHash(hash));
} else { } else {
return false; return false;
@ -615,7 +615,7 @@ static bool getIndexKey(const std::string& str, uint160& hashBytes, AddressType&
} }
const PKHash *pkhash = std::get_if<PKHash>(&dest); const PKHash *pkhash = std::get_if<PKHash>(&dest);
const ScriptHash *scriptID = std::get_if<ScriptHash>(&dest); const ScriptHash *scriptID = std::get_if<ScriptHash>(&dest);
type = pkhash ? AddressType::P2PK : AddressType::P2SH; type = pkhash ? AddressType::P2PK_OR_P2PKH : AddressType::P2SH;
hashBytes = pkhash ? uint160(*pkhash) : uint160(*scriptID); hashBytes = pkhash ? uint160(*pkhash) : uint160(*scriptID);
return true; return true;
} }