Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions crates/transaction-pool/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ impl TempoPooledTransaction {
let fee_token = self
.resolved_fee_token()
.unwrap_or_else(|| self.inner().fee_token().unwrap_or(DEFAULT_FEE_TOKEN));
let fee_payer = self.fee_payer().ok()?;
let fee_payer = self.tx_env().fee_payer().ok()?;
let slot = TIP20Token::from_address_unchecked(fee_token).balances[fee_payer].slot();
Some((fee_token, slot))
})
Expand All @@ -391,7 +391,8 @@ impl TempoPooledTransaction {
/// conservative sender-scoped invalidation for malformed pooled state.
pub(crate) fn is_sender_paid_fee(&self) -> bool {
let sender = self.sender();
self.fee_payer()
self.tx_env()
.fee_payer()
.map_or(true, |fee_payer| fee_payer == sender)
}

Expand Down Expand Up @@ -435,7 +436,7 @@ impl TempoPooledTransaction {
}

let sender = self.sender();
let fee_payer = self.fee_payer().unwrap_or(sender);
let fee_payer = self.tx_env().fee_payer().unwrap_or(sender);
let fee_collection_warms_fee_payer_rewards = !self.fee_token_cost.is_zero();

// For payment transactions, warm sender + recipient balance and allowance slots.
Expand Down
Loading