Merge pull request #3989 from patriksletmo/fix-token-transfer-sort

Fixed bug that sometimes lead to incorrect ordering of token transfers

CHANGELOG.md

@@ -4,7 +4,8 @@
 
 ### Fixes
 - [#3946](https://github.com/blockscout/blockscout/pull/3946) - Get NFT metadata from URIs with status_code 301
-- [#3888](https://github.com/blockscout/blockscout/pull/3888) - EIP-1967 contract proxy pattern detection fix 
+- [#3888](https://github.com/blockscout/blockscout/pull/3888) - EIP-1967 contract proxy pattern detection fix
+- [#3989](https://github.com/blockscout/blockscout/pull/3989) - Fixed bug that sometimes lead to incorrect ordering of token transfers
 
 ### Chore
 - [#3934](https://github.com/blockscout/blockscout/pull/3934) - Update nimble_csv package

apps/explorer/lib/explorer/etherscan.ex

@@ -461,6 +461,7 @@ defmodule Explorer.Etherscan do
         inner_join: t in Transaction,
         on: tt.transaction_hash == t.hash and tt.block_number == t.block_number and tt.block_hash == t.block_hash,
         inner_join: b in assoc(t, :block),
+        order_by: [{^options.order_by_direction, tt.block_number}, {^options.order_by_direction, tt.token_log_index}],
         select: %{
           token_contract_address_hash: tt.token_contract_address_hash,
           transaction_hash: tt.transaction_hash,