Leaderboard query

.gitignore

@@ -43,6 +43,8 @@ screenshots/
 *.iml
 .idea/
 
+tmpbriefly*
+
 # mix phx.gen.cert self-signed certs for dev
 /apps/block_scout_web/priv/cert
 

apps/block_scout_web/lib/block_scout_web/resolvers/address.ex

@@ -1,7 +1,9 @@
 defmodule BlockScoutWeb.Resolvers.Address do
   @moduledoc false
 
-  alias Explorer.Chain
+  alias Absinthe.Relay.Connection
+  alias Explorer.{Chain, GraphQL, Repo}
+  alias Explorer.Chain.CeloAccount
 
   def get_by(_, %{hashes: hashes}, _) do
     case Chain.hashes_to_addresses(hashes) do
@@ -12,8 +14,17 @@ defmodule BlockScoutWeb.Resolvers.Address do
 
   def get_by(_, %{hash: hash}, _) do
     case Chain.hash_to_address(hash) do
-      {:error, :not_found} -> {:error, "Address not found."}
-      {:ok, _} = result -> result
+      {:error, :not_found} ->
+        {:error, "Address not found."}
+
+      {:ok, _} = result ->
+        result
     end
   end
+
+  def get_by(%CeloAccount{address: hash}, args, _) do
+    hash
+    |> GraphQL.address_query()
+    |> Connection.from_query(&Repo.all/1, args, [])
+  end
 end

apps/block_scout_web/lib/block_scout_web/resolvers/celo_account.ex

@@ -0,0 +1,20 @@
+defmodule BlockScoutWeb.Resolvers.CeloAccount do
+  @moduledoc false
+
+  alias Absinthe.Relay.Connection
+  alias Explorer.{Chain, GraphQL, Repo}
+  alias Explorer.Chain.Address
+
+  def get_by(_, %{hash: hash}, _) do
+    case Chain.get_celo_account(hash) do
+      {:error, :not_found} -> {:error, "Celo account not found."}
+      {:ok, _} = result -> result
+    end
+  end
+
+  def get_by(%Address{hash: hash}, args, _) do
+    hash
+    |> GraphQL.address_to_account_query()
+    |> Connection.from_query(&Repo.all/1, args, [])
+  end
+end

apps/block_scout_web/lib/block_scout_web/resolvers/competitor.ex

@@ -0,0 +1,20 @@
+defmodule BlockScoutWeb.Resolvers.Competitor do
+  @moduledoc false
+
+  alias Explorer.Chain
+  #    alias Explorer.Chain.Hash
+  #    alias Explorer.Chain.Hash.Address
+
+  def get_by(_, _, _) do
+    case Chain.query_leaderboard() do
+      {:error, :not_found} ->
+        {:error, "Leaderboard broken."}
+
+      {:ok, lst} ->
+        {:ok,
+         Enum.map(lst, fn [address, name, score] ->
+           %{address: "0x" <> Base.encode16(address), identity: name, points: score}
+         end)}
+    end
+  end
+end

apps/block_scout_web/lib/block_scout_web/schema.ex

@@ -10,6 +10,8 @@ defmodule BlockScoutWeb.Schema do
   alias BlockScoutWeb.Resolvers.{
     Address,
     Block,
+    CeloAccount,
+    Competitor,
     InternalTransaction,
     TokenTransfer,
     Transaction
@@ -66,6 +68,17 @@ defmodule BlockScoutWeb.Schema do
       resolve(&Address.get_by/3)
     end
 
+    @desc "Gets the leaderboard"
+    field :leaderboard, list_of(:competitor) do
+      resolve(&Competitor.get_by/3)
+    end
+
+    @desc "Gets an account by address hash."
+    field :celo_account, :celo_account do
+      arg(:hash, non_null(:address_hash))
+      resolve(&CeloAccount.get_by/3)
+    end
+
     @desc "Gets addresses by address hash."
     field :addresses, list_of(:address) do
       arg(:hashes, non_null(list_of(non_null(:address_hash))))

apps/block_scout_web/lib/block_scout_web/schema/types.ex

@@ -7,13 +7,18 @@ defmodule BlockScoutWeb.Schema.Types do
   import Absinthe.Resolution.Helpers
 
   alias BlockScoutWeb.Resolvers.{
+    Address,
+    CeloAccount,
     InternalTransaction,
     Transaction
   }
 
   import_types(Absinthe.Type.Custom)
   import_types(BlockScoutWeb.Schema.Scalars)
 
+  connection(node_type: :celo_account)
+  connection(node_type: :competitor)
+  connection(node_type: :address)
   connection(node_type: :transaction)
   connection(node_type: :internal_transaction)
   connection(node_type: :token_transfer)
@@ -31,6 +36,10 @@ defmodule BlockScoutWeb.Schema.Types do
       resolve(dataloader(:db, :smart_contract))
     end
 
+    connection field(:celo_account, node_type: :celo_account) do
+      resolve(&CeloAccount.get_by/3)
+    end
+
     connection field(:transactions, node_type: :transaction) do
       arg(:count, :integer)
       resolve(&Transaction.get_by/3)
@@ -45,6 +54,20 @@ defmodule BlockScoutWeb.Schema.Types do
     end
   end
 
+  @desc """
+  Celo account information
+  """
+  object :celo_account do
+    field(:address, :address_hash)
+    field(:account_type, :string)
+    field(:nonvoting_locked_gold, :wei)
+    field(:locked_gold, :wei)
+
+    connection field(:address_info, node_type: :address) do
+      resolve(&Address.get_by/3)
+    end
+  end
+
   @desc """
   A package of data that contains zero or more transactions, the hash of the previous block ("parent"), and optionally
   other data. Because each block (except for the initial "genesis block") points to the previous block, the data
@@ -65,6 +88,15 @@ defmodule BlockScoutWeb.Schema.Types do
     field(:parent_hash, :full_hash)
   end
 
+  @desc """
+  Leaderboard entry 
+  """
+  object :competitor do
+    field(:address, :address_hash)
+    field(:points, :float)
+    field(:identity, :string)
+  end
+
   @desc """
   Models internal transactions.
   """

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex

@@ -318,6 +318,10 @@ defmodule EthereumJSONRPC do
     Receipts.fetch(transactions_params, json_rpc_named_arguments)
   end
 
+  def fetch_logs(from..to, json_rpc_named_arguments) do
+    Receipts.fetch_logs(from, to, json_rpc_named_arguments)
+  end
+
   @doc """
   Assigns an id to each set of params in `params_list` for batch request-response correlation
   """
@@ -343,10 +347,10 @@ defmodule EthereumJSONRPC do
   @spec json_rpc(Transport.batch_request(), json_rpc_named_arguments) ::
           {:ok, Transport.batch_response()} | {:error, reason :: term()}
   def json_rpc(request, named_arguments) when (is_map(request) or is_list(request)) and is_list(named_arguments) do
+    # IO.inspect(request)
     transport = Keyword.fetch!(named_arguments, :transport)
     transport_options = Keyword.fetch!(named_arguments, :transport_options)
     throttle_timeout = Keyword.get(named_arguments, :throttle_timeout, @default_throttle_timeout)
-
     RequestCoordinator.perform(request, transport, transport_options, throttle_timeout)
   end
 

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/contract.ex

@@ -52,6 +52,9 @@ defmodule EthereumJSONRPC.Contract do
       end
       |> Enum.into(%{}, &{&1.id, &1})
 
+    # IO.inspect(requests)
+    # IO.inspect(indexed_responses)
+
     Enum.map(requests_with_index, fn {%{function_name: function_name}, index} ->
       selectors = Enum.filter(parsed_abi, fn p_abi -> p_abi.function == function_name end)
 
@@ -80,7 +83,7 @@ defmodule EthereumJSONRPC.Contract do
     request(%{
       id: id,
       method: "eth_call",
-      params: [%{to: contract_address, data: data}, block]
+      params: [%{to: contract_address, data: data, gasPrice: "0x1000000000000000000"}, block]
     })
   end
 

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex

@@ -145,6 +145,30 @@ defmodule EthereumJSONRPC.Receipts do
     end
   end
 
+  def fetch_logs(to, from, json_rpc_named_arguments) do
+    requests = [
+      %{
+        id: 123,
+        method: "eth_getLogs",
+        jsonrpc: "2.0",
+        params: [
+          %{
+            fromBlock: "0x" <> Integer.to_string(from, 16),
+            toBlock: "0x" <> Integer.to_string(to, 16)
+          }
+        ]
+      }
+    ]
+
+    with {:ok, responses} <- json_rpc(requests, json_rpc_named_arguments),
+         {:ok, orig_logs} <- reduce_logs_responses(responses) do
+      elixir_logs = Logs.to_elixir(orig_logs)
+      logs = Logs.elixir_to_params(elixir_logs)
+
+      {:ok, %{logs: logs}}
+    end
+  end
+
   @doc """
   Converts stringly typed fields to native Elixir types.
 
@@ -244,10 +268,24 @@ defmodule EthereumJSONRPC.Receipts do
     |> Enum.reduce({:ok, []}, &reduce_receipt(&1, &2))
   end
 
+  defp reduce_logs_responses(responses)
+       when is_list(responses) do
+    responses
+    |> Enum.reduce({:ok, []}, &reduce_logs_receipt(&1, &2))
+  end
+
   defp reduce_receipt({:ok, receipt}, {:ok, receipts}) when is_list(receipts),
     do: {:ok, [receipt | receipts]}
 
   defp reduce_receipt({:ok, _}, {:error, _} = error), do: error
   defp reduce_receipt({:error, reason}, {:ok, _}), do: {:error, [reason]}
   defp reduce_receipt({:error, reason}, {:error, reasons}) when is_list(reasons), do: {:error, [reason | reasons]}
+
+  defp reduce_logs_receipt(%{result: receipt}, {:ok, receipts}) when is_list(receipts) do
+    {:ok, receipt ++ receipts}
+  end
+
+  defp reduce_logs_receipt(%{result: _}, {:error, _} = error), do: error
+  defp reduce_logs_receipt(%{error: reason}, {:ok, _}), do: {:error, [reason]}
+  defp reduce_logs_receipt(%{error: reason}, {:error, reasons}) when is_list(reasons), do: {:error, [reason | reasons]}
 end

apps/explorer/config/config.exs

@@ -90,12 +90,6 @@ config :explorer, Explorer.Staking.PoolsReader,
   validators_contract_address: System.get_env("POS_VALIDATORS_CONTRACT"),
   staking_contract_address: System.get_env("POS_STAKING_CONTRACT")
 
-config :explorer, Explorer.Celo.AccountReader,
-  accounts_contract_address: System.get_env("ACCOUNTS_CONTRACT_ADDRESS"),
-  validators_contract_address: System.get_env("VALIDATORS_CONTRACT_ADDRESS"),
-  lockedgold_contract_address: System.get_env("LOCKEDGOLD_CONTRACT_ADDRESS"),
-  election_contract_address: System.get_env("ELECTION_CONTRACT_ADDRESS")
-
 if System.get_env("POS_STAKING_CONTRACT") do
   config :explorer, Explorer.Staking.EpochCounter,
     enabled: true,

apps/explorer/lib/explorer/celo/abi_handler.ex

@@ -12,7 +12,14 @@ defmodule Explorer.Celo.AbiHandler do
 
   @impl GenServer
   def init(_) do
-    contract_abi = abi("lockedgold.json") ++ abi("validators.json") ++ abi("election.json") ++ abi("accounts.json")
+    contract_abi =
+      abi("lockedgold.json") ++
+        abi("validators.json") ++
+        abi("election.json") ++
+        abi("accounts.json") ++
+        abi("registry.json") ++
+        abi("erc20.json")
+
     {:ok, contract_abi}
   end