RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

script: implement more segwit policy.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-11-11 19:37:02 -08:00
parent ecd18b9613
commit 286ae9d9c8
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/protocol/constants.js
View File

@ -777,7 +777,8 @@ exports.flags = {
VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM: (1 << 12), VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM: (1 << 12),
VERIFY_MINIMALIF: (1 << 13), VERIFY_MINIMALIF: (1 << 13),
VERIFY_NULLFAIL: (1 << 14), VERIFY_NULLFAIL: (1 << 14),
VERIFY_MAST: (1 << 15), // should be 1 << 13 VERIFY_WITNESS_PUBKEYTYPE: (1 << 15),
VERIFY_MAST: (1 << 16), // should be 1 << 13
VERIFY_SEQUENCE: (1 << 0), VERIFY_SEQUENCE: (1 << 0),
MEDIAN_TIME_PAST: (1 << 1) MEDIAN_TIME_PAST: (1 << 1)
}; };
@ -804,11 +805,14 @@ exports.flags.STANDARD_VERIFY_FLAGS = 0
| exports.flags.VERIFY_NULLDUMMY | exports.flags.VERIFY_NULLDUMMY
| exports.flags.VERIFY_DISCOURAGE_UPGRADABLE_NOPS | exports.flags.VERIFY_DISCOURAGE_UPGRADABLE_NOPS
| exports.flags.VERIFY_CLEANSTACK | exports.flags.VERIFY_CLEANSTACK
| exports.flags.VERIFY_MINIMALIF
| exports.flags.VERIFY_NULLFAIL
| exports.flags.VERIFY_CHECKLOCKTIMEVERIFY | exports.flags.VERIFY_CHECKLOCKTIMEVERIFY
| exports.flags.VERIFY_LOW_S
| exports.flags.VERIFY_CHECKSEQUENCEVERIFY | exports.flags.VERIFY_CHECKSEQUENCEVERIFY
| exports.flags.VERIFY_LOW_S
| exports.flags.VERIFY_WITNESS | exports.flags.VERIFY_WITNESS
| exports.flags.VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM; | exports.flags.VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM
| exports.flags.VERIFY_WITNESS_PUBKEYTYPE;
/** /**
* Standard-not-mandatory flags. * Standard-not-mandatory flags.

31
lib/script/script.js
View File

@ -978,7 +978,7 @@ Script.prototype.execute = function execute(stack, flags, tx, index, version) {
subscript.removeData(sig); subscript.removeData(sig);
Script.validateSignature(sig, flags); Script.validateSignature(sig, flags);
Script.validateKey(key, flags); Script.validateKey(key, flags, version);
if (sig.length > 0) { if (sig.length > 0) {
type = sig[sig.length - 1]; type = sig[sig.length - 1];
@ -1057,7 +1057,7 @@ Script.prototype.execute = function execute(stack, flags, tx, index, version) {
key = stack.top(-ikey); key = stack.top(-ikey);
Script.validateSignature(sig, flags); Script.validateSignature(sig, flags);
Script.validateKey(key, flags); Script.validateKey(key, flags, version);
if (sig.length > 0) { if (sig.length > 0) {
type = sig[sig.length - 1]; type = sig[sig.length - 1];
@ -2713,7 +2713,7 @@ Script.isDummy = function isDummy(data) {
* @throws {ScriptError} * @throws {ScriptError}
*/ */
Script.validateKey = function validateKey(key, flags) { Script.validateKey = function validateKey(key, flags, version) {
if (flags == null) if (flags == null)
flags = constants.flags.STANDARD_VERIFY_FLAGS; flags = constants.flags.STANDARD_VERIFY_FLAGS;
@ -2724,6 +2724,31 @@ Script.validateKey = function validateKey(key, flags) {
throw new ScriptError('PUBKEYTYPE'); throw new ScriptError('PUBKEYTYPE');
} }
if (version === 1) {
if (flags & constants.flags.VERIFY_WITNESS_PUBKEYTYPE) {
if (!Script.isCompressedEncoding(key))
throw new ScriptError('WITNESS_PUBKEYTYPE');
}
}
return true;
};
/**
* Test whether the data element is a compressed key.
* @param {Buffer} key
* @returns {Boolean}
*/
Script.isCompressedEncoding = function isCompressedEncoding(key) {
assert(Buffer.isBuffer(key));
if (key.length !== 33)
return false;
if (key[0] !== 0x02 && key[0] !== 0x03)
return false;
return true; return true;
}; };