openassets-ruby 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a02703514bb6c61cd1bf4f7eaad7402855dead43
-  data.tar.gz: f78d71f011dab41f68dc60a3ccdb751bf8a0f9c2
+  metadata.gz: 14a0524ecd885560924bce4da7804e6aa39f176d
+  data.tar.gz: 2a726966732a748b5645eb58272df80922660d63
 SHA512:
-  metadata.gz: 4229ca4a625d8f1d76503829b7fd3646e36ee945cde151930f0ed0d6cae4d80c768729da2055a19b957b57acd22daaabf57251ac556856b31a3196c9cd01e440
-  data.tar.gz: f1a1339a39e8e368a579339b89a1ec0900ecd927d1fa97cbd5d9538d2a16d57e9ce445959aa49536d6aa3d728633640cf03234a09e034d8e480bb888d402d913
+  metadata.gz: ae77d53785ec2b31a2692e96b5580e2dbdb5021cb2011228e26a33ca060c96fee45adf4a45dee1fc0a2b37234363f879db632315b6fbe58b589b191c48ccd602
+  data.tar.gz: d188e2415a112a7d3d34bd3bd1c513a3672dd30f7d57c7fdef772d7ada7156796ac3ffb3e0e49bc29bc7d19d297d5bf6b6534d3fb2fc9ae145d3b16c048e3c15

data/README.md

@@ -164,6 +164,25 @@ This transaction inputs use only uncolored outputs.
 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.
 
+* **get_outputs_from_txid**  
+Get tx outputs. (use for debug)
+  ```ruby
+  api.get_outputs_from_txid('3fba8bfb157ae29c293d5bd65c178fec169a87f880e2e62537fcce26612a6aa3')
+  > [{
+      "address": "14M4kbAtn71P1nnNYuhBDFTNYxa19t1XP6",
+      "oa_address": "akEJwzkzEFau4t2wjbXoMs7MwtZkB8xixmH",
+      "script": "76a91424b3d405bc60bd9628691fe28bb00f6800e1480688ac",
+      "amount": "0.00000600",
+      "asset_id": "AWo3R89p5REmoSyMWB8AeUmud8456bRxZL",
+      "asset_quantity": "1",
+      "asset_amount": "1",
+      "account": null,
+      "asset_definition_url": "",
+      "txid": "3fba8bfb157ae29c293d5bd65c178fec169a87f880e2e62537fcce26612a6aa3",
+      "vout": 1
+    },..
+  ``` 
+  
 ## License
 
 The MIT License (MIT)

data/lib/openassets/api.rb

@@ -43,24 +43,7 @@ module OpenAssets
     def list_unspent(oa_address_list = [])
       btc_address_list = oa_address_list.map { |oa_address| oa_address_to_address(oa_address)}
       outputs = get_unspent_outputs(btc_address_list)
-      result = outputs.map{|out|
-        address = script_to_address(out.output.script)
-        script = out.output.script.to_payload.bth
-        {
-          'txid' => out.out_point.hash,
-          'vout' =>  out.out_point.index,
-          'address' =>  address,
-          'oa_address' => address.nil? ? nil : address_to_oa_address(address),
-          'script' => script,
-          'amount' => satoshi_to_coin(out.output.value),
-          'confirmations' => out.confirmations,
-          'asset_id' => out.output.asset_id,
-          'account' => out.output.account,
-          'asset_quantity' => out.output.asset_quantity.to_s,
-          'asset_amount' => out.output.asset_amount.to_s,
-          'asset_definition_url' => out.output.asset_definition_url
-        }
-      }
+      result = outputs.map{|out| out.to_hash}
       result
     end
 
@@ -179,12 +162,12 @@ module OpenAssets
       decode_tx = provider.get_transaction(txid, 0)
       raise OpenAssets::Transaction::TransactionBuildError, "txid #{txid} could not be retrieved." if decode_tx.nil?
       tx = Bitcoin::Protocol::Tx.new(decode_tx.htb)
-      colored_outputs = get_color_transaction(tx)
+      colored_outputs = get_color_outputs_from_tx(tx)
       colored_outputs.each_with_index { |o, index | @cache[txid + index.to_s] = o}
       colored_outputs[output_index]
     end
 
-    def get_color_transaction(tx)
+    def get_color_outputs_from_tx(tx)
       unless tx.is_coinbase?
         tx.outputs.each_with_index { |out, i|
           marker_output_payload = OpenAssets::Protocol::MarkerOutput.parse_script(out.pk_script)
@@ -201,10 +184,21 @@ module OpenAssets
       tx.outputs.map{|out| OpenAssets::Protocol::TransactionOutput.new(out.value, out.parsed_script, nil, 0, OpenAssets::Protocol::OutputType::UNCOLORED)}
     end
 
+    # Get tx outputs. (use for debug)
+    # @param[String] txid Transaction ID.
+    # @return[Array] Return array of the transaction output Hash with coloring information.
+    def get_outputs_from_txid(txid)
+      decode_tx = provider.get_transaction(txid, 0)
+      raise OpenAssets::Transaction::TransactionBuildError, "txid #{txid} could not be retrieved." if decode_tx.nil?
+      tx = Bitcoin::Protocol::Tx.new(decode_tx.htb)
+      outputs = get_color_outputs_from_tx(tx)
+      outputs.map.with_index{|out, i|out.to_hash.merge({'txid' => tx.hash, 'vout' => i})}
+    end
+
     private
     # @param [Array[OpenAssets::Protocol::TransactionOutput] inputs The outputs referenced by the inputs of the transaction.
     # @param [Integer] marker_output_index The position of the marker output in the transaction.
-    # @param [Array[Bitcoin::Protocol::TxOUt]] outputs The outputs of the transaction.
+    # @param [Array[Bitcoin::Protocol::TxOut]] outputs The outputs of the transaction.
     # @param [Array[OpenAssets::Protocol::TransactionOutput]] asset_quantities The list of asset quantities of the outputs.
     def compute_asset_ids(inputs, marker_output_index, outputs, asset_quantities)
       return nil if asset_quantities.length > outputs.length - 1 || inputs.length == 0

data/lib/openassets/protocol/transaction_output.rb

@@ -4,6 +4,8 @@ module OpenAssets
     # Represents a transaction output and its asset ID and asset quantity.
     class TransactionOutput
 
+      include OpenAssets::Util
+
       attr_accessor :value
       attr_accessor :script
       attr_accessor :asset_id
@@ -46,6 +48,22 @@ module OpenAssets
         @asset_definition.divisibility
       end
 
+      # convert to hash object.
+      def to_hash
+        address = script_to_address(@script)
+        {
+            'address' =>  address,
+            'oa_address' => address.nil? ? nil : address_to_oa_address(address),
+            'script' => @script.to_payload.bth,
+            'amount' => satoshi_to_coin(@value),
+            'asset_id' => @asset_id,
+            'asset_quantity' => @asset_quantity.to_s,
+            'asset_amount' => asset_amount.to_s,
+            'account' => @account,
+            'asset_definition_url' => @asset_definition_url
+        }
+      end
+
       private
 
       @@definition_cache = {}

data/lib/openassets/transaction/spendable_output.rb

@@ -16,6 +16,13 @@ module OpenAssets
       def initialize(out_point, output)
         @out_point = out_point
         @output = output
+        @confirmations = 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)
       end
 
     end

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

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