openassets-ruby 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d4b61f5231ce9ddde842d4269de8a9b683c7d0e
-  data.tar.gz: a8231c78393699625f5a7c03be616d0586c18b0f
+  metadata.gz: 55f541af3749707d21e550e2fa82882062a203f1
+  data.tar.gz: 00909d9fb3f0eef92d696b1fd97ed34554c5c805
 SHA512:
-  metadata.gz: 6e54c5aa9436b2528065b9a77da06cae8a123dd8b38478561ca4f4df9d89dabce2a41bd0020e6326ccd290c03292f8fccdb3c309a6c8b657aa85e48ad21c7c88
-  data.tar.gz: a49134f3c11dd99c874f1578dd4864d1e1b700309c5c30058991a2a4fe98b2c13d5b153dca0df8f0e524345f80753cd30ff7f13bd4d2276ba3c08b00417bf599
+  metadata.gz: 748937bd4d011a5ee5b62a3527c032a230ad154812526fc0dccf01127dca1213c7bd90fd21a03d4c37c05b254f3a3c1a4760d30237b052a11bb20432d18aa3df
+  data.tar.gz: 5c97eb9169a61a16b645fcf697d63f09fcefa2fd78c96b64208e6d4d9c81fc5b202f089a1f7b3b3b919224ccace384a9f0b575b2f3454fbfc39ac21e5e6b8293

data/README.md

@@ -215,7 +215,6 @@ Creates a transaction for sending **multiple** asset from the open asset address
   tx = api.send_assets(from, params)
   ``` 
 
-
 ## Command line interface
 
 Openassets-ruby comes with a `openassets` command line interface that allows easy interaction with OpenAssets. 

data/lib/openassets/api.rb

@@ -122,7 +122,7 @@ module OpenAssets
 
     # Creates a transaction for sending multiple asset from an address to another.
     # @param[String] from The open asset address to send the asset from.
-    # @param[Array[OpenAssets::SendAssetParams]] send_asset_params The send Asset information(asset_id, amount, to).
+    # @param[Array[OpenAssets::SendAssetParam]] send_asset_params The send Asset information(asset_id, amount, to).
     # @param[Integer] fees The fess in satoshis for the transaction.
     # @param[String] mode 'broadcast' (default) for signing and broadcasting the transaction,
     # 'signed' for signing the transaction without broadcasting,

data/lib/openassets/protocol/transaction_output.rb

@@ -63,12 +63,16 @@ module OpenAssets
             'asset_id' => @asset_id,
             'asset_quantity' => @asset_quantity.to_s,
             'asset_amount' => asset_amount.to_s,
-            'account' => @account,
+            'account' => account,
             'asset_definition_url' => @asset_definition_url,
             'proof_of_authenticity' => proof_of_authenticity
         }
       end
 
+      def account
+        @account.nil? ? nil : @account.encode('ISO-8859-1').force_encoding('UTF-8')
+      end
+
       private
 
       @@definition_cache = {}

data/lib/openassets/transaction/transaction_builder.rb

@@ -133,20 +133,28 @@ module OpenAssets
         inputs = []
         outputs = []
         asset_quantities = []
+
+        asset_based_specs = {}
         asset_transfer_specs.each{|asset_id, transfer_spec|
-          colored_outputs, total_amount = TransactionBuilder.collect_colored_outputs(transfer_spec.unspent_outputs, asset_id, transfer_spec.amount)
-          inputs = inputs + colored_outputs
+          asset_based_specs[asset_id] = [] unless asset_based_specs.has_key?(asset_id)
+          asset_based_specs[asset_id] << transfer_spec
+        }
 
-          # add asset transfer output
-          transfer_spec.split_output_amount.each {|amount|
-            outputs << create_colored_output(oa_address_to_address(transfer_spec.to_script))
-            asset_quantities << amount
+        asset_based_specs.each{|asset_id, transfer_specs|
+          transfer_amount = transfer_specs.inject(0){|sum, s| sum + s.amount}
+          colored_outputs, total_amount = TransactionBuilder.collect_colored_outputs(transfer_specs[0].unspent_outputs, asset_id, transfer_amount)
+          inputs = inputs + colored_outputs
+          transfer_specs.each{|spec|
+            # add asset transfer output
+            spec.split_output_amount.each {|amount|
+              outputs << create_colored_output(oa_address_to_address(spec.to_script))
+              asset_quantities << amount
+            }
           }
-
           # add the rest of the asset to the origin address
-          if total_amount > transfer_spec.amount
-            outputs << create_colored_output(oa_address_to_address(transfer_spec.change_script))
-            asset_quantities << (total_amount - transfer_spec.amount)
+          if total_amount > transfer_amount
+            outputs << create_colored_output(oa_address_to_address(transfer_specs[0].change_script))
+            asset_quantities << (total_amount - transfer_amount)
           end
         }
 

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby