openassets-ruby 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf01309338f084d52c8fda8cf85695b4606d32b0
-  data.tar.gz: a0b83af7aaa19874a381ed21c2393caff99c095d
+  metadata.gz: ad9b917508f6d470f30b887f8ae9d5cce02fdc0a
+  data.tar.gz: b88e61903d84a5e05ff1e39eca558a73bb65df49
 SHA512:
-  metadata.gz: 0552802edfa3962439b41ad80f62efcc2215bc8f1ec7c105f7d2ef3beea5c97a1d6f432137103a1360e0f96ff1b6b795c6296647f0321fe9dd259861a4da363b
-  data.tar.gz: d152dd700611ddfced626c6aed83b67eccba0d0257198cc427e66ee551242f78b05649ce2b84c4a4a82fabd5eba1a3dcdb1a5536f30ff286183c4e3bc8bbd2dc
+  metadata.gz: 385715ff6acdfa617eee821e57b6ab74d63bb896f0566af31319ec81c87eecb3f8786bc96178c41f8dc533dc2623b82598a13729986453be574b19b46d932a14
+  data.tar.gz: 31ab11d1390551dcfcc5d214f69e068220c494a1782d6a470c7ac9d390931425953d38b47327d319183161a8f5efc436b32a85e0ca6623a89dc0a73240c6bcfc

data/lib/openassets/transaction/transaction_builder.rb

@@ -66,7 +66,8 @@ module OpenAssets
       def self.collect_uncolored_outputs(unspent_outputs, amount)
         total_amount = 0
         results = []
-        unspent_outputs.each do |output|
+        sorted_outputs = unspent_outputs.sort{|a,b| a.output.value <=> b.output.value}
+        sorted_outputs.each do |output|
           if output.output.asset_id.nil?
             results << output
             total_amount += output.output.value
@@ -145,15 +146,24 @@ module OpenAssets
         }
 
         # btc_excess = inputs(colored) total satoshi - outputs(transfer) total satoshi
+        utxo = btc_transfer_spec.unspent_outputs.dup
         btc_excess = inputs.inject(0) { |sum, i| sum + i.output.value } - outputs.inject(0){|sum, o| sum + o.value}
         if btc_excess < btc_transfer_spec.amount + fees
           uncolored_outputs, uncolored_amount =
-              TransactionBuilder.collect_uncolored_outputs(btc_transfer_spec.unspent_outputs, btc_transfer_spec.amount + fees - btc_excess)
+              TransactionBuilder.collect_uncolored_outputs(utxo, btc_transfer_spec.amount + fees - btc_excess)
+          utxo = utxo - uncolored_outputs
           inputs << uncolored_outputs
           btc_excess += uncolored_amount
         end
 
         otsuri = btc_excess - btc_transfer_spec.amount - fees
+        if otsuri > 0 && otsuri < @amount
+          uncolored_outputs, uncolored_amount =
+              TransactionBuilder.collect_uncolored_outputs(utxo, @amount - otsuri)
+          inputs << uncolored_outputs
+          otsuri += uncolored_amount
+        end
+
         if otsuri > 0
           outputs << create_uncolored_output(btc_transfer_spec.change_script, otsuri)
         end

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: The implementation of the Open Assets Protocol for Ruby.