Revert "Remove congestion multiplier from calculate fee (#34865)"
This reverts commit 73d3973c7c
.
This commit is contained in:
parent
df2ee120e9
commit
0dcac3fe7c
|
@ -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) {
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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);
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue