Merge pull request #136 from ethpandaops/revert/network

revert: #130

docs/discovery.md

@@ -60,6 +60,7 @@ P2P configuration to get node records to discover from the [Xatu server coordina
 | p2p.config.discV4 | bool | `true` | enable Node Discovery Protocol v4 *Note: both Node Discovery Protocol v4 and v5 can be enabled at the same time* |
 | p2p.config.discV5 | bool | `true` | enable Node Discovery Protocol v5 *Note: both Node Discovery Protocol v4 and v5 can be enabled at the same time* |
 | p2p.config.restart | string | `2m` | Time between initiating discovery scans and fetching new node record, will generate a fresh private key each time |
+| p2p.config.networkIds | array<string> |  | List of network ids to filter node records by (decimal format, eg. '1' for mainnet) |
 | p2p.config.forkIdHashes | array<string> |  | List of [Fork ID hash](https://eips.ethereum.org/EIPS/eip-2124) to filter node records by (hex string) |
 
 ### P2P `static` configuration
@@ -112,6 +113,7 @@ p2p:
     discV4: true
     discV5: true
     restart: 2m
+    networkIds: [1]
     forkIdHashes: [0xf0afd0e3]
 ```
 

docs/mimicry.md

@@ -98,6 +98,7 @@ Output configuration to send mimicry events to a [Xatu server](./server.md).
 | outputs[].config.batchTimeout | string | `5s` | The maximum duration for constructing a batch. Processor forcefully sends available events when timeout is reached |
 | outputs[].config.exportTimeout | string | `30s` | The maximum duration for exporting events. If the timeout is reached, the export will be cancelled |
 | outputs[].config.maxExportBatchSize | int | `512` | MaxExportBatchSize is the maximum number of events to process in a single batch. If there are more than one batch worth of events then it processes multiple batches of events one batch after the other without any delay |
+| outputs[].config.networkIds | array<string> |  | List of network ids to connect to (decimal format, eg. '1' for mainnet) |
 | outputs[].config.forkIdHashes | array<string> |  | List of [Fork ID hash](https://eips.ethereum.org/EIPS/eip-2124) to connect to (hex string) |
 | outputs[].config.maxPeers | int | `100` | Max number of peers to attempt to connect to simultaneously |
 
@@ -123,6 +124,7 @@ coordinator:
   type: xatu
   config:
     address: localhost:8080
+    networkIds: [1]
     forkIdHashes: [0xf0afd0e3]
     maxPeers: 100
 
@@ -157,6 +159,7 @@ coordinator:
   type: xatu
   config:
     address: localhost:8080
+    networkIds: [1]
     forkIdHashes: [0xf0afd0e3]
 
 outputs:
@@ -175,6 +178,7 @@ coordinator:
   type: xatu
   config:
     address: localhost:8080
+    networkIds: [1]
     forkIdHashes: [0xf0afd0e3]
 
 outputs:
@@ -204,6 +208,7 @@ coordinator:
   type: xatu
   config:
     address: localhost:8080
+    networkIds: [1]
     forkIdHashes: [0xf0afd0e3]
 
 outputs:

docs/server.md

@@ -57,11 +57,6 @@ Server requires a single `yaml` config file. An example file can be found [here]
 | addr | string | `:8080` | The grpc address for [services](#services) |
 | labels | object |  | A key value map of labels to append to every sentry event |
 | ntpServer | string | `pool.ntp.org` | NTP server to calculate clock drift for events |
-| ethereum.network.name | string | | Ethereum network name |
-| ethereum.network.id | int | | Ethereum network chain ID |
-| ethereum.network.spec.secondsPerSlot | int | | Seconds per slot |
-| ethereum.network.spec.slotsPerEpoch | int | | Slots per epoch |
-| ethereum.network.spec.genesisTime | int | | Genesis time |
 | persistence.enabled | bool | `false` | Enable persistence |
 | persistence.driverName | string | `postgres` | Persistence driver name (`postgres`) |
 | persistence.connectionString | string |  | Connection string for the persistence driver |
@@ -115,15 +110,6 @@ GeoIP configuration for MaxMind.
 Simple example that runs on default ports and enables the [Coordinator](./server.md#coordinator) and [Event Ingester](./server.md#event-ingester) services.
 
 ```yaml
-ethereum:
-  network:
-    name: "mainnet"
-    id: 1
-    spec:
-      secondsPerSlot: 12
-      slotsPerEpoch: 32
-      genesisTime: 1606824023
-
 services:
   coordinator:
     enabled: true
@@ -140,15 +126,6 @@ services:
 ### Only run the event exporter example
 
 ```yaml
-ethereum:
-  network:
-    name: "mainnet"
-    id: 1
-    spec:
-      secondsPerSlot: 12
-      slotsPerEpoch: 32
-      genesisTime: 1606824023
-
 services:
   eventIngester:
     enabled: true
@@ -174,15 +151,6 @@ labels:
 
 ntpServer: time.google.com
 
-ethereum:
-  network:
-    name: "mainnet"
-    id: 1
-    spec:
-      secondsPerSlot: 12
-      slotsPerEpoch: 32
-      genesisTime: 1606824023
-
 persistence:
   enabled: true
   driverName: postgres

example_discovery.yaml

@@ -75,4 +75,5 @@ p2p:
   #   discV4: true
   #   discV5: true
   #   restart: 2m
+  #   networkIds: [1]
   #   forkIdHashes: [0xf0afd0e3]

example_mimicry.yaml

@@ -28,6 +28,7 @@ coordinator:
   #   tls: false
   #   headers:
   #     authorization: Someb64Value
+  #   networkIds: [1]
   #   forkIdHashes: [0xf0afd0e3]
   #   maxPeers: 100
 

example_server.yaml

@@ -13,29 +13,6 @@ labels:
 #   pool.ntp.org - https://www.pool.ntp.org/zone/@
 ntpServer: time.google.com
 
-ethereum:
-  network:
-    name: "mainnet"
-    id: 1
-    spec:
-      secondsPerSlot: 12
-      slotsPerEpoch: 32
-      genesisTime: 1606824023
-
-    # name: "goerli"
-    # id: 5
-    # spec:
-    #   secondsPerSlot: 12
-    #   slotsPerEpoch: 32
-    #   genesisTime: 1616508000   
-
-    # name: "sepolia"
-    # id: 11155111
-    # spec:
-    #   secondsPerSlot: 12
-    #   slotsPerEpoch: 32
-    #   genesis_time: 1655733600
-
 persistence:
   enabled: false
   # driverName: postgres

pkg/discovery/p2p/xatu/config.go

@@ -11,6 +11,7 @@ type Config struct {
 	DiscV4       bool              `yaml:"discV4" default:"true"`
 	DiscV5       bool              `yaml:"discV5" default:"true"`
 	Restart      time.Duration     `yaml:"restart" default:"2m"`
+	NetworkIds   []uint64          `yaml:"networkIds"`
 	ForkIDHashes []string          `yaml:"forkIdHashes"`
 }
 

pkg/discovery/p2p/xatu/xatu.go

@@ -131,6 +131,7 @@ func (c *Coordinator) startCrons(ctx context.Context) error {
 		}
 
 		req := xatu.GetDiscoveryNodeRecordRequest{
+			NetworkIds:   c.config.NetworkIds,
 			ForkIdHashes: forkIDHashes,
 		}
 

pkg/mimicry/coordinator/xatu/coordinator/config.go

@@ -8,6 +8,7 @@ type Config struct {
 	Address      string            `yaml:"address"`
 	Headers      map[string]string `yaml:"headers"`
 	TLS          bool              `yaml:"tls" default:"false"`
+	NetworkIds   []uint64          `yaml:"networkIds"`
 	ForkIDHashes []string          `yaml:"forkIdHashes"`
 	MaxPeers     uint32            `yaml:"maxPeers" default:"100"`
 }
@@ -17,5 +18,9 @@ func (c *Config) Validate() error {
 		return errors.New("address is required")
 	}
 
+	if len(c.NetworkIds) == 0 {
+		return errors.New("networkIds is required")
+	}
+
 	return nil
 }

pkg/mimicry/coordinator/xatu/coordinator/coordinator.go

@@ -89,6 +89,7 @@ func (c *Coordinator) CoordinateExecutionNodeRecords(ctx context.Context, record
 	}
 
 	req := xatu.CoordinateExecutionNodeRecordsRequest{
+		NetworkIds:   c.config.NetworkIds,
 		ForkIdHashes: forkIDHashes,
 		NodeRecords:  records,
 		Limit:        c.config.MaxPeers,