From 26e688ae0637ee1b41cabf6866d5df412ed6cb3e Mon Sep 17 00:00:00 2001
From: Esteban Ordano <eordano@gmail.com>
Date: Fri, 9 Jan 2015 16:09:36 -0300
Subject: [PATCH] Add .toScriptHashOut() to scripts

- Also sort gulpfile dependencies
---
 gulpfile.js                     | 13 +++++++------
 lib/script/script.js            |  7 +++++++
 test/transaction/transaction.js |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 0618136b5..ed80a78d9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -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'];
diff --git a/lib/script/script.js b/lib/script/script.js
index 77859188d..9eab6462f 100644
--- a/lib/script/script.js
+++ b/lib/script/script.js
@@ -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
diff --git a/test/transaction/transaction.js b/test/transaction/transaction.js
index 00b4f57ea..e5f2f4dd6 100644
--- a/test/transaction/transaction.js
+++ b/test/transaction/transaction.js
@@ -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());