tapyrus 0.2.13 → 0.3.2

data/lib/tapyrus/script/tx_checker.rb

@@ -1,12 +1,10 @@
 module Tapyrus
   class TxChecker
-    attr_reader :tx
-    attr_reader :input_index
-    attr_reader :amount
+    attr_accessor :tx
+    attr_accessor :input_index
 
-    def initialize(tx: nil, amount: 0, input_index: nil)
+    def initialize(tx: nil, input_index: nil)
       @tx = tx
-      @amount = amount
       @input_index = input_index
     end
 
@@ -14,15 +12,13 @@ module Tapyrus
     # @param [String] script_sig a signature with hex format.
     # @param [String] pubkey a public key with hex format.
     # @param [Tapyrus::Script] script_code
-    # @param [Integer] sig_version
     # @return [Boolean] if check is passed return true, otherwise false.
-    def check_sig(script_sig, pubkey, script_code, sig_version)
+    def check_sig(script_sig, pubkey, script_code)
       return false if script_sig.empty?
       script_sig = script_sig.htb
       hash_type = script_sig[-1].unpack('C').first
       sig = script_sig[0..-2]
-      sighash =
-        tx.sighash_for_input(input_index, script_code, hash_type: hash_type, amount: amount, sig_version: sig_version)
+      sighash = tx.sighash_for_input(input_index, script_code, hash_type: hash_type)
       verify_sig(sig.bth, pubkey, sighash)
     end
 

data/lib/tapyrus/tx.rb

@@ -103,34 +103,23 @@ module Tapyrus
       to_payload.bytesize
     end
 
-    # get signature hash
+    # Generate signature hash
     # @param [Integer] input_index input index.
     # @param [Integer] hash_type signature hash type
-    # @param [Tapyrus::Script] output_script script pubkey or script code. if script pubkey is P2WSH, set witness script to this.
-    # @param [Integer] amount tapyrus amount locked in input. required for witness input only.
-    # @param [Integer] skip_separator_index If output_script is P2WSH and output_script contains any OP_CODESEPARATOR,
-    # the script code needs  is the witnessScript but removing everything up to and including the last executed OP_CODESEPARATOR before the signature checking opcode being executed.
-    def sighash_for_input(
-      input_index,
-      output_script,
-      hash_type: SIGHASH_TYPE[:all],
-      sig_version: :base,
-      amount: nil,
-      skip_separator_index: 0
-    )
+    # @param [Tapyrus::Script] output_script script pubkey or script code. if script pubkey is P2SH, set redeem script to this.
+    # @return [String] sighash
+    def sighash_for_input(input_index, output_script, hash_type: SIGHASH_TYPE[:all])
       raise ArgumentError, 'input_index must be specified.' unless input_index
       raise ArgumentError, 'does not exist input corresponding to input_index.' if input_index >= inputs.size
       raise ArgumentError, 'script_pubkey must be specified.' unless output_script
-      raise ArgumentError, 'unsupported sig version specified.' unless SIG_VERSION.include?(sig_version)
       sighash_for_legacy(input_index, output_script, hash_type)
     end
 
     # verify input signature.
     # @param [Integer] input_index
     # @param [Tapyrus::Script] script_pubkey the script pubkey for target input.
-    # @param [Integer] amount the amount of tapyrus, require for witness program only.
     # @param [Array] flags the flags used when execute script interpreter.
-    def verify_input_sig(input_index, script_pubkey, amount: nil, flags: STANDARD_SCRIPT_VERIFY_FLAGS)
+    def verify_input_sig(input_index, script_pubkey, flags: STANDARD_SCRIPT_VERIFY_FLAGS)
       flags << SCRIPT_VERIFY_P2SH if script_pubkey.p2sh?
       verify_input_sig_for_legacy(input_index, script_pubkey, flags)
     end
@@ -207,7 +196,9 @@ module Tapyrus
       checker = Tapyrus::TxChecker.new(tx: self, input_index: input_index)
       interpreter = Tapyrus::ScriptInterpreter.new(checker: checker, flags: flags)
 
-      interpreter.verify_script(script_sig, script_pubkey)
+      result = interpreter.verify_script(script_sig, script_pubkey)
+      warn("Verify failed. Cause: #{interpreter.error}") unless result
+      result
     end
   end
 end

data/lib/tapyrus/tx_builder.rb

@@ -89,9 +89,11 @@ module Tapyrus
         script_pubkey = script_pubkey.add_color(color_id)
       end
 
+      output = Tapyrus::TxOut.new(script_pubkey: script_pubkey, value: value)
+      raise ArgumentError, 'The transaction amount is too small' if color_id.default? && output.dust?
       @outgoings[color_id] ||= 0
       @outgoings[color_id] += value
-      @outputs << Tapyrus::TxOut.new(script_pubkey: script_pubkey, value: value)
+      @outputs << output
       self
     end
 
@@ -136,13 +138,16 @@ module Tapyrus
     def add_change(tx)
       @incomings.each do |color_id, in_amount|
         out_amount = @outgoings[color_id] || 0
-        change, script_pubkey =
+        output =
           if color_id.default?
-            [in_amount - out_amount - estimated_fee, @change_script_pubkey]
+            change = in_amount - out_amount - estimated_fee
+            change_output = Tapyrus::TxOut.new(script_pubkey: @change_script_pubkey, value: change)
+            change_output unless change_output.dust?
           else
-            [in_amount - out_amount, @change_script_pubkey.add_color(color_id)]
+            change = in_amount - out_amount
+            Tapyrus::TxOut.new(script_pubkey: @change_script_pubkey.add_color(color_id), value: change) if change > 0
           end
-        tx.outputs << Tapyrus::TxOut.new(script_pubkey: script_pubkey, value: change) if change > 0
+        tx.outputs << output if output
       end
     end
 

data/lib/tapyrus/version.rb

@@ -1,3 +1,3 @@
 module Tapyrus
-  VERSION = '0.2.13'
+  VERSION = '0.3.2'
 end

data/lib/tapyrus.rb

@@ -156,22 +156,6 @@ module Tapyrus
     end
   end
 
-  class ::Object
-    def build_json
-      self.is_a?(Array) ? "[#{self.map { |o| o.to_h.to_json }.join(',')}]" : to_h.to_json
-    end
-
-    def to_h
-      return self if self.is_a?(String)
-      instance_variables.inject({}) do |result, var|
-        key = var.to_s
-        key.slice!(0) if key.start_with?('@')
-        value = instance_variable_get(var)
-        value.is_a?(Array) ? result.update(key => value.map { |v| v.to_h }) : result.update(key => value)
-      end
-    end
-  end
-
   class ::Integer
     def to_even_length_hex
       hex = to_s(16)

data/tapyrusrb.gemspec

@@ -31,12 +31,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'siphash'
   spec.add_runtime_dependency 'activesupport', '>= 5.2.3'
   spec.add_runtime_dependency 'json_pure', '>= 2.3.1'
+  spec.add_runtime_dependency 'terminal-table', '~> 3.0.2'
 
   # for options
   spec.add_development_dependency 'leveldb-native'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'prettier'
+  spec.add_development_dependency 'prettier', '2.0.0'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'timecop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tapyrus
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.2
 platform: ruby
 authors:
 - azuchi
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: leveldb-native
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +224,16 @@ dependencies:
   name: prettier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -280,6 +294,7 @@ description: The implementation of Tapyrus Protocol for Ruby.
 email:
 - azuchi@chaintope.com
 executables:
+- tapyrus-script-debugger
 - tapyrusrb-cli
 - tapyrusrbd
 extensions: []
@@ -299,6 +314,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/tapyrus-script-debugger
 - exe/tapyrusrb-cli
 - exe/tapyrusrbd
 - lib/openassets.rb
@@ -425,7 +441,7 @@ homepage: https://github.com/chaintope/tapyrusrb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -440,8 +456,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.3.21
+signing_key: 
 specification_version: 4
 summary: The implementation of Tapyrus Protocol for Ruby.
 test_files: []