chore: upgrade phoenix and other deps (#918)

jyeshe · web-flow · commit f5b42702c01c · 2022-09-28T18:47:39.000+09:00
diff --git a/.dialyzer_ignore.exs b/.dialyzer_ignore.exs
@@ -3,7 +3,5 @@
   # created during runtime that belong to the AE core code.
   ~r/does not exist/,
   # Following warnings are due to bad implementation of riverside.
-  {"lib/phoenix/router.ex", :pattern_match, 402},
-  {"lib/riverside.ex", :pattern_match, 876},
-  {"lib/ae_mdw_web/websocket/socket_handler.ex", :overlapping_contract, 2}
+  {"lib/phoenix/router.ex", :pattern_match, 405}
 ]
diff --git a/.github/actions/mdw-setup/action.yml b/.github/actions/mdw-setup/action.yml
@@ -6,8 +6,8 @@ runs:
   steps:
     - uses: erlef/setup-beam@v1
       with:
-        otp-version: 23.3.4.5
-        elixir-version: 1.11.4
+        otp-version: 23.3.4.17
+        elixir-version: 1.13.4
 
     - name: Get Mdw dependencies
       shell: bash
diff --git a/.github/actions/tests-common/action.yml b/.github/actions/tests-common/action.yml
@@ -1,8 +1,5 @@
 name: 'Common Test setup'
-
-inputs:
-  deploy-key:
-    required: true
+description: 'Setup docker compose'
 
 runs:
   using: "composite"
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
@@ -93,7 +93,7 @@ jobs:
         id: plt-cache
         with:
           path: priv/plts
-          key: plts-v9-${{ hashFiles('mix.lock') }}
+          key: plts-v11-${{ hashFiles('mix.lock') }}
 
       - name: Mdw Setup
         uses: ./.github/actions/mdw-setup
diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,2 @@
 erlang 23.3.4.17
-#elixir 1.12.3-otp-22
-elixir 1.11.4-otp-23
+elixir 1.13.4-otp-23
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-FROM elixir:1.11.4
+FROM hexpm/elixir:1.13.4-erlang-23.3.4.17-debian-buster-20220801
 # Add required files to download and compile only the dependencies
 
 # Install other required dependencies
-RUN apt-get -qq update && apt-get -qq -y install curl libncurses5 libsodium-dev jq build-essential gcc g++ make libgmp10 \
+RUN apt-get -qq update && apt-get -qq -y install git curl libncurses5 libsodium-dev jq build-essential gcc g++ make libgmp10 \
     && ldconfig \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/config/dev.tools.sample.exs b/config/dev.tools.sample.exs
@@ -7,7 +7,7 @@ config :git_hooks,
     pre_commit: [
       verbose: true,
       tasks: [
-        "mix format --check-formatted --dry-run --check-equivalent"
+        "mix format --check-formatted --dry-run"
       ]
     ],
     pre_push: [
diff --git a/lib/ae_mdw/aex9.ex b/lib/ae_mdw/aex9.ex
@@ -204,7 +204,7 @@ defmodule AeMdw.Aex9 do
          {:ok, cursor} <- deserialize_history_cursor(cursor) do
       {first_gen, last_gen} =
         case range do
-          {:gen, %Range{first: first, last: last}} -> {first, last}
+          {:gen, first..last} -> {first, last}
           nil -> {0, DbUtil.last_gen(state)}
         end
 
diff --git a/lib/ae_mdw/blocks.ex b/lib/ae_mdw/blocks.ex
@@ -48,7 +48,7 @@ defmodule AeMdw.Blocks do
     range =
       case range do
         nil -> {0, last_gen}
-        {:gen, %Range{first: first, last: last}} -> {first, last}
+        {:gen, first..last} -> {first, last}
       end
 
     case Util.build_gen_pagination(cursor, direction, range, limit, last_gen) do
@@ -118,7 +118,7 @@ defmodule AeMdw.Blocks do
     range =
       case range do
         nil -> {0, last_gen}
-        {:gen, %Range{first: first, last: last}} -> {first, last}
+        {:gen, first..last} -> {first, last}
       end
 
     case Util.build_gen_pagination(cursor, direction, range, limit, last_gen) do
diff --git a/lib/ae_mdw/channels.ex b/lib/ae_mdw/channels.ex
@@ -110,7 +110,7 @@ defmodule AeMdw.Channels do
   defp serialize_cursor({{height, channel_pk}, is_reversed?}),
     do: {"#{height}-#{Enc.encode(:channel, channel_pk)}", is_reversed?}
 
-  defp deserialize_scope({:gen, %Range{first: first_gen, last: last_gen}}) do
+  defp deserialize_scope({:gen, first_gen..last_gen}) do
     {{first_gen, Util.min_bin()}, {last_gen, Util.max_256bit_bin()}}
   end
 
diff --git a/lib/ae_mdw/contracts.ex b/lib/ae_mdw/contracts.ex
@@ -415,18 +415,13 @@ defmodule AeMdw.Contracts do
 
   defp deserialize_scope(_state, nil), do: {@min_txi, @max_txi}
 
-  defp deserialize_scope(state, {:gen, %Range{first: first_gen, last: last_gen}}) do
-    deserialize_scope(
-      state,
-      {:txi,
-       %Range{
-         first: DBUtil.gen_to_txi(state, first_gen),
-         last: DBUtil.gen_to_txi(state, last_gen + 1) - 1
-       }}
-    )
+  defp deserialize_scope(state, {:gen, first_gen..last_gen}) do
+    first = DBUtil.gen_to_txi(state, first_gen)
+    last = DBUtil.gen_to_txi(state, last_gen + 1) - 1
+    deserialize_scope(state, {:txi, first..last})
   end
 
-  defp deserialize_scope(_state, {:txi, %Range{first: first_txi, last: last_txi}}) do
+  defp deserialize_scope(_state, {:txi, first_txi..last_txi}) do
     {first_txi, last_txi}
   end
 
diff --git a/lib/ae_mdw/names.ex b/lib/ae_mdw/names.ex
@@ -431,7 +431,7 @@ defmodule AeMdw.Names do
     |> Enum.map(&render_name_info(state, &1, opts))
   end
 
-  defp deserialize_scope({:gen, %Range{first: first_gen, last: last_gen}}) do
+  defp deserialize_scope({:gen, first_gen..last_gen}) do
     {{first_gen, Util.min_bin()}, {last_gen, Util.max_256bit_bin()}}
   end
 
diff --git a/lib/ae_mdw/oracles.ex b/lib/ae_mdw/oracles.ex
@@ -225,6 +225,6 @@ defmodule AeMdw.Oracles do
 
   defp deserialize_scope(nil), do: nil
 
-  defp deserialize_scope({:gen, %Range{first: first_gen, last: last_gen}}),
+  defp deserialize_scope({:gen, first_gen..last_gen}),
     do: {{first_gen, Util.min_bin()}, {last_gen, Util.max_256bit_bin()}}
 end
diff --git a/lib/ae_mdw/stats.ex b/lib/ae_mdw/stats.ex
@@ -78,7 +78,7 @@ defmodule AeMdw.Stats do
     range =
       case range do
         nil -> {1, last_gen}
-        {:gen, %Range{first: first, last: last}} -> {max(first, 1), last}
+        {:gen, first..last} -> {max(first, 1), last}
       end
 
     cursor = deserialize_cursor(cursor)
@@ -100,7 +100,7 @@ defmodule AeMdw.Stats do
     range =
       case range do
         nil -> {1, last_gen}
-        {:gen, %Range{first: first, last: last}} -> {max(first, 1), last}
+        {:gen, first..last} -> {max(first, 1), last}
       end
 
     cursor = deserialize_cursor(cursor)
@@ -123,7 +123,7 @@ defmodule AeMdw.Stats do
     range =
       case range do
         nil -> {1, last_gen}
-        {:gen, %Range{first: first, last: last}} -> {max(first, 1), last}
+        {:gen, first..last} -> {max(first, 1), last}
       end
 
     cursor = deserialize_cursor(cursor)
@@ -183,7 +183,7 @@ defmodule AeMdw.Stats do
     end
   end
 
-  defp render_stats(state, %Range{first: first, last: last}) do
+  defp render_stats(state, first..last) do
     Enum.map(first..last, fn height ->
       %{
         block_reward: block_reward,
diff --git a/lib/ae_mdw/transfers.ex b/lib/ae_mdw/transfers.ex
@@ -145,20 +145,15 @@ defmodule AeMdw.Transfers do
       Util.max_int()}}
   end
 
-  defp deserialize_scope(_state, {:gen, %Range{first: first_gen, last: last_gen}}) do
+  defp deserialize_scope(_state, {:gen, first_gen..last_gen}) do
     {{{first_gen, Util.min_int()}, Util.min_bin(), Util.min_bin(), Util.min_int()},
      {{last_gen, Util.max_int()}, Util.max_256bit_bin(), Util.max_256bit_bin(), Util.max_int()}}
   end
 
-  defp deserialize_scope(state, {:txi, %Range{first: first_txi, last: last_txi}}) do
-    deserialize_scope(
-      state,
-      {:gen,
-       %Range{
-         first: DBUtil.txi_to_gen(state, first_txi),
-         last: DBUtil.txi_to_gen(state, last_txi)
-       }}
-    )
+  defp deserialize_scope(state, {:txi, first_txi..last_txi}) do
+    first_gen = DBUtil.txi_to_gen(state, first_txi)
+    last_gen = DBUtil.txi_to_gen(state, last_txi)
+    deserialize_scope(state, {:gen, first_gen..last_gen})
   end
 
   defp deserialize_cursor(nil), do: nil
diff --git a/lib/ae_mdw/util.ex b/lib/ae_mdw/util.ex
@@ -210,21 +210,6 @@ defmodule AeMdw.Util do
   @spec min_256bit_int() :: integer()
   def min_256bit_int(), do: -0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 
-  @spec contains_unicode?(binary()) :: boolean()
-  def contains_unicode?(string) do
-    string
-    |> String.codepoints()
-    |> Enum.reduce_while(
-      false,
-      fn cp, false ->
-        case String.next_grapheme_size(cp) do
-          {1, ""} -> {:cont, false}
-          {_, ""} -> {:halt, true}
-        end
-      end
-    )
-  end
-
   @spec parse_int(binary()) :: {:ok, integer()} | :error
   def parse_int(int_bin) do
     case Integer.parse(int_bin) do
diff --git a/lib/ae_mdw_web/controllers/aex9_controller.ex b/lib/ae_mdw_web/controllers/aex9_controller.ex
@@ -350,10 +350,10 @@ defmodule AeMdwWeb.Aex9Controller do
 
   defp validate_range(range) do
     case parse_range(range) do
-      {:ok, %Range{first: f, last: l}} ->
+      {:ok, first..last} ->
         {:ok, top_kb} = :aec_chain.top_key_block()
-        first = max(0, f)
-        last = min(l, :aec_blocks.height(top_kb))
+        first = max(0, first)
+        last = min(last, :aec_blocks.height(top_kb))
 
         if last - first + 1 > @max_range_length do
           {:error,
diff --git a/lib/ae_mdw_web/util.ex b/lib/ae_mdw_web/util.ex
@@ -51,7 +51,7 @@ defmodule AeMdwWeb.Util do
     |> Enum.join("&")
   end
 
-  defp url_encode_scope({scope, %Range{first: a, last: b}}),
+  defp url_encode_scope({scope, a..b}),
     do: "#{scope}/#{a}-#{b}"
 
   defp path_no_scope([_ | _] = path_info),
diff --git a/mix.exs b/mix.exs
@@ -11,7 +11,7 @@ defmodule AeMdw.MixProject do
         warnings_as_errors: true
       ],
       aliases: aliases(),
-      compilers: [:phoenix, :gettext] ++ Mix.compilers(),
+      compilers: [:phoenix] ++ Mix.compilers(),
       start_permanent: Mix.env() == :prod,
       deps: deps(),
       xref: [
@@ -92,7 +92,8 @@ defmodule AeMdw.MixProject do
           :app_ctrl_server,
           :enacl,
           :sext,
-          :rocksdb
+          :rocksdb,
+          :telemetry
         ]
       ],
       dialyzer: dialyzer(),
@@ -133,25 +134,26 @@ defmodule AeMdw.MixProject do
       {:smart_global, github: "ks/smart_global"},
       {:smart_record, github: "ks/smart_record"},
       {:dbg, github: "fishcakez/dbg"},
-      {:phoenix, "~> 1.5.8"},
-      {:plug, "~> 1.11"},
+      {:phoenix, "~> 1.6.12"},
+      {:phoenix_html, "~> 3.0"},
+      {:esbuild, "~> 0.3", runtime: Mix.env() == :dev},
+      {:plug, "~> 1.13"},
       {:cors_plug, "~> 2.0"},
-      {:gettext, "~> 0.11"},
-      {:jason, "~> 1.0"},
+      {:gettext, "~> 0.20"},
+      {:jason, "~> 1.4"},
       {:poison, "~> 5.0"},
-      {:plug_cowboy, "~> 2.0"},
+      {:plug_cowboy, "~> 2.5"},
       {:riverside, "~> 2.2.1"},
-      {:websockex, "~> 0.4.2"},
+      {:websockex, "~> 0.4.3"},
       {:temp, "~> 0.4"},
       {:tesla, "~> 1.3.0"},
-      {:dialyxir, "~> 1.0", only: :dev, runtime: false},
+      {:dialyxir, "~> 1.2", only: :dev, runtime: false},
       {:git_hooks, "~> 0.5.0", only: :dev, runtime: false},
       {:mock, "~> 0.3.0", only: :test},
-      {:phoenix_html, "~> 2.11"},
-      {:credo, "~> 1.5", only: [:dev, :test], runtime: false},
+      {:credo, "~> 1.6", only: [:dev, :test], runtime: false},
       {:benchee, "~> 1.0.0", only: [:dev]},
       {:ex_json_schema, "~> 0.7.1"},
-      {:excoveralls, "~> 0.10", only: :test},
+      {:excoveralls, "~> 0.14", only: :test},
       {:gen_state_machine, "~> 2.0"}
     ]
   end
diff --git a/mix.lock b/mix.lock

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,5 @@`
`3`	`3`	`# created during runtime that belong to the AE core code.`
`4`	`4`	`~r/does not exist/,`
`5`	`5`	`# Following warnings are due to bad implementation of riverside.`
`6`		`- {"lib/phoenix/router.ex", :pattern_match, 402},`
`7`		`- {"lib/riverside.ex", :pattern_match, 876},`
`8`		`- {"lib/ae_mdw_web/websocket/socket_handler.ex", :overlapping_contract, 2}`
	`6`	`+ {"lib/phoenix/router.ex", :pattern_match, 405}`
`9`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ config :git_hooks,`
`7`	`7`	`pre_commit: [`
`8`	`8`	`verbose: true,`
`9`	`9`	`tasks: [`
`10`		`- "mix format --check-formatted --dry-run --check-equivalent"`
	`10`	`+ "mix format --check-formatted --dry-run"`
`11`	`11`	`]`
`12`	`12`	`],`
`13`	`13`	`pre_push: [`