From 67fc186293d78dbb2c56a17dd63c016ecb7a355f Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Wed, 20 Jul 2016 10:36:16 -0400
Subject: [PATCH] test: address txs trim results

---
 lib/transactions.js |  13 ++--
 test/addresses.js   | 169 +++++++++++++++++++++++++++++++++++++-------
 2 files changed, 152 insertions(+), 30 deletions(-)

diff --git a/lib/transactions.js b/lib/transactions.js
index a3c51e5..ec98f9e 100644
--- a/lib/transactions.js
+++ b/lib/transactions.js
@@ -111,9 +111,11 @@ TxController.prototype.transformInput = function(options, input, index) {
 
   if (!options.noScriptSig) {
     transformed.scriptSig = {
-      asm: options.noAsm ? undefined : input.scriptAsm,
       hex: input.script
     };
+    if (!options.noAsm) {
+      transformed.scriptSig.asm = input.scriptAsm;
+    }
   }
 
   transformed.addr = input.address;
@@ -132,13 +134,14 @@ TxController.prototype.transformOutput = function(options, output, index) {
     value: (output.satoshis / 1e8).toFixed(8),
     n: index,
     scriptPubKey: {
-      hex: output.script,
-      asm: options.noAsm ? undefined : output.scriptAsm
-      //reqSigs: null, // TODO
+      hex: output.script
     }
-    //spentTs: undefined // TODO
   };
 
+  if (!options.noAsm) {
+    transformed.scriptPubKey.asm = output.scriptAsm;
+  }
+
   if (!options.noSpent) {
     transformed.spentTxId = output.spentTxId || null;
     transformed.spentIndex = _.isUndefined(output.spentIndex) ? null : output.spentIndex;
diff --git a/test/addresses.js b/test/addresses.js
index 81bd581..167d1ea 100644
--- a/test/addresses.js
+++ b/test/addresses.js
@@ -108,7 +108,7 @@ var tx = {
       outputIndex: 1,
       sequence: 4294967295,
       script: '473044022054233934268b30be779fad874ef42e8db928ba27a1b612d5f111b3ee95eb271c022024272bbaf2dcc4050bd3b9dfa3c93884f6ba6ad7d257598b8245abb65b5ab1e40141040682fdb281a8533e21e13dfd1fcfa424912a85b6cdc4136b5842c85de05ac1f0e4a013f20702adeb53329de13b2ef388e5ed6244676f4f1ee4ee685ab607964d',
-      scriptAsm: '71 0x3044022054233934268b30be779fad874ef42e8db928ba27a1b612d5f111b3ee95eb271c022024272bbaf2dcc4050bd3b9dfa3c93884f6ba6ad7d257598b8245abb65b5ab1e401 65 0x040682fdb281a8533e21e13dfd1fcfa424912a85b6cdc4136b5842c85de05ac1f0e4a013f20702adeb53329de13b2ef388e5ed6244676f4f1ee4ee685ab607964d',
+      scriptAsm: '3044022054233934268b30be779fad874ef42e8db928ba27a1b612d5f111b3ee95eb271c022024272bbaf2dcc4050bd3b9dfa3c93884f6ba6ad7d257598b8245abb65b5ab1e401 040682fdb281a8533e21e13dfd1fcfa424912a85b6cdc4136b5842c85de05ac1f0e4a013f20702adeb53329de13b2ef388e5ed6244676f4f1ee4ee685ab607964d',
       satoshis: 53540000,
     },
     {
@@ -117,7 +117,7 @@ var tx = {
       outputIndex: 2,
       sequence: 4294967295,
       script: '473044022044938ac3f8fcb8da29011df6397ed28cc7e894cdc35d596d4f3623bd8c7e465f022014829c6e0bd7ee97a1bcfef6b85c5fd232653f289394fc6ce6ebb41c73403f1b014104d9ccf88efc6e5be3151fae5e848efd94c91d75e7bf621f9f724a8caff51415338525d3239fae6b93826edf759dd562f77693e55dfa852ffd96a92d683db590f2',
-      scriptAsm: '71 0x3044022044938ac3f8fcb8da29011df6397ed28cc7e894cdc35d596d4f3623bd8c7e465f022014829c6e0bd7ee97a1bcfef6b85c5fd232653f289394fc6ce6ebb41c73403f1b01 65 0x04d9ccf88efc6e5be3151fae5e848efd94c91d75e7bf621f9f724a8caff51415338525d3239fae6b93826edf759dd562f77693e55dfa852ffd96a92d683db590f2',
+      scriptAsm: '3044022044938ac3f8fcb8da29011df6397ed28cc7e894cdc35d596d4f3623bd8c7e465f022014829c6e0bd7ee97a1bcfef6b85c5fd232653f289394fc6ce6ebb41c73403f1b01 04d9ccf88efc6e5be3151fae5e848efd94c91d75e7bf621f9f724a8caff51415338525d3239fae6b93826edf759dd562f77693e55dfa852ffd96a92d683db590f2',
       satoshis: 299829,
     }
   ],
@@ -125,17 +125,20 @@ var tx = {
     {
       satoshis: 220000,
       script: '76a914b9bbd76588d9e4e09f0369a9aa0b2749a11c4e8d88ac',
+      scriptAsm: 'OP_DUP OP_HASH160 b9bbd76588d9e4e09f0369a9aa0b2749a11c4e8d OP_EQUALVERIFY OP_CHECKSIG',
       address: 'mxT2KzTUQvsaYYothDtjcdvyAdaHA9ofMp'
     },
     {
       satoshis: 53320000,
       address: 'mzkD4nmQ8ixqxySdBgsXTpgvAMK5iRZpNK',
-      script: '76a914d2ec20bb8e5f25a52f730384b803d95683250e0b88ac'
+      script: '76a914d2ec20bb8e5f25a52f730384b803d95683250e0b88ac',
+      scriptAsm: 'OP_DUP OP_HASH160 d2ec20bb8e5f25a52f730384b803d95683250e0b OP_EQUALVERIFY OP_CHECKSIG'
     },
     {
       address: 'moZY18rGNmh4YCPeugtGW46AkkWMQttBUD',
       satoshis: 289829,
-      script: '76a914583df9fa56ad961051e00ca93e68dfaf1eab9ec588ac'
+      script: '76a914583df9fa56ad961051e00ca93e68dfaf1eab9ec588ac',
+      scriptAsm: 'OP_DUP OP_HASH160 583df9fa56ad961051e00ca93e68dfaf1eab9ec5 OP_EQUALVERIFY OP_CHECKSIG'
     }
   ],
   locktime: 0
@@ -523,41 +526,20 @@ describe('Addresses', function() {
       var todos = {
         'items': [
           {
-            'vin': [
-              {
-                'scriptSig': {
-                  'asm': '3044022054233934268b30be779fad874ef42e8db928ba27a1b612d5f111b3ee95eb271c022024272bbaf2dcc4050bd3b9dfa3c93884f6ba6ad7d257598b8245abb65b5ab1e401 040682fdb281a8533e21e13dfd1fcfa424912a85b6cdc4136b5842c85de05ac1f0e4a013f20702adeb53329de13b2ef388e5ed6244676f4f1ee4ee685ab607964d'
-                }
-              },
-              {
-                'scriptSig': {
-                  'asm': '3044022044938ac3f8fcb8da29011df6397ed28cc7e894cdc35d596d4f3623bd8c7e465f022014829c6e0bd7ee97a1bcfef6b85c5fd232653f289394fc6ce6ebb41c73403f1b01 04d9ccf88efc6e5be3151fae5e848efd94c91d75e7bf621f9f724a8caff51415338525d3239fae6b93826edf759dd562f77693e55dfa852ffd96a92d683db590f2'
-                }
-              }
-            ],
             'vout': [
               {
                 'scriptPubKey': {
-                  'asm': 'OP_DUP OP_HASH160 b9bbd76588d9e4e09f0369a9aa0b2749a11c4e8d OP_EQUALVERIFY OP_CHECKSIG',
                   'reqSigs': 1,
-                  'type': 'pubkeyhash',
-                  'addresses': []
                 }
               },
               {
                 'scriptPubKey': {
-                  'asm': 'OP_DUP OP_HASH160 d2ec20bb8e5f25a52f730384b803d95683250e0b OP_EQUALVERIFY OP_CHECKSIG',
                   'reqSigs': 1,
-                  'type': 'pubkeyhash',
-                  'addresses': []
                 }
               },
               {
                 'scriptPubKey': {
-                  'asm': 'OP_DUP OP_HASH160 583df9fa56ad961051e00ca93e68dfaf1eab9ec5 OP_EQUALVERIFY OP_CHECKSIG',
                   'reqSigs': 1,
-                  'type': 'pubkeyhash',
-                  'addresses': []
                 }
               }
             ],
@@ -592,6 +574,143 @@ describe('Addresses', function() {
         }
       };
 
+      addresses.multitxs(req, res);
+    });
+    it('should have trimmed data', function(done) {
+      var insight = {
+        'totalItems': 1,
+        'from': 0,
+        'to': 1,
+        'items': [
+          {
+            'txid': '63b68becb0e514b32317f4b29a5cf0627d4087e54ac17f686fcb1d9a27680f73',
+            'version': 1,
+            'locktime': 0,
+            'vin': [
+              {
+                'txid': 'ea97726ffc529808094ae5568342267931a058375a20147535a0d095837079f3',
+                'vout': 1,
+                'sequence': 4294967295,
+                'n': 0,
+                'addr': 'moFfnRwt77pApKnnU6m5uocFaa43aAYpt5',
+                'valueSat': 53540000,
+                'value': 0.5354,
+                'doubleSpentTxID': null
+              },
+              {
+                'txid': '980a9cc2dbc2d3464eb9900ae6d579a03045408563320f62d99316c3d4ff58b7',
+                'vout': 2,
+                'sequence': 4294967295,
+                'n': 1,
+                'addr': 'n1XJBAyU4hNR4xRtY3UxnmAteoJX83p5qv',
+                'valueSat': 299829,
+                'value': 0.00299829,
+                'doubleSpentTxID': null
+              }
+            ],
+            'vout': [
+              {
+                'value': '0.00220000',
+                'n': 0,
+                'scriptPubKey': {
+                  'hex': '76a914b9bbd76588d9e4e09f0369a9aa0b2749a11c4e8d88ac',
+                  'reqSigs': 1,
+                  'type': 'pubkeyhash',
+                  'addresses': [
+                    'mxT2KzTUQvsaYYothDtjcdvyAdaHA9ofMp'
+                  ]
+                }
+              },
+              {
+                'value': '0.53320000',
+                'n': 1,
+                'scriptPubKey': {
+                  'hex': '76a914d2ec20bb8e5f25a52f730384b803d95683250e0b88ac',
+                  'reqSigs': 1,
+                  'type': 'pubkeyhash',
+                  'addresses': [
+                    'mzkD4nmQ8ixqxySdBgsXTpgvAMK5iRZpNK'
+                  ],
+                }
+              },
+              {
+                'value': '0.00289829',
+                'n': 2,
+                'scriptPubKey': {
+                  'hex': '76a914583df9fa56ad961051e00ca93e68dfaf1eab9ec588ac',
+                  'reqSigs': 1,
+                  'type': 'pubkeyhash',
+                  'addresses': [
+                    'moZY18rGNmh4YCPeugtGW46AkkWMQttBUD'
+                  ]
+                }
+              }
+            ],
+            'blockhash': '0000000000000041ddc94ecf4f86a456a83b2e320c36c6f0c13ff92c7e75f013',
+            'blockheight': 534181,
+            'confirmations': 52,
+            'time': 1441116143,
+            'blocktime': 1441116143,
+            'valueOut': 0.53829829,
+            'size': 470,
+            'valueIn': 0.53839829,
+            'fees': 0.0001,
+            'firstSeenTs': 1441108193
+          }
+        ]
+      };
+
+      var todos = {
+        'items': [
+          {
+            'vout': [
+              {
+                'scriptPubKey': {
+                  'reqSigs': 1,
+                }
+              },
+              {
+                'scriptPubKey': {
+                  'reqSigs': 1,
+                }
+              },
+              {
+                'scriptPubKey': {
+                  'reqSigs': 1,
+                }
+              }
+            ],
+            'firstSeenTs': 1441108193
+          }
+        ]
+      };
+
+      var node = {
+        getAddressHistory: sinon.stub().callsArgWith(2, null, txinfos2),
+        services: {
+          bitcoind: {
+            height: 534232
+          }
+        },
+        network: 'testnet'
+      };
+
+      var addresses = new AddressController(node);
+
+      var req = {
+        addrs: 'mzkD4nmQ8ixqxySdBgsXTpgvAMK5iRZpNK,moZY18rGNmh4YCPeugtGW46AkkWMQttBUD',
+        query: {noSpent: '1', noScriptSig: '1', noAsm: '1'},
+        body: {}
+      };
+
+      var res = {
+        jsonp: function(data) {
+          var merged = _.merge(data, todos);
+          should(merged).eql(insight);
+          done();
+        }
+      };
+
       addresses.multitxs(req, res);
     });
   });