cns 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c039a56bcd426903a7ed40cb00b645466cca84e41ef4d7531b759232a86d2da
-  data.tar.gz: aaea56ea2594357bebc070cecb16b6aff74095af1ddd41253719b94e535bf40e
+  metadata.gz: b0deb219876c5a8fd82a5338c9d7635b11356feffcdc908514be211fb0bbc909
+  data.tar.gz: b188c18e7a9226bded29d42d0f9142280c94e9230fe7d41ff94d4776dc56222c
 SHA512:
-  metadata.gz: 142c33251cbd3229fa3918cb8b514dff1e3adcfdbd041ef737190be6b43b37a227900e66d44eb1aaba54449511de7e990caa3a3a6a9c1dbe3d457f92f2e212a0
-  data.tar.gz: 02e44cf67cf50d342c48b956b9fd4ae18ae6cb9435673ba31675b241a57e489f3f8251bf37a37991fd6a5547f6590fc7e2c589552dc43e263506067990fc3d59
+  metadata.gz: 9833256521bb67118970871725a5ca3da4f5cc371a8aa3d531421238f66510a8040dd778de1a42506b6aeacda1deb581195f449cd883776951ba3b97b2d8bffc
+  data.tar.gz: 163a57bfbdfe4ba4a6f864db5ba97266c4e1f5088e2b72543137c20bcc4810bf1799d5bbc03e76aa929c6b8984ad75a212f7756471b1c4c968ba923cb17d8a8c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cns (2.1.2)
+    cns (2.1.4)
       curb
       faraday
       faraday-retry
@@ -213,7 +213,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   cns!
-  rake (~> 12.0)
+  rake (~> 12.0, >= 0)
   reek
   rubocop
   rubocop-rake
@@ -221,4 +221,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.6.9
+  4.0.6

data/lib/cns/apice.rb

@@ -71,17 +71,19 @@ module Cns
     end
 
     # Get trades from Kraken
+    # @param [Integer] days optional number of days to fetch trades from (last N days)
     # @return [Hash] trades kraken
-    def trades_us
-      pag_us_req('TradesHistory', :trades)
+    def trades_us(days = nil)
+      pag_us_req('TradesHistory', :trades, days ? {start: days} : {})
     rescue Curl::Err::CurlError
       []
     end
 
     # Get ledger from Kraken
+    # @param [Integer] days optional number of days to fetch ledger from (last N days)
     # @return [Hash] ledger kraken
-    def ledger_us
-      pag_us_req('Ledgers', :ledger)
+    def ledger_us(days = nil)
+      pag_us_req('Ledgers', :ledger, days ? {start: days} : {})
     rescue Curl::Err::CurlError
       []
     end
@@ -102,15 +104,16 @@ module Cns
     # Generic paginated request handler for Kraken
     # @param [String] uri API endpoint URI
     # @param [Symbol] key Key to extract from the result
+    # @param [Hash] prm Additional options for the request
     # @yield [Array<Hash>] Block to process each batch of results
     # @return [Array<Hash>] Combined results from all pages
-    def pag_us_req(uri, key)
+    def pag_us_req(uri, key, prm = {})
       ary = []
       ofs = 0
       loop do
         # Rate limiting for page requests (2s in Kraken)
         sleep(@lpag - Time.now + 2) if @lpag && Time.now - @lpag < 2
-        ops = {nonce: nnc, ofs: ofs}
+        ops = prm.merge({nonce: nnc, ofs: ofs})
         rcrl(@curl, "#{API[:us]}/#{uri}", method: 'POST', post_data: ops, headers: hus(uri, ops))
         bth = pjsn(@curl).fetch(:result, {}).fetch(key, []).map { |k, v| us_unif(k, v) }
         break if bth.empty?

data/lib/cns/bitcoinde.rb

@@ -73,7 +73,7 @@ module Cns
         mo: moe.upcase,
         ex: vex,
         bq: vbq,
-        ok: vex == vbq ? 'OK' : 'NOK'
+        ok: vex.round(9) == vbq.round(9) ? 'OK' : 'NOK'
       )
     end
 

data/lib/cns/kraken.rb

@@ -26,7 +26,7 @@ module Cns
     # mosta resumo saldos & transacoes & ajuste dias
     def mresumo
       puts("\nKRAKEN\ntipo                 kraken              bigquery")
-      exd[:sl].sort.each { |key, val| puts(fos(key, val)) }
+      exd[:sl].transform_keys { |k| k.downcase.to_sym }.sort_by { |_, v| v }.each { |k, v| puts(fos(k, v)) }
       mtotais
 
       mtrades
@@ -68,17 +68,23 @@ module Cns
       novxl.sort_by { |i| -i[:srx] }.each { |o| puts(fol(o)) }
     end
 
-    # @param [String] moe codigo kraken da moeda
+    # @param [Symbol] moe codigo kraken da moeda
+    # @return [String] moeda formatada
+    def normalize_moe(moe)
+      {xeth: 'ETH', xxbt: 'BTC', zeur: 'EUR'}[moe] || moe.to_s.upcase
+    end
+
+    # @param [Symbol] moe (see normalize_moe)
     # @param [BigDecimal] sal saldo kraken da moeda
     # @return [String] texto formatado saldos
     def fos(moe, sal)
-      vbq = (bqd[:sl]&.fetch(moe.downcase.to_sym, nil) || 0).to_d
+      vbq = (bqd[:sl]&.fetch(moe, nil) || 0).to_d
       format(
         '%<mo>-5.5s %<kr>21.9f %<bq>21.9f %<ok>3.3s',
-        mo: moe.upcase,
+        mo: normalize_moe(moe),
         kr: sal,
         bq: vbq,
-        ok: vbq == sal ? 'OK' : 'NOK'
+        ok: vbq.round(9) == sal.round(9) ? 'OK' : 'NOK'
       )
     end
 
@@ -119,7 +125,7 @@ module Cns
     # @param [Hash] itm recursos kraken
     # @return [Hash<BigDecimal>] moedas & sados
     def pusa(itm)
-      itm.select { |k, _| %i[XETH ZEUR].include?(k) }.transform_values { |v| v.to_d }
+      itm.select { |k, _| %i[XETH ZEUR XXBT].include?(k) }.transform_values { |v| v.to_d }
     end
 
     # @param [Array<Hash>] htx trades kraken
@@ -149,7 +155,9 @@ module Cns
 
     # @return [Hash] dados exchange kraken - saldos & transacoes trades e ledger
     memoize def exd
-      {sl: pusa(api.account_us), kt: pust(api.trades_us), kl: pusl(api.ledger_us)}
+      # Numero dias para buscar transacoes
+      dys = ops&.[](:d)&.positive? ? Integer(Time.now - (ops[:d] * 86_400)) : nil
+      {sl: pusa(api.account_us), kt: pust(api.trades_us(dys)), kl: pusl(api.ledger_us(dys))}
     end
 
     # @return [Array<String>] indices trades bigquery

data/lib/cns/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cns
-  VERSION = '2.1.2'
+  VERSION = '2.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cns
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz