Resolved conflicts f1f445f

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ### Features
 
+### Fixes
+
+### Chore
+
+## 4.1.8-beta
+
+### Features
+
 - [#5968](https://github.com/blockscout/blockscout/pull/5968) - Add call type in the response of txlistinternal API method
 - [#5860](https://github.com/blockscout/blockscout/pull/5860) - Integrate rust verifier micro-service ([blockscout-rs/verifier](https://github.com/blockscout/blockscout-rs/tree/main/verification))
 - [#6001](https://github.com/blockscout/blockscout/pull/6001) - Add ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES env var that filters requests and query node only if the block quantity is "latest"
@@ -33,6 +41,9 @@
 
 ### Chore
 
+- [#5921](https://github.com/blockscout/blockscout/pull/5921) - Bump briefly from 25942fb to 1dd66ee
+- [#6033](https://github.com/blockscout/blockscout/pull/6033) - Bump sass from 1.54.7 to 1.54.8 in /apps/block_scout_web/assets
+- [#6046](https://github.com/blockscout/blockscout/pull/6046) - Bump credo from 1.6.6 to 1.6.7
 - [#6045](https://github.com/blockscout/blockscout/pull/6045) - Re-use _btn_copy.html for raw trace page
 - [#6035](https://github.com/blockscout/blockscout/pull/6035) - Hide copy btn if no raw trace
 - [#6034](https://github.com/blockscout/blockscout/pull/6034) - Suppress empty sections in supported chain dropdown

README.md

@@ -3,9 +3,11 @@
 <div align="center">
 
 [![Blockscout](https://github.com/blockscout/blockscout/workflows/Blockscout/badge.svg?branch=master)](https://github.com/blockscout/blockscout/actions)
+[![](https://dcbadge.vercel.app/api/server/blockscout?style=flat)](https://discord.gg/blockscout)
 
 </div>
 
+
 BlockScout provides a comprehensive, easy-to-use interface for users to view, confirm, and inspect transactions on EVM (Ethereum Virtual Machine) blockchains. This includes the POA Network, Gnosis Chain, Ethereum Classic and other **Ethereum testnets, private networks and sidechains**.
 
 See our [project documentation](https://docs.blockscout.com/) for detailed information and setup instructions.

apps/block_scout_web/assets/package.json

@@ -71,7 +71,7 @@
     "redux": "^4.2.0",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
-    "sweetalert2": "^11.4.29",
+    "sweetalert2": "^11.4.31",
     "uniqid": "^5.4.0",
     "urijs": "^1.19.11",
     "url": "^0.11.0",
@@ -81,8 +81,8 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.13",
-    "@babel/preset-env": "^7.18.10",
+    "@babel/core": "^7.19.0",
+    "@babel/preset-env": "^7.19.0",
     "autoprefixer": "^10.4.8",
     "babel-loader": "^8.2.5",
     "copy-webpack-plugin": "^11.0.0",
@@ -94,8 +94,8 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.1",
     "file-loader": "^6.2.0",
-    "jest": "^29.0.1",
-    "jest-environment-jsdom": "^29.0.1",
+    "jest": "^29.0.2",
+    "jest-environment-jsdom": "^29.0.2",
     "mini-css-extract-plugin": "^2.6.1",
     "postcss": "^8.4.16",
     "postcss-loader": "^7.0.1",

apps/block_scout_web/mix.exs

@@ -26,7 +26,7 @@ defmodule BlockScoutWeb.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "4.1.7"
+      version: "4.1.8"
     ]
   end
 

apps/ethereum_jsonrpc/mix.exs

@@ -26,7 +26,7 @@ defmodule EthereumJsonrpc.MixProject do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "4.1.7"
+      version: "4.1.8"
     ]
   end
 

apps/explorer/mix.exs

@@ -27,7 +27,7 @@ defmodule Explorer.Mixfile do
         dialyzer: :test
       ],
       start_permanent: Mix.env() == :prod,
-      version: "4.1.7"
+      version: "4.1.8"
     ]
   end
 

apps/indexer/mix.exs

@@ -17,7 +17,7 @@ defmodule Indexer.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
       start_permanent: Mix.env() == :prod,
-      version: "4.1.7"
+      version: "4.1.8"
     ]
   end
 

mix.exs

@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
     [
       # app: :block_scout,
       # aliases: aliases(config_env()),
-      version: "4.1.7",
+      version: "4.1.8",
       apps_path: "apps",
       deps: deps(),
       dialyzer: dialyzer(),