Change order for insertion to AddressTokenBalances

CHANGELOG.md

@@ -6,6 +6,7 @@
 - [#3462](https://github.com/poanetwork/blockscout/pull/3462) - Display price for bridged tokens
 
 ### Fixes
+- [#3433](https://github.com/poanetwork/blockscout/pull/3433) - Token balances and rewards tables deadlocks elimination
 - [#3494](https://github.com/poanetwork/blockscout/pull/3494), [#3497](https://github.com/poanetwork/blockscout/pull/3497) - Contracts interaction: fix method call with array[] input
 - [#3494](https://github.com/poanetwork/blockscout/pull/3494), [#3495](https://github.com/poanetwork/blockscout/pull/3495) - Contracts interaction: fix tuple output display
 - [#3479](https://github.com/poanetwork/blockscout/pull/3479) - Fix working with big numbers in Staking DApp
@@ -56,7 +57,6 @@
 - [#3440](https://github.com/poanetwork/blockscout/pull/3440) - Rewrite missing blocks range query
 - [#3439](https://github.com/poanetwork/blockscout/pull/3439) - Dark mode color fixes (search, charts)
 - [#3437](https://github.com/poanetwork/blockscout/pull/3437) - Fix Postgres Docker container
-- [#3433](https://github.com/poanetwork/blockscout/pull/3433) - Token balances and rewards tables deadlocks elimination
 - [#3428](https://github.com/poanetwork/blockscout/pull/3428) - Fix address tokens search
 - [#3424](https://github.com/poanetwork/blockscout/pull/3424) - Fix display of long NFT IDs
 - [#3422](https://github.com/poanetwork/blockscout/pull/3422) - Fix contract reader: tuple type

apps/explorer/lib/explorer/chain/import/runner/blocks.ex

@@ -344,8 +344,8 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         select: map(tb, [:address_hash, :token_contract_address_hash, :block_number]),
         # Enforce TokenBalance ShareLocks order (see docs: sharelocks.md)
         order_by: [
-          tb.address_hash,
           tb.token_contract_address_hash,
+          tb.address_hash,
           tb.block_number
         ],
         lock: "FOR UPDATE"
@@ -381,8 +381,8 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         select: map(ctb, [:address_hash, :token_contract_address_hash]),
         # Enforce CurrentTokenBalance ShareLocks order (see docs: sharelocks.md)
         order_by: [
-          ctb.address_hash,
+          ctb.token_contract_address_hash,
-          ctb.token_contract_address_hash
+          ctb.address_hash
         ],
         lock: "FOR UPDATE"
       )
@@ -467,7 +467,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
       new_current_token_balance_query
       |> repo.all()
       # Enforce CurrentTokenBalance ShareLocks order (see docs: sharelocks.md)
-      |> Enum.sort_by(&{&1.address_hash, &1.token_contract_address_hash})
+      |> Enum.sort_by(&{&1.token_contract_address_hash, &1.address_hash})
 
     {_total, result} =
       repo.insert_all(

apps/indexer/lib/indexer/token_balances.ex

@@ -57,6 +57,7 @@ defmodule Indexer.TokenBalances do
     |> Enum.map(fn {_, grouped_address_token_balances} ->
       Enum.max_by(grouped_address_token_balances, fn %{block_number: block_number} -> block_number end)
     end)
+    |> Enum.sort_by(&{&1.token_contract_address_hash, &1.address_hash})
   end
 
   defp set_token_balance_value({:ok, balance}, token_balance) do