From 0595c8cbaa3af07ad5faf0a085f70efe9de50f66 Mon Sep 17 00:00:00 2001 From: Andrew Cravenho Date: Mon, 26 Nov 2018 08:58:40 -0500 Subject: [PATCH 1/7] Replace dev sokol node with personal node --- apps/explorer/config/dev/parity.exs | 10 +++++----- apps/indexer/config/dev/parity.exs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/explorer/config/dev/parity.exs b/apps/explorer/config/dev/parity.exs index 64e9ee1a37..9b96da5560 100644 --- a/apps/explorer/config/dev/parity.exs +++ b/apps/explorer/config/dev/parity.exs @@ -5,11 +5,11 @@ config :explorer, transport: EthereumJSONRPC.HTTP, transport_options: [ http: EthereumJSONRPC.HTTP.HTTPoison, - url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "https://sokol.poa.network", + url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://54.234.12.105:8545", method_to_url: [ - eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network", - eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network", - trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network" + eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545", + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545", + trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545" ], http_options: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] ], @@ -19,7 +19,7 @@ config :explorer, transport: EthereumJSONRPC.WebSocket, transport_options: [ web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, - url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "wss://sokol-ws.poa.network/ws" + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://54.234.12.105:8546" ], variant: EthereumJSONRPC.Parity ] diff --git a/apps/indexer/config/dev/parity.exs b/apps/indexer/config/dev/parity.exs index 8bd5e87c07..198dd4c5cf 100644 --- a/apps/indexer/config/dev/parity.exs +++ b/apps/indexer/config/dev/parity.exs @@ -6,11 +6,11 @@ config :indexer, transport: EthereumJSONRPC.HTTP, transport_options: [ http: EthereumJSONRPC.HTTP.HTTPoison, - url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "https://sokol.poa.network", + url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://54.234.12.105:8545", method_to_url: [ - eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network", - trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network", - trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network" + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545", + trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545", + trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545" ], http_options: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] ], @@ -20,6 +20,6 @@ config :indexer, transport: EthereumJSONRPC.WebSocket, transport_options: [ web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, - url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "wss://sokol-ws.poa.network/ws" + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://54.234.12.105:8546" ] ] From 72480f2389af62ccc1bbe7f60d3410578bfb0cc3 Mon Sep 17 00:00:00 2001 From: Andrew Cravenho Date: Mon, 26 Nov 2018 08:58:56 -0500 Subject: [PATCH 2/7] Remove old sokol node from prod env --- apps/explorer/config/prod/parity.exs | 10 +++++----- apps/indexer/config/prod/parity.exs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/explorer/config/prod/parity.exs b/apps/explorer/config/prod/parity.exs index 64e9ee1a37..3e5c8ca64d 100644 --- a/apps/explorer/config/prod/parity.exs +++ b/apps/explorer/config/prod/parity.exs @@ -5,11 +5,11 @@ config :explorer, transport: EthereumJSONRPC.HTTP, transport_options: [ http: EthereumJSONRPC.HTTP.HTTPoison, - url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "https://sokol.poa.network", + url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), method_to_url: [ - eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network", - eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network", - trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network" + eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), + trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") ], http_options: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] ], @@ -19,7 +19,7 @@ config :explorer, transport: EthereumJSONRPC.WebSocket, transport_options: [ web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, - url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "wss://sokol-ws.poa.network/ws" + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") ], variant: EthereumJSONRPC.Parity ] diff --git a/apps/indexer/config/prod/parity.exs b/apps/indexer/config/prod/parity.exs index 8bd5e87c07..463dc3f079 100644 --- a/apps/indexer/config/prod/parity.exs +++ b/apps/indexer/config/prod/parity.exs @@ -6,11 +6,11 @@ config :indexer, transport: EthereumJSONRPC.HTTP, transport_options: [ http: EthereumJSONRPC.HTTP.HTTPoison, - url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "https://sokol.poa.network", + url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), method_to_url: [ - eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network", - trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network", - trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "https://sokol-trace.poa.network" + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), + trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), + trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") ], http_options: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] ], @@ -20,6 +20,6 @@ config :indexer, transport: EthereumJSONRPC.WebSocket, transport_options: [ web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, - url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "wss://sokol-ws.poa.network/ws" + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") ] ] From 063c393281000c8de2901fcb2d843f2a3335aeb5 Mon Sep 17 00:00:00 2001 From: Andrew Cravenho Date: Mon, 26 Nov 2018 09:08:29 -0500 Subject: [PATCH 3/7] Update documentation replacing old sokol nodes --- README.md | 4 ++-- apps/ethereum_jsonrpc/README.md | 8 ++++---- apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex | 4 ++-- .../ethereum_jsonrpc/case/parity/http_websocket.ex | 2 +- .../support/ethereum_jsonrpc/web_socket/case/parity.ex | 2 +- ...ock_importer_download_block_1_downloads_the_block.json | 2 +- .../block_importer_import_1_duplicate_block.json | 2 +- .../vcr_cassettes/block_importer_import_1_pending.json | 2 +- .../block_importer_import_1_saves_the_block.json | 2 +- .../ethereumex_extensions_trace_transaction_1.json | 2 +- .../vcr_cassettes/import_block_perform_1_duplicate.json | 2 +- .../vcr_cassettes/import_block_perform_1_earliest.json | 2 +- .../vcr_cassettes/import_block_perform_1_integer.json | 2 +- .../vcr_cassettes/import_block_perform_1_latest.json | 2 +- .../vcr_cassettes/import_block_perform_1_string.json | 2 +- .../fixture/vcr_cassettes/import_receipt_perform_1.json | 2 +- .../internal_transaction_importer_import_1.json | 2 +- ...nsaction_importer_import_1_with_contract_creation.json | 2 +- .../transaction_importer_binds_internal_transactions.json | 2 +- .../transaction_importer_creates_a_from_address.json | 2 +- .../transaction_importer_creates_a_to_address.json | 2 +- ...action_importer_creates_a_to_address_from_creates.json | 2 +- .../transaction_importer_download_transaction.json | 2 +- ...ion_importer_download_transaction_with_a_bad_hash.json | 2 +- .../transaction_importer_import_1_failed.json | 2 +- .../transaction_importer_import_1_out_of_gas.json | 2 +- .../transaction_importer_import_1_pending.json | 2 +- .../transaction_importer_import_1_receipt.json | 2 +- ...transaction_importer_import_saves_the_transaction.json | 2 +- .../transaction_importer_saves_the_association.json | 2 +- .../transaction_importer_txn_without_block.json | 2 +- .../transaction_importer_updates_the_association.json | 2 +- apps/indexer/README.md | 4 ++-- docker/README.md | 6 +++--- 34 files changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 8a8d934b9d..3c8202a2be 100644 --- a/README.md +++ b/README.md @@ -204,8 +204,8 @@ mix coveralls.html --umbrella --exclude no_parity | Protocol | URL | |:----------|:-----------------------------------| -| HTTP | `https://sokol-trace.poa.network` | -| WebSocket | `wss://sokol-ws.poa.network/ws` | +| HTTP | `http://54.234.12.105:8545` | +| WebSocket | `ws://54.234.12.105:8546` | ##### Geth diff --git a/apps/ethereum_jsonrpc/README.md b/apps/ethereum_jsonrpc/README.md index da62fd2447..c8e143f73b 100644 --- a/apps/ethereum_jsonrpc/README.md +++ b/apps/ethereum_jsonrpc/README.md @@ -9,8 +9,8 @@ config: ```elixir config :ethereum_jsonrpc, - url: "https://sokol.poa.network", - trace_url: "https://sokol-trace.poa.network", + url: "http://54.234.12.105:8545", + trace_url: "http://54.234.12.105:8545", http: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] ``` @@ -44,8 +44,8 @@ mix test --exclude no_parity | Protocol | URL | |:----------|:-----------------------------------| -| HTTP | `https://sokol-trace.poa.network` | -| WebSocket | `wss://sokol-ws.poa.network/ws` | +| HTTP | `http://54.234.12.105:8545` | +| WebSocket | `ws://54.234.12.105:8546` | ### Geth diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex index 49006a9ff6..caf1abaca8 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex @@ -7,8 +7,8 @@ defmodule EthereumJSONRPC do Configuration for parity URLs can be provided with the following mix config: config :ethereum_jsonrpc, - url: "https://sokol.poa.network", - trace_url: "https://sokol-trace.poa.network", + url: "http://54.234.12.105:8545", + trace_url: "http://54.234.12.105:8545", http: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] diff --git a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/parity/http_websocket.ex b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/parity/http_websocket.ex index 70d7b4426f..8f57ec0bdc 100644 --- a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/parity/http_websocket.ex +++ b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/parity/http_websocket.ex @@ -12,7 +12,7 @@ defmodule EthereumJSONRPC.Case.Parity.HTTPWebSocket do transport_options: [ http: EthereumJSONRPC.HTTP.HTTPoison, http_options: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]], - url: "https://sokol-trace.poa.network" + url: "http://54.234.12.105:8545" ], variant: EthereumJSONRPC.Parity ) diff --git a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/web_socket/case/parity.ex b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/web_socket/case/parity.ex index f63321283c..0c5898fba1 100644 --- a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/web_socket/case/parity.ex +++ b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/web_socket/case/parity.ex @@ -6,7 +6,7 @@ defmodule EthereumJSONRPC.WebSocket.Case.Parity do import ExUnit.Callbacks, only: [start_supervised!: 1] def setup do - url = "wss://sokol-ws.poa.network/ws" + url = "ws://54.234.12.105:8546" web_socket_module = EthereumJSONRPC.WebSocket.WebSocketClient web_socket = start_supervised!({web_socket_module, [url, []]}) diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_download_block_1_downloads_the_block.json b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_download_block_1_downloads_the_block.json index ef08dd0c98..177134865a 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_download_block_1_downloads_the_block.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_download_block_1_downloads_the_block.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_duplicate_block.json b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_duplicate_block.json index ed01d15e03..04e3057186 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_duplicate_block.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_duplicate_block.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_pending.json b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_pending.json index a45df1eab5..5c7ca88057 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_pending.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_pending.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_saves_the_block.json b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_saves_the_block.json index 9ae55768bf..9e5edcce75 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_saves_the_block.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_saves_the_block.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/ethereumex_extensions_trace_transaction_1.json b/apps/explorer/test/support/fixture/vcr_cassettes/ethereumex_extensions_trace_transaction_1.json index 75123fd84a..15573d3aba 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/ethereumex_extensions_trace_transaction_1.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/ethereumex_extensions_trace_transaction_1.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_duplicate.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_duplicate.json index d7cd1acd56..34fddd61a2 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_duplicate.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_duplicate.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_earliest.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_earliest.json index fbe9128192..994c42d801 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_earliest.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_earliest.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_integer.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_integer.json index c019c8b19b..9797ef809a 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_integer.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_integer.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_latest.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_latest.json index 1cf796f617..fa3b9120a7 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_latest.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_latest.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_string.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_string.json index 8d8d1e3c3f..e97d75eb3a 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_string.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_string.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_receipt_perform_1.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_receipt_perform_1.json index 8a2b337a73..6f5c9e6cf7 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_receipt_perform_1.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_receipt_perform_1.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1.json b/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1.json index 691989cee1..45ee296ff7 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1_with_contract_creation.json b/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1_with_contract_creation.json index 2d7a1970a0..05645ac995 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1_with_contract_creation.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1_with_contract_creation.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_binds_internal_transactions.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_binds_internal_transactions.json index 48fff5d094..ade5e73f18 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_binds_internal_transactions.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_binds_internal_transactions.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_from_address.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_from_address.json index e756422df8..d4cddaebe3 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_from_address.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_from_address.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address.json index b2095fd971..8f7fc80da0 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address_from_creates.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address_from_creates.json index 3f2d41867c..25d783a701 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address_from_creates.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address_from_creates.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction.json index 2dec11562e..0bac81ad34 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction_with_a_bad_hash.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction_with_a_bad_hash.json index 20e80fd6fd..f302003433 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction_with_a_bad_hash.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction_with_a_bad_hash.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_failed.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_failed.json index a8fa4d3f51..467447b183 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_failed.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_failed.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_out_of_gas.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_out_of_gas.json index b3e5a1fc00..b59d2556a6 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_out_of_gas.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_out_of_gas.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_pending.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_pending.json index 98ea77155c..e9c960c5cb 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_pending.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_pending.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_receipt.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_receipt.json index 29da0b90b4..64cc778e46 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_receipt.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_receipt.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_saves_the_transaction.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_saves_the_transaction.json index d1858cbe7f..56fd50a88e 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_saves_the_transaction.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_saves_the_transaction.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_saves_the_association.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_saves_the_association.json index 3c118d1f5f..f8ba5fc4fc 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_saves_the_association.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_saves_the_association.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_txn_without_block.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_txn_without_block.json index 0a3e395453..01f3202128 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_txn_without_block.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_txn_without_block.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_updates_the_association.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_updates_the_association.json index 1337f8fb6c..41c76a867e 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_updates_the_association.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_updates_the_association.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "https://sokol-trace.poa.network" + "url": "http://54.234.12.105:8545" }, "response": { "binary": false, diff --git a/apps/indexer/README.md b/apps/indexer/README.md index 154914d9e5..a5d91e6683 100644 --- a/apps/indexer/README.md +++ b/apps/indexer/README.md @@ -53,8 +53,8 @@ mix test --exclude no_parity | Protocol | URL | |:----------|:-----------------------------------| -| HTTP | `https://sokol-trace.poa.network` | -| WebSocket | `wss://sokol-ws.poa.network/ws` | +| HTTP | `http://54.234.12.105:8545` | +| WebSocket | `ws://54.234.12.105:8546` | ### Geth diff --git a/docker/README.md b/docker/README.md index 17e142c27f..8b240796be 100644 --- a/docker/README.md +++ b/docker/README.md @@ -54,7 +54,7 @@ Available options are: | `ETHEREUM_JSONRPC_VARIANT` | Variant of your JSON RPC service: `parity`, `geth` or `ganache` | `parity` | | `ETHEREUM_JSONRPC_HTTP_URL` | HTTP JSON RPC URL Only for `geth` or `ganache` variant | Different per JSONRPC variant | | `ETHEREUM_JSONRPC_WS_URL` | WS JSON RPC url | Different per JSONRPC variant | -| `ETHEREUM_JSONRPC_TRACE_URL` | Trace URL **Only for `parity` variant** | `https://sokol-trace.poa.network` | +| `ETHEREUM_JSONRPC_TRACE_URL` | Trace URL **Only for `parity` variant** | `http://54.234.12.105:8545` | | `COIN` | Default Coin | `POA` | | `LOGO` | Coin logo | Empty | | `NETWORK` | Network | Empty | @@ -65,13 +65,13 @@ Available options are: `ETHEREUM_JSONRPC_HTTP_URL` default values: - * For `parity` - `https://sokol.poa.network` + * For `parity` - `http://54.234.12.105:8545` * For `geth` - `https://mainnet.infura.io/8lTvJTKmHPCHazkneJsY` * For `ganache` - `http://localhost:7545` `ETHEREUM_JSONRPC_WS_URL` default values: - * For `parity` - `wss://sokol-ws.poa.network/ws` + * For `parity` - `ws://54.234.12.105:8546` * For `geth` - `wss://mainnet.infura.io/8lTvJTKmHPCHazkneJsY/ws` * For `ganache` - `ws://localhost:7545` From c1d1ad996ccdb965cc45a324e2fe51e16dfda2c7 Mon Sep 17 00:00:00 2001 From: Andrew Cravenho Date: Mon, 26 Nov 2018 14:21:02 -0500 Subject: [PATCH 4/7] Change the sokol node to localhost --- apps/explorer/config/dev/parity.exs | 10 +++++----- apps/indexer/config/dev/parity.exs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/explorer/config/dev/parity.exs b/apps/explorer/config/dev/parity.exs index 9b96da5560..d503892fe0 100644 --- a/apps/explorer/config/dev/parity.exs +++ b/apps/explorer/config/dev/parity.exs @@ -5,11 +5,11 @@ config :explorer, transport: EthereumJSONRPC.HTTP, transport_options: [ http: EthereumJSONRPC.HTTP.HTTPoison, - url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://54.234.12.105:8545", + url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545", method_to_url: [ - eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545", - eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545", - trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545" + eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", + trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545" ], http_options: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] ], @@ -19,7 +19,7 @@ config :explorer, transport: EthereumJSONRPC.WebSocket, transport_options: [ web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, - url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://54.234.12.105:8546" + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:8546" ], variant: EthereumJSONRPC.Parity ] diff --git a/apps/indexer/config/dev/parity.exs b/apps/indexer/config/dev/parity.exs index 198dd4c5cf..e903be4141 100644 --- a/apps/indexer/config/dev/parity.exs +++ b/apps/indexer/config/dev/parity.exs @@ -6,11 +6,11 @@ config :indexer, transport: EthereumJSONRPC.HTTP, transport_options: [ http: EthereumJSONRPC.HTTP.HTTPoison, - url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://54.234.12.105:8545", + url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545", method_to_url: [ - eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545", - trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545", - trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://54.234.12.105:8545" + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", + trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", + trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545" ], http_options: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] ], @@ -20,6 +20,6 @@ config :indexer, transport: EthereumJSONRPC.WebSocket, transport_options: [ web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, - url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://54.234.12.105:8546" + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:8546" ] ] From 2cb7f4b0c76f8145c7cc76400cd8c9ed2cb8e785 Mon Sep 17 00:00:00 2001 From: Andrew Cravenho Date: Mon, 26 Nov 2018 14:21:29 -0500 Subject: [PATCH 5/7] Update README and change default variant to ganache --- README.md | 8 +++++++- apps/explorer/config/dev.exs | 2 +- apps/indexer/config/dev.exs | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3c8202a2be..03cd4adf48 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,13 @@ The [development stack page](https://github.com/poanetwork/blockscout/wiki/Devel `cd apps/block_scout_web/assets && npm install; cd -` `cd apps/explorer && npm install; cd -` - 7. Start Phoenix Server. + 7. Update your JSON RPC Variant in `apps/explorer/config/dev.exs` and `apps/indexer/config/dev.exs`. + For `variant`, enter `ganache`, `geth`, or `parity` + + 8. Update your JSON RPC Endpoint in `apps/explorer/config/dev/` and `apps/indexer/config/dev/` + For the `variant` chosen in step 7, enter the correct information for the corresponding JSON RPC Endpoint in `parity.exs`, `geth.exs`, or `ganache.exs` + + 9. Start Phoenix Server. `mix phx.server` Now you can visit [`localhost:4000`](http://localhost:4000) from your browser. diff --git a/apps/explorer/config/dev.exs b/apps/explorer/config/dev.exs index 2436efae81..8cc1f28a5f 100644 --- a/apps/explorer/config/dev.exs +++ b/apps/explorer/config/dev.exs @@ -22,7 +22,7 @@ import_config "dev.secret.exs" variant = if is_nil(System.get_env("ETHEREUM_JSONRPC_VARIANT")) do - "parity" + "ganache" else System.get_env("ETHEREUM_JSONRPC_VARIANT") |> String.split(".") diff --git a/apps/indexer/config/dev.exs b/apps/indexer/config/dev.exs index 2f445c38dc..337e2f9b97 100644 --- a/apps/indexer/config/dev.exs +++ b/apps/indexer/config/dev.exs @@ -11,7 +11,7 @@ config :logger, :indexer_token_balances, variant = if is_nil(System.get_env("ETHEREUM_JSONRPC_VARIANT")) do - "parity" + "ganache" else System.get_env("ETHEREUM_JSONRPC_VARIANT") |> String.split(".") From a64a1dc6bbe912d2bc751abb045db8b674d5f473 Mon Sep 17 00:00:00 2001 From: Andrew Cravenho Date: Mon, 26 Nov 2018 16:11:29 -0500 Subject: [PATCH 6/7] Update sokol node tests --- README.md | 4 ++-- apps/ethereum_jsonrpc/README.md | 8 ++++---- apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex | 4 ++-- .../ethereum_jsonrpc/case/parity/http_websocket.ex | 2 +- .../support/ethereum_jsonrpc/web_socket/case/parity.ex | 2 +- ...ock_importer_download_block_1_downloads_the_block.json | 2 +- .../block_importer_import_1_duplicate_block.json | 2 +- .../vcr_cassettes/block_importer_import_1_pending.json | 2 +- .../block_importer_import_1_saves_the_block.json | 2 +- .../ethereumex_extensions_trace_transaction_1.json | 2 +- .../vcr_cassettes/import_block_perform_1_duplicate.json | 2 +- .../vcr_cassettes/import_block_perform_1_earliest.json | 2 +- .../vcr_cassettes/import_block_perform_1_integer.json | 2 +- .../vcr_cassettes/import_block_perform_1_latest.json | 2 +- .../vcr_cassettes/import_block_perform_1_string.json | 2 +- .../fixture/vcr_cassettes/import_receipt_perform_1.json | 2 +- .../internal_transaction_importer_import_1.json | 2 +- ...nsaction_importer_import_1_with_contract_creation.json | 2 +- .../transaction_importer_binds_internal_transactions.json | 2 +- .../transaction_importer_creates_a_from_address.json | 2 +- .../transaction_importer_creates_a_to_address.json | 2 +- ...action_importer_creates_a_to_address_from_creates.json | 2 +- .../transaction_importer_download_transaction.json | 2 +- ...ion_importer_download_transaction_with_a_bad_hash.json | 2 +- .../transaction_importer_import_1_failed.json | 2 +- .../transaction_importer_import_1_out_of_gas.json | 2 +- .../transaction_importer_import_1_pending.json | 2 +- .../transaction_importer_import_1_receipt.json | 2 +- ...transaction_importer_import_saves_the_transaction.json | 2 +- .../transaction_importer_saves_the_association.json | 2 +- .../transaction_importer_txn_without_block.json | 2 +- .../transaction_importer_updates_the_association.json | 2 +- apps/indexer/README.md | 4 ++-- docker/README.md | 6 +++--- 34 files changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 03cd4adf48..f201753977 100644 --- a/README.md +++ b/README.md @@ -210,8 +210,8 @@ mix coveralls.html --umbrella --exclude no_parity | Protocol | URL | |:----------|:-----------------------------------| -| HTTP | `http://54.234.12.105:8545` | -| WebSocket | `ws://54.234.12.105:8546` | +| HTTP | `http://localhost:8545` | +| WebSocket | `ws://localhost:8546` | ##### Geth diff --git a/apps/ethereum_jsonrpc/README.md b/apps/ethereum_jsonrpc/README.md index c8e143f73b..5d9d469ea4 100644 --- a/apps/ethereum_jsonrpc/README.md +++ b/apps/ethereum_jsonrpc/README.md @@ -9,8 +9,8 @@ config: ```elixir config :ethereum_jsonrpc, - url: "http://54.234.12.105:8545", - trace_url: "http://54.234.12.105:8545", + url: "http://localhost:8545", + trace_url: "http://localhost:8545", http: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] ``` @@ -44,8 +44,8 @@ mix test --exclude no_parity | Protocol | URL | |:----------|:-----------------------------------| -| HTTP | `http://54.234.12.105:8545` | -| WebSocket | `ws://54.234.12.105:8546` | +| HTTP | `http://localhost:8545` | +| WebSocket | `ws://localhost:8546` | ### Geth diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex index caf1abaca8..bd6cbefc0d 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex @@ -7,8 +7,8 @@ defmodule EthereumJSONRPC do Configuration for parity URLs can be provided with the following mix config: config :ethereum_jsonrpc, - url: "http://54.234.12.105:8545", - trace_url: "http://54.234.12.105:8545", + url: "http://localhost:8545", + trace_url: "http://localhost:8545", http: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]] diff --git a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/parity/http_websocket.ex b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/parity/http_websocket.ex index 8f57ec0bdc..73be4705eb 100644 --- a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/parity/http_websocket.ex +++ b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/case/parity/http_websocket.ex @@ -12,7 +12,7 @@ defmodule EthereumJSONRPC.Case.Parity.HTTPWebSocket do transport_options: [ http: EthereumJSONRPC.HTTP.HTTPoison, http_options: [recv_timeout: 60_000, timeout: 60_000, hackney: [pool: :ethereum_jsonrpc]], - url: "http://54.234.12.105:8545" + url: "http://18.207.247.30:8545" ], variant: EthereumJSONRPC.Parity ) diff --git a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/web_socket/case/parity.ex b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/web_socket/case/parity.ex index 0c5898fba1..3fe72075bd 100644 --- a/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/web_socket/case/parity.ex +++ b/apps/ethereum_jsonrpc/test/support/ethereum_jsonrpc/web_socket/case/parity.ex @@ -6,7 +6,7 @@ defmodule EthereumJSONRPC.WebSocket.Case.Parity do import ExUnit.Callbacks, only: [start_supervised!: 1] def setup do - url = "ws://54.234.12.105:8546" + url = "ws://18.207.247.30:8546" web_socket_module = EthereumJSONRPC.WebSocket.WebSocketClient web_socket = start_supervised!({web_socket_module, [url, []]}) diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_download_block_1_downloads_the_block.json b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_download_block_1_downloads_the_block.json index 177134865a..b62aa3277f 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_download_block_1_downloads_the_block.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_download_block_1_downloads_the_block.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_duplicate_block.json b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_duplicate_block.json index 04e3057186..169a8160a8 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_duplicate_block.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_duplicate_block.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_pending.json b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_pending.json index 5c7ca88057..375279645a 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_pending.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_pending.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_saves_the_block.json b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_saves_the_block.json index 9e5edcce75..e62eae9925 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_saves_the_block.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/block_importer_import_1_saves_the_block.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/ethereumex_extensions_trace_transaction_1.json b/apps/explorer/test/support/fixture/vcr_cassettes/ethereumex_extensions_trace_transaction_1.json index 15573d3aba..d31ed57dd9 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/ethereumex_extensions_trace_transaction_1.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/ethereumex_extensions_trace_transaction_1.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_duplicate.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_duplicate.json index 34fddd61a2..e66fd00420 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_duplicate.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_duplicate.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_earliest.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_earliest.json index 994c42d801..b3057bb033 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_earliest.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_earliest.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_integer.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_integer.json index 9797ef809a..6eff0a1e04 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_integer.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_integer.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_latest.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_latest.json index fa3b9120a7..b8348fb16f 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_latest.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_latest.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_string.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_string.json index e97d75eb3a..5be3ed31ba 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_string.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_block_perform_1_string.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/import_receipt_perform_1.json b/apps/explorer/test/support/fixture/vcr_cassettes/import_receipt_perform_1.json index 6f5c9e6cf7..f23d3abbca 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/import_receipt_perform_1.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/import_receipt_perform_1.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1.json b/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1.json index 45ee296ff7..65051c71ef 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1_with_contract_creation.json b/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1_with_contract_creation.json index 05645ac995..28e8e4f211 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1_with_contract_creation.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/internal_transaction_importer_import_1_with_contract_creation.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_binds_internal_transactions.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_binds_internal_transactions.json index ade5e73f18..86dfd87e03 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_binds_internal_transactions.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_binds_internal_transactions.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_from_address.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_from_address.json index d4cddaebe3..088f9d6c05 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_from_address.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_from_address.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address.json index 8f7fc80da0..30f110f066 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address_from_creates.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address_from_creates.json index 25d783a701..a36208621a 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address_from_creates.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_creates_a_to_address_from_creates.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction.json index 0bac81ad34..dbb71df424 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction_with_a_bad_hash.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction_with_a_bad_hash.json index f302003433..73f2eb7cfc 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction_with_a_bad_hash.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_download_transaction_with_a_bad_hash.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_failed.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_failed.json index 467447b183..333c2b9bef 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_failed.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_failed.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_out_of_gas.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_out_of_gas.json index b59d2556a6..f9bd56b2d9 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_out_of_gas.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_out_of_gas.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_pending.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_pending.json index e9c960c5cb..f1ea9378a8 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_pending.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_pending.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_receipt.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_receipt.json index 64cc778e46..cab876ebfa 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_receipt.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_1_receipt.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_saves_the_transaction.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_saves_the_transaction.json index 56fd50a88e..829b214442 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_saves_the_transaction.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_import_saves_the_transaction.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_saves_the_association.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_saves_the_association.json index f8ba5fc4fc..1c03f4aaae 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_saves_the_association.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_saves_the_association.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_txn_without_block.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_txn_without_block.json index 01f3202128..55803dd737 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_txn_without_block.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_txn_without_block.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_updates_the_association.json b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_updates_the_association.json index 41c76a867e..67d9d0c9f7 100644 --- a/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_updates_the_association.json +++ b/apps/explorer/test/support/fixture/vcr_cassettes/transaction_importer_updates_the_association.json @@ -8,7 +8,7 @@ "method": "post", "options": [], "request_body": "", - "url": "http://54.234.12.105:8545" + "url": "http://18.207.247.30:8545" }, "response": { "binary": false, diff --git a/apps/indexer/README.md b/apps/indexer/README.md index a5d91e6683..e7e7d83e6d 100644 --- a/apps/indexer/README.md +++ b/apps/indexer/README.md @@ -53,8 +53,8 @@ mix test --exclude no_parity | Protocol | URL | |:----------|:-----------------------------------| -| HTTP | `http://54.234.12.105:8545` | -| WebSocket | `ws://54.234.12.105:8546` | +| HTTP | `http://localhost:8545` | +| WebSocket | `ws://localhost:8546` | ### Geth diff --git a/docker/README.md b/docker/README.md index 8b240796be..f8ab76051b 100644 --- a/docker/README.md +++ b/docker/README.md @@ -54,7 +54,7 @@ Available options are: | `ETHEREUM_JSONRPC_VARIANT` | Variant of your JSON RPC service: `parity`, `geth` or `ganache` | `parity` | | `ETHEREUM_JSONRPC_HTTP_URL` | HTTP JSON RPC URL Only for `geth` or `ganache` variant | Different per JSONRPC variant | | `ETHEREUM_JSONRPC_WS_URL` | WS JSON RPC url | Different per JSONRPC variant | -| `ETHEREUM_JSONRPC_TRACE_URL` | Trace URL **Only for `parity` variant** | `http://54.234.12.105:8545` | +| `ETHEREUM_JSONRPC_TRACE_URL` | Trace URL **Only for `parity` variant** | `http://localhost:8545` | | `COIN` | Default Coin | `POA` | | `LOGO` | Coin logo | Empty | | `NETWORK` | Network | Empty | @@ -65,13 +65,13 @@ Available options are: `ETHEREUM_JSONRPC_HTTP_URL` default values: - * For `parity` - `http://54.234.12.105:8545` + * For `parity` - `http://localhost:8545` * For `geth` - `https://mainnet.infura.io/8lTvJTKmHPCHazkneJsY` * For `ganache` - `http://localhost:7545` `ETHEREUM_JSONRPC_WS_URL` default values: - * For `parity` - `ws://54.234.12.105:8546` + * For `parity` - `ws://localhost:8546` * For `geth` - `wss://mainnet.infura.io/8lTvJTKmHPCHazkneJsY/ws` * For `ganache` - `ws://localhost:7545` From bd769c6724a6fbf9087516fae48b26abe05549a7 Mon Sep 17 00:00:00 2001 From: Andrew Cravenho Date: Mon, 26 Nov 2018 16:50:28 -0500 Subject: [PATCH 7/7] Fix core tests --- apps/indexer/test/indexer/block/realtime/fetcher_test.exs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/indexer/test/indexer/block/realtime/fetcher_test.exs b/apps/indexer/test/indexer/block/realtime/fetcher_test.exs index 2a8457bc76..48ff3b9cc7 100644 --- a/apps/indexer/test/indexer/block/realtime/fetcher_test.exs +++ b/apps/indexer/test/indexer/block/realtime/fetcher_test.exs @@ -20,12 +20,12 @@ defmodule Indexer.Block.Realtime.FetcherTest do setup %{json_rpc_named_arguments: json_rpc_named_arguments} do core_json_rpc_named_arguments = json_rpc_named_arguments - |> put_in([:transport_options, :url], "https://core.poa.network") + |> put_in([:transport_options, :url], "http://54.144.107.14:8545") |> put_in( [:transport_options, :method_to_url], - eth_getBalance: "https://core-trace.poa.network", - trace_replayTransaction: "https://core-trace.poa.network", - trace_block: "https://core-trace.poa.network" + eth_getBalance: "http://54.144.107.14:8545", + trace_replayTransaction: "http://54.144.107.14:8545", + trace_block: "http://54.144.107.14:8545" ) block_fetcher = %Indexer.Block.Fetcher{