Fix errors found in the TBRv3 Solana Audit #105
Merged
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
Contributor
feli-xlabs
commented
Jan 2, 2025
feli-xlabs
commented
- Allow to create accounts by hand even if they're squatted.
- Refactor the program ownership transfer so that we only need the new owner's signature when accepting the transfer.
- Check both the chain ID and the peer address in case of an inbound transfer
feli-xlabs
force-pushed
the
audit-solana
branch
from
0886d29 to
1fb1484
Compare
nonergodic
approved these changes
Jan 11, 2025
Comment on lines
+60
to
+89
| let total_fees_mwei = (|| { | ||
| let evm_transaction_fee_mwei = config | ||
| .evm_transaction_gas | ||
| .checked_mul(u64::from(oracle_evm_prices.gas_price))?; | ||
| let evm_tx_size_fee_mwei = config | ||
| .evm_transaction_size | ||
| .checked_mul(u64::from(oracle_evm_prices.price_per_byte))?; | ||
| let dropoff_mwei = u64::from(dropoff_amount_micro).checked_mul(MWEI_PER_MICRO_ETH)?; | ||
|
|
||
| evm_transaction_fee_mwei | ||
| .checked_add(evm_tx_size_fee_mwei)? | ||
| .checked_add(dropoff_mwei) | ||
| })() | ||
| .ok_or(TokenBridgeRelayerError::Overflow)?; | ||
|
|
||
| // μusd = Mwei * μusd/Token / Mwei/Token + μusd) | ||
| let total_fees_micro_usd = u64::try_from( | ||
| u128::from(total_fees_mwei) * u128::from(oracle_evm_prices.gas_token_price) / MWEI_PER_ETH, | ||
| ) | ||
| .expect("Overflow") | ||
| + u64::from(chain_config.relayer_fee_micro_usd); | ||
| .map_err(|_| TokenBridgeRelayerError::Overflow)? | ||
| .checked_add(u64::from(chain_config.relayer_fee_micro_usd)) | ||
| .ok_or(TokenBridgeRelayerError::Overflow)?; | ||
|
|
||
| // lamports/SOL * μusd / μusd/SOL | ||
| Ok((LAMPORTS_PER_SOL * total_fees_micro_usd) / oracle_config.sol_price) | ||
| let fee = total_fees_micro_usd | ||
| .checked_mul(LAMPORTS_PER_SOL) | ||
| .map(|sol| sol / oracle_config.sol_price) | ||
| .ok_or(TokenBridgeRelayerError::Overflow)?; | ||
|
|
||
| Ok(fee) |
There was a problem hiding this comment.
I see where the motivation for the custom type with a single, simple overflow check at the end that you mentioned came from. Only a mother can love this code.
There was a problem hiding this comment.
I don't like it, maybe that's because I'm a father, not a mother.
… so that when the new owner accepts the transfer, there is no need for the previous owner's signature.
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.