straight-server 0.2.3 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.2.3
+1.0.0

data/db/migrations/011_add_callback_data_to_orders.rb

@@ -5,7 +5,7 @@ Sequel.migration do
   end
 
   down do
-    remove_column :orders, :callback_data
+    drop_column :orders, :callback_data
   end
 
 end

data/db/migrations/012_add_address_provider.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+
+  up do
+    add_column :gateways, :address_provider, String, default: "Bip32"
+  end
+
+  down do
+    drop_column :gateways, :address_provider
+  end
+
+end

data/db/migrations/013_add_address_derivation_scheme.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+
+  up do
+    add_column :gateways, :address_derivation_scheme, String
+  end
+
+  down do
+    drop_column :gateways, :address_derivation_scheme
+  end
+
+end

data/db/migrations/014_pubkey_null_address_provider_not_null.rb

@@ -0,0 +1,8 @@
+Sequel.migration do
+  change do
+    alter_table :gateways do
+      set_column_allow_null :pubkey
+      set_column_not_null   :address_provider
+    end
+  end
+end

data/db/migrations/015_add_amount_paid_to_orders.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+
+  up do
+    add_column :orders, :amount_paid, Bignum
+  end
+
+  down do
+    drop_column :orders, :amount_paid
+  end
+
+end

data/db/migrations/016_add_new_params_to_orders.rb

@@ -0,0 +1,13 @@
+Sequel.migration do
+
+  up do
+    add_column :orders, :callback_url, String
+    add_column :orders, :title, String
+  end
+
+  down do
+    drop_column :orders, :callback_url
+    drop_column :orders, :title
+  end
+
+end

data/db/migrations/017_add_test_mode_to_gateways.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+
+  up do
+    add_column :gateways, :test_mode, TrueClass, default: false
+  end
+
+  down do
+    drop_column :gateways, :test_mode
+  end
+
+end

data/db/migrations/018_add_test_keychain_id_to_gateways.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+
+  up do
+    add_column :gateways, :test_last_keychain_id, Integer, default: 0, null: false
+  end
+
+  down do
+    drop_column :gateways, :test_last_keychain_id
+  end
+
+end

data/db/migrations/019_add_test_pubkey_to_gateways.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+
+  up do
+    add_column :gateways, :test_pubkey, String
+  end
+
+  down do
+    drop_column :gateways, :test_pubkey
+  end
+
+end

data/db/migrations/020_add_test_mode_to_orders.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+
+  up do
+    add_column :orders, :test_mode, TrueClass, default: false
+  end
+
+  down do
+    drop_column :orders, :test_mode
+  end
+
+end

data/db/schema.rb

@@ -4,7 +4,7 @@ Sequel.migration do
       primary_key :id
       Integer :confirmations_required, :default=>0, :null=>false
       Integer :last_keychain_id, :default=>0, :null=>false
-      String :pubkey, :size=>255, :null=>false
+      String :pubkey, :size=>255
       String :order_class, :size=>255, :null=>false
       String :secret, :size=>255, :null=>false
       String :name, :size=>255, :null=>false
@@ -19,6 +19,11 @@ Sequel.migration do
       TrueClass :active, :default=>true
       String :order_counters, :size=>255
       String :hashed_id, :size=>255
+      String :address_provider, :default=>"Bip32", :size=>255, :null=>false
+      String :address_derivation_scheme, :size=>255
+      TrueClass :test_mode, :default=>false
+      Integer :test_last_keychain_id, :default=>0, :null=>false
+      String :test_pubkey, :size=>255
       
       index [:hashed_id]
       index [:id], :unique=>true
@@ -41,6 +46,11 @@ Sequel.migration do
       String :payment_id, :size=>255
       String :description, :size=>255
       Integer :reused, :default=>0
+      String :callback_data, :size=>255
+      String :amount_paid
+      String :callback_url, :size=>255
+      String :title, :size=>255
+      TrueClass :test_mode, :default=>false
       
       index [:address]
       index [:id], :unique=>true

data/lib/straight-server.rb

@@ -6,23 +6,25 @@ require 'logmaster'
 require 'openssl'
 require 'base64'
 require 'net/http'
+require 'redis'
 require 'faye/websocket'
 Sequel.extension :migration
 
-
-require_relative 'straight-server/utils/hash_string_to_sym_keys'
-require_relative 'straight-server/random_string'
-require_relative 'straight-server/config'
-require_relative 'straight-server/initializer'
-require_relative 'straight-server/thread'
-require_relative 'straight-server/orders_controller'
-
 module StraightServer
 
   VERSION = File.read(File.expand_path('../', File.dirname(__FILE__)) + '/VERSION')
 
+  StraightServerError = Class.new(StandardError)
+
   class << self
-    attr_accessor :db_connection, :logger
+    attr_accessor :db_connection, :redis_connection, :logger
   end
 
 end
+
+require_relative 'straight-server/utils/hash_string_to_sym_keys'
+require_relative 'straight-server/random_string'
+require_relative 'straight-server/config'
+require_relative 'straight-server/initializer'
+require_relative 'straight-server/thread'
+require_relative 'straight-server/orders_controller'

data/lib/straight-server/config.rb

@@ -1,24 +1,34 @@
+require 'ostruct'
+
 module StraightServer
 
-  class Config
+  # :db
+  # :gateways_source
+  # :gateways
+  # :logmaster
+  # :server_secret
+  # :count_orders
+  # :environment
+  # :redis
+  # :check_order_status_in_db_first
+  # :port
+  # :blockchain_adapters
+  # :expiration_overtime
+  # :reuse_address_orders_threshold
+  # :throttle
 
-    class << self
-      attr_accessor :db,
-                    :gateways_source,
-                    :gateways,
-                    :logmaster,
-                    :server_secret,
-                    :count_orders,
-                    :environment,
-                    :redis,
-                    :check_order_status_in_db_first,
-                    :port,
-                    :blockchain_adapters,
-                    :expiration_overtime,
-                    :reuse_address_orders_threshold,
-                    :throttle
+  class << (Config = OpenStruct.new)
+    def [](key_chain)
+      key_chain = key_chain.to_s.split('.')
+      config    = self.public_send(key_chain.shift)
+      key_chain.each do |key|
+        if config.kind_of?(Hash)
+          config = config[key] || config[key.to_sym]
+        else
+          return
+        end
+      end
+      config
     end
-
   end
-
 end

data/lib/straight-server/gateway.rb

@@ -1,36 +1,30 @@
+require 'cgi'
+
 module StraightServer
 
   # This module contains common features of Gateway, later to be included
   # in one of the classes below.
   module GatewayModule
 
-    # Temporary fix for straight server benchmarking
-    @@redis = StraightServer::Config.redis[:connection] if StraightServer::Config.redis
     @@websockets = {}
-    
-    def fetch_transactions_for(address)
-      try_adapters(@blockchain_adapters, type: 'blockchain') { |b| b.fetch_transactions_for(address) }
-    end
 
-    class InvalidSignature           < Exception; end
-    class InvalidOrderId             < Exception; end
-    class CallbackUrlBadResponse     < Exception; end
-    class WebsocketExists            < Exception; end
-    class WebsocketForCompletedOrder < Exception; end
-    class GatewayInactive            < Exception; end
-    class NoBlockchainAdapters       < Exception
+    class CallbackUrlBadResponse     < StraightServerError; end
+    class WebsocketExists            < StraightServerError; end
+    class WebsocketForCompletedOrder < StraightServerError; end
+    class GatewayInactive            < StraightServerError; end
+    class NoBlockchainAdapters       < StraightServerError
       def message
         "No blockchain adapters were found! StraightServer cannot query the blockchain.\n" +
         "Check your ~/.straight/config.yml file and make sure valid blockchain adapters\n" +
         "are present."
       end
     end
-    class NoWebsocketsForNewGateway  < Exception
+    class NoWebsocketsForNewGateway  < StraightServerError
       def message
         "You're trying to get access to websockets on a Gateway that hasn't been saved yet"
       end
     end
-    class OrderCountersDisabled      < Exception
+    class OrderCountersDisabled      < StraightServerError
       def message
         "Please enable order counting in config file! You can do is using the following option:\n\n" +
         "  count_orders: true\n\n" +
@@ -41,6 +35,18 @@ module StraightServer
         "    db:   null\n"
       end
     end
+    class NoPubkey < StraightServerError
+      def message
+        "No public key were found! Gateway can't work without it.\n" +
+        "Please provide it in config file or DB."
+      end
+    end
+    class NoTestPubkey < StraightServerError
+      def message
+        "No test public key were found! Gateway can't work in test mode without it.\n" +
+        "Please provide it in config file or DB."
+      end
+    end
 
     CALLBACK_URL_ATTEMPT_TIMEFRAME = 3600 # seconds
 
@@ -56,7 +62,7 @@ module StraightServer
         self.exchange_rate_adapter_names.each do |adapter|
           begin
             @exchange_rate_adapters << Straight::ExchangeRate.const_get("#{adapter}Adapter").instance
-          rescue NameError => e 
+          rescue NameError => e
             puts "WARNING: No exchange rate adapter with the name #{adapter} was found!"
           end
         end
@@ -67,18 +73,15 @@ module StraightServer
       @blockchain_adapters = []
       StraightServer::Config.blockchain_adapters.each do |a|
 
-        adapter = begin
-          Straight::Blockchain.const_get("#{a}Adapter")
-        rescue NameError
-          begin
-            Kernel.const_get(a)
-          rescue NameError
-            puts "WARNING: No blockchain adapter with the name #{a} was found!"
-            nil
-          end
+        adapter = Straight::Blockchain.const_get("#{a}Adapter")
+        next unless adapter
+        begin
+          main_url = StraightServer::Config.__send__("#{a.downcase}_url") rescue next
+          test_url = StraightServer::Config.__send__("#{a.downcase}_test_url") rescue nil
+          @blockchain_adapters << adapter.mainnet_adapter(main_url: main_url, test_url: test_url)
+        rescue ArgumentError
+          @blockchain_adapters << adapter.mainnet_adapter
         end
-
-        @blockchain_adapters << adapter.mainnet_adapter if adapter
       end
       raise NoBlockchainAdapters if @blockchain_adapters.empty?
     end
@@ -89,9 +92,11 @@ module StraightServer
       @order_callbacks = [
         lambda do |order|
           StraightServer::Thread.new do
-            send_callback_http_request     order
             send_order_to_websocket_client order
           end
+          StraightServer::Thread.new do
+            send_callback_http_request order
+          end
         end
       ]
     end
@@ -99,10 +104,20 @@ module StraightServer
     def initialize_status_check_schedule
       @status_check_schedule = Straight::GatewayModule::DEFAULT_STATUS_CHECK_SCHEDULE
     end
+
+    def initialize_network
+      BTC::Network.default = test_mode ? BTC::Network.testnet : BTC::Network.mainnet
+    end
     #
     ############# END OF Initializers methods ##################################################
- 
-    
+
+    def fetch_transactions_for(address)
+      super
+    rescue Straight::Blockchain::Adapter::BitcoinAddressInvalid => e
+      StraightServer.logger.warn "Address seems to be invalid, ignoring it. #{e.message}"
+      return []
+    end
+
     # Creates a new order and saves into the DB. Checks if the MD5 hash
     # is correct first.
     def create_order(attrs={})
@@ -110,43 +125,53 @@ module StraightServer
       raise GatewayInactive unless self.active
 
       StraightServer.logger.info "Creating new order with attrs: #{attrs}"
-      signature = attrs.delete(:signature)
-      if !check_signature || sign_with_secret(attrs[:keychain_id]) == signature
-        raise InvalidOrderId if check_signature && (attrs[:keychain_id].nil? || attrs[:keychain_id].to_i <= 0)
-
-        # If we decide to reuse the order, we simply need to supply the
-        # keychain_id that was used in the order we're reusing.
-        # The address will be generated correctly.
-        if reused_order = find_reusable_order
-          attrs[:keychain_id] = reused_order.keychain_id 
-        end
 
-        order = order_for_keychain_id(
-          amount:           attrs[:amount],
-          keychain_id:      attrs[:keychain_id] || self.last_keychain_id+1,
-          currency:         attrs[:currency],
-          btc_denomination: attrs[:btc_denomination]
-        )
-        order.id            = attrs[:id].to_i       if attrs[:id]
-        order.data          = attrs[:data]          if attrs[:data]
-        order.callback_data = attrs[:callback_data] if attrs[:callback_data]
-        order.gateway       = self
-        order.reused        = reused_order.reused + 1 if reused_order
-        order.save
-
-        self.update_last_keychain_id(attrs[:keychain_id]) unless order.reused > 0
-        self.save
-        StraightServer.logger.info "Order #{order.id} created: #{order.to_h}"
-        order
-      else
-        StraightServer.logger.warn "Invalid signature, cannot create an order for gateway (#{id})"
-        raise InvalidSignature
+      # If we decide to reuse the order, we simply need to supply the
+      # keychain_id that was used in the order we're reusing.
+      # The address will be generated correctly.
+      if reused_order = find_reusable_order
+        attrs[:keychain_id] = reused_order.keychain_id
+
       end
+      
+      attrs[:keychain_id] = nil if attrs[:keychain_id] == ''
+
+
+      order = new_order(
+        amount:           (attrs[:amount] && attrs[:amount].to_f),
+        keychain_id:      attrs[:keychain_id] || get_next_last_keychain_id,
+        currency:         attrs[:currency],
+        btc_denomination: attrs[:btc_denomination]
+      )
+
+      order.id            = attrs[:id].to_i       if attrs[:id]
+      order.data          = attrs[:data]          if attrs[:data]
+      order.callback_data = attrs[:callback_data] if attrs[:callback_data]
+      order.title         = attrs[:title]         if attrs[:title]
+      order.callback_url  = attrs[:callback_url]  if attrs[:callback_url]
+      order.gateway       = self
+      order.test_mode     = test_mode
+      order.description   = attrs[:description]
+      order.reused        = reused_order.reused + 1 if reused_order
+      order.save
+
+      self.update_last_keychain_id(attrs[:keychain_id]) unless order.reused > 0
+      self.save
+      StraightServer.logger.info "Order #{order.id} created: #{order.to_h}"
+      order
+    end
+
+    def get_next_last_keychain_id
+      self.test_mode ? self.test_last_keychain_id + 1 : self.last_keychain_id + 1
     end
 
+    # TODO: make it pretty
     def update_last_keychain_id(new_value=nil)
-      #new_value = nil if new_value && new_value.empty?
-      new_value ? self.last_keychain_id = new_value : self.last_keychain_id += 1
+      if self.test_mode
+        new_value ? self.test_last_keychain_id = new_value : self.test_last_keychain_id += 1
+      else
+        new_value ? self.last_keychain_id = new_value : self.last_keychain_id += 1
+      end
     end
 
     def add_websocket_for_order(ws, order)
@@ -198,18 +223,19 @@ module StraightServer
         paid:        get_order_counter(:paid),
         underpaid:   get_order_counter(:underpaid),
         overpaid:    get_order_counter(:overpaid),
-        expired:     get_order_counter(:expired)
+        expired:     get_order_counter(:expired),
+        canceled:    get_order_counter(:canceled),
       }
     end
 
     def get_order_counter(counter_name)
       raise OrderCountersDisabled unless StraightServer::Config.count_orders
-      @@redis.get("#{StraightServer::Config.redis[:prefix]}:gateway_#{id}:#{counter_name}_orders_counter").to_i || 0
+      StraightServer.redis_connection.get("#{StraightServer::Config.redis[:prefix]}:gateway_#{id}:#{counter_name}_orders_counter").to_i || 0
     end
 
     def increment_order_counter!(counter_name, by=1)
       raise OrderCountersDisabled unless StraightServer::Config.count_orders
-      @@redis.incrby("#{StraightServer::Config.redis[:prefix]}:gateway_#{id}:#{counter_name}_orders_counter", by)
+      StraightServer.redis_connection.incrby("#{StraightServer::Config.redis[:prefix]}:gateway_#{id}:#{counter_name}_orders_counter", by)
     end
 
     # If we have more than Config.reuse_address_orders_threshold i a row for this gateway,
@@ -234,33 +260,38 @@ module StraightServer
     private
 
       # Tries to send a callback HTTP request to the resource specified
-      # in the #callback_url. If it fails for any reason, it keeps trying for an hour (3600 seconds)
+      # in the #callback_url. Use #callback_url given to Order if it exist, otherwise default.
+      # If it fails for any reason, it keeps trying for an hour (3600 seconds)
       # making 10 http requests, each delayed by twice the time the previous one was delayed.
       # This method is supposed to be running in a separate thread.
       def send_callback_http_request(order, delay: 5)
-        return if callback_url.nil?
-
-        StraightServer.logger.info "Attempting to send request to the callback url for order #{order.id} to #{callback_url}..."
+        url = order.callback_url || self.callback_url
+        return if url.to_s.empty?
 
         # Composing the request uri here
-        signature = self.check_signature ? "&signature=#{sign_with_secret(order.id)}" : ''
-        callback_data = order.callback_data ? "&callback_data=#{order.callback_data}" : ''
-        uri           = URI.parse(callback_url + '?' + order.to_http_params + signature + callback_data)
+        callback_data = order.callback_data ? "&callback_data=#{CGI.escape(order.callback_data)}" : ''
+        uri           = URI.parse("#{url}#{url.include?('?') ? '&' : '?'}#{order.to_http_params}#{callback_data}")
+
+        StraightServer.logger.info "Attempting callback for order #{order.id}: #{uri.to_s}"
 
         begin
-          response = Net::HTTP.get_response(uri)
+          request = Net::HTTP::Get.new(uri.request_uri)
+          request.add_field 'X-Signature', SignatureValidator.signature(method: 'GET', request_uri: uri.request_uri, secret: secret, nonce: nil, body: nil)
+          response = Net::HTTP.new(uri.host, uri.port).start do |http|
+            http.request request
+          end
           order.callback_response = { code: response.code, body: response.body }
           order.save
           raise CallbackUrlBadResponse unless response.code.to_i == 200
-        rescue Exception => e
+        rescue => ex
           if delay < CALLBACK_URL_ATTEMPT_TIMEFRAME
             sleep(delay)
             send_callback_http_request(order, delay: delay*2)
           else
-            StraightServer.logger.warn "Callback request for order #{order.id} failed, see order's #callback_response field for details"
+            StraightServer.logger.warn "Callback request for order #{order.id} failed with #{ex.inspect}, see order's #callback_response field for details"
           end
         end
-        
+
         StraightServer.logger.info "Callback request for order #{order.id} performed successfully"
       end
 
@@ -287,7 +318,7 @@ module StraightServer
       #     Return the row of expired orders - which is not enough to trigger a reuse
       #     (the triger is in the #find_reusable_order method, which calls this one).
       def find_expired_orders_row
-        
+
         orders = []
         row    = nil
         offset = 0
@@ -298,7 +329,7 @@ module StraightServer
           row.reject! do |o|
             reject = false
             row.each do |o2|
-              reject = true if o.keychain_id == o2.keychain_id && o.reused < o2.reused 
+              reject = true if o.keychain_id == o2.keychain_id && o.reused < o2.reused
             end
             reject
           end
@@ -330,10 +361,8 @@ module StraightServer
     include GatewayModule
     plugin :timestamps, create: :created_at, update: :updated_at
     plugin :serialization, :marshal, :exchange_rate_adapter_names
-    plugin :serialization, :marshal
     plugin :after_initialize
 
-
     def self.find_by_hashed_id(s)
       self.where(hashed_id: s).first
     end
@@ -347,6 +376,8 @@ module StraightServer
     def before_create
       super
       encrypt_secret
+      self.test_mode ||= false
+      self.test_last_keychain_id ||= 0
     end
 
     def before_update
@@ -367,8 +398,15 @@ module StraightServer
       initialize_exchange_rate_adapters
       initialize_blockchain_adapters
       initialize_status_check_schedule
+      initialize_network
     end
-    
+
+    def validate
+      super
+      errors.add(:pubkey, "Please provide public key") if pubkey_missing?
+      errors.add(:test_pubkey, "Please provide test public key if you activate test mode") if test_pubkey_missing?
+    end
+
     # We cannot allow to store gateway secret in a DB plaintext, this would be completetly unsecure.
     # Althougth we use symmetrical encryption here and store the encryption key in the
     # server's in a special file (~/.straight/server_secret), which in turn can also be stolen,
@@ -393,9 +431,9 @@ module StraightServer
       raise "cipher.iv cannot be nil" unless iv
 
       encrypted        = cipher.update(self[:secret]) << cipher.final()
-      base64_encrypted = Base64.strict_encode64(encrypted).encode('utf-8') 
+      base64_encrypted = Base64.strict_encode64(encrypted).encode('utf-8')
       result           = "#{iv}:#{base64_encrypted}"
-      
+
       # Check whether we can decrypt. It should not be possible to encrypt the
       # gateway secret unless we are sure we can decrypt it.
       if decrypt_secret(result) == self[:secret]
@@ -405,6 +443,24 @@ module StraightServer
       end
     end
 
+    def address_provider_type
+      self[:address_provider] ? self[:address_provider].to_sym : :Bip32
+    end
+
+    def address_provider
+      Kernel.const_get("Straight::AddressProvider::#{address_provider_type}").new(self)
+    end
+
+    def disable_test_mode!
+      self[:test_mode] = false
+      save(columns: 'test_mode')
+    end
+
+    def enable_test_mode!
+      self[:test_mode] = true
+      save(columns: 'test_mode')
+    end
+
     private
 
       def decrypt_secret(encrypted_field=self[:secret])
@@ -433,7 +489,7 @@ module StraightServer
     attr_accessor :secret
 
     # This is used to generate the next address to accept payments
-    attr_accessor :last_keychain_id
+    attr_accessor :last_keychain_id, :test_last_keychain_id
 
     # If set to false, doesn't require an unique id of the order along with
     # the signed md5 hash of that id + secret to be passed into the #create_order method.
@@ -451,7 +507,7 @@ module StraightServer
 
     attr_accessor :exchange_rate_adapter_names
     attr_accessor :orders_expiration_period
-   
+
     # This affects whether it is possible to create a new order with the gateway.
     # If it's set to false, then it won't be possible to create a new order, but
     # it will keep checking on the existing ones.
@@ -466,6 +522,12 @@ module StraightServer
       initialize_exchange_rate_adapters
       initialize_blockchain_adapters
       initialize_status_check_schedule
+      initialize_network
+    end
+
+    def validate_config
+      raise NoPubkey if pubkey_missing?
+      raise NoTestPubkey if test_pubkey_missing?
     end
 
     # Because this is a config based gateway, we only save last_keychain_id
@@ -478,7 +540,7 @@ module StraightServer
     # If the file doesn't exist, we create it. Later, whenever an attribute is updated,
     # we save it to the file.
     def load_last_keychain_id!
-      @last_keychain_id_file ||= StraightServer::Initializer::ConfigDir.path + "/#{name}_last_keychain_id"
+      @last_keychain_id_file ||= build_keychain_path
       if File.exists?(@last_keychain_id_file)
         self.last_keychain_id = File.read(@last_keychain_id_file).to_i
       else
@@ -488,10 +550,23 @@ module StraightServer
     end
 
     def save_last_keychain_id!
-      @last_keychain_id_file ||= StraightServer::Initializer::ConfigDir.path + "/#{name}_last_keychain_id"
+      @last_keychain_id_file ||= build_keychain_path
       File.open(@last_keychain_id_file, 'w') {|f| f.write(last_keychain_id) }
     end
 
+    def build_keychain_path
+      filename = self.test_mode ? "/#{name}_test_last_keychain_id" : "/#{name}_last_keychain_id"
+      StraightServer::Initializer::ConfigDir.path + filename
+    end
+
+    def address_provider_type
+      @address_provider ? @address_provider.to_sym : :Bip32
+    end
+
+    def address_provider
+      Kernel.const_get("Straight::AddressProvider::#{address_provider_type}").new(self)
+    end
+
     # This method is a replacement for the Sequel's model one used in DB version of the gateway
     # and it finds gateways using the index of @@gateways Array.
     def self.find_by_id(id)
@@ -509,6 +584,7 @@ module StraightServer
       i += 1
       gateway = self.new
       gateway.pubkey                         = attrs['pubkey']
+      gateway.test_pubkey                    = attrs['test_pubkey']
       gateway.confirmations_required         = attrs['confirmations_required'].to_i
       gateway.order_class                    = attrs['order_class']
       gateway.secret                         = attrs['secret']
@@ -517,9 +593,13 @@ module StraightServer
       gateway.default_currency               = attrs['default_currency']
       gateway.orders_expiration_period       = attrs['orders_expiration_period']
       gateway.active                         = attrs['active']
+      gateway.address_provider               = attrs['address_provider'] || "Bip32"
+      gateway.address_derivation_scheme      = attrs['address_derivation_scheme']
+      gateway.test_mode                      = attrs['test_mode'] || false
       gateway.name                     = name
       gateway.id                       = i
       gateway.exchange_rate_adapter_names = attrs['exchange_rate_adapters']
+      gateway.validate_config
       gateway.initialize_exchange_rate_adapters
       gateway.load_last_keychain_id!
       @@websockets[i] = {}