bitcoinrb 0.1.5 → 0.1.6

data/lib/bitcoin/network/pool.rb

@@ -26,6 +26,7 @@ module Bitcoin
         @max_outbound = MAX_OUTBOUND_CONNECTIONS
         @chain = chain
         @logger = Bitcoin::Logger.create(:debug)
+        @configuration = configuration
         @peer_discovery = PeerDiscovery.new(configuration)
         @started = false
       end
@@ -39,7 +40,7 @@ module Bitcoin
         port = Bitcoin.chain_params.default_port
         EM::Iterator.new(addr_list, Bitcoin::PARALLEL_THREAD).each do |ip, iter|
           if pending_peers.size < MAX_OUTBOUND_CONNECTIONS
-            peer = Peer.new(ip, port, self)
+            peer = Peer.new(ip, port, self, @configuration)
             pending_peers << peer
             peer.connect
             iter.next
@@ -73,6 +74,21 @@ module Bitcoin
         peers.each { |peer| peer.broadcast_tx(tx) }
       end
 
+      # new bloom filter.
+      def filter_load(bloom)
+        peers.each { |peer| peer.send_filter_load(bloom) }
+      end
+
+      # add element to bloom filter.
+      def filter_add(element)
+        peers.each { |peer| peer.send_filter_add(element) }
+      end
+
+      # clear bloom filter.
+      def filter_clear
+        peers.each { |peer| peer.send_filter_clear }
+      end
+
       def handle_error(e)
         terminate
       end

data/lib/bitcoin/node/cli.rb

@@ -45,6 +45,11 @@ module Bitcoin
         request('listwallets')
       end
 
+      desc 'getwalletinfo', 'Returns an object containing various wallet state info.'
+      def getwalletinfo
+        request('getwalletinfo')
+      end
+
       private
 
       def config

data/lib/bitcoin/node/configuration.rb

@@ -9,6 +9,7 @@ module Bitcoin
       def initialize(opts = {})
         # TODO apply configuration file.
         opts[:network] = :mainnet unless opts[:network]
+        opts[:relay] = false unless opts[:relay]
         Bitcoin.chain_params = opts[:network]
 
         begin

data/lib/bitcoin/node/spv.rb

@@ -10,6 +10,7 @@ module Bitcoin
       attr_accessor :running
       attr_reader :configuration
       attr_accessor :server
+      attr_accessor :wallet
 
       def initialize(configuration)
         @chain = Bitcoin::Store::SPVChain.new
@@ -17,6 +18,10 @@ module Bitcoin
         @pool = Bitcoin::Network::Pool.new(@chain, @configuration)
         @logger = Bitcoin::Logger.create(:debug)
         @running = false
+        @wallet = Bitcoin::Wallet::Base.current_wallet
+        # TODO : optimize bloom filter parameters
+        # TODO : load public keys in wallet.
+        @bloom = Bitcoin::BloomFilter.new(512, 0.01)
       end
 
       # open the node.
@@ -43,7 +48,22 @@ module Bitcoin
         logger.debug "broadcast tx: #{tx.to_payload.bth}"
       end
 
-    end
+      # new bloom filter.
+      def filter_load
+        pool.filter_load(@bloom)
+      end
+
+      # add filter element to bloom filter.
+      # [String] element. the hex string of txid, public key, public key hash or outpoint.
+      def filter_add(element)
+        @bloom.add(element)
+        pool.filter_add(element)
+      end
 
+      # clear bloom filter.
+      def filter_clear
+        pool.filter_clear
+      end
+    end
   end
 end

data/lib/bitcoin/rpc/request_handler.rb

@@ -92,6 +92,12 @@ module Bitcoin
         Bitcoin::Wallet::Base.wallet_paths(wallet_path_prefix)
       end
 
+      # get current wallet information.
+      def getwalletinfo
+        return {} unless node.wallet
+        {wallet_id: node.wallet.wallet_id, version: node.wallet.version}
+      end
+
     end
 
   end

data/lib/bitcoin/script/script.rb

@@ -1,3 +1,6 @@
+# Porting part of the code from bitcoin-ruby. see the license.
+# https://github.com/lian/bitcoin-ruby/blob/master/COPYING
+
 module Bitcoin
 
   # bitcoin script
@@ -304,7 +307,7 @@ module Bitcoin
       return '' if i == 0
       negative = i < 0
 
-      hex = i.abs.to_s(16)
+      hex = i.abs.to_even_length_hex
       hex = '0' + hex unless (hex.length % 2).zero?
       v = hex.htb.reverse # change endian
 

data/lib/bitcoin/script/script_interpreter.rb

@@ -14,7 +14,7 @@ module Bitcoin
     DISABLE_OPCODES = [OP_CAT, OP_SUBSTR, OP_LEFT, OP_RIGHT, OP_INVERT, OP_AND, OP_OR, OP_XOR, OP_2MUL, OP_2DIV, OP_DIV, OP_MUL, OP_MOD, OP_LSHIFT, OP_RSHIFT]
 
     # initialize runner
-    def initialize(flags: [], checker: TxChecker.new)
+    def initialize(flags: SCRIPT_VERIFY_NONE, checker: TxChecker.new)
       @stack, @debug = [], []
       @flags = flags
       @checker = checker
@@ -219,10 +219,7 @@ module Bitcoin
                 when OP_NOP1, OP_NOP4..OP_NOP10
                   return set_error(SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS) if flag?(SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS)
                 when OP_CHECKLOCKTIMEVERIFY
-                  unless flag?(SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)
-                    return set_error(SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS) if flag?(SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS)
-                    next
-                  end
+                  next unless flag?(SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)
                   return set_error(SCRIPT_ERR_INVALID_STACK_OPERATION) if stack.size < 1
                   # Note that elsewhere numeric opcodes are limited to operands in the range -2**31+1 to 2**31-1,
                   # however it is legal for opcodes to produce results exceeding that range.
@@ -235,12 +232,7 @@ module Bitcoin
                   return set_error(SCRIPT_ERR_NEGATIVE_LOCKTIME) if locktime < 0
                   return set_error(SCRIPT_ERR_UNSATISFIED_LOCKTIME) unless checker.check_locktime(locktime)
                 when OP_CHECKSEQUENCEVERIFY
-                  unless flag?(SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)
-                    if flag?(SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS)
-                      return set_error(SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS)
-                    end
-                    next
-                  end
+                  next unless flag?(SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)
                   return set_error(SCRIPT_ERR_INVALID_STACK_OPERATION) if stack.size < 1
 
                   # nSequence, like nLockTime, is a 32-bit unsigned integer field.
@@ -522,13 +514,7 @@ module Bitcoin
     private
 
     def flag?(flag)
-      (all_flags & flag) != 0
-    end
-
-    def all_flags
-      result = SCRIPT_VERIFY_NONE
-      flags.each{ |f| result |= f }
-      result
+      (flags & flag) != 0
     end
 
     # pop the item with the int value for the number specified by +count+ from the stack.
@@ -610,6 +596,7 @@ module Bitcoin
       return false if sig.empty?
       s = sig.unpack('C*')
       hash_type = s[-1] & (~(SIGHASH_TYPE[:anyonecanpay]))
+      hash_type &= (~(Bitcoin::SIGHASH_FORK_ID)) if Bitcoin.chain_params.fork_chain? # for fork coin.
       return false if hash_type < SIGHASH_TYPE[:all] || hash_type > SIGHASH_TYPE[:single]
       true
     end

data/lib/bitcoin/secp256k1/native.rb

@@ -1,3 +1,6 @@
+# Porting part of the code from bitcoin-ruby. see the license.
+# https://github.com/lian/bitcoin-ruby/blob/master/COPYING
+
 module Bitcoin
   module Secp256k1
 
@@ -101,9 +104,13 @@ module Bitcoin
         Bitcoin::Key.new(priv_key: privkey, pubkey: pubkey, compressed: compressed)
       end
 
-      def sign_data(data, priv_key)
+      # sign data.
+      # @param [String] data a data to be signed with binary format
+      # @param [String] privkey a private key using sign
+      # @return [String] signature data with binary format
+      def sign_data(data, privkey)
         with_context do |context|
-          secret = FFI::MemoryPointer.new(:uchar, priv_key.htb.bytesize).put_bytes(0, priv_key.htb)
+          secret = FFI::MemoryPointer.new(:uchar, privkey.htb.bytesize).put_bytes(0, privkey.htb)
           raise 'priv_key invalid' unless secp256k1_ec_seckey_verify(context, secret)
 
           internal_signature = FFI::MemoryPointer.new(:uchar, 64)
@@ -137,7 +144,6 @@ module Bitcoin
           signature = FFI::MemoryPointer.new(:uchar, sig.bytesize).put_bytes(0, sig)
           internal_signature = FFI::MemoryPointer.new(:uchar, 64)
           result = secp256k1_ecdsa_signature_parse_der(context, internal_signature, signature, signature.size)
-          #result = ecdsa_signature_parse_der_lax(context, internal_signature, signature, signature.size)
           return false unless result
 
           # libsecp256k1's ECDSA verification requires lower-S signatures, which have not historically been enforced in Bitcoin, so normalize them first.

data/lib/bitcoin/secp256k1/ruby.rb

@@ -1,8 +1,6 @@
 module Bitcoin
   module Secp256k1
 
-    GROUP = ECDSA::Group::Secp256k1
-
     # secp256 module using ecdsa gem
     # https://github.com/DavidEGrayson/ruby_ecdsa
     module Ruby
@@ -25,19 +23,35 @@ module Bitcoin
       end
 
       # sign data.
-      # @param [String] data a data to be signed
+      # @param [String] data a data to be signed with binary format
       # @param [String] privkey a private key using sign
       # @return [String] signature data with binary format
       def sign_data(data, privkey)
-        # digest = Digest::SHA2.digest(data)
-        private_key = ECDSA::Format::IntegerOctetString.decode(privkey.htb)
-        signature = nil
-        while signature.nil?
-          # TODO support rfc 6979 https://tools.ietf.org/html/rfc6979
-          temp_key = 1 + SecureRandom.random_number(GROUP.order - 1)
-          signature = ECDSA.sign(GROUP, private_key, data, temp_key)
+        privkey = privkey.htb
+        private_key = ECDSA::Format::IntegerOctetString.decode(privkey)
+        nonce = generate_rfc6979_nonce(data, privkey)
+
+        # port form ecdsa gem.
+        r_point = GROUP.new_point(nonce)
+
+        point_field = ECDSA::PrimeField.new(GROUP.order)
+        r = point_field.mod(r_point.x)
+        return nil if r.zero?
+
+        e = ECDSA.normalize_digest(data, GROUP.bit_length)
+        s = point_field.mod(point_field.inverse(nonce) * (e + r * private_key))
+
+        if s > (GROUP.order / 2) # convert low-s
+          s = GROUP.order - s
         end
-        ECDSA::Format::SignatureDerString.encode(signature) # signature with DER format
+
+        return nil if s.zero?
+
+        signature = ECDSA::Signature.new(r, s)
+        public_key = Bitcoin::Key.new(priv_key: privkey.bth).pubkey
+        signature = ECDSA::Format::SignatureDerString.encode(signature) # signature with DER format
+        raise 'Creation of signature failed.' unless Bitcoin::Secp256k1::Ruby.verify_sig(data, signature, public_key)
+        signature
       end
 
       # verify signature using public key
@@ -48,24 +62,13 @@ module Bitcoin
       def verify_sig(digest, sig, pubkey)
         begin
           k = ECDSA::Format::PointOctetString.decode(repack_pubkey(pubkey), GROUP)
-          signature = repack_sig(sig)
+          signature = ECDSA::Format::SignatureDerString.decode(sig)
           ECDSA.valid_signature?(k, digest, signature)
         rescue Exception
           false
         end
       end
 
-      # repack signature for OpenSSL 1.0.1k handling of DER signatures
-      # https://github.com/bitcoin/bitcoin/pull/5634/files
-      def repack_sig(sig)
-        sig_array = sig.unpack('C*')
-        len_r = sig_array[3]
-        r = sig_array[4...(len_r+4)].pack('C*').bth
-        len_s = sig_array[len_r + 5]
-        s = sig_array[(len_r + 6)...(len_r + 6 + len_s)].pack('C*').bth
-        ECDSA::Signature.new(r.to_i(16), s.to_i(16))
-      end
-
       # if +pubkey+ is hybrid public key format, it convert uncompressed format.
       # https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2012-June/001578.html
       def repack_pubkey(pubkey)
@@ -79,6 +82,31 @@ module Bitcoin
         end
       end
 
+      # generate temporary key k to be used when ECDSA sign.
+      # https://tools.ietf.org/html/rfc6979#section-3.2
+      def generate_rfc6979_nonce(data, privkey)
+        v = ('01' * 32).htb
+        k = ('00' * 32).htb
+        # 3.2.d
+        k = Bitcoin.hmac_sha256(k, v + '00'.htb + privkey + data)
+        # 3.2.e
+        v = Bitcoin.hmac_sha256(k, v)
+        # 3.2.f
+        k = Bitcoin.hmac_sha256(k, v + '01'.htb + privkey + data)
+        # 3.2.g
+        v = Bitcoin.hmac_sha256(k, v)
+        # 3.2.h
+        t = ''
+        10000.times do
+          v = Bitcoin.hmac_sha256(k, v)
+          t = (t + v)
+          t_num = t.bth.to_i(16)
+          return t_num if 1 <= t_num && t_num < GROUP.order
+          k = Bitcoin.hmac_sha256(k, v + '00'.htb)
+          v = Bitcoin.hmac_sha256(v)
+        end
+        raise 'A valid nonce was not found.'
+      end
     end
 
   end

data/lib/bitcoin/secp256k1.rb

@@ -2,6 +2,8 @@ module Bitcoin
 
   module Secp256k1
 
+    GROUP = ECDSA::Group::Secp256k1
+
     autoload :Ruby, 'bitcoin/secp256k1/ruby'
     autoload :Native, 'bitcoin/secp256k1/native'
 

data/lib/bitcoin/store/chain_entry.rb

@@ -51,8 +51,7 @@ module Bitcoin
 
       # generate payload
       def to_payload
-        height_value = height.to_s(16)
-        height_value = '0' + height_value if height_value.length.odd?
+        height_value = height.to_even_length_hex
         height_value = height_value.htb.reverse
         Bitcoin.pack_var_int(height_value.bytesize) + height_value + header.to_payload
       end

data/lib/bitcoin/store/db/level_db.rb

@@ -74,8 +74,7 @@ module Bitcoin
 
         # generate height key
         def height_key(height)
-          height = height.to_s(16)
-          height = '0' + height if height.bytesize.odd?
+          height = height.to_even_length_hex
           KEY_PREFIX[:height] + height.htb.reverse.bth
         end
 
@@ -98,4 +97,4 @@ module Bitcoin
 
     end
   end
-end
+end

data/lib/bitcoin/store/spv_chain.rb

@@ -43,7 +43,7 @@ module Bitcoin
       # @param [Bitcoin::BlockHeader] header a block header.
       # @return [Bitcoin::Store::ChainEntry] appended block header entry.
       def append_header(header)
-        logger.debug("append header #{header.hash}")
+        logger.info("append header #{header.hash}")
         raise "this header is invalid. #{header.hash}" unless header.valid?
         best_block = latest_block
         current_height = best_block.height

data/lib/bitcoin/tx.rb

@@ -1,3 +1,6 @@
+# Porting part of the code from bitcoin-ruby. see the license.
+# https://github.com/lian/bitcoin-ruby/blob/master/COPYING
+
 module Bitcoin
 
   # Transaction class
@@ -178,7 +181,7 @@ module Bitcoin
       raise ArgumentError, 'script_pubkey must be specified.' unless output_script
       raise ArgumentError, 'unsupported sig version specified.' unless SIG_VERSION.include?(sig_version)
 
-      if sig_version == :witness_v0
+      if sig_version == :witness_v0 || Bitcoin.chain_params.fork_chain?
         raise ArgumentError, 'amount must be specified.' unless amount
         sighash_for_witness(input_index, output_script, hash_type, amount, skip_separator_index)
       else
@@ -201,7 +204,7 @@ module Bitcoin
         script_pubkey = redeem_script if redeem_script.p2wpkh?
       end
 
-      if has_witness
+      if has_witness || Bitcoin.chain_params.fork_chain?
         verify_input_sig_for_witness(input_index, script_pubkey, amount, flags)
       else
         verify_input_sig_for_legacy(input_index, script_pubkey, flags)
@@ -271,6 +274,7 @@ module Bitcoin
       if (hash_type & SIGHASH_TYPE[:anyonecanpay]) != 0
         hash_prevouts = hash_sequence ="\x00".ljust(32, "\x00")
       end
+      hash_type |= (Bitcoin.chain_params.fork_id << 8) if Bitcoin.chain_params.fork_chain?
       buf = [ [version].pack('V'), hash_prevouts, hash_sequence, outpoint,
               script_code ,amount, nsequence, hash_outputs, [@lock_time, hash_type].pack('VV')].join
       Bitcoin.double_sha256(buf)
@@ -287,8 +291,8 @@ module Bitcoin
 
     # verify input signature for witness tx.
     def verify_input_sig_for_witness(input_index, script_pubkey, amount, flags)
-      flags << SCRIPT_VERIFY_WITNESS
-      flags << SCRIPT_VERIFY_WITNESS_PUBKEYTYPE
+      flags |= SCRIPT_VERIFY_WITNESS
+      flags |= SCRIPT_VERIFY_WITNESS_PUBKEYTYPE
       checker = Bitcoin::TxChecker.new(tx: self, input_index: input_index, amount: amount)
       interpreter = Bitcoin::ScriptInterpreter.new(checker: checker, flags: flags)
       i = inputs[input_index]

data/lib/bitcoin/tx_in.rb

@@ -1,3 +1,6 @@
+# Porting part of the code from bitcoin-ruby. see the license.
+# https://github.com/lian/bitcoin-ruby/blob/master/COPYING
+
 module Bitcoin
 
   # transaction input

data/lib/bitcoin/tx_out.rb

@@ -1,3 +1,6 @@
+# Porting part of the code from bitcoin-ruby. see the license.
+# https://github.com/lian/bitcoin-ruby/blob/master/COPYING
+
 module Bitcoin
 
   # transaction output

data/lib/bitcoin/util.rb

@@ -1,3 +1,6 @@
+# Porting part of the code from bitcoin-ruby. see the license.
+# https://github.com/lian/bitcoin-ruby/blob/master/COPYING
+
 module Bitcoin
 
   # bitcoin utility.

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/bitcoin/wallet/account.rb

@@ -54,12 +54,12 @@ module Bitcoin
 
       # derive receive key
       def derive_receive(address_index)
-        derive_path(0, address_index)
+        derive_key(0, address_index)
       end
 
       # derive change key
       def derive_change(address_index)
-        derive_path(1, address_index)
+        derive_key(1, address_index)
       end
 
       # save this account payload to database.
@@ -74,7 +74,7 @@ module Bitcoin
 
       # get the list of derived keys for change key.
       def derived_change_keys
-        receive_depth.times.map{|i|derive_key(1,i)}
+        change_depth.times.map{|i|derive_key(1,i)}
       end
 
       private

data/lib/bitcoin/wallet/base.rb

@@ -9,6 +9,7 @@ module Bitcoin
       attr_reader :path
 
       DEFAULT_PATH_PREFIX = "#{Bitcoin.base_dir}/db/wallet/"
+      VERSION = 1
 
       # Create new wallet. If wallet already exist, throw error.
       # The wallet generates a seed using SecureRandom and store to db at initialization.
@@ -36,7 +37,15 @@ module Bitcoin
       # get wallets path
       # @return [Array] Array of paths for each wallet dir.
       def self.wallet_paths(path_prefix = DEFAULT_PATH_PREFIX)
-        Dir.glob("#{path_prefix}wallet*/")
+        Dir.glob("#{path_prefix}wallet*/").sort
+      end
+
+      # get current wallet
+      def self.current_wallet(path_prefix = DEFAULT_PATH_PREFIX)
+        path = wallet_paths.first # TODO default wallet selection
+        return nil unless path
+        wallet_id = path.delete(path_prefix + '/wallet').delete('/').to_i
+        self.load(wallet_id, path_prefix)
       end
 
       # get account list based on BIP-44
@@ -55,6 +64,11 @@ module Bitcoin
         account
       end
 
+      # get wallet version.
+      def version
+        db.version
+      end
+
       # close database wallet
       def close
         db.close

data/lib/bitcoin/wallet/db.rb

@@ -5,7 +5,8 @@ module Bitcoin
 
       KEY_PREFIX = {
           account: 'a',       # key: account index, value: Account raw data.
-          master: 'm',          # value : wallet seed.
+          master: 'm',        # value: wallet seed.
+          version: 'v',       # value: wallet version
       }
 
       attr_reader :level_db
@@ -44,6 +45,7 @@ module Bitcoin
       # @param [Bitcoin::Wallet::MasterKey] master a master key.
       def register_master_key(master)
         level_db.put(KEY_PREFIX[:master], master.to_payload)
+        level_db.put(KEY_PREFIX[:version], Bitcoin::Wallet::Base::VERSION.to_s)
         @master_key = master
       end
 
@@ -52,6 +54,11 @@ module Bitcoin
         !level_db.get(KEY_PREFIX[:master]).nil?
       end
 
+      # wallet version
+      def version
+        level_db.get(KEY_PREFIX[:version]).to_i
+      end
+
     end
   end
-end
+end

data/lib/bitcoin.rb

@@ -1,3 +1,6 @@
+# Porting part of the code from bitcoin-ruby. see the license.
+# https://github.com/lian/bitcoin-ruby/blob/master/COPYING
+
 require 'bitcoin/version'
 require 'eventmachine'
 require 'ecdsa'
@@ -39,6 +42,7 @@ module Bitcoin
   autoload :Store, 'bitcoin/store'
   autoload :RPC, 'bitcoin/rpc'
   autoload :Wallet, 'bitcoin/wallet'
+  autoload :BloomFilter, 'bitcoin/bloom_filter'
 
   require_relative 'bitcoin/constants'
 
@@ -58,12 +62,13 @@ module Bitcoin
     return @current_chain if @current_chain
     case @chain_param
     when :mainnet
-      Bitcoin::ChainParams.mainnet
+      @current_chain = Bitcoin::ChainParams.mainnet
     when :testnet
-      Bitcoin::ChainParams.testnet
+      @current_chain = Bitcoin::ChainParams.testnet
     when :regtest
-      Bitcoin::ChainParams.regtest
+      @current_chain = Bitcoin::ChainParams.regtest
     end
+    @current_chain
   end
 
   # base dir path that store blockchain data and wallet data
@@ -77,6 +82,14 @@ module Bitcoin
     (path && File.exist?(path)) ? Bitcoin::Secp256k1::Native : Bitcoin::Secp256k1::Ruby
   end
 
+  def self.hmac_sha512(key, data)
+    OpenSSL::HMAC.digest(OpenSSL::Digest.new('SHA512'), key, data)
+  end
+
+  def self.hmac_sha256(key, data)
+    OpenSSL::HMAC.digest(OpenSSL::Digest.new('SHA256'), key, data)
+  end
+
   class ::String
     # binary convert to hex string
     def bth
@@ -140,6 +153,7 @@ module Bitcoin
     end
 
     def to_h
+      return self if self.is_a?(String)
       instance_variables.inject({}) do |result, var|
         key = var.to_s
         key.slice!(0) if key.start_with?('@')
@@ -154,4 +168,10 @@ module Bitcoin
 
   end
 
+  class ::Integer
+    def to_even_length_hex
+      hex = to_s(16)
+      hex.rjust((hex.length / 2.0).ceil * 2, '0')
+    end
+  end
 end