close the stack which should gracefully shutdown node

Author: jagdeep sidhu

eth/backend.go

@@ -415,7 +415,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		return nil
 	}
 	if ethashConfig.PowMode == ethash.ModeNEVM {
-		eth.zmqRep = NewZMQRep(eth, config.NEVMPubEP, NEVMIndex{createBlock, addBlock, deleteBlock})
+		eth.zmqRep = NewZMQRep(stack, eth, config.NEVMPubEP, NEVMIndex{createBlock, addBlock, deleteBlock})
 	}
 	return eth, err
 }

eth/zmqpubsub.go

@@ -20,11 +20,13 @@ package eth
 import (
 	"context"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/node"
 	"github.com/go-zeromq/zmq4"
 	"github.com/ethereum/go-ethereum/core/types"
 )
 
 type ZMQRep struct {
+	stack 	  	   *node.Node
 	eth            *Ethereum
 	rep            zmq4.Socket
 	nevmIndexer    NEVMIndex
@@ -63,7 +65,7 @@ func (zmq *ZMQRep) Init(nevmEP string) error {
 			if strTopic == "nevmcomms" {
 				if string(msg.Frames[1]) == "\ndisconnect" {
 					log.Info("ZMQ: exiting...")
-					zmq.eth.Stop()
+					zmq.stack.Close()
 					return
 				}
 				if string(msg.Frames[1]) == "\fstartnetwork" {
@@ -116,9 +118,10 @@ func (zmq *ZMQRep) Init(nevmEP string) error {
 	return nil
 }
 
-func NewZMQRep(ethIn *Ethereum, NEVMPubEP string, nevmIndexerIn NEVMIndex) *ZMQRep {
+func NewZMQRep(stackIn *node.Node, ethIn *Ethereum, NEVMPubEP string, nevmIndexerIn NEVMIndex) *ZMQRep {
 	ctx := context.Background()
 	zmq := &ZMQRep{
+		stack:			stackIn,
 		eth:            ethIn,
 		rep:            zmq4.NewRep(ctx),
 		nevmIndexer:    nevmIndexerIn,

les/client.go

@@ -310,7 +310,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*LightEthereum, error) {
 		return nil
 	}
 	if config.Ethash.PowMode == ethash.ModeNEVM {
-		leth.zmqRep = NewZMQRep(leth, config.NEVMPubEP, LightNEVMIndex{addBlock, deleteBlock})
+		leth.zmqRep = NewZMQRep(stack, leth, config.NEVMPubEP, LightNEVMIndex{addBlock, deleteBlock})
 	}
 	return leth, nil
 }

les/zmqpubsub.go

@@ -20,11 +20,13 @@ package les
 import (
 	"context"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/node"
 	"github.com/go-zeromq/zmq4"
 	"github.com/ethereum/go-ethereum/core/types"
 )
 
 type ZMQRep struct {
+	stack 	  	   *node.Node
 	leth           *LightEthereum
 	rep            zmq4.Socket
 	nevmIndexer    LightNEVMIndex
@@ -63,7 +65,7 @@ func (zmq *ZMQRep) Init(nevmEP string) error {
 			if strTopic == "nevmcomms" {
 				if string(msg.Frames[1]) == "\ndisconnect" {
 					log.Info("ZMQ: exiting...")
-					zmq.leth.Stop()
+					zmq.stack.Close()
 					return
 				}
 				if string(msg.Frames[1]) == "\fstartnetwork" {
@@ -106,9 +108,10 @@ func (zmq *ZMQRep) Init(nevmEP string) error {
 	return nil
 }
 
-func NewZMQRep(lethIn *LightEthereum, NEVMPubEP string, nevmIndexerIn LightNEVMIndex) *ZMQRep {
+func NewZMQRep(stackIn *node.Node, lethIn *LightEthereum, NEVMPubEP string, nevmIndexerIn LightNEVMIndex) *ZMQRep {
 	ctx := context.Background()
 	zmq := &ZMQRep{
+		stack:			stackIn,
 		leth:           lethIn,
 		rep:            zmq4.NewRep(ctx),
 		nevmIndexer:    nevmIndexerIn,