money-tree 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040b86e807e6dea0ebf4dfc4b5e508e3f9ef673c94b95a210a18c125d8857974
-  data.tar.gz: '01800e0fb32058488fd01f1a8f2be3539788c7d0bebc0021fd49776fdde947a4'
+  metadata.gz: 53b2d866f0baa17b011631e360bda7c118100ce772cb2ce7b681ac03381b5f3e
+  data.tar.gz: dc39341115ffc116c132e1f030084eafced123506af17943f19e4c1bd0847841
 SHA512:
-  metadata.gz: 70a6465799b1f7140a2e45c2ded416b41e4b64a7801b57325ed20cea470c92cad96e7644596d523a192254e7284eb772406e90af0a797f5b367304cbe2e9b725
-  data.tar.gz: 2d0c6bea3a33f161cf30a3400d3f75b6119098f035eca6cdac076c11c03596a2e0e205456b1e3ea2453f2ad1e58fd7edec91ff21ec1a8fd515c2d7836169762c
+  metadata.gz: 3d4c68b7ef831c84b48c68e715007dbb16002c7a148c681d5db192216fd4be33f1767dd2a93cab0c09d87722fb7af475aa766e2bf4a561c76302ccf36747c7ca
+  data.tar.gz: 3019c78a855717e4d98b2f7f4d7a0458aac6c880fed23e6f81ae74587b9f0c4d2e122357ee95a481bb253b45e71b8f9e9c339cd367c2ccf1fd128131c326a2d7

data/.github/workflows/code.yml

@@ -0,0 +1,44 @@
+---
+name: CodeQL
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language:
+          - ruby
+    steps:
+      - name: "Checkout repository"
+        uses: actions/checkout@v3
+      - name: "Initialize CodeQL"
+        uses: github/codeql-action/init@v2
+        with:
+          languages: "${{ matrix.language }}"
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+      - name: "Perform CodeQL Analysis"
+        uses: github/codeql-action/analyze@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: "Run rufo code formatting checks"
+        run: |
+          gem install rufo
+          rufo --check ./lib
+          rufo --check ./spec

data/.github/workflows/docs.yml

@@ -0,0 +1,26 @@
+---
+name: Docs
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.0'
+        bundler-cache: true
+    - name: Run Yard Doc
+      run: |
+        gem install yard
+        yard doc
+    - name: Deploy GH Pages
+      uses: JamesIves/github-pages-deploy-action@4.4.1
+      with:
+          branch: gh-pages
+          folder: doc/

data/.github/workflows/spec.yml

@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        ruby: ['2.7', '3.0']
+        os: [ubuntu-22.04, macos-12]
+        ruby: ['3.0', '3.1', '3.2']
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
@@ -29,3 +29,5 @@ jobs:
     - name: Run Tests
       run: |
         bundle exec rspec
+      env:
+        COVERAGE: true

data/Gemfile

@@ -1,4 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
+group :test, :development do
+  gem "bundler", "~> 2.2"
+  gem "codecov", "~> 0.6"
+  gem "pry", "~> 0.14"
+  gem "rake", "~> 13.0"
+  gem "rdoc", "~> 6.5"
+  gem "rspec", "~> 3.12"
+  gem "rufo", "~> 0.13"
+  gem "simplecov", "~> 0.21"
+  gem "yard", "~> 0.9"
+end
 
-# Specify your gem's dependencies in money-tree.gemspec
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Micah Winkelspecht
+Copyright (c) 2013-23 Micah Winkelspecht
 
 MIT License
 

data/README.md

@@ -6,7 +6,7 @@
 [![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 Coverage](https://codecov.io/gh/GemHQ/money-tree/branch/master/graph/badge.svg?token=PF4BL36Z9q)](https://codecov.io/gh/GemHQ/money-tree)
 [![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)
 

data/Rakefile

@@ -1,5 +1,5 @@
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 

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

@@ -0,0 +1 @@
+fdc5329fa932c085d66ae40a7a9d730876b9a68a17932f0cd824c74a0562fafbfdc8fb2a3f92011138854ffbf7422bb8919e042dba46bcb55e11755bcf2bb5fb

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

@@ -0,0 +1 @@
+eb2346654c00b8506127ac5a2e87a04ebdc2bcde9221fe1f9707c4d1522cc9280206aeca41a3a2a9430db4d8bcef0f7c27e95ef23755b54bcdda991e6886f067

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

@@ -1 +1 @@
-ce3c7dc0fe6817aee65f990c7a97f89fd36c94380ac804c7579554d665a934df99d4e72ee9b2e467efcc76799a20c4d1de4c950bbba3512d42260c38a46e54b9
+ce3c7dc0fe6817aee65f990c7a97f89fd36c94380ac804c7579554d665a934df99d4e72ee9b2e467efcc76799a20c4d1de4c950bbba3512d42260c38a46e54b9

data/config/openssl.conf

@@ -0,0 +1,14 @@
+openssl_conf = openssl_init
+
+[openssl_init]
+providers = provider_sect
+
+[provider_sect]
+default = default_sect
+legacy = legacy_sect
+
+[default_sect]
+activate = 1
+
+[legacy_sect]
+activate = 1

data/lib/money-tree/address.rb

@@ -1,16 +1,26 @@
 module MoneyTree
   class Address
-    attr_reader :private_key, :public_key
+    attr_reader :private_key
+    attr_reader :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)
+      @private_key = PrivateKey.new({ key: private_key }.merge(opts))
+      @public_key = PublicKey.new(@private_key, opts)
     end
 
     def to_s(network: :bitcoin)
-      public_key.to_s(network: network)
+      @public_key.to_s(network: network)
     end
 
+    def to_bech32(network: :bitcoin)
+      hrp = NETWORKS[network][:human_readable_part]
+      witprog = @public_key.to_ripemd160
+      Support.to_serialized_bech32(hrp, witprog)
+    end
+
+    def to_p2wpkh_p2sh(network: :bitcoin)
+      @public_key.to_p2wpkh_p2sh(network: network)
+    end
   end
 end

data/lib/money-tree/key.rb

@@ -1,12 +1,11 @@
 # encoding ascii-8bit
 
-require 'openssl'
+require "openssl"
 
 module MoneyTree
   class Key
-    include OpenSSL
     include Support
-    extend Support
+
     class KeyInvalid < StandardError; end
     class KeyGenerationFailure < StandardError; end
     class KeyImportFailure < StandardError; end
@@ -14,10 +13,13 @@ module MoneyTree
     class InvalidWIFFormat < StandardError; end
     class InvalidBase64Format < StandardError; end
 
-    attr_reader :options, :key, :raw_key
+    attr_reader :options
+    attr_reader :key
+    attr_reader :raw_key
+
     attr_accessor :ec_key
 
-    GROUP_NAME = 'secp256k1'
+    GROUP_NAME = "secp256k1"
     ORDER = "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141".to_i(16)
 
     def valid?(eckey = nil)
@@ -35,34 +37,40 @@ module MoneyTree
   end
 
   class PrivateKey < Key
-
     def initialize(opts = {})
       @options = opts
-      @ec_key = PKey::EC.new GROUP_NAME
+      generate
       if @options[:key]
         @raw_key = @options[:key]
         @key = parse_raw_key
         import
       else
-        generate
         @key = to_hex
       end
     end
 
     def generate
-      ec_key.generate_key
+      @ec_key = PKey::EC.generate GROUP_NAME
     end
 
     def import
-      ec_key.private_key = BN.new(key, 16)
-      set_public_key
+      @ec_key = OpenSSL::PKey::EC.new(data_sequence.to_der)
+    end
+
+    def data_sequence
+      OpenSSL::ASN1::Sequence([
+        OpenSSL::ASN1::Integer(1),
+        OpenSSL::ASN1::OctetString(OpenSSL::BN.new(key, 16).to_s(2)),
+        OpenSSL::ASN1::ObjectId(GROUP_NAME, 0, :EXPLICIT),
+        OpenSSL::ASN1::BitString(calculate_public_key.to_octet_string(:uncompressed), 1, :EXPLICIT),
+      ])
     end
 
     def calculate_public_key(opts = {})
       opts[:compressed] = true unless opts[:compressed] == false
       group = ec_key.group
       group.point_conversion_form = opts[:compressed] ? :compressed : :uncompressed
-      point = group.generator.mul ec_key.private_key
+      point = group.generator.mul OpenSSL::BN.new(key, 16)
     end
 
     def set_public_key(opts = {})
@@ -70,14 +78,9 @@ module MoneyTree
     end
 
     def parse_raw_key
-      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
-      elsif uncompressed_wif_format? then from_wif
-      else
-        raise KeyFormatNotFound
-      end
+      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 elsif uncompressed_wif_format? then from_wif else
+          raise KeyFormatNotFound
+        end
       result.downcase
     end
 
@@ -113,7 +116,7 @@ module MoneyTree
 
     def wif_format?(compression)
       length = compression == :compressed ? 52 : 51
-      wif_prefixes = MoneyTree::NETWORKS.map {|k, v| v["#{compression}_wif_chars".to_sym]}.flatten
+      wif_prefixes = MoneyTree::NETWORKS.map { |k, v| v["#{compression}_wif_chars".to_sym] }.flatten
       raw_key.length == length && wif_prefixes.include?(raw_key.slice(0))
     end
 
@@ -160,7 +163,6 @@ module MoneyTree
     def to_s(network: :bitcoin)
       to_wif(network: network)
     end
-
   end
 
   class PublicKey < Key
@@ -209,19 +211,19 @@ module MoneyTree
       self.compression = opts[:compressed] ? :compressed : :uncompressed
       bn = BN.new int_to_hex(int), 16
       @point = PKey::EC::Point.new group, bn
-      raise KeyInvalid, 'point is not on the curve' unless @point.on_curve?
+      raise KeyInvalid, "point is not on the curve" unless @point.on_curve?
     end
 
     def parse_raw_key
       result = if raw_key.is_a?(Integer)
-        set_point raw_key
-      elsif hex_format?
-        set_point hex_to_int(raw_key), compressed: false
-      elsif compressed_hex_format?
-        set_point hex_to_int(raw_key), compressed: true
-      else
-        raise KeyFormatNotFound
-      end
+          set_point raw_key
+        elsif hex_format?
+          set_point hex_to_int(raw_key), compressed: false
+        elsif compressed_hex_format?
+          set_point hex_to_int(raw_key), compressed: true
+        else
+          raise KeyFormatNotFound
+        end
       to_hex
     end
 
@@ -251,8 +253,20 @@ module MoneyTree
       address = NETWORKS[network][:address_version] + hash
       to_serialized_base58 address
     end
+
     alias :to_s :to_address
 
+    def to_p2wpkh_p2sh(network: :bitcoin)
+      prefix = [NETWORKS[network][:p2sh_version]].pack("H*")
+      convert_p2wpkh_p2sh(to_hex, prefix)
+    end
+
+    def to_bech32_address(network: :bitcoin)
+      hrp = NETWORKS[network][:human_readable_part]
+      witprog = to_ripemd160
+      to_serialized_bech32(hrp, witprog)
+    end
+
     def to_fingerprint
       hash = to_ripemd160
       hash.slice(0..7)

data/lib/money-tree/networks.rb

@@ -1,33 +1,34 @@
 module MoneyTree
-  NETWORKS =
-    begin
+  NETWORKS = begin
       hsh = Hash.new do |_, key|
         raise "#{key} is not a valid network!"
       end.merge(
         bitcoin: {
-          address_version: '00',
-          p2sh_version: '05',
-          p2sh_char: '3',
-          privkey_version: '80',
-          privkey_compression_flag: '01',
+          address_version: "00",
+          p2sh_version: "05",
+          p2sh_char: "3",
+          privkey_version: "80",
+          privkey_compression_flag: "01",
           extended_privkey_version: "0488ade4",
           extended_pubkey_version: "0488b21e",
           compressed_wif_chars: %w(K L),
           uncompressed_wif_chars: %w(5),
-          protocol_version: 70001
+          protocol_version: 70001,
+          human_readable_part: "bc",
         },
         bitcoin_testnet: {
-          address_version: '6f',
-          p2sh_version: 'c4',
-          p2sh_char: '2',
-          privkey_version: 'ef',
-          privkey_compression_flag: '01',
+          address_version: "6f",
+          p2sh_version: "c4",
+          p2sh_char: "2",
+          privkey_version: "ef",
+          privkey_compression_flag: "01",
           extended_privkey_version: "04358394",
           extended_pubkey_version: "043587cf",
           compressed_wif_chars: %w(c),
           uncompressed_wif_chars: %w(9),
-          protocol_version: 70001
-        }
+          protocol_version: 70001,
+          human_readable_part: "tb",
+        },
       )
       hsh[:testnet3] = hsh[:bitcoin_testnet]
       hsh

data/lib/money-tree/node.rb

@@ -2,8 +2,16 @@ module MoneyTree
   class Node
     include Support
     extend Support
-    attr_reader :private_key, :public_key, :chain_code,
-      :is_private, :depth, :index, :parent
+
+    attr_reader :private_key
+    attr_reader :public_key
+    attr_reader :chain_code
+    attr_reader :is_private
+    attr_reader :depth
+    attr_reader :index
+    attr_reader :parent
+
+    PRIVATE_RANGE_LIMIT = 0x80000000
 
     class PublicDerivationFailure < StandardError; end
     class InvalidKeyForIndex < StandardError; end
@@ -21,36 +29,31 @@ module MoneyTree
         depth: hex.slice!(0..1).to_i(16),
         parent_fingerprint: hex.slice!(0..7),
         index: hex.slice!(0..7).to_i(16),
-        chain_code: hex.slice!(0..63).to_i(16)
+        chain_code: hex.slice!(0..63).to_i(16),
       }.merge(parse_out_key(hex)))
     end
 
-    def self.from_serialized_address(address)
-      puts 'Node.from_serialized_address is DEPRECATED. Please use .from_bip32 instead.'
-      from_bip32(address)
-    end
-
     def self.parse_out_key(hex)
-      if hex.slice(0..1) == '00'
+      if hex.slice(0..1) == "00"
         private_key = MoneyTree::PrivateKey.new(key: hex.slice(2..-1))
         {
           private_key: private_key,
-          public_key: MoneyTree::PublicKey.new(private_key)
+          public_key: MoneyTree::PublicKey.new(private_key),
         }
       elsif %w(02 03).include? hex.slice(0..1)
         { public_key: MoneyTree::PublicKey.new(hex) }
       else
-        raise ImportError, 'Public or private key data does not match version type'
+        raise ImportError, "Public or private key data does not match version type"
       end
     end
 
     def is_private?
-      index >= 0x80000000 || index < 0
+      index >= PRIVATE_RANGE_LIMIT || index < 0
     end
 
     def index_hex(i = index)
       if i < 0
-        [i].pack('l>').unpack('H*').first
+        [i].pack("l>").unpack("H*").first
       else
         i.to_s(16).rjust(8, "0")
       end
@@ -69,26 +72,37 @@ module MoneyTree
     end
 
     def i_as_bytes(i)
-      [i].pack('N')
+      [i].pack("N")
     end
 
     def derive_private_key(i = 0)
-      message = i >= 0x80000000 || i < 0 ? private_derivation_message(i) : public_derivation_message(i)
+      message = i >= PRIVATE_RANGE_LIMIT || i < 0 ? private_derivation_message(i) : public_derivation_message(i)
       hash = hmac_sha512 hex_to_bytes(chain_code_hex), message
       left_int = left_from_hash(hash)
-      raise InvalidKeyForIndex, 'greater than or equal to order' if left_int >= MoneyTree::Key::ORDER # very low probability
+      raise InvalidKeyForIndex, "greater than or equal to order" if left_int >= MoneyTree::Key::ORDER # very low probability
       child_private_key = (left_int + private_key.to_i) % MoneyTree::Key::ORDER
-      raise InvalidKeyForIndex, 'equal to zero' if child_private_key == 0 # very low probability
+      raise InvalidKeyForIndex, "equal to zero" if child_private_key == 0 # very low probability
       child_chain_code = right_from_hash(hash)
       return child_private_key, child_chain_code
     end
 
+    def derive_parent_node(parent_key)
+      message = parent_key.public_key.to_bytes << i_as_bytes(index)
+      hash = hmac_sha512 hex_to_bytes(parent_key.chain_code_hex), message
+      priv = (private_key.to_i - left_from_hash(hash)) % MoneyTree::Key::ORDER
+      MoneyTree::Node.new(depth: parent_key.depth,
+                          index: parent_key.index,
+                          private_key: MoneyTree::PrivateKey.new(key: priv),
+                          public_key: parent_key.public_key,
+                          chain_code: parent_key.chain_code)
+    end
+
     def derive_public_key(i = 0)
-      raise PrivatePublicMismatch if i >= 0x80000000
+      raise PrivatePublicMismatch if i >= PRIVATE_RANGE_LIMIT
       message = public_derivation_message(i)
       hash = hmac_sha512 hex_to_bytes(chain_code_hex), message
       left_int = left_from_hash(hash)
-      raise InvalidKeyForIndex, 'greater than or equal to order' if left_int >= MoneyTree::Key::ORDER # very low probability
+      raise InvalidKeyForIndex, "greater than or equal to order" if left_int >= MoneyTree::Key::ORDER # very low probability
       factor = BN.new left_int.to_s
 
       gen_point = public_key.uncompressed.group.generator.mul(factor)
@@ -96,7 +110,7 @@ module MoneyTree
       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
+      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
     end
@@ -125,12 +139,7 @@ module MoneyTree
       to_serialized_base58 to_serialized_hex(type, network: network)
     end
 
-    def to_serialized_address(type = :public, network: :bitcoin)
-      puts 'Node.to_serialized_address is DEPRECATED. Please use .to_bip32.'
-      to_bip32(type, network: network)
-    end
-
-    def to_identifier(compressed=true)
+    def to_identifier(compressed = true)
       key = compressed ? public_key.compressed : public_key.uncompressed
       key.to_ripemd160
     end
@@ -143,15 +152,25 @@ module MoneyTree
       if @parent_fingerprint
         @parent_fingerprint
       else
-        depth.zero? ? '00000000' : parent.to_fingerprint
+        depth.zero? ? "00000000" : parent.to_fingerprint
       end
     end
 
-    def to_address(compressed=true, network: :bitcoin)
+    def to_address(compressed = true, network: :bitcoin)
       address = NETWORKS[network][:address_version] + to_identifier(compressed)
       to_serialized_base58 address
     end
 
+    def to_p2wpkh_p2sh(network: :bitcoin)
+      public_key.to_p2wpkh_p2sh(network: network)
+    end
+
+    def to_bech32_address(network: :bitcoin)
+      hrp = NETWORKS[network][:human_readable_part]
+      witprog = to_identifier
+      to_serialized_bech32(hrp, witprog)
+    end
+
     def subnode(i = 0, opts = {})
       if private_key.nil?
         child_public_key, child_chain_code = derive_public_key(i)
@@ -162,7 +181,7 @@ module MoneyTree
         child_public_key = MoneyTree::PublicKey.new child_private_key
       end
 
-      MoneyTree::Node.new( depth: depth+1,
+      MoneyTree::Node.new(depth: depth + 1,
                           index: i,
                           private_key: private_key.nil? ? nil : child_private_key,
                           public_key: child_public_key,
@@ -182,9 +201,9 @@ module MoneyTree
     #
     # You should choose either the p or the negative number convention for private key derivation.
     def node_for_path(path)
-      force_public = path[-4..-1] == '.pub'
+      force_public = path[-4..-1] == ".pub"
       path = path[0..-5] if force_public
-      parts = path.split('/')
+      parts = path.split("/")
       nodes = []
       parts.each_with_index do |part, depth|
         if part =~ /m/i
@@ -195,7 +214,7 @@ module MoneyTree
           nodes << node.subnode(i)
         end
       end
-      if force_public or parts.first == 'M'
+      if force_public or parts.first == "M"
         node = nodes.last
         node.strip_private_info!
         node
@@ -204,17 +223,19 @@ module MoneyTree
       end
     end
 
-    def parse_index(path_part)
-      is_prime = %w(p ').include? path_part[-1]
-      i = path_part.to_i
+    def negative?(path_part)
+      relative_index = path_part.to_i
+      prime_symbol_present = %w(p ').include?(path_part[-1])
+      minus_present = path_part[0] == "-"
+      private_range = relative_index >= PRIVATE_RANGE_LIMIT
+      negative_value = relative_index < 0
+      prime_symbol_present || minus_present || private_range || negative_value
+    end
 
-      i = if i < 0
-        i
-      elsif is_prime
-        i | 0x80000000
-      else
-        i & 0x7fffffff
-      end
+    def parse_index(path_part)
+      index = path_part.to_i
+      return index | PRIVATE_RANGE_LIMIT if negative?(path_part)
+      index
     end
 
     def strip_private_info!
@@ -251,7 +272,7 @@ module MoneyTree
         raise SeedGeneration::ImportError unless seed_valid?(@seed_hash)
         set_seeded_keys
       elsif opts[:private_key] || opts[:public_key]
-        raise ImportError, 'chain code required' unless opts[:chain_code]
+        raise ImportError, "chain code required" unless opts[:chain_code]
         @chain_code = opts[:chain_code]
         if opts[:private_key]
           @private_key = opts[:private_key]
@@ -261,8 +282,7 @@ module MoneyTree
             opts[:public_key]
           else
             MoneyTree::PublicKey.new(opts[:public_key])
-          end
-        end
+          end         end
       else
         generate_seed
         set_seeded_keys