Merge pull request #34 from samcm/fix/beacon-changes

feat(consensus): Bugfixes for beacon.Node

pkg/exporter/consensus/beacon/beacon.go

@@ -264,12 +264,19 @@ func (n *node) subscribeToSelf(ctx context.Context) error {
 
 		start := time.Now()
 
+		// Sleep a little for the beacon node to actually save the block
+		time.Sleep(200 * time.Millisecond)
+
 		// Grab the entire block from the beacon node
 		block, err := n.getBlock(ctx, fmt.Sprintf("%v", ev.Slot))
 		if err != nil {
 			return err
 		}
 
+		if block == nil {
+			return errors.New("fetched block is nil")
+		}
+
 		// Insert the beacon block into the state
 		if err := n.state.AddBeaconBlock(ctx, block, start); err != nil {
 			return err

pkg/exporter/pair/pair.go

@@ -166,8 +166,14 @@ func (p *pair) deriveConsensusMechanism(ctx context.Context) error {
 
 	consensusMechanism := DefaultConsensusMechanism
 
+	networkID := uint64(1)
+
+	if p.networkID != nil {
+		networkID = p.networkID.Uint64()
+	}
+
 	// Support networks like Goerli that use Proof of Authority as the default consensus mechanism.
-	if value, exists := DefaultNetworkConsensusMechanism[p.networkID.Uint64()]; exists {
+	if value, exists := DefaultNetworkConsensusMechanism[networkID]; exists {
 		consensusMechanism = value
 	}