openassets-ruby 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ebe922dafaddce5468b643e800caeebfac700c5
-  data.tar.gz: 238a308ab6eea7f04ed160d70468831ab5a2d6e2
+  metadata.gz: d3804b292002c1e288151b5f5e9b17e271e9a223
+  data.tar.gz: 7ca178d7e5556ddbc997f09cf05a9dcdb87f7112
 SHA512:
-  metadata.gz: 73085f2221a5753ca9d4463cf712a71efe175e2b77705723faac92fe89a64a6478af497814206e1b5d0aa7c56a936d58675093a4e9e7e194d815d80967057004
-  data.tar.gz: cd26cfd741e51acc8d4be4ba6631bbbad19956d52285550ba855630f7fd3b118aa7940531d4bb9d5cc1d3d6fbbc2e53de335aa2025d93abb443ab0e70cd83066
+  metadata.gz: 066a91d9c71bc20a8241279ff9f8319c0220d42cc7748847f9bbefabad54e2304f64b7974fc23a27588a05f6075303120c84e7781d35ea80dfba6a5e88b8c537
+  data.tar.gz: 568042474c3efa701a00672b695dec08dbea170eeda6108a63653a32e61fc40ebd052a548a8eef53ee439fc19599dd3c95dcece6e8436a0ea4b2b1d1545cea06

data/README.md

@@ -69,6 +69,21 @@ Creates a transaction for sending an asset from the open asset address to anothe
   api.send_asset(from, 'AWo3R89p5REmoSyMWB8AeUmud8456bRxZL', 100, to, 10000, 'broadcast')
   ``` 
   
+* **send_bitcoin**  
+Creates a transaction for sending bitcoins from an address to another.
+  ```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.>)
+
+  # example
+  from = '14M4kbAtn71P1nnNYuhBDFTNYxa19t1XP6'
+  to = '1MFW7BTwiNbAkmVz4SzAMQXboKYKGSzkq2'
+  api.send_bitcoin(from, 60000, to)
+  ``` 
+
+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
 
 The MIT License (MIT)

data/lib/openassets/api.rb

@@ -118,6 +118,7 @@ module OpenAssets
     # @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_asset(from, asset_id, amount, to, fees = nil, mode = 'broadcast')
       builder = OpenAssets::Transaction::TransactionBuilder.new(@config[:dust_limit])
       colored_outputs = get_unspent_outputs([oa_address_to_address(from)])
@@ -127,6 +128,26 @@ module OpenAssets
       tx
     end
 
+    # Creates a transaction for sending bitcoins from an address to another.
+    # @param[String] from The address to send the bitcoins from.
+    # @param[Integer] amount The amount of satoshis to send.
+    # @param[String] to The address to send the bitcoins 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,
+    # 'unsigned' for getting the raw unsigned transaction without broadcasting"""='broadcast'
+    # @param [Integer] output_qty The number of divides the issue output. Default value is 1.
+    # Ex. amount = 125 and output_qty = 2, asset quantity = [62, 63] and issue TxOut is two.
+    # @return[Bitcoin::Protocol:Tx] The resulting transaction.
+    def send_bitcoin(from, amount, to, fees = nil, mode = 'broadcast', output_qty = 1)
+      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)
+      process_transaction(tx, mode)
+    end
+
     # Get unspent outputs.
     # @param [Array] addresses The array of Bitcoin address.
     # @return [Array[OpenAssets::Transaction::SpendableOutput]] The array of unspent outputs.

data/lib/openassets/protocol/marker_output.rb

@@ -28,6 +28,7 @@ module OpenAssets
         payload = [OAP_MARKER, VERSION]
         payload << Bitcoin::Protocol.pack_var_int(@asset_quantities.length).unpack("H*")
         @asset_quantities.map{|q|payload << encode_leb128(q)}
+        @metadata ||= ''
         payload << Bitcoin::Protocol.pack_var_int(@metadata.length).unpack("H*")
         tmp = []
         @metadata.bytes{|b| tmp << b.to_s(16)}

data/lib/openassets/transaction/transaction_builder.rb

@@ -50,56 +50,17 @@ module OpenAssets
       # @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)
-        btc_transfer_spec = OpenAssets::Transaction::TransferParameters.new(transfer_spec.unspent_outputs, nil, btc_change_script, 0)
-        outputs = []
-        asset_quantities = []
-        inputs, total_amount = TransactionBuilder.collect_colored_outputs(transfer_spec.unspent_outputs, asset_id, transfer_spec.amount)
-
-        # add asset transfer outpu
-        outputs << create_colored_output(oa_address_to_address(transfer_spec.to_script))
-        asset_quantities << transfer_spec.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)
-        end
-
-        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)
-          inputs << uncolored_outputs
-          btc_excess += uncolored_amount
-        end
-
-        change = btc_excess - btc_transfer_spec.amount - fees
-        if change > 0
-          outputs << create_uncolored_output(oa_address_to_address(btc_transfer_spec.change_script), change)
-        end
-
-        if btc_transfer_spec.amount > 0
-          outputs << create_uncolored_output(oa_address_to_address(btc_transfer_spec.to_script), btc_transfer_spec.amount)
-        end
-
-        # add marker output to outputs first.
-        unless asset_quantities.empty?
-          outputs.unshift(create_marker_output(asset_quantities))
-        end
-
-        tx = Bitcoin::Protocol::Tx.new
-        inputs.flatten.each{|i|
-          script_sig = i.output.script.to_binary
-          tx_in = Bitcoin::Protocol::TxIn.from_hex_hash(i.out_point.hash, i.out_point.index)
-          tx_in.script_sig = script_sig
-          tx.add_in(tx_in)
-        }
-        outputs.each{|o|tx.add_out(o)}
-        tx
+        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)
       end
 
-      def transfer_btc
-
+      # 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)
       end
 
       # collect uncolored outputs in unspent outputs(contains colored output).
@@ -166,6 +127,66 @@ 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)
+        inputs = []
+        outputs = []
+        asset_quantities = []
+        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
+
+          # add asset transfer output
+          outputs << create_colored_output(oa_address_to_address(transfer_spec.to_script))
+          asset_quantities << transfer_spec.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)
+          end
+        }
+
+        # btc_excess = inputs(colored) total satoshi - outputs(transfer) total satoshi
+        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)
+          inputs << uncolored_outputs
+          btc_excess += uncolored_amount
+        end
+
+        otsuri = btc_excess - btc_transfer_spec.amount - fees
+        if otsuri > 0
+          outputs << create_uncolored_output(btc_transfer_spec.change_script, otsuri)
+        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
+            else
+              amount = btc_transfer_spec.amount / btc_output_qty
+            end
+            outputs << create_uncolored_output(btc_transfer_spec.to_script, amount)
+          }
+        end
+
+        # add marker output to outputs first.
+        unless asset_quantities.empty?
+          outputs.unshift(create_marker_output(asset_quantities))
+        end
+
+        tx = Bitcoin::Protocol::Tx.new
+        inputs.flatten.each{|i|
+          script_sig = i.output.script.to_binary
+          tx_in = Bitcoin::Protocol::TxIn.from_hex_hash(i.out_point.hash, i.out_point.index)
+          tx_in.script_sig = script_sig
+          tx.add_in(tx_in)
+        }
+        outputs.each{|o|tx.add_out(o)}
+        tx
+      end
+
     end
 
   end

data/lib/openassets/version.rb

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

metadata

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