openassets-ruby 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f3294a9b0b8a8936e8755c1425d11ad371e5c1
-  data.tar.gz: 98adc0ea523613f33fd5f528a4a1a1879a494a5a
+  metadata.gz: 73a2e3f9a8afacf4353d268e424223fd17baaa11
+  data.tar.gz: 194c9b3a032235108ae763f7c9f4fe967e3e763b
 SHA512:
-  metadata.gz: 57873cdabe16afb4d0a2b477d7becaf5705be753af43fb739621f7d7063b965fceea94ce577c0aa3623050dc89f649a07e970d566d7b41c4dfd1271480c241dc
-  data.tar.gz: 3595d40e454e6fd7badb719233b6aa716ed5e26583a5c83e0ccb12fb600eb0366b80cbb9eec9ac38dcf15f8ecca5211b5fa71dfad5de30d83e278bc0fd5407e9
+  metadata.gz: 8ea7f8836af8f8095145692593b05f79c399c6cb5a90cd9fb40291bdc093a65f0994c5b987b56241ffe444e7680c85c06b8e3fc25f34cf09ea174274d023e826
+  data.tar.gz: 0ef222597d3614e49481d953eb11e1453e892ca1b8ee68c7287d8c96c4ea1f83f7c8392a6de933000b68108b5ed2a14615c4abca5d95f6ebb02788577267b393

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.2
+ruby-2.3.0

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "octorelease"
 
 RSpec::Core::RakeTask.new("spec")
 task :default => :spec

data/lib/openassets.rb

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

data/lib/openassets/api.rb

@@ -271,11 +271,7 @@ module OpenAssets
       marker_output = outputs[marker_output_index]
 
       # Add the issuance outputs
-      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
+      issuance_asset_id = script_to_asset_id(prev_outs[0].script.to_payload.bth)
 
       for i in (0..marker_output_index-1)
         value = outputs[i].value
@@ -283,7 +279,7 @@ 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 prev_outs[0].script.is_p2sh?
+          if (metadata.nil? || metadata.length == 0) && prev_outs[0].script.is_p2sh?
             metadata = parse_issuance_p2sh_pointer(tx.in[0].script_sig)
           end
           metadata = '' unless metadata

data/lib/openassets/version.rb

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

data/lib/segwit.rb

@@ -0,0 +1,8 @@
+module Bitcoin
+  module Protocol
+    require 'segwit/tx'
+    autoload :TxWitness, 'segwit/tx_witness'
+    autoload :TxInWitness, 'segwit/tx_in_witness'
+    autoload :ScriptWitness, 'segwit/script_witness'
+  end
+end

data/lib/segwit/script_witness.rb

@@ -0,0 +1,23 @@
+class Bitcoin::Protocol::ScriptWitness
+
+  # witness stack
+  attr_reader :stack
+
+  def initialize
+    @stack = []
+  end
+
+  def empty?
+    stack.empty?
+  end
+
+  # output script in raw binary format
+  def to_payload
+    payload = Bitcoin::Protocol.pack_var_int(stack.size)
+    stack.each{|e|
+      payload << Bitcoin::Protocol.pack_var_int(e.htb.bytesize)
+      payload << e.htb
+    }
+    payload
+  end
+end

data/lib/segwit/tx.rb

@@ -0,0 +1,76 @@
+# extension for Bitcoin::Protocol::Tx to support segwit
+class Bitcoin::Protocol::Tx
+  include Bitcoin::Util
+
+  attr_reader :witness
+
+  def initialize(data=nil)
+    @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
+        parse_witness_data_from_io(data) # parse witness data
+      end
+    end
+  end
+
+  # get witness hash
+  def witness_hash
+    hash_from_payload(to_witness_payload)
+  end
+
+  # parse raw data which include witness data
+  # serialization format is defined by https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki
+  def parse_witness_data_from_io(data)
+    buf = data.is_a?(String) ? StringIO.new(data) : data
+
+    @ver = buf.read(4).unpack("V").first
+
+    @marker = buf.read(1).unpack("c").first
+
+    @flag = buf.read(1).unpack("c").first
+
+    in_size = Bitcoin::Protocol.unpack_var_int_from_io(buf)
+    @in = []
+    in_size.times{
+      break if buf.eof?
+      @in << Bitcoin::Protocol::TxIn.from_io(buf)
+    }
+
+    out_size = Bitcoin::Protocol.unpack_var_int_from_io(buf)
+    @out = []
+    out_size.times{
+      break if buf.eof?
+      @out << Bitcoin::Protocol::TxOut.from_io(buf)
+    }
+
+    @witness = Bitcoin::Protocol::TxWitness.new
+    in_size.times{
+      witness_count = Bitcoin::Protocol.unpack_var_int_from_io(buf)
+      in_witness = Bitcoin::Protocol::TxInWitness.new
+      witness_count.times{
+        length = Bitcoin::Protocol.unpack_var_int_from_io(buf)
+        in_witness.add_stack(buf.read(length).unpack("H*").first)
+      }
+      @witness.add_witness(in_witness)
+    }
+
+    @lock_time = buf.read(4).unpack("V").first
+
+    @hash = hash_from_payload(to_payload)
+  end
+
+  # output transaction in raw binary format with witness
+  def to_witness_payload
+    pin = ""
+    @in.each{|input| pin << input.to_payload }
+    pout = ""
+    @out.each{|output| pout << output.to_payload }
+    payload = [@ver].pack("V") << [0].pack("c") << [1].pack("c") << Bitcoin::Protocol.pack_var_int(@in.size) << pin <<
+        Bitcoin::Protocol.pack_var_int(@out.size) << pout << @witness.to_payload << [@lock_time].pack("V")
+    payload
+  end
+
+end

data/lib/segwit/tx_in_witness.rb

@@ -0,0 +1,22 @@
+class Bitcoin::Protocol::TxInWitness
+
+  attr_reader :script_witness
+
+  def initialize
+    @script_witness = Bitcoin::Protocol::ScriptWitness.new
+  end
+
+  def add_stack(script)
+    script_witness.stack << script
+  end
+
+  #  output witness script in raw binary format with witness
+  def to_payload
+    script_witness.to_payload
+  end
+
+  def stack
+    script_witness.stack
+  end
+
+end

data/lib/segwit/tx_witness.rb

@@ -0,0 +1,22 @@
+class Bitcoin::Protocol::TxWitness
+
+  attr_reader :tx_in_wit
+
+  def initialize
+    @tx_in_wit = []
+  end
+
+  # Add witness
+  # @param[Bitcoin::Protocol::TxInWitness] tx_in_wit witness object
+  def add_witness(tx_in_wit)
+    (@tx_in_wit ||= []) << tx_in_wit
+  end
+
+  # output witness in raw binary format
+  def to_payload
+    payload = ""
+    tx_in_wit.each{|w|payload << w.to_payload}
+    payload
+  end
+
+end

data/openassets-ruby.gemspec

@@ -23,11 +23,11 @@ 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_runtime_dependency "leb128", '0.1.1'
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "timecop"
-  spec.add_development_dependency "octorelease"
+  spec.add_development_dependency "travis"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2016-11-13 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'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: octorelease
+  name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -219,6 +219,11 @@ files:
 - lib/openassets/transaction/transfer_parameters.rb
 - lib/openassets/util.rb
 - lib/openassets/version.rb
+- lib/segwit.rb
+- lib/segwit/script_witness.rb
+- lib/segwit/tx.rb
+- lib/segwit/tx_in_witness.rb
+- lib/segwit/tx_witness.rb
 - openassets-ruby.gemspec
 homepage: https://github.com/haw-itn/openassets-ruby
 licenses:
@@ -240,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The implementation of the Open Assets Protocol for Ruby.