Skip to content

Commit

Permalink
Merge pull request #9 from darwinia-network/fix-active-collators
Browse files Browse the repository at this point in the history
fix
  • Loading branch information
wuminzhe authored Nov 30, 2023
2 parents 1f34c7c + 9c0c309 commit 79f99f7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ task :update_nominees, [:network_name] do |_t, args|
kton_pool = get_storage(rpc, metadata, 'darwinia_staking', 'kton_pool', nil, nil)
collator_commissions = get_collator_commissions(rpc, metadata) # includes active and waiting collators
active_collator_addresses = get_active_collators(rpc, metadata)
current_exposures = get_current_exposures(rpc, metadata)
collators_no_session_key = current_exposures - active_collator_addresses
identities = get_identities(rpc, metadata) # address => name
commission_updates_count = CommissionUpdates.commission_updates_count(SubsquidClient.send(network_name))

Expand Down Expand Up @@ -183,7 +185,8 @@ task :update_nominees, [:network_name] do |_t, args|
commission: collator_commissions[nominee_address],
commission_updates_count: commission_updates_count[nominee_address]&.[](:count) || 0,
commission_max_increase: commission_updates_count[nominee_address]&.[](:max_increase),
status: get_nominee_status(active_collator_addresses, waiting_collator_addresses, nominee_address)
status: get_nominee_status(active_collator_addresses, waiting_collator_addresses, nominee_address),
no_session_key: collators_no_session_key.include?(nominee_address)
}
]
end.to_h
Expand Down
4 changes: 4 additions & 0 deletions src/account.rb
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ def get_collator_commissions(rpc, metadata)
end

def get_active_collators(rpc, metadata)
get_storage(rpc, metadata, 'session', 'validators', nil, nil)
end

def get_current_exposures(rpc, metadata)
exposures_cache_id =
get_storage(rpc, metadata, 'darwinia_staking', 'exposure_cache_states', nil, nil).index('Current')
exposures_storage_name = "exposure_cache#{exposures_cache_id}"
Expand Down

0 comments on commit 79f99f7

Please sign in to comment.