v1.18: Revert PRs caused hash mismatch (backport of #35018) (#35020)

* Revert "refactor unused parameter (#34970)"

This reverts commit 0838909.

(cherry picked from commit 1542392)

# Conflicts:
#	sdk/src/fee.rs

* Revert "separate priority fee and transaction fee from fee calculation (#34757)"

This reverts commit 5ecc47e.

(cherry picked from commit df2ee12)

# Conflicts:
#	sdk/src/fee.rs

* Revert "Remove congestion multiplier from calculate fee (#34865)"

This reverts commit 73d3973.

(cherry picked from commit 0dcac3f)

# Conflicts:
#	sdk/src/fee.rs

* fix merge conflicts

---------

Co-authored-by: Tao Zhu <[email protected]>

Author: mergify[bot]

runtime/src/bank.rs

@@ -6660,17 +6660,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) {

runtime/src/bank/tests.rs

@@ -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());

sdk/src/fee.rs

@@ -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
     }
 }