tapyrus 0.2.13 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82146cdd150374b76b593273e44c31f4f578d38a1b7dcabea0b0d1fd9acbbb5f
-  data.tar.gz: 8895de33dd2b36412f509c4e35465d513d3d6c98a0bcfc0e7db241a77acd8b3b
+  metadata.gz: 21c6e4a293a4eeb2945e7129cfa401927282e944913b992e837c92393a69f1bf
+  data.tar.gz: b03bb102f8856dce5246ba2a89ad6f648f7cf9df92c66616387bb9f1cc15810a
 SHA512:
-  metadata.gz: e386ac9d8578846437902e78d79b3d4419c85df861c831c92641da94d2d46a37c4793efaafa8e28a1da4466e5347fbe79f66beb0d925fe2bfc83cca1d1e90c99
-  data.tar.gz: a34fa0709093aafb118356b7736b409c733e1185a22538f7e2ed4392dac0ac661a652a31853f652d988860ee66c8b57124815b0fc28dd795b7bea97ad44182c5
+  metadata.gz: 4b15f3bc76c02d258b4f05def9f255a765e4b9f369d9d0ef5737b8a788ee7c352b605e2a2680da9e146c50567e06aa351316d3f7cbf6fe0830f39710c01616fa
+  data.tar.gz: 815a380de5e8c790beaf9d5508e5899d16e5ef58894de01ab9d64e011263b5d435b5c550c70f058ae640154944d99324967a9d1f74646107e08dc214317e6d8c

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/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.13'
+  VERSION = '0.3.0'
 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.13
+  version: 0.3.0
 platform: ruby
 authors:
 - azuchi
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-04-20 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.0.6
+signing_key: 
 specification_version: 4
 summary: The implementation of Tapyrus Protocol for Ruby.
 test_files: []