Merge pull request #310 from cheng762/feature/compatible-with-graphql

fix p2p chainid not set
AlayaNetwork · Jan 26, 2022 · 3cc9c75 · 3cc9c75
2 parents 7fb9d1a + a592304
commit 3cc9c75
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/eth/backend.go b/eth/backend.go
@@ -202,7 +202,7 @@ func New(stack *node.Node, config *Config) (*Ethereum, error) {
 	}
 
 	log.Info("Initialised chain configuration", "config", chainConfig)
-	stack.ChainID = chainConfig.ChainID
+	stack.SetP2pChainID(chainConfig.ChainID)
 
 	eth := &Ethereum{
 		config:            config,

diff --git a/node/node.go b/node/node.go
@@ -64,8 +64,6 @@ type Node struct {
 
 	databases map[*closeTrackingDB]struct{} // All open databases
 
-	// chainId identifies the current chain and is used for replay protection
-	ChainID *big.Int `toml:"-"`
 }
 
 const (
@@ -200,6 +198,9 @@ func (n *Node) Start() error {
 	}
 	return err
 }
+func (n *Node) SetP2pChainID(ChainID *big.Int) {
+	n.server.ChainID = ChainID
+}
 
 // Close stops the Node and releases resources acquired in
 // Node constructor New.

diff --git a/p2p/server.go b/p2p/server.go
@@ -20,14 +20,15 @@ package p2p
 import (
 	"crypto/ecdsa"
 	"errors"
-	"golang.org/x/crypto/sha3"
 	"math/big"
 	"math/rand"
 	"net"
 	"sync"
 	"sync/atomic"
 	"time"
 
+	"golang.org/x/crypto/sha3"
+
 	"github.com/AlayaNetwork/Alaya-Go/common"
 	"github.com/AlayaNetwork/Alaya-Go/common/mclock"
 	"github.com/AlayaNetwork/Alaya-Go/core/cbfttypes"