money-tree 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b30fcb1b0feac18dde7d94b62a0ff97666209d3f
-  data.tar.gz: ffa45ca51da46d1d56d701f24e36d61848e261ea
+SHA256:
+  metadata.gz: 040b86e807e6dea0ebf4dfc4b5e508e3f9ef673c94b95a210a18c125d8857974
+  data.tar.gz: '01800e0fb32058488fd01f1a8f2be3539788c7d0bebc0021fd49776fdde947a4'
 SHA512:
-  metadata.gz: 859a1b5a4dfd21fafb73dba60ad6d243c3d8462bba900aed584934e463976fd0075abd5fa83b6317f54ce9801f342e3ba31ac639bb53ee9769068fd1f1cbda13
-  data.tar.gz: 3609f386e6fc5276f41a51221898dc0ebb10d314fd4b76a6ea4522ced950738b064167fb0f4d6a7d84c1b12823dd255494043e817b9dd7562f3f3eb4c02e093d
+  metadata.gz: 70a6465799b1f7140a2e45c2ded416b41e4b64a7801b57325ed20cea470c92cad96e7644596d523a192254e7284eb772406e90af0a797f5b367304cbe2e9b725
+  data.tar.gz: 2d0c6bea3a33f161cf30a3400d3f75b6119098f035eca6cdac076c11c03596a2e0e205456b1e3ea2453f2ad1e58fd7edec91ff21ec1a8fd515c2d7836169762c

data/.github/workflows/spec.yml

@@ -0,0 +1,31 @@
+---
+name: Spec
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        ruby: ['2.7', '3.0']
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: false
+    - name: Install Dependencies
+      run: |
+        bundle install
+    - name: Run Tests
+      run: |
+        bundle exec rspec

data/README.md

