Merge branch 'master' into dont-process-nil-block-numbers

apps/block_scout_web/config/dev.exs

@@ -11,8 +11,8 @@ config :block_scout_web, BlockScoutWeb.Endpoint,
   https: [
     port: 4001,
     cipher_suite: :strong,
-    certfile: "priv/cert/selfsigned.pem",
-    keyfile: "priv/cert/selfsigned_key.pem"
+    certfile: System.get_env("CERTFILE") || "priv/cert/selfsigned.pem",
+    keyfile: System.get_env("KEYFILE") || "priv/cert/selfsigned_key.pem"
   ],
   debug_errors: true,
   code_reloader: true,

apps/explorer/priv/repo/migrations/20190208143201_add_index_on_address_hash_block_number_and_token_contract_address_hash_for_current_token_balance.exs

@@ -0,0 +1,7 @@
+defmodule Explorer.Repo.Migrations.AddIndexOnAddressHashBlockNumberAndTokenContractAddressHashForCurrentTokenBalance do
+  use Ecto.Migration
+
+  def change do
+    create(index(:address_current_token_balances, [:address_hash, :block_number, :token_contract_address_hash]))
+  end
+end