Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multisignature and OP_EVAL support #669

Merged
merged 12 commits into from
Dec 20, 2011
Merged

Multisignature and OP_EVAL support #669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7e55c1a
Collapse no-op ExtractAddress/ExtractAddressInner
gavinandresen Sep 29, 2011
1466b8b
Rework unit tests so test_bitcoin.cpp does not #include them all
gavinandresen Oct 11, 2011
bf79873
Support 3 new multisignature IsStandard transactions
gavinandresen Sep 28, 2011
cc40ba2
Global fixture to send output to console instead of debug.log
gavinandresen Oct 3, 2011
e679ec9
OP_EVAL implementation
gavinandresen Oct 3, 2011
d7062ef
Put OP_EVAL string in coinbase of generated blocks
gavinandresen Oct 13, 2011
fae3e2a
Disable addmultisigaddress if not testnet
gavinandresen Oct 19, 2011
a0871af
Interpret OP_EVAL as OP_NOP until Feb 1, 2012
gavinandresen Oct 21, 2011
2a45a49
Use block times for 'hard' OP_EVAL switchover, and refactored EvalScript
gavinandresen Nov 8, 2011
be237c1
Fix logic for IsChange() for send-to-self transactions.
gavinandresen Dec 5, 2011
9e47058
Update bitcoin address numbers for latest luke-jr/sipa scheme
gavinandresen Dec 16, 2011
77f21f1
include util.h to get SecureString definition.
gavinandresen Dec 20, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update bitcoin address numbers for latest luke-jr/sipa scheme
  • Loading branch information
@gavinandresen
gavinandresen committed Dec 19, 2011
commit 9e470585b35a84fcb7f6aa41ac0216c117e2a5e1
33 changes: 23 additions & 10 deletions src/base58.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,26 @@ class CBase58Data
};

// 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
// 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
{
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)
Expand All @@ -270,7 +282,7 @@ class CBitcoinAddress : public CBase58Data

bool SetScriptHash160(const uint160& hash160)
{
SetData(fTestNet ? 111^2 : 2, &hash160, 20);
SetData(fTestNet ? SCRIPT_ADDRESS_TEST : SCRIPT_ADDRESS, &hash160, 20);
return true;
}

Expand All @@ -280,20 +292,21 @@ class CBitcoinAddress : public CBase58Data
bool fExpectTestNet = false;
switch(nVersion)
{
case 0:
case PUBKEY_ADDRESS:
nExpectedSize = 20; // Hash of public key
fExpectTestNet = false;
break;
case 2:
case SCRIPT_ADDRESS:
nExpectedSize = 20; // OP_EVAL, hash of CScript
fExpectTestNet = false;
break;

case 111:
case PUBKEY_ADDRESS_TEST_LEGACY:
case PUBKEY_ADDRESS_TEST:
nExpectedSize = 20;
fExpectTestNet = true;
break;
case 111^2:
case SCRIPT_ADDRESS_TEST:
nExpectedSize = 20;
fExpectTestNet = true;
break;
Expand All @@ -308,8 +321,8 @@ class CBitcoinAddress : public CBase58Data
if (!IsValid())
return false;
if (fTestNet)
return nVersion == 111^2;
return nVersion == 2;
return nVersion == SCRIPT_ADDRESS_TEST;
return nVersion == SCRIPT_ADDRESS;
}

CBitcoinAddress()
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes
{
if (IsCoinBase())
return true; // Coinbase transactions have no inputs to fetch.

for (int i = 0; i < vin.size(); i++)
{
COutPoint prevout = vin[i].prevout;
Expand Down
2 changes: 1 addition & 1 deletion src/script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ bool EvalScriptInner(vector<vector<unsigned char> >& stack, const CScript& scrip
valtype& vchScript = stacktop(-1);
CScript subscript(vchScript.begin(), vchScript.end());
popstack(stack);

// 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
// and signed by OP_CHECKSIG, but OP_EVAl'ed code is in the scriptSig, not the scriptPubKey.
Expand Down