openassets-ruby 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e14dae510bd326f2eebfd68bb8c340c357bd784
-  data.tar.gz: b47b056dd41870261c220ceebb54a1e93552f244
+  metadata.gz: d5a79cc924492696e02f90d9b2921b0753d9e619
+  data.tar.gz: 875977bc89c76903f923b20f1ca15da38e881345
 SHA512:
-  metadata.gz: 61d27c133aa5469a76f1e021b261fcbcc0f43b05d63501a0db0dae4050ab00237d8edd01ff8598ed8412880aef3a9bcfa2c270a53b871ca1e1e31be18f2e6f46
-  data.tar.gz: c95fa4b8b7761e5c30a0d50d73c7a84df18d3f6eb729d63c5729096a775988d528377be9347dae557aa6b8567ffa9fe6f684777a905852a937256e961b5e6330
+  metadata.gz: 6f27081be1ef5c68114410337396fb78e65ca3f7535ab40758111971fc66b72760ce7bcdb7ff899d467bfbd90dc60a0b21d5484e6d74eeb573e80579493e4822
+  data.tar.gz: dfc1b43a7acb7f8a8191c2c938f88cb3446fc8e5575381ead4574fda5c69caaf7d1ec00be5237dadb40a02e5e35bb9dd2a72dd31441ea4e64ee9ea7c42a99fab

data/README.md

@@ -17,7 +17,7 @@ require 'openassets'
 
 api = OpenAssets::Api.new({:network => 'mainnet',
                      :provider => 'bitcoind',
-                     :dust_limit => 600,
+                     :dust_limit => 600, :default_fees => 10000,
                      :rpc => {:user => 'xxx', :password => 'xxx', :schema => 'http', :port => 8332, :host => 'localhost'}})                      
 ```
 
@@ -28,10 +28,20 @@ require 'openassets'
 
 api = OpenAssets::Api.new({:network => 'testnet',
                      :provider => 'bitcoind',
-                     :dust_limit => 600,
+                     :dust_limit => 600, :default_fees => 10000,
                      :rpc => {:user => 'xxx', :password => 'xxx', :schema => 'http', :port => 18332, :host => 'localhost'}})                      
 ```
 
+The configuration options are as follows:
+
+|option|describe|default|
+|---|---|---|
+|**network**|The using network. "mainnet" or "testnet" |mainnet|
+|**provider**|The RPC server. Specify possible now only "bitcoind".|bitcoind|
+|**dust_limit**|The amount of Bitcoin, which is set to the each output of the Open Assets Protocol(issue or transfer).|600 (satoshi)|
+|**default_fees**|The transaction fee. (used by issue_asset and send_asset, send_bitcoin )|10000 (satoshi)|
+|**rpc**|The access information to the RPC server of Bitcoin Core.|N/A|
+
 ## API
 
 Currently openassets-ruby support the following API.   
@@ -183,6 +193,21 @@ Get tx outputs. (use for debug)
     },..
   ``` 
   
+* **send_assets**  
+Creates a transaction for sending **multiple** asset from the open asset address to another.
+  ```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')
+  params = []
+  params << OpenAssets::SendAssetParam.new('oGu4VXx2TU97d9LmPP8PMCkHckkcPqC5RY', 50, to)
+  params << OpenAssets::SendAssetParam.new('oUygwarZqNGrjDvcZUpZdvEc7es6dcs1vs', 4, to)
+  tx = api.send_assets(from, params)
+  ``` 
+
 ## License
 
 The MIT License (MIT)

data/lib/openassets.rb

@@ -9,5 +9,6 @@ module OpenAssets
   autoload :Api, 'openassets/api'
   autoload :Provider, 'openassets/provider'
   autoload :Error, 'openassets/error'
+  autoload :SendAssetParam, 'openassets/send_asset_param'
 
 end

data/lib/openassets/api.rb

@@ -7,7 +7,7 @@ module OpenAssets
     include Util
     include MethodFilter
 
-    before_filter :change_network, {:include => [:list_unspent, :get_balance, :issue_asset, :send_asset, :send_bitcoin]}
+    before_filter :change_network, {:include => [:list_unspent, :get_balance, :issue_asset, :send_asset, :send_assets, :send_bitcoin]}
 
     attr_reader :config
     attr_reader :provider
@@ -114,7 +114,26 @@ module OpenAssets
       builder = OpenAssets::Transaction::TransactionBuilder.new(@config[:dust_limit])
       colored_outputs = get_unspent_outputs([oa_address_to_address(from)])
       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 = builder.transfer_asset(asset_id, asset_transfer_spec, from, fees.nil? ? @config[:default_fees]: fees)
+      tx = process_transaction(tx, mode)
+      tx
+    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::SendAssetParams]] 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,
+    # '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')
+      builder = OpenAssets::Transaction::TransactionBuilder.new(@config[:dust_limit])
+      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)]
+      }
+      tx = builder.transfer_assets(transfer_specs, from, fees.nil? ? @config[:default_fees]: fees)
       tx = process_transaction(tx, mode)
       tx
     end

data/lib/openassets/send_asset_param.rb

@@ -0,0 +1,15 @@
+module OpenAssets
+
+    class SendAssetParam
+      attr_accessor :asset_id
+      attr_accessor :amount
+      attr_accessor :to
+
+      def initialize(asset_id, amount, to)
+        @asset_id = asset_id
+        @amount = amount
+        @to = to
+      end
+    end
+
+end

data/lib/openassets/transaction/transaction_builder.rb

@@ -45,12 +45,18 @@ 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(asset_id, asset_transfer_spec, btc_change_script, fees)
+      def transfer_asset(asset_id, asset_transfer_spec, btc_change_script, fees)
         btc_transfer_spec = OpenAssets::Transaction::TransferParameters.new(
             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
 
+      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)
+        transfer(transfer_specs, 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.

data/lib/openassets/util.rb

@@ -91,6 +91,17 @@ module OpenAssets
       }
     end
 
+    # generate Asset ID from open asset address.
+    def oa_address_to_asset_id(oa_address)
+      address_to_asset_id(oa_address_to_address(oa_address))
+    end
+
+    # generate Asset ID from bitcoin address.
+    def address_to_asset_id(btc_address)
+      pubkey_hash = hash160_from_address(btc_address)
+      pubkey_hash_to_asset_id(pubkey_hash)
+    end
+
     private
     def oa_version_byte
       Bitcoin.network[:address_version] == "6f" ? OA_VERSION_BYTE_TESTNET : OA_VERSION_BYTE

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -126,6 +126,7 @@ files:
 - lib/openassets/provider/api_error.rb
 - lib/openassets/provider/bitcoin_core_provider.rb
 - lib/openassets/provider/block_chain_provider_base.rb
+- lib/openassets/send_asset_param.rb
 - lib/openassets/transaction.rb
 - lib/openassets/transaction/dust_output_error.rb
 - lib/openassets/transaction/insufficient_asset_quantity_error.rb