wallet: delete utxo instead of marking it as spend

src/wallet.js

@@ -68,7 +68,7 @@ function Wallet(seed, network) {
 
     for(var key in this.outputs){
       var output = this.outputs[key]
-      if(!output.spend) utxo.push(outputToUnspentOutput(output))
+      utxo.push(outputToUnspentOutput(output))
     }
 
     return utxo
@@ -171,11 +171,9 @@ function Wallet(seed, network) {
 
     tx.ins.forEach(function(txIn, i){
       var op = txIn.outpoint
+      var output = op.hash + ':' + op.index
 
-      var o = me.outputs[op.hash + ':' + op.index]
-      if (o) {
-        o.spend = txhash + ':' + i
-      }
+      if(me.outputs[output]) delete me.outputs[output]
     })
   }
 
@@ -220,7 +218,7 @@ function Wallet(seed, network) {
 
     for (var key in me.outputs) {
       var output = me.outputs[key]
-      if (!output.spend && !output.pending) unspent.push(output)
+      if (!output.pending) unspent.push(output)
     }
 
     var sortByValueDesc = unspent.sort(function(o1, o2){

test/wallet.js

@@ -195,14 +195,6 @@ describe('Wallet', function() {
 
         assert.equal(wallet.getBalance(), 40000)
       })
-
-      it('excludes spent outputs', function(){
-        addUtxoToOutput(expectedUtxo)
-        addUtxoToOutput(utxo1)
-        wallet.outputs[utxo1.hash + ':' + utxo1.outputIndex].spend = "sometxn:m"
-
-        assert.equal(wallet.getBalance(), 20000)
-      })
     })
 
     describe('getUnspentOutputs', function(){
@@ -213,11 +205,6 @@ describe('Wallet', function() {
       it('parses wallet outputs to the expect format', function(){
         assert.deepEqual(wallet.getUnspentOutputs(), [expectedUtxo])
       })
-
-      it('excludes spent outputs', function(){
-        wallet.outputs[expectedOutputKey].spend = "sometxn:m"
-        assert.deepEqual(wallet.getUnspentOutputs(), [])
-      })
     })
 
     describe('setUnspentOutputs', function(){
@@ -319,7 +306,7 @@ describe('Wallet', function() {
 
       })
 
-      describe("when tx ins outpoint contains a known txhash:i, the corresponding 'output' gets updated", function(){
+      describe("when tx ins outpoint contains a known txhash:i", function(){
         beforeEach(function(){
           wallet.addresses = [addresses[0]] // the address fixtureTx2 used as input
           wallet.processConfirmedTx(tx)
@@ -333,14 +320,14 @@ describe('Wallet', function() {
           assert.deepEqual(wallet.outputs, outputs)
         })
 
-        it("sets spend with the transaction hash and input index", function(){
+        it("deletes corresponding 'output'", function(){
           wallet.processConfirmedTx(tx)
 
           var txIn = tx.ins[0]
           var key = txIn.outpoint.hash + ":" + txIn.outpoint.index
           var output = wallet.outputs[key]
 
-          assert.equal(output.spend, tx.getHash() + ':' + 0)
+          assert.equal(output, undefined)
         })
       })
 
@@ -427,24 +414,6 @@ describe('Wallet', function() {
         assert.deepEqual(tx.ins[0].outpoint, { hash: fakeTxHash(3), index: 0 })
       })
 
-      it('ignores spent outputs', function(){
-        utxo.push(
-          {
-            "hash": fakeTxHash(4),
-            "outputIndex": 0,
-            "address" : address2,
-            "value": 530000 // enough but spent before createTx
-          }
-        )
-        wallet.setUnspentOutputs(utxo)
-        wallet.outputs[fakeTxHash(4) + ":" + 0].spend = fakeTxHash(5) + ":" + 0
-
-        var tx = wallet.createTx(to, value)
-
-        assert.equal(tx.ins.length, 1)
-        assert.deepEqual(tx.ins[0].outpoint, { hash: fakeTxHash(3), index: 0 })
-      })
-
       it('ignores pending outputs', function(){
         utxo.push(
           {