TokenBalanceOnDemand ERC-1155 support

2 years ago · 622d11e009
parent 32b1959480
commit 622d11e009
4 changed files with 49 additions and 19 deletions
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@ -38,7 +38,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-

@ -98,7 +98,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -122,7 +122,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -145,7 +145,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -185,7 +185,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -211,7 +211,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -240,7 +240,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -285,7 +285,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -331,7 +331,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -388,7 +388,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -442,7 +442,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -507,7 +507,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

@ -571,7 +571,7 @@ jobs:
          path: |
            deps
            _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_17-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_18-${{ hashFiles('mix.lock') }}
          restore-keys: |
            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,6 +8,7 @@
 - [#6694](https://github.com/blockscout/blockscout/pull/6694) - Add withdrawals support (EIP-4895)
 - [#7355](https://github.com/blockscout/blockscout/pull/7355) - Add endpoint for token info import
 - [#7393](https://github.com/blockscout/blockscout/pull/7393) - Realtime fetcher max gap
+- [#7436](https://github.com/blockscout/blockscout/pull/7436) - TokenBalanceOnDemand ERC-1155 support

 ### Fixes
 - [#7391](https://github.com/blockscout/blockscout/pull/7391) - Fix: cannot read properties of null (reading 'value')
--- a/apps/explorer/lib/explorer/token/balance_reader.ex
+++ b/apps/explorer/lib/explorer/token/balance_reader.ex
@ -40,7 +40,12 @@ defmodule Explorer.Token.BalanceReader do
  ]

  @spec get_balances_of([
-          %{token_contract_address_hash: String.t(), address_hash: String.t(), block_number: non_neg_integer()}
+          %{
+            token_contract_address_hash: String.t(),
+            address_hash: String.t(),
+            block_number: non_neg_integer(),
+            token_id: non_neg_integer() | nil
+          }
        ]) :: [{:ok, non_neg_integer()} | {:error, String.t()}]
  def get_balances_of(token_balance_requests) do
    token_balance_requests
@ -51,7 +56,12 @@ defmodule Explorer.Token.BalanceReader do

  @spec get_balances_of_with_abi(
          [
-            %{token_contract_address_hash: String.t(), address_hash: String.t(), block_number: non_neg_integer()}
+            %{
+              token_contract_address_hash: String.t(),
+              address_hash: String.t(),
+              block_number: non_neg_integer(),
+              token_id: non_neg_integer() | nil
+            }
          ],
          [%{}]
        ) :: [{:ok, non_neg_integer()} | {:error, String.t()}]
@ -74,6 +84,18 @@ defmodule Explorer.Token.BalanceReader do
    end
  end

+  @spec get_balances_of_erc_1155([
+          %{
+            token_contract_address_hash: String.t(),
+            address_hash: String.t(),
+            block_number: non_neg_integer(),
+            token_id: non_neg_integer() | nil
+          }
+        ]) :: [{:ok, non_neg_integer()} | {:error, String.t()}]
+  def get_balances_of_erc_1155(token_balance_requests) do
+    get_balances_of_with_abi(token_balance_requests, @erc1155_balance_function_abi)
+  end
+
  defp format_balance_request(%{
         address_hash: address_hash,
         block_number: block_number,
--- a/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
+++ b/apps/indexer/lib/indexer/fetcher/token_balance_on_demand.ex
@ -49,16 +49,22 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
  defp fetch_and_update(block_number, address_hash, stale_current_token_balances) do
    current_token_balances_update_params =
      stale_current_token_balances
-      |> Enum.map(fn {stale_current_token_balance, token} ->
+      |> Enum.map(fn {%{token_id: token_id} = stale_current_token_balance, token} ->
        stale_current_token_balances_to_fetch = [
          %{
            token_contract_address_hash: "0x" <> Base.encode16(token.contract_address_hash.bytes),
            address_hash: "0x" <> Base.encode16(address_hash.bytes),
-            block_number: block_number
+            block_number: block_number,
+            token_id: token_id && Decimal.to_integer(token_id)
          }
        ]

-        balance_response = BalanceReader.get_balances_of(stale_current_token_balances_to_fetch)
+        balance_response =
+          case stale_current_token_balance.token_type do
+            "ERC-1155" -> BalanceReader.get_balances_of_erc_1155(stale_current_token_balances_to_fetch)
+            _ -> BalanceReader.get_balances_of(stale_current_token_balances_to_fetch)
+          end
+
        updated_balance = balance_response[:ok]

        if updated_balance do
@ -66,6 +72,7 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
          |> Map.put(:address_hash, stale_current_token_balance.address_hash)
          |> Map.put(:token_contract_address_hash, token.contract_address_hash)
          |> Map.put(:token_type, token.type)
+          |> Map.put(:token_id, token_id)
          |> Map.put(:block_number, block_number)
          |> Map.put(:value, Decimal.new(updated_balance))
          |> Map.put(:value_fetched_at, DateTime.utc_now())
@ -106,7 +113,7 @@ defmodule Indexer.Fetcher.TokenBalanceOnDemand do
          {:error, :empty_database}
        else
          threshold = Application.get_env(:indexer, __MODULE__)[:threshold]
-          block_number - div(:timer.minutes(threshold), average_block_time)
+          block_number - div(threshold, average_block_time)
        end
    end
  end