tapyrus 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba1dec1b7532b15985c9233604dc63ad38b4a11e61d4bbc63d54cebdb291b3d6
-  data.tar.gz: 3b7cb3c9e41df3693ac45b22084108b1ec682fd753a10ff95cf0d50133bff959
+  metadata.gz: 15ad1708c6361b20c98632d45f81d2ad445114b45123fbc5acc2c8da2fc01c1b
+  data.tar.gz: 74a754e7045b6a2475eeb913b79acee31fe882ac8bda39918c774017e1d0cb4e
 SHA512:
-  metadata.gz: f82c7815830b1eb9aba88b0247acf36cb64f9ab47802e6b05c6dc4e167503baf85fa1696bfc59fe79cd78c8866b0638b2022cb52b3c924e2db34f09c06d01370
-  data.tar.gz: 8cdeec0c475d32f905b245f3b2a8ef9551d4ee55a1e21abe9a5b1f38b1dfe6fb317cfa85387899b5d0d5667bf19278654fee800b0b90234fa1407cd9f1703f8b
+  metadata.gz: e71234f42f008a4e81ab87652ffe1e386303b0e0a731fce90a84e7e77fb40ef6549f777762970d6dbbb380d8f6d6fa5f1d4af2a7e42038d8a210221317eb6d33
+  data.tar.gz: 21c7fbefd23b4fb42d4dc9400917c2d42650db8b7dfaa09bb5d96ed14f2d04a707fa749e8964c69b6c297261875f30f2e0a0a6e2b7c1a702e607e9bce537fd49

data/lib/tapyrus.rb

@@ -118,14 +118,7 @@ module Tapyrus
 
     # get opcode
     def opcode
-      case encoding
-      when Encoding::ASCII_8BIT
-        each_byte.next
-      when Encoding::US_ASCII
-        ord
-      else
-        to_i
-      end
+      force_encoding(Encoding::ASCII_8BIT).ord
     end
 
     def opcode?

data/lib/tapyrus/script/script.rb

@@ -130,6 +130,12 @@ module Tapyrus
           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

data/lib/tapyrus/util.rb

@@ -113,6 +113,9 @@ module Tapyrus
       if hex.size == 50 && calc_checksum(hex[0...-8]) == hex[-8..-1]
         raise 'Invalid version bytes.' unless [Tapyrus.chain_params.address_version, Tapyrus.chain_params.p2sh_version].include?(hex[0..1])
         [hex[2...-8], hex[0..1]]
+      elsif hex.size == 116 && calc_checksum(hex[0...-8]) == hex[-8..-1]
+        raise 'Invalid version bytes.' unless [Tapyrus.chain_params.cp2pkh_version, Tapyrus.chain_params.cp2sh_version].include?(hex[0..1])
+        [hex[2...-8], hex[0..1]]
       else
         raise 'Invalid address.'
       end
@@ -128,6 +131,18 @@ module Tapyrus
       OpenSSL::HMAC.digest(DIGEST_NAME_SHA256, key, data)
     end
 
+    # check whether +addr+ is valid address.
+    # @param [String] addr an address
+    # @return [Boolean] if valid address return true, otherwise false.
+    def valid_address?(addr)
+      begin
+        Tapyrus::Script.parse_from_addr(addr)
+        true
+      rescue Exception => e
+        false
+      end
+    end
+
   end
 
   module HexConverter

data/lib/tapyrus/version.rb

@@ -1,3 +1,3 @@
 module Tapyrus
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tapyrus
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -421,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The implementation of Tapyrus Protocol for Ruby.