cns 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f7ae1ef8366ed9cf561233f61e42435ab6d5b7202c64936310d057f99689138
-  data.tar.gz: 29610ef7729632d29c3d97aeccc1732cac387265de5536327734d5f4af54a265
+  metadata.gz: f4fb8ef5137e35f64fabed9a151d6547d12f21487e602c91404ba5eedcd88a34
+  data.tar.gz: 037a388cdcd7652fa803d76131ba1e7076b2a0983c74f835484005791c3a1fc3
 SHA512:
-  metadata.gz: 5c28857d6b4fe429e9f8f9eb6ddfdca805343c6f5347b40624a6ea03a687bd9b90d4c257c1d7434629d404df6914f9dfa6c62883babb843cc74842643cd7d39e
-  data.tar.gz: b3a334a6580af627911d51037bad7065af7129239fd2ccbaf45750cba7f8c7a57b48ab28f4605a00ac9b5bbadb304a9f80e6af1519ad7d0c677d6acafb153bc3
+  metadata.gz: bd36261022378f795e64bc814434879b9f99cd7f7c3ff974a719aa0aed0d40bc16a341fcd11038f49c0e1056ea298acb21bca79644dcff7251eb27d69b4b6118
+  data.tar.gz: b6c078fcfb4e878f6058b785051ba702d8e49afc150767f7a99412d4d9202890e98cd3f3f3896afd11d80d2dc083e94fb220e1ff7a25fd261c8a1c781884abf2

data/Gemfile.lock

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

data/lib/cns/bigquery.rb

@@ -8,9 +8,9 @@ module Cns
   BD = 'hernanirvaz.coins'
   FO = File.expand_path("~/#{File.basename($PROGRAM_NAME)}.log")
   TB = {
-    i: %w[blocknumber timestamp txhash axfrom axto iax value contractaddress input type gas gasused traceid iserror errcode],
-    p: %w[blocknumber timestamp blockreward iax],
-    w: %w[withdrawalindex validatorindex address amount blocknumber timestamp],
+    i: %w[blocknumber timestamp txhash axfrom axto iax value contractaddress input type gas gasused traceid iserror errcode dias],
+    p: %w[blocknumber timestamp blockreward iax dias],
+    w: %w[withdrawalindex validatorindex address amount blocknumber timestamp dias],
     t: %w[blocknumber timestamp txhash nonce blockhash transactionindex axfrom axto iax value gas gasprice gasused iserror txreceipt_status input contractaddress dias],
     k: %w[blocknumber timestamp txhash nonce blockhash transactionindex axfrom axto iax value tokenname tokensymbol tokendecimal gas gasprice gasused input contractaddress dias],
     neost: %w[gseq aseq bnum time contract action acfrom acto iax amount moeda memo dias],
@@ -236,19 +236,19 @@ module Cns
     end
 
     # SQL value formatting methods with improved safety
-    def quote(value)
+    def fqt(value)
       return 'null' if value.nil? || value.empty?
 
       "'#{value}'"
     end
 
-    def numeric(value)
+    def fnm(value)
       return 'null' if value.nil?
 
       "CAST('#{value}' AS NUMERIC)"
     end
 
-    def integer(value)
+    def fin(value)
       return '0' if value.nil?
 
       Integer(value).to_s
@@ -256,11 +256,11 @@ module Cns
       'null'
     end
 
-    def ptime(sec)
+    def ftm(sec)
       "PARSE_DATETIME('%s', '#{String(sec.round)}')"
     end
 
-    def ptimestamp(value)
+    def fts(value)
       "DATETIME(TIMESTAMP('#{value}'))"
     end
 
@@ -268,24 +268,24 @@ module Cns
     # @return [String] valores formatados netht (norml parte1)
     def netht_val(htx)
       "(#{[
-        integer(htx[:blockNumber]),
-        integer(htx[:timeStamp]),
-        quote(htx[:hash]),
-        integer(htx[:nonce]),
-        quote(htx[:blockHash]),
-        integer(htx[:transactionIndex]),
-        quote(htx[:from]),
-        quote(htx[:to]),
-        quote(htx[:iax]),
-        numeric(htx[:value]),
-        numeric(htx[:gas]),
-        numeric(htx[:gasPrice]),
-        numeric(htx[:gasUsed]),
-        integer(htx[:isError]),
-        integer(htx[:txreceipt_status]),
-        quote(htx[:input]),
-        quote(htx[:contractAddress]),
-        integer(ops.dig(:h, htx[:blockNumber]))
+        fin(htx[:blockNumber]),
+        fin(htx[:timeStamp]),
+        fqt(htx[:hash]),
+        fin(htx[:nonce]),
+        fqt(htx[:blockHash]),
+        fin(htx[:transactionIndex]),
+        fqt(htx[:from]),
+        fqt(htx[:to]),
+        fqt(htx[:iax]),
+        fnm(htx[:value]),
+        fnm(htx[:gas]),
+        fnm(htx[:gasPrice]),
+        fnm(htx[:gasUsed]),
+        fin(htx[:isError]),
+        fin(htx[:txreceipt_status]),
+        fqt(htx[:input]),
+        fqt(htx[:contractAddress]),
+        fin(ops.dig(:h, htx[:hash]))
       ].join(',')})"
     end
 
@@ -293,40 +293,42 @@ module Cns
     # @return [String] valores formatados nethi (internas parte1)
     def nethi_val(htx)
       "(#{[
-        integer(htx[:blockNumber]),
-        integer(htx[:timeStamp]),
-        quote(htx[:hash]),
-        quote(htx[:from]),
-        quote(htx[:to]),
-        quote(htx[:iax]),
-        numeric(htx[:value]),
-        quote(htx[:contractAddress]),
-        quote(htx[:input]),
-        quote(htx[:type]),
-        numeric(htx[:gas]),
-        numeric(htx[:gasUsed]),
-        quote(htx[:traceId]),
-        integer(htx[:isError]),
-        integer(htx[:errCode])
+        fin(htx[:blockNumber]),
+        fin(htx[:timeStamp]),
+        fqt(htx[:hash]),
+        fqt(htx[:from]),
+        fqt(htx[:to]),
+        fqt(htx[:iax]),
+        fnm(htx[:value]),
+        fqt(htx[:contractAddress]),
+        fqt(htx[:input]),
+        fqt(htx[:type]),
+        fnm(htx[:gas]),
+        fnm(htx[:gasUsed]),
+        fqt(htx[:traceId]),
+        fin(htx[:isError]),
+        fin(htx[:errCode]),
+        fin(ops.dig(:h, htx[:hash]))
       ].join(',')})"
     end
 
     # @param [Hash] htx transacao block etherscan
     # @return [String] valores formatados nethi (block parte1)
     def nethp_val(htx)
-      "(#{[integer(htx[:blockNumber]), integer(htx[:timeStamp]), numeric(htx[:blockReward]), quote(htx[:iax])].join(',')})"
+      "(#{[fin(htx[:blockNumber]), fin(htx[:timeStamp]), fnm(htx[:blockReward]), fqt(htx[:iax]), fin(ops.dig(:h, htx[:blockNumber]))].join(',')})"
     end
 
     # @param [Hash] htx transacao withdrawals etherscan
     # @return [String] valores formatados nethi (withdrawals parte1)
     def nethw_val(htx)
       "(#{[
-        integer(htx[:withdrawalIndex]),
-        integer(htx[:validatorIndex]),
-        quote(htx[:address]),
-        numeric(htx[:amount]),
-        integer(htx[:blockNumber]),
-        integer(htx[:timestamp])
+        fin(htx[:withdrawalIndex]),
+        fin(htx[:validatorIndex]),
+        fqt(htx[:address]),
+        fnm(htx[:amount]),
+        fin(htx[:blockNumber]),
+        fin(htx[:timestamp]),
+        fin(ops.dig(:h, htx[:withdrawalIndex]))
       ].join(',')})"
     end
 
@@ -334,25 +336,25 @@ module Cns
     # @return [String] valores formatados nethk (token parte1)
     def nethk_val(htx)
       "(#{[
-        integer(htx[:blockNumber]),
-        integer(htx[:timeStamp]),
-        quote(htx[:hash]),
-        integer(htx[:nonce]),
-        quote(htx[:blockHash]),
-        integer(htx[:transactionIndex]),
-        quote(htx[:from]),
-        quote(htx[:to]),
-        quote(htx[:iax]),
-        numeric(htx[:value]),
-        quote(htx[:tokenName]),
-        quote(htx[:tokenSymbol]),
-        integer(htx[:tokenDecimal]),
-        numeric(htx[:gas]),
-        numeric(htx[:gasPrice]),
-        numeric(htx[:gasUsed]),
-        quote(htx[:input]),
-        quote(htx[:contractAddress]),
-        integer(ops.dig(:h, htx[:blockNumber]))
+        fin(htx[:blockNumber]),
+        fin(htx[:timeStamp]),
+        fqt(htx[:hash]),
+        fin(htx[:nonce]),
+        fqt(htx[:blockHash]),
+        fin(htx[:transactionIndex]),
+        fqt(htx[:from]),
+        fqt(htx[:to]),
+        fqt(htx[:iax]),
+        fnm(htx[:value]),
+        fqt(htx[:tokenName]),
+        fqt(htx[:tokenSymbol]),
+        fin(htx[:tokenDecimal]),
+        fnm(htx[:gas]),
+        fnm(htx[:gasPrice]),
+        fnm(htx[:gasUsed]),
+        fqt(htx[:input]),
+        fqt(htx[:contractAddress]),
+        fin(ops.dig(:h, htx[:hash]))
       ].join(',')})"
     end
 
@@ -365,19 +367,19 @@ module Cns
       qtd = dat[:quantity].to_s
       str = dat[:memo].inspect
       "(#{[
-        integer(htx[:global_action_seq]),
-        integer(htx[:account_action_seq]),
-        integer(htx[:block_num]),
-        ptimestamp(htx[:block_time]),
-        quote(act[:account]),
-        quote(act[:name]),
-        quote(dat[:from]),
-        quote(dat[:to]),
-        quote(htx[:iax]),
+        fin(htx[:global_action_seq]),
+        fin(htx[:account_action_seq]),
+        fin(htx[:block_num]),
+        fts(htx[:block_time]),
+        fqt(act[:account]),
+        fqt(act[:name]),
+        fqt(dat[:from]),
+        fqt(dat[:to]),
+        fqt(htx[:iax]),
         qtd.to_d,
-        quote(qtd[/[[:upper:]]+/]),
-        quote(str),
-        integer(ops.dig(:h, htx[:itx]))
+        fqt(qtd[/[[:upper:]]+/]),
+        fqt(str),
+        fin(ops.dig(:h, htx[:itx]))
       ].join(',')})"
     end
 
@@ -385,14 +387,14 @@ module Cns
     # @return [String] valores formatados det (trades parte1)
     def cdet_val(htx)
       "(#{[
-        quote(htx[:trade_id]),
-        ptimestamp(htx[:successfully_finished_at]),
-        quote(htx[:type]),
-        quote(htx[:trading_partner_information][:username]),
-        numeric(htx[:type] == 'buy' ? htx[:amount_currency_to_trade_after_fee] : "-#{htx[:amount_currency_to_trade]}"),
-        numeric(htx[:volume_currency_to_pay_after_fee]),
-        ptimestamp(htx[:trade_marked_as_paid_at]),
-        integer(ops.dig(:h, htx[:trade_id]))
+        fqt(htx[:trade_id]),
+        fts(htx[:successfully_finished_at]),
+        fqt(htx[:type]),
+        fqt(htx[:trading_partner_information][:username]),
+        fnm(htx[:type] == 'buy' ? htx[:amount_currency_to_trade_after_fee] : "-#{htx[:amount_currency_to_trade]}"),
+        fnm(htx[:volume_currency_to_pay_after_fee]),
+        fts(htx[:trade_marked_as_paid_at]),
+        fin(ops.dig(:h, htx[:trade_id]))
       ].join(',')})"
     end
 
@@ -402,13 +404,13 @@ module Cns
       tip = htx[:tp]
       qtd = htx[:qt]
       "(#{[
-        integer(htx[:txid]),
-        ptimestamp(htx[:time].iso8601),
-        quote(tip),
-        quote(htx[:add]),
-        quote(htx[:moe]),
-        numeric(tip == 'withdrawal' ? "-#{qtd}" : qtd),
-        numeric(htx[:fee])
+        fin(htx[:txid]),
+        fts(htx[:time].iso8601),
+        fqt(tip),
+        fqt(htx[:add]),
+        fqt(htx[:moe]),
+        fnm(tip == 'withdrawal' ? "-#{qtd}" : qtd),
+        fnm(htx[:fee])
       ].join(',')})"
     end
 
@@ -417,20 +419,20 @@ module Cns
     # @return [String] valores formatados ust (trades parte1)
     def cust_val(idx, htx)
       "(#{[
-        quote(idx),
-        quote(htx[:ordertxid]),
-        quote(htx[:pair]),
-        ptime(htx[:time]),
-        quote(htx[:type]),
-        quote(htx[:ordertype]),
-        numeric(htx[:price]),
-        numeric(htx[:cost]),
-        numeric(htx[:fee]),
-        numeric(htx[:vol]),
-        numeric(htx[:margin]),
-        quote(htx[:misc]),
-        quote(apius.novcusl.select { |_, obj| obj[:refid] == idx.to_s }.keys.join(',')),
-        integer(ops.dig(:h, idx))
+        fqt(idx),
+        fqt(htx[:ordertxid]),
+        fqt(htx[:pair]),
+        ftm(htx[:time]),
+        fqt(htx[:type]),
+        fqt(htx[:ordertype]),
+        fnm(htx[:price]),
+        fnm(htx[:cost]),
+        fnm(htx[:fee]),
+        fnm(htx[:vol]),
+        fnm(htx[:margin]),
+        fqt(htx[:misc]),
+        fqt(apius.novcusl.select { |_, obj| obj[:refid] == idx.to_s }.keys.join(',')),
+        fin(ops.dig(:h, idx))
       ].join(',')})"
     end
 
@@ -438,7 +440,7 @@ module Cns
     # @param [Hash] hlx ledger kraken
     # @return [String] valores formatados usl (ledger)
     def cusl_val(idx, hlx)
-      "(#{[quote(idx), quote(hlx[:refid]), ptime(hlx[:time]), quote(hlx[:type]), quote(hlx[:aclass]), quote(hlx[:asset]), numeric(hlx[:amount]), numeric(hlx[:fee])].join(',')})"
+      "(#{[fqt(idx), fqt(hlx[:refid]), ftm(hlx[:time]), fqt(hlx[:type]), fqt(hlx[:aclass]), fqt(hlx[:asset]), fnm(hlx[:amount]), fnm(hlx[:fee])].join(',')})"
     end
   end
 end

data/lib/cns/etherscan.rb

@@ -193,11 +193,11 @@ module Cns
 
       puts("\nid     address                                        etherscan      bigquery")
       dados.each { |obj| puts(formata_carteira_simples(obj)) }
-      mostra_transacao_norml
-      mostra_transacao_inter
-      mostra_transacao_block
-      mostra_transacao_token
-      mostra_transacao_withw
+      mostra_tx_norml
+      mostra_tx_inter
+      mostra_tx_block
+      mostra_tx_token
+      mostra_tx_withw
       mostra_configuracao_ajuste_dias
     end
 
@@ -207,11 +207,11 @@ module Cns
 
       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_tx_norml
+      mostra_tx_inter
+      mostra_tx_block
+      mostra_tx_token
+      mostra_tx_withw
       mostra_configuracao_ajuste_dias
     end
 
@@ -297,27 +297,42 @@ module Cns
       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..]}"
+      "#{ndd[0, ini]}..#{ndd[-inf - ini..]}"
     end
 
     # @example (see Apibc#norml_es)
     # @param [Hash] htx transacao normal etherscan
     # @return [String] texto formatado transacao normal etherscan
-    def formata_transacao_norml(htx)
+    def formata_tx_ti(htx)
       format(
-        '%<bn>9i %<fr>-20.20s %<to>-20.20s %<dt>10.10s %<vl>17.6f',
-        bn: htx[:blockNumber],
-        fr: formata_enderec2(htx[:from], 20),
-        to: formata_enderec2(htx[:to], 20),
+        '%<hx>-29.29s %<fr>-15.15s %<to>-15.15s %<dt>10.10s %<vl>7.3f',
+        hx: formata_enderec1(htx[:hash], 29),
+        fr: formata_enderec2(htx[:from], 15),
+        to: formata_enderec2(htx[:to], 15),
         dt: Time.at(Integer(htx[:timeStamp])),
         vl: (htx[:value].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
+    def formata_tx_token(hkx)
+      format(
+        '%<hx>-23.23s %<fr>-15.15s %<to>-15.15s %<dt>10.10s %<vl>7.3f %<sy>-5.5s',
+        hx: formata_enderec1(hkx[:hash], 23),
+        fr: formata_enderec2(hkx[:from], 15),
+        to: formata_enderec2(hkx[:to], 15),
+        dt: Time.at(Integer(hkx[:timeStamp])),
+        vl: (hkx[:value].to_d / (10**18)).round(10),
+        sy: hkx[:tokenSymbol]
+      )
+    end
+
     # @example (see Apibc#block_es)
     # @param [Hash] htx transacao block etherscan
     # @return [String] texto formatado transacao block etherscan
-    def formata_transacao_block(htx)
+    def formata_tx_block(htx)
       format(
         '%<bn>9i %<fr>-41.41s %<dt>10.10s %<vl>17.6f',
         bn: htx[:blockNumber],
@@ -327,78 +342,66 @@ module Cns
       )
     end
 
-    # @example (see Apibc#token_es)
-    # @param [Hash] hkx transacao token etherscan
-    # @return [String] texto formatado transacao token etherscan
-    def formata_transacao_token(hkx)
-      format(
-        '%<bn>9i %<fr>-20.20s %<to>-20.20s %<dt>10.10s %<vl>11.3f %<sy>-5.5s',
-        bn: hkx[:blockNumber],
-        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]
-      )
-    end
-
     # @example (see Apibc#block_es)
     # @param [Hash] htx transacao withdrawals etherscan
     # @return [String] texto formatado transacao withdrawals etherscan
-    def formata_transacao_withw(htx)
+    def formata_tx_withw(htx)
       format(
-        '%<vi>9i %<bn>10i %<dt>10.10s %<vl>10.6f',
-        vi: htx[:validatorIndex],
+        '%<bn>10i %<vi>9i %<dt>10.10s %<vl>10.6f',
         bn: htx[:withdrawalIndex],
+        vi: htx[:validatorIndex],
         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
+    def mostra_tx_norml
       return unless ops[:v] && novnetht.count.positive?
 
-      puts("\ntx normal from                 to                   data                   valor")
-      sortx.each { |obj| puts(formata_transacao_norml(obj)) }
+      puts("\ntx normal                     from            to              data         valor")
+      sortx.each { |obj| puts(formata_tx_ti(obj)) }
     end
 
     # @return [String] texto transacoes internas
-    def mostra_transacao_inter
+    def mostra_tx_inter
       return unless ops[:v] && novnethi.count.positive?
 
-      puts("\ntx intern from                 to                   data                   valor")
-      sorix.each { |obj| puts(formata_transacao_norml(obj)) }
+      puts("\ntx intern                     from            to              data         valor")
+      sorix.each { |obj| puts(formata_tx_ti(obj)) }
     end
 
     # @return [String] texto transacoes block
-    def mostra_transacao_block
+    def mostra_tx_block
       return unless ops[:v] && novnethp.count.positive?
 
       puts("\ntx block  address                                   data                   valor")
-      sorpx.each { |obj| puts(formata_transacao_block(obj)) }
+      sorpx.each { |obj| puts(formata_tx_block(obj)) }
     end
 
     # @return [String] texto transacoes token
-    def mostra_transacao_token
+    def mostra_tx_token
       return unless ops[:v] && novnethk.count.positive?
 
-      puts("\ntx token  from                 to                   data             valor")
-      sorkx.each { |obj| puts(formata_transacao_token(obj)) }
+      puts("\ntx token                from            to              data         valor moeda")
+      sorkx.each { |obj| puts(formata_tx_token(obj)) }
     end
 
     # @return [String] texto transacoes withdrawals
-    def mostra_transacao_withw
+    def mostra_tx_withw
       return unless ops[:v] && novnethw.count.positive?
 
-      puts("\nvalidator withdrawal data            valor")
-      sorwx.each { |obj| puts(formata_transacao_withw(obj)) }
+      puts("\nwithdrawal validator data            valor")
+      sorwx.each { |obj| puts(formata_tx_withw(obj)) }
     end
 
     # @return [String] texto configuracao ajuste dias das transacoes (normais & token)
     def mostra_configuracao_ajuste_dias
-      puts("\nstring ajuste dias transacoes normais\n-h=#{sortx.map { |obj| "#{obj[:blockNumber]}:0" }.join(' ')}") if novnetht.count.positive?
-      puts("\nstring ajuste dias transacoes token  \n-h=#{sorkx.map { |obj| "#{obj[:blockNumber]}:0" }.join(' ')}") if novnethk.count.positive?
+      puts("\najuste dias transacoes normais    \n-h=#{sortx.map { |obj| "#{obj[:hash]}:0"            }.join(' ')}") if novnetht.count.positive?
+      puts("\najuste dias transacoes internas   \n-h=#{sorix.map { |obj| "#{obj[:hash]}:0"            }.join(' ')}") if novnethi.count.positive?
+      puts("\najuste dias transacoes block      \n-h=#{sorpx.map { |obj| "#{obj[:blockNumber]}:0"     }.join(' ')}") if novnethp.count.positive?
+      puts("\najuste dias transacoes withdrawals\n-h=#{sorwx.map { |obj| "#{obj[:withdrawalIndex]}:0" }.join(' ')}") if novnethw.count.positive?
+      puts("\najuste dias transacoes token      \n-h=#{sorkx.map { |obj| "#{obj[:hash]}:0"            }.join(' ')}") if novnethk.count.positive?
     end
   end
 end

data/lib/cns/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cns
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz