From a036920c98ea073dc6725ecb31c3845cc2b4bb66 Mon Sep 17 00:00:00 2001 From: a10zn8 Date: Wed, 1 Mar 2023 12:27:24 +0300 Subject: [PATCH] Update documentation sections about ethereum PoS connection (#150) --- docs/04-upstream-config.adoc | 23 +++++----- docs/reference-configuration.adoc | 72 ++++++++++++++++--------------- 2 files changed, 50 insertions(+), 45 deletions(-) diff --git a/docs/04-upstream-config.adoc b/docs/04-upstream-config.adoc index 9dccc2d5..20efe88d 100644 --- a/docs/04-upstream-config.adoc +++ b/docs/04-upstream-config.adoc @@ -73,17 +73,18 @@ cluster: options: disable-validation: true connection: - ethereum: - rpc: - url: "https://mainnet.infura.io/v3/${INFURA_USER}" - basic-auth: - username: ${INFURA_USER} - password: ${INFURA_PASSWD} - ws: - url: "wss://mainnet.infura.io/ws/v3/${INFURA_USER}" - basic-auth: - username: ${INFURA_USER} - password: ${INFURA_PASSWD} + ethereum-pos: + execution: + rpc: + url: "https://mainnet.infura.io/v3/${INFURA_USER}" + basic-auth: + username: ${INFURA_USER} + password: ${INFURA_PASSWD} + ws: + url: "wss://mainnet.infura.io/ws/v3/${INFURA_USER}" + basic-auth: + username: ${INFURA_USER} + password: ${INFURA_PASSWD} - id: ethereum-pos node-id: 3 chain: ropsten diff --git a/docs/reference-configuration.adoc b/docs/reference-configuration.adoc index a7695ec2..55f4d696 100644 --- a/docs/reference-configuration.adoc +++ b/docs/reference-configuration.adoc @@ -110,26 +110,28 @@ cluster: disabled: - name: "admin_shutdown" connection: - ethereum: - rpc: - url: "http://localhost:8545" - ws: - url: "ws://localhost:8546" - origin: "http://localhost" - basic-auth: - username: 9c199ad8f281f20154fc258fe41a6814 - password: 258fe4149c199ad8f2811a68f20154fc + ethereum-pos: + execution: + rpc: + url: "http://localhost:8545" + ws: + url: "ws://localhost:8546" + origin: "http://localhost" + basic-auth: + username: 9c199ad8f281f20154fc258fe41a6814 + password: 258fe4149c199ad8f2811a68f20154fc - id: infura chain: ethereum options: disable-validation: true connection: - ethereum: - rpc: - url: "https://mainnet.infura.io/v3/fa28c968191849c1aff541ad1d8511f2" - basic-auth: - username: 4fc258fe41a68149c199ad8f281f2015 - password: 1a68f20154fc258fe4149c199ad8f281 + ethereum-pos: + execution: + rpc: + url: "https://mainnet.infura.io/v3/fa28c968191849c1aff541ad1d8511f2" + basic-auth: + username: 4fc258fe41a68149c199ad8f281f2015 + password: 1a68f20154fc258fe4149c199ad8f281 - id: bitcoin chain: bitcoin options: @@ -608,12 +610,13 @@ cluster: - id: local chain: ethereum connection: - ethereum: - rpc: - url: "http://localhost:8545" - ws: - url: "ws://localhost:8546" - origin: "http://localhost" + ethereum-pos: + execution: + rpc: + url: "http://localhost:8545" + ws: + url: "ws://localhost:8546" + origin: "http://localhost" include: - "upstreams-extra.yaml" ---- @@ -654,17 +657,18 @@ configuration, and may be omitted for most of the situations. disabled: - name: "admin_shutdown" connection: - ethereum: - rpc: - url: "http://localhost:8545" - ws: - url: "ws://localhost:8546" - origin: "http://localhost" - basic-auth: - username: 9c199ad8f281f20154fc258fe41a6814 - password: 258fe4149c199ad8f2811a68f20154fc - frameSize: 5mb - msgSize: 15mb + ethereum-pos: + execution: + rpc: + url: "http://localhost:8545" + ws: + url: "ws://localhost:8546" + origin: "http://localhost" + basic-auth: + username: 9c199ad8f281f20154fc258fe41a6814 + password: 258fe4149c199ad8f2811a68f20154fc + frameSize: 5mb + msgSize: 15mb ---- .Main Config @@ -718,9 +722,9 @@ See link:09-quorum-and-selectors.adoc[Quorum and Selectors] `not_empty` - accept not _null_ value, otherwise retry another upstream; `not_lagging` - accept response only from a fully synced upstream. -| `connection.ethereum` +| `connection.ethereum-pos` | yes -| Connection configuration for Ethereum API +| Connection configuration for Ethereum API of PoS network | `connection.bitcoin` | yes