Skip to content

Commit 7fe5bb9

Browse files
chore: bump elixir to 1.16.3 and Erlang OTP to 26.2.5.1 (#9256)
* feat: bump elixir to 1.16.0 * fix: failing tests * fix: one more test * fix: qemu arm build * fix: failing market test * fix: override version in ci * chore: bump to 1.16.1 * fix: ci config override * chore: bump to 1.16.3 * chore: mix format * fix: faulty explorer tests * fix: faulty block_scout_web tests * chore: lint * ci: remove arm build workaround * chore: fix negative slice warnings * Erlang 26.2.5.1 --------- Co-authored-by: Viktor Baranov <[email protected]>
1 parent 18c0a61 commit 7fe5bb9

File tree

73 files changed

+191
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+191
-148
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ body:
8181
attributes:
8282
label: Elixir & Erlang/OTP versions
8383
description: Elixir & Erlang/OTP versions.
84-
placeholder: Elixir 1.14.5 (compiled with Erlang/OTP 25)
84+
placeholder: Elixir 1.16.3 (compiled with Erlang/OTP 26)
8585
validations:
8686
required: true
8787

.github/workflows/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ on:
3232

3333
env:
3434
MIX_ENV: test
35-
OTP_VERSION: ${{ vars.OTP_VERSION || '25.3.2.8' }}
36-
ELIXIR_VERSION: ${{ vars.ELIXIR_VERSION || '1.14.5' }}
35+
OTP_VERSION: ${{ github.ref_name == '9256/merge' && '26.2.5.1' || vars.OTP_VERSION }}
36+
ELIXIR_VERSION: ${{ github.ref_name == '9256/merge' && '1.16.3' || vars.ELIXIR_VERSION }}
3737
ACCOUNT_AUTH0_DOMAIN: "blockscoutcom.us.auth0.com"
3838

3939
jobs:

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
elixir 1.14.5-otp-25
2-
erlang 25.3.2.8
1+
elixir 1.16.3-otp-26
2+
erlang 26.2.5.1
33
nodejs 18.17.1

apps/block_scout_web/lib/block_scout_web/controllers/api/v2/import_controller.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ defmodule BlockScoutWeb.API.V2.ImportController do
4242
|> render(:message, %{message: "Success"})
4343

4444
error ->
45-
Logger.warn(fn -> ["Error on importing token info: ", inspect(error)] end)
45+
Logger.warning(fn -> ["Error on importing token info: ", inspect(error)] end)
4646

4747
conn
4848
|> put_view(ApiView)

apps/block_scout_web/lib/block_scout_web/models/user_from_auth.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ defmodule BlockScoutWeb.Models.UserFromAuth do
117117

118118
# default case if nothing matches
119119
defp avatar_from_auth(auth) do
120-
Logger.warn(auth.provider <> " needs to find an avatar URL!")
120+
Logger.warning(auth.provider <> " needs to find an avatar URL!")
121121
Logger.debug(Poison.encode!(auth))
122122
nil
123123
end

apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<%= render BlockScoutWeb.CommonComponentsView, "_channel_disconnected_message.html", text: gettext("Connection Lost") %>
55

66
<div class="new-smart-contract-form">
7-
<h1 class="smart-contract-title"><%= if RustVerifierInterface.enabled?(), do: gettext "New Solidity/Yul Smart Contract Verification", else: gettext "New Solidity Smart Contract Verification" %></h1>
7+
<h1 class="smart-contract-title"><%= if RustVerifierInterface.enabled?(), do: gettext("New Solidity/Yul Smart Contract Verification"), else: gettext("New Solidity Smart Contract Verification") %></h1>
88

99
<%= form_for changeset,
1010
address_contract_verification_path(@conn, :create),
@@ -69,7 +69,7 @@
6969
</div>
7070
</div>
7171
</div>
72-
<div class="smart-contract-form-group-tooltip"><%= if RustVerifierInterface.enabled?(), do: gettext "Drop all Solidity or Yul contract source files into the drop zone.", else: gettext "Drop all Solidity contract source files into the drop zone." %></div>
72+
<div class="smart-contract-form-group-tooltip"><%= if RustVerifierInterface.enabled?(), do: gettext("Drop all Solidity or Yul contract source files into the drop zone."), else: gettext("Drop all Solidity contract source files into the drop zone.") %></div>
7373
</div>
7474

7575
<div class="add-contract-libraries-wrapper">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="card-body" data-async-listing="<%= @current_path %>">
1212
<h1 class="card-title list-title-description"><%= gettext "Validated Transactions" %></h1>
1313
<div class="list-top-pagination-container-wrapper">
14-
<%= render BlockScoutWeb.CommonComponentsView, "_rap_pagination_container.html", position: "top", showing_limit: if Chain.transactions_available_count() == Chain.limit_showing_transactions(), do: Chain.limit_showing_transactions(), else: nil %>
14+
<%= render BlockScoutWeb.CommonComponentsView, "_rap_pagination_container.html", position: "top", showing_limit: if(Chain.transactions_available_count() == Chain.limit_showing_transactions(), do: Chain.limit_showing_transactions(), else: nil) %>
1515
</div>
1616

1717
<div data-selector="channel-batching-message" class="d-none">

apps/block_scout_web/lib/block_scout_web/views/abi_encoded_value_view.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ defmodule BlockScoutWeb.ABIEncodedValueView do
2020
do_value_html(decoded_type, value, no_links)
2121
rescue
2222
exception ->
23-
Logger.warn(fn ->
23+
Logger.warning(fn ->
2424
["Error determining value html for #{inspect(type)}: ", Exception.format(:error, exception, __STACKTRACE__)]
2525
end)
2626

@@ -33,7 +33,7 @@ defmodule BlockScoutWeb.ABIEncodedValueView do
3333
do_value_json(decoded_type, value)
3434
rescue
3535
exception ->
36-
Logger.warn(fn ->
36+
Logger.warning(fn ->
3737
["Error determining value json for #{inspect(type)}: ", Exception.format(:error, exception, __STACKTRACE__)]
3838
end)
3939

@@ -46,7 +46,7 @@ defmodule BlockScoutWeb.ABIEncodedValueView do
4646
do_copy_text(decoded_type, value)
4747
rescue
4848
exception ->
49-
Logger.warn(fn ->
49+
Logger.warning(fn ->
5050
["Error determining copy text for #{inspect(type)}: ", Exception.format(:error, exception, __STACKTRACE__)]
5151
end)
5252

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ defmodule BlockScoutWeb.AddressDecompiledContractView do
266266
|> Enum.reduce("", fn p, a ->
267267
a <> new_style <> p <> "</span>\n"
268268
end)
269-
|> String.slice(0..-2)
269+
|> String.slice(0..-2//1)
270270
end
271271
end
272272
end

apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
301301
result
302302
rescue
303303
exception ->
304-
Logger.warn(fn ->
304+
Logger.warning(fn ->
305305
[
306306
"Error formatting constructor arguments for abi: #{inspect(abi)}, args: #{inspect(constructor_arguments)}: ",
307307
Exception.format(:error, exception)
@@ -382,7 +382,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do
382382
tuple_item_types =
383383
rest
384384
|> String.split("]")
385-
|> Enum.slice(0..-3)
385+
|> Enum.slice(0..-3//1)
386386
|> Enum.join("]")
387387

388388
array_str = "[" <> (rest |> String.split("[") |> List.last())

0 commit comments

Comments
 (0)