openassets-ruby 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3804b292002c1e288151b5f5e9b17e271e9a223
-  data.tar.gz: 7ca178d7e5556ddbc997f09cf05a9dcdb87f7112
+  metadata.gz: ab88032ced409505e81e4ce0ed7ec27e59b61e3c
+  data.tar.gz: d2b86f52973527638af824c70fbd2a57c734b5cc
 SHA512:
-  metadata.gz: 066a91d9c71bc20a8241279ff9f8319c0220d42cc7748847f9bbefabad54e2304f64b7974fc23a27588a05f6075303120c84e7781d35ea80dfba6a5e88b8c537
-  data.tar.gz: 568042474c3efa701a00672b695dec08dbea170eeda6108a63653a32e61fc40ebd052a548a8eef53ee439fc19599dd3c95dcece6e8436a0ea4b2b1d1545cea06
+  metadata.gz: 4a95fda64c3b67b08c1f8496628a095800f79a23fb323362f5d4d8813a4cdb44e62890eecf78ef7908344c36a9a63ad28e16a04d79c925bf45e22286adfc82df
+  data.tar.gz: efd6548365827737a57d08dde0740bfaa0c2c8ba9426c4357ad5b02e4176f56935edccb81f553e2d45de3e5f2d778470a17a7755459c8bc27f612aeae72250f3

data/README.md

@@ -54,7 +54,7 @@ Creates a transaction for issuing an asset.
   address = 'akEJwzkzEFau4t2wjbXoMs7MwtZkB8xixmH'
   api.issue_asset(address, 150, 'u=https://goo.gl/bmVEuw', address, nil, 'broadcast')
   ``` 
-If specified output_qty, the issue output is divided by the number of output_qty.   
+If specified ``output_qty``, the issue output is divided by the number of output_qty.   
 Ex, amount = 125 and output_qty = 2, the marker output asset quantity is [62, 63] and issue TxOut is two.
 
 * **send_asset**  
@@ -70,7 +70,8 @@ Creates a transaction for sending an asset from the open asset address to anothe
   ``` 
   
 * **send_bitcoin**  
-Creates a transaction for sending bitcoins from an address to another.
+Creates a transaction for sending bitcoins from an address to another.  
+This transaction inputs use only uncolored outputs.
   ```ruby
   # send bitcoin
   # api.send_bitcoin(<from btc address>, <amount (satoshi)>, <to btc address>, <fees (The fess in satoshis for the transaction. use 10000 satoshi if specified nil)>, <mode=('broadcast', 'signed', 'unsigned')>, <output_qty default value is 1.>)
@@ -80,8 +81,7 @@ Creates a transaction for sending bitcoins from an address to another.
   to = '1MFW7BTwiNbAkmVz4SzAMQXboKYKGSzkq2'
   api.send_bitcoin(from, 60000, to)
   ``` 
-
-If specified output_qty, the send output is divided by the number of output_qty.   
+If specified ``output_qty``, the send output is divided by the number of output_qty.   
 Ex, amount = 60000 and output_qty = 2, send TxOut is two (each value is 30000, 30000) and change TxOut one.
 
 ## License

data/lib/openassets/api.rb

@@ -103,8 +103,8 @@ module OpenAssets
       to = from if to.nil?
       builder = OpenAssets::Transaction::TransactionBuilder.new(@config[:dust_limit])
       colored_outputs = get_unspent_outputs([oa_address_to_address(from)])
-      issue_param = OpenAssets::Transaction::TransferParameters.new(colored_outputs, to, from, amount)
-      tx = builder.issue_asset(issue_param, metadata, fees.nil? ? @config[:default_fees]: fees, output_qty)
+      issue_param = OpenAssets::Transaction::TransferParameters.new(colored_outputs, to, from, amount, output_qty)
+      tx = builder.issue_asset(issue_param, metadata, fees.nil? ? @config[:default_fees]: fees)
       tx = process_transaction(tx, mode)
       tx
     end
@@ -119,11 +119,11 @@ module OpenAssets
     # '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_asset(from, asset_id, amount, to, fees = nil, mode = 'broadcast')
+    def send_asset(from, asset_id, amount, to, fees = nil, mode = 'broadcast', output_qty = 1)
       builder = OpenAssets::Transaction::TransactionBuilder.new(@config[:dust_limit])
       colored_outputs = get_unspent_outputs([oa_address_to_address(from)])
-      send_param = OpenAssets::Transaction::TransferParameters.new(colored_outputs, to, from, amount)
-      tx = builder.transfer_assets(asset_id, send_param, from, fees.nil? ? @config[:default_fees]: fees)
+      asset_transfer_spec = OpenAssets::Transaction::TransferParameters.new(colored_outputs, to, from, amount, output_qty)
+      tx = builder.transfer_assets(asset_id, asset_transfer_spec, from, fees.nil? ? @config[:default_fees]: fees)
       tx = process_transaction(tx, mode)
       tx
     end
@@ -143,8 +143,8 @@ module OpenAssets
       validate_address([from, to])
       builder = OpenAssets::Transaction::TransactionBuilder.new(@config[:dust_limit])
       colored_outputs = get_unspent_outputs([from])
-      send_param = OpenAssets::Transaction::TransferParameters.new(colored_outputs, to, from, amount)
-      tx = builder.transfer_btc(send_param, fees.nil? ? @config[:default_fees]: fees, output_qty)
+      btc_transfer_spec = OpenAssets::Transaction::TransferParameters.new(colored_outputs, to, from, amount, output_qty)
+      tx = builder.transfer_btc(btc_transfer_spec, fees.nil? ? @config[:default_fees]: fees)
       process_transaction(tx, mode)
     end
 

data/lib/openassets/transaction/transaction_builder.rb

@@ -16,7 +16,7 @@ module OpenAssets
       # @param [bytes] metadata The metadata to be embedded in the transaction.
       # @param [Integer] fees The fees to include in the transaction.
       # @return[Bitcoin:Protocol:Tx] An unsigned transaction for issuing asset.
-      def issue_asset(issue_spec, metadata, fees, output_qty = 1)
+      def issue_asset(issue_spec, metadata, fees)
         inputs, total_amount =
             TransactionBuilder.collect_uncolored_outputs(issue_spec.unspent_outputs, 2 * @amount + fees)
         tx = Bitcoin::Protocol::Tx.new
@@ -30,11 +30,11 @@ module OpenAssets
         from_address = oa_address_to_address(issue_spec.change_script)
         validate_address([issue_address, from_address])
         asset_quantities =[]
-        output_qty.times {|index|
-          if index == output_qty - 1
-            asset_quantities[index] = issue_spec.amount / output_qty + issue_spec.amount % output_qty
+        issue_spec.output_qty.times {|index|
+          if index == issue_spec.output_qty - 1
+            asset_quantities[index] = issue_spec.amount / issue_spec.output_qty + issue_spec.amount % issue_spec.output_qty
           else
-            asset_quantities[index] = issue_spec.amount / output_qty
+            asset_quantities[index] = issue_spec.amount / issue_spec.output_qty
           end
           tx.add_out(create_colored_output(issue_address))
         }
@@ -45,22 +45,22 @@ module OpenAssets
 
       # Creates a transaction for sending an asset.
       # @param[String] asset_id The ID of the asset being sent.
-      # @param[OpenAssets::Transaction::TransferParameters] transfer_spec The parameters of the asset being transferred.
+      # @param[OpenAssets::Transaction::TransferParameters] asset_transfer_spec The parameters of the asset being transferred.
       # @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(asset_id, transfer_spec, btc_change_script, fees)
+      def transfer_assets(asset_id, asset_transfer_spec, btc_change_script, fees)
         btc_transfer_spec = OpenAssets::Transaction::TransferParameters.new(
-            transfer_spec.unspent_outputs, nil, oa_address_to_address(btc_change_script), 0)
-        transfer([[asset_id, transfer_spec]], btc_transfer_spec, fees)
+            asset_transfer_spec.unspent_outputs, nil, oa_address_to_address(btc_change_script), 0)
+        transfer([[asset_id, asset_transfer_spec]], btc_transfer_spec, fees)
       end
 
       # Creates a transaction for sending bitcoins.
       # @param[OpenAssets::Transaction::TransferParameters] btc_transfer_spec The parameters of the bitcoins being transferred.
       # @param[Integer] fees The fees to include in the transaction.
       # @return[Bitcoin::Protocol:Tx] The resulting unsigned transaction.
