openassets-ruby 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9d348974ed51f85bc9e72c5eb5a38bd0a184238
-  data.tar.gz: a693b29a1e8d88cb25b6babd4cabcfd42640502d
+  metadata.gz: 373d3c6333cae6c3f7b59ab0c5b655016d97a246
+  data.tar.gz: f2893fc9d18904df4ea8120d6d9cf88a955021e9
 SHA512:
-  metadata.gz: 742fe44913fa3c9fe836ee659719236bc024cd6b655a5fcae74affdb22f0f07cf2ec7c7d4f72e47119e88030368b4069f8333f799f963348795411dbf0a0c72b
-  data.tar.gz: 1d0f68e09c1c0f61c78d130d211949f52822cc0617f20314e55515910cc3625f80c92917a8697d44b846c7cb8fe4f43033741f2f39042a80b00c363bcf49a26c
+  metadata.gz: 1eded75af7ea679718ce74292b4cd2c4a74fa0e84788ec760061d587d2d729d00fe43ca0dfd046991cf56c225384d3ecb5010ba4a53540dd9e6f612fe81bf952
+  data.tar.gz: 24180dbf44cdadd4ccf2daf36bdce9e3fcf9abcab72654a677dbaa58e6cf02af1335a0f4b4c6f9273c7dca4827d1409961ca4aab2bb333742291c2af3465be95

data/README.md

@@ -40,7 +40,7 @@ The configuration options are as follows:
 |**provider**|The RPC server. Specify possible now only "bitcoind".|bitcoind|
 |**cache**|The path to the database file. If you want to use in-memory database, specify ':memory:'.|cache.db|
 |**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)|
+|**default_fees**|The default transaction fee in satoshi. If you want to use auto fee settings, specify ':auto'. (used by issue_asset and send_asset, send_bitcoin )|10000 (satoshi)|
 |**min_confirmation**|The minimum number of confirmations the transaction containing an output that used to get UTXO.|1|
 |**max_confirmation**|The maximum number of confirmations the transaction containing an output that used to get UTXO.|9999999|
 |**rpc**|The access information to the RPC server of Bitcoin Core.|N/A|

data/lib/openassets/api.rb

@@ -364,7 +364,20 @@ module OpenAssets
     end
 
     def create_tx_builder
-      OpenAssets::Transaction::TransactionBuilder.new(@config[:dust_limit])
+      if @config[:default_fees] == :auto
+        # Estimate a transaction fee rate (satoshis/KB) if fee is specified by :auto
+        efr = coin_to_satoshi(provider.estimatefee(1).to_s).to_i
+        if efr < 0
+          # Negative efr means "estimatefee" of bitcoin-api returns false
+          # In this case, use default minimum fees rate (10_000 satoshis/KB)
+          efr = 10_000
+        end
+        OpenAssets::Transaction::TransactionBuilder.new(@config[:dust_limit], efr)
+      else
+        # If fee is specified by a fixed value (or the default value)
+        OpenAssets::Transaction::TransactionBuilder.new(@config[:dust_limit])
+      end
+
     end
 
     def load_tx(txid)

data/lib/openassets/protocol/asset_definition.rb

@@ -73,7 +73,9 @@ module OpenAssets
 
       # Convert Asset Definition to json format.
       def to_json
-        to_hash.to_json
+        h = to_hash
+        h.delete('proof_of_authenticity')
+        h.to_json
       end
 
       def to_hash

data/lib/openassets/transaction/transaction_builder.rb

@@ -7,8 +7,12 @@ module OpenAssets
       # The minimum allowed output value.
       attr_accessor :amount
 
-      def initialize(amount = 600)
+      # The estimated transaction fee rate (satoshis/KB).
+      attr_accessor :efr
+      
+      def initialize(amount = 600, efr = 10000)
         @amount = amount
+        @efr = efr 
       end
 
       # Creates a transaction for issuing an asset.
@@ -17,6 +21,12 @@ module OpenAssets
       # @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)
+        
+        if fees == :auto
+          # Calculate fees (assume that one vin and four vouts are wrote)
+          fees = calc_fee(1, 4)
+        end
+        
         inputs, total_amount =
             TransactionBuilder.collect_uncolored_outputs(issue_spec.unspent_outputs, 2 * @amount + fees)
         tx = Bitcoin::Protocol::Tx.new
@@ -50,7 +60,12 @@ module OpenAssets
             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 assets to many.
+      # @param[Array[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(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)
@@ -72,12 +87,18 @@ module OpenAssets
       def transfer_btcs(btc_transfer_specs, fees)
         transfer([], btc_transfer_specs, fees)
       end
-
-
+      
       # Create a transaction for burn asset
       def burn_asset(unspents, asset_id, fee)
+
         tx = Bitcoin::Protocol::Tx.new
         targets = unspents.select{|o|o.output.asset_id == asset_id}
+
+        if fee == :auto
+          # Calculate fees and otsuri (assume that one vout exists)
+          fee = calc_fee(targets.size, 1)
+        end
+        
         raise TransactionBuildError.new('There is no asset.') if targets.length == 0
         total_amount = targets.inject(0){|sum, o|o.output.value + sum}
         otsuri = total_amount - fee
@@ -207,18 +228,32 @@ module OpenAssets
         # Calculate total amount of bitcoins to send
         btc_transfer_total_amount = btc_transfer_specs.inject(0) {|sum, b| sum + b.amount}
 
-        if btc_excess < btc_transfer_total_amount + fees
+        if fees == :auto 
+          fixed_fees = 0
+        else
+          fixed_fees = fees
+        end
+        
+        if btc_excess < btc_transfer_total_amount + fixed_fees
           # When there does not exist enough bitcoins to send in the inputs
           # assign new address (utxo) to the inputs (does not include output coins)
           # CREATING INPUT (if needed)
           uncolored_outputs, uncolored_amount =
-              TransactionBuilder.collect_uncolored_outputs(utxo, btc_transfer_total_amount + fees - btc_excess)
+            TransactionBuilder.collect_uncolored_outputs(utxo, btc_transfer_total_amount + fixed_fees - btc_excess)
           utxo = utxo - uncolored_outputs
           inputs << uncolored_outputs
           btc_excess += uncolored_amount
         end
 
+        if fees == :auto
+          # Calculate fees and otsuri (the numbers of vins and vouts are known)
+          # +1 in the second term means "otsuri" vout, 
+          # and outputs size means the number of vout witn asset_id
+          fees = calc_fee(inputs.size, outputs.size + btc_transfer_specs.size + 1)
+        end
+        
         otsuri = btc_excess - btc_transfer_total_amount - fees
+        
         if otsuri > 0 && otsuri < @amount
           # When there exists otsuri, but it is smaller than @amount (default is 600 satoshis)
           # assign new address (utxo) to the input (does not include @amount - otsuri)
@@ -261,9 +296,22 @@ module OpenAssets
         }
 
         outputs.each{|o|tx.add_out(o)}
-
+        
         tx
       end
+      
+      # Calculate a transaction fee
+      # @param [Integer] inputs_num: The number of vin fields.
+      # @param [Integer] outputs_num: The number of vout fields.
+      # @return [Integer] A transaction fee.
+      def calc_fee(inputs_num, outputs_num) 
+        # See http://bitcoinfees.com/ 
+        tx_size = 148 * inputs_num + 34 * outputs_num + 10
+        # See Bitcoin::tx.calculate_minimum_fee
+        fee = (1 + tx_size / 1_000) * @efr
+        
+        fee
+      end
 
     end
 

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

metadata

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