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

fix parse error. misc.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-07-01 14:48:23 -07:00
parent ab8fff71e2
commit 87a94639d4
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/bcoin/chain.js
View File

@ -155,6 +155,7 @@ Chain.prototype._init = function _init() {
this.on('exists', function(block, height) {
bcoin.debug('Already have block %s (%d).', block.rhash, height);
});
this.on('orphan', function(block, height) {
bcoin.debug('Handled orphan %s (%d).', block.rhash, height);

3
lib/bcoin/miner.js
View File

@ -460,7 +460,8 @@ MinerBlock.prototype.updateCommitment = function updateCommitment() {
hash = this.block.getCommitmentHash();
// Update commitment.
output.script = bcoin.script.fromCommitment(hash, flags);
output.script.clear();
output.script.fromCommitment(hash, flags);
};
/**

23
lib/bcoin/script.js
View File

@ -2555,6 +2555,7 @@ Script.prototype.fromMultisig = function fromMultisig(m, n, keys) {
this.push(n + 0x50);
this.push(opcodes.OP_CHECKMULTISIG);
this.compile();
return this;
@ -2692,14 +2693,7 @@ Script.fromAddress = function fromAddress(address) {
*/
Script.prototype.fromCommitment = function fromCommitment(hash, flags) {
var p;
if (typeof flags === 'string')
flags = new Buffer(flags, 'utf8');
assert(!flags || Buffer.isBuffer(flags));
p = new BufferWriter();
var p = new BufferWriter();
p.writeU32BE(0xaa21a9ed);
p.writeHash(hash);
@ -4656,7 +4650,7 @@ Opcode.prototype.toRaw = function toRaw(writer) {
};
/**
* Instantiate an opcode from a number.
* Instantiate an opcode from a number opcode.
* @param {Number} op
* @returns {Opcode}
*/
@ -4721,6 +4715,17 @@ Opcode.fromNumber = function fromNumber(num) {
return Opcode.fromData(Script.array(num));
};
/**
* Instantiate an opcode from a small number.
* @param {Number} num
* @returns {Opcode}
*/
Opcode.fromSmall = function fromSmall(num) {
assert(utils.isNumber(num) && num >= 0 && num <= 16);
return new Opcode(num === 0 ? 0 : num + 0x50);
};
/**
* Instantiate a pushdata opcode from a string.
* @param {String} data