etht 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ca8ae2c29d35644a3d72e1ed819048020838736539e71023d5b81a0808875a5
-  data.tar.gz: c40d028004ed756b4805eed8e89a71e0a7efc35de52bee891ebe7c00bc358abd
+  metadata.gz: f5a76fade4364cb9ecc118fcfae181f13d84fe3e39ba85a6078e8974ab403652
+  data.tar.gz: 269e68983b59463ec5aaeb3e0179b28f79f6a43135e2401269c467e0d90a74c4
 SHA512:
-  metadata.gz: 005a56ce7e56e95fa9bcff843e9077a129f3492e5aa149a78d7f184307a88bc68e058004159fddeabd04c5b41eacec5eae405445a8d091b41dcdf9e5dd81f761
-  data.tar.gz: 5707e919d084a23f8115b3516db8a3979555decb1b682245fba6249f31a46166ee8047687eeb3390eec0a9c59f8f8c4aa7e75d4ed09acff2d2f4a9b936b1bae0
+  metadata.gz: 9f446bfb04b77cf6d7cfc366f12b564a6385837484d388121341dbb4fa26d36e07f30d3883871d8e7bbbe1a353a3ed838fa95a2aa5b1d15026a8fc099f6e8389
+  data.tar.gz: 65936552f2176a0706e417579fa6747a8c7fcc9937a23d1f83fca413c2a964c6e37ee58cfd1dd086e964367d723e0ce828a130e182043129c4cc84117227ae75

data/.rubocop.yml

@@ -0,0 +1,12 @@
+AllCops:
+  TargetRubyVersion: 2.7
+  EnabledByDefault: true
+
+Style/Copyright:
+    Enabled: false
+
+Lint/ConstantResolution:
+    Enabled: false
+
+Style/ConstantVisibility:
+    Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    etht (0.1.4)
+    etht (0.1.5)
       faraday
       google-cloud-bigquery
       json
@@ -47,7 +47,7 @@ GEM
       signet (~> 0.14)
     httpclient (2.8.3)
     json (2.3.1)
-    jwt (2.2.1)
+    jwt (2.2.2)
     memoist (0.16.2)
     mini_mime (1.0.2)
     multi_json (1.15.0)

data/README.md

@@ -1,26 +1,16 @@
 # Etht
 
-Arquiva eth-transactions no bigquery. Pode apagar movimentos existentes ja no bigquery.
+Arquiva eth-transactions no bigquery. Pode ajustar dias para reposicionamento temporal.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'etht'
-```
-
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
-
     $ gem install etht
 
 ## Usage
 
-TODO: Write usage instructions here
+    $ etht help [COMMAND]  # Describe available commands or one specific command
+    $ etht show            # mostra carteiras e dados bigquery & etherscan
+    $ etht work            # carrega dados novos do etherscan no bigquery
 
 ## Development
 
@@ -30,7 +20,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/etht. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/etht/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/etht. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/hernanirvaz/etht/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -39,4 +29,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Etht project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/etht/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Etht project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/hernanirvaz/etht/blob/master/CODE_OF_CONDUCT.md).

data/etht.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'lib/etht/version'
+require_relative('lib/etht/version')
 
 Gem::Specification.new do |spec|
   spec.name          = 'etht'
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['hernanirvaz@gmail.com']
 
   spec.summary     = 'Arquiva eth-transactions no bigquery.'
-  spec.description = spec.summary + ' Pode apagar movimentos existentes ja no bigquery.'
+  spec.description = "#{spec.summary} Pode ajustar dias para reposicionamento temporal."
 
   spec.homepage    = 'https://github.com/hernanirvaz/etht'
   spec.license = 'MIT'
@@ -20,19 +20,20 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
+  spec.files =
+    Dir.chdir(File.expand_path(__dir__)) do
+      `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency('bundler')
+  spec.add_development_dependency('rake')
 
-  spec.add_dependency 'faraday'
-  spec.add_dependency 'google-cloud-bigquery'
-  spec.add_dependency 'json'
-  spec.add_dependency 'thor'
-  spec.add_dependency 'yard'
+  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/etht.rb

@@ -1,36 +1,36 @@
 # frozen_string_literal: true
 
-require 'thor'
-require 'etht/bigquery'
-require 'etht/etherscan'
-require 'etht/version'
+require('thor')
+require('etht/bigquery')
+require('etht/carteiras')
+require('etht/etherscan')
+require('etht/formatar')
+require('etht/version')
 
 # @author Hernani Rodrigues Vaz
 module Etht
-  ID = `whoami`.chomp
-
-  class Error < StandardError; end
-  # class Exception < StandardError
-  class Exception < StandardError
-    def initialize(message)
-      super(message)
+  # classe para erros desta gem
+  class Erro < StandardError
+    # @return [StandardError] personalizacao dos erros
+    def initialize(msg)
+      super(msg)
     end
   end
 
-  # CLI para carregar etherscan comuns no bigquery
+  # classe para carregar/mostrar dados comuns bigquery & etherscan
   class CLI < Thor
-    desc 'work', 'carrega/apaga dados do etherscan'
-    option :e, type: :boolean, default: false, desc: 'apaga linha igual'
-    option :m, type: :boolean, default: false, desc: 'apaga linhas existencia multipla'
-    # processa etherscan
+    desc 'work', 'carrega transacoes novas no bigquery'
+    option :h, type: :hash, default: {}, desc: 'configuracao ajuste reposicionamento temporal'
+    # carrega transacoes novas no bigquery
     def work
-      Bigquery.new({ e: options[:e], m: options[:m], i: true }).processa_eth
+      Bigquery.new(options).processa
     end
 
-    desc 'show', 'mostra dados do etherscan'
-    # show etherscan
+    desc 'show', 'mostra carteiras e dados bigquery & etherscan'
+    option :v, type: :boolean, default: false, desc: 'mostra dados transacoes normais & token'
+    # mostra carteiras e dados bigquery & etherscan
     def show
-      Bigquery.new.processa_eth
+      Bigquery.new(options).carteiras.mostra
     end
 
     default_task :show

data/lib/etht/bigquery.rb

@@ -1,103 +1,153 @@
 # frozen_string_literal: true
 
-require 'google/cloud/bigquery'
+require('google/cloud/bigquery')
+require('bigdecimal/util')
 
 # @author Hernani Rodrigues Vaz
 module Etht
-  DF = '%Y-%m-%d'
-  DI = '%Y-%m-%d %H:%M:%S'
+  BD = 'hernanirvaz.coins'
 
-  # (see Bigquery)
+  # classe para processar etherscan & bigquery
   class Bigquery
     # @return [Google::Cloud::Bigquery] API bigquery
-    attr_reader :apibq
-    # @return [Etherscan::Api] API etherscan
-    attr_reader :apies
-
-    # @return [Array] row folha calculo em processamento
-    attr_reader :row
+    attr_reader :api
     # @return [Google::Cloud::Bigquery::QueryJob] job bigquery
     attr_reader :job
-    # @return (see sql_select)
-    attr_reader :sql
-
-    # @param [String] csv folha calculo para processar
-    # @param [Hash<Symbol, Boolean>] ops opcoes trabalho com linhas
-    # @option ops [Boolean] :e (false) apaga linha igual?
-    # @option ops [Boolean] :m (false) apaga linhas existencia multipla?
-    # @option ops [Boolean] :i (false) insere linha nova?
-    # @return [Bigquery] acesso folhas calculo bloks.io & correspondente bigquery dataset
-    def initialize(ops = { e: false, m: false, i: false })
+    # @return [Thor::CoreExt::HashWithIndifferentAccess] opcoes trabalho
+    attr_reader :ops
+
+    # @param [Thor::CoreExt::HashWithIndifferentAccess] pop opcoes trabalho
+    # @option pop [Hash] :h ({}) configuracao ajuste reposicionamento temporal
+    # @option pop [Boolean] :v (false) mostra dados transacoes normais & token?
+    # @return [Bigquery] API bigquery & API etherscan
+    def initialize(pop)
       # usa env GOOGLE_APPLICATION_CREDENTIALS para obter credentials
       # @see https://cloud.google.com/bigquery/docs/authentication/getting-started
-      @apibq = Google::Cloud::Bigquery.new
-      @apies = Etht::Accounts.new
-      @linha = ops
+      @api = Google::Cloud::Bigquery.new
+      @ops = pop
     end
 
-    def processa_eth
-      contract_address = '0xfc325129a11fab241287e42a9f04a74f14077b77'
-      p apies.normal_transactions(contract_address)
+    # @return [Carteiras] API etherscan - processar transacoes normais e tokens
+    def carteiras
+      @carteiras ||= Carteiras.new(
+        {
+          wb: sql("select * from #{BD}.walletEth order by 2")
+                   .map { |e| { id: e[:id], ax: e[:address], sl: e[:saldo].to_d.round(10) } },
+          nt: sql("select blocknumber,iax from #{BD}.ethtx"),
+          nk: sql("select blocknumber,iax from #{BD}.ethkx")
+        },
+        ops
+      )
     end
 
-    # cria job bigquery & verifica execucao
-    #
-    # @param [String] sql a executar
-    # @return [Boolean] job ok?
-    def job_bigquery?(sql)
-      @job = apibq.query_job(sql)
-      @job.wait_until_done!
-      puts @job.error['message'] if @job.failed?
-      @job.failed?
+    # insere transacoes novas nas tabelas etht, ethk
+    def processa
+      puts(format("%<n>2i LINHAS INSERIDAS #{BD}.etht", n: carteiras.novaest.count.positive? ? dml(etht_ins) : 0))
+      puts(format("%<n>2i LINHAS INSERIDAS #{BD}.ethk", n: carteiras.novaesk.count.positive? ? dml(ethk_ins) : 0))
     end
 
-    # cria Data Manipulation Language (DML) job bigquery
-    #
-    # @param (see job_bigquery?)
-    # @return [Integer] numero linhas afetadas
-    def dml(sql)
-      job_bigquery?(sql) ? 0 : job.num_dml_affected_rows
+    # @return [String] comando insert SQL formatado bigquery.etht
+    def etht_ins
+      "insert #{BD}.etht(blocknumber,timestamp,txhash,nonce,blockhash,transactionindex,axfrom,axto,value,gas," \
+      'gasprice,iserror,txreceipt_status,input,contractaddress,cumulativegasused,gasused,confirmations,dias' \
+      ") VALUES(#{carteiras.novaest.map { |e| etht_val1(e) }.join(',')})"
     end
 
-    # pesquisa existencia linha folha calculo no bigquery
-    #
-    # @return [Google::Cloud::Bigquery::Data] resultado do sql num array<hash>
-    def sql_select
-      # array.count  = 0 ==> pode carregar esta linha
-      # array.count >= 1 ==> nao carregar esta linha
-      @sql = job_bigquery?('select ' + eos_fields + ' ' + sql_where) ? [{}, {}] : job.data
+    # @return [String] valores formatados bigquery.etht parte1
+    def etht_val1(hes)
+      "#{Integer(hes['blockNumber'])}," \
+      "#{Integer(hes['timeStamp'])}," \
+      "'#{hes['hash']}'," \
+      "#{Integer(hes['nonce'])}," \
+      "'#{hes['blockHash']}'," \
+      "#{Integer(hes['transactionIndex'])}," \
+      "'#{hes['from']}'," \
+      "'#{hes['to']}'," \
+      "#{etht_val2(hes)}"
+    end
+
+    # @return [String] valores formatados bigquery.etht parte2
+    def etht_val2(hes)
+      "cast('#{hes['value']}' as numeric)," \
+      "cast('#{hes['gas']}' as numeric)," \
+      "cast('#{hes['gasPrice']}' as numeric)," \
+      "#{Integer(hes['isError'])}," \
+      "#{hes['txreceipt_status'].length.zero? ? 'null' : hes['txreceipt_status']}," \
+      "#{hes['input'].length.zero? ? 'null' : "'#{hes['input']}'"}," \
+      "#{etht_val3(hes)}"
     end
 
-    # @return [String] parte sql para processamento linhas existentes
-    def sql_where
-      "from hernanirvaz.coins.eos where blocknumber=#{row[0]}"
+    # @return [String] valores formatados bigquery.etht parte3
+    def etht_val3(hes)
+      "#{hes['contractAddress'].length.zero? ? 'null' : "'#{hes['contractAddress']}'"}," \
+      "0,cast('#{hes['gasUsed']}' as numeric),0," \
+      "#{Integer(ops[:h][hes['blockNumber']] || 0)}"
     end
 
-    # @return [Integer] numero linhas inseridas
-    def sql_insert
-      return 1 unless linha[:i]
+    # @return [String] comando insert SQL formatado bigquery.ethk
+    def ethk_ins
+      "insert #{BD}.ethk(blocknumber,timestamp,txhash,nonce,blockhash,axfrom,contractaddress,axto,value,tokenname," \
+      'tokensymbol,tokendecimal,transactionindex,gas,gasprice,gasused,cumulativegasused,input,confirmations,dias' \
+      ") VALUES(#{carteiras.novaesk.map { |e| ethk_val1(e) }.join(',')})"
+    end
+
+    # @return [String] valores formatados bigquery.ethk parte1
+    def ethk_val1(hes)
+      "#{Integer(hes['blockNumber'])}," \
+      "#{Integer(hes['timeStamp'])}," \
+      "'#{hes['hash']}'," \
+      "#{Integer(hes['nonce'])}," \
+      "'#{hes['blockHash']}'," \
+      "'#{hes['from']}'," \
+      "#{ethk_val2(hes)}"
+    end
 
-      dml('insert hernanirvaz.coins.eos(' + eos_fields + ') VALUES(' + str_insert1)
+    # @return [String] valores formatados bigquery.ethk parte2
+    def ethk_val2(hes)
+      "#{hes['contractAddress'].length.zero? ? 'null' : "'#{hes['contractAddress']}'"}," \
+      "'#{hes['to']}'," \
+      "cast('#{hes['value']}' as numeric)," \
+      "'#{hes['tokenName']}'," \
+      "'#{hes['tokenSymbol']}'," \
+      "#{Integer(hes['tokenDecimal'])}," \
+      "#{Integer(hes['transactionIndex'])}," \
+      "#{ethk_val3(hes)}"
     end
 
-    # @return [String] campos da tabela no bigquery
-    def eos_fields
-      'blocknumber,time,contract,action,acfrom,acto,amount,symbol,memo,data,dias'
+    # @return [String] valores formatados bigquery.ethk parte3
+    def ethk_val3(hes)
+      "cast('#{hes['gas']}' as numeric)," \
+      "cast('#{hes['gasPrice']}' as numeric)," \
+      "cast('#{hes['gasUsed']}' as numeric),0," \
+      "#{hes['input'].length.zero? ? 'null' : "'#{hes['input']}'"},0," \
+      "#{Integer(ops[:h][hes['blockNumber']] || 0)}"
     end
 
-    # @return [String] campos insert da linha bigquery
-    def str_insert1
-      "#{row[0]},'#{DateTime.parse(row[1]).strftime(DI)}','#{row[2]}'," + str_insert2
+    # cria job bigquery & verifica execucao
+    #
+    # @param [String] sql a executar
+    # @return [Boolean] job ok?
+    def job?(sql)
+      @job = api.query_job(sql)
+      @job.wait_until_done!
+      puts(@job.error['message']) if @job.failed?
+      @job.failed?
     end
 
-    # @return [String] campos insert da linha bigquery
-    def str_insert2
-      "'#{row[3]}','#{row[4]}','#{row[5]}',#{row[6].to_f},'#{row[7]}','#{row[8]}','#{row[9]}',0)"
+    # cria Data Manipulation Language (DML) job bigquery
+    #
+    # @param (see job?)
+    # @return [Integer] numero linhas afetadas
+    def dml(sql)
+      job?(sql) ? 0 : job.num_dml_affected_rows
     end
 
-    # @return [Integer] numero linhas apagadas
-    def sql_delete
-      dml('delete ' + sql_where)
+    # cria Structured Query Language (SQL) job bigquery
+    #
+    # @param (see job?)
+    # @return [Array<Hash>] resultados do SQL
+    def sql(sql)
+      job?(sql) ? [] : job.data
     end
   end
 end

data/lib/etht/carteiras.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require('bigdecimal/util')
+
+# @author Hernani Rodrigues Vaz
+module Etht
+  # classe para processar carteiras & transacoes normais e tokens
+  class Carteiras
+    # @return [Etherscan] API etherscan
+    attr_reader :api
+    # @return [Array<Hash>] todos os dados bigquery
+    attr_reader :dbq
+    # @return [Thor::CoreExt::HashWithIndifferentAccess] opcoes trabalho
+    attr_reader :ops
+
+    # @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 & tokens?
+    # @return [Carteiras] API etherscan - processar transacoes normais e tokens
+    def initialize(dad, pop)
+      @api = Etherscan.new
+      @dbq = dad
+      @ops = pop
+    end
+
+    # @return [Array<Hash>] todos os dados etherscan - saldos & transacoes
+    def dadoses
+      @dadoses ||= api.multi_address_balance(dbq[:wb].map { |c| c[:ax] }).map { |e| base_etherscan(e) }
+    end
+
+    # @return [Array<Integer>] lista blocknumbers novos de transacoes normais
+    def novobnt
+      @novobnt ||= (dadoses.map { |e| e[:tx].map { |n| Integer(n['blockNumber']) } }.flatten -
+                    dbq[:nt].map { |t| t[:blocknumber] }).uniq
+    end
+
+    # @return [Array<Integer>] lista blocknumbers novos de transacoes token
+    def novobnk
+      @novobnk ||= (dadoses.map { |e| e[:kx].map { |n| Integer(n['blockNumber']) } }.flatten -
+                    dbq[:nk].map { |t| t[:blocknumber] }).uniq
+    end
+
+    # @return [Array<Hash>] lista transacoes normais novas
+    def novaest
+      @novaest ||= dadoses.map { |e| e[:tx].select { |s| novobnt.include?(Integer(s['blockNumber'])) } }.flatten.uniq
+    end
+
+    # @return [Array<Hash>] lista transacoes tokan novas
+    def novaesk
+      @novaesk ||= dadoses.map { |e| e[:kx].select { |s| novobnk.include?(Integer(s['blockNumber'])) } }.flatten.uniq
+    end
+
+    # @return [Array<Hash>] totdos dados juntos bigquery & etherscan
+    def dadosjn
+      @dadosjn ||= dbq[:wb].map { |b| bigquery_etherscan(b, dadoses.select { |s| b[:ax] == s[:ax] }.first) }
+    end
+
+    # @return [Array<Hash>] lista ordenada transacoes normais novas
+    def sortest
+      novaest.sort { |a, b| Integer(a['blockNumber']) <=> Integer(b['blockNumber']) }
+    end
+
+    # @return [Array<Hash>] lista ordenada transacoes tokan novas
+    def sortesk
+      novaesk.sort { |a, b| Integer(a['blockNumber']) <=> Integer(b['blockNumber']) }
+    end
+
+    # @return [Array<Hash>] lista ordenada transacoes normais & tokan novas
+    def totalha
+      (novaest + novaesk).sort { |a, b| Integer(a['blockNumber']) <=> Integer(b['blockNumber']) }
+    end
+
+    # @param [Hash] hes dados etherscan
+    # @return [Hash] dados etherscan - address, saldo & transacoes
+    def base_etherscan(hes)
+      {
+        ax: hes['account'],
+        sl: (hes['balance'].to_d / 10**18).round(10),
+        tx: etherscan_tx(hes['account']),
+        kx: etherscan_kx(hes['account'])
+      }
+    end
+
+    # @param [Hash] hbq dados bigquery
+    # @param [Hash] hes dados etherscan
+    # @return [Hash] dados juntos bigquery & etherscan
+    def bigquery_etherscan(hbq, hes)
+      {
+        id: hbq[:id],
+        ax: hbq[:ax],
+        bs: hbq[:sl],
+        bt: dbq[:nt].select { |t| t[:iax] == hbq[:ax] },
+        bk: dbq[:nk].select { |t| t[:iax] == hbq[:ax] },
+        es: hes[:sl],
+        et: hes[:tx],
+        ek: hes[:kx]
+      }
+    end
+
+    # @param [String] add endereco da carteira
+    # @return [Array<Hash>] lista transacoes normais ligadas a uma carteira - sem elementos irrelevantes
+    def etherscan_tx(add)
+      api.normal_tx(add).map do |e|
+        e.delete('cumulativeGasUsed')
+        e.delete('confirmations')
+        e
+      end
+    end
+
+    # @param (see etherscan_tx)
+    # @return [Array<Hash>] lista transacoes token ligadas a uma carteira - sem elementos irrelevantes
+    def etherscan_kx(add)
+      api.token_tx(add).map do |e|
+        e.delete('cumulativeGasUsed')
+        e.delete('confirmations')
+        e
+      end
+    end
+
+    # @return [Boolean] carteira tem transacoes novas(sim=NOK, nao=OK)?
+    def ok?(hjn)
+      hjn[:bs] == hjn[:es] && hjn[:bt].count == hjn[:et].count && hjn[:bk].count == hjn[:ek].count
+    end
+  end
+end

data/lib/etht/etherscan.rb

@@ -1,177 +1,129 @@
 # frozen_string_literal: true
 
-require 'faraday'
-require 'json'
+require('faraday')
+require('json')
 
 # @author Hernani Rodrigues Vaz
 module Etht
-  # class Config
-  class Config
-    attr_accessor :key, :secret, :url, :raise_exceptions
-    attr_writer :logger
+  # classe para tratar pedidos etherscan com chave API
+  class Etherscan
+    attr_reader :key, :url
 
-    def logger
-      @logger ||= Logger.new(STDERR)
-    end
-  end
-
-  # class Api
-  class Api
-    attr_reader :connection
-
-    def initialize(params = {})
-      @connection = Etht::Client.new(params)
+    # @param [String] :key apikey a juntar aos pedidos HTTP url:
+    # @param [String] :url base URL to use as a prefix for all requests
+    # @return [Etherscan] API etherscan base
+    def initialize(key: ENV['ETHERSCAN_API_KEY'], url: 'https://api.etherscan.io/')
+      @key = key
+      @url = url
     end
 
-    def get(params)
-      response = connection.get(params)
-      response['result']
+    # @return [<Symbol>] adapter for the connection - default :net_http
+    def adapter
+      @adapter ||= Faraday.default_adapter
     end
-  end
 
-  # class Client
-  class Client
-    URL     = 'https://api.etherscan.io/'
-    HEADERS = { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }.freeze
-
-    attr_reader :key, :url, :user_agent, :headers, :raise_exceptions
-    attr_writer :adapter, :conn
-
-    def initialize(params = {})
-      @key        = params.fetch(:key, Etht.config.key)
-      @url        = params.fetch(:url, Etht.config.url || URL)
-      @adapter    = params.fetch(:adapter, adapter)
-      @conn       = params.fetch(:conn, conn)
-      @user_agent = params.fetch(:user_agent, "etherscan/#{Etht::VERSION};ruby")
-      @headers    = HEADERS.merge('User-Agent' => @user_agent)
-      @raise_exceptions = params.fetch(:raise_exceptions, Etht.config.raise_exceptions || true)
-      yield self if block_given?
+    # manage the default properties and the middleware stack for fulfilling an HTTP request
+    #
+    # @return [<Faraday::Connection>] connection object with an URL & adapter
+    def conn
+      @conn ||=
+        Faraday.new(url: url) do |c|
+          c.request(:url_encoded)
+          c.adapter(adapter)
+        end
     end
 
-    def get(params = {})
-      endpoint = 'api'
-      merged_params = params.merge({ apikey: key })
-      response = conn.get(endpoint) do |req|
-        req.headers = headers
-        req.params  = merged_params
-      end
-      raise Etht::Exception, response if raise_exceptions? && response.status != 200
+    # @return [<Hash>] resultado json do GET HTTP request
+    def get(**ars)
+      r =
+        conn.get('api') do |o|
+          o.headers = { content_type: 'application/json', accept: 'application/json', user_agent: 'etherscan;ruby' }
+          o.params = ars.merge({ apikey: key })
+        end
+      raise(Etht::Erro, r) if r.status != 200
 
-      JSON(response.body)
+      JSON(r.body)['result']
     end
 
-    def conn
-      @conn ||= Faraday.new(url: @url) do |conn|
-        conn.request :url_encoded
-        conn.adapter adapter
-      end
-    end
+    # get ether balance for a single address
+    #
+    # @param [String] add address for balance
+    # @return [<String>] devolve saldo
+    def address_balance(add)
+      raise(Etht::Erro, 'address must be defined') if add.nil?
 
-    def adapter
-      @adapter ||= Faraday.default_adapter
+      get(module: 'account', action: 'balance', address: add, tag: 'latest')
     end
 
-    def raise_exceptions?
-      @raise_exceptions
-    end
-  end
+    # get ether balance for multiple addresses
+    #
+    # @param [String] ads lista de addresses (max 20)
+    # @return [Array<Hash>] devolve lista com contas & saldo
+    def multi_address_balance(ads)
+      raise(Etht::Erro, 'up to 20 accounts in a single batch') if ads.size > 20
 
-  # class Accounts < Etht::Api
-  class Accounts < Api
-    def address_balance(address)
-      params = {
-        module: 'account', action: 'balance',
-        address: address, tag: 'latest'
-      }
-      get(params)
+      get(module: 'account', action: 'balancemulti', address: ads.join(','), tag: 'latest')
     end
 
-    def multi_address_balance(addresses)
-      raise Etht::Exception, 'up to 20 accounts in a single batch' if addresses.size > 20
+    # get ERC20-token account balance
+    #
+    # @param add (see address_balance)
+    # @param [String] cdd token contract address
+    # @return (see address_balance)
+    def token_balance(add, cdd)
+      raise(Etht::Erro, 'contract or address must be defined') if (cdd || add).nil?
 
-      params = {
-        module: 'account', action: 'balancemulti',
-        address: addresses.join(','), tag: 'latest'
-      }
-      get(params)
+      get(module: 'account', action: 'tokenbalance', address: add, contractaddress: cdd)
     end
 
-    # Get a list of 'Normal' Transactions By Address
-    # if page is not defined Returns up to 10000 last transactions
-    # Available args: start_block, end_block, sort, page, offset
-    # @param sort 'asc' -> ascending order, 'des' -> descending order
-    # @param start_block starting blockNo to retrieve results
-    # @param end_block ending blockNo to retrieve results
-    # @param page Paginated result <page number>
-    # @param offset max records to return
-    def normal_transactions(address, args = {})
-      action = 'txlist'
-      transcations(action, address, nil, args)
-    end
+    # get a list of normal transactions by address
+    #
+    # @param [String] add address for transactions
+    # @param [Hash] ars opcoes trabalho
+    # @option ars [String] :start_block starting blockNo to retrieve results
+    # @option ars [String] :end_block ending blockNo to retrieve results
+    # @option ars [String] :sort asc -> ascending order, desc -> descending order
+    # @option ars [String] :page to get paginated results
+    # @option ars [String] :offset max records to return
+    # @return [Array<Hash>] devolve ate max 10000 das ultimas transacoes
+    def normal_tx(add, **ars)
+      raise(Etht::Erro, 'address must be defined') if add.nil?
 
-    # Get a list of 'Internal' Transactions By Address
-    # Available args: start_block, end_block, sort, page, offset
-    def internal_transactions(address, args = {})
-      action = 'txlistinternal'
-      transcations(action, address, nil, args)
+      transcations('txlist', add, nil, **ars)
     end
 
-    # Get a list of "ERC20 - Token Transfer Events"
-    # @param contract_address Token address (set nil to get a list of all ERC20 transactions)
-    # @param address Address for ERC20 transactions (optional)
-    # Available args: start_block, end_block, sort, page, offset
-    def token_transactions(contract_address, address = nil, args = {})
-      raise Etht::Exception, 'contract or address must be defined' if (contract_address || address).nil?
+    # get a list of ERC20 - token transfer events
+    #
+    # @param add (see normal_tx)
+    # @param [String] cdd token address (nil to get a list of all ERC20 transactions)
+    # @param ars (see normal_tx)
+    # @option ars (see normal_tx)
+    # @return (see normal_tx)
+    def token_tx(add, cdd = nil, **ars)
+      raise(Etht::Erro, 'contract or address must be defined') if (cdd || add).nil?
 
-      action = 'tokentx'
-      transcations(action, address, contract_address, args)
+      transcations('tokentx', add, cdd, **ars)
     end
 
     private
 
-    def transcations(action, address, contract_address, args)
-      params = {
-        module: 'account', action: action,
-        address: address, contractaddress: contract_address,
-        startblock: args[:start_block], endblock: args[:end_block],
-        page: args[:page], offset: args[:offset], sort: args[:sort]
-      }.reject { |_, v| v.nil? }
-      get(params)
-    end
-  end
-
-  # class Tokens < Etht::Api
-  class Tokens < Api
-    def total_supply(contract_address)
-      params = {
-        module: 'stats', action: 'tokensupply',
-        contractaddress: contract_address
-      }
-      get(params)
+    # get a list of transactions
+    #
+    # @param [String] act accao a executar
+    # @param add (see normal_tx)
+    # @param cdd (see token_tx)
+    # @param ars (see normal_tx)
+    # @option ars (see normal_tx)
+    # @return (see normal_tx)
+    def transcations(act, add, cdd, **ars)
+      get(**{ module: 'account', action: act, address: add }.merge({
+        contractaddress: cdd,
+        startblock: ars[:start_block],
+        endblock: ars[:end_block],
+        page: ars[:page],
+        offset: ars[:offset],
+        sort: ars[:sort]
+      }.reject { |_, v| v.nil? }))
     end
-
-    def balance(address, contract_address)
-      params = {
-        module: 'account', action: 'tokenbalance',
-        address: address, contractaddress: contract_address
-      }
-      get(params)
-    end
-  end
-
-  def self.configure
-    yield config
-  end
-
-  def self.config
-    @config ||= Config.new
-  end
-
-  def self.logger
-    config.logger
-  end
-
-  configure do |config|
-    config.key = ENV['ETHERSCAN_API_KEY']
   end
 end

data/lib/etht/formatar.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# @author Hernani Rodrigues Vaz
+module Etht
+  # (see Carteiras)
+  class Carteiras
+    # @return [String] texto formatado valores duma carteira
+    def valores(hjn)
+      format(
+        '%<v1>10.6f %<n1>2i %<n3>2i %<v2>11.6f %<n2>2i %<n4>2i %<ok>-3s',
+        v1: hjn[:bs],
+        n1: hjn[:bt].count,
+        n3: hjn[:bk].count,
+        v2: hjn[:es],
+        n2: hjn[:et].count,
+        n4: hjn[:ek].count,
+        ok: ok?(hjn) ? 'OK' : 'NOK'
+      )
+    end
+
+    # @return [String] texto formatado transacao normal
+    def formata_tx(htx)
+      format(
+        '%<bn>9i %<fr>-20.20s %<to>-20.20s %<dt>10.10s %<vl>17.6f',
+        bn: htx['blockNumber'],
+        fr: ftx(htx['from'], 20),
+        to: ftx(htx['to'], 20),
+        dt: Time.at(Integer(htx['timeStamp'])),
+        vl: (htx['value'].to_d / 10**18).round(10)
+      )
+    end
+
+    # @return [String] texto formatado transacao token
+    def formata_kx(hkx)
+      format(
+        '%<bn>9i %<fr>-20.20s %<to>-20.20s %<dt>10.10s %<vl>11.3f %<sy>-5.5s',
+        bn: hkx['blockNumber'],
+        fr: ftx(hkx['from'], 20),
+        to: ftx(hkx['to'], 20),
+        dt: Time.at(Integer(hkx['timeStamp'])),
+        vl: (hkx['value'].to_d / 10**18).round(10),
+        sy: hkx['tokenSymbol']
+      )
+    end
+
+    # @return [String] texto lista carteiras & lista transacoes & ajuste dias
+    def mostra
+      return unless dadosjn.count.positive?
+
+      puts("\nid     address                            ----bigquery---- ----etherscan----")
+      dadosjn.each { |e| puts format('%<s1>-6.6s %<s2>-34.34s ', s1: e[:id], s2: ftx(e[:ax], 34)) + valores(e) }
+      mostra_tx
+      mostra_kx
+      mostra_ha
+    end
+
+    # @example ether address inicio..fim
+    #  0x10f3a0cf0b534c..c033cf32e8a03586
+    # @param [String] add ether address
+    # @param [Integer] max chars a mostrar
+    # @return [String] ether address formatada
+    def ftx(add, max)
+      i = Integer((max - 2) / 2)
+      max < 7 ? 'erro' : "#{add[0, i]}..#{add[-i..]}"
+    end
+
+    # @return [String] lista transacoes normais
+    def mostra_tx
+      return unless novaest.count.positive? && ops[:v]
+
+      puts("\ntx normal address from         address to           ---data--- ------valor------")
+      sortest.each { |e| puts formata_tx(e) }
+    end
+
+    # @return [String] lista transacoes token
+    def mostra_kx
+      return unless novaesk.count.positive? && ops[:v]
+
+      puts("\ntx token  address from         address to           ---data--- ---valor--- token")
+      sortesk.each { |e| puts formata_kx(e) }
+    end
+
+    # @return [String] texto configuracao ajuste dias
+    def mostra_ha
+      return unless (novaest.count + novaesk.count).positive? && ops[:v]
+
+      puts("\nstring ajuste dias\n-h=#{totalha.map { |e| "#{e['blockNumber']}:0" }.join(' ')}")
+    end
+  end
+end

data/lib/etht/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Etht
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etht
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-09 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,8 +108,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Arquiva eth-transactions no bigquery. Pode apagar movimentos existentes
-  ja no bigquery.
+description: Arquiva eth-transactions no bigquery. Pode ajustar dias para reposicionamento
+  temporal.
 email:
 - hernanirvaz@gmail.com
 executables:
@@ -118,6 +118,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -130,7 +131,9 @@ files:
 - exe/etht
 - lib/etht.rb
 - lib/etht/bigquery.rb
+- lib/etht/carteiras.rb
 - lib/etht/etherscan.rb
+- lib/etht/formatar.rb
 - lib/etht/version.rb
 homepage: https://github.com/hernanirvaz/etht
 licenses: