huginn_callisto_network_agent 0.1.85 → 0.1.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e413837711159b9a4b8daebbb25a1b604897b41b9f51401b85d7817513139cac
-  data.tar.gz: 4ebf78dd64060dfcb6bcd09766f25eee3f9570331b8134c9318e1b1440bf0ce7
+  metadata.gz: 6219080211b6e50ca5cbcbb05bebf2f9157385551feef225954ade4b293d2576
+  data.tar.gz: 5a5399afe59892d9500fd19971efd58fc5eee5d8914e24bb28f9e779a14e4556
 SHA512:
-  metadata.gz: 648c94e951e5ecb7582d6e530b9c943adb0ad5f0f134d92f8c03864d3c91c4d57250d81ce3d3a58d51381384faf5cdb0044548322cf5eff389495317b7549966
-  data.tar.gz: e07ec83a4a4c680d6de559a4acd5ed6b792aa17ce242eb6b1de67edd1d2bf7514c28d446c394801ff0c43859c66c8565d27cf58c932f636d8f5eee39774ca1f4
+  metadata.gz: 25ac957425bd0d03f99160c13f16943d726573a0ace02a960df78ebd3f2d29534d0c756e935048cfbfd80d7456dc7fd442cd963533889c411eb7c5af59d0e795
+  data.tar.gz: a704bb8e408294de17ec1bf625bf8a0b11424dc2a07c46d77910a0e1b2a0a11c98c58c9a76bfbf610a962443efc1cab4c5fe59a3930ee59abbf03dba7302d649

data/lib/huginn_callisto_network_agent/callisto_network_agent.rb

@@ -455,18 +455,19 @@ module Agents
       internal = true
       tx_list = []
       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)
+        burnt_per_block = 0
+        burnt_type2_per_block = 0
+        fees = 0
         transactions['result']['transactions'].each do |tx|
+          gas_fee = transactions['result']['baseFeePerGas'].to_i(16)
           if !tx.empty?
             tx_list << tx
             if tx['type'] == "0x2"
-              gas_fee = transactions['result']['baseFeePerGas'].to_i(16)
-              fees = ( transactions['result']['gasUsed'].to_i(16) * gas_fee.to_f ) / (10 ** 18)
-            else
-              fees = 0
+              tx_hash_info = get_tx_receipt(tx['hash'])
+              fees = ( tx_hash_info['result']['gasUsed'].to_i(16) * gas_fee.to_f ) / (10 ** 18)
             end
             if tx['to'] == dead_address
               burnt = tx['value'].to_i(16).to_f / 10**18
@@ -474,11 +475,12 @@ module Agents
               burnt = 0
             end
           end
-          burnt_type2 += fees
+          burnt_type2_per_block += fees
           burnt_dead += burnt
         end
+        burnt_per_block += ( burnt_dead + burnt_type2_per_block )
+        burnt_clo += burnt_per_block
       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']) }

metadata

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