CipherLabs
/
blockscout
mirror of https://github.com/blockscout/blockscout
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove default websockets URL from config

Browse Source
pull/3030/head
Victor Baranov 5 years ago
parent 4ae6290ac7
commit 444ea6ac0e
13 changed files with 17 additions and 16 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 2
      apps/explorer/config/dev/ganache.exs
  3. 2
      apps/explorer/config/dev/geth.exs
  4. 2
      apps/explorer/config/dev/parity.exs
  5. 2
      apps/explorer/config/dev/rsk.exs
  6. 4
      apps/explorer/config/prod/ganache.exs
  7. 4
      apps/explorer/config/prod/geth.exs
  8. 4
      apps/indexer/config/dev/ganache.exs
  9. 2
      apps/indexer/config/dev/geth.exs
  10. 2
      apps/indexer/config/dev/parity.exs
  11. 2
      apps/indexer/config/dev/rsk.exs
  12. 4
      apps/indexer/config/prod/ganache.exs
  13. 2
      apps/indexer/config/prod/geth.exs

1
CHANGELOG.md
Unescape View File

@ -30,6 +30,7 @@
- [#2883](https://github.com/poanetwork/blockscout/pull/2883) - Fix long contracts names - [#2883](https://github.com/poanetwork/blockscout/pull/2883) - Fix long contracts names
### Chore ### Chore
- [#3030](https://github.com/poanetwork/blockscout/pull/3030) - Remove default websockets URL from config
- [#2995](https://github.com/poanetwork/blockscout/pull/2995) - Support API_PATH env var in Docker file - [#2995](https://github.com/poanetwork/blockscout/pull/2995) - Support API_PATH env var in Docker file

2
apps/explorer/config/dev/ganache.exs
Unescape View File

@ -14,7 +14,7 @@ config :explorer,
transport: EthereumJSONRPC.WebSocket, transport: EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:7545" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
], ],
variant: EthereumJSONRPC.Ganache variant: EthereumJSONRPC.Ganache
] ]

2
apps/explorer/config/dev/geth.exs
Unescape View File

@ -14,7 +14,7 @@ config :explorer,
transport: EthereumJSONRPC.WebSocket, transport: EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "wss://mainnet.infura.io/8lTvJTKmHPCHazkneJsY/ws" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
], ],
variant: EthereumJSONRPC.Geth variant: EthereumJSONRPC.Geth
] ]

2
apps/explorer/config/dev/parity.exs
Unescape View File

@ -19,7 +19,7 @@ config :explorer,
transport: EthereumJSONRPC.WebSocket, transport: EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:8546" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
], ],
variant: EthereumJSONRPC.Parity variant: EthereumJSONRPC.Parity
] ]

2
apps/explorer/config/dev/rsk.exs
Unescape View File

@ -19,7 +19,7 @@ config :explorer,
transport: EthereumJSONRPC.WebSocket, transport: EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:8546" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
], ],
variant: EthereumJSONRPC.RSK variant: EthereumJSONRPC.RSK
] ]

4
apps/explorer/config/prod/ganache.exs
Unescape View File

@ -5,7 +5,7 @@ config :explorer,
transport: EthereumJSONRPC.HTTP, transport: EthereumJSONRPC.HTTP,
transport_options: [ transport_options: [
http: EthereumJSONRPC.HTTP.HTTPoison, http: EthereumJSONRPC.HTTP.HTTPoison,
url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:7545", url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"),
http_options: [recv_timeout: :timer.minutes(1), timeout: :timer.minutes(1), hackney: [pool: :ethereum_jsonrpc]] http_options: [recv_timeout: :timer.minutes(1), timeout: :timer.minutes(1), hackney: [pool: :ethereum_jsonrpc]]
], ],
variant: EthereumJSONRPC.Ganache variant: EthereumJSONRPC.Ganache
@ -14,7 +14,7 @@ config :explorer,
transport: EthereumJSONRPC.WebSocket, transport: EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:7545" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
], ],
variant: EthereumJSONRPC.Ganache variant: EthereumJSONRPC.Ganache
] ]

4
apps/explorer/config/prod/geth.exs
Unescape View File

@ -5,7 +5,7 @@ config :explorer,
transport: EthereumJSONRPC.HTTP, transport: EthereumJSONRPC.HTTP,
transport_options: [ transport_options: [
http: EthereumJSONRPC.HTTP.HTTPoison, http: EthereumJSONRPC.HTTP.HTTPoison,
url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "https://mainnet.infura.io/8lTvJTKmHPCHazkneJsY", url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"),
http_options: [recv_timeout: :timer.minutes(1), timeout: :timer.minutes(1), hackney: [pool: :ethereum_jsonrpc]] http_options: [recv_timeout: :timer.minutes(1), timeout: :timer.minutes(1), hackney: [pool: :ethereum_jsonrpc]]
], ],
variant: EthereumJSONRPC.Geth variant: EthereumJSONRPC.Geth
@ -14,7 +14,7 @@ config :explorer,
transport: EthereumJSONRPC.WebSocket, transport: EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "wss://mainnet.infura.io/8lTvJTKmHPCHazkneJsY/ws" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
], ],
variant: EthereumJSONRPC.Geth variant: EthereumJSONRPC.Geth
] ]

4
apps/indexer/config/dev/ganache.exs
Unescape View File

@ -16,9 +16,9 @@ config :indexer,
variant: EthereumJSONRPC.Ganache variant: EthereumJSONRPC.Ganache
], ],
subscribe_named_arguments: [ subscribe_named_arguments: [
transport: EthereumJSONRPC.WebSocket, transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:7545" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
] ]
] ]

2
apps/indexer/config/dev/geth.exs
Unescape View File

@ -19,6 +19,6 @@ config :indexer,
transport: EthereumJSONRPC.WebSocket, transport: EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "wss://mainnet.infura.io/ws/8lTvJTKmHPCHazkneJsY" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
] ]
] ]

2
apps/indexer/config/dev/parity.exs
Unescape View File

@ -42,6 +42,6 @@ config :indexer,
transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket, transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:8546" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
] ]
] ]

2
apps/indexer/config/dev/rsk.exs
Unescape View File

@ -26,6 +26,6 @@ config :indexer,
transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket, transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:8546" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
] ]
] ]

4
apps/indexer/config/prod/ganache.exs
Unescape View File

@ -16,9 +16,9 @@ config :indexer,
variant: EthereumJSONRPC.Ganache variant: EthereumJSONRPC.Ganache
], ],
subscribe_named_arguments: [ subscribe_named_arguments: [
transport: EthereumJSONRPC.WebSocket, transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:7545" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
] ]
] ]

2
apps/indexer/config/prod/geth.exs
Unescape View File

@ -19,6 +19,6 @@ config :indexer,
transport: EthereumJSONRPC.WebSocket, transport: EthereumJSONRPC.WebSocket,
transport_options: [ transport_options: [
web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, web_socket: EthereumJSONRPC.WebSocket.WebSocketClient,
url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "wss://mainnet.infura.io/ws/8lTvJTKmHPCHazkneJsY" url: System.get_env("ETHEREUM_JSONRPC_WS_URL")
] ]
] ]

Write Preview
Loading…
Cancel
Save