-      def transfer_btc(btc_transfer_spec, fees, output_qty = 1)
-        transfer([], btc_transfer_spec, fees, output_qty)
+      def transfer_btc(btc_transfer_spec, fees)
+        transfer([], btc_transfer_spec, fees)
       end
 
       # collect uncolored outputs in unspent outputs(contains colored output).
@@ -127,7 +127,7 @@ module OpenAssets
         Bitcoin::Protocol::TxOut.new(value, Bitcoin::Script.new(Bitcoin::Script.to_hash160_script(hash160)).to_payload)
       end
 
-      def transfer(asset_transfer_specs, btc_transfer_spec, fees, btc_output_qty = 1)
+      def transfer(asset_transfer_specs, btc_transfer_spec, fees)
         inputs = []
         outputs = []
         asset_quantities = []
@@ -136,8 +136,15 @@ module OpenAssets
           inputs = inputs + colored_outputs
 
           # add asset transfer output
-          outputs << create_colored_output(oa_address_to_address(transfer_spec.to_script))
-          asset_quantities << transfer_spec.amount
+          transfer_spec.output_qty.times{|index|
+            if index == transfer_spec.output_qty - 1
+              amount = transfer_spec.amount / transfer_spec.output_qty + transfer_spec.amount % transfer_spec.output_qty
+            else
+              amount = transfer_spec.amount / transfer_spec.output_qty
+            end
+            outputs << create_colored_output(oa_address_to_address(transfer_spec.to_script))
+            asset_quantities << amount
+          }
 
           # add the rest of the asset to the origin address
           if total_amount > transfer_spec.amount
@@ -161,11 +168,11 @@ module OpenAssets
         end
 
         if btc_transfer_spec.amount > 0
-          btc_output_qty.times {|index|
-            if index == btc_output_qty - 1
-              amount = btc_transfer_spec.amount / btc_output_qty + btc_transfer_spec.amount % btc_output_qty
+          btc_transfer_spec.output_qty.times {|index|
+            if index == btc_transfer_spec.output_qty - 1
+              amount = btc_transfer_spec.amount / btc_transfer_spec.output_qty + btc_transfer_spec.amount % btc_transfer_spec.output_qty
             else
-              amount = btc_transfer_spec.amount / btc_output_qty
+              amount = btc_transfer_spec.amount / btc_transfer_spec.output_qty
             end
             outputs << create_uncolored_output(btc_transfer_spec.to_script, amount)
           }

data/lib/openassets/transaction/transfer_parameters.rb

@@ -8,17 +8,19 @@ module OpenAssets
       attr_accessor :amount
       attr_accessor :change_script
       attr_accessor :to_script
+      attr_accessor :output_qty
 
       # initialize
       # @param [Array[OpenAssets::Transaction::SpendableOutput]] unspent_outputs Array of the unspent outputs available for the transaction.
       # @param [String] to_script the output script to which to send the assets or bitcoins.
       # @param [String] change_script the output script to which to send any remaining change.
       # @param [Integer] amount The asset quantity or amount of the satoshi sent in the transaction.
-      def initialize(unspent_outputs, to_script, change_script, amount)
+      def initialize(unspent_outputs, to_script, change_script, amount, output_qty = 1)
         @unspent_outputs = unspent_outputs
         @to_script = to_script
         @change_script = change_script
         @amount = amount
+        @output_qty = output_qty
       end
 
     end

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby