openassets-ruby 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76264bfa708badea9cd4797851dbf74c8d96e869
-  data.tar.gz: 1bf65b91f46e0e81b6a4b5b7ee580dc4b131cb3c
+  metadata.gz: 42f90d72e17b972a1339a04511c2f8df17a0f90d
+  data.tar.gz: 4b9d6b5a3133cb1602ebcf866a67dd202817410a
 SHA512:
-  metadata.gz: 9f4b49c84af17ef43f9e0b961d65b4320566c2174ebaa9dd036295448ecbd5b5769ab118bf01f14283862a7c02dcbb0d61ffa9e3a04a6195a2d7ee83c1c4fa93
-  data.tar.gz: c5da7028a8bed46e6488544972bec5e129b6b3f6aa7bea56f09ea977b2c9f1257c74302fe28ee69ac14415a85b88614c0e7c227c9ca8d220cff2f7c47bb8ad0c
+  metadata.gz: 863eeb3a760be7d9705d81d31cbfa18829e6b66557f05f1b750950b6c112bcaa1b1bfdbdbd63cc93abe7944724db545e2bb8fcb33e19330a0a7ed81e3279681b
+  data.tar.gz: 614c5bc59d24ca6322d44219e80330e2edeb74b47459c8d4877543e307e29d3955a0477adc5083f7eb29b7b6a8eb8cfc099ef62e9c0bcb9450f2239dfa789928

data/lib/openassets/api.rb

@@ -405,7 +405,7 @@ module OpenAssets
       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 = to_bytes(redeem_script.chunks[0].to_s.bth)[0..-1].map{|x|x.to_i(16).chr}.join
       asset_def && asset_def.start_with?('u=') ? asset_def : nil
     end
 

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 end

data/lib/segwit/tx.rb

@@ -8,10 +8,10 @@ class Bitcoin::Protocol::Tx
     @ver, @lock_time, @in, @out, @scripts, @witness = 1, 0, [], [], [], Bitcoin::Protocol::TxWitness.new
     @enable_bitcoinconsensus = !!ENV['USE_BITCOINCONSENSUS']
     if data
-      if witness_tx?(data)
-        parse_witness_data_from_io(data) # parse witness data
-      else
-        parse_data_from_io(data) # parse no witness data
+      begin
+        parse_witness_data_from_io(data) unless parse_data_from_io(data).is_a?(TrueClass)
+      rescue Exception
+        parse_witness_data_from_io(data)
       end
     end
   end
@@ -73,14 +73,4 @@ class Bitcoin::Protocol::Tx
     payload
   end
 
-  # Checks witness transaction data.
-  # see https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki
-  def witness_tx?(data)
-    buf = data.is_a?(String) ? StringIO.new(data) : data
-    buf.read(4) # read nVersion
-    marker = buf.read(1).unpack("c").first
-    flag = buf.read(1).unpack("c").first
-    marker == 0 && flag == 1
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby