cns 2.1.8 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c3291d5689453fc6b8055d59f4468b00b8f1d65244d98d9a1e2e0f7397c6c6
-  data.tar.gz: e6feab9a8d9da05c236ed46f9e6d019d002812ce9d000a2765549dcb56bb433f
+  metadata.gz: 35cbb3480d93201fac4d588ef04df6a57f4e487d911f6ebd01f4c629c6701287
+  data.tar.gz: e1f7387b9cb172028410c3a3d1f358787374d3a24fceb84214808a62fc596922
 SHA512:
-  metadata.gz: cff4090062ae367a6df696863a5d6db89cd5f67d2c01d374793013ff890e9ee4aad9195142b3233e672626148bd208051b873aaf0934aea8800cead3c99c3536
-  data.tar.gz: 2e2c356ad94b02e6ca2ae0c1fe16e2c79221e0bcb0ccb7ce0597842cd4f3503caa798a162ac3553c2e2d69054f6e60202f4fc64e04268da042796c996bedabee
+  metadata.gz: 56adc131c7198a2496dec57d3781f930465ce0ab06cc4895b3853673906e19dcee6b992026dc87c43158e1276b4266c2684487cb18dc95b78a3a91032289af19
+  data.tar.gz: f9f29e2b1f086a3de056126d873fd48c5e960ce0e2f9f5f17b98eb408af5c478bf3b4b2120ce2abcc046e4d728c3d76af2b93f00879a737f98ae80684f9d82a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cns (2.1.8)
+    cns (2.2.0)
       curb
       faraday
       faraday-retry
@@ -112,14 +112,14 @@ GEM
     multi_json (1.19.1)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    nokogiri (1.19.0-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
     observer (0.1.2)
     open3 (0.2.1)
     os (1.1.4)
     ostruct (0.6.3)
     parallel (1.27.0)
-    parser (3.3.10.1)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     prism (1.9.0)
@@ -141,7 +141,7 @@ GEM
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.2)
+    retriable (3.2.1)
     reverse_markdown (3.0.2)
       nokogiri
     rexml (3.4.4)
@@ -205,7 +205,7 @@ GEM
       yard (>= 0.8)
     yard-solargraph (0.1.0)
       yard (~> 0.9)
-    zeitwerk (2.7.4)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   x86_64-linux

data/lib/cns/apice.rb

@@ -10,6 +10,7 @@ module Cns
   # classe para acesso dados centralized exchanges
   class Apice
     API = {de: 'https://api.bitcoin.de/v4', us: 'https://api.kraken.com/0/private'}.freeze
+    MDE = %w[btc eth].freeze
 
     def initialize
       @curl =
@@ -48,19 +49,23 @@ module Cns
     end
 
     # Get deposits from Bitcoin.de, uniformly formatted
-    # @param [Integer] tsp optional unix timestamp (seconds) to fetch deposits from (start date on bitcoin.de API)
     # @return [Array<Hash>] depositos uniformizados bitcoinde
     def deposits_de
-      pag_de_req("#{API[:de]}/btc/deposits", {}, :deposits) { |i| i.map { |h| deposit_unif(h) } }
+      MDE.flat_map do |cry|
+        pag_de_req("#{API[:de]}/#{cry}/deposits", {}, :deposits) { |i| i.map { |h| deposit_unif(h, cry.upcase) } }
+      end
+      # pag_de_req("#{API[:de]}/btc/deposits", {}, :deposits) { |i| i.map { |h| deposit_unif(h) } }
     rescue Curl::Err::CurlError
       []
     end
 
     # Get withdrawals from Bitcoin.de, uniformly formatted
-    # @param [Integer] tsp optional unix timestamp (seconds) to fetch withdrawals from (start date on bitcoin.de API)
     # @return [Array<Hash>] withdrawals uniformizadas bitcoinde
     def withdrawals_de
-      pag_de_req("#{API[:de]}/btc/withdrawals", {}, :withdrawals) { |i| i.map { |h| withdrawal_unif(h) } }
+      MDE.flat_map do |cry|
+        pag_de_req("#{API[:de]}/#{cry}/withdrawals", {}, :withdrawals) { |i| i.map { |h| withdrawal_unif(h, cry.upcase) } }
+      end
+      # pag_de_req("#{API[:de]}/btc/withdrawals", {}, :withdrawals) { |i| i.map { |h| withdrawal_unif(h) } }
     rescue Curl::Err::CurlError
       []
     end
@@ -127,6 +132,10 @@ module Cns
         sleep(@lpag - Time.now + 2) if @lpag && Time.now - @lpag < 2
         ops = prm.merge({nonce: nnc, ofs: ofs})
         rcrl(@curl, "#{API[:us]}/#{uri}", method: 'POST', post_data: ops, headers: hus(uri, ops))
+        unless @curl.response_code == 200
+          puts("Kraken API returned non-200 status: #{@curl.response_code} for #{uri}")
+          break
+        end
         bth = pjsn(@curl).fetch(:result, {}).fetch(key, []).map { |k, v| us_unif(k, v) }
         break if bth.empty?
 
@@ -149,7 +158,6 @@ module Cns
       loop do
         url = "#{uri}?#{URI.encode_www_form(prm.merge(page: pag))}"
         rcrl(@curl, url, headers: hde(url))
-        # Check HTTP status
         unless @curl.response_code == 200
           puts("Bitcoin.de API returned non-200 status: #{@curl.response_code} for #{url}")
           break
@@ -200,15 +208,17 @@ module Cns
 
     # Uniformly format a deposit from Bitcoin.de
     # @param [Hash] has Deposit data from Bitcoin.de
+    # @param [String] moe Currency code (e.g., 'BTC', 'ETH')
     # @return [Hash] deposito uniformizado bitcoinde
-    def deposit_unif(has)
-      {add: has[:address], time: Time.parse(has[:created_at]), qtd: has[:amount].to_d, nxid: has[:deposit_id].to_i}.merge(tp: 'deposit', moe: 'BTC', fee: 0.to_d)
+    def deposit_unif(has, moe)
+      {add: has[:address], time: Time.parse(has[:created_at]), qtd: has[:amount].to_d, nxid: has[:deposit_id].to_i}.merge(tp: 'deposit', moe: moe, fee: 0.to_d)
     end
 
     # Uniformly format a withdrawal from Bitcoin.de
     # @param [Hash] has Withdrawal data from Bitcoin.de
+    # @param [String] moe Currency code (e.g., 'BTC', 'ETH')
     # @return [Hash] withdrawal uniformizada bitcoinde
-    def withdrawal_unif(has)
+    def withdrawal_unif(has, moe)
       {
         add: has[:address],
         time: Time.parse(has[:transferred_at]),
@@ -216,7 +226,7 @@ module Cns
         fee: has[:network_fee].to_d,
         nxid: has[:withdrawal_id].to_i,
         tp: 'withdrawal',
-        moe: 'BTC'
+        moe: moe
       }
     end
 

data/lib/cns/bigquery.rb

@@ -252,7 +252,7 @@ module Cns
         kys.map do |k|
           case k
           when :amount, :btc, :cost, :fee, :gas, :gasPrice, :gasUsed, :margin, :price, :quantity, :value, :vol, :eur, :blockReward, :qtd then fnm(hsh[k])
-          when :blockNumber, :timeStamp, :nonce, :transactionIndex, :isError, :txreceipt_status, :tokenDecimal, :withdrawalIndex, :validatorIndex then fin(hsh[k])
+          when :blockNumber, :timeStamp, :nonce, :transactionIndex, :isError, :txreceipt_status, :tokenDecimal, :withdrawalIndex, :validatorIndex, :nxid then fin(hsh[k])
           when :block_time, :successfully_finished_at, :time, :trade_marked_as_paid_at then fts(hsh[k])
           when :memo, :input, :misc then fqe(hsh[k])
           else fqt(hsh[k])

data/lib/cns/bitcoinde.rb

@@ -43,7 +43,7 @@ module Cns
       vtt, vnt = exd[:tt].count, bqd[:nt].count
       vtl, vnl = exd[:tl].count, bqd[:nl].count
 
-      puts("TRADES #{format('%<a>20i %<b>21i %<o>3.3s', a: vtt, b: vnt, o: vtt == vnt ? 'OK' : 'NOK')}") if vtt.positive?
+      puts("TRADES #{format('%<a>20i %<b>21i %<o>3.3s', a: vtt, b: vnt, o: vtt == vnt ? 'OK' : 'NOK')}")
       puts("LEDGER #{format('%<c>20i %<d>21i %<o>3.3s', c: vtl, d: vnl, o: vtl == vnl ? 'OK' : 'NOK')}")
     end
 
@@ -51,7 +51,7 @@ module Cns
     def mtrades
       return unless ops[:v] && novxt.any?
 
-      puts("\ntrades data       hora     dt criacao tipo  par                     btc      eur")
+      puts("\ntrades data       hora     dt criacao tipo                 crypto            eur")
       novxt.sort_by { |i| -i[:srx] }.each { |o| puts(fot(o)) }
     end
 
@@ -59,7 +59,7 @@ module Cns
     def mledger
       return unless ops[:v] && novxl.any?
 
-      puts("\nledger data       hora     tipo       moe          quantidade              custo")
+      puts("\nledger data       hora     tipo       moe              crypto              custo")
       novxl.sort_by { |i| -i[:srx] }.each { |o| puts(fol(o)) }
     end
 
@@ -82,12 +82,11 @@ module Cns
     # @return [String] texto formatado trade
     def fot(htx)
       format(
-        '%<ky>-6.6s %<dt>19.19s %<dp>10.10s %<ty>-5.5s %<mo>-8.8s %<vl>18.8f %<co>8.2f',
+        '%<ky>-6.6s %<dt>19.19s %<dp>10.10s %<ty>-8.8s %<vl>18.8f %<co>14.2f',
         ky: htx[:trade_id],
-        dt: htx[:successfully_finished_at].strftime('%F %T'),
-        dp: htx[:trade_marked_as_paid_at].strftime('%F'),
+        dt: htx[:successfully_finished_at]&.strftime('%F %T'),
+        dp: htx[:trade_marked_as_paid_at]&.strftime('%F'),
         ty: htx[:type],
-        mo: htx[:trading_pair],
         vl: htx[:btc],
         co: htx[:eur]
       )
@@ -138,9 +137,9 @@ module Cns
         pdes(:successfully_finished_at, t).merge(
           trade_marked_as_paid_at: ptm(t[:trade_marked_as_paid_at]),
           username: t[:trading_partner_information][:username],
-          btc: t[:type] == 'buy' ? t[:amount_currency_to_trade_after_fee].to_d : -1 * t[:amount_currency_to_trade].to_d,
-          eur: t[:volume_currency_to_pay_after_fee].to_d,
-          trading_pair: t[:trading_pair].upcase
+          type: "#{t[:trading_pair][0..2]}#{t[:type]}",
+          btc: t[:type] == 'buy' ? t[:amount_currency_to_trade_after_fee].to_d : t[:amount_currency_to_trade].to_d * -1,
+          eur: t[:volume_currency_to_pay_after_fee].to_d
         )
       end
     end

data/lib/cns/version.rb

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

metadata

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