openassets-ruby 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd0918ad4bb75cb8cbc1a3cd13fcedffde7d97a9
-  data.tar.gz: ca7fc189f43ea44adf304ab3a2f3e4df831a936f
+  metadata.gz: feddc0050a29a509975ae29fdd81e8f464612c99
+  data.tar.gz: e8c6b8bb501b03f12833613d3fd8cb12c29e9d9f
 SHA512:
-  metadata.gz: 927f9c392e633ff2ce0f621b792283c5c6e3705dd9e8d83a561a4b946e0b575ec342e4512e72ceb8de1726963de72817ef924e5b481913e983cfdb0862578e5f
-  data.tar.gz: 0662166b353f3e54a6514d49440ff4c2fbaf82ee61d899e46107f4f3f325f6ae3ad10d7b8ae242e2e02f268cfbe0809bcff5dcb5737bd35cf66ec27dcc83816c
+  metadata.gz: 82c528c39eaa375f6a888164cb2e8edbaa4524bfd13dfd8d24fa5dd73c44225d6ff72f41a4503a69ef60cae193e1dda8c7d87d69f001b22b8d2233a1110dcea3
+  data.tar.gz: 30b2d8a9e9e60b425f7fb8ffcc863c5dd150405ffcb647c7b5626bb22e2950ba6f64a6cf860c0107da6adb788cb02af7ba4e179112770ee99cdec82eeed0f53e

data/README.md

@@ -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:'.|cache.db|
+|**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|
 |**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,8 +28,10 @@ module OpenAssets
       else
         raise OpenAssets::Error, 'specified unsupported provider.'
       end
-      @tx_cache = Cache::TransactionCache.new(@config[:cache])
-      @output_cache = Cache::OutputCache.new(@config[:cache])
+      unless @config[:cache] == :none
+        @tx_cache = Cache::TransactionCache.new(@config[:cache])
+        @output_cache = Cache::OutputCache.new(@config[:cache])
+      end
       change_network
     end
 
@@ -209,12 +211,14 @@ module OpenAssets
     end
 
     def get_output(txid, output_index)
-      cached = output_cache.get(txid, output_index)
-      return cached unless cached.nil?
+      if output_cache
+        cached = output_cache.get(txid, output_index)
+        return cached unless cached.nil?
+      end
       decode_tx = load_cached_tx(txid)
       tx = Bitcoin::Protocol::Tx.new(decode_tx.htb)
       colored_outputs = get_color_outputs_from_tx(tx)
-      colored_outputs.each_with_index { |o, index| output_cache.put(txid, index, o)}
+      colored_outputs.each_with_index { |o, index| output_cache.put(txid, index, o)} if output_cache
       colored_outputs[output_index]
     end
 
@@ -387,6 +391,7 @@ module OpenAssets
     end
 
     def load_cached_tx(txid)
+      return load_tx(txid) unless tx_cache
       decode_tx = tx_cache.get(txid)
       if decode_tx.nil?
         decode_tx = load_tx(txid)

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] : ':memory:'
+        path = OpenAssets.configuration && OpenAssets.configuration[:cache] != :none ? OpenAssets.configuration[:cache] : ':memory:'
         super(path)
       end
 

data/lib/openassets/protocol.rb

@@ -3,6 +3,8 @@ module OpenAssets
     autoload :MarkerOutput, 'openassets/protocol/marker_output'
     autoload :TransactionOutput, 'openassets/protocol/transaction_output'
     autoload :OutputType, 'openassets/protocol/output_type'
+    autoload :AssetDefinitionLoader, 'openassets/protocol/asset_definition_loader'
+    autoload :HttpAssetDefinitionLoader, 'openassets/protocol/http_asset_definition_loader'
     autoload :AssetDefinition, 'openassets/protocol/asset_definition'
   end
 end

data/lib/openassets/protocol/asset_definition.rb

@@ -53,19 +53,6 @@ module OpenAssets
         definition
       end
 
-      # Parse the JSON obtained from the URL, and create a AssetDefinition object.
-      # @param[String] url The URL of Asset Definition.
-      def self.parse_url(url)
-        begin
-          definition = parse_json(RestClient::Request.execute(:method => :get, :url => url, :timeout => 10, :open_timeout => 10))
-          definition.asset_definition_url = url
-          definition
-        rescue => e
-          puts e
-          nil
-        end
-      end
-
       def include_asset_id?(asset_id)
         return false if asset_ids.nil? || asset_ids.empty?
         asset_ids.include?(asset_id)

data/lib/openassets/protocol/asset_definition_loader.rb

@@ -0,0 +1,22 @@
+module OpenAssets
+  module Protocol
+
+    class AssetDefinitionLoader
+
+      attr_reader :loader
+
+      def initialize(metadata)
+        if metadata.start_with?('http://') || metadata.start_with?('https://')
+          @loader = HttpAssetDefinitionLoader.new(metadata)
+        end
+      end
+
+      # load Asset Definition File
+      # @return[OpenAssets::Protocol::AssetDefinition] loaded asset definition object
+      def load_definition
+        @loader.load
+      end
+
+    end
+  end
+end

data/lib/openassets/protocol/http_asset_definition_loader.rb

@@ -0,0 +1,27 @@
+module OpenAssets
+  module Protocol
+
+    # Asset Definition loader for http or https uri scheme
+    class HttpAssetDefinitionLoader
+
+      attr_reader :url
+
+      def initialize(url)
+        @url = url
+      end
+
+      # load asset definition
+      def load
+        begin
+          definition = AssetDefinition.parse_json(RestClient::Request.execute(:method => :get, :url => url, :timeout => 10, :open_timeout => 10))
+          definition.asset_definition_url = url
+          definition
+        rescue => e
+          puts e
+          nil
+        end
+      end
+
+    end
+  end
+end

data/lib/openassets/protocol/marker_output.rb

@@ -43,6 +43,7 @@ module OpenAssets
       # @param [String] payload The Open Assets Payload.
       # @return [OpenAssets::Protocol::MarkerOutput] The marker output object.
       def self.deserialize_payload(payload)
+        return nil unless valid?(payload)
         payload = payload[8..-1] # exclude OAP_MARKER,VERSION
         asset_quantity, payload = parse_asset_qty(payload)
         list = to_bytes(payload).map{|x|(x.to_i(16)>=128 ? x : x+"|")}.join.split('|')[0..(asset_quantity - 1)].join
@@ -57,24 +58,7 @@ module OpenAssets
       # @return [String] The byte string of the marker output payload if the output fits the pattern, nil otherwise.
       def self.parse_script(output_script)
         data = Bitcoin::Script.new(output_script).get_op_return_data
-        return data if data.nil?
-        # check open assets marker
-        return nil unless data.start_with?(OAP_MARKER + VERSION)
-        # check asset quantity
-        offset = [OAP_MARKER + VERSION].pack('H*').length
-        count, offset = read_var_integer(data, offset)
-        return nil unless count
-        # check metadata
-        count.times do
-          quantity, length = read_leb128(data, offset)
-          return nil if quantity.nil? || (length - offset) > 9
-          offset = length
-        end
-        # check metadata
-        length, offset = read_var_integer(data, offset)
-        return nil unless length
-        return nil if [data].pack('H*').bytes.length < length + offset
-        data
+        return data if valid?(data)
       end
 
       # Creates an output script containing an OP_RETURN and a PUSHDATA from payload.
@@ -117,6 +101,29 @@ module OpenAssets
         end
       end
 
+      # validate marker output format
+      # @param[String] data marker output data with start with 4f41
+      def self.valid?(data)
+        return false if data.nil?
+        # check open assets marker
+        return false unless data.start_with?(OAP_MARKER + VERSION)
+        # check asset quantity
+        offset = [OAP_MARKER + VERSION].pack('H*').length
+        count, offset = read_var_integer(data, offset)
+        return false unless count
+        # check metadata
+        count.times do
+          quantity, length = read_leb128(data, offset)
+          return false if quantity.nil? || (length - offset) > 9
+          offset = length
+        end
+        # check metadata
+        length, offset = read_var_integer(data, offset)
+        return false unless length
+        return false if [data].pack('H*').bytes.length < length + offset
+        true
+      end
+
     end
 
   end

data/lib/openassets/protocol/transaction_output.rb

@@ -120,7 +120,10 @@ module OpenAssets
       end
 
       def load_asset_definition(url)
-        @@definition_cache[url] = AssetDefinition.parse_url(metadata_url) unless @@definition_cache.has_key?(url)
+        unless @@definition_cache.has_key?(url)
+          loader = AssetDefinitionLoader.new(metadata_url)
+          @@definition_cache[url] = loader.load_definition
+        end
         @@definition_cache[url]
       end
     end

data/lib/openassets/transaction/transaction_builder.rb

@@ -193,28 +193,30 @@ module OpenAssets
         # Only when assets are transferred
         asset_based_specs = {}
         asset_transfer_specs.each{|asset_id, transfer_spec|
-          asset_based_specs[asset_id] = [] unless asset_based_specs.has_key?(asset_id)
-          asset_based_specs[asset_id] << transfer_spec
+          asset_based_specs[asset_id] = {} unless asset_based_specs.has_key?(asset_id)
+          asset_based_specs[asset_id][transfer_spec.change_script] = [] unless asset_based_specs[asset_id].has_key?(transfer_spec.change_script)
+          asset_based_specs[asset_id][transfer_spec.change_script] << transfer_spec
         }
 
-        asset_based_specs.each{|asset_id, transfer_specs|
-          transfer_amount = transfer_specs.inject(0){|sum, s| sum + s.amount}
-          colored_outputs, total_amount = TransactionBuilder.collect_colored_outputs(transfer_specs[0].unspent_outputs, asset_id, transfer_amount)
-          inputs = inputs + colored_outputs
-          transfer_specs.each{|spec|
-            # add asset transfer output
-            spec.split_output_amount.each {|amount|
-              outputs << create_colored_output(oa_address_to_address(spec.to_script))
-              asset_quantities << amount
+        asset_based_specs.each{|asset_id, address_based_specs|
+          address_based_specs.values.each{|transfer_specs|
+            transfer_amount = transfer_specs.inject(0){|sum, s| sum + s.amount}
+            colored_outputs, total_amount = TransactionBuilder.collect_colored_outputs(transfer_specs[0].unspent_outputs, asset_id, transfer_amount)
+            inputs = inputs + colored_outputs
+            transfer_specs.each{|spec|
+              # add asset transfer output
+              spec.split_output_amount.each {|amount|
+                outputs << create_colored_output(oa_address_to_address(spec.to_script))
+                asset_quantities << amount
+              }
             }
+            # add the rest of the asset to the origin address
+            if total_amount > transfer_amount
+              outputs << create_colored_output(oa_address_to_address(transfer_specs[0].change_script))
+              asset_quantities << (total_amount - transfer_amount)
+            end
           }
-          # add the rest of the asset to the origin address
-          if total_amount > transfer_amount
-            outputs << create_colored_output(oa_address_to_address(transfer_specs[0].change_script))
-            asset_quantities << (total_amount - transfer_amount)
-          end
         }
-
         # End of asset settings
 
         ## For bitcoins transfer

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -183,6 +183,8 @@ files:
 - lib/openassets/medhod_filter.rb
 - lib/openassets/protocol.rb
 - lib/openassets/protocol/asset_definition.rb
+- lib/openassets/protocol/asset_definition_loader.rb
+- lib/openassets/protocol/http_asset_definition_loader.rb
 - lib/openassets/protocol/marker_output.rb
 - lib/openassets/protocol/output_type.rb
 - lib/openassets/protocol/transaction_output.rb
@@ -224,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The implementation of the Open Assets Protocol for Ruby.