openassets-ruby 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7799eb6ff465493ef1873435b320f4700499128
-  data.tar.gz: 2a30a7092e1d2bdfc301f208c692ca617a0ae95b
+  metadata.gz: 72f3294a9b0b8a8936e8755c1425d11ad371e5c1
+  data.tar.gz: 98adc0ea523613f33fd5f528a4a1a1879a494a5a
 SHA512:
-  metadata.gz: d5bb413b7fe229ea47230bb5b1da509693f0502132ba4383cfc0dee6af146e3b16c84bc7aa42136f13b8dcedb825072d2e53e350f2c94986dfc3b04a089d173f
-  data.tar.gz: 77ebd36b208b46b2c88d16be49256d822a56b69eed147a374ce7a73195ecbefcab45d52cee1600b5aa26972215b50c4274a5759407cce8ae7027165d227dc82f
+  metadata.gz: 57873cdabe16afb4d0a2b477d7becaf5705be753af43fb739621f7d7063b965fceea94ce577c0aa3623050dc89f649a07e970d566d7b41c4dfd1271480c241dc
+  data.tar.gz: 3595d40e454e6fd7badb719233b6aa716ed5e26583a5c83e0ccb12fb600eb0366b80cbb9eec9ac38dcf15f8ecca5211b5fa71dfad5de30d83e278bc0fd5407e9

data/README.md

@@ -1,5 +1,5 @@
 # openassets-ruby [![Build Status](https://travis-ci.org/haw-itn/openassets-ruby.svg?branch=master)](https://travis-ci.org/haw-itn/openassets-ruby) [![Gem Version](https://badge.fury.io/rb/openassets-ruby.svg)](https://badge.fury.io/rb/openassets-ruby) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
-The implementation of the Open Assets Protocol for Ruby.
+The implementation of the [Open Assets Protocol](https://github.com/OpenAssets/open-assets-protocol) for Ruby.
 
 ## Install
 
@@ -38,7 +38,7 @@ The configuration options are as follows:
 |---|---|---|
 |**network**|The using network. "mainnet" or "testnet" or "regtest" |mainnet|
 |**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:'. If do not use cache, specify 'none' .|cache.db|
+|**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 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|

data/lib/openassets/api.rb

@@ -28,10 +28,8 @@ module OpenAssets
       else
         raise OpenAssets::Error, 'specified unsupported provider.'
       end
-      unless @config[:cache] == 'none'
-        @tx_cache = Cache::TransactionCache.new(@config[:cache])
-        @output_cache = Cache::OutputCache.new(@config[:cache])
-      end
+      @tx_cache = Cache::TransactionCache.new(@config[:cache])
+      @output_cache = Cache::OutputCache.new(@config[:cache])
       change_network
     end
 
@@ -233,10 +231,8 @@ module OpenAssets
           marker_output_payload = OpenAssets::Protocol::MarkerOutput.parse_script(out.pk_script)
           unless marker_output_payload.nil?
             marker_output = OpenAssets::Protocol::MarkerOutput.deserialize_payload(marker_output_payload)
-            inputs = tx.inputs.map {|input|
-              get_output(input.previous_output, input.prev_out_index)
-            }
-            asset_ids = compute_asset_ids(inputs, i, tx.outputs, marker_output.asset_quantities)
+            prev_outs = tx.inputs.map {|input|get_output(input.previous_output, input.prev_out_index)}
+            asset_ids = compute_asset_ids(prev_outs, i, tx, marker_output.asset_quantities)
             return asset_ids unless asset_ids.nil?
           end
         }
@@ -263,18 +259,23 @@ module OpenAssets
     end
 
     private
-    # @param [Array[OpenAssets::Protocol::TransactionOutput] inputs The outputs referenced by the inputs of the transaction.
+    # @param [Array[OpenAssets::Protocol::TransactionOutput] prev_outs 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 [Bitcoin::Protocol::Tx] tx 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
+    def compute_asset_ids(prev_outs, marker_output_index, tx, asset_quantities)
+      outputs = tx.outputs
+      return nil if asset_quantities.length > outputs.length - 1 || prev_outs.length == 0
       result = []
 
       marker_output = outputs[marker_output_index]
 
       # Add the issuance outputs
-      issuance_asset_id = pubkey_hash_to_asset_id(inputs[0].script.get_hash160)
+      if prev_outs[0].script.is_p2sh?
+        issuance_asset_id = script_to_asset_id(prev_outs[0].script.to_payload.bth)
+      else
+        issuance_asset_id = pubkey_hash_to_asset_id(prev_outs[0].script.get_hash160)
+      end
 
       for i in (0..marker_output_index-1)
         value = outputs[i].value
@@ -282,12 +283,11 @@ module OpenAssets
         if i < asset_quantities.length && asset_quantities[i] > 0
           payload = OpenAssets::Protocol::MarkerOutput.parse_script(marker_output.parsed_script.to_payload)
           metadata = OpenAssets::Protocol::MarkerOutput.deserialize_payload(payload).metadata
-          if metadata.nil?
-            output = OpenAssets::Protocol::TransactionOutput.new(value, script, issuance_asset_id, asset_quantities[i], OpenAssets::Protocol::OutputType::ISSUANCE)
-          else
-            output = OpenAssets::Protocol::TransactionOutput.new(
-                value, script, issuance_asset_id, asset_quantities[i], OpenAssets::Protocol::OutputType::ISSUANCE, metadata)
+          if prev_outs[0].script.is_p2sh?
+            metadata = parse_issuance_p2sh_pointer(tx.in[0].script_sig)
           end
+          metadata = '' unless metadata
+          output = OpenAssets::Protocol::TransactionOutput.new(value, script, issuance_asset_id, asset_quantities[i], OpenAssets::Protocol::OutputType::ISSUANCE, metadata)
         else
           output = OpenAssets::Protocol::TransactionOutput.new(value, script, nil, 0, OpenAssets::Protocol::OutputType::ISSUANCE)
         end
@@ -311,14 +311,13 @@ module OpenAssets
       remove_outputs.each{|o|outputs.delete(o)}
 
       # Add the transfer outputs
-      input_enum = inputs.each
+      input_enum = prev_outs.each
       input_units_left = 0
       index = 0
       for i in (marker_output_index + 1)..(outputs.length-1)
         output_asset_quantity = (i <= asset_quantities.length) ? asset_quantities[i-1] : 0
         output_units_left = output_asset_quantity
-        asset_id = nil
-        metadata = nil
+        asset_id,metadata = nil
         while output_units_left > 0
           index += 1
           if input_units_left == 0
@@ -405,6 +404,15 @@ module OpenAssets
       decode_tx
     end
 
+    # parse issuance p2sh which contains asset definition pointer
+    def parse_issuance_p2sh_pointer(script_sig)
+      script = Bitcoin::Script.new(script_sig).chunks.last
+      redeem_script = Bitcoin::Script.new(script)
+      return nil unless redeem_script.chunks[1] == Bitcoin::Script::OP_DROP
+      asset_def = to_bytes(redeem_script.chunks[0].bth)[0..-1].map{|x|x.to_i(16).chr}.join
+      asset_def && asset_def.start_with?('u=') ? asset_def : nil
+    end
+
   end
 
 end

data/lib/openassets/cache/ssl_certificate_cache.rb

@@ -3,7 +3,7 @@ module OpenAssets
     class SSLCertificateCache < SQLiteBase
 
       def initialize
-        path = OpenAssets.configuration && OpenAssets.configuration[:cache] != :none ? OpenAssets.configuration[:cache] : ':memory:'
+        path = OpenAssets.configuration ? OpenAssets.configuration[:cache] : ':memory:'
         super(path)
       end
 

data/lib/openassets/protocol/asset_definition_loader.rb

@@ -2,12 +2,14 @@ module OpenAssets
   module Protocol
 
     class AssetDefinitionLoader
+      extend Bitcoin::Util
+      extend OpenAssets::Util
 
       attr_reader :loader
 
-      def initialize(metadata)
-        if metadata.start_with?('http://') || metadata.start_with?('https://')
-          @loader = HttpAssetDefinitionLoader.new(metadata)
+      def initialize(url)
+        if url.start_with?('http://') || url.start_with?('https://')
+          @loader = HttpAssetDefinitionLoader.new(url)
         end
       end
 
@@ -17,6 +19,25 @@ module OpenAssets
         @loader.load if @loader
       end
 
+      # create redeem script of asset definition file using p2sh
+      # @param[String] url The asset definition url.
+      # @param[String] to The open asset address to send the asset to.
+      # @return[Bitcoin::Script] redeem script.
+      def self.create_pointer_redeem_script(url, to)
+        asset_def = "u=#{url}".bytes.map{|b|b.to_s(16)}.join
+        btc_addr = oa_address_to_address(to)
+        script = Bitcoin::Script.from_string("#{asset_def}")
+        Bitcoin::Script.new(script.append_opcode(Bitcoin::Script::OP_DROP).to_payload + Bitcoin::Script.to_address_script(btc_addr))
+      end
+
+      # create ps2s script which specify asset definition pointer
+      # @param[String] url The asset definition url.
+      # @param[String] to The open asset address to send the asset to.
+      # @return[Bitcoin::Script] p2sh script.
+      def self.create_pointer_p2sh(url, to)
+        redeem_script = create_pointer_redeem_script(url, to)
+        Bitcoin::Script.new(Bitcoin::Script.to_p2sh_script(hash160(redeem_script.to_payload.bth)))
+      end
     end
   end
 end

data/lib/openassets/transaction/transaction_builder.rb

@@ -63,7 +63,7 @@ module OpenAssets
       
       # 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[OpenAssets::Transaction::TransferParameters] btc_transfer_spec 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_transfer_spec, fees)

data/lib/openassets/util.rb

@@ -38,29 +38,39 @@ module OpenAssets
       pubkey_hash_to_asset_id(hash160(pub_key))
     end
 
-    def pubkey_hash_to_asset_id(hash)
+    def pubkey_hash_to_asset_id(pubkey_hash)
       # gen P2PKH script hash
       # P2PKH script = OP_DUP OP_HASH160 <PubKeyHash> OP_EQUALVERIFY OP_CHECKSIG
       # （76=OP_DUP, a9=OP_HASH160, 14=Bytes to push, 88=OP_EQUALVERIFY, ac=OP_CHECKSIG）
-      script = hash160(["76", "a9", "14", hash, "88", "ac"].join)
-      script = oa_version_byte.to_s(16) + script # add version byte to script hash
-      encode_base58(script + checksum(script)) # add checksum & encode
+      hash_to_asset_id(hash160(["76", "a9", "14", pubkey_hash, "88", "ac"].join))
+    end
+
+    def script_to_asset_id(script)
+      hash_to_asset_id(hash160(script))
+    end
+
+    def hash_to_asset_id(hash)
+      hash = oa_version_byte.to_s(16) + hash # add version byte to script hash
+      encode_base58(hash + checksum(hash)) # add checksum & encode
     end
 
     # LEB128 encode
     def encode_leb128(value)
-      d7=->n{(n>>7)==0 ? [n] : d7[n>>7]+[127 & n]}
-      msb=->a{a0=a[0].to_s(16);[(a[0]< 16 ? "0"+a0 : a0)]+a[1..-1].map{|x|(x|128).to_s(16)}}
-      leb128=->n{msb[d7[n]].reverse.join}
-      leb128[value]
+      LEB128.encode(value, false).read.bth
     end
 
     # LEB128 decode
     def decode_leb128(value)
-      mbs = to_bytes(value).map{|x|(x.to_i(16)>=128 ? x : x+"|")}.join.split('|')
-      num=->a{(a.size==1 ? a[0] : (num[a[0..-2]]<<7)|a[-1])}
-      r7=->n{to_bytes(n).map{|x|(x.to_i(16))&127}}
-      mbs.map{|x|num[r7[x].reverse]}
+      results = []
+      sio = StringIO.new
+      value.htb.each_byte{|b|
+        sio.putc(b)
+        if b < 128
+          results << LEB128.decode(sio, false)
+          sio = StringIO.new
+        end
+      }
+      results
     end
 
     def to_bytes(string)
@@ -109,17 +119,6 @@ module OpenAssets
       valid_address?(address)
     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
-
     # read variable integer
     # @param [String] data reading data
     # @param [Integer] offset the position when reading from data.

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

data/lib/openassets.rb

@@ -1,4 +1,5 @@
 require 'bitcoin'
+require 'leb128'
 module OpenAssets
 
   autoload :Protocol, 'openassets/protocol'

data/openassets-ruby.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rest-client", "~>1.8.0"
   spec.add_runtime_dependency "httpclient"
   spec.add_runtime_dependency "sqlite3"
+  spec.add_runtime_dependency "leb128"
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: leb128
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement