Skip to content

Commit

Permalink
Revert "Remove congestion multiplier from calculate fee (solana-labs#…
Browse files Browse the repository at this point in the history
…34865)"

This reverts commit 73d3973.
  • Loading branch information
tao-stones committed Jan 30, 2024
1 parent df2ee12 commit 0dcac3f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
11 changes: 0 additions & 11 deletions runtime/src/bank.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6719,17 +6719,6 @@ impl Bank {
&self.runtime_config.compute_budget.unwrap_or_default(),
false, /* debugging_features */
));

// genesis_config loaded by accounts_db::open_genesis_config() from ledger
// has it's lamports_per_signature set to zero; bank sets its value correctly
// after the first block with a transaction in it. This is a hack to mimic
// the process.
let derived_fee_rate_governor =
FeeRateGovernor::new_derived(&genesis_config.fee_rate_governor, 0);
// new bank's fee_structure.lamports_per_signature should be inline with
// what's configured in GenesisConfig
self.fee_structure.lamports_per_signature =
derived_fee_rate_governor.lamports_per_signature;
}

pub fn set_inflation(&self, inflation: Inflation) {
Expand Down
1 change: 1 addition & 0 deletions runtime/src/bank/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3335,6 +3335,7 @@ fn test_bank_parent_account_spend() {
let key2 = Keypair::new();
let (parent, bank_forks) = Bank::new_with_bank_forks_for_tests(&genesis_config);
let amount = genesis_config.rent.minimum_balance(0);
println!("==== amount {}", amount);

let tx =
system_transaction::transfer(&mint_keypair, &key1.pubkey(), amount, genesis_config.hash());
Expand Down
12 changes: 10 additions & 2 deletions sdk/src/fee.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,17 @@ impl FeeStructure {
pub fn calculate_fee(
&self,
message: &SanitizedMessage,
_lamports_per_signature: u64,
lamports_per_signature: u64,
budget_limits: &FeeBudgetLimits,
include_loaded_account_data_size_in_fee: bool,
) -> u64 {
// Fee based on compute units and signatures
let congestion_multiplier = if lamports_per_signature == 0 {
0.0 // test only
} else {
1.0 // multiplier that has no effect
};

let signature_fee = message
.num_signatures()
.saturating_mul(self.lamports_per_signature);
Expand Down Expand Up @@ -115,11 +122,12 @@ impl FeeStructure {
.unwrap_or_default()
});

(budget_limits
((budget_limits
.prioritization_fee
.saturating_add(signature_fee)
.saturating_add(write_lock_fee)
.saturating_add(compute_fee) as f64)
* congestion_multiplier)
.round() as u64
}
}
Expand Down

0 comments on commit 0dcac3f

Please sign in to comment.