openassets-ruby 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73a2e3f9a8afacf4353d268e424223fd17baaa11
-  data.tar.gz: 194c9b3a032235108ae763f7c9f4fe967e3e763b
+  metadata.gz: 76264bfa708badea9cd4797851dbf74c8d96e869
+  data.tar.gz: 1bf65b91f46e0e81b6a4b5b7ee580dc4b131cb3c
 SHA512:
-  metadata.gz: 8ea7f8836af8f8095145692593b05f79c399c6cb5a90cd9fb40291bdc093a65f0994c5b987b56241ffe444e7680c85c06b8e3fc25f34cf09ea174274d023e826
-  data.tar.gz: 0ef222597d3614e49481d953eb11e1453e892ca1b8ee68c7287d8c96c4ea1f83f7c8392a6de933000b68108b5ed2a14615c4abca5d95f6ebb02788577267b393
+  metadata.gz: 9f4b49c84af17ef43f9e0b961d65b4320566c2174ebaa9dd036295448ecbd5b5769ab118bf01f14283862a7c02dcbb0d61ffa9e3a04a6195a2d7ee83c1c4fa93
+  data.tar.gz: c5da7028a8bed46e6488544972bec5e129b6b3f6aa7bea56f09ea977b2c9f1257c74302fe28ee69ac14415a85b88614c0e7c227c9ca8d220cff2f7c47bb8ad0c

data/lib/openassets/protocol/transaction_output.rb

@@ -59,6 +59,7 @@ module OpenAssets
             'address' =>  address,
             'oa_address' => oa_address,
             'script' => @script.to_payload.bth,
+            'script_type' => script_type,
             'amount' => satoshi_to_coin(@value),
             'asset_id' => @asset_id,
             'asset_quantity' => @asset_quantity.to_s,
@@ -89,6 +90,30 @@ module OpenAssets
         end
       end
 
+      # get pubkey script type
+      def script_type
+        case @script.type
+          when :hash160
+            'pubkeyhash'
+          when :pubkey
+            'pubkey'
+          when :multisig
+            'multisig'
+          when :p2sh
+            'scripthash'
+          when :op_return
+            'nulldata'
+          when :witness_v0_keyhash
+            'witness_v0_keyhash'
+          when :witness_v0_scripthash
+            'witness_v0_scripthash'
+          when :unknown
+            'nonstandard'
+          else
+            'nonstandard'
+        end
+      end
+
       private
 
       @@definition_cache = {}

data/lib/openassets/util.rb

@@ -56,7 +56,7 @@ module OpenAssets
 
     # LEB128 encode
     def encode_leb128(value)
-      LEB128.encode(value, false).read.bth
+      LEB128.encode_unsigned(value).read.bth
     end
 
     # LEB128 decode
@@ -66,7 +66,7 @@ module OpenAssets
       value.htb.each_byte{|b|
         sio.putc(b)
         if b < 128
-          results << LEB128.decode(sio, false)
+          results << LEB128.decode_unsigned(sio)
           sio = StringIO.new
         end
       }

data/lib/openassets/version.rb

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

data/lib/segwit.rb

@@ -1,6 +1,7 @@
 module Bitcoin
   module Protocol
     require 'segwit/tx'
+    require 'segwit/script'
     autoload :TxWitness, 'segwit/tx_witness'
     autoload :TxInWitness, 'segwit/tx_in_witness'
     autoload :ScriptWitness, 'segwit/script_witness'

data/lib/segwit/script.rb

@@ -0,0 +1,36 @@
+module SegwitScript
+
+  # override Bitcoin::Script#is_standard?
+  # Add P2WPKH and P2WSH to the standard
+  def is_standard?
+    super || is_witness_v0_keyhash? || is_witness_v0_scripthash?
+  end
+
+  # see https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki#Witness_program
+  def is_witness_v0_keyhash?
+    @chunks.length == 2 &&@chunks[0] == 0 && @chunks[1].bytesize == 20
+  end
+
+  # see https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki#Witness_program
+  def is_witness_v0_scripthash?
+    @chunks.length == 2 &&@chunks[0] == 0 && @chunks[1].bytesize == 32
+  end
+
+  # override Bitcoin::Script#type
+  # Add type witness_v0_keyhash and witness_v0_scripthash
+  def type
+    base = super
+    if base == :unknown
+      return :witness_v0_keyhash if is_witness_v0_keyhash?
+      return :witness_v0_scripthash if is_witness_v0_scripthash?
+      :unknown
+    else
+      base
+    end
+  end
+
+end
+
+class Bitcoin::Script
+  prepend SegwitScript
+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
-      begin
-        parse_data_from_io(data) # parse no witness data
-      rescue StandardError
+      if witness_tx?(data)
         parse_witness_data_from_io(data) # parse witness data
+      else
+        parse_data_from_io(data) # parse no witness data
       end
     end
   end
@@ -73,4 +73,14 @@ 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

data/openassets-ruby.gemspec

@@ -23,7 +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", '0.1.1'
+  spec.add_runtime_dependency "leb128", '~> 1.0.0'
   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.6
+  version: 0.5.7
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -84,16 +84,16 @@ dependencies:
   name: leb128
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,7 @@ files:
 - lib/openassets/util.rb
 - lib/openassets/version.rb
 - lib/segwit.rb
+- lib/segwit/script.rb
 - lib/segwit/script_witness.rb
 - lib/segwit/tx.rb
 - lib/segwit/tx_in_witness.rb