huginn_callisto_network_agent 0.1.83 → 0.1.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed5f76f3114c8521b24a4cb7261420b6bb6bba9f2c24d6355eb2285968af44b
-  data.tar.gz: e458bc227bb0fe55f0ca99c4ff5110fffd689fc50bd58b6c85937eddb8c4ac29
+  metadata.gz: e413837711159b9a4b8daebbb25a1b604897b41b9f51401b85d7817513139cac
+  data.tar.gz: 4ebf78dd64060dfcb6bcd09766f25eee3f9570331b8134c9318e1b1440bf0ce7
 SHA512:
-  metadata.gz: fa68db11f70f7776d15b4f4b79b0561cdba4f797749b6e20ba1b42351552e4e2988820d0421fe3df88cddd622a9c18f2f385095950061875bb78952a02aab432
-  data.tar.gz: 0d69632d689c76f2ffca506ea8eae98c2612a318db39b1d97c61cf7b9566c8a361e465820554f1315ec5c546a0ecef31ab8b3de719eb9e052b4bb17f3513f38a
+  metadata.gz: 648c94e951e5ecb7582d6e530b9c943adb0ad5f0f134d92f8c03864d3c91c4d57250d81ce3d3a58d51381384faf5cdb0044548322cf5eff389495317b7549966
+  data.tar.gz: e07ec83a4a4c680d6de559a4acd5ed6b792aa17ce242eb6b1de67edd1d2bf7514c28d446c394801ff0c43859c66c8565d27cf58c932f636d8f5eee39774ca1f4

data/lib/huginn_callisto_network_agent/callisto_network_agent.rb

@@ -454,43 +454,41 @@ module Agents
       dead_address = '0x000000000000000000000000000000000000dead'
       internal = true
       tx_list = []
-      burnt_ether = 0
+      burnt_clo = 0
+      burnt_type2 = 0
+      burnt_dead = 0
       (interpolated['first_block']..interpolated['last_block']).each do |i|
         transactions = get_data(i.to_i,internal)
-        gas_used = transactions['result']['gasUsed'].to_i(16)
         transactions['result']['transactions'].each do |tx|
           if !tx.empty?
             tx_list << tx
             if tx['type'] == "0x2"
-              gas_price = tx['gasPrice'].to_i(16)
-              fees = gas_price * gas_used.to_f / 10**18
+              gas_fee = transactions['result']['baseFeePerGas'].to_i(16)
+              fees = ( transactions['result']['gasUsed'].to_i(16) * gas_fee.to_f ) / (10 ** 18)
             else
               fees = 0
             end
             if tx['to'] == dead_address
-              burnt = tx['value'].to_i(16) / 10**18
+              burnt = tx['value'].to_i(16).to_f / 10**18
             else
               burnt = 0
             end
           end
-          burnt_ether += fees
-          burnt_ether += burnt
+          burnt_type2 += fees
+          burnt_dead += burnt
         end
       end
+      burnt_clo = ( burnt_type2 / tx_list.count ) + burnt_dead
       top_tx = most_common_from(tx_list)
       top_count = tx_list.count { |hash| hash['from'] == top_tx }
       miners_count = tx_list.select { |hash| all_miners.include?(hash['from']) }
-#      log "miners_count #{miners_count.count}"
       shitty_count = tx_list.select { |hash| shitty_wallets.include?(hash['from']) }
       callosha_count = tx_list.select { |hash| hash['to'] == callosha_address }
       twobears_count = tx_list.select { |hash| hash['to'] == twobears_address }
       vipwarz_count = tx_list.select { |hash| hash['to'] == vipwarz_address }
       slotmachine_count = tx_list.select { |hash| hash['to'] == slotmachine_address }
-#      log "shitty_count #{shitty_count.count}"
       active = tx_list.map { |p| p['from'] }.uniq.count
-#      log "top_count : #{top_count}"
-#      log "total : #{tx_list.count}"
-      create_event :payload => { 'total_tx' => "#{tx_list.count}", 'total_active' => "#{active}", 'burnt_clo' => "#{burnt_ether}", 'top_wallet': {'address' => "#{top_tx}", 'percentage' => "#{percentage(top_count.to_i,tx_list.count.to_i)}"}, 'shitty': {'address': 'shitty', 'shitty_percentage' => "#{percentage(shitty_count.count,tx_list.count.to_i)}"}, 'miners': {'address': "miners", 'percentage' => "#{percentage(miners_count.count,tx_list.count.to_i)}"}, 'callosha': {'address': callosha_address, 'percentage' => "#{percentage(callosha_count.count,tx_list.count.to_i)}"}, 'twobears': {'address': twobears_address, 'percentage' => "#{percentage(twobears_count.count,tx_list.count.to_i)}"}, 'vipwarz': {'address': vipwarz_address, 'percentage' => "#{percentage(vipwarz_count.count,tx_list.count.to_i)}"}, 'slotmachine': {'address': slotmachine_address, 'percentage' => "#{percentage(slotmachine_count.count,tx_list.count.to_i)}"}}
+      create_event :payload => { 'total_tx' => "#{tx_list.count}", 'total_active' => "#{active}", 'burnt_clo' => "#{burnt_clo}", 'top_wallet': {'address' => "#{top_tx}", 'percentage' => "#{percentage(top_count.to_i,tx_list.count.to_i)}"}, 'shitty': {'address': 'shitty', 'shitty_percentage' => "#{percentage(shitty_count.count,tx_list.count.to_i)}"}, 'miners': {'address': "miners", 'percentage' => "#{percentage(miners_count.count,tx_list.count.to_i)}"}, 'callosha': {'address': callosha_address, 'percentage' => "#{percentage(callosha_count.count,tx_list.count.to_i)}"}, 'twobears': {'address': twobears_address, 'percentage' => "#{percentage(twobears_count.count,tx_list.count.to_i)}"}, 'vipwarz': {'address': vipwarz_address, 'percentage' => "#{percentage(vipwarz_count.count,tx_list.count.to_i)}"}, 'slotmachine': {'address': slotmachine_address, 'percentage' => "#{percentage(slotmachine_count.count,tx_list.count.to_i)}"}}
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huginn_callisto_network_agent
 version: !ruby/object:Gem::Version
-  version: 0.1.83
+  version: 0.1.85
 platform: ruby
 authors:
 - Nicolas Germain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler