Add .toScriptHashOut() to scripts

- Also sort gulpfile dependencies
This commit is contained in:
Esteban Ordano 2015-01-09 16:09:36 -03:00
parent d99d1c9cc2
commit 26e688ae06
3 changed files with 16 additions and 8 deletions

View File

@ -32,19 +32,20 @@
'use strict';
var gulp = require('gulp');
var bump = require('gulp-bump');
var coveralls = require('gulp-coveralls');
var git = require('gulp-git');
var gutil = require('gulp-util');
var jsdoc2md = require('jsdoc-to-markdown');
var jshint = require('gulp-jshint');
var mfs = require('more-fs');
var mocha = require('gulp-mocha');
var rename = require('gulp-rename');
var runSequence = require('run-sequence');
var shell = require('gulp-shell');
var through = require('through2');
var gutil = require('gulp-util');
var jsdoc2md = require('jsdoc-to-markdown');
var mfs = require('more-fs');
var uglify = require('gulp-uglify');
var rename = require('gulp-rename');
var bump = require('gulp-bump');
var git = require('gulp-git');
var files = ['lib/**/*.js'];

View File

@ -715,6 +715,13 @@ Script.prototype.toAddress = function(network) {
throw new Error('The script type needs to be PayToPublicKeyHash or PayToScriptHash');
};
/**
* @return {Script}
*/
Script.prototype.toScriptHashOut = function() {
return Script.buildScriptHashOut(this);
};
/**
* Analagous to bitcoind's FindAndDelete. Find and delete equivalent chunks,
* typically used with push data chunks. Note that this will find and delete

View File

@ -277,9 +277,9 @@ describe('Transaction', function() {
var public2 = new PrivateKey(private2).publicKey;
var transaction = new Transaction()
.from({
txId: private1,
txId: '0000', // Not relevant
outputIndex: 0,
script: Script.buildScriptHashOut(Script.buildMultisigOut([public1, public2], 2)),
script: Script.buildMultisigOut([public1, public2], 2).toScriptHashOut(),
satoshis: 10000
}, [public1, public2], 2);
var deserialized = new Transaction(transaction.toObject());