@@ -1,13 +1,23 @@
-[![Build Status](https://travis-ci.org/GemHQ/money-tree.png)](https://travis-ci.org/GemHQ/money-tree) [![Coverage Status](https://img.shields.io/coveralls/GemHQ/money-tree.svg)](https://coveralls.io/r/GemHQ/money-tree?branch=master) [![Code Climate](https://codeclimate.com/github/GemHQ/money-tree.png)](https://codeclimate.com/github/GemHQ/money-tree) [![Gem Version](https://badge.fury.io/rb/money-tree.png)](http://badge.fury.io/rb/money-tree)
 # MoneyTree
+
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/GemHQ/money-tree)](https://github.com/GemHQ/money-tree/releases)
+[![Gem](https://img.shields.io/gem/v/money-tree)](https://rubygems.org/gems/money-tree)
+[![Gem](https://img.shields.io/gem/dt/money-tree)](https://rubygems.org/gems/money-tree)
+[![GitHub top language](https://img.shields.io/github/languages/top/GemHQ/money-tree?color=red)](https://github.com/GemHQ/money-tree/pulse)
+
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/GemHQ/money-tree/Spec)](https://github.com/GemHQ/money-tree/actions)
+[![Coverage Status](https://img.shields.io/coveralls/GemHQ/money-tree.svg)](https://coveralls.io/r/GemHQ/money-tree?branch=master)
+[![Code Climate](https://codeclimate.com/github/GemHQ/money-tree.png)](https://codeclimate.com/github/GemHQ/money-tree)
+[![GitHub](https://img.shields.io/github/license/GemHQ/money-tree)](LICENSE)
+
 ### RSpec tested. Big Brother removed.
 
 MoneyTree is a Ruby implementation of Bitcoin Wallets. Specifically, it supports [Hierachical Deterministic wallets](https://en.bitcoin.it/wiki/Deterministic_Wallet) according to the protocol specified in [BIP0032](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki).
 
 ___
-If you find this helpful, please consider a small Bitcoin donation to 1nj2kie1hATcFbAaD7dEY53QaxNgt4KBp
+If you find this helpful, please consider a small Bitcoin donation to `1nj2kie1hATcFbAaD7dEY53QaxNgt4KBp`.
 
-![Donate BTC](https://raw.github.com/wink/money-tree/master/donation_btc_qr_code.gif)
+![Donate BTC](./.github/donation_btc_qr_code.gif)
 ___
 
 ## Why would I want an HD Wallet?
@@ -60,7 +70,7 @@ These instructions assume you have a decent understanding of how Bitcoin wallets
 
 ### Create a Master Node (seed)
 
-To create a new HD Wallet, we're going to create a tree structure of private/public keypairs (nodes).  You'll first want to start with a master node. This master node should be seeded with at least 16 random bytes but preferably 32 random bytes from a cryptographically secure PRNG (pseudo-random number generator). 
+To create a new HD Wallet, we're going to create a tree structure of private/public keypairs (nodes).  You'll first want to start with a master node. This master node should be seeded with at least 16 random bytes but preferably 32 random bytes from a cryptographically secure PRNG (pseudo-random number generator).
 
 DO NOT use a user generated password. Keep in mind that whoever controls the seed controls ALL coins in the entire tree, so it should not be left up to a human brain, because humans tend to follow patterns and patterns are subject to brute force attacks. Luckily, MoneyTree includes the seed generation by default so you don't need to create this on your own.
 
@@ -109,19 +119,19 @@ DO NOT use a user generated password. Keep in mind that whoever controls the see
 @master.public_key.to_hex
 => "0339a36013301597daef41fbe593a02cc513d0b55527ec2df1050e2e8ff49c85c2"
 
-@master.chain_code_hex 
+@master.chain_code_hex
 => "873dff81c02f525623fd1fe5167eac3a55a049de3d314bb42ee227ffed37d508" # Look up chain codes in the BIP0032 spec
 
 @master.to_serialized_hex(:private)
 => "0488ade4000000000000000000873dff81c02f525623fd1fe5167eac3a55a049de3d314bb42ee227ffed37d50800e8f32e723decf4051aefac8e2c93c9c5b214313817cdb01a1494b917c8436b35"
 
-@master.to_serialized_address(:private)
+@master.to_bip32(:private)
 => "xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi"
 
 @master.to_serialized_hex
 => "0488b21e000000000000000000873dff81c02f525623fd1fe5167eac3a55a049de3d314bb42ee227ffed37d5080339a36013301597daef41fbe593a02cc513d0b55527ec2df1050e2e8ff49c85c2"
 
-@master.to_serialized_address
+@master.to_bip32
 => "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8"
 ```
 
@@ -140,10 +150,10 @@ To generate a child node from a given path:
 @node.depth
 => 2
 
-@node.to_serialized_address(:private)
+@node.to_bip32(:private)
 => "xprv9ww7sMFLzJN15m7zX5JEBXQrQq8h4fU8PVqd929Hjy3xNSMzeBf163idMNBSq47DdCakyZTK7KcC2nbz3jqUkpJj8ZR4FqrijcFcFmcoBAe"
 
-@node.to_serialized_address
+@node.to_bip32
 => "xpub6AvUGrnEpfvJJFCTd6qEYfMaxryBU8BykimDwQYuJJawFEh9BiyFdr37Cc4wEKCWWv7TsFQRUMdezXVqV9cfBUbeUEgNYCCP4omxULbNaRr"
 ```
 
@@ -163,23 +173,23 @@ Because we need multiple pieces of info to reconstruct nodes in a tree, when we'
 "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8"
 ```
 
-In addition to the key and the chain code, this encoding also includes info about the depth and index of the key, along with a fingerprint of its parent key (which I presume is for quickly sorting a big pile of keys into a tree).   
-  
+In addition to the key and the chain code, this encoding also includes info about the depth and index of the key, along with a fingerprint of its parent key (which I presume is for quickly sorting a big pile of keys into a tree).
+
 These are the addresses that you should use to represent each node in the tree structure, however these are NOT the bitcoin addresses you should pass around for receiving money. These are more for storing inside a wallet file so that you can reconstruct the tree.
 
 To export a node to a serialized address, you can do:
 
 ```ruby
-@node.to_serialized_address(:private) # for private keys
+@node.to_bip32(:private) # for private keys
 => "xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi"
 
-@node.to_serialized_address
+@node.to_bip32
 => "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8"
 ```
-    
+
 To import from a serialized address: (either public or private)
 ```ruby
-@node = MoneyTree::Node.from_serialized_address "xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi"
+@node = MoneyTree::Node.from_bip32 "xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi"
 => MoneyTree::Node instance
 ```
 
@@ -198,10 +208,10 @@ For example:
 ```ruby
 @node = @master.node_for_path("M/0/3") # or "m/0/3.pub" or "M/0/3.pub"...these are equivalent
 
-@node.to_serialized_address
+@node.to_bip32
 => "xpub6AvUGrnEpfvJJFCTd6qEYfMaxryBU8BykimDwQYuJJawFEh9BiyFdr37Cc4wEKCWWv7TsFQRUMdezXVqV9cfBUbeUEgNYCCP4omxULbNaRr"
 
-@node.to_serialized_address(:private)
+@node.to_bip32(:private)
 -> raises MoneyTree::Node::PrivatePublicMismatch error
 ```
 
@@ -209,13 +219,13 @@ For example:
 You can also import a node using only a public key. Keep in mind that this node will only be able to generate other public-key only nodes. You will not be able to derive child private keys using this node.
 
 ```ruby
-@node = MoneyTree::Node.from_serialized_address("xpub6AvUGrnEpfvJJFCTd6qEYfMaxryBU8BykimDwQYuJJawFEh9BiyFdr37Cc4wEKCWWv7TsFQRUMdezXVqV9cfBUbeUEgNYCCP4omxULbNaRr")
+@node = MoneyTree::Node.from_bip32("xpub6AvUGrnEpfvJJFCTd6qEYfMaxryBU8BykimDwQYuJJawFEh9BiyFdr37Cc4wEKCWWv7TsFQRUMdezXVqV9cfBUbeUEgNYCCP4omxULbNaRr")
 => MoneyTree::Node instance
 
-@node.to_serialized_address
+@node.to_bip32
 => "xpub6AvUGrnEpfvJJFCTd6qEYfMaxryBU8BykimDwQYuJJawFEh9BiyFdr37Cc4wEKCWWv7TsFQRUMdezXVqV9cfBUbeUEgNYCCP4omxULbNaRr"
 
-@node.to_serialized_address(:private)
+@node.to_bip32(:private)
 -> raises MoneyTree::Node::PrivatePublicMismatch error
 ```
 
@@ -241,7 +251,7 @@ For instance:
 
 They are all equivalent ways of saying the same thing, but the first two are just a more human readable shorthand notation. You are free to use whichever notation you prefer. This gem will parse it.
 
-To add just a little more confusion to the mix, some wallets will use negative `i` values to also denote private derivation. Any `i` value that is negative will be processed using private derivation by this library. e.g. `"m/-1/1"`.
+To add just a little more confusion to the mix, some wallets will use negative `i` values to also denote private derivation. Any `i` value that is negative will be processed using private derivation by this library. e.g. `"m/-1/1"`. (NOTE: known issue, see below)
 
 
 ## Contributing
@@ -251,3 +261,8 @@ To add just a little more confusion to the mix, some wallets will use negative `
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Known Issues (PRs welcome)
+
+- Segwit ([BIP49](https://github.com/bitcoin/bips/blob/master/bip-0049.mediawiki)) address generation is not supported
+- Use of negative integers in paths does _not_ produce the correct hardened derivation.

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => :spec

data/certs/mattatgemco.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEHDCCAoSgAwIBAgIBATANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDDBFtYXR0
+L0RDPWdlbS9EQz1jbzAeFw0xODA1MzAyMTQwNDZaFw0xOTA1MzAyMTQwNDZaMBwx
+GjAYBgNVBAMMEW1hdHQvREM9Z2VtL0RDPWNvMIIBojANBgkqhkiG9w0BAQEFAAOC
+AY8AMIIBigKCAYEAxfbjMHFlxA2P+4YWPagKoGAMi4078imgXdFbD3Rloe6cGfYp
+IMUQitiHrKi6fhSE0UjXmoP3qnYFddm1enN9zUAFRhHWv7xpINqSqss4PYAb5Anl
+RYZu3jromop5aVodi15HUfu5z27MvBm4rAaN/dDRfh/rT2hDbTTh0HmvEaPUDfX6
+TyflAttfabFvtY4qsD+ao8tks0DytqyuEWZ0tvQ6upOgHRNNuYDwDZB1T9v2dq2w
+3goJFmOKBMMn7UH8WMjD3HiOuRD4tWhq5xWLjBqjzFlVPlZPgdCNyXeMMnLXER98
+NY35cVWFFuqG+kZwy4MFKdE9WFTocLZxLFo0VVTNSpPara9HirbHtIo9jZNuop4S
+g4JTf1F8dIWYii3sXoAYZfkl6rHVRP0G/OV5LcTfSS3QkmI5hNltz5FZzc+qI6S1
+rTR1ZwTy1rRI3coFY7vDRaFWBoMbbo/DytgCE3+rfbVDxQrJa4aZ0iYDhu8LXEA1
+VTtpf1EWYCOsYE1TAgMBAAGjaTBnMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
+A1UdDgQWBBQ6QoDNre7LFgOukH2Cv+RqZyfUzjAWBgNVHREEDzANgQttYXR0QGdl
+bS5jbzAWBgNVHRIEDzANgQttYXR0QGdlbS5jbzANBgkqhkiG9w0BAQsFAAOCAYEA
+kOxYnOsB+NwHwLc2lHEZ8ubxanq2qIZDhvVQ4M31gwmba43xO7vq0ktFxYRvozs4
+74dQ6bmY2e7njoFgeutyJwxulA+BC71mDQA1s4WsZo7Z2TRgB0GViVqHrzq+jY+M
+p9mTHQqKH+2j0P9T4DXSzq4qOaBA3YROAwAzYI9N8MObeWkRt2pZ4zYQrAniP2nd
+wzXs/G5lWbbntVcvQOfAAXBipSJ3X5P2EGpUytP9ZpGdezY5HZzuiJFcmCf1CM3t
+VX4NZjbJak9gOY0AFD0Aw497sYenm0VBExclOmeRuZLffpWteTTL//utpG3bbFPl
+jQ78uzsrexYTYW5IshjfSIf3TZxm50Z45pyOTow5EOP1Nd7OmKOcI8hrLGv5+AlD
+hCnomUTUNsM4Rjwl5rzQiIn3ezv6+0tlg4rWJmVTuOGwcHk/oj1In2sPjCqm0pgx
+TLnMa8gr6aUpuHR5s2N4ZH0Q2YIsaD6cv7DYXt+G4MRut3njOYHfkqsSVykO6hvr
+-----END CERTIFICATE-----

data/checksum/money-tree-0.9.0.gem.sha512

@@ -0,0 +1 @@
+ce3c7dc0fe6817aee65f990c7a97f89fd36c94380ac804c7579554d665a934df99d4e72ee9b2e467efcc76799a20c4d1de4c950bbba3512d42260c38a46e54b9

data/lib/money-tree/address.rb

@@ -1,13 +1,13 @@
 module MoneyTree
   class Address
     attr_reader :private_key, :public_key
-    
+
     def initialize(opts = {})
       private_key = opts.delete(:private_key)
       @private_key = MoneyTree::PrivateKey.new({ key: private_key }.merge(opts))
       @public_key = MoneyTree::PublicKey.new(@private_key, opts)
     end
-    
+
     def to_s(network: :bitcoin)
       public_key.to_s(network: network)
     end

data/lib/money-tree/key.rb

@@ -7,12 +7,12 @@ module MoneyTree
     include OpenSSL
     include Support
     extend Support
-    class KeyInvalid < Exception; end
-    class KeyGenerationFailure < Exception; end
-    class KeyImportFailure < Exception; end
-    class KeyFormatNotFound < Exception; end
-    class InvalidWIFFormat < Exception; end
-    class InvalidBase64Format < Exception; end
+    class KeyInvalid < StandardError; end
+    class KeyGenerationFailure < StandardError; end
+    class KeyImportFailure < StandardError; end
+    class KeyFormatNotFound < StandardError; end
+    class InvalidWIFFormat < StandardError; end
+    class InvalidBase64Format < StandardError; end
 
     attr_reader :options, :key, :raw_key
     attr_accessor :ec_key
@@ -70,7 +70,7 @@ module MoneyTree
     end
 
     def parse_raw_key
-      result = if raw_key.is_a?(Bignum) then from_bignum
+      result = if raw_key.is_a?(Integer) then from_integer
       elsif hex_format? then from_hex
       elsif base64_format? then from_base64
       elsif compressed_wif_format? then from_wif
@@ -81,7 +81,7 @@ module MoneyTree
       result.downcase
     end
 
-    def from_bignum(bignum = raw_key)
+    def from_integer(bignum = raw_key)
       # TODO: does this need a byte size specification?
       int_to_hex(bignum)
     end
@@ -213,7 +213,7 @@ module MoneyTree
     end
 
     def parse_raw_key
-      result = if raw_key.is_a?(Bignum)
+      result = if raw_key.is_a?(Integer)
         set_point raw_key
       elsif hex_format?
         set_point hex_to_int(raw_key), compressed: false

data/lib/money-tree/node.rb

@@ -5,10 +5,10 @@ module MoneyTree
     attr_reader :private_key, :public_key, :chain_code,
       :is_private, :depth, :index, :parent
 
-    class PublicDerivationFailure < Exception; end
-    class InvalidKeyForIndex < Exception; end
-    class ImportError < Exception; end
-    class PrivatePublicMismatch < Exception; end
+    class PublicDerivationFailure < StandardError; end
+    class InvalidKeyForIndex < StandardError; end
+    class ImportError < StandardError; end
+    class PrivatePublicMismatch < StandardError; end
 
     def initialize(opts = {})
       opts.each { |k, v| instance_variable_set "@#{k}", v }
@@ -90,7 +90,12 @@ module MoneyTree
       left_int = left_from_hash(hash)
       raise InvalidKeyForIndex, 'greater than or equal to order' if left_int >= MoneyTree::Key::ORDER # very low probability
       factor = BN.new left_int.to_s
-      child_public_key = public_key.uncompressed.group.generator.mul(factor).add(public_key.uncompressed.point).to_bn.to_i
+
+      gen_point = public_key.uncompressed.group.generator.mul(factor)
+
+      sum_point_hex = MoneyTree::OpenSSLExtensions.add(gen_point, public_key.uncompressed.point)
+      child_public_key = OpenSSL::PKey::EC::Point.new(public_key.group, OpenSSL::BN.new(sum_point_hex, 16)).to_bn.to_i
+
       raise InvalidKeyForIndex, 'at infinity' if child_public_key == 1/0.0 # very low probability
       child_chain_code = right_from_hash(hash)
       return child_public_key, child_chain_code

data/lib/money-tree/support.rb

@@ -4,11 +4,11 @@ require 'base64'
 module MoneyTree
   module Support
     include OpenSSL
-    
+
     INT32_MAX = 256 ** [1].pack("L*").size
     INT64_MAX = 256 ** [1].pack("Q*").size
     BASE58_CHARS = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
-    
+
     def int_to_base58(int_val, leading_zero_bytes=0)
       base58_val, base = '', BASE58_CHARS.size
       while int_val > 0
@@ -40,7 +40,7 @@ module MoneyTree
       s
     end
     alias_method :base58_to_hex, :decode_base58
-    
+
     def to_serialized_base58(hex)
       hash = sha256 hex
       hash = sha256 hash
@@ -48,7 +48,7 @@ module MoneyTree
       address = hex + checksum
       encode_base58 address
     end
-    
+
     def from_serialized_base58(base58)
       hex = decode_base58 base58
       checksum = hex.slice!(-8..-1)
@@ -56,45 +56,45 @@ module MoneyTree
       raise EncodingError unless checksum == compare_checksum
       hex
     end
-    
+
     def digestify(digest_type, source, opts = {})
       source = [source].pack("H*") unless opts[:ascii]
       bytes_to_hex Digest.digest(digest_type, source)
     end
-    
+
     def sha256(source, opts = {})
       digestify('SHA256', source, opts)
     end
-    
+
     def ripemd160(source, opts = {})
       digestify('RIPEMD160', source, opts)
     end
-    
+
     def encode_base64(hex)
       Base64.encode64([hex].pack("H*")).chomp
     end
-    
+
     def decode_base64(base64)
       Base64.decode64(base64).unpack("H*")[0]
     end
-    
+
     def hmac_sha512(key, message)
       digest = Digest::SHA512.new
       HMAC.digest digest, key, message
     end
-    
+
     def hmac_sha512_hex(key, message)
       md = hmac_sha512(key, message)
       md.unpack("H*").first.rjust(64, '0')
     end
-    
+
     def bytes_to_int(bytes, base = 16)
       if bytes.is_a?(Array)
         bytes = bytes.pack("C*")
       end
       bytes.unpack("H*")[0].to_i(16)
     end
-    
+
     def int_to_hex(i, size=nil)
       hex = i.to_s(16).downcase
       if (hex.size % 2) != 0
@@ -107,19 +107,19 @@ module MoneyTree
         hex
       end
     end
-        
+
     def int_to_bytes(i)
       [int_to_hex(i)].pack("H*")
     end
-    
+
     def bytes_to_hex(bytes)
       bytes.unpack("H*")[0].downcase
     end
-    
+
     def hex_to_bytes(hex)
       [hex].pack("H*")
     end
-    
+
     def hex_to_int(hex)
       hex.to_i(16)
     end

data/lib/money-tree/version.rb

@@ -1,3 +1,3 @@
 module MoneyTree
-  VERSION = "0.9.0"
+  VERSION = "0.11.0"
 end

data/lib/money-tree.rb

@@ -8,5 +8,4 @@ require "money-tree/networks"
 require "money-tree/node"
 
 module MoneyTree
-  
 end

data/lib/openssl_extensions.rb

@@ -1,73 +1,28 @@
 # encoding: ascii-8bit
 
 require 'openssl'
-require 'ffi'
 
 module MoneyTree
   module OpenSSLExtensions
-    extend FFI::Library
-    ffi_lib 'ssl'
-
-    NID_secp256k1 = 714
-    POINT_CONVERSION_COMPRESSED = 2
-    POINT_CONVERSION_UNCOMPRESSED = 4
-
-    attach_function :EC_KEY_free, [:pointer], :int
-    attach_function :EC_KEY_get0_group, [:pointer], :pointer
-    attach_function :EC_KEY_new_by_curve_name, [:int], :pointer
-    attach_function :EC_POINT_clear_free, [:pointer], :int
-    attach_function :EC_POINT_add, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
-    attach_function :EC_POINT_point2hex, [:pointer, :pointer, :int, :pointer], :string
-    attach_function :EC_POINT_hex2point, [:pointer, :string, :pointer, :pointer], :pointer
-    attach_function :EC_POINT_new, [:pointer], :pointer
-    
     def self.add(point_0, point_1)
       validate_points(point_0, point_1)
-      eckey = EC_KEY_new_by_curve_name(NID_secp256k1)
-      group = EC_KEY_get0_group(eckey)
-      
+      group = OpenSSL::PKey::EC::Group.new('secp256k1')
       point_0_hex = point_0.to_bn.to_s(16)
-      point_0_pt = EC_POINT_hex2point(group, point_0_hex, nil, nil)
+      point_0_pt = OpenSSL::PKey::EC::Point.new(group, OpenSSL::BN.new(point_0_hex, 16))
       point_1_hex = point_1.to_bn.to_s(16)
-      point_1_pt = EC_POINT_hex2point(group, point_1_hex, nil, nil)
-
-      sum_point = EC_POINT_new(group)
-      success = EC_POINT_add(group, sum_point, point_0_pt, point_1_pt, nil)
-      hex = EC_POINT_point2hex(group, sum_point, POINT_CONVERSION_UNCOMPRESSED, nil)
-
-      EC_KEY_free(eckey)
-      EC_POINT_clear_free(sum_point)
-      EC_POINT_clear_free(point_0_pt)
-      EC_POINT_clear_free(point_1_pt)
-
-      eckey = nil
-      group = nil
-      sum_point = nil
-      point_0_pt = nil
-      point_1_pt = nil
-
-      hex
+      point_1_pt = OpenSSL::PKey::EC::Point.new(group, OpenSSL::BN.new(point_1_hex, 16))
+      sum_point = point_0_pt.add(point_1_pt)
+      sum_point.to_bn.to_s(16)
     end
 
     def self.validate_points(*points)
       points.each do |point|
         if !point.is_a?(OpenSSL::PKey::EC::Point)
-          raise ArgumentError, "point must be an OpenSSL::PKey::EC::Point object" 
+          raise ArgumentError, "point must be an OpenSSL::PKey::EC::Point object"
         elsif point.infinity?
-          raise ArgumentError, "point must not be infinity" 
+          raise ArgumentError, "point must not be infinity"
         end
       end
     end
   end
 end
-
-
-class OpenSSL::PKey::EC::Point
-  include MoneyTree::OpenSSLExtensions
-  
-  def add(point)
-    sum_point_hex = MoneyTree::OpenSSLExtensions.add(self, point)
-    self.class.new group, OpenSSL::BN.new(sum_point_hex, 16)
-  end
-  
-end

data/money-tree.gemspec

@@ -6,33 +6,22 @@ require 'money-tree/version'
 Gem::Specification.new do |spec|
   spec.name          = "money-tree"
   spec.version       = MoneyTree::VERSION
-  spec.authors       = ["Micah Winkelspecht"]
-  spec.email         = ["winkelspecht@gmail.com"]
+  spec.authors       = ["Micah Winkelspecht", "Afri Schoedon"]
+  spec.email         = ["winkelspecht@gmail.com", "gems@q9f.cc"]
   spec.description   = %q{A Ruby Gem implementation of Bitcoin HD Wallets}
   spec.summary       = %q{Bitcoin Hierarchical Deterministic Wallets in Ruby! (Bitcoin standard BIP0032)}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/gemhq/money-tree"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  
-  # used with gem i coin-op -P HighSecurity
-  spec.cert_chain  = ["certs/jvergeldedios.pem"]
-  # Sign gem when evaluating spec with `gem` command
-  #  unless ENV has set a SKIP_GEM_SIGNING
-  if ($0 =~ /gem\z/) and not ENV.include?("SKIP_GEM_SIGNING")
-    spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem")
-  end
 
- 
-  spec.add_dependency "ffi"
-    
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "pry"
+  spec.add_dependency 'openssl', '>= 2.2'
+
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.10"
+  spec.add_development_dependency "pry", "~> 0.4"
 end

data/spec/lib/money-tree/address_spec.rb

@@ -4,14 +4,20 @@ describe MoneyTree::Address do
   describe "initialize" do
     it "generates a private key by default" do
       address = MoneyTree::Address.new
+      expect(address).to be
+      expect(address).to be_instance_of MoneyTree::Address
+      expect(address.private_key).to be_instance_of MoneyTree::PrivateKey
       expect(address.private_key.key.length).to eql(64)
     end
-    
+
     it "generates a public key by default" do
       address = MoneyTree::Address.new
+      expect(address).to be
+      expect(address).to be_instance_of MoneyTree::Address
+      expect(address.public_key).to be_instance_of MoneyTree::PublicKey
       expect(address.public_key.key.length).to eql(66)
     end
-        
+
     it "imports a private key in hex form" do
       address = MoneyTree::Address.new private_key: "5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b"
       expect(address.private_key.key).to eql("5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b")
@@ -20,36 +26,46 @@ describe MoneyTree::Address do
       expect(address.private_key.to_s).to eql("KzPkwAXJ4wtXHnbamTaJqoMrzwCUUJaqhUxnqYhnZvZH6KhgmDPK")
       expect(address.public_key.to_s).to eql("13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe")
     end
-    
+
     it "imports a private key in compressed wif format" do
       address = MoneyTree::Address.new private_key: "KzPkwAXJ4wtXHnbamTaJqoMrzwCUUJaqhUxnqYhnZvZH6KhgmDPK"
       expect(address.private_key.key).to eql("5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b")
       expect(address.public_key.key).to eql("022dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b")
       expect(address.to_s).to eql("13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe")
     end
-    
+
     it "imports a private key in uncompressed wif format" do
       address = MoneyTree::Address.new private_key: "5JXz5ZyFk31oHVTQxqce7yitCmTAPxBqeGQ4b7H3Aj3L45wUhoa"
       expect(address.private_key.key).to eql("5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b")
       expect(address.public_key.key).to eql("022dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b")
     end
   end
-  
+
   describe "to_s" do
     before do
       @address = MoneyTree::Address.new private_key: "5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b"
     end
-    
+
     it "returns compressed base58 public key" do
       expect(@address.to_s).to eql("13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe")
       expect(@address.public_key.to_s).to eql("13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe")
     end
-    
+
     it "returns compressed WIF private key" do
       expect(@address.private_key.to_s).to eql("KzPkwAXJ4wtXHnbamTaJqoMrzwCUUJaqhUxnqYhnZvZH6KhgmDPK")
     end
   end
 
+  context "bitcoin wiki" do
+    # ref https://en.bitcoin.it/wiki/Technical_background_of_version_1_Bitcoin_addresses
+    subject(:wiki) { MoneyTree::Address.new private_key: '18e14a7b6a307f426a94f8114701e7c8e774e7f9a47e2c2035db29a206321725' }
+
+    it "always regenerates the bitcoin wiki example" do
+      expect(wiki.public_key.key).to eq "0250863ad64a87ae8a2fe83c1af1a8403cb53f53e486d8511dad8a04887e5b2352"
+      expect(wiki.to_s).to eq "1PMycacnJaSqwwJqjawXBErnLsZ7RkXUAs"
+    end
+  end
+
   context "testnet3" do
     before do
       @address = MoneyTree::Address.new network: :bitcoin_testnet