Skip to content

Fix charged fee for oasis encoded eth txs #1234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptrus merged 1 commit into from
Jan 12, 2026
Merged

Fix charged fee for oasis encoded eth txs #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .changelog/1234.bugfix.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
api: Fix charged fee for oasis encoded eth txs
4 changes: 4 additions & 0 deletions .changelog/1234.bugfix.2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix consensus related events edgecase

The query did not include the event type in the join, which could result
in wrong events showing up as related events.
6 changes: 4 additions & 2 deletions storage/client/queries/queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ const (
LEFT JOIN chain.blocks b ON tx_block = b.height
LEFT JOIN chain.events_related_accounts rel ON
chain.events.tx_block = rel.tx_block AND
chain.events.type = rel.type AND
chain.events.event_index = rel.event_index AND
-- When related_address ($5) is NULL and hence we do no filtering on it, avoid the join altogether.
($5::text IS NOT NULL)
Expand Down Expand Up @@ -601,8 +602,9 @@ const (
txs.gas_limit,
txs.gas_used,
CASE
WHEN txs.tx_eth_hash IS NULL THEN txs.fee
ELSE COALESCE(FLOOR(txs.fee / NULLIF(txs.gas_limit, 0)) * txs.gas_used, 0)
WHEN txs.method IN ('evm.Call', 'evm.Create') OR txs.tx_eth_hash IS NOT NULL
THEN COALESCE(FLOOR(txs.fee / NULLIF(txs.gas_limit, 0)) * txs.gas_used, 0)
ELSE txs.fee
END AS charged_fee,
txs.size,
txs.raw_result,
Expand Down
Loading