Make multisig replay protected txs redeemable
This commit is contained in:
parent
9802c3e528
commit
476b5245a8
|
@ -31,6 +31,7 @@ const char* GetTxnOutputType(txnouttype t)
|
||||||
case TX_PUBKEYHASH_REPLAY: return "pubkeyhashreplay";
|
case TX_PUBKEYHASH_REPLAY: return "pubkeyhashreplay";
|
||||||
case TX_SCRIPTHASH: return "scripthash";
|
case TX_SCRIPTHASH: return "scripthash";
|
||||||
case TX_MULTISIG: return "multisig";
|
case TX_MULTISIG: return "multisig";
|
||||||
|
case TX_MULTISIG_REPLAY: return "multisigreplay";
|
||||||
case TX_NULL_DATA: return "nulldata";
|
case TX_NULL_DATA: return "nulldata";
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -55,6 +56,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
|
||||||
|
|
||||||
// Sender provides N pubkeys, receivers provides M signatures
|
// Sender provides N pubkeys, receivers provides M signatures
|
||||||
mTemplates.insert(make_pair(TX_MULTISIG, CScript() << OP_SMALLINTEGER << OP_PUBKEYS << OP_SMALLINTEGER << OP_CHECKMULTISIG));
|
mTemplates.insert(make_pair(TX_MULTISIG, CScript() << OP_SMALLINTEGER << OP_PUBKEYS << OP_SMALLINTEGER << OP_CHECKMULTISIG));
|
||||||
|
mTemplates.insert(make_pair(TX_MULTISIG_REPLAY, CScript() << OP_SMALLINTEGER << OP_PUBKEYS << OP_SMALLINTEGER << OP_CHECKMULTISIG << OP_SMALLDATA << OP_SMALLDATA << OP_NOP5));
|
||||||
|
|
||||||
// Empty, provably prunable, data-carrying output
|
// Empty, provably prunable, data-carrying output
|
||||||
if (GetBoolArg("-datacarrier", true))
|
if (GetBoolArg("-datacarrier", true))
|
||||||
|
|
|
@ -67,6 +67,7 @@ enum txnouttype
|
||||||
TX_PUBKEYHASH_REPLAY,
|
TX_PUBKEYHASH_REPLAY,
|
||||||
TX_SCRIPTHASH,
|
TX_SCRIPTHASH,
|
||||||
TX_MULTISIG,
|
TX_MULTISIG,
|
||||||
|
TX_MULTISIG_REPLAY,
|
||||||
TX_NULL_DATA,
|
TX_NULL_DATA,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue