bitcoinrb 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0cc5450016d6ffbb76d36dcccd415a485a8532ab8414d9beddb9a7e25305dba
-  data.tar.gz: 75d509c36069ce2dee667a0330962ae310c8062f24aa01d299e5692f6f069461
+  metadata.gz: a6e5ff6fa694353e122cd0028354edff2aa877debdc36d368503c25f6277c77f
+  data.tar.gz: a6ef9fb214582173d6681dcad6547208b6c606f9d4b82f1c2b3423f388866db1
 SHA512:
-  metadata.gz: c2457464548bd24c937eaf55aa53ff2b7ca01b5db0b57b66d7e6fef60142cde6ff2752d670e06bd6052470b6eef25af9f3b676ffe1842fd98c1fd9d590888556
-  data.tar.gz: 95d5649e3cacc1a155b0e033f0275d9f1806a9e39aad2bbe0c9b61809a10b76d117dddf94c0c68eae50e9dd52aa8e3f266244e2a400821d9172e2706a371c654
+  metadata.gz: b4b858790060163880d19b8d771383b406facaa755386e7919e8c6d1caa6b7f362eeb611846f13f40b406114cae7d3e100cf4f5cb46adef01e37d40a43c35de6
+  data.tar.gz: a4712b529713ad39bebd6f32d9124d2f07d3c77c22482297df550f384b6f3ebf0ee6000958494684a95cc70354f95a22d8361dd686241c2d67c645fcee20ea5c

data/bitcoinrb.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'eventmachine_httpserver'
   spec.add_runtime_dependency 'iniparse'
   spec.add_runtime_dependency 'siphash'
-  spec.add_runtime_dependency 'json_pure', '>= 2.3.1', '< 2.8.0'
   spec.add_runtime_dependency 'bip-schnorr', '>= 0.7.0'
   spec.add_runtime_dependency 'base32', '>= 0.3.4'
   spec.add_runtime_dependency 'base64', '~> 0.2.0'
   spec.add_runtime_dependency 'observer', '~> 0.1.2'
   spec.add_runtime_dependency 'secp256k1rb', '0.1.1'
+  spec.add_runtime_dependency 'logger'
 end

data/lib/bitcoin/ext.rb

@@ -1,6 +1,5 @@
 module Bitcoin
   module Ext
-    autoload :JsonParser, 'bitcoin/ext/json_parser'
     autoload :ArrayExt, 'bitcoin/ext/array_ext'
     autoload :ObjectExt, 'bitcoin/ext/object_ext'
   end

data/lib/bitcoin/rpc/bitcoin_core_client.rb

@@ -62,7 +62,8 @@ module Bitcoin
         request.body = data.to_json
         response = http.request(request)
         body = response.body
-        response = Bitcoin::Ext::JsonParser.new(body.gsub(/\\u([\da-fA-F]{4})/) { [$1].pack('H*').unpack('n*').pack('U*').encode('ISO-8859-1').force_encoding('UTF-8') }).parse
+        json_data = JSON.parse(body.gsub(/\\u([\da-fA-F]{4})/) { [$1].pack('H*').unpack('n*').pack('U*').encode('ISO-8859-1').force_encoding('UTF-8') })
+        response = convert_floats_to_strings(json_data)
         raise response['error'].to_json if response['error']
         response['result']
       end
@@ -77,6 +78,19 @@ module Bitcoin
         end
       end
 
+      # Convert float value
+      def convert_floats_to_strings(obj)
+        case obj
+        when Float
+          obj.to_s
+        when Hash
+          obj.transform_values { |v| convert_floats_to_strings(v) }
+        when Array
+          obj.map { |item| convert_floats_to_strings(item) }
+        else
+          obj
+        end
+      end
     end
   end
 end

data/lib/bitcoin/script/tx_checker.rb

@@ -37,7 +37,7 @@ module Bitcoin
 
     # check schnorr signature.
     # @param [String] sig schnorr signature with hex format.
-    # @param [String] pubkey a public key with hex fromat.
+    # @param [String] pubkey a public key with hex format.
     # @param [Symbol] sig_version whether :taproot or :tapscript
     # @return [Boolean] verification result
     def check_schnorr_sig(sig, pubkey, sig_version, opts = {})

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - azuchi
 bindir: exe
 cert_chain: []
-date: 2025-02-03 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa_ext
@@ -149,26 +149,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: bip-schnorr
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +219,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The implementation of Bitcoin Protocol for Ruby.
 email:
 - azuchi@chaintope.com
@@ -308,7 +302,6 @@ files:
 - lib/bitcoin/ext.rb
 - lib/bitcoin/ext/array_ext.rb
 - lib/bitcoin/ext/ecdsa.rb
-- lib/bitcoin/ext/json_parser.rb
 - lib/bitcoin/ext/object_ext.rb
 - lib/bitcoin/ext_key.rb
 - lib/bitcoin/gcs_filter.rb
@@ -457,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: The implementation of Bitcoin Protocol for Ruby.
 test_files: []

data/lib/bitcoin/ext/json_parser.rb

@@ -1,46 +0,0 @@
-require 'json/pure'
-
-module Bitcoin
-  module Ext
-    # Extension of JSON::Pure::Parser.
-    # This class convert Float value to String value.
-    class JsonParser < JSON::Pure::Parser
-
-      def parse_value
-        case
-        when scan(FLOAT)
-          self[1].to_s
-        when scan(INTEGER)
-          Integer(self[1])
-        when scan(TRUE)
-          true
-        when scan(FALSE)
-          false
-        when scan(NULL)
-          nil
-        when !UNPARSED.equal?(string = parse_string)
-          string
-        when scan(ARRAY_OPEN)
-          @current_nesting += 1
-          ary = parse_array
-          @current_nesting -= 1
-          ary
-        when scan(OBJECT_OPEN)
-          @current_nesting += 1
-          obj = parse_object
-          @current_nesting -= 1
-          obj
-        when @allow_nan && scan(NAN)
-          NaN
-        when @allow_nan && scan(INFINITY)
-          Infinity
-        when @allow_nan && scan(MINUS_INFINITY)
-          MinusInfinity
-        else
-          UNPARSED
-        end
-      end
-
-    end
-  end
-end