Skip to content

Commit

Permalink
Merge branch 'grarco/force-fee-payment' (#3295)
Browse files Browse the repository at this point in the history
* origin/grarco/force-fee-payment:
  Fmt
  Changelog #3075
  Fixes typo
  Misc adjustments to v36
  Adds integration test for enforced fees
  Removes useless operations on wrapper transactions
  Removes useless check on tx type for reprot management
  Fixes unit tests
  Pass tx by reference in `apply_wrapper_tx`
  Removes unused wasm caches for wrapper execution
  Refactors the arguments of `dispatch_tx` for every tx type
  Cache wrapper transaction to avoid second deserialization
  Reorganizes arguments for tx execution
  Refactors tx execution of `finalize_block` into separate functions
  Fixes fee payment
  • Loading branch information
tzemanovic committed May 24, 2024
2 parents 35014c8 + d063ac1 commit 57cfd99
Show file tree
Hide file tree
Showing 7 changed files with 800 additions and 409 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/3075-force-fee-payment.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fixed the fee collection logic in `finalize_block` to match that of
`process_proposal`. ([\#3075](https://github.com/anoma/namada/issues/3075))
10 changes: 3 additions & 7 deletions crates/namada/src/ledger/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,11 @@ mod dry_run_tx {
Gas::try_from(wrapper.gas_limit).into_storage_result()?;
let tx_gas_meter = RefCell::new(TxGasMeter::new(gas_limit));
let tx_result = protocol::apply_wrapper_tx(
tx.clone(),
&tx,
&wrapper,
&request.data,
ShellParams::new(
&tx_gas_meter,
&mut temp_state,
&mut ctx.vp_wasm_cache,
&mut ctx.tx_wasm_cache,
),
&tx_gas_meter,
&mut temp_state,
None,
)
.into_storage_result()?;
Expand Down
Loading

0 comments on commit 57cfd99

Please sign in to comment.