cns 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5864db949cd54475943852878f488bcb0e62e342dafcc2f0be4d2e418a6e4a8
-  data.tar.gz: 2f33d2a740c1787f92246625ff11d44f1cc06d4ac8cbe2a54e610aca6a2309ed
+  metadata.gz: 5e6f05fc2c2fc0c7c1e34cda63d18338f37db37957be5f1af27c60041cd761b5
+  data.tar.gz: bab915764960144e4b713348958b173524f81ba42eb53d2d0df1242c2721d194
 SHA512:
-  metadata.gz: 989d84cf9d660f93068f135d35f8963633431787446a2a666562230560965711430820cc57ebc8ec7e6dd540005c920d1791431ac20e9acd0a71e84565a24dc4
-  data.tar.gz: b8818edca07d3e902cd1a126e9474efe1ff15c3088ca6939f27be8f5422fd91f88a024e2b407a75dd156426cbb4f30b9971548c23ccad0f648348607bd6da435
+  metadata.gz: 78336dc2f0cc71f52a0fffcdc0a520e62fb8b77bee5173a18c21de958f0f17df2a7042d21a344a324b1cc3861bab978b6e3a66b96aba66981bd147571e8a5fdc
+  data.tar.gz: cd747260647643fc61a7ac298a716489df77f71a130571f3360efe5a4268a7e27644150b6c7649d395fd900777439e78d98892a315c5423ba4fd8649eb3c2fd1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cns (0.9.3)
+    cns (0.9.5)
       curb
       faraday
       google-cloud-bigquery
@@ -79,7 +79,7 @@ GEM
       google-cloud-errors (~> 1.0)
     google-cloud-env (2.2.1)
       faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.4.0)
+    google-cloud-errors (1.5.0)
     google-logging-utils (0.1.0)
     googleauth (1.13.1)
       faraday (>= 1.0, < 3.a)
@@ -137,7 +137,7 @@ GEM
     reverse_markdown (3.0.0)
       nokogiri
     rexml (3.4.1)
-    rubocop (1.73.1)
+    rubocop (1.73.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/lib/cns/apibc.rb

@@ -7,141 +7,156 @@ require('json')
 module Cns
   # classe para acesso dados blockchains
   class Apibc
-    ESPS = 10_000
-    GMPS = 100
+    ESPS = 10_000 # Etherscan maximum records per page
+    GMPS = 100    # Greymass maximum actions per request
 
     def initialize
-      @etherscan_conn = connection('https://api.etherscan.io')
-      @greymass_conn = connection('https://eos.greymass.com')
+      @escn = connection('https://api.etherscan.io')
+      @gmcn = connection('https://eos.greymass.com')
+      @esky = ENV.fetch('ETHERSCAN_API_KEY', nil)
     end
 
     # Get account balances for multiple ETH addresses
-    # @param addresses [Array<String>] List of ETH addresses (max 20)
+    # @param [Array<String>] addresses List of ETH addresses (max 20)
     # @return [Array<Hash>] List of addresses with balances
     def account_es(addresses)
-      response = etherscan_req('balancemulti', addresses.join(','), 1, tag: 'latest')
-      response[:status] == '1' ? response[:result] || [] : []
+      res = es_req('balancemulti', addresses.join(','), 1, tag: 'latest')
+      res[:status] == '1' ? res[:result] || [] : []
     end
 
     # Get normal transactions for ETH address
     # @param [String] address endereco ETH
     # @return [Array<Hash>] lista transacoes normais etherscan
     def norml_es(address)
-      pag_etherscan_req('txlist', address)
+      pag_es_req('txlist', address)
     end
 
     # Get internal transactions for ETH address
     # @param (see norml_es)
     # @return [Array<Hash>] lista transacoes internas etherscan
     def inter_es(address)
-      pag_etherscan_req('txlistinternal', address)
+      pag_es_req('txlistinternal', address)
     end
 
     # Get mined blocks for ETH address
     # @param (see norml_es)
     # @return [Array<Hash>] lista blocos etherscan
     def block_es(address)
-      pag_etherscan_req('getminedblocks', address, blocktype: 'blocks')
+      pag_es_req('getminedblocks', address, blocktype: 'blocks')
     end
 
     # Get withdrawals for ETH address
     # @param (see norml_es)
     # @return [Array<Hash>] lista blocos etherscan
     def withw_es(address)
-      pag_etherscan_req('txsBeaconWithdrawal', address)
+      pag_es_req('txsBeaconWithdrawal', address)
     end
 
     # Get token transfers for ETH address
     # @param (see norml_es)
     # @return [Array<Hash>] lista token transfer events etherscan
     def token_es(address)
-      pag_etherscan_req('tokentx', address)
+      pag_es_req('tokentx', address)
     end
 
     # Get EOS account information
-    # @param address [String] EOS account name
+    # @param [String] address EOS account name
     # @return [Hash] Account details with resources
     def account_gm(address)
-      response = greymass_req('/v1/chain/get_account', account_name: address)
-      response[:core_liquid_balance]&.to_d&.positive? ? response : gm_erro
+      res = gm_req('/v1/chain/get_account', account_name: address)
+      res[:core_liquid_balance]&.to_d&.positive? ? res : gm_erro
     end
 
     # Get complete transaction history for EOS account
     # @param (see account_gm)
     # @return [Array<Hash>] lista completa transacoes greymass
     def ledger_gm(address)
-      actions = []
+      trx = []
       pos = 0
       loop do
-        response = greymass_req('/v1/history/get_actions', account_name: address, pos: pos, offset: GMPS)
-        batch = response[:actions] || []
-        actions.concat(batch)
-        break if batch.size < GMPS
+        res = gm_req('/v1/history/get_actions', account_name: address, pos: pos, offset: GMPS)
+        bth = res[:actions] || []
+        trx.concat(bth)
+        break if bth.size < GMPS
 
         pos += GMPS
       end
-      actions
+      trx
     end
 
     private
 
-    # Reusable Faraday connection
-    def connection(base_url)
-      Faraday.new(base_url) do |conn|
-        conn.request(:json) # Automatically encodes body as JSON
-        conn.headers = {content_type: 'application/json', accept: 'application/json', user_agent: 'blockchain-api-client'}
-        conn.options.timeout = 30
-        conn.options.open_timeout = 10
-        conn.adapter(Faraday.default_adapter)
-      end
-    end
-
-    # Generic Etherscan API request handler
-    def etherscan_req(action, address, page = 1, params = {})
-      params = {module: 'account', action: action, address: address, page: page, apikey: ENV.fetch('ETHERSCAN_API_KEY')}.merge(params)
-      parse_json(@etherscan_conn.get('/api', params))
+    # Make a request to the Etherscan API
+    # @param [String] act API action name
+    # @param [String] add Blockchain address
+    # @param [Integer] pag Page number for pagination
+    # @param [Hash] prm Additional request parameters
+    # @return [Hash] Parsed API response
+    def es_req(act, add, pag = 1, prm = {})
+      prm = {module: 'account', action: act, address: add, page: pag, apikey: @esky}.merge(prm)
+      parse_json(@escn.get('/api', prm))
     rescue Faraday::Error
       {status: '0'}
     end
 
-    # Generic method for paginated Etherscan requests
-    # @param action [String] API action name
-    # @param address [String] Blockchain address
-    # @param params [Hash] Additional request parameters
+    # Fetch paginated results from Etherscan
+    # @param act [String] API action name
+    # @param add [String] Blockchain address
+    # @param prm [Hash] Additional request parameters
     # @return [Array<Hash>] Combined results from all pages
-    def pag_etherscan_req(action, address, params = {})
-      results = []
-      page = 1
+    def pag_es_req(act, add, prm = {})
+      prm = prm.merge(offset: ESPS)
+      trx = []
+      pag = 1
       loop do
-        response = etherscan_req(action, address, page, params)
-        break unless response[:status] == '1'
+        res = es_req(act, add, pag, prm)
+        break unless res[:status] == '1'
 
-        batch = response[:result] || []
-        results.concat(batch)
-        break if batch.size < ESPS
+        bth = res[:result] || []
+        trx.concat(bth)
+        break if bth.size < ESPS
 
-        page += 1
+        pag += 1
       end
-      results
-    end
-
-    # Generic Greymass API error
-    def gm_erro
-      {core_liquid_balance: 0, total_resources: {net_weight: 0, cpu_weight: 0}}
+      trx
     end
 
-    # Generic Greymass API request handler
-    def greymass_req(endpoint, payload)
-      parse_json(@greymass_conn.post(endpoint) { |req| req.body = payload })
+    # Make a request to the Greymass API
+    # @param [String] url API endpoint
+    # @param [Hash] pyl Request payload
+    # @return [Hash] Parsed API response
+    def gm_req(url, pyl)
+      parse_json(@gmcn.post(url) { |r| r.body = pyl })
     rescue Faraday::Error
       gm_erro
     end
 
-    # Safe JSON parsing with error handling
+    # Default error response for Greymass API
+    # @return [Hash] Error response with zeroed values
+    def gm_erro
+      {core_liquid_balance: 0, total_resources: {net_weight: 0, cpu_weight: 0}}
+    end
+
+    # Safely parse JSON response
+    # @param [Faraday::Response] res API response
+    # @return [Hash] Parsed JSON or empty hash on error
     def parse_json(res)
       JSON.parse(res.body, symbolize_names: true) || {}
     rescue JSON::ParserError
       {}
     end
+
+    # Create a Faraday connection with JSON configuration
+    # @param [String] url Base URL for the API
+    # @return [Faraday::Connection] Configured Faraday connection
+    def connection(url)
+      Faraday.new(url) do |conn|
+        conn.request(:json)
+        conn.headers = {accept: 'application/json', user_agent: 'blockchain-api-client'}
+        conn.options.timeout = 30
+        conn.options.open_timeout = 10
+        conn.adapter(Faraday.default_adapter)
+      end
+    end
   end
 end

data/lib/cns/apice.rb

@@ -17,8 +17,13 @@ module Cns
       @curl.connect_timeout = 10
       @curl.follow_location = true
       @curl.ssl_verify_peer = true
+      @deky = ENV.fetch('BITCOINDE_API_KEY', nil)
+      @desc = ENV.fetch('BITCOINDE_API_SECRET', nil)
+      @usky = ENV.fetch('KRAKEN_API_KEY', nil)
+      @ussc = ENV.fetch('KRAKEN_API_SECRET', nil)
     end
 
+    # Get account balances from Bitcoin.de
     # @return [Hash] saldos no bitcoinde
     def account_de
       uri = "#{API[:de]}/account"
@@ -28,6 +33,7 @@ module Cns
       {}
     end
 
+    # Get trades from Bitcoin.de
     # @return [Array<Hash>] trades bitcoinde
     def trades_de
       pag_de_req("#{API[:de]}/trades", {state: 1}, :trades)
@@ -35,6 +41,7 @@ module Cns
       []
     end
 
+    # Get deposits from Bitcoin.de, uniformly formatted
     # @return [Array<Hash>] depositos uniformizados bitcoinde
     def deposits_de
       pag_de_req("#{API[:de]}/btc/deposits", {state: 2}, :deposits) { |i| i.map { |h| deposit_unif(h) } }
@@ -42,6 +49,7 @@ module Cns
       []
     end
 
+    # Get withdrawals from Bitcoin.de, uniformly formatted
     # @return [Array<Hash>] withdrawals uniformizadas bitcoinde
     def withdrawals_de
       pag_de_req("#{API[:de]}/btc/withdrawals", {state: 1}, :withdrawals) { |i| i.map { |h| withdrawal_unif(h) } }
@@ -49,60 +57,83 @@ module Cns
       []
     end
 
+    # Get account balances from Kraken
     # @return [Hash] saldos kraken
     def account_us
       uri = 'Balance'
       ops = {nonce: nnc}
-      run_curl(@curl, "#{API[:us]}/#{uri}", method: :post, post_data: ops, headers: hus(uri, ops))
+      run_curl(@curl, "#{API[:us]}/#{uri}", method: 'POST', post_data: ops, headers: hus(uri, ops))
       parse_json(@curl).fetch(:result, {})
     rescue Curl::Err::CurlError
       {}
     end
 
+    # Get trades from Kraken
     # @return [Hash] trades kraken
     def trades_us
       pag_us_req('TradesHistory', :trades)
     rescue Curl::Err::CurlError
-      {}
+      []
     end
 
+    # Get ledger from Kraken
     # @return [Hash] ledger kraken
     def ledger_us
       pag_us_req('Ledgers', :ledger)
     rescue Curl::Err::CurlError
-      {}
+      []
     end
 
     private
 
+    # Uniformly format transacao kraken
+    # @param [Symbol] key id da transacao
+    # @param [Hash] trx transacao
+    # @return [Hash] transacao uniformizada
+    def us_unif(key, trx)
+      t = Integer(trx[:time])
+      trx.merge(txid: key.to_s, srx: t, time: Time.at(t))
+    rescue StandardError
+      {}
+    end
+
     # Generic paginated request handler for Kraken
+    # @param [String] uri API endpoint URI
+    # @param [Symbol] key Key to extract from the result
+    # @yield [Array<Hash>] Block to process each batch of results
+    # @return [Array<Hash>] Combined results from all pages
     def pag_us_req(uri, key)
-      has = {}
+      ary = []
       ofs = 0
       loop do
         sleep(ofs.zero? ? 0 : 2)
         ops = {nonce: nnc, ofs: ofs}
-        run_curl(@curl, "#{API[:us]}/#{uri}", method: :post, post_data: ops, headers: hus(uri, ops))
-        batch = parse_json(@curl).fetch(:result, {}).fetch(key, [])
-        break if batch.empty?
+        run_curl(@curl, "#{API[:us]}/#{uri}", method: 'POST', post_data: ops, headers: hus(uri, ops))
+        bth = parse_json(@curl).fetch(:result, {}).fetch(key, []).map { |k, v| us_unif(k, v) }
+        break if bth.empty?
 
-        has.merge!(batch)
-        ofs += batch.size
+        ary.concat(bth)
+        ofs += bth.size
       end
-      has
+      ary
     end
 
     # Generic paginated request handler for Bitcoin.de
-    def pag_de_req(base_url, params, key)
+    # @param [String] uri Base URL for the API request
+    # @param [Hash] prm Additional parameters for the request
+    # @param [Symbol] key Key to extract from the result
+    # @yield [Array<Hash>] Optional block to process each batch of results
+    # @return [Array<Hash>] Combined results from all pages
+    def pag_de_req(uri, prm, key)
       ary = []
       pag = 1
       loop do
-        url = "#{base_url}?#{URI.encode_www_form(params.merge(page: pag))}"
+        url = "#{uri}?#{URI.encode_www_form(prm.merge(page: pag))}"
         run_curl(@curl, url, headers: hde(url))
-        result = parse_json(@curl)
-        batch = result.fetch(key, [])
-        ary.concat(block_given? ? yield(batch) : batch)
-        break if result[:page]&.[](:current)&.>= result[:page]&.[](:last)
+        res = parse_json(@curl)
+        bth = res.fetch(key, [])
+        ary.concat(block_given? ? yield(bth) : bth)
+        break if res[:page]&.[](:current)&.>= res[:page]&.[](:last)
 
         pag += 1
       end
@@ -110,64 +141,76 @@ module Cns
     end
 
     # Configure Curl object for request
-    def run_curl(curl, url, method: :get, post_data: nil, headers: {})
+    # @param [Curl::Easy] curl Curl object to configure
+    # @param [String] url URL for the request
+    # @param [String] method HTTP method (GET or POST)
+    # @param [Hash] post_data Data to send in POST requests
+    # @param [Hash] headers HTTP headers for the request
+    def run_curl(curl, url, method: 'GET', post_data: nil, headers: {})
       curl.reset
       curl.url = url
-      curl.http(method == :post ? 'POST' : 'GET')
+      curl.http(method)
       curl.headers = headers
       curl.post_body = URI.encode_www_form(post_data) if post_data
       curl.perform
     end
 
     # Safe JSON parsing with error handling
+    # @param [Curl::Easy] res Curl response object
+    # @return [Hash] Parsed JSON or empty hash on error
     def parse_json(res)
       JSON.parse(res.body_str, symbolize_names: true)
     rescue JSON::ParserError
       {}
     end
 
-    # @return [Integer] continually-increasing unsigned integer nonce from the current Unix Time
+    # Generate a continually-increasing unsigned integer nonce from the current Unix Time
+    # @return [Integer] Nonce value
     def nnc
       Integer(Float(Time.now) * 1e6)
     end
 
+    # Uniformly format a deposit from Bitcoin.de
+    # @param [Hash] has Deposit data from Bitcoin.de
     # @return [Hash] deposito uniformizado bitcoinde
     def deposit_unif(has)
-      {add: has[:address], time: Time.parse(has[:created_at]), qt: has[:amount], txid: Integer(has[:deposit_id])}.merge(tp: 'deposit', moe: 'btc', fee: '0')
+      {add: has[:address], time: Time.parse(has[:created_at]), qtd: has[:amount].to_d, nxid: Integer(has[:deposit_id])}.merge(tp: 'deposit', moe: 'BTC', fee: 0.to_d)
     end
 
+    # Uniformly format a withdrawal from Bitcoin.de
+    # @param [Hash] has Withdrawal data from Bitcoin.de
     # @return [Hash] withdrawal uniformizada bitcoinde
     def withdrawal_unif(has)
       {
         add: has[:address],
         time: Time.parse(has[:transferred_at]),
-        qt: has[:amount],
-        fee: has[:network_fee],
-        txid: Integer(has[:withdrawal_id]),
+        qtd: -1 * has[:amount].to_d,
+        fee: has[:network_fee].to_d,
+        nxid: Integer(has[:withdrawal_id]),
         tp: 'withdrawal',
-        moe: 'btc'
+        moe: 'BTC'
       }
     end
 
-    # @param [String] qde query a incluir no pedido HTTP
-    # @param [Integer] non continually-increasing unsigned integer
-    # @return [Hash] headers necessarios para pedido HTTP da exchange bitcoinde
+    # Generate headers for Bitcoin.de HTTP requests
+    # @param [String] qde Query string to include in the HTTP request
+    # @param [Integer] non Nonce value (default: generated from nnc)
+    # @return [Hash] Headers required for Bitcoin.de HTTP requests
     def hde(qde, non = nnc)
-      key = ENV.fetch('BITCOINDE_API_KEY', nil)
-      md5 = ['GET', qde, key, non, Digest::MD5.hexdigest('')].join('#')
-      mac = OpenSSL::HMAC.hexdigest('sha256', ENV.fetch('BITCOINDE_API_SECRET', nil), md5)
-      {'X-API-KEY': key, 'X-API-NONCE': non, 'X-API-SIGNATURE': mac}
+      md5 = ['GET', qde, @deky, non, Digest::MD5.hexdigest('')].join('#')
+      mac = OpenSSL::HMAC.hexdigest('sha256', @desc, md5)
+      {'X-API-KEY' => @deky, 'X-API-NONCE' => non.to_s, 'X-API-SIGNATURE' => mac}
     end
 
+    # Generate headers for Kraken HTTP requests
     # @param [String] qus query a incluir no pedido HTTP
     # @param [Hash] ops opcoes trabalho
     # @option ops [Hash] :nonce continually-increasing unsigned integer
-    # @return [Hash] headers necessarios para pedido HTTP da exchange kraken
+    # @return [Hash] Headers required for Kraken HTTP requests
     def hus(qus, ops)
-      key = ENV.fetch('KRAKEN_API_KEY', nil)
       sha = ['/0/private/', qus, Digest::SHA256.digest("#{ops[:nonce]}#{URI.encode_www_form(ops)}")].join
-      mac = OpenSSL::HMAC.digest('sha512', Base64.decode64(ENV.fetch('KRAKEN_API_SECRET', nil)), sha)
-      {'api-key': key, 'api-sign': Base64.strict_encode64(mac)}
+      mac = OpenSSL::HMAC.digest('sha512', Base64.decode64(@ussc), sha)
+      {'api-key' => @usky, 'api-sign' => Base64.strict_encode64(mac)}
     end
   end
 end

data/lib/cns/bigquery.rb

@@ -9,16 +9,16 @@ module Cns
   FO = File.expand_path("~/#{File.basename($PROGRAM_NAME)}.log")
   EM = %i[EOS XETH ZEUR btc eth]
   TB = {
-    netht: %w[blocknumber timestamp txhash nonce blockhash transactionindex axfrom axto iax value gas gasprice gasused iserror txreceipt_status input contractaddress dias],
-    hetht: %i[blockNumber timeStamp hash nonce blockHash transactionIndex from to iax value gas gasPrice gasUsed isError txreceipt_status input contractAddress],
-    nethi: %w[blocknumber timestamp txhash axfrom axto iax value contractaddress input type gas gasused traceid iserror errcode dias],
-    hethi: %i[blockNumber timeStamp hash from to iax value contractAddress input type gas gasUsed traceId isError errCode],
+    netht: %w[txhash blocknumber timestamp nonce blockhash transactionindex axfrom axto iax value gas gasprice gasused iserror txreceipt_status input contractaddress dias],
+    hetht: %i[hash blockNumber timeStamp nonce blockHash transactionIndex from to iax value gas gasPrice gasUsed isError txreceipt_status input contractAddress],
+    nethi: %w[txhash blocknumber timestamp axfrom axto iax value contractaddress input type gas gasused traceid iserror errcode dias],
+    hethi: %i[hash blockNumber timeStamp from to iax value contractAddress input type gas gasUsed traceId isError errCode],
     nethp: %w[blocknumber timestamp blockreward iax dias],
     hethp: %i[blockNumber timeStamp blockReward iax],
     nethw: %w[withdrawalindex validatorindex address amount blocknumber timestamp dias],
     hethw: %i[withdrawalIndex validatorIndex address amount blockNumber timeStamp],
-    nethk: %w[blocknumber timestamp txhash nonce blockhash transactionindex axfrom axto iax value tokenname tokensymbol tokendecimal gas gasprice gasused input contractaddress dias],
-    hethk: %i[blockNumber timeStamp hash nonce blockHash transactionIndex from to iax value tokenName tokenSymbol tokenDecimal gas gasPrice gasUsed input contractAddress],
+    nethk: %w[txhash blocknumber timestamp nonce blockhash transactionindex axfrom axto iax value tokenname tokensymbol tokendecimal gas gasprice gasused input contractaddress dias],
+    hethk: %i[hash blockNumber timeStamp nonce blockHash transactionIndex from to iax value tokenName tokenSymbol tokenDecimal gas gasPrice gasUsed input contractAddress],
     neost: %w[gseq aseq bnum time contract action acfrom acto iax amount moeda memo dias],
     heost: %i[global_action_seq account_action_seq block_num block_time account name from to iax quantity moe memo],
     cdet: %w[txid time tp user btc eur dtc dias],
@@ -30,6 +30,22 @@ module Cns
     cusl: %w[txid refid time type aclass asset amount fee],
     husl: %i[txid refid time type aclass asset amount fee]
   }
+  # para testes bigquery
+  TL = {
+    ins: 'INSERT',
+    exo: false,
+    est: '', # ' limit 226',
+    esi: '', # ' limit 22',
+    esp: '', # ' limit 72',
+    esw: '', # ' limit 2299',
+    esk: '', # ' limit 20',
+    gmt: '', # ' limit 1091',
+    ust: '', # ' limit 182',
+    usl: '', # ' limit 448',
+    det: '', # ' limit 27',
+    del: '' # ' limit 16'
+
+  }
 
   # classe para processar bigquery
   class Bigquery
@@ -154,11 +170,11 @@ module Cns
       Etherscan.new(
         {
           wb: sql("SELECT * FROM #{BD}.wet#{prx[-1]} ORDER BY ax"),
-          ni: sql("SELECT * FROM #{BD}.#{prx}i"),
-          nk: sql("SELECT * FROM #{BD}.#{prx}k"),
-          np: sql("SELECT * FROM #{BD}.#{prx}p"),
-          nt: sql("SELECT * FROM #{BD}.#{prx}t"),
-          nw: sql("SELECT * FROM #{BD}.#{prx}w")
+          nt: sql("SELECT * FROM #{BD}.#{prx}t#{TL[:est]}"),
+          ni: sql("SELECT * FROM #{BD}.#{prx}i#{TL[:esi]}"),
+          np: sql("SELECT * FROM #{BD}.#{prx}p#{TL[:esp]}"),
+          nw: sql("SELECT * FROM #{BD}.#{prx}w#{TL[:esw]}"),
+          nk: sql("SELECT * FROM #{BD}.#{prx}k#{TL[:esk]}")
         },
         ops
       )
@@ -176,32 +192,39 @@ module Cns
 
     # @return [Greymass] API blockchain EOS
     def apigm
-      @apigm ||= Greymass.new({wb: sql("select * from #{BD}.weos ORDER BY ax"), nt: sql("select * from #{BD}.neosx")}, ops)
+      @apigm ||= Greymass.new({wb: sql("select * from #{BD}.weos ORDER BY ax"), nt: sql("select * from #{BD}.neosx#{TL[:gmt]}")}, ops)
     end
 
     # @return [Kraken] API exchange kraken
     def apius
-      @apius ||= Kraken.new({sl: sql("select * from #{BD}.cuss").first, nt: sql("select * from #{BD}.cust"), nl: sql("select * from #{BD}.cusl")}, ops)
+      @apius ||= Kraken.new({sl: sql("select * from #{BD}.cuss").first, nt: sql("select * from #{BD}.cust#{TL[:ust]}"), nl: sql("select * from #{BD}.cusl#{TL[:usl]}")}, ops)
     end
 
     # @return [Bitcoinde] API exchange bitcoinde
     def apide
-      @apide ||= Bitcoinde.new({sl: sql("select * from #{BD}.cdes").first, nt: sql("select * from #{BD}.cdet"), nl: sql("select * from #{BD}.cdel")}, ops)
+      @apide ||= Bitcoinde.new({sl: sql("select * from #{BD}.cdes").first, nt: sql("select * from #{BD}.cdet#{TL[:det]}"), nl: sql("select * from #{BD}.cdel#{TL[:del]}")}, ops)
     end
 
     # @return [String] comando insert SQL formatado
     def ins_sql(tbl, lin)
-      "INSERT #{BD}.#{tbl} (#{TB[tbl].join(',')}) VALUES #{lin.map { |i| send("#{tbl}_val", i) }.join(',')}"
+      # para testes bigquery
+      if TL[:exo]
+        exl = lin.map { |i| send("#{tbl}_val", i)[1..-2] }
+        exi = exl.map { |f| f.split(',').first }.join(',')
+        exo = "SELECT #{TB[tbl].join(',')} FROM #{BD}.#{tbl} WHERE #{TB[tbl].first} IN (#{exi}) union all select "
+        puts(exo + exl.join(' union all select ') + ' order by 1')
+      end
+      "#{TL[:ins]} #{BD}.#{tbl} (#{TB[tbl].join(',')}) VALUES #{lin.map { |i| send("#{tbl}_val", i) }.join(',')}"
     end
 
     # @return [String] relatorio execucao dml
     def dml_out(src, str, ltb)
       str.concat(
-        ltb.filter_map do |itm|
-          novx = src.send("nov#{itm}")
+        ltb.filter_map do |i|
+          novx = src.send("nov#{i}")
           next if novx.empty?
 
-          format(' %<n>i %<t>s', n: dml(ins_sql(itm, %i[cust cusl].include?(itm) ? novx.values : novx)), t: "#{itm}")
+          format(' %<n>i %<t>s', n: dml(ins_sql(i, novx)), t: "#{i}")
         end
       )
       str.join
@@ -290,7 +313,7 @@ module Cns
     # @param [Hash] htx ledger greymass
     # @return [String] valores formatados neost
     def neost_val(htx)
-      fvals(htx, TB[:heost], :itx)
+      fvals(htx, TB[:heost], :global_action_seq)
     end
 
     # @param [Hash] htx trades bitcoinde
@@ -308,7 +331,7 @@ module Cns
     # @param [Hash] htx trades kraken
     # @return [String] valores formatados cust
     def cust_val(htx)
-      fvals(htx.merge(ledgers: apius.exd[:kl].select { |_, o| o[:refid] == htx[:txid] }.keys.join(',')), TB[:hust], :txid)
+      fvals(htx.merge(ledgers: apius.uskl.select { |o| o[:refid] == htx[:txid] }.map { |t| t[:txid] }.join(',')), TB[:hust], :txid)
     end
 
     # @param [Hash] htx ledger kraken

data/lib/cns/bitcoinde.rb

@@ -23,15 +23,10 @@ module Cns
       @ops = pop.transform_keys(&:to_sym)
     end
 
-    # @return [Hash] dados exchange bitcoinde - saldos & trades & deposits & withdrawals
-    def exd
-      @exd ||= {sl: pdea(api.account_de), tt: pdet(api.trades_de), tl: pdel(api.deposits_de + api.withdrawals_de)}
-    end
-
     # @return [String] texto saldos & transacoes & ajuste dias
     def mresumo
       puts("\nBITCOINDE\ntipo              bitcoinde              bigquery")
-      exd[:sl].sort.each { |k, v| puts(fos(k, v)) }
+      ded[:sl].sort.each { |k, v| puts(fos(k, v)) }
       mtotais
 
       mtrades
@@ -45,9 +40,9 @@ module Cns
 
     # mosta contadores transacoes
     def mtotais
-      vtt = exd[:tt].count
+      vtt = ded[:tt].count
       vnt = bqd[:nt].count
-      vtl = exd[:tl].count
+      vtl = ded[:tl].count
       vnl = bqd[:nl].count
 
       puts("TRADES #{format('%<a>20i %<b>21i %<o>3.3s', a: vtt, b: vnt, o: vtt == vnt ? 'OK' : 'NOK')}")
@@ -105,7 +100,7 @@ module Cns
     def fol(hlx)
       format(
         '%<ky>6i %<dt>19.19s %<ty>-10.10s %<mo>-3.3s %<pr>19.8f %<vl>18.8f',
-        ky: hlx[:txid],
+        ky: hlx[:nxid],
         dt: hlx[:time].strftime('%F %T'),
         ty: hlx[:tp],
         mo: hlx[:moe],
@@ -114,6 +109,7 @@ module Cns
       )
     end
 
+    # @return [Boolean] mostra todas/novas transacoes
     def show_all?
       ops[:t] || false
     end
@@ -154,37 +150,42 @@ module Cns
     # @param [Array<Hash>] hlx ledger bitcoinde
     # @return [Array<Hash>] transaccao filtrada
     def pdel(hlx)
-      hlx.map { |t| pdes(:time, t).merge(qtd: (t[:tp] == 'withdrawal' ? -1 : 1) * t[:qt].to_d, nxid: t[:txid], fee: t[:fee].to_d, moe: t[:moe].upcase) }
+      hlx.map { |t| pdes(:time, t) }
+    end
+
+    # @return [Hash] dados exchange bitcoinde - saldos & trades & deposits & withdrawals
+    def ded
+      @ded ||= {sl: pdea(api.account_de), tt: pdet(api.trades_de), tl: pdel(api.deposits_de + api.withdrawals_de)}
     end
 
     # @return [Array<String>] indices trades bigquery
     def bqkyt
-      @bqkyt ||= show_all? ? [] : (bqd[:nt]&.map { |t| t[:txid] } || [])
+      @bqkyt ||= show_all? ? [] : bqd[:nt].map { |t| t[:txid] }
     end
 
     # @return [Array<Integer>] indices ledger bigquery
     def bqkyl
-      @bqkyl ||= show_all? ? [] : (bqd[:nl]&.map { |l| l[:txid] } || [])
+      @bqkyl ||= show_all? ? [] : bqd[:nl].map { |l| l[:txid] }
     end
 
     # @return [Array<String>] lista txid trades novos
     def kyt
-      @kyt ||= exd[:tt].map { |t| t[:trade_id] } - bqkyt
+      @kyt ||= ded[:tt].map { |t| t[:trade_id] } - bqkyt
     end
 
-    # @return [Array<Integer>] lista txid ledger novos
+    # @return [Array<Integer>] lista nxid ledger novos
     def kyl
-      @kyl ||= exd[:tl].map { |t| t[:txid] } - bqkyl
+      @kyl ||= ded[:tl].map { |t| t[:nxid] } - bqkyl
     end
 
-    # @return [Array<Hash>] lista trades bitcoinde novos
+    # @return [Array<Hash>] lista trades novos bitcoinde
     def novcdet
-      @novcdet ||= exd[:tt].select { |obj| kyt.include?(obj[:trade_id]) }
+      @novcdet ||= ded[:tt].select { |o| kyt.include?(o[:trade_id]) }
     end
 
-    # @return [Array<Hash>] lista ledger (deposits + withdrawals) bitcoinde novos
+    # @return [Array<Hash>] lista ledgers (deposits + withdrawals) novos bitcoinde
     def novcdel
-      @novcdel ||= exd[:tl].select { |obj| kyl.include?(obj[:txid]) }
+      @novcdel ||= ded[:tl].select { |o| kyl.include?(o[:nxid]) }
     end
   end
 end

data/lib/cns/etherscan.rb

@@ -84,22 +84,22 @@ module Cns
 
     # mosta transacoes novas
     def mtransacoes_novas
-      TT.each do |_, cfg|
-        ntx = send(cfg[:new])
+      TT.each do |_, c|
+        ntx = send(c[:new])
         next unless ops[:v] && ntx.any?
 
-        puts(cfg[:header])
-        ntx.sort_by { |s| -s[cfg[:sork]] }.each { |t| puts(send(cfg[:format], t)) }
+        puts(c[:header])
+        ntx.sort_by { |s| -s[c[:sork]] }.each { |t| puts(send(c[:format], t)) }
       end
     end
 
     # mostra configuration text for adjusting days
     def mconfiguracao_ajuste_dias
-      TT.each do |typ, cfg|
-        ntx = send(cfg[:new])
+      TT.each do |p, c|
+        ntx = send(c[:new])
         next unless ntx.any?
 
-        puts("\najuste dias transacoes #{typ}\n-h=#{ntx.sort_by { |s| -s[cfg[:sork]] }.map { |t| "#{t[cfg[:adjk]]}:0" }.join(' ')}")
+        puts("\najuste dias transacoes #{p}\n-h=#{ntx.sort_by { |s| -s[c[:sork]] }.map { |t| "#{t[c[:adjk]]}:0" }.join(' ')}")
       end
     end
 
@@ -226,44 +226,7 @@ module Cns
       format('%<bn>10i %<vi>9i %<dt>10.10s %<vl>10.6f', bn: hwx[:withdrawalIndex], vi: hwx[:validatorIndex], dt: hwx[:timeStamp].strftime('%F'), vl: hwx[:amount] / (10**9))
     end
 
-    # @param [Hash] abc account etherscan
-    # @return [Hash] dados etherscan - address, saldo & transacoes
-    def base_bc(abc)
-      acc = abc[:account].downcase
-      {
-        ax: acc,
-        sl: abc[:balance].to_d / (10**18),
-        tx: ftik(acc, api.norml_es(acc)),
-        ix: ftik(acc, api.inter_es(acc)),
-        px: fppp(acc, api.block_es(acc)),
-        wx: fwww(acc, api.withw_es(acc)),
-        kx: ftik(acc, api.token_es(acc))
-      }
-    end
-
-    # @param [Hash] wbq wallet bigquery
-    # @param [Hash] hbc dados etherscan - address, saldo & transacoes
-    # @return [Hash] dados juntos bigquery & etherscan
-    def bq_bc(wbq, hbc)
-      xbq = wbq[:ax]
-      {
-        id: wbq[:id],
-        ax: xbq,
-        bs: wbq[:sl],
-        bt: bqd[:nt].select { |ont| ont[:iax].casecmp?(xbq) },
-        bi: bqd[:ni].select { |oni| oni[:iax].casecmp?(xbq) },
-        bp: bqd[:np].select { |onp| onp[:iax].casecmp?(xbq) },
-        bw: bqd[:nw].select { |onw| onw[:iax].casecmp?(xbq) },
-        bk: bqd[:nk].select { |onk| onk[:iax].casecmp?(xbq) },
-        es: hbc[:sl],
-        et: hbc[:tx],
-        ei: hbc[:ix],
-        ep: hbc[:px],
-        ew: hbc[:wx],
-        ek: hbc[:kx]
-      }
-    end
-
+    # @return [Boolean] mostra todas/novas transacoes
     def show_all?
       ops[:t] || false
     end
@@ -296,94 +259,132 @@ module Cns
       ary.map { |o| o.merge(itx: Integer(o[:withdrawalIndex]), iax: add, amount: o[:amount].to_d, timeStamp: Time.at(Integer(o[:timestamp]))) }
     end
 
+    # @param [Hash] aes account etherscan
+    # @return [Hash] dados etherscan - address, saldo & transacoes
+    def bses(aes)
+      acc = aes[:account].downcase
+      {
+        ax: acc,
+        sl: aes[:balance].to_d / (10**18),
+        tx: ftik(acc, api.norml_es(acc)),
+        ix: ftik(acc, api.inter_es(acc)),
+        px: fppp(acc, api.block_es(acc)),
+        wx: fwww(acc, api.withw_es(acc)),
+        kx: ftik(acc, api.token_es(acc))
+      }
+    end
+
+    # @param [Hash] wbq wallet bigquery
+    # @param [Hash] hes dados etherscan - address, saldo & transacoes
+    # @return [Hash] dados juntos bigquery & etherscan
+    def bqes(wbq, hes)
+      xbq = wbq[:ax]
+      {
+        id: wbq[:id],
+        ax: xbq,
+        bs: wbq[:sl],
+        bt: bqd[:nt].select { |t| t[:iax].casecmp?(xbq) },
+        bi: bqd[:ni].select { |i| i[:iax].casecmp?(xbq) },
+        bp: bqd[:np].select { |p| p[:iax].casecmp?(xbq) },
+        bw: bqd[:nw].select { |w| w[:iax].casecmp?(xbq) },
+        bk: bqd[:nk].select { |k| k[:iax].casecmp?(xbq) },
+        es: hes[:sl],
+        et: hes[:tx],
+        ei: hes[:ix],
+        ep: hes[:px],
+        ew: hes[:wx],
+        ek: hes[:kx]
+      }
+    end
+
     # @return [Array<String>] lista enderecos
     def lax
       @lax ||= bqd[:wb].map { |o| o[:ax] }
     end
 
     # @return [Array<Hash>] todos os dados etherscan - saldos & transacoes
-    def bcd
-      @bcd ||= api.account_es(lax).map { |o| base_bc(o) }
+    def esd
+      @esd ||= api.account_es(lax).map { |o| bses(o) }
     end
 
     # @return [Array<Hash>] todos os dados juntos bigquery & etherscan
     def dados
-      @dados ||= bqd[:wb].map { |b| bq_bc(b, bcd.find { |e| b[:ax] == e[:ax] }) }
+      @dados ||= bqd[:wb].map { |b| bqes(b, esd.find { |e| b[:ax] == e[:ax] }) }
     end
 
     # @return [Array<Integer>] indices transacoes bigquery
     def bqidt
-      @bqidt ||= show_all? ? [] : (bqd[:nt]&.map { |i| i[:itx] } || [])
+      @bqidt ||= show_all? ? [] : bqd[:nt].map { |i| i[:itx] }
     end
 
     # @return [Array<Integer>] indices transacoes bigquery
     def bqidi
-      @bqidi ||= show_all? ? [] : (bqd[:ni]&.map { |i| i[:itx] } || [])
+      @bqidi ||= show_all? ? [] : bqd[:ni].map { |i| i[:itx] }
     end
 
     # @return [Array<Integer>] indices transacoes bigquery
     def bqidp
-      @bqidp ||= show_all? ? [] : (bqd[:np]&.map { |i| i[:itx] } || [])
+      @bqidp ||= show_all? ? [] : bqd[:np].map { |i| i[:itx] }
     end
 
     # @return [Array<Integer>] indices transacoes bigquery
     def bqidw
-      @bqidw ||= show_all? ? [] : (bqd[:nw]&.map { |i| i[:itx] } || [])
+      @bqidw ||= show_all? ? [] : bqd[:nw].map { |i| i[:itx] }
     end
 
     # @return [Array<Integer>] indices transacoes bigquery
     def bqidk
-      @bqidk ||= show_all? ? [] : (bqd[:nk]&.map { |i| i[:itx] } || [])
+      @bqidk ||= show_all? ? [] : bqd[:nk].map { |i| i[:itx] }
     end
 
     # @return [Array<Integer>] indices transacoes novas (etherscan - bigquery)
     def idt
-      @idt ||= bcd.map { |o| o[:tx].map { |i| i[:itx] } }.flatten - bqidt
+      @idt ||= esd.map { |o| o[:tx].map { |i| i[:itx] } }.flatten - bqidt
     end
 
     # @return [Array<Integer>] indices transacoes novas (etherscan - bigquery)
     def idi
-      @idi ||= bcd.map { |o| o[:ix].map { |i| i[:itx] } }.flatten - bqidi
+      @idi ||= esd.map { |o| o[:ix].map { |i| i[:itx] } }.flatten - bqidi
     end
 
     # @return [Array<Integer>] indices transacoes novas (etherscan - bigquery)
     def idp
-      @idp ||= bcd.map { |o| o[:px].map { |i| i[:itx] } }.flatten - bqidp
+      @idp ||= esd.map { |o| o[:px].map { |i| i[:itx] } }.flatten - bqidp
     end
 
     # @return [Array<Integer>] indices transacoes novas (etherscan - bigquery)
     def idw
-      @idw ||= bcd.map { |o| o[:wx].map { |i| i[:itx] } }.flatten - bqidw
+      @idw ||= esd.map { |o| o[:wx].map { |i| i[:itx] } }.flatten - bqidw
     end
 
     # @return [Array<Integer>] indices transacoes novas (etherscan - bigquery)
     def idk
-      @idk ||= bcd.map { |o| o[:kx].map { |i| i[:itx] } }.flatten - bqidk
+      @idk ||= esd.map { |o| o[:kx].map { |i| i[:itx] } }.flatten - bqidk
     end
 
     # @return [Array<Hash>] lista transacoes normais novas
     def novnetht
-      @novnetht ||= bcd.map { |o| o[:tx].select { |t| idt.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
+      @novnetht ||= esd.map { |o| o[:tx].select { |t| idt.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
     end
 
     # @return [Array<Hash>] lista transacoes internas novas
     def novnethi
-      @novnethi ||= bcd.map { |o| o[:ix].select { |t| idi.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
+      @novnethi ||= esd.map { |o| o[:ix].select { |t| idi.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
     end
 
     # @return [Array<Hash>] lista transacoes block novas
     def novnethp
-      @novnethp ||= bcd.map { |o| o[:px].select { |t| idp.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
+      @novnethp ||= esd.map { |o| o[:px].select { |t| idp.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
     end
 
     # @return [Array<Hash>] lista transacoes withdrawals novas
     def novnethw
-      @novnethw ||= bcd.map { |o| o[:wx].select { |t| idw.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
+      @novnethw ||= esd.map { |o| o[:wx].select { |t| idw.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
     end
 
     # @return [Array<Hash>] lista transacoes token novas
     def novnethk
-      @novnethk ||= bcd.map { |o| o[:kx].select { |t| idk.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
+      @novnethk ||= esd.map { |o| o[:kx].select { |t| idk.include?(t[:itx]) } }.flatten.uniq { |i| i[:itx] }
     end
   end
 end

data/lib/cns/greymass.rb

@@ -95,28 +95,7 @@ module Cns
       )
     end
 
-    # @param [Hash] wbq wallet bigquery
-    # @return [Hash] dados greymass - address, saldo & transacoes
-    def base_bc(wbq)
-      xbq = wbq[:ax]
-      {ax: xbq, sl: peosa(xbq).reduce(:+), tx: peost(xbq, api.ledger_gm(xbq))}
-    end
-
-    # @param wbq (see base_bc)
-    # @param [Hash] hbc dados greymass - address, saldo & transacoes
-    # @return [Hash] dados juntos bigquery & greymass
-    def bq_bc(wbq, hbc)
-      xbq = wbq[:ax]
-      {
-        id: wbq[:id],
-        ax: xbq,
-        bs: wbq[:sl],
-        bt: bqd[:nt].select { |o| o[:iax] == xbq },
-        es: hbc[:sl],
-        et: hbc[:tx]
-      }
-    end
-
+    # @return [Boolean] mostra todas/novas transacoes
     def show_all?
       ops[:t] || false
     end
@@ -133,11 +112,11 @@ module Cns
     # @param [Array<Hash>] ary lista transacoes
     # @return [Array<Hash>] lista transacoes filtrada
     def peost(add, ary)
-      ary.map do |omp|
-        act = omp[:action_trace][:act]
+      ary.map do |t|
+        act = t[:action_trace][:act]
         adt = act[:data]
         qtd = adt[:quantity].to_s
-        omp.merge(
+        t.merge(
           name: act[:name],
           from: adt[:from],
           quantity: qtd.to_d,
@@ -145,36 +124,58 @@ module Cns
           to: adt[:to],
           memo: String(adt[:memo]).gsub(/\p{C}/, ''), # remove Non-Printable Characters
           moe: qtd[/[[:upper:]]+/],
-          itx: omp[:global_action_seq],
+          itx: t[:global_action_seq],
           iax: add,
-          block_time: Time.parse(omp[:block_time])
+          block_time: Time.parse(t[:block_time])
         )
       end
     end
 
+    # @param [Hash] wbq wallet bigquery
+    # @return [Hash] dados greymass - address, saldo & transacoes
+    def bsgm(wbq)
+      xbq = wbq[:ax]
+      {ax: xbq, sl: peosa(xbq).reduce(:+), tx: peost(xbq, api.ledger_gm(xbq))}
+    end
+
+    # @param wbq (see bsgm)
+    # @param [Hash] hgm dados greymass - address, saldo & transacoes
+    # @return [Hash] dados juntos bigquery & greymass
+    def bqgm(wbq, hgm)
+      xbq = wbq[:ax]
+      {
+        id: wbq[:id],
+        ax: xbq,
+        bs: wbq[:sl],
+        bt: bqd[:nt].select { |o| o[:iax] == xbq },
+        es: hgm[:sl],
+        et: hgm[:tx]
+      }
+    end
+
     # @return [Array<Hash>] todos os dados greymass - saldos & transacoes
-    def bcd
-      @bcd ||= bqd[:wb].map { |o| base_bc(o) }
+    def gmd
+      @gmd ||= bqd[:wb].map { |o| bsgm(o) }
     end
 
     # @return [Array<Hash>] todos os dados juntos bigquery & greymass
     def dados
-      @dados ||= bqd[:wb].map { |b| bq_bc(b, bcd.find { |g| b[:ax] == g[:ax] }) }
+      @dados ||= bqd[:wb].map { |b| bqgm(b, gmd.find { |g| b[:ax] == g[:ax] }) }
     end
 
     # @return [Array<Integer>] indices transacoes bigquery
     def bqidt
-      @bqidt ||= show_all? ? [] : (bqd[:nt]&.map { |i| i[:itx] } || [])
+      @bqidt ||= show_all? ? [] : bqd[:nt].map { |i| i[:itx] }
     end
 
     # @return [Array<Integer>] indices transacoes novas (greymass - bigquery)
     def idt
-      @idt ||= bcd.map { |o| o[:tx].map { |i| i[:itx] } }.flatten - bqidt
+      @idt ||= gmd.map { |o| o[:tx].map { |i| i[:itx] } }.flatten - bqidt
     end
 
     # @return [Array<Hash>] lista transacoes novas
     def novneost
-      @novneost ||= bcd.map { |obc| obc[:tx].select { |o| idt.include?(o[:itx]) } }.flatten
+      @novneost ||= gmd.map { |t| t[:tx].select { |o| idt.include?(o[:itx]) } }.flatten.uniq { |i| i[:itx] }
     end
   end
 end

data/lib/cns/kraken.rb

@@ -23,31 +23,31 @@ module Cns
       @ops = pop.transform_keys(&:to_sym)
     end
 
-    # @return [Hash] dados exchange kraken - saldos & transacoes trades e ledger
-    def exd
-      @exd ||= {sl: pusa(api.account_us), kt: pust(api.trades_us), kl: pusl(api.ledger_us)}
-    end
-
-    # @return [String] texto saldos & transacoes & ajuste dias
+    # mosta resumo saldos & transacoes & ajuste dias
     def mresumo
       puts("\nKRAKEN\ntipo                 kraken              bigquery")
-      exd[:sl].sort.each { |key, val| puts(fos(key, val)) }
+      usd[:sl].sort.each { |key, val| puts(fos(key, val)) }
       mtotais
 
       mtrades
       mledger
       return if novcust.empty?
 
-      puts("\nstring ajuste dias dos trades\n-h=#{novcust.sort_by { |_, v| -v[:srx] }.map { |k, _v| "#{k}:0" }.join(' ')}")
+      puts("\nstring ajuste dias dos trades\n-h=#{novcust.sort_by { |i| -i[:srx] }.map { |o| "#{o[:txid]}:0" }.join(' ')}")
+    end
+
+    # @return [Hash] ledgers exchange kraken
+    def uskl
+      usd[:kl]
     end
 
     private
 
     # mosta contadores transacoes
     def mtotais
-      vkt = exd[:kt].count
+      vkt = usd[:kt].count
       vnt = bqd[:nt].count
-      vkl = exd[:kl].count
+      vkl = usd[:kl].count
       vnl = bqd[:nl].count
 
       puts("TRADES #{format('%<a>20i %<b>21i %<o>3.3s', a: vkt, b: vnt, o: vkt == vnt ? 'OK' : 'NOK')}")
@@ -59,7 +59,7 @@ module Cns
       return unless ops[:v] && novcust.any?
 
       puts("\ntrade  data       hora     tipo       par         preco     volume         custo")
-      novcust.sort_by { |_, v| -v[:srx] }.each { |k, t| puts(fot(k, t)) }
+      novcust.sort_by { |i| -i[:srx] }.each { |o| puts(fot(o)) }
     end
 
     # mosta transacoes ledger
@@ -67,14 +67,14 @@ module Cns
       return unless ops[:v] && novcusl.any?
 
       puts("\nledger data       hora     tipo       moeda        quantidade              custo")
-      novcusl.sort_by { |_, v| -v[:srx] }.each { |k, t| puts(fol(k, t)) }
+      novcusl.sort_by { |i| -i[:srx] }.each { |o| puts(fol(o)) }
     end
 
     # @param [String] moe codigo kraken da moeda
     # @param [BigDecimal] sal saldo kraken da moeda
     # @return [String] texto formatado saldos
     def fos(moe, sal)
-      vbq = bqd[:sl][moe.downcase.to_sym].to_d
+      vbq = (bqd[:sl]&.fetch(moe.downcase.to_sym, nil) || 0).to_d
       format(
         '%<mo>-5.5s %<kr>21.9f %<bq>21.9f %<ok>3.3s',
         mo: moe.upcase,
@@ -84,13 +84,12 @@ module Cns
       )
     end
 
-    # @param [Symbol] idx id da transacao
     # @param [Hash] htn trades kraken
     # @return [String] texto formatado trade
-    def fot(idx, htx)
+    def fot(htx)
       format(
         '%<ky>-6.6s %<dt>19.19s %<ty>-10.10s %<mo>-8.8s %<pr>8.2f %<vl>10.4f %<co>13.2f',
-        ky: idx,
+        ky: htx[:txid],
         dt: htx[:time].strftime('%F %T'),
         ty: "#{htx[:type]}/#{htx[:ordertype]}",
         mo: htx[:pair],
@@ -100,13 +99,12 @@ module Cns
       )
     end
 
-    # @param idx (see fot)
     # @param [Hash] hln ledger kraken
     # @return [String] texto formatado ledger
-    def fol(idx, hlx)
+    def fol(hlx)
       format(
         '%<ky>-6.6s %<dt>19.19s %<ty>-10.10s %<mo>-4.4s %<pr>18.7f %<vl>18.7f',
-        ky: idx,
+        ky: hlx[:txid],
         dt: hlx[:time].strftime('%F %T'),
         ty: hlx[:type],
         mo: hlx[:asset],
@@ -115,6 +113,7 @@ module Cns
       )
     end
 
+    # @return [Boolean] mostra todas/novas transacoes
     def show_all?
       ops[:t] || false
     end
@@ -125,55 +124,51 @@ module Cns
       itm.select { |k, _| EM.include?(k) }.transform_values { |v| v.to_d }
     end
 
-    # @param [Hash] itm transacao kraken
-    # @return [Hash] transaccao filtrada
-    def pusk(itm)
-      itm.map do |k, v|
-        t = Integer(v[:time])
-        [k, v.merge(txid: k.to_s, srx: t, time: Time.at(t))]
-      end.to_h
-    end
-
-    # @param [Hash] htx trade kraken
-    # @return [Hash] transaccao filtrada
+    # @param [Array<Hash>] htx trades kraken
+    # @return [Array<Hash>] transaccoes filtradas
     def pust(htx)
-      pusk(htx).transform_values { |t| t.merge(pair: t[:pair].upcase, price: t[:price].to_d, vol: t[:vol].to_d, cost: t[:cost].to_d) }
+      htx.map { |t| t.merge(pair: t[:pair].upcase, price: t[:price].to_d, vol: t[:vol].to_d, cost: t[:cost].to_d) }
     end
 
-    # @param [Hash] hlx ledger kraken
-    # @return [Hash] transaccao filtrada
+    # @param [Array<Hash>] hlx ledgers kraken
+    # @return [Array<Hash>] transaccoes filtradas
     def pusl(hlx)
-      pusk(hlx).transform_values { |t| t.merge(asset: t[:asset].upcase, amount: t[:amount].to_d, fee: t[:fee].to_d) }
+      hlx.map { |t| t.merge(asset: t[:asset].upcase, amount: t[:amount].to_d, fee: t[:fee].to_d) }
+    end
+
+    # @return [Hash] dados exchange kraken - saldos & transacoes trades e ledger
+    def usd
+      @usd ||= {sl: pusa(api.account_us), kt: pust(api.trades_us), kl: pusl(api.ledger_us)}
     end
 
-    # @return [Array<Symbol>] indices trades bigquery
+    # @return [Array<String>] indices trades bigquery
     def bqkyt
-      @bqkyt ||= show_all? ? [] : (bqd[:nt]&.map { |t| t[:txid].to_sym } || [])
+      @bqkyt ||= show_all? ? [] : bqd[:nt].map { |t| t[:txid] }
     end
 
-    # @return [Array<Symbol>] indices ledger bigquery
+    # @return [Array<String>] indices ledger bigquery
     def bqkyl
-      @bqkyl ||= show_all? ? [] : (bqd[:nl]&.map { |l| l[:txid].to_sym } || [])
+      @bqkyl ||= show_all? ? [] : bqd[:nl].map { |l| l[:txid] }
     end
 
-    # @return [Array<Symbol>] lista txid trades novos
+    # @return [Array<String>] lista txid trades novos
     def kyt
-      @kyt ||= exd[:kt].keys - bqkyt
+      @kyt ||= usd[:kt].map { |t| t[:txid] } - bqkyt
     end
 
-    # @return [Array<Symbol>] lista txid ledger novos
+    # @return [Array<String>] lista txid ledger novos
     def kyl
-      @kyl ||= exd[:kl].keys - bqkyl
+      @kyl ||= usd[:kl].map { |t| t[:txid] } - bqkyl
     end
 
-    # @return [Hash] trades kraken novos
+    # @return [Array<Hash>] trades novos kraken
     def novcust
-      @novcust ||= exd[:kt].slice(*kyt)
+      @novcust ||= usd[:kt].select { |o| kyt.include?(o[:txid]) }
     end
 
-    # @return [Hash] ledger kraken novos
+    # @return [Array<Hash>] ledgers novos kraken
     def novcusl
-      @novcusl ||= exd[:kl].slice(*kyl)
+      @novcusl ||= usd[:kl].select { |o| kyl.include?(o[:txid]) }
     end
   end
 end

data/lib/cns/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cns
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.5
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 bindir: exe
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler