kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-02-03 02:34:14 +00:00
Code Issues Projects Releases Wiki Activity

Update bitcoin address numbers for latest luke-jr/sipa scheme

Browse Source
This commit is contained in:
Gavin Andresen 2011-12-16 18:03:48 -05:00
parent be237c119e
commit 9e470585b3
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/base58.h
View File

@ -253,14 +253,26 @@ public:
}; };
// base58-encoded bitcoin addresses // base58-encoded bitcoin addresses
// Addresses have version 0 or 111 (testnet) // Public-key-hash-addresses have version 0 (or 192 testnet)
// The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key // The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key
// Script-hash-addresses (OP_EVAL) have version 5 (or 196 testnet)
// The data vector contains RIPEMD160(SHA256(cscript)), where cscript is the serialized redemption script
class CBitcoinAddress : public CBase58Data class CBitcoinAddress : public CBase58Data
{ {
public: public:
void SetHash160(const uint160& hash160) enum
{ {
SetData(fTestNet ? 111 : 0, &hash160, 20); PUBKEY_ADDRESS = 0,
SCRIPT_ADDRESS = 5,
PUBKEY_ADDRESS_TEST = 192,
PUBKEY_ADDRESS_TEST_LEGACY = 111, // Deprecated: old testnet address
SCRIPT_ADDRESS_TEST = 196,
};
bool SetHash160(const uint160& hash160)
{
SetData(fTestNet ? PUBKEY_ADDRESS_TEST : PUBKEY_ADDRESS, &hash160, 20);
return true;
} }
void SetPubKey(const std::vector<unsigned char>& vchPubKey) void SetPubKey(const std::vector<unsigned char>& vchPubKey)
@ -270,7 +282,7 @@ public:
bool SetScriptHash160(const uint160& hash160) bool SetScriptHash160(const uint160& hash160)
{ {
SetData(fTestNet ? 111^2 : 2, &hash160, 20); SetData(fTestNet ? SCRIPT_ADDRESS_TEST : SCRIPT_ADDRESS, &hash160, 20);
return true; return true;
} }
@ -280,20 +292,21 @@ public:
bool fExpectTestNet = false; bool fExpectTestNet = false;
switch(nVersion) switch(nVersion)
{ {
case 0: case PUBKEY_ADDRESS:
nExpectedSize = 20; // Hash of public key nExpectedSize = 20; // Hash of public key
fExpectTestNet = false; fExpectTestNet = false;
break; break;
case 2: case SCRIPT_ADDRESS:
nExpectedSize = 20; // OP_EVAL, hash of CScript nExpectedSize = 20; // OP_EVAL, hash of CScript
fExpectTestNet = false; fExpectTestNet = false;
break; break;
case 111: case PUBKEY_ADDRESS_TEST_LEGACY:
case PUBKEY_ADDRESS_TEST:
nExpectedSize = 20; nExpectedSize = 20;
fExpectTestNet = true; fExpectTestNet = true;
break; break;
case 111^2: case SCRIPT_ADDRESS_TEST:
nExpectedSize = 20; nExpectedSize = 20;
fExpectTestNet = true; fExpectTestNet = true;
break; break;
@ -308,8 +321,8 @@ public:
if (!IsValid()) if (!IsValid())
return false; return false;
if (fTestNet) if (fTestNet)
return nVersion == 111^2; return nVersion == SCRIPT_ADDRESS_TEST;
return nVersion == 2; return nVersion == SCRIPT_ADDRESS;
} }
CBitcoinAddress() CBitcoinAddress()

2
src/main.cpp
View File

@ -902,7 +902,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes
{ {
if (IsCoinBase()) if (IsCoinBase())
return true; // Coinbase transactions have no inputs to fetch. return true; // Coinbase transactions have no inputs to fetch.
for (int i = 0; i < vin.size(); i++) for (int i = 0; i < vin.size(); i++)
{ {
COutPoint prevout = vin[i].prevout; COutPoint prevout = vin[i].prevout;

2
src/script.cpp
View File

@ -1025,7 +1025,7 @@ bool EvalScriptInner(vector<vector<unsigned char> >& stack, const CScript& scrip
valtype& vchScript = stacktop(-1); valtype& vchScript = stacktop(-1);
CScript subscript(vchScript.begin(), vchScript.end()); CScript subscript(vchScript.begin(), vchScript.end());
popstack(stack); popstack(stack);
// Codeseparators not allowed; they don't make sense 'inside' an OP_EVAL, because // Codeseparators not allowed; they don't make sense 'inside' an OP_EVAL, because
// their purpose is to change which parts of the scriptPubKey script is copied // their purpose is to change which parts of the scriptPubKey script is copied
// and signed by OP_CHECKSIG, but OP_EVAl'ed code is in the scriptSig, not the scriptPubKey. // and signed by OP_CHECKSIG, but OP_EVAl'ed code is in the scriptSig, not the scriptPubKey.