tapyrus 0.2.12 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9619b8bb901abe7085cedda9ca2ed29efb41281125bca6cfe2fd68facf7fc280
-  data.tar.gz: a1f1d5544976189606b024ce064bdf794d01f646c4ae9b727ff278d071ddb4ce
+  metadata.gz: dc2e90197905239fab7d891f05da735cf1fb2df0127abbb1ca38c1299130914d
+  data.tar.gz: 36a9a028b360a238077bd30c2380b3c722983d5dbd7e5f5d9e6e1d2dbd1408c0
 SHA512:
-  metadata.gz: '05187916624701c58d88d53bc78ddc576de97ddb1b5b3c5a9066093a57256bad53f8f86c2b126e74db36af4ae5a5ddfd3eb6f9a966672c48f45571e2c60aec61'
-  data.tar.gz: db6dc58cc66b4a5e754a21a26738d37af025f81f8c3c1b29635218ec685636250a22d55bc9d953e62203289524fd89640bf5951fba245712c6ba8a2b2fb7673c
+  metadata.gz: e336315f9e68a361edf4b0e2dec290a6e37f666375badc13336391289b773084d57ac324fa5e1b3334faa6400d931abd24dda05345901767a29e9f11251200bc
+  data.tar.gz: a1a3df8abf276b794eed62cd7b238d57fa909315f116d5f12c4b472e32b24c8da1ff8cc62e656fb985cf5728e24a7821580b1f24f09613535a2be4b23f3bf1fa

data/.github/workflows/ruby.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.5", "2.6", "2.7", "3.0"]
+        ruby-version: ["2.6", "2.7", "3.0", "3.1"]
 
     steps:
       - run: sudo apt install libleveldb-dev
@@ -26,8 +26,7 @@ jobs:
       - name: Set up Ruby
         # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
         # change this to (see https://github.com/ruby/setup-ruby#versioning):
-        # uses: ruby/setup-ruby@v1
-        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.ruby-version

@@ -1 +1 @@
-3.0.2
+3.1.2

data/lib/tapyrus/chain_params.rb

@@ -54,7 +54,8 @@ module Tapyrus
     end
 
     def self.init(name)
-      i = YAML.load(File.open("#{__dir__}/chainparams/#{name}.yml"))
+      yaml = File.open("#{__dir__}/chainparams/#{name}.yml")
+      i = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(yaml) : YAML.load(yaml)
       i.dust_relay_fee ||= Tapyrus::DUST_RELAY_TX_FEE
       i
     end

data/lib/tapyrus/ext.rb

@@ -1,5 +1,21 @@
 module Tapyrus
   module Ext
     autoload :JsonParser, 'tapyrus/ext/json_parser'
+
+    refine Object do
+      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
   end
 end

data/lib/tapyrus/network/message_handler.rb

@@ -2,6 +2,8 @@ module Tapyrus
   module Network
     # P2P message handler used by peer connection class.
     module MessageHandler
+      using Tapyrus::Ext
+
       # handle p2p message.
       def handle(message)
         peer.last_recv = Time.now.to_i

data/lib/tapyrus/rpc/request_handler.rb

@@ -96,7 +96,7 @@ module Tapyrus
           script = Tapyrus::Script.parse_from_payload(hex_script.htb)
           h = script.to_h
           h.delete(:hex)
-          h[:p2sh] = script.to_p2sh.addresses.first unless script.p2sh?
+          h[:p2sh] = script.to_p2sh.to_addr unless script.p2sh?
           h
         rescue Exception
           raise ArgumentError.new('Script decode failed')

data/lib/tapyrus/rpc/tapyrus_core_client.rb

@@ -24,8 +24,13 @@ module Tapyrus
         @rpc_error = rpc_error
       end
 
-      def message
-        @message ||=
+      # Return response object as Hash
+      # @return [Hash] response
+      # @option response_code [Integer] HTTP status code
+      # @option response_msg [String] HTTP response body
+      # @option rpc_error [String] error message received from Tapyrus Core
+      def response
+        @response ||=
           begin
             m = { response_code: response_code, response_msg: response_msg }
             m.merge!(rpc_error: rpc_error) if rpc_error
@@ -33,8 +38,14 @@ module Tapyrus
           end
       end
 
+      # Return string that represents error message.
+      # @return [String] error message
+      def message
+        response.to_json
+      end
+
       def to_s
-        message.to_s
+        message
       end
     end
 

data/lib/tapyrus/script/script.rb

@@ -61,7 +61,7 @@ module Tapyrus
     end
 
     # Add color identifier to existing p2pkh or p2sh
-    # @param [ColorIdentifier] color identifier
+    # @param [ColorIdentifier] color_id color identifier
     # @return [Script] CP2PKH or CP2SH script
     # @raise [ArgumentError] if color_id is nil or invalid
     # @raise [RuntimeError] if script is neither p2pkh nor p2sh
@@ -75,7 +75,6 @@ module Tapyrus
     end
 
     # Remove color identifier from cp2pkh or cp2sh
-    # @param [ColorIdentifier] color identifier
     # @return [Script] P2PKH or P2SH script
     # @raise [RuntimeError] if script is neither cp2pkh nor cp2sh
     def remove_color
@@ -118,26 +117,18 @@ module Tapyrus
     # @param [String] addr address.
     # @return [Tapyrus::Script] parsed script.
     def self.parse_from_addr(addr)
-      begin
-        segwit_addr = Bech32::SegwitAddr.new(addr)
-        raise 'Invalid hrp.' unless Tapyrus.chain_params.bech32_hrp == segwit_addr.hrp
-        Tapyrus::Script.parse_from_payload(segwit_addr.to_script_pubkey.htb)
-      rescue Exception => e
-        hex, addr_version = Tapyrus.decode_base58_address(addr)
-        case addr_version
-        when Tapyrus.chain_params.address_version
-          Tapyrus::Script.to_p2pkh(hex)
-        when Tapyrus.chain_params.p2sh_version
-          Tapyrus::Script.to_p2sh(hex)
-        when Tapyrus.chain_params.cp2pkh_version
-          color = Tapyrus::Color::ColorIdentifier.parse_from_payload(hex[0..65].htb)
-          Tapyrus::Script.to_cp2pkh(color, hex[66..-1])
-        when Tapyrus.chain_params.cp2sh_version
-          color = Tapyrus::Color::ColorIdentifier.parse_from_payload(hex[0..65].htb)
-          Tapyrus::Script.to_cp2sh(color, hex[66..-1])
-        else
-          throw e
-        end
+      hex, addr_version = Tapyrus.decode_base58_address(addr)
+      case addr_version
+      when Tapyrus.chain_params.address_version
+        Tapyrus::Script.to_p2pkh(hex)
+      when Tapyrus.chain_params.p2sh_version
+        Tapyrus::Script.to_p2sh(hex)
+      when Tapyrus.chain_params.cp2pkh_version
+        color = Tapyrus::Color::ColorIdentifier.parse_from_payload(hex[0..65].htb)
+        Tapyrus::Script.to_cp2pkh(color, hex[66..-1])
+      when Tapyrus.chain_params.cp2sh_version
+        color = Tapyrus::Color::ColorIdentifier.parse_from_payload(hex[0..65].htb)
+        Tapyrus::Script.to_cp2sh(color, hex[66..-1])
       end
     end
 
@@ -189,6 +180,17 @@ module Tapyrus
       chunks.size == 0
     end
 
+    # Returns the address corresponding to this script. Return nil if there is no corresponding address.
+    # @return [String] address
+    def to_addr
+      return p2pkh_addr if p2pkh?
+      return p2sh_addr if p2sh?
+      return cp2pkh_addr if cp2pkh?
+      return cp2sh_addr if cp2sh?
+      nil
+    end
+
+    # @deprecated use #to_addr method.
     def addresses
       return [p2pkh_addr] if p2pkh?
       return [p2sh_addr] if p2sh?

data/lib/tapyrus/version.rb

@@ -1,3 +1,3 @@
 module Tapyrus
-  VERSION = '0.2.12'
+  VERSION = '0.3.1'
 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

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   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.12
+  version: 0.3.1
 platform: ruby
 authors:
 - azuchi
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -210,16 +210,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
@@ -425,7 +425,7 @@ homepage: https://github.com/chaintope/tapyrusrb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -440,8 +440,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.7
+signing_key: 
 specification_version: 4
 summary: The implementation of Tapyrus Protocol for Ruby.
 test_files: []