bitcoinrb 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 524753cfa61041f101f72d76e914f70b20b504fb0eecad9d378a436afe7db718
-  data.tar.gz: f3181a60120da9f892ceaaaaf22aba5923b26f495fb9fb9dd314c5cce8127129
+  metadata.gz: f552597dfd50a5df7cee6e6c29c10789afbbe5e78ad316af9833f25e99f15e76
+  data.tar.gz: 9044c1daafb7c4badee574cdd326a922354b64376b9b871da3b2f5ad6a8aa4e6
 SHA512:
-  metadata.gz: da27669ddabc4d64bf3c96d4e83eb8c5d90ef837ed91b6f2e1d0e7d50c74153c62ff39eecb1867463f5a8435f7643d62ba6108e7a10d1fa46e4b10178fe8e2f1
-  data.tar.gz: 2f85e04fecddba5bb1d1ce4fc61bf79fd972280f4834e56a4b56974958903e74bd1d19789c93d6bdebe8bead9b5fca8ad26d4c35967760cf0517da42ebfeb35d
+  metadata.gz: '09d270868f51f4a08af65dbedce68d87d1863bb8f82dbf32c8999eb40bad432910325d5d17efc7c8d23f2f0398614cca8d4852dd3a52bd232ab0576bb0e7ee61'
+  data.tar.gz: 0b958912e698973c4e1b4af4f9737a046b3d07566064bdd759ec7fa4c336a33861ec060a90f7bc9181c5a8a7f6fe91240359232ee0cefbcfc799580f59e861e5

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.5.3

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.3.0
-  - 2.4.1
-  - 2.5.0
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
 addons:
   apt:
     packages:

data/README.md

@@ -1,4 +1,4 @@
-# Bitcoinrb [![Build Status](https://travis-ci.org/haw-itn/bitcoinrb.svg?branch=master)](https://travis-ci.org/haw-itn/bitcoinrb) [![Gem Version](https://badge.fury.io/rb/bitcoinrb.svg)](https://badge.fury.io/rb/bitcoinrb) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) <img src="http://segwit.co/static/public/images/logo.png" width="100">
+# Bitcoinrb [![Build Status](https://travis-ci.org/chaintope/bitcoinrb.svg?branch=master)](https://travis-ci.org/chaintope/bitcoinrb) [![Gem Version](https://badge.fury.io/rb/bitcoinrb.svg)](https://badge.fury.io/rb/bitcoinrb) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) <img src="http://segwit.co/static/public/images/logo.png" width="100">
 
 
 Bitcoinrb is a Ruby implementation of Bitcoin Protocol.
@@ -68,7 +68,7 @@ The parameters of the blockchain are managed by `Bitcoin::ChainParams`. Switch c
 Bitcoin.chain_params = :mainnet
 ```
 
-This parameter is described in https://github.com/haw-itn/bitcoinrb/blob/master/lib/bitcoin/chainparams/mainnet.yml.
+This parameter is described in https://github.com/chaintope/bitcoinrb/blob/master/lib/bitcoin/chainparams/mainnet.yml.
 
 * testnet
 
@@ -76,7 +76,7 @@ This parameter is described in https://github.com/haw-itn/bitcoinrb/blob/master/
 Bitcoin.chain_params = :testnet
 ```
 
-This parameter is described in https://github.com/haw-itn/bitcoinrb/blob/master/lib/bitcoin/chainparams/testnet.yml.
+This parameter is described in https://github.com/chaintope/bitcoinrb/blob/master/lib/bitcoin/chainparams/testnet.yml.
 
 * regtest
 
@@ -84,20 +84,7 @@ This parameter is described in https://github.com/haw-itn/bitcoinrb/blob/master/
 Bitcoin.chain_params = :regtest
 ```
 
-This parameter is described in https://github.com/haw-itn/bitcoinrb/blob/master/lib/bitcoin/chainparams/regtest.yml.
-
-#### Fork coin
-
-When using with fork coin, please specify the fork_id of the coin as follows.
-
-```ruby
-Bitcoin.chain_params.fork_id = 0 # 0 is bch fork id
-```
-
-Currently bitcoinrb supports only support and verification of transaction replay protection using `SIGHASH_FORK_ID`.
-For details of `SIGHASH_FORK_ID`, refer to the following.
-
-https://github.com/Bitcoin-UAHF/spec/blob/master/replay-protected-sighash.md
+This parameter is described in https://github.com/chaintope/bitcoinrb/blob/master/lib/bitcoin/chainparams/regtest.yml.
 
 ## Contributing
 

data/bitcoinrb.gemspec

@@ -8,11 +8,11 @@ Gem::Specification.new do |spec|
   spec.name          = "bitcoinrb"
   spec.version       = Bitcoin::VERSION
   spec.authors       = ["azuchi"]
-  spec.email         = ["azuchi@haw.co.jp"]
+  spec.email         = ["azuchi@chaintope.com"]
 
   spec.summary       = %q{[WIP]The implementation of Bitcoin Protocol for Ruby.}
   spec.description   = %q{[WIP]The implementation of Bitcoin Protocol for Ruby.}
-  spec.homepage      = 'https://github.com/haw-itn/bitcoinrb'
+  spec.homepage      = 'https://github.com/chaintope/bitcoinrb'
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'iniparse'
   spec.add_runtime_dependency 'siphash'
   spec.add_runtime_dependency 'protobuf'
+  spec.add_runtime_dependency 'scrypt'
 
   # for options
   spec.add_development_dependency 'leveldb-ruby'

data/lib/bitcoin/key.rb

@@ -87,9 +87,20 @@ module Bitcoin
 
     # sign +data+ with private key
     # @param [String] data a data to be signed with binary format
+    # @param [Boolean] low_r flag to apply low-R.
+    # @param [String] extra_entropy the extra entropy for rfc6979.
     # @return [String] signature data with binary format
-    def sign(data)
-      secp256k1_module.sign_data(data, priv_key)
+    def sign(data, low_r = true, extra_entropy = nil)
+      sig = secp256k1_module.sign_data(data, priv_key, extra_entropy)
+      if low_r && !sig_has_low_r?(sig)
+        counter = 1
+        until sig_has_low_r?(sig)
+          extra_entropy = [counter].pack('I*').bth.ljust(64, '0').htb
+          sig = secp256k1_module.sign_data(data, priv_key, extra_entropy)
+          counter += 1
+        end
+      end
+      sig
     end
 
     # verify signature using public key
@@ -242,8 +253,7 @@ module Bitcoin
     # @param [Boolean] compressed pubkey compressed?
     # @return [String] a pubkey which generate from privkey
     def generate_pubkey(privkey, compressed: true)
-      private_key = ECDSA::Format::IntegerOctetString.decode(privkey.htb)
-      public_key = ECDSA::Group::Secp256k1.generator.multiply_by_scalar(private_key)
+      public_key = ECDSA::Group::Secp256k1.generator.multiply_by_scalar(privkey.to_i(16))
       pubkey = ECDSA::Format::PointOctetString.encode(public_key, compression: compressed)
       pubkey.bth
     end
@@ -272,6 +282,13 @@ module Bitcoin
       !pubkey.nil? && pubkey.size > 0
     end
 
+    # check whether the signature is low-R
+    # @param [String] sig the signature data
+    # @return [Boolean] result
+    def sig_has_low_r?(sig)
+      sig[3].bth.to_i(16) == 0x20 && sig[4].bth.to_i(16) < 0x80
+    end
+
   end
 
 end

data/lib/bitcoin/message/not_found.rb

@@ -4,23 +4,15 @@ module Bitcoin
     # notfound message
     # https://bitcoin.org/en/developer-reference#notfound
     class NotFound < Base
+      include InventoriesParser
+      extend InventoriesParser
 
-      attr_accessor :inventory
+      attr_reader :inventories
 
       COMMAND = 'notfound'
 
-      def initialize(identifier, hash)
-        @inventory = Inventory.new(identifier, hash)
-      end
-
-      def self.parse_from_payload(payload)
-        size, inventory_payload = Bitcoin.unpack_var_int(payload)
-        inventory = Inventory.parse_from_payload(inventory_payload)
-        new(inventory.identifier, inventory.hash)
-      end
-
-      def to_payload
-        Bitcoin.pack_var_int(1) << inventory.to_payload
+      def initialize(inventories = [])
+        @inventories = inventories
       end
 
     end

data/lib/bitcoin/network/pool.rb

@@ -21,6 +21,7 @@ module Bitcoin
       attr_reader :logger
       attr_reader :peer_discovery
       attr_accessor :started
+      attr_reader :mutex
 
       def initialize(node, chain, configuration)
         @node = node
@@ -32,6 +33,7 @@ module Bitcoin
         @configuration = configuration
         @peer_discovery = PeerDiscovery.new(configuration)
         @started = false
+        @mutex = Mutex.new
       end
 
       # connecting other peers and begin network activity.
@@ -48,12 +50,14 @@ module Bitcoin
       # detect new peer connection.
       def handle_new_peer(peer)
         logger.debug "connected new peer #{peer.addr}."
-        peer.id = allocate_peer_id
-        unless peers.find(&:primary?)
-          peer.primary = true
-          peer.start_block_header_download
+        mutex.synchronize do
+          peer.id = allocate_peer_id
+          unless peers.find(&:primary?)
+            peer.primary = true
+            peer.start_block_header_download
+          end
+          peers << peer
         end
-        peers << peer
         pending_peers.delete(peer)
         filter_load(peer) if node.wallet
       end

data/lib/bitcoin/secp256k1/native.rb

@@ -107,20 +107,23 @@ module Bitcoin
       # sign data.
       # @param [String] data a data to be signed with binary format
       # @param [String] privkey a private key using sign
+      # @param [String] extra_entropy a extra entropy for rfc6979
       # @return [String] signature data with binary format
-      def sign_data(data, privkey)
+      def sign_data(data, privkey, extra_entropy)
         with_context do |context|
           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)
           msg32 = FFI::MemoryPointer.new(:uchar, 32).put_bytes(0, data)
+          entropy = extra_entropy ? FFI::MemoryPointer.new(:uchar, 32).put_bytes(0, extra_entropy) : nil
 
           ret, tries, max = 0, 0, 20
+
           while ret != 1
             raise 'secp256k1_ecdsa_sign failed.' if tries >= max
             tries += 1
-            ret = secp256k1_ecdsa_sign(context, internal_signature, msg32, secret, nil, nil)
+            ret = secp256k1_ecdsa_sign(context, internal_signature, msg32, secret, nil, entropy)
           end
 
           signature = FFI::MemoryPointer.new(:uchar, 72)

data/lib/bitcoin/secp256k1/ruby.rb

@@ -26,10 +26,11 @@ module Bitcoin
       # @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)
+      def sign_data(data, privkey, extra_entropy)
         privkey = privkey.htb
         private_key = ECDSA::Format::IntegerOctetString.decode(privkey)
-        nonce = generate_rfc6979_nonce(data, privkey)
+        extra_entropy ||= ''
+        nonce = generate_rfc6979_nonce(data, privkey, extra_entropy)
 
         # port form ecdsa gem.
         r_point = GROUP.new_point(nonce)
@@ -83,15 +84,15 @@ module Bitcoin
 
       # 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
+      def generate_rfc6979_nonce(data, privkey, extra_entropy)
+        v = ('01' * 32).htb # 3.2.b
+        k = ('00' * 32).htb # 3.2.c
         # 3.2.d
-        k = Bitcoin.hmac_sha256(k, v + '00'.htb + privkey + data)
+        k = Bitcoin.hmac_sha256(k, v + '00'.htb + privkey + data + extra_entropy)
         # 3.2.e
         v = Bitcoin.hmac_sha256(k, v)
         # 3.2.f
-        k = Bitcoin.hmac_sha256(k, v + '01'.htb + privkey + data)
+        k = Bitcoin.hmac_sha256(k, v + '01'.htb + privkey + data + extra_entropy)
         # 3.2.g
         v = Bitcoin.hmac_sha256(k, v)
         # 3.2.h
@@ -102,7 +103,7 @@ module Bitcoin
           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)
+          v = Bitcoin.hmac_sha256(k, v)
         end
         raise 'A valid nonce was not found.'
       end

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/lib/bitcoin/wallet/account.rb

@@ -57,7 +57,7 @@ module Bitcoin
       def create_receive
         @receive_depth += 1
         save
-        derive_key(0, @receive_depth)
+        save_key(0, @receive_depth, derive_key(0, @receive_depth))
       end
 
       # create new change key
@@ -65,12 +65,21 @@ module Bitcoin
       def create_change
         @change_depth += 1
         save
-        derive_key(1, @change_depth)
+        save_key(1, @change_depth, derive_key(1, @change_depth))
       end
 
       # save this account payload to database.
       def save
         wallet.db.save_account(self)
+        save_key(0, receive_depth, derive_key(0, receive_depth)) if receive_depth.zero?
+        save_key(1, change_depth, derive_key(1, change_depth)) if change_depth.zero?
+      end
+
+      # @param purpose 0:recieve, 1:change
+      # @param index receive_depth or change_depth
+      # @param key the key to be saved
+      def save_key(purpose, index, key)
+        wallet.db.save_key(self, purpose, index, key)
       end
 
       # get the list of derived keys for receive key.
@@ -111,7 +120,7 @@ module Bitcoin
       # get data elements tobe monitored with Bloom Filter.
       # @return [Array[String]]
       def watch_targets
-        derived_receive_keys.map(&:hash160) + derived_change_keys.map(&:hash160)
+        wallet.db.get_keys(self).map { |key| Bitcoin.hash160(key) }
       end
 
       def to_h

data/lib/bitcoin/wallet/db.rb

@@ -7,6 +7,7 @@ module Bitcoin
           account: 'a',       # key: account index, value: Account raw data.
           master: 'm',        # value: wallet seed.
           version: 'v',       # value: wallet version
+          key: 'k',           # key: path to the key, value: public key
       }
 
       attr_reader :level_db
@@ -37,6 +38,21 @@ module Bitcoin
         end
       end
 
+      def save_key(account, purpose, index, key)
+        pubkey = key.pub
+        id = [account.purpose, account.index, purpose, index].pack('I*').bth
+        k = KEY_PREFIX[:key] + id
+        level_db.put(k, pubkey)
+        key
+      end
+
+      def get_keys(account)
+        id = [account.purpose, account.index].pack('I*').bth
+        from = KEY_PREFIX[:key] + id + '00000000'
+        to = KEY_PREFIX[:key] + id + 'ffffffff'
+        level_db.each(from: from, to: to).map { |k, v| v}
+      end
+
       # get master_key
       def master_key
         @master_key ||= Bitcoin::Wallet::MasterKey.parse_from_payload(level_db.get(KEY_PREFIX[:master]))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-29 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: scrypt
+  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'
 - !ruby/object:Gem::Dependency
   name: leveldb-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +278,7 @@ dependencies:
         version: '0'
 description: "[WIP]The implementation of Bitcoin Protocol for Ruby."
 email:
-- azuchi@haw.co.jp
+- azuchi@chaintope.com
 executables:
 - bitcoinrb-cli
 - bitcoinrbd
@@ -403,7 +417,7 @@ files:
 - lib/openassets/marker_output.rb
 - lib/openassets/payload.rb
 - lib/openassets/util.rb
-homepage: https://github.com/haw-itn/bitcoinrb
+homepage: https://github.com/chaintope/bitcoinrb
 licenses:
 - MIT
 metadata: {}
@@ -423,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: "[WIP]The implementation of Bitcoin Protocol for Ruby."