[fortuna] Withdraw fees #1610
Merged
[fortuna] Withdraw fees #1610
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎ 2 Ignored Deployments
|
m30m
approved these changes
Jun 4, 2024
| &provider_info, | ||
| provider_config | ||
| .fee_manager | ||
| .unwrap_or(Address::from([0u8; 20])), |
| config.keeper.private_key.load()?.ok_or(anyhow!("Please specify a keeper private key in the config or omit the --keeper option to use the provider private key"))? | ||
| } else { | ||
| config.provider.private_key.load()?.ok_or(anyhow!( | ||
| "Please specify a provider private key in the config or provide the --keeper option to use the keeper private key instead. " |
There was a problem hiding this comment.
nit: extra space at the end of string
| contract.wallet().address() | ||
| ); | ||
|
|
||
| if is_fee_manager { |
There was a problem hiding this comment.
this part has a bit of repeated logic. Can refactor into something like this:
let call = match is_fee_manager {
true => contract.withdraw_as_fee_manager(provider_address, withdrawal_amount_wei),
false => contract.withdraw(withdrawal_amount_wei),
};
let tx_result = call.send()
.await?
.await?;
log_tx_hash(&tx_result);
apps/fortuna/src/keeper.rs
Outdated
|
|
||
| let fees = provider_info.accrued_fees_in_wei; | ||
|
|
||
| let min_balance = U256::from(12345); |
There was a problem hiding this comment.
We should probably read this from some config
| .await | ||
| .map_err(|e| anyhow!("Error while getting provider info. error: {:?}", e))?; | ||
|
|
||
| let fees = provider_info.accrued_fees_in_wei; |
There was a problem hiding this comment.
we should add some check that the fee_manager is actually the keeper. Otherwise, we may get confusing revert errors
apps/fortuna/src/keeper.rs
Outdated
| @@ -837,3 +846,68 @@ pub async fn track_provider( | |||
| }) | |||
| .set(end_sequence_number as i64); | |||
| } | |||
|
|
|||
| // TODO: fields | |||
There was a problem hiding this comment.
no fields necessary here. We only want the chain_id and if you add in_current_span when you are spawning this, it should be enough.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add logic to withdraw fees. Couple related features here: