krkt 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7ecf13d81e36dc2d9295da177be307c1cb561cdc58b724f08c5dce8b908c077
-  data.tar.gz: ec40bacfe8c616e1b7b87633e6f549c26879ea3362c3611b09c98b7046d4d90a
+  metadata.gz: 5e77ce587432e90cad0d143296824dc047f9c2d625740726a1718195e7e5ed9f
+  data.tar.gz: c6e54c032fdaf6b4b5b93d6c4e44485f29c136a9258df66c76425a5179735426
 SHA512:
-  metadata.gz: 0b397260748d90b88bb7240f86b361c9e6f0f7faec26f13795e1edb279ae1375573d529b13b029df676e3b1eb791d22ffdd3017ba8280b7732194438384bd79c
-  data.tar.gz: 4f3aa178068ff860ae858c8e23d0bd3fe0010821297bf850ebbd46ad6cc7cb80499e14e8dd95038adf077480124db692e8105ffb3951b3fa2429d36efe1dfa2e
+  metadata.gz: c95f8a46d51664fed210e8b39ff2c3dcf8f13306bc1df591e8ad566f20e1be5c873af3586201e12cddbc3c8aa3fa2ee6f350dc4e27c1cec1a24de4d68bde2805
+  data.tar.gz: 85b8362ebb1dbf177513440b80383b9ab080c526cb5b63b5a1677a473f79f27c49e5f6401ebc9d1e4bbfabe37611f86956298b14a50c39562ace62e776147e55

data/Gemfile.lock

@@ -1,11 +1,9 @@
 PATH
   remote: .
   specs:
-    krkt (0.1.1)
+    krkt (0.1.2)
       curb
-      faraday
       google-cloud-bigquery
-      json
       thor
       yard
 
@@ -48,7 +46,6 @@ GEM
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
     httpclient (2.8.3)
-    json (2.3.1)
     jwt (2.2.2)
     memoist (0.16.2)
     mini_mime (1.0.2)

data/krkt.gemspec

@@ -31,9 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rake')
 
   spec.add_dependency('curb')
-  spec.add_dependency('faraday')
   spec.add_dependency('google-cloud-bigquery')
-  spec.add_dependency('json')
   spec.add_dependency('thor')
   spec.add_dependency('yard')
 end

data/lib/krkt.rb

@@ -6,10 +6,11 @@ require('krkt/client')
 require('krkt/kraken')
 require('krkt/version')
 
+# @author Hernani Rodrigues Vaz
 module Krkt
   class Error < ::StandardError; end
 
-  # classe para carregar/mostrar dados comuns bigquery & etherscan
+  # classe para carregar/mostrar dados transacoes kraken no bigquery
   class CLI < Thor
     desc 'work', 'carrega transacoes novas no bigquery'
     option :h, type: :hash, default: {}, desc: 'configuracao ajuste reposicionamento temporal'
@@ -26,15 +27,6 @@ module Krkt
       Bigquery.new(options).transacoes.mostra_resumo
     end
 
-    desc 'novo', 'mostra reumo carteiras & transacoes'
-    # mostra reumo carteiras & transacoes
-    def novo
-      client = Client.new
-      p(client.trades_history(start: 'TLADFV-QIUTN-QDNCBR')['trades'].keys)
-      # p(client.ledgers(start: 'L4ZDDO-WUGC2-Z72VPW')['ledger'].keys)
-      p(client.balance)
-    end
-
     default_task :show
   end
 end

data/lib/krkt/bigquery.rb

@@ -7,7 +7,7 @@ require('bigdecimal/util')
 module Krkt
   BD = 'hernanirvaz.coins'
 
-  # classe para processar kraken & bigquery
+  # classe para processar bigquery & kraken
   class Bigquery
     # @return [Google::Cloud::Bigquery] API bigquery
     attr_reader :api
@@ -20,9 +20,9 @@ module Krkt
 
     # @param [Thor::CoreExt::HashWithIndifferentAccess] pop opcoes trabalho
     # @option pop [Hash] :h ({}) configuracao ajuste reposicionamento temporal
-    # @option pop [Boolean] :v (false) mostra transacoes normais & ledger?
+    # @option pop [Boolean] :v (false) mostra transacoes trades & ledger?
     # @option pop [Boolean] :t (false) mostra transacoes todas ou somente novas?
-    # @return [Bigquery] API bigquery & API kraken
+    # @return [Bigquery] API bigquery & kraken
     def initialize(pop)
       # usa env GOOGLE_APPLICATION_CREDENTIALS para obter credentials
       # @see https://cloud.google.com/bigquery/docs/authentication/getting-started
@@ -30,7 +30,7 @@ module Krkt
       @ops = pop
     end
 
-    # @return [Kraken] API kraken - processar transacoes normais e ledgers
+    # @return [Kraken] API kraken - obter saldos & transacoes trades e ledger
     def transacoes
       @transacoes ||= Kraken.new(
         {
@@ -80,11 +80,11 @@ module Krkt
     # @return [String] comando insert SQL formatado usl (ledger)
     def usl_ins
       "insert #{BD}.usl(txid,refid,time,type,aclass,asset,amount,fee" \
-      ") VALUES#{transacoes.ledger.map { |k, v| usl_val1(k, v) }.join(',')}"
+      ") VALUES#{transacoes.ledger.map { |k, v| usl_val(k, v) }.join(',')}"
     end
 
-    # @return [String] valores formatados usl (ledger parte1)
-    def usl_val1(idx, hes)
+    # @return [String] valores formatados usl (ledger)
+    def usl_val(idx, hes)
       "('#{idx}'," \
       "'#{hes['refid']}'," \
       "PARSE_DATETIME('%s', '#{String(hes['time'].round)}')," \

data/lib/krkt/client.rb

@@ -5,13 +5,14 @@ require('base64')
 require('curb')
 require('json')
 
+# @author Hernani Rodrigues Vaz
 module Krkt
-  # class Client
+  # classe para processar dados no kraken
   class Client
     # @return [String] API key
-    attr_reader :key
+    attr_reader :aky
     # @return [String] API secret
-    attr_reader :sec
+    attr_reader :asc
     # @return [String] API public url
     attr_reader :puu
     # @return [String] API private url
@@ -19,65 +20,90 @@ module Krkt
     # @return [String] API private path
     attr_reader :pth
 
-    # def initialize(api_key: nil, api_secret: nil, options: {})
-    def initialize(api_key: ENV['KRAKEN_API_KEY'], api_secret: ENV['KRAKEN_API_SECRET'], options: {})
+    # @param [String] pky API key
+    # @param [String] psc API secret
+    # @return [Client] API kraken base
+    def initialize(pky: ENV['KRAKEN_API_KEY'], psc: ENV['KRAKEN_API_SECRET'], options: {})
       b = options.fetch(:base_uri, 'https://api.kraken.com')
       v = options.fetch(:version, 0)
-      @key = api_key
-      @sec = api_secret
+      @aky = pky
+      @asc = psc
       @puu = "#{b}/#{v}/public/"
       @pru = "#{b}/#{v}/private/"
       @pth = "/#{v}/private/"
     end
 
-    # type = type of trade (optional)
-    #     all = all types (default)
-    #     any position = any position (open or closed)
-    #     closed position = positions that have been closed
-    #     closing position = any trade closing all or part of a position
-    #     no position = non-positional trades
-    # trades = whether or not to include trades related to position in output (optional.  default = false)
-    # start = starting unix timestamp or trade tx id of results (optional.  exclusive)
-    # end = ending unix timestamp or trade tx id of results (optional.  inclusive)
-    # ofs = result offset
-    # Result: array of trade info
-    # trades = array of trade info with txid as the key
-    #     ordertxid = order responsible for execution of trade
-    #     pair = asset pair
-    #     time = unix timestamp of trade
-    #     type = type of order (buy/sell)
-    #     ordertype = order type
-    #     price = average price order was executed at (quote currency)
-    #     cost = total cost of order (quote currency)
-    #     fee = total fee (quote currency)
-    #     vol = volume (base currency)
-    #     margin = initial margin (quote currency)
-    #     misc = comma delimited list of miscellaneous info
-    #         closing = trade closes all or part of a position
-    # count = amount of available trades info matching criteria
-    def trades_history(**opts)
-      post_private('TradesHistory', **opts)['result']
+    # @return [Hash] resultados ultimas transacoes trades no kraken
+    # @example
+    #  {
+    #    'trades' => {
+    #      'TLADFV-QIUTN-QDNCBR' => {
+    #        'ordertxid' => 'O2CRFG-5PCJA-EMX7VC',
+    #        'pair' => 'XETHXXBT',
+    #        'time' => 1_463_422_494.7069,
+    #        'type' => 'buy',
+    #        'ordertype' => 'market',
+    #        'price' => '0.024400',
+    #        'cost' => '1.358424',
+    #        'fee' => '0.003532',
+    #        'vol' => '55.67311475',
+    #        'margin' => '0.000000',
+    #        'misc' => ''
+    #      },
+    #      ...
+    #    },
+    #    'count' => 156
+    #  }
+    def trades_history
+      post_private('TradesHistory')['result']
     end
 
-    # def ledgers
-    def ledgers(**opts)
-      post_private('Ledgers', **opts)['result']
+    # @return [Hash] resultados ultimas transacoes ledger no kraken
+    # @example
+    #  {
+    #    'ledger' => {
+    #      'LUK3QC-QW6TA-27B7NI' => {
+    #        'refid' => 'A2BNCQS-CHCETZ-JYCER6',
+    #        'time' => 1_584_349_306.9479,
+    #        'type' => 'withdrawal',
+    #        'subtype' => '',
+    #        'aclass' => 'currency',
+    #        'asset' => 'XETH',
+    #        'amount' => '-29.2659039100',
+    #        'fee' => '0.0050000000',
+    #        'balance' => '1.1806988100'
+    #      }
+    #      ,
+    #      ...
+    #    },
+    #    'count' => 373
+    #  }
+    def ledger
+      post_private('Ledgers')['result']
     end
 
-    # def balance
+    # @return [Hash] saldos no kraken
+    # @example
+    #  {
+    #    'ZEUR' => '0.0000',
+    #    'XXBT' => '0.0000000000',
+    #    'XETH' => '1.1806988100',
+    #    'XETC' => '0.0000000000',
+    #    'EOS' => '0.0000001700',
+    #    'BCH' => '0.0000000000'
+    #  }
     def balance
       post_private('Balance')['result']
     end
 
-    # Get server time
-    # URL: https://api.kraken.com/0/public/Time
-    # Returns a hash with keys +error+ and +result+.
-    # +result+ is an array of hashes with keys:
-    #   +unixtime+  = unix timestamp
-    #   +rfc1123+   = RFC 1123 time format
-    #
+    # @return [Hash] data hora kraken
+    # @example
+    #  {
+    #    'unixtime' => 1_598_956_727,
+    #    'rfc1123' => 'Tue,  1 Sep 20 10:38:47 +0000'
+    #  }
     def server_time
-      get_public('Time')
+      get_public('Time')['result']
     end
 
     private
@@ -90,23 +116,23 @@ module Krkt
     # HTTP POST request for private API queries involving user credentials.
     def post_private(method, **opts)
       # Generate a continually-increasing unsigned 51-bit integer nonce from the current Unix Time.
-      t = opts.merge!({ nonce: Integer(Time.now.to_f * 1_000_000) }).map { |p| p.join('=') }.join('&')
+      opts.merge!({ nonce: Integer(Time.now) * 1_000_000 })
 
-      parse_response(Curl.post("#{pru}#{method}", t) do |r|
+      parse_response(Curl.post("#{pru}#{method}", opts) do |r|
                        r.headers = {
-                         'api-key': key,
-                         'api-sign': authenticate(method, opts[:nonce], t)
+                         'api-key': aky,
+                         'api-sign': authenticate(method, opts[:nonce], opts.map { |p| p.join('=') }.join('&'))
                        }
                      end)
     end
 
     def authenticate(method, nonce, params)
-      raise(ArgumentError, 'API Key is not set') unless key
-      raise(ArgumentError, 'API Secret is not set') unless sec
+      raise(ArgumentError, 'API Key is not set') unless aky
+      raise(ArgumentError, 'API Secret is not set') unless asc
 
       Base64.strict_encode64(OpenSSL::HMAC.digest(
                                'sha512',
-                               Base64.decode64(sec),
+                               Base64.decode64(asc),
                                "#{pth}#{method}#{Digest::SHA256.digest("#{nonce}#{params}")}"
                              ))
     end

data/lib/krkt/kraken.rb

@@ -4,7 +4,7 @@ require('bigdecimal/util')
 
 # @author Hernani Rodrigues Vaz
 module Krkt
-  # classe para processar carteiras & transacoes normais e ledgers
+  # classe para processar saldos & transacoes trades e ledger
   class Kraken
     # @return [Client] API kraken
     attr_reader :api
@@ -16,44 +16,48 @@ module Krkt
     # @param [Hash] dad todos os dados bigquery
     # @param [Thor::CoreExt::HashWithIndifferentAccess] pop opcoes trabalho
     # @option pop [Hash] :h ({}) configuracao dias ajuste reposicionamento temporal
-    # @option pop [Boolean] :v (false) mostra dados transacoes normais & ledgers?
-    # @return [Kraken] API kraken - processar transacoes normais e ledgers
+    # @option pop [Boolean] :v (false) mostra dados transacoes trades & ledger?
+    # @option pop [Boolean] :t (false) mostra transacoes todas ou somente novas?
+    # @return [Kraken] API kraken - obter saldos & transacoes trades e ledger
     def initialize(dad, pop)
+      # API kraken base
       @api = Client.new
       @dbq = dad
       @ops = pop
     end
 
-    # @return [Array<Hash>] todos os dados kraken - saldos & transacoes
+    # @return [Hash] dados kraken - saldos & transacoes trades e ledger
     def dkr
       @dkr ||= {
         sl: api.balance,
         kt: api.trades_history,
-        kl: api.ledgers
+        kl: api.ledger
       }
     end
 
-    # @return [Array<Integer>] lista blocknumbers de transacoes normais
+    # @return [Array<String>] lista txid de transacoes trades
     def kyt
       @kyt ||= dkr[:kt]['trades'].keys - (ops[:t] ? [] : dbq[:nt].map { |e| e[:txid] })
     end
 
-    # @return [Array<Integer>] lista blocknumbers de transacoes ledger
+    # @return [Array<String>] lista txid de transacoes ledger
     def kyl
       @kyl ||= dkr[:kl]['ledger'].keys - (ops[:t] ? [] : dbq[:nl].map { |e| e[:txid] })
     end
 
-    # @return [Array<Hash>] lista transacoes novas trades
+    # @return [Hash] transacoes trades
     def trades
       @trades ||= dkr[:kt]['trades'].select { |k, _| kyt.include?(k) }
     end
 
-    # @return [Array<Hash>] lista transacoes novas ledger
+    # @return [Hash] transacoes ledger
     def ledger
       @ledger ||= dkr[:kl]['ledger'].select { |k, _| kyl.include?(k) }
     end
 
-    # def formata_saldos(moe, sal)
+    # @parm [String] moe codigo kraken da moeda
+    # @parm [String] moe saldo kraken da moeda
+    # @return [String] texto formatado saldos (kraken/bigquery) & iguais/ok/nok?
     def formata_saldos(moe, sal)
       t = dbq[:sl][moe.downcase.to_sym].to_d
       format(
@@ -65,8 +69,9 @@ module Krkt
       )
     end
 
-    # @parm [Hash] htx transacao normal
-    # @return [String] texto formatado transacao normal
+    # @parm [String] idx codigo transacao
+    # @parm [Hash] htx transacao trade
+    # @return [String] texto formatado transacao trade
     def formata_transacao_trades(idx, htx)
       format(
         '%<ky>-6.6s %<dt>19.19s %<ty>-10.10s %<mo>-8.8s %<pr>8.2f %<vl>15.7f %<co>8.2f',
@@ -80,6 +85,7 @@ module Krkt
       )
     end
 
+    # @parm idx (see formata_transacao_trades)
     # @parm [Hash] hlx transacao ledger
     # @return [String] texto formatado transacao ledger
     def formata_transacao_ledger(idx, hlx)
@@ -106,7 +112,7 @@ module Krkt
       puts("\nstring ajuste dias dos trades\n-h=#{kyt.map { |e| "#{e}:0" }.join(' ')}")
     end
 
-    # @return [String] texto transacoes normais
+    # @return [String] texto transacoes trades
     def mostra_trades
       return unless ops[:v] && trades.count.positive?
 

data/lib/krkt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Krkt
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krkt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: google-cloud-bigquery
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement