coinsync 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee9560e9255a67e3389a7aa39ca48820dffe803
-  data.tar.gz: e946c4c12142d887c53f50b54c85d4a1d473f5bf
+  metadata.gz: c0072156912886d0dda428c95b5421b230ce73bb
+  data.tar.gz: 3cb523a19af17908648fad02113d63fea9c7cb47
 SHA512:
-  metadata.gz: cff97b38cecbc4933545d1f50525ab9aeba5e02ac13474e103e3108174b175bd98b6536097bec5816f4c265504fb155bc8d36081cdfdd6ef3f0987acbd5fd3f3
-  data.tar.gz: c324c154236885613861372a8302582dd80214416eaa3e85690826a0864ee43c610f95869c78c0e174e8ae9d882f176657bb476909a14d5cef808471abfad6d5
+  metadata.gz: 57fe540967120d3926ad5ac5e7883aae9f49147b6e6eba82e0f4b1c38aa1ea54af70adfd1140545e75fa1255907b9bd4a6860094dd75f9f77e96d78d227a52ce
+  data.tar.gz: 4aa898c645ca40f083720d22b517e7d3dc8c53ab8246bf977c5fbe00dccbc8188c7b44e34b220c119076b9597a373ba031e6c8bc5a047002c0923ea8b9f7d272

data/lib/coinsync/config.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'tzinfo'
 require 'yaml'
 
 require_relative 'currencies'
@@ -28,8 +29,6 @@ module CoinSync
           require(File.expand_path(File.join(*directory, file)))
         end
       end
-
-      set_timezone(timezone) if timezone
     end
 
     def sources
@@ -55,10 +54,6 @@ module CoinSync
       Hash[included.map { |source| [source.key, source] }]
     end
 
-    def set_timezone(timezone)
-      ENV['TZ'] = timezone
-    end
-
     def base_cryptocurrencies
       settings['base_cryptocurrencies'] || ['USDT', 'BTC', 'ETH', 'BNB', 'KCS', 'LTC', 'BCH', 'NEO']
     end
@@ -88,7 +83,7 @@ module CoinSync
     end
 
     def timezone
-      settings['timezone']
+      settings['timezone'] && TZInfo::Timezone.get(settings['timezone'])
     end
 
     def translate(label)

data/lib/coinsync/currency_conversion_task.rb

@@ -26,7 +26,7 @@ module CoinSync
               BigDecimal.new(1),
               from: tx.bought_currency,
               to: @target_currency,
-              date: tx.time.to_date
+              time: tx.time
             )
             tx.converted.bought_amount = tx.bought_amount * tx.converted.exchange_rate
           else
@@ -44,7 +44,7 @@ module CoinSync
               BigDecimal.new(1),
               from: tx.sold_currency,
               to: @target_currency,
-              date: tx.time.to_date
+              time: tx.time
             )
             tx.converted.sold_amount = tx.sold_amount * tx.converted.exchange_rate
           else

data/lib/coinsync/currency_converters/base.rb

@@ -23,20 +23,17 @@ module CoinSync
         @cache = Cache.new(self.class.name.downcase.split('::').last)
       end
 
-      def convert(amount, from:, to:, date:)
+      def convert(amount, from:, to:, time:)
         (amount > 0) or raise "#{self.class}: amount should be positive"
         (amount.is_a?(BigDecimal)) or raise "#{self.class}: 'amount' should be a BigDecimal"
-        (from.is_a?(FiatCurrency)) or raise "#{self.class}: 'from' should be a FiatCurrency"
-        (to.is_a?(FiatCurrency)) or raise "#{self.class}: 'to' should be a FiatCurrency"
-        (date.is_a?(Date)) or raise "#{self.class}: 'date' should be a Date"
 
-        if rate = @cache[from, to, date]
-          return rate * amount
-        else
-          rate = fetch_conversion_rate(from: from, to: to, date: date)
-          @cache[from, to, date] = rate
-          return rate * amount
-        end
+        rate = get_conversion_rate(from: from, to: to, time: time)
+
+        rate * amount
+      end
+
+      def get_conversion_rate(from:, to:, time:)
+        raise "not implemented"
       end
 
       def finalize

data/lib/coinsync/currency_converters/exchangeratesapi.rb

@@ -10,12 +10,23 @@ module CoinSync
       register_converter :exchangeratesapi
 
       BASE_URL = "https://exchangeratesapi.io/api"
+      ECB_TIMEZONE = TZInfo::Timezone.get('Europe/Berlin')
 
       class Exception < StandardError; end
       class NoDataException < Exception; end
       class BadRequestException < Exception; end
 
-      def fetch_conversion_rate(from:, to:, date:)
+      def get_conversion_rate(from:, to:, time:)
+        (from.is_a?(FiatCurrency)) or raise "#{self.class}: 'from' should be a FiatCurrency"
+        (to.is_a?(FiatCurrency)) or raise "#{self.class}: 'to' should be a FiatCurrency"
+        (time.is_a?(Time)) or raise "#{self.class}: 'time' should be a Time"
+
+        date = ECB_TIMEZONE.utc_to_local(time.utc).to_date
+
+        if rate = @cache[from, to, date]
+          return rate
+        end
+
         response = Request.get("#{BASE_URL}/#{date}?base=#{from.code}")
 
         case response
@@ -24,6 +35,8 @@ module CoinSync
           rate = json['rates'][to.code.upcase]
           raise NoDataException.new("No exchange rate found for #{to.code.upcase}") if rate.nil?
 
+          @cache[from, to, date] = rate
+
           return rate
         when Net::HTTPBadRequest
           raise BadRequestException.new(response)

data/lib/coinsync/currency_converters/nbp.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'net/http'
+require 'tzinfo'
 
 require_relative 'base'
 require_relative '../request'
@@ -10,14 +11,25 @@ module CoinSync
       register_converter :nbp
 
       BASE_URL = "https://api.nbp.pl/api"
+      POLISH_TIMEZONE = TZInfo::Timezone.get('Europe/Warsaw')
 
       class Exception < StandardError; end
       class NoDataException < Exception; end
       class BadRequestException < Exception; end
 
-      def fetch_conversion_rate(from:, to:, date:)
+      def get_conversion_rate(from:, to:, time:)
+        (from.is_a?(FiatCurrency)) or raise "#{self.class}: 'from' should be a FiatCurrency"
+        (to.is_a?(FiatCurrency)) or raise "#{self.class}: 'to' should be a FiatCurrency"
+        (time.is_a?(Time)) or raise "#{self.class}: 'time' should be a Time"
+
         raise "Only conversions to PLN are supported" if to.code != 'PLN'
 
+        date = POLISH_TIMEZONE.utc_to_local(time.utc).to_date
+
+        if rate = @cache[from, to, date]
+          return rate
+        end
+
         response = Request.get("#{BASE_URL}/exchangerates/rates/a/#{from.code}/#{date - 8}/#{date - 1}/?format=json")
 
         case response
@@ -26,6 +38,8 @@ module CoinSync
           rate = json['rates'] && json['rates'].last && json['rates'].last['mid']
           raise NoDataException.new("No exchange rate found for #{from.code.upcase}") if rate.nil?
 
+          @cache[from, to, date] = rate
+
           return rate
         when Net::HTTPBadRequest
           raise BadRequestException.new(response)

data/lib/coinsync/formatter.rb

@@ -33,7 +33,8 @@ module CoinSync
     end
 
     def format_time(time)
-      time.strftime(@config.time_format || '%Y-%m-%d %H:%M:%S')
+      local_time = @config.timezone ? @config.timezone.utc_to_local(time.utc) : time
+      local_time.strftime(@config.time_format || '%Y-%m-%d %H:%M:%S')
     end
 
     def parse_decimal(string)

data/lib/coinsync/importers/binance_api.rb

@@ -68,23 +68,30 @@ module CoinSync
         transactions = []
 
         @traded_pairs.uniq.each do |pair|
-          response = make_request('/v3/myTrades', limit: 500, symbol: pair) # TODO: paging
-
-          case response
-          when Net::HTTPSuccess
-            json = JSON.parse(response.body)
-
-            if json.is_a?(Hash)
-              raise "Binance importer: Invalid response: #{response.body}"
+          lastId = 0
+
+          loop do
+            response = make_request('/v3/myTrades', limit: 500, fromId: lastId + 1, symbol: pair)
+
+            case response
+            when Net::HTTPSuccess
+              json = JSON.parse(response.body)
+
+              if !json.is_a?(Array)
+                raise "Binance importer: Invalid response: #{response.body}"
+              elsif json.empty?
+                break
+              else
+                json.each { |tx| tx['symbol'] = pair }
+                lastId = json.map { |j| j['id'] }.sort.last
+
+                transactions.concat(json)
+              end
+            when Net::HTTPBadRequest
+              raise "Binance importer: Bad request: #{response} (#{response.body})"
+            else
+              raise "Binance importer: Bad response: #{response}"
             end
-
-            json.each { |tx| tx['symbol'] = pair }
-
-            transactions.concat(json)
-          when Net::HTTPBadRequest
-            raise "Binance importer: Bad request: #{response} (#{response.body})"
-          else
-            raise "Binance importer: Bad response: #{response}"
           end
         end
 
@@ -187,6 +194,8 @@ module CoinSync
       private
 
       def make_request(path, params = {}, signed = true)
+        print '.'
+
         if signed
           (@api_key && @secret_key) or raise "Public and secret API keys must be provided"
 

data/lib/coinsync/importers/bitbay20.rb

@@ -1,6 +1,7 @@
 require 'bigdecimal'
 require 'csv'
 require 'time'
+require 'tzinfo'
 
 require_relative 'base'
 require_relative '../currencies'
@@ -24,10 +25,12 @@ module CoinSync
       class HistoryEntry
         attr_accessor :date, :accounting_date, :type, :amount, :currency
 
+        POLISH_TIMEZONE = TZInfo::Timezone.get('Europe/Warsaw')
+
         def initialize(line)
-          # TODO: force parsing in Polish timezone
-          @date = Time.parse(line[0]) unless line[0] == '-'
-          @accounting_date = Time.parse(line[1]) unless line[1] == '-'
+          @date = POLISH_TIMEZONE.local_to_utc(Time.parse(line[0])) unless line[0] == '-'
+          @accounting_date = POLISH_TIMEZONE.local_to_utc(Time.parse(line[1])) unless line[1] == '-'
+
           @type = line[2]
 
           amount, currency = line[3].split(' ')

data/lib/coinsync/importers/bitbay_api.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'net/http'
 require 'openssl'
 require 'time'
+require 'tzinfo'
 require 'uri'
 
 require_relative 'base'
@@ -22,14 +23,16 @@ module CoinSync
       OP_SALE = '-pay_for_currency'
       OP_FEE = '-fee'
 
-      MAX_TIME_DIFFERENCE = 2.0  # TODO: this breaks too easily (3.0)
+      MAX_TIME_DIFFERENCE = 5.0
       TRANSACTION_TYPES = [OP_PURCHASE, OP_SALE, OP_FEE]
 
+      POLISH_TIMEZONE = TZInfo::Timezone.get('Europe/Warsaw')
+
       class HistoryEntry
         attr_accessor :date, :amount, :type, :currency
 
         def initialize(hash)
-          @date = Time.parse(hash['time'])  # TODO: these times are all fucked up
+          @date = POLISH_TIMEZONE.local_to_utc(Time.parse(hash['time']))
           @amount = BigDecimal.new(hash['amount'])
           @type = hash['operation_type']
           @currency = parse_currency(hash['currency'])
@@ -94,7 +97,8 @@ module CoinSync
         currencies.each do |currency|
           sleep 1  # rate limiting
 
-          response = make_request('history', currency: currency, limit: 10000)  # TODO: does this limit really work?
+          # TODO: does this limit really work? (no way to test it really and docs don't mention a max value)
+          response = make_request('history', currency: currency, limit: 10000)
 
           case response
           when Net::HTTPSuccess
@@ -144,15 +148,17 @@ module CoinSync
 
           next unless TRANSACTION_TYPES.include?(entry.type)
 
-          if !matching.empty? && matching.any? { |e| (e.date - entry.date).abs > MAX_TIME_DIFFERENCE }
-            transactions << process_matched(matching)
+          if !matching.empty?
+            must_match = matching.any? { |e| (e.date - entry.date).abs > MAX_TIME_DIFFERENCE }
+            transaction = process_matched(matching, must_match)
+            transactions << transaction if transaction
           end
 
           matching << entry
         end
 
         if !matching.empty?
-          transactions << process_matched(matching)
+          transactions << process_matched(matching, true)
         end
 
         transactions
@@ -161,7 +167,7 @@ module CoinSync
 
       private
 
-      def process_matched(matching)
+      def process_matched(matching, must_match)
         if matching.length % 3 == 0
           purchases = matching.select { |tx| tx.type == OP_PURCHASE }
           sales = matching.select { |tx| tx.type == OP_SALE }
@@ -186,7 +192,10 @@ module CoinSync
           end
         end
 
-        raise "BitBay API importer error: Couldn't match some history lines: #{matching}"
+        if must_match
+          raise "BitBay API importer error: Couldn't match some history lines: " +
+            matching.map { |m| "\n#{m.inspect}" }.join
+        end
       end
 
       def make_request(method, params = {})

data/lib/coinsync/importers/bitcurex.rb

@@ -1,6 +1,7 @@
 require 'bigdecimal'
 require 'csv'
 require 'time'
+require 'tzinfo'
 
 require_relative 'base'
 require_relative '../currencies'
@@ -14,11 +15,12 @@ module CoinSync
       class HistoryEntry
         attr_accessor :lp, :type, :date, :market, :amount, :price, :total, :fee, :fee_currency, :id
 
+        POLISH_TIMEZONE = TZInfo::Timezone.get('Europe/Warsaw')
+
         def initialize(line)
-          # TODO: force parsing in Polish timezone
           @lp = line[0].to_i
           @type = line[1]
-          @date = Time.parse(line[2])
+          @date = POLISH_TIMEZONE.local_to_utc(Time.parse(line[2]))
           @market = FiatCurrency.new(line[3])
           @amount = BigDecimal.new(line[4])
           @price = BigDecimal.new(line[5].split(' ').first)

data/lib/coinsync/importers/bitstamp_csv.rb

@@ -0,0 +1,73 @@
+require 'bigdecimal'
+require 'csv'
+require 'time'
+
+require_relative 'base'
+require_relative '../currencies'
+require_relative '../transaction'
+
+module CoinSync
+  module Importers
+    class BitstampCSV < Base
+      register_importer :bitstamp_csv
+
+      class HistoryEntry
+        attr_accessor :lp, :type, :date, :market, :amount, :price, :total, :fee, :fee_currency, :id
+
+        def initialize(line)
+          @type = line[0]
+          @date = Time.parse(line[1])
+          @account = line[2]
+
+          
+          @lp = line[0].to_i
+          @market = FiatCurrency.new(line[3])
+          @amount = BigDecimal.new(line[4])
+          @price = BigDecimal.new(line[5].split(' ').first)
+          @total = BigDecimal.new(line[6].split(' ').first)
+          @fee = BigDecimal.new(line[7].split(' ').first)
+          @fee_currency = line[7].split(' ').last
+          @id = line[8].to_i
+        end
+      end
+
+      def read_transaction_list(source)
+        csv = CSV.new(source, col_sep: ',')
+
+        transactions = []
+        bitcoin = CryptoCurrency.new('BTC')
+
+        csv.each do |line|
+          next if line.empty?
+          next if line[0] == 'Type'
+
+          entry = HistoryEntry.new(line)
+
+          if entry.type == 'Kup'
+            transactions << Transaction.new(
+              exchange: 'Bitcurex',
+              bought_currency: bitcoin,
+              sold_currency: entry.market,
+              time: entry.date,
+              bought_amount: entry.amount,
+              sold_amount: entry.total
+            )
+          elsif entry.type == 'Sprzedaj'
+            transactions << Transaction.new(
+              exchange: 'Bitcurex',
+              bought_currency: entry.market,
+              sold_currency: bitcoin,
+              time: entry.date,
+              bought_amount: entry.total,
+              sold_amount: entry.amount
+            )
+          else
+            raise "Bitcurex importer error: unexpected entry type '#{entry.type}'"
+          end
+        end
+
+        transactions.reverse
+      end
+    end
+  end
+end

data/lib/coinsync/importers/bittrex_csv.rb

@@ -58,7 +58,7 @@ module CoinSync
             transactions << Transaction.new(
               exchange: 'Bittrex',
               time: entry.time_closed,
-              bought_amount: entry.price - entry.commission,   # TODO check this
+              bought_amount: entry.price - entry.commission,
               bought_currency: entry.currency,
               sold_amount: entry.quantity,
               sold_currency: entry.asset

data/lib/coinsync/importers/default.rb

@@ -68,7 +68,10 @@ module CoinSync
         entry.lp = line[0].to_i
         entry.exchange = line[1]
         entry.type = line[2]
-        entry.date = Time.parse(line[3])
+
+        time = Time.parse(line[3])
+        entry.date = @config.timezone ? @config.timezone.local_to_utc(time) : time
+
         entry.amount = @formatter.parse_decimal(line[4])
         entry.asset = CryptoCurrency.new(line[5])
         entry.total = @formatter.parse_decimal(line[6])

data/lib/coinsync/importers/kucoin_api.rb

@@ -43,7 +43,8 @@ module CoinSync
       end
 
       def import_transactions(filename)
-        response = make_request('/order/dealt', limit: 100) # TODO: what if there's more than 100?
+        # TODO: what if there's more than 100? (looks like we might need to switch to loading each market separately…)
+        response = make_request('/order/dealt', limit: 100)
 
         case response
         when Net::HTTPSuccess
@@ -128,8 +129,16 @@ module CoinSync
               sold_amount: entry.deal_value,
               sold_currency: entry.coin_type_pair
             )
+          elsif entry.direction == 'SELL'
+            transactions << Transaction.new(
+              exchange: 'Kucoin',
+              time: entry.created_at,
+              sold_amount: entry.amount,
+              sold_currency: entry.coin_type,
+              bought_amount: entry.deal_value - entry.fee,
+              bought_currency: entry.coin_type_pair
+            )
           else
-            # TODO sell
             raise "Kucoin importer error: unexpected entry direction '#{entry.direction}'"
           end
         end

data/lib/coinsync/outputs/list.rb

@@ -16,7 +16,7 @@ module CoinSync
           csv << headers
 
           transactions.each do |tx|
-            csv << transaction_to_csv(tx)
+            process_transaction(tx, csv)
           end
         end
       end
@@ -45,6 +45,10 @@ module CoinSync
         line
       end
 
+      def process_transaction(tx, csv)
+        csv << transaction_to_csv(tx)
+      end
+
       def transaction_to_csv(tx)
         if tx.purchase? || tx.sale?
           fiat_transaction_to_csv(tx)

data/lib/coinsync/version.rb

@@ -1,3 +1,3 @@
 module CoinSync
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: coinsync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kuba Suder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
-dependencies: []
+date: 2018-04-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: 
 email:
 - jakub.suder@gmail.com
@@ -45,6 +65,7 @@ files:
 - lib/coinsync/importers/bitbay20.rb
 - lib/coinsync/importers/bitbay_api.rb
 - lib/coinsync/importers/bitcurex.rb
+- lib/coinsync/importers/bitstamp_csv.rb
 - lib/coinsync/importers/bittrex_api.rb
 - lib/coinsync/importers/bittrex_csv.rb
 - lib/coinsync/importers/changelly.rb