straight 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04d8199335a24cd3a0c22e95a2db1cc8576e6d57
-  data.tar.gz: c20786d5a8b3461583df5cc9ee882ee387f5af19
+  metadata.gz: 47b083622bc343959f9614caf0a90263c117e490
+  data.tar.gz: 7b6fd9a56ffae2d8e20d75c8f69c4bdcc5562978
 SHA512:
-  metadata.gz: 59bf81e312babcdaf4e3fb22b80c32ecdb30852484b91490adaa310aa2891c664b9812315644aa25838caa4019fd8be019e8b95b19f2f78c62d6bace037e3308
-  data.tar.gz: 8c9d2819814f9989d19cfbca2b4de5ef92b9bea5e6a2bca3f88cacfbb513224f97216488dca116537d0e9f6760b73de8c5021d6efdb52cfe212bdfad7018598f
+  metadata.gz: 2c750fa3761f2967e448b3b7c8256e60b1815abe215a22bfad1f3c953283a3e46268735084cd8debc2b73d176e3486f81fbe576ed5f1eb789794641454c4dac4
+  data.tar.gz: 9ca4bb9f861caf0d57d02ef2d415c5db3adba2fa1b4a3ff39e72272c6d311fd5a9f291d0471326efcbe82e33a565e596c2f9c2b724d9a38f0d53b7d7ed4a6730

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 # Used to generate bip32 addresses
-gem 'money-tree'
+gem 'money-tree', "0.9.0"
 
 # Used in exchange rate adapters
 gem 'satoshi-unit'

data/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
     diff-lcs (1.2.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
+    ffi (1.9.8)
     git (1.2.8)
     github_api (0.11.3)
       addressable (~> 2.3)
@@ -35,7 +35,7 @@ GEM
     json (1.8.1)
     jwt (1.0.0)
     mini_portile (0.6.0)
-    money-tree (0.8.7)
+    money-tree (0.9.0)
       ffi
     multi_json (1.10.1)
     multi_xml (0.5.5)
@@ -75,6 +75,6 @@ DEPENDENCIES
   github_api (= 0.11.3)
   httparty
   jeweler (~> 2.0.1)
-  money-tree
+  money-tree (= 0.9.0)
   rspec
   satoshi-unit

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/straight/gateway.rb

@@ -87,8 +87,13 @@ module Straight
       # the one a user of this class is going to properly increment) that is used to generate a
       # an BIP32 bitcoin address deterministically.
       def address_for_keychain_id(id)
-        # The 'm/0/n' notation is used by both Electrum and Mycelium
-        keychain.node_for_path("m/0/#{id.to_s}").to_address
+        # First check the depth. If the depth is 4 use '/i' notation (Mycelium iOS wallet)
+        # TODO deal with other depths later. Currently only supports 0 and 4
+        if keychain.depth > 0
+          keychain.node_for_path(id.to_s).to_address
+        else # Otherwise, use 'm/0/n' - both Electrum and Mycelium on Android
+          keychain.node_for_path("m/0/#{id.to_s}").to_address
+        end
       end
       
       def fetch_transaction(tid, address: nil)
@@ -104,7 +109,7 @@ module Straight
       end
 
       def keychain
-        @keychain ||= MoneyTree::Node.from_serialized_address(pubkey)
+        @keychain ||= MoneyTree::Node.from_bip32(pubkey)
       end
 
       # This is a callback method called from each order

data/spec/lib/gateway_spec.rb

@@ -46,10 +46,15 @@ RSpec.describe Straight::Gateway do
     expect(@gateway.order_for_keychain_id(amount: 1, keychain_id: 1).address).to eq(expected_address)
   end
 
+  it "checks the depth of the xpub key and uses derivation notation according to the depth" do
+    @gateway.pubkey = 'xpub6DkF8MtNnbJY6NBR5tBSZ2NYQL16sT4fiT1R8U4D24bfSNmzzbhzNdP25LLgmis6c7EsVdzdUqv1MZoU8TNHaNNRHfTE1hqXRNMfPyJ2fCw'
+    expect(@gateway.address_for_keychain_id(0)).to eq("1GS7KMkpz27xpFKddFPkjqCAAPPo9eyUev")
+  end
+
   it "calls all the order callbacks" do
     callback1                = double('callback1')
     callback2                = double('callback1')
-    @gateway.pubkey          = MoneyTree::Master.new.to_serialized_address
+    @gateway.pubkey          = MoneyTree::Master.new.to_bip32
     @gateway.order_callbacks = [callback1, callback2]
 
     order = @gateway.order_for_keychain_id(amount: 1, keychain_id: 1)

data/straight.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: straight 0.2.2 ruby lib
+# stub: straight 0.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "straight"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roman Snitko"]
-  s.date = "2015-05-07"
+  s.date = "2015-05-30"
   s.description = "An engine for the Straight payment gateway software. Requires no state to be saved (that is, no storage or DB). Its responsibilities only include processing data coming from an actual gateway."
   s.email = "roman.snitko@gmail.com"
   s.extra_rdoc_files = [
@@ -69,14 +69,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<money-tree>, [">= 0"])
+      s.add_runtime_dependency(%q<money-tree>, ["= 0.9.0"])
       s.add_runtime_dependency(%q<satoshi-unit>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<github_api>, ["= 0.11.3"])
     else
-      s.add_dependency(%q<money-tree>, [">= 0"])
+      s.add_dependency(%q<money-tree>, ["= 0.9.0"])
       s.add_dependency(%q<satoshi-unit>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -84,7 +84,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<github_api>, ["= 0.11.3"])
     end
   else
-    s.add_dependency(%q<money-tree>, [">= 0"])
+    s.add_dependency(%q<money-tree>, ["= 0.9.0"])
     s.add_dependency(%q<satoshi-unit>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: straight
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: satoshi-unit
   requirement: !ruby/object:Gem::Requirement