openassets-ruby 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d950356fa5997f18ac1dddd5d46893e2ddb190d4
-  data.tar.gz: ea9446f8d3e5c8c87fd734d85d22975a1ff160e4
+  metadata.gz: d7799eb6ff465493ef1873435b320f4700499128
+  data.tar.gz: 2a30a7092e1d2bdfc301f208c692ca617a0ae95b
 SHA512:
-  metadata.gz: 022199ce2008f3cc6b1a8b41ba3c2cbb3edfd0b4534ffdb3f540ad9b1d38e32b5bd2d51e1fe8fb4ebd46223b2e908d3b4827243515caf2b7f4b601c9c81fb98e
-  data.tar.gz: 59023c2a558f29193df1ef762bd15924e0d3d68504402b5cf339823d1d500ea4344806233770d493cec4e589fc7fc247d4852679888c39d27aa72e0635b1d1cc
+  metadata.gz: d5bb413b7fe229ea47230bb5b1da509693f0502132ba4383cfc0dee6af146e3b16c84bc7aa42136f13b8dcedb825072d2e53e350f2c94986dfc3b04a089d173f
+  data.tar.gz: 77ebd36b208b46b2c88d16be49256d822a56b69eed147a374ce7a73195ecbefcab45d52cee1600b5aa26972215b50c4274a5759407cce8ae7027165d227dc82f

data/README.md

@@ -205,18 +205,31 @@ Get tx outputs. (use for debug)
   ``` 
   
 * **send_assets**  
-Creates a transaction for sending **multiple** asset from the open asset address to another.
+Creates a transaction for sending **multiple** asset from the open asset address(es) to another.  
+`<from open asset address>` is used to send bitcoins **if** needed, and receive bitcoin change **if** any.
   ```ruby
   # send assets
   # api.send_assets(<from open asset address>, <The array of send Asset information(see OpenAssets::SendAssetParam).>, <fees (The fess in satoshis for the transaction. use 10000 satoshi if specified nil)>, <mode=('broadcast', 'signed', 'unsigned')>, <output_qty default value is 1.>)
 
   # example
-  from = address_to_oa_address('mrxpeizRrF8ymNx5FrvcGGZVecZjtUFVP3')
-  to = address_to_oa_address('n4MEsSUN8GktDFZzU3V55mP3jWGMN7e4wE')
+  from = api.address_to_oa_address('mrxpeizRrF8ymNx5FrvcGGZVecZjtUFVP3')
+  to = api.address_to_oa_address('n4MEsSUN8GktDFZzU3V55mP3jWGMN7e4wE')
   params = []
   params << OpenAssets::SendAssetParam.new('oGu4VXx2TU97d9LmPP8PMCkHckkcPqC5RY', 50, to)
   params << OpenAssets::SendAssetParam.new('oUygwarZqNGrjDvcZUpZdvEc7es6dcs1vs', 4, to)
   tx = api.send_assets(from, params)
+  
+  # send assets from multiple addresses.
+  change_address = 'mwxeANpckdbdgZCpUMTceQhbbhLPJiqpfD'
+  from = [
+    api.address_to_oa_address("mrxpeizRrF8ymNx5FrvcGGZVecZjtUFVP3"),
+    api.address_to_oa_address("mvYbB238p3rFYFjM56cHhNNHeQb5ypQJ3T")
+  ]
+  to = api.address_to_oa_address('n4MEsSUN8GktDFZzU3V55mP3jWGMN7e4wE')
+  params = []
+  params << OpenAssets::SendAssetParam.new('oGu4VXx2TU97d9LmPP8PMCkHckkcPqC5RY', 100, to, from[0])
+  params << OpenAssets::SendAssetParam.new('oUygwarZqNGrjDvcZUpZdvEc7es6dcs1vs', 100, to, from[1])
+  tx = api.send_assets(change_address, params)
   ```
 
 * **send_bitcoins**  

data/lib/openassets/api.rb

@@ -125,19 +125,22 @@ module OpenAssets
     end
 
     # 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::SendAssetParam]] send_asset_params The send Asset information(asset_id, amount, to).
+    # @param[String] from The open asset address to send the asset from when send_asset_param hasn't from.
+    # to send the bitcoins from, if needed. where to send bitcoin change, if any.
+    # @param[Array[OpenAssets::SendAssetParam]] send_asset_params The send Asset information(asset_id, amount, to, from).
     # @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,
     # 'unsigned' for getting the raw unsigned transaction without broadcasting"""='broadcast'
     # @return[Bitcoin::Protocol:Tx] The resulting transaction.
     def send_assets(from, send_asset_params, fees = nil, mode = 'broadcast')
-      colored_outputs = get_unspent_outputs([oa_address_to_address(from)])
-      transfer_specs = send_asset_params.map{|param|
-        [param.asset_id, OpenAssets::Transaction::TransferParameters.new(colored_outputs, param.to, from, param.amount)]
+      transfer_specs = send_asset_params.map{ |param|
+        colored_outputs = get_unspent_outputs([oa_address_to_address(param.from || from)])
+        [param.asset_id, OpenAssets::Transaction::TransferParameters.new(colored_outputs, param.to, param.from || from, param.amount)]
       }
-      tx = create_tx_builder.transfer_assets(transfer_specs, from, fees.nil? ? @config[:default_fees]: fees)
+      btc_transfer_spec = OpenAssets::Transaction::TransferParameters.new(
+          get_unspent_outputs([oa_address_to_address(from)]), nil, oa_address_to_address(from), 0)
+      tx = create_tx_builder.transfer_assets(transfer_specs, btc_transfer_spec, fees.nil? ? @config[:default_fees]: fees)
       tx = process_transaction(tx, mode)
       tx
     end
@@ -205,6 +208,8 @@ module OpenAssets
         output = OpenAssets::Transaction::SpendableOutput.new(
           OpenAssets::Transaction::OutPoint.new(item['txid'], item['vout']), output_result)
         output.confirmations = item['confirmations']
+        output.spendable = item['spendable']
+        output.solvable = item['solvable']
         output
       }
       result

data/lib/openassets/protocol/asset_definition_loader.rb

@@ -14,7 +14,7 @@ module OpenAssets
       # load Asset Definition File
       # @return[OpenAssets::Protocol::AssetDefinition] loaded asset definition object
       def load_definition
-        @loader.load
+        @loader.load if @loader
       end
 
     end

data/lib/openassets/send_asset_param.rb

@@ -4,11 +4,13 @@ module OpenAssets
       attr_accessor :asset_id
       attr_accessor :amount
       attr_accessor :to
+      attr_accessor :from
 
-      def initialize(asset_id, amount, to)
+      def initialize(asset_id, amount, to, from = nil)
         @asset_id = asset_id
         @amount = amount
         @to = to
+        @from = from
       end
     end
 

data/lib/openassets/transaction/spendable_output.rb

@@ -10,6 +10,8 @@ module OpenAssets
       attr_accessor :output
 
       attr_accessor :confirmations
+      attr_accessor :spendable
+      attr_accessor :solvable
 
       # @param [OpenAssets::Transaction::OutPoint] out_point
       # @param [OpenAssets::Protocol::TransactionOutput] output
@@ -17,12 +19,17 @@ module OpenAssets
         @out_point = out_point
         @output = output
         @confirmations = nil
+        @solvable = nil
+        @spendable = nil
       end
 
       # convert to hash.
       def to_hash
         return {} if @output.nil?
-        {'txid' => @out_point.hash, 'vout' => @out_point.index, 'confirmations' => @confirmations}.merge(@output.to_hash)
+        h = {'txid' => @out_point.hash, 'vout' => @out_point.index, 'confirmations' => @confirmations}.merge(@output.to_hash)
+        h['solvable'] = @solvable unless @solvable.nil?
+        h['spendable'] = @spendable unless @spendable.nil?
+        h
       end
 
     end

data/lib/openassets/transaction/transaction_builder.rb

@@ -66,9 +66,7 @@ module OpenAssets
       # @param[String] btc_change_script The script where to send bitcoin change, if any.
       # @param[Integer] fees The fees to include in the transaction.
       # @return[Bitcoin::Protocol:Tx] The resulting unsigned transaction.
-      def transfer_assets(transfer_specs, btc_change_script, fees)
-        btc_transfer_spec = OpenAssets::Transaction::TransferParameters.new(
-            transfer_specs[0][1].unspent_outputs, nil, oa_address_to_address(btc_change_script), 0)
+      def transfer_assets(transfer_specs, btc_transfer_spec, fees)
         transfer(transfer_specs, [btc_transfer_spec], fees)
       end
 

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -226,7 +226,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.