script: move CScriptID to standard.h and add a ctor for creating them from CScripts

This allows for a reversal of the current behavior.

This:
CScript foo;
CScriptID bar(foo.GetID());

Becomes:
CScript foo;
CScriptID bar(foo);

This way, CScript is no longer dependent on CScriptID or Hash();
This commit is contained in:
Cory Fields
2014-09-24 22:24:46 -04:00
parent e8f6d54f1f
commit 066e2a1403
17 changed files with 37 additions and 34 deletions

View File

@@ -292,7 +292,7 @@ Value createmultisig(const Array& params, bool fHelp)
// Construct using pay-to-script-hash:
CScript inner = _createmultisig_redeemScript(params);
CScriptID innerID = inner.GetID();
CScriptID innerID(inner);
CBitcoinAddress address(innerID);
Object result;