cns 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a8560b33e2dde0b1567ad2f42c16bcc6b70c407dbb8e1e7c186a35cabcf9d0
-  data.tar.gz: 3f5aa10bbc0634d0efc4f5ca0a0af6fa8ad8731c1cd91bfe662cfd1e90f95b43
+  metadata.gz: 9662468bbf6e6a3b21b1a4326b2416e79887037ea77a7009876e0ac543529eb4
+  data.tar.gz: 4f303a99616e125a22145e8811c4a6a96de4de4e05b99d07851bfad08a9e737f
 SHA512:
-  metadata.gz: 3ca08a51425a7199bf02a38197d36968de326bef30a19548fa4676127fe447de37e83c8658031c1e676b41eb80f84d50de4a73e7e1d9033d87d022979f31fd05
-  data.tar.gz: c93acf84eeee10b576bde22ef34b210f93c54b3e87f787e64b7c927759d73130e79ee4e8b7cc209438a6a8a95514c95ef38bc49c35b096454f8ed92073255076
+  metadata.gz: 9e11db3bd04f6df2e7d2fb69c094d990887ed0be224a6f050a01bfea3e7b2e34a22a2b46e7b7403723b85f5e14ab80c3409a6dca2df941eb4258c78161acebe5
+  data.tar.gz: 857d01de778bb491a5f69481f20d4b3277aac83e95b6f2f9b5f65be7254a3510c09768e1a51dd4faef1acb1b6fae5355b13a3ed0b4e7221bc35ac557da6b5e61

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cns (2.0.7)
+    cns (2.0.8)
       curb
       faraday
       faraday-retry
@@ -12,15 +12,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     backport (1.2.0)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    benchmark (0.5.0)
+    bigdecimal (3.3.1)
     concurrent-ruby (1.3.5)
-    curb (1.1.0)
+    curb (1.2.2)
     declarative (0.0.20)
     diff-lcs (1.6.2)
     dry-configurable (1.3.0)
@@ -52,29 +52,31 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    faraday (2.13.4)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
+    faraday-follow_redirects (0.4.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
     faraday-retry (2.3.2)
       faraday (~> 2.0)
-    google-apis-bigquery_v2 (0.92.0)
+    google-apis-bigquery_v2 (0.96.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-core (0.18.0)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 1.9)
-      httpclient (>= 2.8.3, < 3.a)
-      mini_mime (~> 1.0)
-      mutex_m
+    google-apis-core (1.0.2)
+      addressable (~> 2.8, >= 2.8.7)
+      faraday (~> 2.13)
+      faraday-follow_redirects (~> 0.3)
+      googleauth (~> 1.14)
+      mini_mime (~> 1.1)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-    google-cloud-bigquery (1.52.1)
+      retriable (~> 3.1)
+    google-cloud-bigquery (1.61.1)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       google-apis-bigquery_v2 (~> 0.71)
-      google-apis-core (~> 0.13)
+      google-apis-core (>= 0.18, < 2)
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
@@ -86,19 +88,17 @@ GEM
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.5.0)
     google-logging-utils (0.2.0)
-    googleauth (1.14.0)
+    googleauth (1.16.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
-      jwt (>= 1.4, < 3.0)
+      jwt (>= 1.4, < 4.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    httpclient (2.9.0)
-      mutex_m
     jaro_winkler (1.6.1)
-    json (2.13.2)
-    jwt (2.10.2)
+    json (2.16.0)
+    jwt (3.1.2)
       base64
     kramdown (2.5.1)
       rexml (>= 3.3.9)
@@ -110,24 +110,23 @@ GEM
     memoist (0.16.2)
     mini_mime (1.1.5)
     multi_json (1.17.0)
-    mutex_m (0.3.0)
-    net-http (0.6.0)
-      uri
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    net-http (0.8.0)
+      uri (>= 0.11.1)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     observer (0.1.2)
     os (1.1.4)
     ostruct (0.6.3)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
-    public_suffix (6.0.2)
+    prism (1.6.0)
+    public_suffix (7.0.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (12.3.3)
-    rbs (3.9.4)
+    rbs (3.9.5)
       logger
     reek (6.5.0)
       dry-schema (~> 1.13)
@@ -135,7 +134,7 @@ GEM
       parser (~> 3.3.0)
       rainbow (>= 2.0, < 4.0)
       rexml (~> 3.1)
-    regexp_parser (2.11.0)
+    regexp_parser (2.11.3)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -143,8 +142,8 @@ GEM
     retriable (3.1.2)
     reverse_markdown (3.0.0)
       nokogiri
-    rexml (3.4.1)
-    rubocop (1.79.1)
+    rexml (3.4.4)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -152,22 +151,22 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
     ruby-progressbar (1.13.0)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
-    solargraph (0.56.0)
+    solargraph (0.57.0)
       backport (~> 1.2)
       benchmark (~> 0.4)
       bundler (~> 2.0)
@@ -180,22 +179,25 @@ GEM
       ostruct (~> 0.6)
       parser (~> 3.0)
       prism (~> 1.4)
-      rbs (~> 3.3)
+      rbs (>= 3.6.1, <= 4.0.0.dev.4)
       reverse_markdown (~> 3.0)
-      rubocop (~> 1.38)
+      rubocop (~> 1.76)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
+      yard-activesupport-concern (~> 0.0)
       yard-solargraph (~> 0.1)
     thor (1.4.0)
     tilt (2.6.1)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.1.1)
     yard (0.9.37)
+    yard-activesupport-concern (0.0.1)
+      yard (>= 0.8)
     yard-solargraph (0.1.0)
       yard (~> 0.9)
     zeitwerk (2.7.3)

data/lib/cns/apibc.rb

@@ -15,6 +15,7 @@ module Cns
       @escn = bccn('https://api.etherscan.io')
       @gmcn = bccn('https://eos.greymass.com')
       @esky = ENV.fetch('ETHERSCAN_API_KEY', nil)
+      @blks = {} # Cache to store block numbers so we don't ask API repeatedly
     end
 
     # Get account balances for multiple ETH addresses
@@ -34,16 +35,19 @@ module Cns
 
     # Get normal transactions for ETH address
     # @param [String] add endereco ETH
+    # @param [Integer] days (Optional) Fetch only last N days
     # @return [Array<Hash>] lista transacoes normais etherscan
-    def norml_es(add)
-      pag_es_req('txlist', add)
+    def norml_es(add, days: nil)
+      prm = days ? {startblock: start_block(days)} : {}
+      pag_es_req('txlist', add, prm)
     end
 
     # Get internal transactions for ETH address
     # @param (see norml_es)
     # @return [Array<Hash>] lista transacoes internas etherscan
-    def inter_es(add)
-      pag_es_req('txlistinternal', add)
+    def inter_es(add, days: nil)
+      prm = days ? {startblock: start_block(days)} : {}
+      pag_es_req('txlistinternal', add, prm)
     end
 
     # Get mined blocks for ETH address
@@ -56,15 +60,17 @@ module Cns
     # Get withdrawals for ETH address
     # @param (see norml_es)
     # @return [Array<Hash>] lista blocos etherscan
-    def withw_es(add)
-      pag_es_req('txsBeaconWithdrawal', add)
+    def withw_es(add, days: nil)
+      prm = days ? {startblock: start_block(days)} : {}
+      pag_es_req('txsBeaconWithdrawal', add, prm)
     end
 
     # Get token transfers for ETH address
     # @param (see norml_es)
     # @return [Array<Hash>] lista token transfer events etherscan
-    def token_es(add)
-      pag_es_req('tokentx', add)
+    def token_es(add, days: nil)
+      prm = days ? {startblock: start_block(days)} : {}
+      pag_es_req('tokentx', add, prm)
     end
 
     # Get EOS account information
@@ -96,6 +102,31 @@ module Cns
 
     private
 
+    # Calculate (and cache) the block number for N days ago
+    def start_block(days)
+      return 0 if days.nil?
+      return @blks[days] if @blks.key?(days)
+
+      res = block_req(Integer(Time.now - (days * 86_400)))
+      if res[:status] == '1'
+        blk = Integer(res[:result], 10)
+        @blks[days] = blk
+        blk
+      else
+        0
+      end
+    rescue StandardError
+      0
+    end
+
+    # New dedicated method for Block API calls
+    def block_req(timestamp)
+      prm = {chainid: 1, module: 'block', action: 'getblocknobytime', timestamp: timestamp, closest: 'after', apikey: @esky}
+      pjsn(@escn.get('/v2/api', prm))
+    rescue Faraday::Error
+      {status: '0'}
+    end
+
     # Make a request to the Etherscan API
     # @param [String] act API action name
     # @param [String] add Blockchain address

data/lib/cns/bigquery.rb

@@ -9,6 +9,7 @@ module Cns
   # classe para processar bigquery
   class Bigquery
     extend Memoist
+
     BD = 'hernanirvaz.coins'
     FO = File.expand_path("~/#{File.basename($PROGRAM_NAME)}.log")
     TB = {
@@ -79,7 +80,7 @@ module Cns
 
     # mostra situacao completa entre etherscan & bigquery
     def mseth
-      apies.mresumo_simples
+      apies.mresumo
     end
 
     # @return [String] texto inicial transacoes

data/lib/cns/etherscan.rb

@@ -8,6 +8,7 @@ module Cns
   # classe para processar transacoes do etherscan
   class Etherscan
     extend Memoist
+
     # @return [Array<Hash>] todos os dados bigquery
     # @return [Thor::CoreExt::HashWithIndifferentAccess] opcoes trabalho
     attr_reader :bqd, :ops
@@ -59,19 +60,9 @@ module Cns
       @ops = pop.transform_keys(&:to_sym)
     end
 
-    # mostra resumo carteiras & transacoes & ajuste dias
-    def mresumo_simples
-      return unless bqexd.any?
-
-      puts("\nid     address                                        etherscan      bigquery")
-      bqexd.each { |o| puts(focs(o)) }
-      mtransacoes_novas
-      mconfiguracao_ajuste_dias
-    end
-
     # mostra resumo carteiras & transacoes & ajuste dias (com contadores)
     def mresumo
-      return unless bqexd.any?
+      return if bqexd.none?
 
       puts("\nid     address      etherscan  tn ti tb tk   tw    bigquery  tn ti tb tk   tw")
       bqexd.each { |o| puts(foct(o)) }
@@ -95,26 +86,12 @@ module Cns
     def mconfiguracao_ajuste_dias
       TT.each do |p, c|
         ntx = send(c[:new])
-        next unless ntx.any?
+        next if ntx.none?
 
         puts("\najuste dias transacoes #{p}\n-h=#{ntx.sort_by { |s| -s[c[:sork]] }.map { |t| "#{t[c[:adjk]]}:0" }.join(' ')}")
       end
     end
 
-    # Format simple wallet summary
-    # @param [Hash] hjn dados juntos bigquery & etherscan
-    # @return [String] texto formatado duma carteira
-    def focs(hjn)
-      format(
-        '%<id>-6.6s %<address>-42.42s %<etherscan_value>13.6f %<bigquery_value>13.6f %<status>-3s',
-        id: hjn[:id],
-        address: hjn[:ax],
-        etherscan_value: hjn[:es],
-        bigquery_value: hjn[:bs],
-        status: ok?(hjn) ? 'OK' : 'NOK'
-      )
-    end
-
     # Format detailed wallet summary with counters
     # @param (see focs)
     # @return [String] texto formatado duma carteira (com contadores)
@@ -139,23 +116,11 @@ module Cns
       )
     end
 
-    # Check if wallet has new transactions
+    # Check if wallets saldo
     # @param (see focs)
-    # @return [Boolean] check saldo & contadores ipwtk
+    # @return [Boolean] check saldo
     def ok?(hjn)
-      oks?(hjn) && okipw?(hjn) && hjn[:bt].count == hjn[:et].count && hjn[:bk].count == hjn[:ek].count
-    end
-
-    # @param (see focs)
-    # @return [Boolean] check contadores ipw
-    def okipw?(hjn)
-      oks?(hjn) && hjn[:bi].count == hjn[:ei].count && hjn[:bp].count == hjn[:ep].count && hjn[:bw].count == hjn[:ew].count
-    end
-
-    # @param (see focs)
-    # @return [Boolean] carteira tem transacoes novas (sim=NOK, nao=OK)?
-    def oks?(hjn)
-      hjn[:es].round(6) == hjn[:bs].round(6)
+      hjn[:es].round(4) == hjn[:bs].round(4)
     end
 
     # @example ether address inicio..fim
@@ -249,6 +214,12 @@ module Cns
       ops[:t] || false
     end
 
+    # Numero dias para buscar transacoes
+    # @return [Integer] days in the past to get transacoes
+    def dias
+      ops&.[](:d)&.positive? ? ops[:d] : nil
+    end
+
     # Process timestamp
     # @param [Hash] htx transacao
     # @return [Hash] transaccao filtrada
@@ -288,14 +259,15 @@ module Cns
     # @return [Hash] dados etherscan - address, saldo & transacoes
     def esd(aes)
       acc = aes[:account].downcase
+      dys = dias
       {
         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))
+        tx: ftik(acc, api.norml_es(acc, days: dys)),
+        ix: ftik(acc, api.inter_es(acc, days: dys)),
+        px: fppp(acc, api.block_es(acc)), # block_es (mining) does not support time filtering
+        wx: fwww(acc, api.withw_es(acc, days: dys)),
+        kx: ftik(acc, api.token_es(acc, days: dys))
       }
     end
 

data/lib/cns/version.rb

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

data/lib/cns.rb

@@ -16,6 +16,7 @@ module Cns
     desc 'seth', 'mostra eth transacoes'
     option :v, type: :boolean, default: true, desc: 'mostra transacoes'
     option :t, type: :boolean, default: false, desc: 'mostra transacoes todas ou somente novas'
+    option :d, type: :numeric, default: 0, desc: 'dias para buscar transacoes etherscan, 0=todas'
     # mostra eth transacoes
     def seth
       Bigquery.new(options).mseth
@@ -23,6 +24,7 @@ module Cns
 
     desc 'weth', 'carrega transacoes eth no bigquery'
     option :h, type: :hash, default: {}, desc: 'configuracao ajuste reposicionamento temporal'
+    option :d, type: :numeric, default: 0, desc: 'dias para buscar transacoes etherscan, 0=todas'
     # carrega transacoes eth no bigquery
     def weth
       Bigquery.new(options).pweth
@@ -30,6 +32,7 @@ module Cns
 
     desc 'ceth', 'carrega transacoes eth no bigquery (cron)'
     option :h, type: :hash, default: {}, desc: 'configuracao ajuste reposicionamento temporal'
+    option :d, type: :numeric, default: 0, desc: 'dias para buscar transacoes etherscan, 0=todas'
     # carrega transacoes eth no bigquery (output to file)
     def ceth
       Bigquery.new(options).pceth
@@ -38,6 +41,7 @@ module Cns
     desc 'skrk', 'mostra kraken/eth transacoes'
     option :v, type: :boolean, default: true, desc: 'mostra transacoes'
     option :t, type: :boolean, default: false, desc: 'mostra transacoes todas ou somente novas'
+    option :d, type: :numeric, default: 0, desc: 'dias para buscar transacoes etherscan, 0=todas'
     # mostra kraken/eth transacoes
     def skrk
       Bigquery.new(options).mskrk
@@ -45,6 +49,7 @@ module Cns
 
     desc 'wkrk', 'carrega transacoes kraken/eth no bigquery'
     option :h, type: :hash, default: {}, desc: 'configuracao ajuste reposicionamento temporal'
+    option :d, type: :numeric, default: 0, desc: 'dias para buscar transacoes etherscan, 0=todas'
     # carrega transacoes kraken/eth no bigquery
     def wkrk
       Bigquery.new(options).pwkrk
@@ -52,6 +57,7 @@ module Cns
 
     desc 'work', 'carrega transacoes novas no bigquery'
     option :h, type: :hash, default: {}, desc: 'configuracao ajuste reposicionamento temporal'
+    option :d, type: :numeric, default: 0, desc: 'dias para buscar transacoes etherscan, 0=todas'
     # carrega transacoes novas no bigquery
     def work
       Bigquery.new(options).ptudo
@@ -60,6 +66,7 @@ module Cns
     desc 'show', 'mostra resumo transacoes'
     option :v, type: :boolean, default: true, desc: 'mostra transacoes'
     option :t, type: :boolean, default: false, desc: 'mostra transacoes todas ou somente novas'
+    option :d, type: :numeric, default: 0, desc: 'dias para buscar transacoes etherscan, 0=todas'
     # mostra resumo transacoes
     def show
       Bigquery.new(options).mtudo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cns
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Arquiva transactions etherscan/greymass/bitcoinde/kraken/paymium/therock
   no bigquery.