bitcoinrb 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23f677d00426b94e0bdcee887901bb1e89a98c65ae61b0a025c7d95467dcb484
-  data.tar.gz: 7426638ec33999d466026a09a91517fe698adc0a55f32db6d416dc3f4ad6a386
+  metadata.gz: 544382f715d87eb79e185e310c827b2349c0af75c1bd89887a653510e226cd1f
+  data.tar.gz: c807d0965da7c06f71b248d5a543ccfff2375d702a6ab4db70698c4be245720d
 SHA512:
-  metadata.gz: 960aada8b3db4c610a2b206254f878af9c149f81ce42a53a2ebe8441e0a5179964a9a505807ae2b7519349c4a48125397acb20b412cfb84ea59d58957acd84e4
-  data.tar.gz: 493c6e06d7fb686dda65fd4bc4075e3716004427beab0cce9e040060711ad4a7197d0fdece2838d130ed6b1b64cdc94a37957a8354d7629bf9bd68fc02d326e4
+  metadata.gz: 22ea36535fb045c35d28809f87c60f4451e2d37801e7a231772068c268d6e58cdeb086456ffc649091a5a28a82815af77f6d35ef286a7a101e53fa3f97e55a9a
+  data.tar.gz: 7ca7b637b77bdde57d2af3faf056184397b1d87fd98dd5c46933dfb40e716d5bf8ef56890691771b97d8e66dde1c9684cb1d03e9f74f99d4f8b5bbaeb6a37e2c

data/bitcoinrb.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'ecdsa_ext', '~> 0.5.0'
   spec.add_runtime_dependency 'eventmachine'
-  spec.add_runtime_dependency 'murmurhash3'
+  spec.add_runtime_dependency 'murmurhash3', '~> 0.1.7'
   spec.add_runtime_dependency 'bech32', '>= 1.3.0'
   spec.add_runtime_dependency 'daemon-spawn'
   spec.add_runtime_dependency 'thor'
@@ -31,7 +31,6 @@ 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 'protobuf', '3.8.5'
   spec.add_runtime_dependency 'json_pure', '>= 2.3.1'
   spec.add_runtime_dependency 'bip-schnorr', '>= 0.5.0'
   spec.add_runtime_dependency 'base32', '>= 0.3.4'

data/lib/bitcoin/key.rb

@@ -52,7 +52,7 @@ module Bitcoin
 
     # generate key pair
     def self.generate(key_type = TYPES[:compressed])
-      priv_key, pubkey = Bitcoin.secp_impl.generate_key_pair
+      priv_key, pubkey = Bitcoin.secp_impl.generate_key_pair(compressed: key_type != TYPES[:uncompressed])
       new(priv_key: priv_key, pubkey: pubkey, key_type: key_type)
     end
 
@@ -261,6 +261,12 @@ module Bitcoin
       pubkey[2..65]
     end
 
+    # Convert this key to decompress key.
+    # @return [String] decompress public key with hex format.
+    def decompress_pubkey
+      pubkey.htb.bytesize == PUBLIC_KEY_SIZE ? pubkey : to_point.to_hex(false)
+    end
+
     # check +pubkey+ (hex) is compress or uncompress pubkey.
     def self.compress_or_uncompress_pubkey?(pubkey)
       p = pubkey.htb

data/lib/bitcoin/script/script.rb

@@ -233,11 +233,28 @@ module Bitcoin
       OP_HASH160 == chunks[0].ord && OP_EQUAL == chunks[2].ord && chunks[1].bytesize == 21
     end
 
+    # Check whether this script is a P2PK format script.
+    # @return [Boolean] if P2PK return true, otherwise false
+    def p2pk?
+      return false unless chunks.size == 2
+      return false unless chunks[0].pushdata?
+      key_type = chunks[0].pushed_data[0].ord
+      case key_type
+      when 0x02, 0x03
+        return false unless chunks[0].pushed_data.bytesize == 33
+      when 0x04
+        return false unless chunks[0].pushed_data.bytesize == 65
+      else
+        return false
+      end
+      chunks[1].ord == OP_CHECKSIG
+    end
+
     def multisig?
       return false if chunks.size < 4 || chunks.last.ord != OP_CHECKMULTISIG
       pubkey_count = Opcodes.opcode_to_small_int(chunks[-2].opcode)
       sig_count = Opcodes.opcode_to_small_int(chunks[0].opcode)
-      return false unless pubkey_count || sig_count
+      return false if pubkey_count.nil? || sig_count.nil?
       sig_count <= pubkey_count
     end
 

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/bitcoin.rb

@@ -46,7 +46,6 @@ module Bitcoin
   autoload :RPC, 'bitcoin/rpc'
   autoload :Wallet, 'bitcoin/wallet'
   autoload :BloomFilter, 'bitcoin/bloom_filter'
-  autoload :Payments, 'bitcoin/payments'
   autoload :PSBT, 'bitcoin/psbt'
   autoload :GCSFilter, 'bitcoin/gcs_filter'
   autoload :BlockFilter, 'bitcoin/block_filter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa_ext
@@ -42,16 +42,16 @@ dependencies:
   name: murmurhash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: bech32
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: protobuf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.8.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.8.5
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -439,13 +425,6 @@ files:
 - lib/bitcoin/opcodes.rb
 - lib/bitcoin/out_point.rb
 - lib/bitcoin/payment_code.rb
-- lib/bitcoin/payments.rb
-- lib/bitcoin/payments/output.pb.rb
-- lib/bitcoin/payments/payment.pb.rb
-- lib/bitcoin/payments/payment_ack.pb.rb
-- lib/bitcoin/payments/payment_details.pb.rb
-- lib/bitcoin/payments/payment_request.pb.rb
-- lib/bitcoin/payments/x509_certificates.pb.rb
 - lib/bitcoin/psbt.rb
 - lib/bitcoin/psbt/hd_key_path.rb
 - lib/bitcoin/psbt/input.rb

data/lib/bitcoin/payments/output.pb.rb

@@ -1,20 +0,0 @@
-module Bitcoin
-  module Payments
-
-    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#Output
-    class Output < Protobuf::Message
-
-      optional :uint64, :amount, 1, {default: 0}
-
-      required :bytes, :script, 2
-
-      # convert to TxOut object.
-      # @return [Bitcoin::TxOut]
-      def to_tx_out
-        Bitcoin::TxOut.new(value: amount, script_pubkey: Bitcoin::Script.parse_from_payload(script))
-      end
-
-    end
-
-  end
-end

data/lib/bitcoin/payments/payment.pb.rb

@@ -1,26 +0,0 @@
-module Bitcoin
-  module Payments
-
-    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#Payment
-    class Payment < Protobuf::Message
-
-      optional :bytes, :merchant_data, 1
-
-      repeated :bytes, :transactions, 2
-
-      repeated Bitcoin::Payments::Output, :refund_to, 3
-
-      optional :string, :memo, 4
-
-      def self.parse_from_payload(payload)
-        decode(payload)
-      end
-
-      def transactions
-        @values[:transactions].map{|raw_tx|Bitcoin::Tx.parse_from_payload(raw_tx, strict: true)}
-      end
-
-    end
-
-  end
-end

data/lib/bitcoin/payments/payment_ack.pb.rb

@@ -1,17 +0,0 @@
-module Bitcoin
-  module Payments
-
-    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#PaymentACK
-    class PaymentACK < Protobuf::Message
-
-      required Bitcoin::Payments::Payment, :payment, 1
-
-      optional :string, :memo, 2
-
-      def self.parse_from_payload(payload)
-        decode(payload)
-      end
-    end
-
-  end
-end

data/lib/bitcoin/payments/payment_details.pb.rb

@@ -1,24 +0,0 @@
-module Bitcoin
-  module Payments
-
-    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#PaymentDetailsPaymentRequest
-    class PaymentDetails < Protobuf::Message
-
-      optional :string, :network, 1, {default: 'main'}
-
-      repeated Bitcoin::Payments::Output, :outputs, 2
-
-      required :uint64, :time, 3
-
-      optional :uint64, :expires, 4
-
-      optional :string, :memo, 5
-
-      optional :string, :payment_url, 6
-
-      optional :bytes, :merchant_data, 7
-
-    end
-
-  end
-end

data/lib/bitcoin/payments/payment_request.pb.rb

@@ -1,79 +0,0 @@
-module Bitcoin
-  module Payments
-
-    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#PaymentDetailsPaymentRequest
-    class PaymentRequest < Protobuf::Message
-
-      optional :uint32, :payment_details_version, 1, {default: 1}
-
-      optional :string, :pki_type, 2, {default: 'none'}
-
-      optional :bytes, :pki_data, 3
-
-      required :bytes, :serialized_payment_details, 4
-
-      optional :bytes, :signature, 5
-
-      def self.parse_from_payload(payload)
-        self.decode(payload)
-      end
-
-      # verify +pki_data+.
-      # @return [Struct] pki information.
-      def verify_pki_data
-        d = Struct.new(:display_name, :merchant_sign_key, :root_auth, :root_auth_name)
-        d
-      end
-
-      # get payment details
-      # @return [Bitcoin::Payments:PaymentDetails]
-      def details
-        PaymentDetails.decode(serialized_payment_details)
-      end
-
-      # get certificates
-      # @return [Array[OpenSSL::X509::Certificate]]
-      def certs
-        return [] unless has_pki?
-        X509Certificates.decode(pki_data).certs
-      end
-
-      # whether exist +pki_data+.
-      def has_pki?
-        pki_type != 'none'
-      end
-
-      # verify signature.
-      def valid_sig?
-        return false unless has_pki?
-        digest = case pki_type
-                   when 'x509+sha256'
-                     OpenSSL::Digest::SHA256.new
-                   when 'x509+sha1'
-                     OpenSSL::Digest::SHA1.new
-                   else
-                     raise "pki_type: #{pki_type} is invalid type."
-                 end
-        certs.first.public_key.verify(digest, signature, sig_message)
-      end
-
-      # verify expire time for payment request.
-      def valid_time?
-        expires = details.expires
-        return true if expires == 0
-        Time.now.to_i <= expires
-      end
-
-      private
-
-      # Generate data to be signed
-      def sig_message
-        PaymentRequest.new(payment_details_version: payment_details_version,
-                           pki_type: pki_type, pki_data: pki_data, signature: '',
-                           serialized_payment_details: serialized_payment_details).encode
-      end
-
-    end
-
-  end
-end

data/lib/bitcoin/payments/x509_certificates.pb.rb

@@ -1,18 +0,0 @@
-module Bitcoin
-  module Payments
-
-    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#Certificates
-    class X509Certificates < Protobuf::Message
-
-      repeated :bytes, :certificate, 1
-
-      # get certificates
-      # @return [Array[OpenSSL::X509::Certificate]]
-      def certs
-        certificate.map{|v|OpenSSL::X509::Certificate.new(v)}
-      end
-
-    end
-
-  end
-end

data/lib/bitcoin/payments.rb

@@ -1,14 +0,0 @@
-require 'protobuf'
-
-module Bitcoin
-  module Payments
-
-    autoload :Output, 'bitcoin/payments/output.pb'
-    autoload :Payment, 'bitcoin/payments/payment.pb'
-    autoload :PaymentACK, 'bitcoin/payments/payment_ack.pb'
-    autoload :PaymentDetails, 'bitcoin/payments/payment_details.pb'
-    autoload :PaymentRequest, 'bitcoin/payments/payment_request.pb'
-    autoload :X509Certificates, 'bitcoin/payments/x509_certificates.pb'
-
-  end
-end