bitcoinrb 1.4.0 → 1.6.0

data/lib/bitcoin/taproot/custom_depth_builder.rb

@@ -0,0 +1,64 @@
+module Bitcoin
+  module Taproot
+    # A class that takes the script tree configuration as a nested array and constructs the Taproot output.
+    # TODO WIP
+    class CustomDepthBuilder < SimpleBuilder
+
+      attr_reader :tree
+
+      # Constructor
+      # @param [String] internal_key Internal public key with hex format.
+      # @param [Array] tree Script tree configuration as a nested array.
+      # @return [Bitcoin::Taproot::CustomDepthBuilder]
+      def initialize(internal_key, tree)
+        super(internal_key, [])
+        raise ArgumentError, "tree must be an array." unless tree.is_a?(Array)
+        raise ArgumentError, "tree must be binary tree." unless tree.length == 2
+        tree.each do |item|
+          unless item.is_a?(Array) || item.is_a?(Bitcoin::Taproot::LeafNode)
+            raise ArgumentError, "tree must consist of either an array or LeafNode."
+          end
+          raise ArgumentError, "tree must be binary tree." if item.is_a?(Array) && item.length != 2
+        end
+        @tree = tree
+      end
+
+      def add_leaf(leaf)
+        raise NotImplementedError
+      end
+
+      def add_branch(leaf1, leaf2 = nil)
+        raise NotImplementedError
+      end
+
+      def control_block(leaf)
+        raise NotImplementedError # TODO
+      end
+
+      def inclusion_proof(leaf)
+        raise NotImplementedError # TODO
+      end
+
+      private
+
+      def merkle_root
+        build_tree(tree).bth
+      end
+
+      def build_tree(tree)
+        left, right = tree
+        left_hash = if left.is_a?(Array)
+                      build_tree(left)
+                    else
+                      left
+                    end
+        right_hash = if right.is_a?(Array)
+                       build_tree(right)
+                     else
+                       right
+                     end
+        combine_hash([left_hash, right_hash])
+      end
+    end
+  end
+end

data/lib/bitcoin/taproot/simple_builder.rb

@@ -16,6 +16,7 @@ module Bitcoin
       # @raise [Bitcoin::Taproot::Builder] +internal_pubkey+ dose not xonly public key or leaf in +leaves+ does not instance of Bitcoin::Taproot::LeafNode.
       # @return [Bitcoin::Taproot::SimpleBuilder]
       def initialize(internal_key, leaves = [])
+        raise ArgumentError, "Internal public key must be string." unless internal_key.is_a?(String)
         raise Error, "Internal public key must be #{X_ONLY_PUBKEY_SIZE} bytes" unless internal_key.htb.bytesize == X_ONLY_PUBKEY_SIZE
         raise Error, 'leaf must be Bitcoin::Taproot::LeafNode object' if leaves.find{ |leaf| !leaf.is_a?(Bitcoin::Taproot::LeafNode)}
 
@@ -113,12 +114,6 @@ module Bitcoin
 
       private
 
-      # Compute tweak from script tree.
-      # @return [String] tweak with binary format.
-      def tweak
-        Taproot.tweak(Bitcoin::Key.from_xonly_pubkey(internal_key), merkle_root)
-      end
-
       # Calculate merkle root from branches.
       # @return [String] merkle root with hex format.
       def merkle_root

data/lib/bitcoin/taproot.rb

@@ -6,6 +6,7 @@ module Bitcoin
     autoload :LeafNode, 'bitcoin/taproot/leaf_node'
     autoload :ControlBlock, 'bitcoin/taproot/control_block'
     autoload :SimpleBuilder, 'bitcoin/taproot/simple_builder'
+    autoload :CustomDepthBuilder,  'bitcoin/taproot/custom_depth_builder'
 
     module_function
 

data/lib/bitcoin/tx.rb

@@ -111,7 +111,7 @@ module Bitcoin
     end
 
     def witness?
-      !inputs.find { |i| !i.script_witness.empty? }.nil?
+      inputs.any?(&:has_witness?)
     end
 
     def ==(other)

data/lib/bitcoin/util.rb

@@ -131,10 +131,18 @@ module Bitcoin
       double_sha256(hex.htb).bth[0..7]
     end
 
-    DIGEST_NAME_SHA256 = 'sha256'
-
     def hmac_sha256(key, data)
-      OpenSSL::HMAC.digest(DIGEST_NAME_SHA256, key, data)
+      Bitcoin.hmac_sha256(key, data)
+    end
+
+    # Run HKDF.
+    # @param [String] ikm The input keying material with binary format.
+    # @param [String] salt The salt with binary format.
+    # @param [String] info The context and application specific information with binary format.
+    # @param [Integer] length The output length in octets.
+    # @return [String] The result of HKDF with binary format.
+    def hkdf_sha256(ikm, salt, info, length = 32)
+      OpenSSL::KDF.hkdf(ikm, salt: salt, info: info, length: length, hash: "SHA256")
     end
 
     # check whether +addr+ is valid address.

data/lib/bitcoin/version.rb

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

data/lib/bitcoin.rb

@@ -61,6 +61,7 @@ module Bitcoin
   autoload :SigHashGenerator, 'bitcoin/sighash_generator'
   autoload :MessageSign, 'bitcoin/message_sign'
   autoload :Taproot, 'bitcoin/taproot'
+  autoload :BIP324, 'bitcoin/bip324'
 
   require_relative 'bitcoin/constants'
   require_relative 'bitcoin/ext/ecdsa'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2024-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa_ext
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: base32
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +332,11 @@ files:
 - exe/bitcoinrbd
 - lib/bitcoin.rb
 - lib/bitcoin/base58.rb
+- lib/bitcoin/bip324.rb
+- lib/bitcoin/bip324/cipher.rb
+- lib/bitcoin/bip324/ell_swift_pubkey.rb
+- lib/bitcoin/bip324/fs_chacha20.rb
+- lib/bitcoin/bip324/fs_chacha_poly1305.rb
 - lib/bitcoin/bip85_entropy.rb
 - lib/bitcoin/bit_stream.rb
 - lib/bitcoin/block.rb
@@ -345,6 +350,23 @@ files:
 - lib/bitcoin/chainparams/testnet.yml
 - lib/bitcoin/constants.rb
 - lib/bitcoin/descriptor.rb
+- lib/bitcoin/descriptor/addr.rb
+- lib/bitcoin/descriptor/checksum.rb
+- lib/bitcoin/descriptor/combo.rb
+- lib/bitcoin/descriptor/expression.rb
+- lib/bitcoin/descriptor/key_expression.rb
+- lib/bitcoin/descriptor/multi.rb
+- lib/bitcoin/descriptor/multi_a.rb
+- lib/bitcoin/descriptor/pk.rb
+- lib/bitcoin/descriptor/pkh.rb
+- lib/bitcoin/descriptor/raw.rb
+- lib/bitcoin/descriptor/script_expression.rb
+- lib/bitcoin/descriptor/sh.rb
+- lib/bitcoin/descriptor/sorted_multi.rb
+- lib/bitcoin/descriptor/sorted_multi_a.rb
+- lib/bitcoin/descriptor/tr.rb
+- lib/bitcoin/descriptor/wpkh.rb
+- lib/bitcoin/descriptor/wsh.rb
 - lib/bitcoin/errors.rb
 - lib/bitcoin/ext.rb
 - lib/bitcoin/ext/array_ext.rb
@@ -459,6 +481,7 @@ files:
 - lib/bitcoin/store/utxo_db.rb
 - lib/bitcoin/taproot.rb
 - lib/bitcoin/taproot/control_block.rb
+- lib/bitcoin/taproot/custom_depth_builder.rb
 - lib/bitcoin/taproot/leaf_node.rb
 - lib/bitcoin/taproot/simple_builder.rb
 - lib/bitcoin/tx.rb
@@ -496,7 +519,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: The implementation of Bitcoin Protocol for Ruby.