cns 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00db558ab8907678d896c4c9af0a4520815eb2159340804799be40e487e788a8
-  data.tar.gz: 533c85ce882e271dd9f66ae5445066e0fbf0ff265f66f7de25222d86e0789f0a
+  metadata.gz: 628583895b421b1b5d84af2753d24d28d4c0f2d1e4ed4f363160ef07b1d0e23d
+  data.tar.gz: 7e14420b81120d01f9abe1171fc248949ff8ffbeff2c698901dc0d60d7d68ad5
 SHA512:
-  metadata.gz: 16fb0ed5e6430cdf5eec1f16157df679605ed691ed558249059002b7772764b8230e4b04e8017d81ab0c0e58b6644e8b157c324c9cd2cadd37b4042abdea2183
-  data.tar.gz: 4744d1fa97206235eb403ae9ce703e4d55369b3b0b614f0ed80556c248feb99fcd0fbbeac8f1e9105830c3f84873b5cd828eb8abeb019b9ad7e05f19adff96b7
+  metadata.gz: 2d0f31b4f43dcef2abcfddce96174ee06de7650fa5413390e126bd532056df1349f3e438f13759651b35cf666e78e688a6378f92f3dff782a0a14f51ff1c575c
+  data.tar.gz: 89e7998c421ad34256815ca720f02814875a2d58958c97604c24b3313388e9d6c324ba67473784299a47c9fb90b76af8806bad80563bd985fd3d56a588110029

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cns (0.3.3)
+    cns (0.3.4)
       curb
       faraday
       google-cloud-bigquery

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.3'
+  VERSION = '0.3.4'
 end

metadata

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