Removed all references to forkid and forkfilter

eth/discovery.go

@@ -18,16 +18,13 @@ package eth
 
 import (
 	"github.com/dominant-strategies/go-quai/core"
-	"github.com/dominant-strategies/go-quai/core/forkid"
 	"github.com/dominant-strategies/go-quai/p2p/enode"
 	"github.com/dominant-strategies/go-quai/rlp"
 )
 
 // ethEntry is the "eth" ENR entry which advertises eth protocol
 // on the discovery network.
 type ethEntry struct {
-	ForkID forkid.ID // Fork identifier
-
 	// Ignore additional fields (for forward compatibility).
 	Rest []rlp.RawValue `rlp:"tail"`
 }
@@ -58,6 +55,5 @@ func (eth *Quai) startEthEntryUpdate(ln *enode.LocalNode) {
 }
 
 func (eth *Quai) currentEthEntry() *ethEntry {
-	return &ethEntry{ForkID: forkid.NewID(eth.core.Config(), eth.core.Genesis().Hash(),
-		eth.core.CurrentHeader().Number().Uint64())}
+	return &ethEntry{}
 }

eth/handler.go

@@ -25,7 +25,6 @@ import (
 
 	"github.com/dominant-strategies/go-quai/common"
 	"github.com/dominant-strategies/go-quai/core"
-	"github.com/dominant-strategies/go-quai/core/forkid"
 	"github.com/dominant-strategies/go-quai/core/types"
 	"github.com/dominant-strategies/go-quai/eth/downloader"
 	"github.com/dominant-strategies/go-quai/eth/fetcher"
@@ -113,7 +112,6 @@ type handlerConfig struct {
 
 type handler struct {
 	networkID     uint64
-	forkFilter    forkid.Filter     // Fork ID filter, constant across the lifetime of the node
 	slicesRunning []common.Location // Slices running on the node
 
 	acceptTxs uint32 // Flag whether we're considered synchronised (enables transaction processing)
@@ -167,7 +165,6 @@ func newHandler(config *handlerConfig) (*handler, error) {
 	h := &handler{
 		networkID:     config.Network,
 		slicesRunning: config.SlicesRunning,
-		forkFilter:    forkid.NewFilter(config.Core),
 		eventMux:      config.EventMux,
 		database:      config.Database,
 		txpool:        config.TxPool,
@@ -230,8 +227,7 @@ func (h *handler) runEthPeer(peer *eth.Peer, handler eth.Handler) error {
 		hash    = head.Hash()
 		entropy = head.CalcS()
 	)
-	forkID := forkid.NewID(h.core.Config(), h.core.Genesis().Hash(), h.core.CurrentHeader().Number().Uint64())
-	if err := peer.Handshake(h.networkID, h.slicesRunning, entropy, hash, genesis.Hash(), forkID, h.forkFilter); err != nil {
+	if err := peer.Handshake(h.networkID, h.slicesRunning, entropy, hash, genesis.Hash()); err != nil {
 		peer.Log().Debug("Quai handshake failed", "err", err)
 		return err
 	}