bitcoinrb 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0cc5450016d6ffbb76d36dcccd415a485a8532ab8414d9beddb9a7e25305dba
-  data.tar.gz: 75d509c36069ce2dee667a0330962ae310c8062f24aa01d299e5692f6f069461
+  metadata.gz: cdae8f671d9fc07798c24ca9293a06ec684e840df4c506e67e2b5945d9b17658
+  data.tar.gz: 6a6a7c20a40c0f1be079da17c15b137240336ca6db029d78246bcc0154aee80f
 SHA512:
-  metadata.gz: c2457464548bd24c937eaf55aa53ff2b7ca01b5db0b57b66d7e6fef60142cde6ff2752d670e06bd6052470b6eef25af9f3b676ffe1842fd98c1fd9d590888556
-  data.tar.gz: 95d5649e3cacc1a155b0e033f0275d9f1806a9e39aad2bbe0c9b61809a10b76d117dddf94c0c68eae50e9dd52aa8e3f266244e2a400821d9172e2706a371c654
+  metadata.gz: 359a3c6d2883a5ae3bda6ffce3987cf01b36c47c29e94d39006d684f48c16cebc892408ddd6c1af1bc27cd9e0d23e18634a219ab6ec585b230d33eeb90402156
+  data.tar.gz: 16b6e7e8c5cf702a2f1d9c56a20815b9a41db5aa9e16b60e8dc7a109af56924f98674ec86c3925dd5fd71c9fd3ec0fe4c2a47beac1cd960c0b7a0a87f425fff4

data/README.md

@@ -83,6 +83,8 @@ This parameter is described in https://github.com/chaintope/bitcoinrb/blob/maste
 
 ```ruby
 Bitcoin.chain_params = :testnet
+# or
+Bitcoin.chain_params = :testnet4
 ```
 
 This parameter is described in https://github.com/chaintope/bitcoinrb/blob/master/lib/bitcoin/chainparams/testnet.yml.

data/bitcoinrb.gemspec

@@ -23,17 +23,17 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ecdsa_ext', '~> 0.5.1'
   spec.add_runtime_dependency 'eventmachine'
   spec.add_runtime_dependency 'murmurhash3', '~> 0.1.7'
-  spec.add_runtime_dependency 'bech32', '>= 1.3.0'
+  spec.add_runtime_dependency 'bech32', '>= 1.5.0'
   spec.add_runtime_dependency 'daemon-spawn'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'leb128', '~> 1.0.0'
   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/key.rb

@@ -34,6 +34,9 @@ module Bitcoin
         @key_type = key_type
         compressed = @key_type != TYPES[:uncompressed]
       else
+        if pubkey && compressed && pubkey.length != COMPRESSED_PUBLIC_KEY_SIZE * 2
+          raise ArgumentError, "Invalid compressed pubkey length."
+        end
         @key_type = compressed ? TYPES[:compressed] : TYPES[:uncompressed]
       end
       @secp256k1_module =  Bitcoin.secp_impl

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/silent_payment.rb

@@ -1,5 +1,92 @@
 module Bitcoin
   module SilentPayment
-    autoload :Addr, 'bitcoin/sp/addr'
+
+
+    # Derive payment
+    # @param [Array] prevouts An array of previous output script(Bitcoin::Script).
+    # @param [Array] private_keys An array of private key corresponding to each public key in prevouts.
+    # @param [Array] recipients
+    # @return [Array]
+    # @raise [ArgumentError]
+    def derive_payment_points(prevouts, private_keys, recipients)
+      raise ArgumentError, "prevouts must be Array." unless prevouts.is_a? Array
+      raise ArgumentError, "private_keys must be Array." unless private_keys.is_a? Array
+      raise ArgumentError, "prevouts and private_keys must be the same length." unless prevouts.length == private_keys.length
+      raise ArgumentError, "recipients must be Array." unless recipients.is_a? Array
+
+      outpoint_l = inputs.map{|i|i.out_point.to_hex}.sort.first
+
+      input_pub_keys = []
+      field = ECDSA::PrimeField.new(Bitcoin::Secp256k1::GROUP.order)
+      sum_priv_keys = 0
+      prevouts.each_with_index do |prevout, index|
+        k = Bitcoin::Key.new(priv_key: private_keys[index].to_s(16))
+        public_key = extract_public_key(prevout, inputs[index])
+        next if public_key.nil?
+        private_key = if public_key.p2tr? && k.to_point.y.odd?
+                        field.mod(-private_keys[index])
+                      else
+                        private_keys[index]
+                      end
+        input_pub_keys << public_key
+        sum_priv_keys = field.mod(sum_priv_keys + private_key)
+      end
+      agg_pubkey = (Bitcoin::Secp256k1::GROUP.generator.to_jacobian * sum_priv_keys).to_affine
+      return [] if agg_pubkey.infinity?
+
+      input_hash = Bitcoin.tagged_hash("BIP0352/Inputs", outpoint_l.htb + agg_pubkey.to_hex.htb).bth
+
+      destinations = {}
+      recipients.each do |sp_addr|
+        raise ArgumentError, "recipients element must be Bech32::SilentPaymentAddr." unless sp_addr.is_a? Bech32::SilentPaymentAddr
+        destinations[sp_addr.scan_key] = [] unless destinations.has_key?(sp_addr.scan_key)
+        destinations[sp_addr.scan_key] << sp_addr.spend_key
+      end
+      outputs = []
+      destinations.each do |scan_key, spends|
+        scan_key = Bitcoin::Key.new(pubkey: scan_key).to_point.to_jacobian
+        ecdh_shared_secret = (scan_key * field.mod(input_hash.to_i(16) * sum_priv_keys)).to_affine.to_hex.htb
+        spends.each.with_index do |spend, i|
+          t_k = Bitcoin.tagged_hash('BIP0352/SharedSecret', ecdh_shared_secret + [i].pack('N'))
+          spend_key = Bitcoin::Key.new(pubkey: spend).to_point.to_jacobian
+          outputs << (spend_key + Bitcoin::Secp256k1::GROUP.generator.to_jacobian * t_k.bth.to_i(16)).to_affine
+        end
+      end
+      outputs
+    end
+
+    # Extract public keys from +prevout+ and input.
+    def extract_public_key(prevout, input)
+      if prevout.p2pkh?
+        spk_hash = prevout.chunks[2].pushed_data.bth
+        input.script_sig.chunks.reverse.each do |chunk|
+          next unless chunk.pushdata?
+          pubkey = chunk.pushed_data.bth
+          if Bitcoin.hash160(pubkey) == spk_hash
+            return Bitcoin::Key.new(pubkey: pubkey) if pubkey.htb.bytesize == Bitcoin::Key::COMPRESSED_PUBLIC_KEY_SIZE
+          end
+        end
+      elsif prevout.p2sh?
+        redeem_script = Bitcoin::Script.parse_from_payload(input.script_sig.chunks.last.pushed_data)
+        if redeem_script.p2wpkh?
+          pk = input.script_witness.stack.last
+          return Bitcoin::Key.new(pubkey: pk.bth) if pk.bytesize == Bitcoin::Key::COMPRESSED_PUBLIC_KEY_SIZE
+        end
+      elsif prevout.p2wpkh?
+        pk = input.script_witness.stack.last
+        return Bitcoin::Key.new(pubkey: pk.bth) if pk.bytesize == Bitcoin::Key::COMPRESSED_PUBLIC_KEY_SIZE
+      elsif prevout.p2tr?
+        witness_stack = input.script_witness.stack.dup
+        witness_stack.pop if witness_stack.last.bth.start_with?("50")
+        if witness_stack.length > 1
+          # script-path
+          cb = Bitcoin::Taproot::ControlBlock.parse_from_payload(witness_stack.last)
+          return nil if cb.internal_key == Bitcoin::Taproot::NUMS_H
+        end
+        pubkey = Bitcoin::Key.from_xonly_pubkey(prevout.chunks[1].pushed_data.bth)
+        return pubkey if pubkey.compressed?
+      end
+      nil
+    end
   end
 end

data/lib/bitcoin/taproot.rb

@@ -8,6 +8,8 @@ module Bitcoin
     autoload :SimpleBuilder, 'bitcoin/taproot/simple_builder'
     autoload :CustomDepthBuilder,  'bitcoin/taproot/custom_depth_builder'
 
+    NUMS_H = "50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0"
+
     module_function
 
     # Calculate tweak value from +internal_pubkey+ and +merkle_root+.

data/lib/bitcoin/tx.rb

@@ -7,6 +7,7 @@ module Bitcoin
   class Tx
 
     include Bitcoin::HexConverter
+    include SilentPayment
 
     MAX_STANDARD_VERSION = 2
 

data/lib/bitcoin/version.rb

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

data/lib/bitcoin.rb

@@ -71,9 +71,11 @@ module Bitcoin
 
   @chain_param = :mainnet
 
+  AVAILABLE_NETWORKS = %i(mainnet testnet regtest signet testnet4)
+
   # set bitcoin network chain params
   def self.chain_params=(name)
-    raise "chain params for #{name} is not defined." unless %i(mainnet testnet regtest signet).include?(name.to_sym)
+    raise "chain params for #{name} is not defined." unless AVAILABLE_NETWORKS.include?(name.to_sym)
     @current_chain = nil
     @chain_param = name.to_sym
   end
@@ -90,6 +92,8 @@ module Bitcoin
       @current_chain = Bitcoin::ChainParams.regtest
     when :signet
       @current_chain = Bitcoin::ChainParams.signet
+    when :testnet4
+      @current_chain = Bitcoin::ChainParams.testnet4
     end
     @current_chain
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.2
 platform: ruby
 authors:
 - azuchi
 bindir: exe
 cert_chain: []
-date: 2025-02-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa_ext
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: daemon-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -411,7 +404,6 @@ files:
 - lib/bitcoin/slip39/share.rb
 - lib/bitcoin/slip39/sss.rb
 - lib/bitcoin/slip39/wordlist/english.txt
-- lib/bitcoin/sp/addr.rb
 - lib/bitcoin/store.rb
 - lib/bitcoin/store/chain_entry.rb
 - lib/bitcoin/store/db.rb
@@ -457,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 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

data/lib/bitcoin/sp/addr.rb

@@ -1,55 +0,0 @@
-module Bitcoin
-  module SilentPayment
-    class Addr
-
-      HRP_MAINNET = 'sp'
-      HRP_TESTNET = 'tsp'
-      MAX_CHARACTERS = 1023
-
-      attr_reader :version
-      attr_reader :scan_key
-      attr_reader :spend_key
-
-      # Constructor.
-      # @param [Bitcoin::Key] scan_key
-      # @param [Bitcoin::Key] spend_key
-      def initialize(version, scan_key:, spend_key:)
-        raise ArgumentError, "version must be integer." unless version.is_a?(Integer)
-        raise ArgumentError, "scan_key must be Bitcoin::Key." unless scan_key.is_a?(Bitcoin::Key)
-        raise ArgumentError, "spend_key must be Bitcoin::Key." unless spend_key.is_a?(Bitcoin::Key)
-        raise ArgumentError, "version '#{version}' is unsupported." unless version.zero?
-
-        @version = version
-        @scan_key = scan_key
-        @spend_key = spend_key
-      end
-
-      # Parse silent payment address.
-      # @param [String] A silent payment address.
-      # @return [Bitcoin::SilentPayment::Addr]
-      def self.from_string(addr)
-        raise ArgumentError, "addr must be string." unless addr.is_a?(String)
-        hrp, data, spec = Bech32.decode(addr, MAX_CHARACTERS)
-        unless hrp == Bitcoin.chain_params.mainnet? ? HRP_MAINNET : HRP_TESTNET
-          raise ArgumentError, "The specified hrp is different from the current network HRP."
-        end
-        raise ArgumentError, "spec must be bech32m." unless spec == Bech32::Encoding::BECH32M
-
-        ver = data[0]
-        payload = Bech32.convert_bits(data[1..-1], 5, 8, false).pack("C*")
-        scan_key = Bitcoin::Key.new(pubkey: payload[0...33].bth, key_type: Bitcoin::Key::TYPES[:compressed])
-        spend_key = Bitcoin::Key.new(pubkey: payload[33..-1].bth, key_type: Bitcoin::Key::TYPES[:compressed])
-        Addr.new(ver, scan_key: scan_key, spend_key: spend_key)
-      end
-
-      # Get silent payment address.
-      # @return [String]
-      def to_s
-        hrp = Bitcoin.chain_params.mainnet? ? HRP_MAINNET : HRP_TESTNET
-        payload = [scan_key.pubkey + spend_key.pubkey].pack("H*").unpack('C*')
-        Bech32.encode(hrp, [version] + Bech32.convert_bits(payload, 8, 5), Bech32::Encoding::BECH32M)
-      end
-
-    end
-  end
-end