cns 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba2ef03e5bc93d772b32c6bbf375ae4322778e4ff00ca43fddf5c041924f4597
-  data.tar.gz: 63c40eebbcb8ca9425153db0a6113659b1ef7f3b16f00b3faa7153e1af04d79d
+  metadata.gz: 628583895b421b1b5d84af2753d24d28d4c0f2d1e4ed4f363160ef07b1d0e23d
+  data.tar.gz: 7e14420b81120d01f9abe1171fc248949ff8ffbeff2c698901dc0d60d7d68ad5
 SHA512:
-  metadata.gz: c32420b68e4ab9e8b4015b2ad2bf55d6b668da22a7ef58e71b57deb6a908961f2050057c3d7bb80b189fc13b365d239282e9aefce7beca59a7534388431cd2dd
-  data.tar.gz: bb370c40be2ed5ae0b3da752270ddbe44746e9f584c1a14715e23a76a5aa0b3c5431e9587504c64d074ad49c89c65b78bda6cad8580527842f1d1862e4940836
+  metadata.gz: 2d0f31b4f43dcef2abcfddce96174ee06de7650fa5413390e126bd532056df1349f3e438f13759651b35cf666e78e688a6378f92f3dff782a0a14f51ff1c575c
+  data.tar.gz: 89e7998c421ad34256815ca720f02814875a2d58958c97604c24b3313388e9d6c324ba67473784299a47c9fb90b76af8806bad80563bd985fd3d56a588110029

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cns (0.3.2)
+    cns (0.3.4)
       curb
       faraday
       google-cloud-bigquery
@@ -10,22 +10,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     backport (1.2.0)
-    benchmark (0.2.0)
-    concurrent-ruby (1.1.10)
-    curb (1.0.1)
+    benchmark (0.2.1)
+    concurrent-ruby (1.2.2)
+    curb (1.0.5)
     declarative (0.0.20)
     e2mmap (0.1.0)
-    faraday (2.6.0)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    google-apis-bigquery_v2 (0.42.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-core (0.9.1)
+    google-apis-bigquery_v2 (0.55.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -34,7 +34,7 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-cloud-bigquery (1.39.0)
+    google-cloud-bigquery (1.43.1)
       concurrent-ruby (~> 1.0)
       google-apis-bigquery_v2 (~> 0.1)
       google-cloud-core (~> 1.6)
@@ -45,8 +45,8 @@ GEM
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
-    googleauth (1.3.0)
+    google-cloud-errors (1.3.1)
+    googleauth (1.6.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -54,8 +54,8 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     httpclient (2.8.3)
-    jaro_winkler (1.5.4)
-    jwt (2.5.0)
+    jaro_winkler (1.5.6)
+    jwt (2.7.1)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -64,15 +64,15 @@ GEM
     memoist (0.16.2)
     mini_mime (1.1.2)
     multi_json (1.15.0)
-    nokogiri (1.13.9-x86_64-linux)
+    nokogiri (1.15.3-x86_64-linux)
       racc (~> 1.4)
     os (1.1.4)
-    parallel (1.22.1)
+    parallel (1.23.0)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     psych (3.3.4)
-    public_suffix (5.0.0)
-    racc (1.6.0)
+    public_suffix (5.0.1)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (12.3.3)
     reek (6.0.2)
@@ -80,7 +80,7 @@ GEM
       parser (>= 2.5.0.0, < 2.8, != 2.5.1.1)
       psych (~> 3.1)
       rainbow (>= 2.0, < 4.0)
-    regexp_parser (2.6.0)
+    regexp_parser (2.8.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -105,7 +105,7 @@ GEM
     ruby-lint (2.3.1)
       parser (~> 2.2)
       slop (~> 3.4, >= 3.4.7)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     signet (0.17.0)
       addressable (~> 2.8)
@@ -127,14 +127,13 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.2.1)
-    tilt (2.0.11)
+    thor (1.2.2)
+    tilt (2.2.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
     unicode-display_width (1.8.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    webrick (1.8.1)
+    yard (0.9.34)
 
 PLATFORMS
   x86_64-linux

data/lib/cns/apibc.rb

@@ -206,6 +206,40 @@ module Cns
       aes
     end
 
+    # @example withw_es
+    # {
+    #    "status":"1",
+    #    "message":"OK",
+    #    "result":[
+    #       {
+    #          "withdrawalIndex":"14",
+    #          "validatorIndex":"119023",
+    #          "address":"0xb9d7934878b5fb9610b3fe8a5e441e8fad7e293f",
+    #          "amount":"3244098967",
+    #          "blockNumber":"17034877",
+    #          "timestamp":"1681338599"
+    #       }
+    #    ]
+    # }
+    # @param (see norml_es)
+    # @return [Array<Hash>] lista blocos etherscan
+    def withw_es(add, pag = 0, aes = [])
+      res = JSON.parse(
+        conn_es.get(
+          '/api',
+          action: 'txsBeaconWithdrawal',
+          address: add,
+          offset: 10_000,
+          page: pag += 1
+        ).body,
+        symbolize_names: true
+      )[:result]
+      aes += res
+      res.count < 10_000 ? aes : withw_es(add, pag, aes)
+    rescue StandardError
+      aes
+    end
+
     # @example token_es
     #  {
     #    status: '1',

data/lib/cns/bigquery1.rb

@@ -34,21 +34,21 @@ module Cns
     def mostra_tudo
       apius.mostra_resumo
       apide.mostra_resumo
-      apifr.mostra_resumo
-      apimt.mostra_resumo
+      #apifr.mostra_resumo
+      #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
     def processa_tudo
       processa_us
       processa_de
-      processa_frmt
+      #processa_frmt
       processa_eth
       processa_eos
-      # processa_bc
+      #processa_bc
     end
 
     # insere transacoes blockchain novas nas tabelas etht (norml), ethi (internas), ethp (block), ethk (token)
@@ -56,6 +56,7 @@ module Cns
       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 TRANSACOES ETH WITHDRAWALS\tINSERIDAS ethw", n: apies.novwx.empty? ? 0 : dml(ethw_ins)))
       puts(format("%<n>4i TOKENS\tETH\t\tINSERIDAS ethk", n: apies.novkx.empty? ? 0 : dml(ethk_ins)))
     end
 

data/lib/cns/bigquery2.rb

@@ -26,6 +26,7 @@ module Cns
           nt: sql("select itx,iax from #{BD}.ethtx"),
           ni: sql("select itx,iax from #{BD}.ethix"),
           np: sql("select itx,iax from #{BD}.ethpx"),
+          nw: sql("select itx,iax from #{BD}.ethwx"),
           nk: sql("select itx,iax from #{BD}.ethkx")
         },
         ops

data/lib/cns/bigquery3.rb

@@ -29,6 +29,12 @@ module Cns
       ") VALUES#{apies.novpx.map { |obj| ethp_1val(obj) }.join(',')}"
     end
 
+    # @return [String] comando insert SQL formatado ethw (withdrawals)
+    def ethw_ins
+      "insert #{BD}.ethw(withdrawalindex,validatorindex,address,amount,blocknumber,timestamp" \
+      ") VALUES#{apies.novwx.map { |obj| ethw_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," \
@@ -132,6 +138,18 @@ module Cns
       "'#{htx[:iax]}')"
     end
 
+    # @example (see Apibc#block_es)
+    # @param [Hash] htx transacao withdrawals etherscan
+    # @return [String] valores formatados ethi (withdrawals parte1)
+    def ethw_1val(htx)
+      "(#{Integer(htx[:withdrawalIndex])}," \
+      "#{Integer(htx[:validatorIndex])}," \
+      "'#{htx[:address]}'," \
+      "cast('#{htx[:amount]}' as numeric)," \
+      "#{Integer(htx[:blockNumber])}," \
+      "#{Integer(htx[:timestamp])})"
+    end
+
     # @example (see Apibc#token_es)
     # @param [Hash] hkx token event etherscan
     # @return [String] valores formatados ethk (token parte1)

data/lib/cns/etherscan1.rb

@@ -42,6 +42,11 @@ module Cns
       @novpx ||= bcd.map { |obc| obc[:px].select { |obj| idp.include?(obj[:itx]) } }.flatten
     end
 
+    # @return [Array<Hash>] lista transacoes withdrawals novas
+    def novwx
+      @novwx ||= bcd.map { |obc| obc[:wx].select { |obj| idw.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
@@ -80,6 +85,12 @@ module Cns
                (ops[:t] ? [] : bqd[:np].map { |obq| obq[:itx] })
     end
 
+    # @return [Array<Integer>] lista indices transacoes withdrawals novas
+    def idw
+      @idw ||= bcd.map { |obc| obc[:wx].map { |obj| obj[:itx] } }.flatten -
+               (ops[:t] ? [] : bqd[:nw].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 -
@@ -97,6 +108,7 @@ module Cns
         tx: filtrar_tx(acc, api.norml_es(acc)),
         ix: filtrar_tx(acc, api.inter_es(acc)),
         px: filtrar_px(acc, api.block_es(acc)),
+        wx: filtrar_px(acc, api.withw_es(acc)),
         kx: filtrar_tx(acc, api.token_es(acc))
       }
     end
@@ -112,11 +124,13 @@ module Cns
         bt: bqd[:nt].select { |ont| ont[:iax] == xbq },
         bi: bqd[:ni].select { |oni| oni[:iax] == xbq },
         bp: bqd[:np].select { |onp| onp[:iax] == xbq },
+        bw: bqd[:nw].select { |onw| onw[:iax] == xbq },
         bk: bqd[:nk].select { |onk| onk[:iax] == xbq },
         es: hbc[:sl],
         et: hbc[:tx],
         ei: hbc[:ix],
         ep: hbc[:px],
+        ew: hbc[:wx],
         ek: hbc[:kx]
       }
     end
@@ -154,6 +168,11 @@ module Cns
       novpx.sort { |ant, prx| ant[:itx] <=> prx[:itx] }
     end
 
+    # @return [Array<Hash>] lista ordenada transacoes withdrawals novas
+    def sorwx
+      novwx.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,12 +8,13 @@ module Cns
     def mostra_resumo
       return unless dados.count.positive?
 
-      puts("\nid     address                 etherscan tn ti tb tk     bigquery tn ti tb tk")
+      puts("\nid     address             etherscan  tn ti tb tk  tw     bigquery  tn ti tb tk  tw")
       dados.each { |obj| puts(formata_carteira(obj)) }
       mostra_transacao_norml
       mostra_transacao_inter
       mostra_transacao_block
       mostra_transacao_token
+      mostra_transacao_withw
       mostra_configuracao_ajuste_dias
     end
 
@@ -21,9 +22,9 @@ module Cns
     # @return [String] texto formatado duma carteira
     def formata_carteira(hjn)
       format(
-        '%<s1>-6.6s %<s2>-20.20s ',
+        '%<s1>-6.6s %<s2>-16.16s ',
         s1: hjn[:id],
-        s2: formata_enderec1(hjn[:ax], 20)
+        s2: formata_enderec1(hjn[:ax], 16)
       ) + formata_valores(hjn)
     end
 
@@ -31,17 +32,19 @@ module Cns
     # @return [String] texto formatado valores duma carteira
     def formata_valores(hjn)
       format(
-        '%<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>12.6f %<n1>3i %<n2>2i %<n3>2i %<n4>2i %<w1>3i %<v2>12.6f %<n5>3i %<n6>2i %<n7>2i %<n8>2i %<w2>3i %<ok>-3s',
         v1: hjn[:es],
         n1: hjn[:et].count,
         n2: hjn[:ei].count,
         n3: hjn[:ep].count,
         n4: hjn[:ek].count,
+        w1: hjn[:ew].count,
         v2: hjn[:bs],
         n5: hjn[:bt].count,
         n6: hjn[:bi].count,
         n7: hjn[:bp].count,
         n8: hjn[:bk].count,
+        w2: hjn[:bw].count,
         ok: ok?(hjn) ? 'OK' : 'NOK'
       )
     end
@@ -49,7 +52,7 @@ module Cns
     # @param (see formata_carteira)
     # @return [Boolean] carteira tem transacoes novas(sim=NOK, nao=OK)?
     def ok?(hjn)
-      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
+      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 && hjn[:bw].count == hjn[:ew].count
     end
 
     # @example ether address inicio..fim
@@ -61,7 +64,7 @@ module Cns
       return 'erro' if max < 7
 
       max -= 2
-      ini = Integer(max / 2)
+      ini = Integer(max / 2) + 3
       inf = max % 2
       "#{add[0, ini - 3]}..#{add[-inf - ini - 3..]}"
     end
@@ -124,6 +127,19 @@ module Cns
       )
     end
 
+    # @example (see Apibc#block_es)
+    # @param [Hash] htx transacao withdrawals etherscan
+    # @return [String] texto formatado transacao withdrawals etherscan
+    def formata_transacao_withw(htx)
+      format(
+        '%<vi>9i %<bn>9i %<dt>10.10s %<vl>10.6f',
+        vi: htx[:validatorIndex],
+        bn: htx[:blockNumber],
+        dt: Time.at(Integer(htx[:timestamp])),
+        vl: (htx[:amount].to_d / 10**9).round(10)
+      )
+    end
+
     # @return [String] texto transacoes normais
     def mostra_transacao_norml
       return unless ops[:v] && novtx.count.positive?
@@ -156,6 +172,14 @@ module Cns
       sorkx.each { |obj| puts(formata_transacao_token(obj)) }
     end
 
+    # @return [String] texto transacoes withdrawals
+    def mostra_transacao_withw
+      return unless ops[:v] && novwx.count.positive?
+
+      puts("\nvalidator     block data            valor")
+      sorwx.each { |obj| puts(formata_transacao_withw(obj)) }
+    end
+
     # @return [String] texto configuracao ajuste dias das transacoes (normais & token)
     def mostra_configuracao_ajuste_dias
       return unless (novtx.count + novkx.count).positive?

data/lib/cns/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cns
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-14 00:00:00.000000000 Z
+date: 2023-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler