+
\ No newline at end of file
diff --git a/apps/ethereum_jsonrpc/README.md b/apps/ethereum_jsonrpc/README.md
index 945c793da83e..4b65295eeb39 100644
--- a/apps/ethereum_jsonrpc/README.md
+++ b/apps/ethereum_jsonrpc/README.md
@@ -1,6 +1,6 @@
# EthereumJSONRPC
-Ethereum JSONRPC client.
+Ethereum JSONRPC client
## Configuration
diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket/web_socket_client.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket/web_socket_client.ex
index baa4ce61c1fb..7892fa46234d 100644
--- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket/web_socket_client.ex
+++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket/web_socket_client.ex
@@ -59,8 +59,7 @@ defmodule EthereumJSONRPC.WebSocket.WebSocketClient do
:error -> :undefined
end
- %URI{host: host} = URI.parse(url)
- host_charlist = String.to_charlist(host)
+ :ssl.start()
# `:depth`, `:verify`, and `:verify_fun`, are based on `:hackney_connect.ssl_opts_1/2` as we use `:hackney` through
# `:httpoison` and this keeps the SSL rules consistent between HTTP and WebSocket
@@ -69,15 +68,8 @@ defmodule EthereumJSONRPC.WebSocket.WebSocketClient do
url,
__MODULE__,
url,
- ssl_verify: :verify_peer,
- keepalive: keepalive,
- socket_opts: [
- cacerts: :certifi.cacerts(),
- depth: 99,
- # SNI extension discloses host name in the clear, but allows for compatibility with Virtual Hosting for TLS
- server_name_indication: host_charlist,
- verify_fun: {&:ssl_verify_hostname.verify_fun/3, [check_hostname: host_charlist]}
- ]
+ ssl_verify: :verify_none,
+ keepalive: keepalive
)
end
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index c58d3bfd3741..3399d340a723 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -55,7 +55,7 @@ config :explorer, Explorer.Counters.AddressTokenUsdSum,
enable_consolidation: true
config :explorer, Explorer.Chain.Cache.TokenExchangeRate,
- enabled: true,
+ enabled: false,
enable_consolidation: true
config :explorer, Explorer.Counters.TokenHoldersCounter,
diff --git a/apps/explorer/package-lock.json b/apps/explorer/package-lock.json
index 2b48149e5187..fccc4f375b10 100644
--- a/apps/explorer/package-lock.json
+++ b/apps/explorer/package-lock.json
@@ -7,7 +7,7 @@
"name": "blockscout",
"license": "GPL-3.0",
"dependencies": {
- "solc": "0.8.16"
+ "solc": "0.8.20"
},
"engines": {
"node": "16.x",
@@ -76,9 +76,9 @@
}
},
"node_modules/solc": {
- "version": "0.8.16",
- "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.16.tgz",
- "integrity": "sha512-6oZg7FAhIouj2zYLvoR3Q4fMP/+BGPR7sY7GcrEXKIp+DRd8RmpDEFO1LUBKpClUiaYguNgmthTFmnPl4MeiMQ==",
+ "version": "0.8.20",
+ "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.20.tgz",
+ "integrity": "sha512-fPRnGspIEqmhu63RFO3pc79sLA7ZmzO0Uy0L5l6hEt2wAsq0o7UV6pXkAp3Mfv9IBhg7Px/oTu3a+y4gs3BWrQ==",
"dependencies": {
"command-exists": "^1.2.8",
"commander": "^8.1.0",
@@ -144,9 +144,9 @@
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
},
"solc": {
- "version": "0.8.16",
- "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.16.tgz",
- "integrity": "sha512-6oZg7FAhIouj2zYLvoR3Q4fMP/+BGPR7sY7GcrEXKIp+DRd8RmpDEFO1LUBKpClUiaYguNgmthTFmnPl4MeiMQ==",
+ "version": "0.8.20",
+ "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.20.tgz",
+ "integrity": "sha512-fPRnGspIEqmhu63RFO3pc79sLA7ZmzO0Uy0L5l6hEt2wAsq0o7UV6pXkAp3Mfv9IBhg7Px/oTu3a+y4gs3BWrQ==",
"requires": {
"command-exists": "^1.2.8",
"commander": "^8.1.0",
diff --git a/apps/explorer/package.json b/apps/explorer/package.json
index 3c5c00095998..f4f988250a58 100644
--- a/apps/explorer/package.json
+++ b/apps/explorer/package.json
@@ -13,6 +13,6 @@
},
"scripts": {},
"dependencies": {
- "solc": "0.8.16"
+ "solc": "0.8.20"
}
}
diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
index 6b157a2011eb..c8e90bbf7f5a 100644
--- a/docker-compose/envs/common-blockscout.env
+++ b/docker-compose/envs/common-blockscout.env
@@ -5,8 +5,8 @@ DATABASE_URL=postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=fal
ETHEREUM_JSONRPC_TRACE_URL=http://host.docker.internal:8545/
NETWORK=
SUBNETWORK=Awesome chain
-LOGO=/images/blockscout_logo.svg
-LOGO_FOOTER=/images/blockscout_logo.svg
+LOGO=/explorer/images/blockscout_logo.svg
+LOGO_FOOTER=/explorer/images/blockscout_logo.svg
# ETHEREUM_JSONRPC_WS_URL=
ETHEREUM_JSONRPC_TRANSPORT=http
ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES=false
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b0a6f0591b82..0265f8d1c823 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -43,7 +43,7 @@ ADD apps/explorer/mix.exs ./apps/explorer/
ADD apps/ethereum_jsonrpc/mix.exs ./apps/ethereum_jsonrpc/
ADD apps/indexer/mix.exs ./apps/indexer/
-RUN mix do deps.get, local.rebar --force, deps.compile
+RUN mix do deps.get, local.rebar --force, deps.compile, deps.compile phoenix --force
ADD . .
@@ -82,3 +82,10 @@ WORKDIR /app
COPY --from=builder /opt/release/blockscout .
COPY --from=builder /app/apps/explorer/node_modules ./node_modules
+
+RUN chgrp -R 0 /app && \
+ chmod -R g=u /app && \
+ chown -R 1001:0 /app && \
+ chmod 775 /app
+
+USER 1001