Merge branch 'master' into ab-decompiled-contract-improvements

CHANGELOG.md

@@ -9,6 +9,7 @@
  - [#1724](https://github.com/poanetwork/blockscout/pull/1724) - Remove internal tx and token balance fetching from realtime fetcher
  - [#1727](https://github.com/poanetwork/blockscout/pull/1727) - add logs pagination in rpc api
  - [#1740](https://github.com/poanetwork/blockscout/pull/1740) - fix empty block time
+ - [#1743](https://github.com/poanetwork/blockscout/pull/1743) - sort decompiled smart contracts in lexicographical order
 
 ### Chore
 

apps/block_scout_web/lib/block_scout_web/templates/address_decompiled_contract/index.html.eex

@@ -6,7 +6,7 @@
       <%= render BlockScoutWeb.AddressView, "_tabs.html", assigns %>
     </div>
 
-    <%= for {contract, _i} <- Enum.with_index(@address.decompiled_smart_contracts) do %>
+    <%= for contract <- sort_contracts_by_version(@address.decompiled_smart_contracts) do %>
       <div class="card-body">
         <h3><%= gettext "Decompiler version" %></h3>
         <div class="tile tile-muted">

apps/block_scout_web/lib/block_scout_web/views/address_decompiled_contract_view.ex

@@ -13,7 +13,7 @@ defmodule BlockScoutWeb.AddressDecompiledContractView do
     "\e[93m" => "57, 115, 0",
     # yellow
     "\e[92m" => "119, 232, 81",
-    # purple
+    # red
     "\e[94m" => "136, 0, 0"
   }
 
@@ -28,6 +28,12 @@ defmodule BlockScoutWeb.AddressDecompiledContractView do
     |> add_line_numbers()
   end
 
+  def sort_contracts_by_version(decompiled_contracts) do
+    decompiled_contracts
+    |> Enum.sort_by(& &1.decompiler_version)
+    |> Enum.reverse()
+  end
+
   defp add_line_numbers(code) do
     code
     |> String.split("\n")

apps/block_scout_web/test/block_scout_web/views/address_decompiled_contract_view_test.exs

@@ -1,5 +1,5 @@
 defmodule BlockScoutWeb.AddressDecompiledContractViewTest do
-  use BlockScoutWeb.ConnCase, async: true
+  use Explorer.DataCase
 
   alias BlockScoutWeb.AddressDecompiledContractView
 
@@ -59,4 +59,16 @@ defmodule BlockScoutWeb.AddressDecompiledContractViewTest do
                "<code>  <span style=\"color:rgb(111, 110, 111)\">#</code>\n<code>  #  eveem.org 6 Feb 2019</code>\n<code>  #  Decompiled source of </span>0x00Bd9e214FAb74d6fC21bf1aF34261765f57e875<span style=\"color:rgb(111, 110, 111)\"></code>\n<code>  #</code>\n<code>  #  Let's make the world open source</code>\n<code>  # </span></code>\n<code>  <span style=\"color:rgb(111, 110, 111)\">#</code>\n<code>  #  I failed with these:</code>\n<code>  </span><span style=\"color:rgb(111, 110, 111)\">#  - </span><span style=\"color:rgb(236, 89, 58)\">unknowne77c646d(?)</span><span style=\"color:rgb(111, 110, 111)\"></code>\n<code>  </span><span style=\"color:rgb(111, 110, 111)\">#  - </span><span style=\"color:rgb(236, 89, 58)\">transferFromWithData(address _from, address _to, uint256 _value, bytes _data)</span><span style=\"color:rgb(111, 110, 111)\"></code>\n<code>  #  All the rest is below.</code>\n<code>  #</span></code>\n<code></code>\n<code></code>\n<code>  <span style=\"color:rgb(111, 110, 111)\">#  Storage definitions and getters</span></code>\n<code></code>\n<code>  <span style=\"color:rgb(57, 115, 0)\">def</span> storage:</code>\n<code>    <span style=\"color:rgb(57, 115, 0)\">allowance</span> is uint256 => uint256 <span style=\"color:rgb(111, 110, 111)\"># mask(256, 0) at storage #2</span></code>\n<code>    <span style=\"color:rgb(57, 115, 0)\">stor4</span> is uint256 => uint8 <span style=\"color:rgb(111, 110, 111)\"># mask(8, 0) at storage #4</span></code>\n<code></code>\n<code>  <span style=\"color:rgb(136, 0, 0)\">def </span>allowance(address <span style=\"color:rgb(57, 115, 0)\">_owner</span>, address <span style=\"color:rgb(57, 115, 0)\">_spender</span>) <span style=\"color:rgb(136, 0, 0)\">payable</span>: <span style=\"color:rgb(111, 110, 111)\"></span></code>\n<code>    require (calldata.size - 4)<span style=\"font-weight:bold\"> >= </span>64</code>\n<code>    return <span style=\"color:rgb(57, 115, 0)\">allowance</span><span style=\"color:rgb(57, 115, 0)\">[</span>sha3(((320 - 1)<span style=\"font-weight:bold\"> and </span>(320 - 1)<span style=\"font-weight:bold\"> and </span><span style=\"color:rgb(57, 115, 0)\">_owner</span>), 1), ((320 - 1)<span style=\"font-weight:bold\"> and </span><span style=\"color:rgb(57, 115, 0)\">_spender</span><span style=\"font-weight:bold\"> and </span>(320 - 1))<span style=\"color:rgb(57, 115, 0)\">]</span></code>\n<code></code>\n<code></code>\n<code>  <span style=\"color:rgb(111, 110, 111)\">#</code>\n<code>  #  Regular functions - see Tutorial for understanding quirks of the code</code>\n<code>  #</span></code>\n<code></code>\n<code></code>\n<code>  <span style=\"color:rgb(111, 110, 111)\"># folder failed in this function - may be terribly long, sorry</span></code>\n<code>  <span style=\"color:rgb(136, 0, 0)\">def </span>unknownc47d033b(?) <span style=\"color:rgb(136, 0, 0)\">payable</span>: <span style=\"color:rgb(111, 110, 111)\"></span></code>\n<code>    if (calldata.size - 4)<span style=\"font-weight:bold\"> < </span>32:</code>\n<code>        revert</code>\n<code>    else:</code>\n<code>        if not (320 - 1)<span style=\"font-weight:bold\"> or </span>not cd[4]:</code>\n<code>            revert</code>\n<code>        else:</code>\n<code>            <span style=\"color:rgb(136, 0, 0)\">mem[</span>0<span style=\"color:rgb(136, 0, 0)\">]</span> = (320 - 1)<span style=\"font-weight:bold\"> and </span>(320 - 1)<span style=\"font-weight:bold\"> and </span>cd[4]</code>\n<code>            <span style=\"color:rgb(136, 0, 0)\">mem[</span>32<span style=\"color:rgb(136, 0, 0)\">]</span> = 4</code>\n<code>            <span style=\"color:rgb(136, 0, 0)\">mem[</span>96<span style=\"color:rgb(136, 0, 0)\">]</span> = bool(<span style=\"color:rgb(57, 115, 0)\">stor4</span><span style=\"color:rgb(57, 115, 0)\">[</span>((320 - 1)<span style=\"font-weight:bold\"> and </span>(320 - 1)<span style=\"font-weight:bold\"> and </span>cd[4])<span style=\"color:rgb(57, 115, 0)\">]</span>)</code>\n<code>            return bool(<span style=\"color:rgb(57, 115, 0)\">stor4</span><span style=\"color:rgb(57, 115, 0)\">[</span>((320 - 1)<span style=\"font-weight:bold\"> and </span>(320 - 1)<span style=\"font-weight:bold\"> and </span>cd[4])<span style=\"color:rgb(57, 115, 0)\">]</span>)</code>\n<code></code>\n<code>  <span style=\"color:rgb(136, 0, 0)\">def </span>_fallback() <span style=\"color:rgb(136, 0, 0)\">payable</span>: <span style=\"color:rgb(111, 110, 111)\"># default function</span></code>\n<code>    revert</code>\n<code></code>\n"
     end
   end
+
+  describe "sort_contracts_by_version/1" do
+    test "sorts contracts in lexicographical order" do
+      contract2 = insert(:decompiled_smart_contract, decompiler_version: "v2")
+      contract1 = insert(:decompiled_smart_contract, decompiler_version: "v1")
+      contract3 = insert(:decompiled_smart_contract, decompiler_version: "v3")
+
+      result = AddressDecompiledContractView.sort_contracts_by_version([contract2, contract1, contract3])
+
+      assert result == [contract3, contract2, contract1]
+    end
+  end
 end