straight-server 0.2.3 → 1.0.0

data/spec/lib/initializer_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe StraightServer::Initializer do
     remove_tmp_dir
   end
 
-  # as #create_config_files method contains #exit method we need to rescue SystemExix: exit() error
+  # as #create_config_files method contains #exit method we need to rescue SystemExit: exit() error
   # and at the same time its good to assert that method execution went well, which we do in rescue
   let(:create_config_files) do
     begin

data/spec/lib/order_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'spec_helper'
 
 RSpec.describe StraightServer::Order do
@@ -9,6 +10,7 @@ RSpec.describe StraightServer::Order do
     allow(@gateway).to receive(:id).and_return(1)
     allow(@gateway).to receive(:active).and_return(true)
     allow(@gateway).to receive(:order_status_changed)
+    allow(@gateway).to receive(:test_mode).and_return(false)
     allow(@gateway).to receive(:save)
     allow(@gateway).to receive(:increment_order_counter!)
     allow(@gateway).to receive(:current_exchange_rate).and_return(111)
@@ -29,7 +31,7 @@ RSpec.describe StraightServer::Order do
 
   it "prepares data as http params" do
     allow(@order).to receive(:tid).and_return("tid1")
-    expect(@order.to_http_params).to eq("order_id=#{@order.id}&amount=10&amount_in_btc=#{@order.amount_in_btc(as: :string)}&status=#{@order.status}&address=#{@order.address}&tid=tid1&keychain_id=#{@order.keychain_id}&last_keychain_id=#{@order.gateway.last_keychain_id}")
+    expect(@order.to_http_params).to eq("order_id=#{@order.id}&amount=10&amount_in_btc=#{@order.amount_in_btc(as: :string)}&amount_paid_in_btc=#{@order.amount_in_btc(field: @order.amount_paid, as: :string)}&status=#{@order.status}&address=#{@order.address}&tid=tid1&keychain_id=#{@order.keychain_id}&last_keychain_id=#{@order.gateway.last_keychain_id}")
   end
 
   it "generates a payment_id" do
@@ -46,9 +48,10 @@ RSpec.describe StraightServer::Order do
   end
 
   it "checks DB for a status update first if the respective option for the gateway is turned on" do
-    allow(@order).to receive(:transaction).and_raise("Shouldn't ever be happening!")
+    # allow(@order).to receive(:transaction).and_raise("Shouldn't ever be happening!")
     StraightServer::Config.check_order_status_in_db_first = true
     StraightServer::Order.where(id: @order.id).update(status: 2)
+    allow(@order.gateway).to receive(:fetch_transactions_for).and_return([])
     allow(@order.gateway).to receive(:order_status_changed)
     expect(@order.status(reload: false)).to eq(0)
     expect(@order.status(reload: true)).to eq(2)
@@ -75,21 +78,37 @@ RSpec.describe StraightServer::Order do
 
   it "returns last_keychain_id for the gateway along with other order data" do
     order = create(:order, gateway_id: @gateway.id)
-    expect(order.to_h).to include(keychain_id: order.keychain_id, last_keychain_id: @gateway.last_keychain_id) 
+    expect(order.to_h).to include(keychain_id: order.keychain_id, last_keychain_id: @gateway.last_keychain_id)
+  end
+
+  it "returns test_last_keychain_id (as last_keychain_id) for the gateway in test mode" do
+    allow(@gateway).to receive(:test_mode).and_return(true)
+    allow(@gateway).to receive(:test_last_keychain_id).and_return(123)
+    order = create(:order, gateway_id: @gateway.id)
+    expect(order.to_h[:last_keychain_id]).to eq(123)
+  end
+
+  it 'is cancelable only while new' do
+    order = build(:order, gateway_id: @gateway.id, status: 0)
+    expect(order.cancelable?).to eq true
+    (1..6).each do |status|
+      order.instance_variable_set :@status, status
+      expect(order.cancelable?).to eq false
+    end
   end
 
   describe "DB interaction" do
 
     it "saves a new order into the database" do
-      expect(DB[:orders][:keychain_id => @order.id]).not_to be_nil 
+      expect(DB[:orders][:keychain_id => @order.id]).not_to be_nil
     end
 
     it "updates an existing order" do
       allow(@order).to receive(:gateway).and_return(@gateway)
-      expect(DB[:orders][:keychain_id => @order.id][:status]).to eq(0) 
+      expect(DB[:orders][:keychain_id => @order.id][:status]).to eq(0)
       @order.status = 1
       @order.save
-      expect(DB[:orders][:keychain_id => @order.id][:status]).to eq(1) 
+      expect(DB[:orders][:keychain_id => @order.id][:status]).to eq(1)
     end
 
     it "finds first order in the database by id" do
@@ -103,7 +122,7 @@ RSpec.describe StraightServer::Order do
     it "finds orders in the database by any conditions" do
       order1 = create(:order, gateway_id: @gateway.id)
       order2 = create(:order, gateway_id: @gateway.id)
-      
+
       expect(StraightServer::Order.where(keychain_id: order1.keychain_id).first).to equal_order(order1)
       expect(StraightServer::Order.where(keychain_id: order2.keychain_id).first).to equal_order(order2)
       expect(StraightServer::Order.where(keychain_id: order2.keychain_id+1).first).to be_nil

data/spec/lib/orders_controller_spec.rb

@@ -5,7 +5,8 @@ RSpec.describe StraightServer::OrdersController do
   before(:each) do
     DB.run("DELETE FROM orders")
     @gateway = gateway = StraightServer::Gateway.find_by_id(2)
-    allow(gateway).to receive(:address_for_keychain_id).and_return("address#{gateway.last_keychain_id+1}")
+    allow(gateway).to receive_message_chain("address_provider.takes_fees?").and_return(false)
+    allow(gateway).to receive_message_chain("address_provider.new_address").and_return("address#{gateway.last_keychain_id+1}")
     allow(gateway).to receive(:fetch_transactions_for).with(anything).and_return([])
     allow(gateway).to receive(:send_callback_http_request)
   end
@@ -18,15 +19,22 @@ RSpec.describe StraightServer::OrdersController do
       expect(response).to render_json_with(status: 0, amount: 10, address: "address1", tid: nil, id: :anything, keychain_id: @gateway.last_keychain_id, last_keychain_id: @gateway.last_keychain_id)
     end
 
-    it "renders 409 error when an order cannot be created due to some validation errors" do
+    it "renders 409 error when an order cannot be created due to invalid amount" do
       send_request "POST", '/gateways/2/orders', amount: 0
       expect(response[0]).to eq(409)
-      expect(response[2]).to eq("Invalid order: amount should be more than 0")
+      expect(response[2]).to eq("Invalid order: amount cannot be nil and should be more than 0")
+    end
+
+    it "renders 409 error when an order cannot be created due to other validation errors" do
+      send_request "POST", '/gateways/2/orders', amount: 1, description: 'A'*256
+      expect(response[0]).to eq(409)
+      expect(response[2]).to eq("Invalid order: description should be shorter than 256 characters")
     end
 
     it "starts tracking the order status in a separate thread" do
       order_mock = double("order mock")
       expect(order_mock).to receive(:start_periodic_status_check)
+      expect(order_mock).to receive(:payment_id).and_return('blabla')
       allow(order_mock).to  receive(:to_h).and_return({})
       expect(@gateway).to   receive(:create_order).and_return(order_mock)
       send_request "POST", '/gateways/2/orders', amount: 10
@@ -58,7 +66,7 @@ RSpec.describe StraightServer::OrdersController do
     end
 
     it 'limits creation of orders without signature' do
-      new_config          = StraightServer::Config.dup
+      new_config          = StraightServer::Config.clone
       new_config.throttle = {requests_limit: 1, period: 1}
       stub_const 'StraightServer::Config', new_config
       allow(StraightServer::Thread).to receive(:new)
@@ -72,7 +80,7 @@ RSpec.describe StraightServer::OrdersController do
       @gateway1.check_signature = true
       5.times do |i|
         i += 1
-        send_request "POST", '/gateways/1/orders', amount: 10, keychain_id: i, signature: @gateway1.sign_with_secret(i)
+        send_signed_request @gateway1, "POST", '/gateways/1/orders', amount: 10, keychain_id: i
         expect(response[0]).to eq 200
         expect(response).to render_json_with(status: 0, amount: 10, tid: nil, id: :anything, keychain_id: i, last_keychain_id: i)
       end
@@ -163,11 +171,62 @@ RSpec.describe StraightServer::OrdersController do
       send_request "GET", '/gateways/2/orders/payment_id/websocket'
       expect(response).to eq("ws rack response")
     end
+  end
+
+  describe "cancel action" do
+    it "cancels new order" do
+      allow(StraightServer::Thread).to receive(:new)
+      send_request "POST", '/gateways/2/orders', amount: 1
+      payment_id = JSON.parse(response[2])['payment_id']
+      send_request "POST", "/gateways/2/orders/#{payment_id}/cancel"
+      expect(response[0]).to eq 200
+    end
 
+    it "requires signature to cancel signed order" do
+      allow(StraightServer::Thread).to receive(:new)
+      @gateway1                 = StraightServer::Gateway.find_by_id(1)
+      @gateway1.check_signature = true
+      @order_mock = double('order mock')
+      allow(@order_mock).to receive(:status).with(reload: true)
+      allow(@order_mock).to receive(:status_changed?).and_return(false)
+      allow(@order_mock).to receive(:cancelable?).and_return(true)
+      expect(@order_mock).to receive(:cancel)
+      allow(StraightServer::Order).to receive(:[]).and_return(@order_mock)
+      send_request "POST", "/gateways/1/orders/payment_id/cancel"
+      expect(response).to eq [409, {}, 'X-Nonce is invalid: nil']
+      send_signed_request @gateway1, "POST", "/gateways/1/orders/payment_id/cancel"
+      expect(response[0]).to eq 200
+    end
+
+    it "do not cancel orders with status != new" do
+      @order_mock = double('order mock')
+      allow(@order_mock).to receive(:status).with(reload: true)
+      allow(@order_mock).to receive(:status_changed?).and_return(true)
+      expect(@order_mock).to receive(:save)
+      allow(@order_mock).to receive(:cancelable?).and_return(false)
+      allow(StraightServer::Order).to receive(:[]).and_return(@order_mock)
+      send_request "POST", "/gateways/2/orders/payment_id/cancel"
+      expect(response).to eq [409, {}, "Order is not cancelable"]
+    end
+  end
+
+  it 'return last_keychain_id' do
+    lk_id = 123
+    @gateway = StraightServer::Gateway.find_by_id(1)
+    @gateway.last_keychain_id = lk_id
+    @gateway.save
+    send_request "GET", '/gateway/1/last_keychain_id'
+    expect(response).to render_json_with(gateway_id: @gateway.id, last_keychain_id: lk_id)
   end
 
   def send_request(method, path, params={})
-    env = Hashie::Mash.new({ 'REQUEST_METHOD' => method, 'REQUEST_PATH' => path, 'params' => params })
+    env = Hashie::Mash.new('REQUEST_METHOD' => method, 'REQUEST_PATH' => path, 'params' => params)
+    @controller = StraightServer::OrdersController.new(env)
+  end
+
+  def send_signed_request(gateway, method, path, params={})
+    env = Hashie::Mash.new('REQUEST_METHOD' => method, 'REQUEST_PATH' => path, 'params' => params, 'HTTP_X_NONCE' => (Time.now.to_f * 1e6).to_i)
+    env['HTTP_X_SIGNATURE'] = StraightServer::SignatureValidator.new(gateway, env).signature
     @controller = StraightServer::OrdersController.new(env)
   end
 

data/spec/lib/signature_validator_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+RSpec.describe StraightServer::SignatureValidator do
+
+  it 'calculates signature' do
+    expect(described_class.signature(nonce: '123', body: '', method: 'GET', request_uri: '/somewhere', secret: 'gateway_secret')).to eq 'ZSWEKzuWy6QWCc05I+t4QYQhUtkeogkW7rCwieQvy/56Y+bVwxGGKB3yNQg1XL2LmtuNNwv2SXUxjlFEP7+0+A=='
+    expect(described_class.signature(nonce: '123', body: '', method: 'GET', request_uri: '/somewhere', secret: 'gateway-secret')).to eq 'nYLq7IXlgw5FAsXGc0+JoXmfHBEwl7zwVQhsix+FraIIFsPeGYnQ/22wkjPAwwyu0GoYEbM6gmN+sxEzciNkFg=='
+    expect(described_class.signature(nonce: '12345', body: 'text' * 10000, method: 'POST', request_uri: '/somewhere', secret: 'gateway_secret')).to eq 'F0GsyqPkxDgmqdTomIGVIRQ/ik2GiZtXy1GVNx0j+UDUL8VS496HsbcOlyUocKUM0fU96KkjhrpUh0LC29AXyQ=='
+  end
+
+  it 'validates signature' do
+    @validator = described_class.new(
+      Struct.new(:secret).new('abc'),
+      {
+        'HTTP_X_NONCE' => '1',
+        'rack.input'     => 'request body',
+        'REQUEST_METHOD' => 'POST',
+        'REQUEST_URI'   => '/gateway/123/orders',
+      }
+    )
+    expect(@validator.env['HTTP_X_SIGNATURE'] = @validator.signature).to eq '1EtQNASecMF85tyag+pSSdF2yxLfy3xCddM2ZGA86M8OTxleEixBnbOeMEBp37Ke5+7jWQm+Gpx95y6MZiW6wQ=='
+    expect(@validator.valid_signature?).to eq true
+  end
+
+  it 'validates nonce' do
+    @validator = described_class.new(
+      Struct.new(:id).new(1),
+      {'HTTP_X_NONCE' => '100500'}
+    )
+    expect(@validator.valid_nonce?).to eq true
+    expect(@validator.valid_nonce?).to eq false
+    @validator.env['HTTP_X_NONCE'] = '100499'
+    expect(@validator.valid_nonce?).to eq false
+    @validator.env['HTTP_X_NONCE'] = '100501'
+    expect(@validator.valid_nonce?).to eq true
+    expect(@validator.valid_nonce?).to eq false
+  end
+
+  it 'validates nonce in a thread-safe way' do
+    # TODO: test on real concurrency (JRuby?)
+    @validator    = described_class.new(
+      Struct.new(:id).new(2),
+      {'HTTP_X_NONCE' => '100500'}
+    )
+    thread_number = 100
+    @threads      = thread_number.times.map do |i|
+      Thread.new do
+        sleep (thread_number - i) / 10000.0
+        Thread.current[:result] = @validator.valid_nonce?
+      end
+    end
+    @threads.each(&:join)
+    expect(@threads.select { |thread| thread[:result] }.size).to eq 1
+  end
+
+  it 'raises exceptions if invalid' do
+    @validator                           = described_class.new(
+      Struct.new(:id, :secret).new(3, 'abc'),
+      {
+        'HTTP_X_NONCE' => '1',
+        'rack.input'     => 'request body',
+        'REQUEST_METHOD' => 'POST',
+        'REQUEST_PATH'   => '/gateway/123/orders',
+      }
+    )
+    @validator.env['HTTP_X_SIGNATURE'] = @validator.signature
+    expect(@validator.validate!).to eq true
+    expect { @validator.validate! }.to raise_error(described_class::InvalidNonce)
+    @validator.env['HTTP_X_NONCE'] = '2'
+    expect { @validator.validate! }.to raise_error(described_class::InvalidSignature)
+  end
+end

data/spec/lib/thread_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+RSpec.describe StraightServer::Thread do
+
+  it 'labels threads' do
+    thread = described_class.new(label: 'payment_id'){}
+    expect(thread[:label]).to eq 'payment_id'
+  end
+
+  it 'sets and clears interruption flag' do
+    thread = described_class.new(label: 'payment_id'){}
+    described_class.interrupt(label: 'payment_id')
+    expect(described_class.interrupted?(thread: thread)).to eq true
+    expect(described_class.interrupted?(thread: thread)).to eq false
+  end
+end

data/spec/lib/throttle_spec.rb

@@ -4,7 +4,7 @@ require 'timecop'
 RSpec.describe StraightServer::Throttler do
 
   it 'throttles requests' do
-    new_config          = StraightServer::Config.dup
+    new_config          = StraightServer::Config.clone
     new_config.throttle = {requests_limit: 1, period: 1}
     stub_const 'StraightServer::Config', new_config
     throttler1 = described_class.new(1)
@@ -29,7 +29,7 @@ RSpec.describe StraightServer::Throttler do
   end
 
   it 'bans by ip' do
-    new_config          = StraightServer::Config.dup
+    new_config          = StraightServer::Config.clone
     new_config.throttle = {requests_limit: 3, period: 1, ip_ban_duration: 30}
     stub_const 'StraightServer::Config', new_config
     throttler1 = described_class.new(1)

data/spec/spec_helper.rb

@@ -12,40 +12,34 @@ DB = Sequel.sqlite
 # 2. Then we can run migrations BEFORE we load actual models
 Sequel::Migrator.run(DB, File.expand_path('../', File.dirname(__FILE__)) + '/db/migrations/')
 
-# 3. Load config and initializer so that we can read our test config file located in
-# spec/.straight/config.yml
+# Actually load the initializer
+require_relative '../lib/straight-server'
 
-# 3.1 This tells initializer where to read the config file from
+# This tells initializer where to read the config file from
 ENV['HOME'] = File.expand_path(File.dirname(__FILE__))
 
-# 3.2 Actually load the initializer
-require_relative "../lib/straight-server/config"
-require_relative "../lib/straight-server/initializer"
-require_relative "../lib/straight-server/utils/hash_string_to_sym_keys"
-include StraightServer::Initializer
-StraightServer::Initializer::ConfigDir.set!
-read_config_file
-setup_redis_connection
-
-# 4. Load the rest of the files, including models, which are now ready
-# to be used as intended and will follow all the previous configuration.
-require_relative '../lib/straight-server/order'
+initializer = Class.new do
+  include StraightServer::Initializer
+end.new
+initializer.prepare
 require_relative '../lib/straight-server/gateway'
-require_relative '../lib/straight-server/orders_controller'
-require_relative '../lib/straight-server'
+require_relative '../lib/straight-server/order'
 
 require_relative 'support/custom_matchers'
 
 require "factory_girl"
 require_relative "factories"
 
-class StraightServer::Order
-  alias :save! :save
-end
+require 'webmock/rspec'
 
+# class StraightServer::Order
+#   alias :save! :save
+# end
+#
 class StraightServer::Thread
-  def self.new(&block)
+  def self.new(label: nil, &block)
     block.call
+    {label: label}
   end
 end
 
@@ -57,7 +51,8 @@ RSpec.configure do |config|
     StraightServer.db_connection = DB #use a memory DB
   end
 
-  config.before(:each) do
+  config.before(:each) do |spec|
+    # puts spec.description
     DB[:orders].delete
     logger_mock = double("logger mock")
     [:debug, :info, :warn, :fatal, :unknown, :blank_lines].each do |e|

data/straight-server.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-server 0.2.3 ruby lib
+# stub: straight-server 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "straight-server"
-  s.version = "0.2.3"
+  s.version = "1.0.0"
 
   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-30"
+  s.date = "2015-07-31"
   s.description = "Accepts orders via http, returns payment info via http or streams updates via websockets, stores orders in a DB"
   s.email = "roman.snitko@gmail.com"
   s.executables = ["straight-console", "straight-server", "straight-server-benchmark"]
@@ -48,6 +48,15 @@ Gem::Specification.new do |s|
     "db/migrations/009_add_hashed_id_to_gateways.rb",
     "db/migrations/010_add_address_reusability_orders.rb",
     "db/migrations/011_add_callback_data_to_orders.rb",
+    "db/migrations/012_add_address_provider.rb",
+    "db/migrations/013_add_address_derivation_scheme.rb",
+    "db/migrations/014_pubkey_null_address_provider_not_null.rb",
+    "db/migrations/015_add_amount_paid_to_orders.rb",
+    "db/migrations/016_add_new_params_to_orders.rb",
+    "db/migrations/017_add_test_mode_to_gateways.rb",
+    "db/migrations/018_add_test_keychain_id_to_gateways.rb",
+    "db/migrations/019_add_test_pubkey_to_gateways.rb",
+    "db/migrations/020_add_test_mode_to_orders.rb",
     "db/schema.rb",
     "examples/client/client.dart",
     "examples/client/client.html",
@@ -61,11 +70,13 @@ Gem::Specification.new do |s|
     "lib/straight-server/orders_controller.rb",
     "lib/straight-server/random_string.rb",
     "lib/straight-server/server.rb",
+    "lib/straight-server/signature_validator.rb",
     "lib/straight-server/thread.rb",
     "lib/straight-server/throttler.rb",
     "lib/straight-server/utils/hash_string_to_sym_keys.rb",
     "lib/tasks/db.rake",
     "spec/.straight/config.yml",
+    "spec/.straight/default_test_last_keychain_id",
     "spec/.straight/server_secret",
     "spec/factories.rb",
     "spec/fixtures/addons.yml",
@@ -74,6 +85,8 @@ Gem::Specification.new do |s|
     "spec/lib/initializer_spec.rb",
     "spec/lib/order_spec.rb",
     "spec/lib/orders_controller_spec.rb",
+    "spec/lib/signature_validator_spec.rb",
+    "spec/lib/thread_spec.rb",
     "spec/lib/throttle_spec.rb",
     "spec/lib/utils/hash_string_to_sym_keys.rb",
     "spec/spec_helper.rb",
@@ -91,42 +104,48 @@ 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<straight>, ["= 0.2.2"])
-      s.add_runtime_dependency(%q<satoshi-unit>, [">= 0"])
+      s.add_runtime_dependency(%q<straight>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<satoshi-unit>, [">= 0.1.8"])
       s.add_runtime_dependency(%q<goliath>, [">= 0"])
       s.add_runtime_dependency(%q<faye-websocket>, [">= 0"])
       s.add_runtime_dependency(%q<sequel>, [">= 0"])
       s.add_runtime_dependency(%q<logmaster>, ["= 0.1.5"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_runtime_dependency(%q<money-tree>, ["= 0.9.0"])
+      s.add_runtime_dependency(%q<redis>, [">= 0"])
+      s.add_runtime_dependency(%q<btcruby>, [">= 0"])
+      s.add_development_dependency(%q<byebug>, [">= 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<straight>, ["= 0.2.2"])
-      s.add_dependency(%q<satoshi-unit>, [">= 0"])
+      s.add_dependency(%q<straight>, ["= 1.0.0"])
+      s.add_dependency(%q<satoshi-unit>, [">= 0.1.8"])
       s.add_dependency(%q<goliath>, [">= 0"])
       s.add_dependency(%q<faye-websocket>, [">= 0"])
       s.add_dependency(%q<sequel>, [">= 0"])
       s.add_dependency(%q<logmaster>, ["= 0.1.5"])
       s.add_dependency(%q<ruby-hmac>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<money-tree>, ["= 0.9.0"])
+      s.add_dependency(%q<redis>, [">= 0"])
+      s.add_dependency(%q<btcruby>, [">= 0"])
+      s.add_dependency(%q<byebug>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<github_api>, ["= 0.11.3"])
     end
   else
-    s.add_dependency(%q<straight>, ["= 0.2.2"])
-    s.add_dependency(%q<satoshi-unit>, [">= 0"])
+    s.add_dependency(%q<straight>, ["= 1.0.0"])
+    s.add_dependency(%q<satoshi-unit>, [">= 0.1.8"])
     s.add_dependency(%q<goliath>, [">= 0"])
     s.add_dependency(%q<faye-websocket>, [">= 0"])
     s.add_dependency(%q<sequel>, [">= 0"])
     s.add_dependency(%q<logmaster>, ["= 0.1.5"])
     s.add_dependency(%q<ruby-hmac>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<money-tree>, ["= 0.9.0"])
+    s.add_dependency(%q<redis>, [">= 0"])
+    s.add_dependency(%q<btcruby>, [">= 0"])
+    s.add_dependency(%q<byebug>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<github_api>, ["= 0.11.3"])