cns 0.2.9 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 656f6faa698c986047e8b24bfffe02c7b32fda6d45457daa433ed6c569891fd6
-  data.tar.gz: 722b19cbd727d9ccac67f93c73973c02080cd944870b93826032dd7ed1bf31a8
+  metadata.gz: 9763844e7eaa6b17c7efa7cbbd05d051ea0ef68146e88ad03cdac9a548047fa7
+  data.tar.gz: 726d97291f8a8ebe6ff03856bc1785f3256501e8b8e2aca983e1291ecf266169
 SHA512:
-  metadata.gz: 6abbd6fea4de908090209bd0a9af059eed4747d1e6de35e79158073bebeaefccbe1ff2891cb1b384a6558efd5387a0449491b19626d19946f74aad70ed8c9e5f
-  data.tar.gz: 7b6156ebe6ec0e6339cb058b8715527aca5e627c74b491ac0f2ed2d6a088cbebb778cb008271d3f2a6131ed0e34bad420f5a8f426bed3554152625d7018859e9
+  metadata.gz: 5988e292e7025ae6f4afe71f2ebc301b8ff55f6a468da12de5ff07eca9046b4e7028d351cd05ed40f4acef84c1c854759cc08f6d9b054af1c547e114ada79c47
+  data.tar.gz: 3fef70b5adc4287a1276fe50e5e2dea05bd0ba79983c9b03963cb100ca040c5c616c7912bc7b9241cf1a7dd729f88a5830f6b45ba6f7744ec56c0a6bcf58f436

data/.rubocop.yml

@@ -1,6 +1,6 @@
 ---
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
   EnabledByDefault: true
 
 Style/Copyright:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cns (0.2.8)
+    cns (0.3.1)
       curb
       faraday
       google-cloud-bigquery
@@ -10,42 +10,32 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     backport (1.2.0)
-    benchmark (0.1.1)
-    concurrent-ruby (1.1.9)
-    curb (0.9.11)
+    benchmark (0.2.0)
+    concurrent-ruby (1.1.10)
+    curb (1.0.1)
     declarative (0.0.20)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     e2mmap (0.1.0)
-    faraday (1.4.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.6.0)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    google-apis-bigquery_v2 (0.13.0)
-      google-apis-core (~> 0.1)
-    google-apis-core (0.3.0)
+    faraday-net_http (3.0.1)
+    google-apis-bigquery_v2 (0.41.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-core (0.9.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.14)
-      httpclient (>= 2.8.1, < 3.0)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
+      retriable (>= 2.0, < 4.a)
       rexml
-      signet (~> 0.14)
       webrick
-    google-cloud-bigquery (1.32.0)
+    google-cloud-bigquery (1.39.0)
       concurrent-ruby (~> 1.0)
       google-apis-bigquery_v2 (~> 0.1)
       google-cloud-core (~> 1.6)
@@ -54,76 +44,78 @@ GEM
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
-    googleauth (0.16.2)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.0)
+    googleauth (1.2.0)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
+      signet (>= 0.16, < 2.a)
     httpclient (2.8.3)
     jaro_winkler (1.5.4)
-    jwt (2.2.3)
-    kramdown (2.3.1)
+    json (2.6.2)
+    jwt (2.5.0)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     kwalify (0.7.2)
     memoist (0.16.2)
-    mini_mime (1.1.0)
-    mini_portile2 (2.5.3)
+    mini_mime (1.1.2)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
-    os (1.1.1)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    os (1.1.4)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    psych (3.3.2)
-    public_suffix (4.0.6)
-    racc (1.5.2)
-    rainbow (3.0.0)
+    public_suffix (5.0.0)
+    racc (1.6.0)
+    rainbow (3.1.1)
     rake (12.3.3)
-    reek (6.0.4)
+    reek (6.1.1)
       kwalify (~> 0.7.0)
-      parser (~> 3.0.0)
-      psych (~> 3.1)
+      parser (~> 3.1.0)
       rainbow (>= 2.0, < 4.0)
-    regexp_parser (2.1.1)
-    representable (3.1.1)
+    regexp_parser (2.6.0)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    reverse_markdown (2.0.0)
+    reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rubocop (1.17.0)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    rubocop-rake (0.5.1)
-      rubocop
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    ruby-lint (0.9.1)
+      parser (>= 2.0.0)
+      racc (>= 1.4.10)
+      slop
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    signet (0.15.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
+    ruby2_keywords (0.0.5)
+    signet (0.17.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    solargraph (0.42.3)
+    slop (4.9.3)
+    solargraph (0.47.2)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
@@ -138,16 +130,17 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.1.0)
-    tilt (2.0.10)
-    trailblazer-option (0.1.1)
+    thor (1.2.1)
+    tilt (2.0.11)
+    trailblazer-option (0.1.2)
     uber (0.1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.3.0)
     webrick (1.7.0)
-    yard (0.9.26)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler
@@ -156,8 +149,9 @@ DEPENDENCIES
   reek
   rubocop
   rubocop-rake
+  ruby-lint
   solargraph
   yard
 
 BUNDLED WITH
-   2.2.19
+   2.3.7

data/cns.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary     = 'Arquiva transactions etherscan/greymass/bitcoinde/kraken/paymium/therock no bigquery.'
   spec.description = "#{spec.summary} Pode ajustar dias para reposicionamento temporal."
 
-  spec.required_ruby_version    = Gem::Requirement.new('~> 2.7')
+  spec.required_ruby_version    = Gem::Requirement.new('~> 3.1')
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['yard.run']     = 'yard'
 
@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('reek')
   spec.add_development_dependency('rubocop')
   spec.add_development_dependency('rubocop-rake')
+  spec.add_development_dependency('ruby-lint')
   spec.add_development_dependency('solargraph')
   spec.add_development_dependency('yard')
 

data/lib/cns/apibc.rb

@@ -38,7 +38,6 @@ module Cns
       []
     end
 
-    # @example account_gm
     # @example account_gm
     #  {
     #    account_name: '...',
@@ -128,7 +127,7 @@ module Cns
     # @param [String] add endereco ETH
     # @param [Integer] pag pagina transacoes
     # @param [Array<Hash>] aes acumulador transacoes
-    # @return [Array<Hash>] lista completa transacoes etherscan
+    # @return [Array<Hash>] lista transacoes normais etherscan
     def norml_es(add, pag = 0, aes = [])
       res = JSON.parse(
         conn_es.get('/api', action: 'txlist', offset: 10_000, address: add, page: pag += 1).body,
@@ -140,6 +139,73 @@ module Cns
       aes
     end
 
+    # @example inter_es
+    # {
+    #   status: '1',
+    #   message: 'OK',
+    #   result: [
+    #     {
+    #       blockNumber: '15592786',
+    #       timeStamp: '1663896779',
+    #       hash: '0x...',
+    #       from: '0x...',
+    #       to: '0x...',
+    #       value: '22000000000000000',
+    #       contractAddress: '',
+    #       input: '',
+    #       type: 'call',
+    #       gas: '2300',
+    #       gasUsed: '0',
+    #       traceId: '0_1_1',
+    #       isError: '0',
+    #       errCode: ''
+    #     }
+    #   ]
+    # }
+    # @param (see norml_es)
+    # @return [Array<Hash>] lista transacoes internas etherscan
+    def inter_es(add, pag = 0, aes = [])
+      res = JSON.parse(
+        conn_es.get('/api', action: 'txlistinternal', offset: 10_000, address: add, page: pag += 1).body,
+        symbolize_names: true
+      )[:result]
+      aes += res
+      res.count < 10_000 ? aes : inter_es(add, pag, aes)
+    rescue StandardError
+      aes
+    end
+
+    # @example block_es
+    # {
+    #   status: '1',
+    #   message: 'OK',
+    #   result: [
+    #     { blockNumber: '15737070', timeStamp: '1665638459', blockReward: '8922867945448231' },
+    #     { blockNumber: '15592786', timeStamp: '1663896779', blockReward: '44997990286623752' },
+    #     { blockNumber: '15570222', timeStamp: '1663622819', blockReward: '261211525682683684' },
+    #     { blockNumber: '15568554', timeStamp: '1663602539', blockReward: '41993833217879559' }
+    #   ]
+    # }
+    # @param (see norml_es)
+    # @return [Array<Hash>] lista blocos etherscan
+    def block_es(add, pag = 0, aes = [])
+      res = JSON.parse(
+        conn_es.get(
+          '/api',
+          action: 'getminedblocks',
+          blocktype: 'blocks',
+          offset: 10_000,
+          address: add,
+          page: pag += 1
+        ).body,
+        symbolize_names: true
+      )[:result]
+      aes += res
+      res.count < 10_000 ? aes : block_es(add, pag, aes)
+    rescue StandardError
+      aes
+    end
+
     # @example token_es
     #  {
     #    status: '1',
@@ -170,7 +236,7 @@ module Cns
     #    ]
     #  }
     # @param (see norml_es)
-    # @return [Array<Hash>] lista completa token transfer events etherscan
+    # @return [Array<Hash>] lista token transfer events etherscan
     def token_es(add, pag = 0, aes = [])
       # registos duplicados aparecem em token events (ver exemplo acima)
       # -quando ha erros na blockchain (acho)
@@ -258,7 +324,7 @@ module Cns
       @conn_es ||=
         Faraday.new(
           url: 'https://api.etherscan.io',
-          params: { module: 'account', apikey: ENV['ETHERSCAN_API_KEY'] },
+          params: { module: 'account', apikey: ENV.fetch('ETHERSCAN_API_KEY', nil) },
           headers: { content_type: 'application/json', accept: 'application/json', user_agent: 'etherscan;ruby' }
         ) do |con|
           con.request(:url_encoded)

data/lib/cns/beaconchain2.rb

@@ -16,11 +16,7 @@ module Cns
     # @param [Hash] hjn dados juntos bigquery & beaconchain
     # @return [String] texto formatado dum validador
     def formata_validador(hjn)
-      format(
-        '%<s1>-5.5s %<s2>-34.34s ',
-        s1: hjn[:id],
-        s2: formata_endereco(hjn[:ax], 34)
-      ) + formata_valores(hjn)
+      format('%<s1>-5.5s %<s2>-34.34s ', s1: hjn[:id], s2: formata_endereco(hjn[:ax], 34)) + formata_valores(hjn)
     end
 
     # @param (see formata_validador)
@@ -48,8 +44,12 @@ module Cns
     # @param [Integer] max chars a mostrar
     # @return [String] pubkey formatada
     def formata_endereco(add, max)
-      int = Integer((max - 2) / 2)
-      max < 7 ? 'erro' : "#{add[0, int - 3]}..#{add[-int - 3..]}"
+      return 'erro' if max < 7
+
+      max -= 2
+      ini = Integer(max / 2)
+      inf = max % 2
+      "#{add[0, ini - 3]}..#{add[-inf - ini - 3..]}"
     end
 
     # @example
@@ -68,7 +68,7 @@ module Cns
       format(
         '%<vi>5i %<vl>17.6f %<ep>6i %<id>9i',
         vi: idx,
-        vl: (hbh[:balance].to_d / 10**9).round(10),
+        vl: (hbh[:balance].to_d / (10**9)).round(10),
         ep: epc,
         id: itx(epc, idx)
       )

data/lib/cns/bigquery1.rb

@@ -38,7 +38,7 @@ module Cns
       apimt.mostra_resumo
       apies.mostra_resumo
       apigm.mostra_resumo
-      apibc.mostra_resumo
+      # apibc.mostra_resumo
     end
 
     # insere (caso existam) dados novos kraken/bitcoinde/paymium/therock/etherscan/greymass/beaconchain no bigquery
@@ -48,7 +48,7 @@ module Cns
       processa_frmt
       processa_eth
       processa_eos
-      processa_bc
+      # processa_bc
     end
 
     private
@@ -71,9 +71,11 @@ module Cns
       puts(format("%<n>4i LEDGER\tTHEROCK\t\tINSERIDAS mt", n: apimt.ledger.empty? ? 0 : dml(mtl_ins)))
     end
 
-    # insere transacoes blockchain novas nas tabelas etht (norml), ethk (token)
+    # insere transacoes blockchain novas nas tabelas etht (norml), ethi (internas), ethp (block), ethk (token)
     def processa_eth
-      puts(format("%<n>4i TRANSACOES\tETH\t\tINSERIDAS etht", n: apies.novtx.empty? ? 0 : dml(etht_ins)))
+      puts(format("%<n>4i TRANSACOES ETH NORMAIS\tINSERIDAS etht", n: apies.novtx.empty? ? 0 : dml(etht_ins)))
+      puts(format("%<n>4i TRANSACOES ETH INTERNAS\tINSERIDAS ethi", n: apies.novix.empty? ? 0 : dml(ethi_ins)))
+      puts(format("%<n>4i TRANSACOES ETH BLOCK\tINSERIDAS ethp", n: apies.novpx.empty? ? 0 : dml(ethp_ins)))
       puts(format("%<n>4i TOKENS\tETH\t\tINSERIDAS ethk", n: apies.novkx.empty? ? 0 : dml(ethk_ins)))
     end
 

data/lib/cns/bigquery2.rb

@@ -24,6 +24,8 @@ module Cns
         {
           wb: sql("select * from #{BD}.walletEth order by 2"),
           nt: sql("select itx,iax from #{BD}.ethtx"),
+          ni: sql("select itx,iax from #{BD}.ethix"),
+          np: sql("select itx,iax from #{BD}.ethpx"),
           nk: sql("select itx,iax from #{BD}.ethkx")
         },
         ops

data/lib/cns/bigquery3.rb

@@ -16,6 +16,19 @@ module Cns
       ") VALUES#{apies.novtx.map { |obj| etht_1val(obj) }.join(',')}"
     end
 
+    # @return [String] comando insert SQL formatado ethi (internas)
+    def ethi_ins
+      "insert #{BD}.ethi(blocknumber,timestamp,txhash,axfrom,axto,iax," \
+      'value,contractaddress,input,type,gas,gasused,traceid,iserror,errcode' \
+      ") VALUES#{apies.novix.map { |obj| ethi_1val(obj) }.join(',')}"
+    end
+
+    # @return [String] comando insert SQL formatado ethp (block)
+    def ethp_ins
+      "insert #{BD}.ethp(blocknumber,timestamp,blockreward,iax" \
+      ") VALUES#{apies.novpx.map { |obj| ethp_1val(obj) }.join(',')}"
+    end
+
     # @return [String] comando insert SQL formatado ethk (token)
     def ethk_ins
       "insert #{BD}.ethk(blocknumber,timestamp,txhash,nonce,blockhash,transactionindex,axfrom,axto,iax," \
@@ -78,6 +91,47 @@ module Cns
       "#{Integer(ops[:h][htx[:blockNumber]] || 0)})"
     end
 
+    # @example (see Apibc#inter_es)
+    # @param [Hash] htx transacao internas etherscan
+    # @return [String] valores formatados ethi (internas parte1)
+    def ethi_1val(htx)
+      cta = htx[:contractAddress]
+      "(#{Integer(htx[:blockNumber])}," \
+      "#{Integer(htx[:timeStamp])}," \
+      "'#{htx[:hash]}'," \
+      "'#{htx[:from]}'," \
+      "'#{htx[:to]}'," \
+      "'#{htx[:iax]}'," \
+      "cast('#{htx[:value]}' as numeric)," \
+      "#{cta.length.zero? ? 'null' : "'#{cta}'"}," \
+      "#{ethi_2val(htx)}"
+    end
+
+    # @param (see ethi_1val)
+    # @return [String] valores formatados ethi (internas parte2)
+    def ethi_2val(htx)
+      inp = htx[:input]
+      tid = htx[:traceId]
+      txr = htx[:errCode]
+      "#{inp.length.zero? ? 'null' : "'#{inp}'"}," \
+      "'#{htx[:type]}'," \
+      "cast('#{htx[:gas]}' as numeric)," \
+      "cast('#{htx[:gasUsed]}' as numeric)," \
+      "#{tid.length.zero? ? 'null' : "'#{tid}'"}," \
+      "#{Integer(htx[:isError])}," \
+      "#{txr.length.zero? ? 'null' : txr})"
+    end
+
+    # @example (see Apibc#block_es)
+    # @param [Hash] htx transacao block etherscan
+    # @return [String] valores formatados ethi (block parte1)
+    def ethp_1val(htx)
+      "(#{Integer(htx[:blockNumber])}," \
+      "#{Integer(htx[:timeStamp])}," \
+      "cast('#{htx[:blockReward]}' as numeric)," \
+      "'#{htx[:iax]}')"
+    end
+
     # @example (see Apibc#token_es)
     # @param [Hash] hkx token event etherscan
     # @return [String] valores formatados ethk (token parte1)

data/lib/cns/etherscan1.rb

@@ -32,6 +32,16 @@ module Cns
       @novtx ||= bcd.map { |obc| obc[:tx].select { |obj| idt.include?(obj[:itx]) } }.flatten
     end
 
+    # @return [Array<Hash>] lista transacoes internas novas
+    def novix
+      @novix ||= bcd.map { |obc| obc[:ix].select { |obj| idi.include?(obj[:itx]) } }.flatten
+    end
+
+    # @return [Array<Hash>] lista transacoes block novas
+    def novpx
+      @novpx ||= bcd.map { |obc| obc[:px].select { |obj| idp.include?(obj[:itx]) } }.flatten
+    end
+
     # @return [Array<Hash>] lista transacoes token novas
     def novkx
       @novkx ||= bcd.map { |obc| obc[:kx].select { |obj| idk.include?(obj[:itx]) } }.flatten
@@ -58,6 +68,18 @@ module Cns
                (ops[:t] ? [] : bqd[:nt].map { |obq| obq[:itx] })
     end
 
+    # @return [Array<Integer>] lista indices transacoes internas novas
+    def idi
+      @idi ||= bcd.map { |obc| obc[:ix].map { |obj| obj[:itx] } }.flatten -
+               (ops[:t] ? [] : bqd[:ni].map { |obq| obq[:itx] })
+    end
+
+    # @return [Array<Integer>] lista indices transacoes block novas
+    def idp
+      @idp ||= bcd.map { |obc| obc[:px].map { |obj| obj[:itx] } }.flatten -
+               (ops[:t] ? [] : bqd[:np].map { |obq| obq[:itx] })
+    end
+
     # @return [Array<Integer>] lista indices transacoes token novas
     def idk
       @idk ||= bcd.map { |obc| obc[:kx].map { |obj| obj[:itx] } }.flatten -
@@ -71,8 +93,10 @@ module Cns
       acc = abc[:account].downcase
       {
         ax: acc,
-        sl: (abc[:balance].to_d / 10**18).round(10),
+        sl: (abc[:balance].to_d / 10**18),
         tx: filtrar_tx(acc, api.norml_es(acc)),
+        ix: filtrar_tx(acc, api.inter_es(acc)),
+        px: filtrar_px(acc, api.block_es(acc)),
         kx: filtrar_tx(acc, api.token_es(acc))
       }
     end
@@ -86,9 +110,13 @@ module Cns
         ax: xbq = wbq[:ax],
         bs: wbq[:sl],
         bt: bqd[:nt].select { |ont| ont[:iax] == xbq },
+        bi: bqd[:ni].select { |oni| oni[:iax] == xbq },
+        bp: bqd[:np].select { |onp| onp[:iax] == xbq },
         bk: bqd[:nk].select { |onk| onk[:iax] == xbq },
         es: hbc[:sl],
         et: hbc[:tx],
+        ei: hbc[:ix],
+        ep: hbc[:px],
         ek: hbc[:kx]
       }
     end
@@ -103,11 +131,29 @@ module Cns
          .map { |omp| omp.delete_if { |key, _| DL.include?(key) }.merge(itx: Integer(omp[:blockNumber]), iax: add) }
     end
 
+    # @param add (see Apibc#norml_es)
+    # @param [Array<Hash>] ary lista blocks events
+    # @return [Array<Hash>] lista blocks events filtrada
+    def filtrar_px(add, ary)
+      # adiciona chave indice itx & adiciona identificador da carteira iax
+      ary.map { |omp| omp.merge(itx: Integer(omp[:blockNumber]), iax: add) }
+    end
+
     # @return [Array<Hash>] lista ordenada transacoes normais novas
     def sortx
       novtx.sort { |ant, prx| ant[:itx] <=> prx[:itx] }
     end
 
+    # @return [Array<Hash>] lista ordenada transacoes internas novas
+    def sorix
+      novix.sort { |ant, prx| ant[:itx] <=> prx[:itx] }
+    end
+
+    # @return [Array<Hash>] lista ordenada transacoes block novas
+    def sorpx
+      novpx.sort { |ant, prx| ant[:itx] <=> prx[:itx] }
+    end
+
     # @return [Array<Hash>] lista ordenada transacoes token novas
     def sorkx
       novkx.sort { |ant, prx| ant[:itx] <=> prx[:itx] }

data/lib/cns/etherscan2.rb

@@ -8,9 +8,11 @@ module Cns
     def mostra_resumo
       return unless dados.count.positive?
 
-      puts("\nid     address                            etherscan nm tk     bigquery nm tk")
+      puts("\nid     address                 etherscan tn ti tb tk     bigquery tn ti tb tk")
       dados.each { |obj| puts(formata_carteira(obj)) }
       mostra_transacao_norml
+      mostra_transacao_inter
+      mostra_transacao_block
       mostra_transacao_token
       mostra_configuracao_ajuste_dias
     end
@@ -19,9 +21,9 @@ module Cns
     # @return [String] texto formatado duma carteira
     def formata_carteira(hjn)
       format(
-        '%<s1>-6.6s %<s2>-32.32s ',
+        '%<s1>-6.6s %<s2>-20.20s ',
         s1: hjn[:id],
-        s2: formata_endereco(hjn[:ax], 32)
+        s2: formata_enderec1(hjn[:ax], 20)
       ) + formata_valores(hjn)
     end
 
@@ -29,13 +31,17 @@ module Cns
     # @return [String] texto formatado valores duma carteira
     def formata_valores(hjn)
       format(
-        '%<v1>11.6f %<n1>2i %<n3>2i %<v2>12.6f %<n2>2i %<n4>2i %<ok>-3s',
+        '%<v1>12.6f %<n1>2i %<n2>2i %<n3>2i %<n4>2i %<v2>12.6f %<n5>2i %<n6>2i %<n7>2i %<n8>2i %<ok>-3s',
         v1: hjn[:es],
         n1: hjn[:et].count,
-        n3: hjn[:ek].count,
+        n2: hjn[:ei].count,
+        n3: hjn[:ep].count,
+        n4: hjn[:ek].count,
         v2: hjn[:bs],
-        n2: hjn[:bt].count,
-        n4: hjn[:bk].count,
+        n5: hjn[:bt].count,
+        n6: hjn[:bi].count,
+        n7: hjn[:bp].count,
+        n8: hjn[:bk].count,
         ok: ok?(hjn) ? 'OK' : 'NOK'
       )
     end
@@ -43,7 +49,7 @@ module Cns
     # @param (see formata_carteira)
     # @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
+      hjn[:bs].round(6) == hjn[:es].round(6) && hjn[:bt].count == hjn[:et].count && hjn[:bi].count == hjn[:ei].count && hjn[:bp].count == hjn[:ep].count && hjn[:bk].count == hjn[:ek].count
     end
 
     # @example ether address inicio..fim
@@ -51,10 +57,29 @@ module Cns
     # @param add (see filtrar_tx)
     # @param [Integer] max chars a mostrar
     # @return [String] endereco formatado
-    def formata_endereco(add, max)
-      int = Integer((max - 2) / 2)
-      hid = (max <= 20 ? bqd[:wb].select { |obj| obj[:ax] == add }.first : nil) || { id: add }
-      max < 7 ? 'erro' : "#{hid[:id][0, int - 3]}..#{add[-int - 3..]}"
+    def formata_enderec1(add, max)
+      return 'erro' if max < 7
+
+      max -= 2
+      ini = Integer(max / 2)
+      inf = max % 2
+      "#{add[0, ini - 3]}..#{add[-inf - ini - 3..]}"
+    end
+
+    # @example ether address inicio..fim
+    #  me-app..4b437776403d
+    # @param add (see filtrar_tx)
+    # @param [Integer] max chars a mostrar
+    # @return [String] endereco formatado
+    def formata_enderec2(add, max)
+      return 'erro' if max < 7
+
+      max -= 2
+      ini = Integer(max / 2)
+      inf = max % 2
+      hid = bqd[:wb].select { |obj| obj[:ax] == add }.first
+      ndd = hid ? hid[:id] + '-' + add : add
+      "#{ndd[0, ini - 3]}..#{ndd[-inf - ini - 3..]}"
     end
 
     # @example (see Apibc#norml_es)
@@ -64,13 +89,26 @@ module Cns
       format(
         '%<bn>9i %<fr>-20.20s %<to>-20.20s %<dt>10.10s %<vl>17.6f',
         bn: htx[:blockNumber],
-        fr: formata_endereco(htx[:from], 20),
-        to: formata_endereco(htx[:to], 20),
+        fr: formata_enderec2(htx[:from], 20),
+        to: formata_enderec2(htx[:to], 20),
         dt: Time.at(Integer(htx[:timeStamp])),
         vl: (htx[:value].to_d / 10**18).round(10)
       )
     end
 
+    # @example (see Apibc#block_es)
+    # @param [Hash] htx transacao block etherscan
+    # @return [String] texto formatado transacao block etherscan
+    def formata_transacao_block(htx)
+      format(
+        '%<bn>9i %<fr>-41.41s %<dt>10.10s %<vl>17.6f',
+        bn: htx[:blockNumber],
+        fr: formata_enderec2(htx[:iax], 41),
+        dt: Time.at(Integer(htx[:timeStamp])),
+        vl: (htx[:blockReward].to_d / 10**18).round(10)
+      )
+    end
+
     # @example (see Apibc#token_es)
     # @param [Hash] hkx transacao token etherscan
     # @return [String] texto formatado transacao token etherscan
@@ -78,8 +116,8 @@ module Cns
       format(
         '%<bn>9i %<fr>-20.20s %<to>-20.20s %<dt>10.10s %<vl>11.3f %<sy>-5.5s',
         bn: hkx[:blockNumber],
-        fr: formata_endereco(hkx[:from], 20),
-        to: formata_endereco(hkx[:to], 20),
+        fr: formata_enderec2(hkx[:from], 20),
+        to: formata_enderec2(hkx[:to], 20),
         dt: Time.at(Integer(hkx[:timeStamp])),
         vl: (hkx[:value].to_d / 10**18).round(10),
         sy: hkx[:tokenSymbol]
@@ -94,6 +132,22 @@ module Cns
       sortx.each { |obj| puts(formata_transacao_norml(obj)) }
     end
 
+    # @return [String] texto transacoes internas
+    def mostra_transacao_inter
+      return unless ops[:v] && novix.count.positive?
+
+      puts("\ntx intern from                 to                   data                   valor")
+      sorix.each { |obj| puts(formata_transacao_norml(obj)) }
+    end
+
+    # @return [String] texto transacoes block
+    def mostra_transacao_block
+      return unless ops[:v] && novpx.count.positive?
+
+      puts("\ntx block  address                                   data                   valor")
+      sorpx.each { |obj| puts(formata_transacao_block(obj)) }
+    end
+
     # @return [String] texto transacoes token
     def mostra_transacao_token
       return unless ops[:v] && novkx.count.positive?

data/lib/cns/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cns
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.1
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
@@ -220,14 +234,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Arquiva transactions etherscan/greymass/bitcoinde/kraken/paymium/therock