huginn_callisto_network_agent 0.1.83 → 0.1.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed5f76f3114c8521b24a4cb7261420b6bb6bba9f2c24d6355eb2285968af44b
-  data.tar.gz: e458bc227bb0fe55f0ca99c4ff5110fffd689fc50bd58b6c85937eddb8c4ac29
+  metadata.gz: 6347392197009dec8851be8b8aa60bec647ba0b3139411f2a70eb43ab90468d9
+  data.tar.gz: a0d9fa5cc02c1ff40af63ccb7a6fc80708d5d865f966915d258648588d9a4002
 SHA512:
-  metadata.gz: fa68db11f70f7776d15b4f4b79b0561cdba4f797749b6e20ba1b42351552e4e2988820d0421fe3df88cddd622a9c18f2f385095950061875bb78952a02aab432
-  data.tar.gz: 0d69632d689c76f2ffca506ea8eae98c2612a318db39b1d97c61cf7b9566c8a361e465820554f1315ec5c546a0ecef31ab8b3de719eb9e052b4bb17f3513f38a
+  metadata.gz: 38c76efc882a2b939ea0e7518d6fbee1c6b83f37a438be2adafe1af00e974f9f17298f3cc6f19e8783465ddad0c436bd62ddbcfab73608189f1f6dbd1b5f35e2
+  data.tar.gz: cecb584921dcc14bdd3b4ebb996d1abcace256c5644d6f2606bc4edf3e0af35db9a969c191df902d7e34767c646d5098b460410a42ebc83fd94a018050ab9e29

data/lib/huginn_callisto_network_agent/callisto_network_agent.rb

@@ -454,29 +454,33 @@ 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)
+              log gas_fee
+              log fees
             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']) }
@@ -490,7 +494,7 @@ module Agents
       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.84
 platform: ruby
 authors:
 - Nicolas Germain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler