From a66e2b6e8384a234ffc728e33de885c067a087b0 Mon Sep 17 00:00:00 2001
From: Tim Mecklem <timothy@mecklem.com>
Date: Tue, 5 Jun 2018 15:16:20 -0400
Subject: [PATCH] Remove joins to address table

Co-authored-by: Stamates <stamates@hotmail.com>
---
 .../explorer_web/controllers/transaction_controller.ex |  4 +---
 .../lib/explorer_web/templates/address/_link.html.eex  | 10 +++++-----
 .../address_internal_transaction/index.html.eex        |  4 ++--
 .../templates/address_transaction/index.html.eex       |  4 ++--
 .../templates/block_transaction/index.html.eex         |  4 ++--
 .../lib/explorer_web/templates/chain/_blocks.html.eex  |  2 +-
 .../templates/chain/_transactions.html.eex             |  4 ++--
 .../templates/pending_transaction/index.html.eex       |  4 ++--
 .../explorer_web/templates/transaction/index.html.eex  |  4 ++--
 .../transaction_internal_transaction/index.html.eex    |  4 ++--
 .../lib/explorer_web/views/address_view.ex             |  3 ++-
 11 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/apps/explorer_web/lib/explorer_web/controllers/transaction_controller.ex b/apps/explorer_web/lib/explorer_web/controllers/transaction_controller.ex
index 684703e036..e262d55711 100644
--- a/apps/explorer_web/lib/explorer_web/controllers/transaction_controller.ex
+++ b/apps/explorer_web/lib/explorer_web/controllers/transaction_controller.ex
@@ -22,9 +22,7 @@ defmodule ExplorerWeb.TransactionController do
       Keyword.merge(
         [
           necessity_by_association: %{
-            block: :required,
-            from_address: :optional,
-            to_address: :optional
+            block: :required
           }
         ],
         options
diff --git a/apps/explorer_web/lib/explorer_web/templates/address/_link.html.eex b/apps/explorer_web/lib/explorer_web/templates/address/_link.html.eex
index d82944a646..96a579f41a 100644
--- a/apps/explorer_web/lib/explorer_web/templates/address/_link.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/address/_link.html.eex
@@ -1,14 +1,14 @@
 <div class="address-link">
-<%= if @address do %>
-  <%= link to: address_path(@conn, :show, @conn.assigns.locale, @address),
+<%= if @address_hash do %>
+  <%= link to: address_path(@conn, :show, @conn.assigns.locale, @address_hash),
       "data-toggle": "tooltip",
       "data-placement": "top",
       class: "address-link__font",
-      title: @address do %>
+      title: @address_hash do %>
         <i class="address-link__type fas fa-address-card"></i>
-    <%= @address |> hash |> String.slice(0..3) %><i class="fas fa-ellipsis-v address-link__seperator"></i><%= @address |> hash |> String.slice(-4..-1) %>
+    <%= @address_hash |> hash() |> String.slice(0..3) %><i class="fas fa-ellipsis-v address-link__seperator"></i><%= @address_hash |> hash() |> String.slice(-4..-1) %>
 <% end %>
-<button class="address-link__copy-button" data-clipboard-text="<%= @address %>" aria-label="copy address">
+<button class="address-link__copy-button" data-clipboard-text="<%= @address_hash %>" aria-label="copy address">
   <i class="fa fa-copy"></i>
 </button>
 <% end %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/address_internal_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/address_internal_transaction/index.html.eex
index af48cf81a1..41c16e7d0a 100644
--- a/apps/explorer_web/lib/explorer_web/templates/address_internal_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/address_internal_transaction/index.html.eex
@@ -96,10 +96,10 @@
                   </td>
                   <td><%= ExplorerWeb.BlockView.age(internal_transaction.transaction.block) %></td>
                   <td>
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.from_address %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: internal_transaction.from_address_hash %>
                   </td>
                   <td>
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.to_address %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: internal_transaction.to_address_hash %>
                   </td>
                   <td><%= ExplorerWeb.TransactionView.value(internal_transaction, include_label: false) %></td>
                 </tr>
diff --git a/apps/explorer_web/lib/explorer_web/templates/address_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/address_transaction/index.html.eex
index 8169efebf8..a5e510bd5f 100644
--- a/apps/explorer_web/lib/explorer_web/templates/address_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/address_transaction/index.html.eex
@@ -103,11 +103,11 @@
                 </td>
                 <td><%= transaction.block.timestamp |> Timex.from_now %></td>
                 <td class="address-cell">
-                  <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
+                  <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
                 </td>
                 <td class="u-text-center"><i class="fas fa-arrow-circle-right"></i></td>
                 <td>
-                  <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
+                  <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
                 </td>
                 <td><%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %></td>
                 <td><%= ExplorerWeb.TransactionView.formatted_fee(transaction, denomination: :ether) %></td>
diff --git a/apps/explorer_web/lib/explorer_web/templates/block_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/block_transaction/index.html.eex
index b0cefd869e..5a8b6e1e54 100644
--- a/apps/explorer_web/lib/explorer_web/templates/block_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/block_transaction/index.html.eex
@@ -164,11 +164,11 @@
                     <%= transaction.block.timestamp |> Timex.from_now %>
                   </td>
                   <td class="address-cell">
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
                   </td>
                   <td class="u-text-center"><i class="fas fa-arrow-circle-right"></i></td>
                   <td>
-                      <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
+                      <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
                   </td>
                   <td>
                     <%= ExplorerWeb.TransactionView.value(transaction) %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/chain/_blocks.html.eex b/apps/explorer_web/lib/explorer_web/templates/chain/_blocks.html.eex
index 4963d97113..4e132eef91 100644
--- a/apps/explorer_web/lib/explorer_web/templates/chain/_blocks.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/chain/_blocks.html.eex
@@ -21,7 +21,7 @@
           <td><%= block.transactions |> Enum.count %></td>
           <td><%= block.gas_used |> Cldr.Number.to_string! %></td>
           <td>
-            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: block.miner %>
+            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: block.miner_hash %>
           </td>
         </tr>
         <% end %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex b/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex
index ed4d1bff71..09423bf7d1 100644
--- a/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex
@@ -17,10 +17,10 @@
             <%= render ExplorerWeb.TransactionView, "_link.html", conn: @conn, transaction: transaction %>
           </td>
           <td>
-            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
+            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
           </td>
           <td>
-            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
+            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
           </td>
           <td><%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> </td>
           <td><%= transaction.block.timestamp |> Timex.from_now() %></td>
diff --git a/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex
index e3ef865c36..650c41ace2 100644
--- a/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex
@@ -50,10 +50,10 @@
               </td>
               <td><%= last_seen(transaction) %></td>
               <td>
-                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
+                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
               </td>
               <td>
-                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
+                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
               </td>
               <td>
               <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex
index fa4cebb868..44ea0a3436 100644
--- a/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex
@@ -59,10 +59,10 @@
                 <%= transaction.block.timestamp %>
               </td>
               <td>
-                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
+                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
               </td>
               <td>
-                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
+                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
               </td>
               <td>
                 <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/transaction_internal_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/transaction_internal_transaction/index.html.eex
index a011aa9b84..ad71b65430 100644
--- a/apps/explorer_web/lib/explorer_web/templates/transaction_internal_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/transaction_internal_transaction/index.html.eex
@@ -38,10 +38,10 @@
                 <tr>
                   <td><%= internal_transaction.call_type %></td>
                   <td>
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.from_address %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: internal_transaction.from_address_hash %>
                   </td>
                   <td>
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.to_address %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: internal_transaction.to_address_hash %>
                   </td>
                   <td><%= ExplorerWeb.TransactionView.value(internal_transaction, include_label: false) %></td>
                   <td><%= ExplorerWeb.TransactionView.gas(internal_transaction) %></td>
diff --git a/apps/explorer_web/lib/explorer_web/views/address_view.ex b/apps/explorer_web/lib/explorer_web/views/address_view.ex
index fe130f9c29..2c75f3a403 100644
--- a/apps/explorer_web/lib/explorer_web/views/address_view.ex
+++ b/apps/explorer_web/lib/explorer_web/views/address_view.ex
@@ -2,6 +2,7 @@ defmodule ExplorerWeb.AddressView do
   use ExplorerWeb, :view
 
   alias Explorer.Chain.{Address, Wei}
+  alias Explorer.Chain.Hash
   alias Explorer.ExchangeRates.Token
   alias ExplorerWeb.ExchangeRates.USD
 
@@ -41,7 +42,7 @@ defmodule ExplorerWeb.AddressView do
     end
   end
 
-  def hash(%Address{hash: hash}) do
+  def hash(%Hash{} = hash) do
     to_string(hash)
   end