mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-27 23:26:44 +00:00
remove shisui code part2
Signed-off-by: Chen Kai <281165273grape@gmail.com>
This commit is contained in:
Chen Kai
parent
42f2f3c2b4
commit
db3778434a
8 changed files with 19 additions and 186 deletions
|
|
@ -71,7 +71,6 @@ import (
|
|||
"github.com/ethereum/go-ethereum/p2p/nat"
|
||||
"github.com/ethereum/go-ethereum/p2p/netutil"
|
||||
"github.com/ethereum/go-ethereum/params"
|
||||
"github.com/ethereum/go-ethereum/portalnetwork/portalwire"
|
||||
"github.com/ethereum/go-ethereum/rpc"
|
||||
"github.com/ethereum/go-ethereum/triedb"
|
||||
"github.com/ethereum/go-ethereum/triedb/hashdb"
|
||||
|
|
@ -929,86 +928,6 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server.
|
|||
Value: metrics.DefaultConfig.InfluxDBOrganization,
|
||||
Category: flags.MetricsCategory,
|
||||
}
|
||||
|
||||
PortalRPCListenAddrFlag = &cli.StringFlag{
|
||||
Name: "rpc.addr",
|
||||
Usage: "HTTP-RPC server listening interface",
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalRPCPortFlag = &cli.IntFlag{
|
||||
Name: "rpc.port",
|
||||
Usage: "HTTP-RPC server listening port",
|
||||
Value: node.DefaultHTTPPort,
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalDataDirFlag = &cli.StringFlag{
|
||||
Name: "data.dir",
|
||||
Usage: "Data dir of where the data file located",
|
||||
Value: "./",
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalDataCapacityFlag = &cli.Uint64Flag{
|
||||
Name: "data.capacity",
|
||||
Usage: "The capacity of the data stored, the unit is MB",
|
||||
Value: 1000 * 10, // 10 GB
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalNATFlag = &cli.StringFlag{
|
||||
Name: "nat",
|
||||
Usage: "NAT port mapping mechanism (any|none|upnp|pmp|stun|pmp:<IP>|extip:<IP>|stun:<IP>)",
|
||||
Value: "any",
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalUDPListenAddrFlag = &cli.StringFlag{
|
||||
Name: "udp.addr",
|
||||
Usage: "Protocol UDP server listening interface",
|
||||
Value: "",
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalUDPPortFlag = &cli.IntFlag{
|
||||
Name: "udp.port",
|
||||
Usage: "Protocol UDP server listening port",
|
||||
Value: node.DefaultUDPPort,
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalLogLevelFlag = &cli.IntFlag{
|
||||
Name: "loglevel",
|
||||
Usage: "Loglevel of portal network",
|
||||
Value: node.DefaultLoglevel,
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalLogFormatFlag = &cli.StringFlag{
|
||||
Name: "logformat",
|
||||
Usage: "Log format to use (json|logfmt|terminal)",
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalPrivateKeyFlag = &cli.StringFlag{
|
||||
Name: "private.key",
|
||||
Usage: "Private key of p2p node, hex format without 0x prifix",
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalBootNodesFlag = &cli.StringFlag{
|
||||
Name: "bootnodes",
|
||||
Usage: "Comma separated enode URLs for P2P discovery bootstrap",
|
||||
Category: flags.PortalNetworkCategory,
|
||||
}
|
||||
|
||||
PortalNetworksFlag = &cli.StringSliceFlag{
|
||||
Name: "networks",
|
||||
Usage: "Portal sub networks: history, beacon, state",
|
||||
Category: flags.PortalNetworkCategory,
|
||||
Value: cli.NewStringSlice(portalwire.History.Name()),
|
||||
}
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ func StartPProf(address string, withMetrics bool) {
|
|||
}
|
||||
log.Info("Starting pprof server", "addr", fmt.Sprintf("http://%s/debug/pprof", address))
|
||||
go func() {
|
||||
if err := http.ListenAndServe("0.0.0.0:8080", nil); err != nil {
|
||||
if err := http.ListenAndServe(address, nil); err != nil {
|
||||
log.Error("Failure in running pprof server", "err", err)
|
||||
}
|
||||
}()
|
||||
|
|
|
|||
|
|
@ -2473,11 +2473,9 @@ func TestFillBlobTransaction(t *testing.T) {
|
|||
}
|
||||
if err != nil && len(tc.err) == 0 {
|
||||
t.Fatalf("expected no error. have: %s", err)
|
||||
return
|
||||
}
|
||||
if res == nil {
|
||||
t.Fatal("result missing")
|
||||
return
|
||||
}
|
||||
want, err := json.Marshal(tc.want)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -19,25 +19,24 @@ package flags
|
|||
import "github.com/urfave/cli/v2"
|
||||
|
||||
const (
|
||||
EthCategory = "ETHEREUM"
|
||||
BeaconCategory = "BEACON CHAIN"
|
||||
DevCategory = "DEVELOPER CHAIN"
|
||||
StateCategory = "STATE HISTORY MANAGEMENT"
|
||||
TxPoolCategory = "TRANSACTION POOL (EVM)"
|
||||
BlobPoolCategory = "TRANSACTION POOL (BLOB)"
|
||||
PerfCategory = "PERFORMANCE TUNING"
|
||||
AccountCategory = "ACCOUNT"
|
||||
APICategory = "API AND CONSOLE"
|
||||
NetworkingCategory = "NETWORKING"
|
||||
MinerCategory = "MINER"
|
||||
GasPriceCategory = "GAS PRICE ORACLE"
|
||||
VMCategory = "VIRTUAL MACHINE"
|
||||
LoggingCategory = "LOGGING AND DEBUGGING"
|
||||
MetricsCategory = "METRICS AND STATS"
|
||||
MiscCategory = "MISC"
|
||||
TestingCategory = "TESTING"
|
||||
DeprecatedCategory = "ALIASED (deprecated)"
|
||||
PortalNetworkCategory = "PORTAL NETWORK"
|
||||
EthCategory = "ETHEREUM"
|
||||
BeaconCategory = "BEACON CHAIN"
|
||||
DevCategory = "DEVELOPER CHAIN"
|
||||
StateCategory = "STATE HISTORY MANAGEMENT"
|
||||
TxPoolCategory = "TRANSACTION POOL (EVM)"
|
||||
BlobPoolCategory = "TRANSACTION POOL (BLOB)"
|
||||
PerfCategory = "PERFORMANCE TUNING"
|
||||
AccountCategory = "ACCOUNT"
|
||||
APICategory = "API AND CONSOLE"
|
||||
NetworkingCategory = "NETWORKING"
|
||||
MinerCategory = "MINER"
|
||||
GasPriceCategory = "GAS PRICE ORACLE"
|
||||
VMCategory = "VIRTUAL MACHINE"
|
||||
LoggingCategory = "LOGGING AND DEBUGGING"
|
||||
MetricsCategory = "METRICS AND STATS"
|
||||
MiscCategory = "MISC"
|
||||
TestingCategory = "TESTING"
|
||||
DeprecatedCategory = "ALIASED (deprecated)"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@ const (
|
|||
DefaultWSPort = 8546 // Default TCP port for the websocket RPC server
|
||||
DefaultAuthHost = "localhost" // Default host interface for the authenticated apis
|
||||
DefaultAuthPort = 8551 // Default port for the authenticated apis
|
||||
DefaultUDPPort = 9009 // Default UDP port for the p2p network
|
||||
DefaultLoglevel = 3 // Default loglevel for portal network, which is error level
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
|||
|
|
@ -70,23 +70,6 @@ var V5Bootnodes = []string{
|
|||
"enr:-LK4QKWrXTpV9T78hNG6s8AM6IO4XH9kFT91uZtFg1GcsJ6dKovDOr1jtAAFPnS2lvNltkOGA9k29BUN7lFh_sjuc9QBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhANAdd-Jc2VjcDI1NmsxoQLQa6ai7y9PMN5hpLe5HmiJSlYzMuzP7ZhwRiwHvqNXdoN0Y3CCI4yDdWRwgiOM", // 3.64.117.223 | aws-eu-central-1-frankfurt}
|
||||
}
|
||||
|
||||
var PortalBootnodes = []string{
|
||||
// Trin team's bootnodes
|
||||
"enr:-Jy4QIs2pCyiKna9YWnAF0zgf7bT0GzlAGoF8MEKFJOExmtofBIqzm71zDvmzRiiLkxaEJcs_Amr7XIhLI74k1rtlXICY5Z0IDAuMS4xLWFscGhhLjEtMTEwZjUwgmlkgnY0gmlwhKEjVaWJc2VjcDI1NmsxoQLSC_nhF1iRwsCw0n3J4jRjqoaRxtKgsEe5a-Dz7y0JloN1ZHCCIyg",
|
||||
"enr:-Jy4QKSLYMpku9F0Ebk84zhIhwTkmn80UnYvE4Z4sOcLukASIcofrGdXVLAUPVHh8oPCfnEOZm1W1gcAxB9kV2FJywkCY5Z0IDAuMS4xLWFscGhhLjEtMTEwZjUwgmlkgnY0gmlwhJO2oc6Jc2VjcDI1NmsxoQLMSGVlxXL62N3sPtaV-n_TbZFCEM5AR7RDyIwOadbQK4N1ZHCCIyg",
|
||||
"enr:-Jy4QH4_H4cW--ejWDl_W7ngXw2m31MM2GT8_1ZgECnfWxMzZTiZKvHDgkmwUS_l2aqHHU54Q7hcFSPz6VGzkUjOqkcCY5Z0IDAuMS4xLWFscGhhLjEtMTEwZjUwgmlkgnY0gmlwhJ31OTWJc2VjcDI1NmsxoQPC0eRkjRajDiETr_DRa5N5VJRm-ttCWDoO1QAMMCg5pIN1ZHCCIyg",
|
||||
// Fluffy team's bootnodes
|
||||
"enr:-IS4QGUtAA29qeT3cWVr8lmJfySmkceR2wp6oFQtvO_uMe7KWaK_qd1UQvd93MJKXhMnubSsTQPJ6KkbIu0ywjvNdNEBgmlkgnY0gmlwhMIhKO6Jc2VjcDI1NmsxoQJ508pIqRqsjsvmUQfYGvaUFTxfsELPso_62FKDqlxI24N1ZHCCI40",
|
||||
"enr:-IS4QNaaoQuHGReAMJKoDd6DbQKMbQ4Mked3Gi3GRatwgRVVPXynPlO_-gJKRF_ZSuJr3wyHfwMHyJDbd6q1xZQVZ2kBgmlkgnY0gmlwhMIhKO6Jc2VjcDI1NmsxoQM2kBHT5s_Uh4gsNiOclQDvLK4kPpoQucge3mtbuLuUGYN1ZHCCI44",
|
||||
"enr:-IS4QBdIjs6S1ZkvlahSkuYNq5QW3DbD-UDcrm1l81f2PPjnNjb_NDa4B5x4olHCXtx0d2ZeZBHQyoHyNnuVZ-P1GVkBgmlkgnY0gmlwhMIhKO-Jc2VjcDI1NmsxoQOO3gFuaCAyQKscaiNLC9HfLbVzFdIerESFlOGcEuKWH4N1ZHCCI40",
|
||||
"enr:-IS4QM731tV0CvQXLTDcZNvgFyhhpAjYDKU5XLbM7sZ1WEzIRq4zsakgrv3KO3qyOYZ8jFBK-VzENF8o-vnykuQ99iABgmlkgnY0gmlwhMIhKO-Jc2VjcDI1NmsxoQMTq6Cdx3HmL3Q9sitavcPHPbYKyEibKPKvyVyOlNF8J4N1ZHCCI44",
|
||||
// Ultralight team's bootnodes
|
||||
"enr:-IS4QFV_wTNknw7qiCGAbHf6LxB-xPQCktyrCEZX-b-7PikMOIKkBg-frHRBkfwhI3XaYo_T-HxBYmOOQGNwThkBBHYDgmlkgnY0gmlwhKRc9_OJc2VjcDI1NmsxoQKHPt5CQ0D66ueTtSUqwGjfhscU_LiwS28QvJ0GgJFd-YN1ZHCCE4k",
|
||||
"enr:-IS4QDpUz2hQBNt0DECFm8Zy58Hi59PF_7sw780X3qA0vzJEB2IEd5RtVdPUYZUbeg4f0LMradgwpyIhYUeSxz2Tfa8DgmlkgnY0gmlwhKRc9_OJc2VjcDI1NmsxoQJd4NAVKOXfbdxyjSOUJzmA4rjtg43EDeEJu1f8YRhb_4N1ZHCCE4o",
|
||||
"enr:-IS4QGG6moBhLW1oXz84NaKEHaRcim64qzFn1hAG80yQyVGNLoKqzJe887kEjthr7rJCNlt6vdVMKMNoUC9OCeNK-EMDgmlkgnY0gmlwhKRc9-KJc2VjcDI1NmsxoQLJhXByb3LmxHQaqgLDtIGUmpANXaBbFw3ybZWzGqb9-IN1ZHCCE4k",
|
||||
"enr:-IS4QA5hpJikeDFf1DD1_Le6_ylgrLGpdwn3SRaneGu9hY2HUI7peHep0f28UUMzbC0PvlWjN8zSfnqMG07WVcCyBhADgmlkgnY0gmlwhKRc9-KJc2VjcDI1NmsxoQJMpHmGj1xSP1O-Mffk_jYIHVcg6tY5_CjmWVg1gJEsPIN1ZHCCE4o",
|
||||
}
|
||||
|
||||
const dnsPrefix = "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@"
|
||||
|
||||
// KnownDNSNetwork returns the address of a public DNS-based node list for the given
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
package trie
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrEmptyLeafKey = errors.New("the leaf node has empty key")
|
||||
ErrDifferentLeafPrefix = errors.New("the leaf prifix path is different")
|
||||
ErrEmptyExtensionPrefix = errors.New("the extension node has empty prefix")
|
||||
ErrDifferentExtensionPrefix = errors.New("the prifix path of extension node is different")
|
||||
)
|
||||
|
||||
func DecodeTrieNode(hash, buf []byte) (node, error) {
|
||||
return decodeNodeUnsafe(hash, buf)
|
||||
}
|
||||
|
||||
func TraverseTrieNode(node node, path []byte) ([]byte, []byte, error) {
|
||||
switch v := node.(type) {
|
||||
case *fullNode:
|
||||
first := path[0]
|
||||
remainingPath := path[1:]
|
||||
return TraverseTrieNode(v.Children[first], remainingPath)
|
||||
case *shortNode:
|
||||
length := len(v.Key)
|
||||
lastKey := v.Key[length-1]
|
||||
prePath := v.Key[:length-1]
|
||||
if lastKey == 16 {
|
||||
if len(prePath) == 0 {
|
||||
return nil, nil, ErrEmptyLeafKey
|
||||
}
|
||||
if !bytes.Equal(prePath, path) {
|
||||
return nil, nil, ErrDifferentLeafPrefix
|
||||
}
|
||||
return (v.Val).(valueNode), path, nil
|
||||
} else {
|
||||
for index, key := range v.Key {
|
||||
if path[index] != key {
|
||||
return nil, nil, ErrDifferentExtensionPrefix
|
||||
}
|
||||
}
|
||||
return TraverseTrieNode(v.Val, path[len(v.Key):])
|
||||
}
|
||||
case hashNode:
|
||||
return v, path, nil
|
||||
}
|
||||
return nil, nil, errors.New("unknown type")
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
package trie
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/ethereum/go-ethereum/common/hexutil"
|
||||
)
|
||||
|
||||
const data = "0xf90211a0491f396d5d4768a01ee4282a3ab1127f2a4dc7d42e6c1dbb3e71ad4e9299f5e7a05b4645219e614b388ba9672452b40f291987b15e35bdbd3dfebfac9a085aeab2a0979ebca2a6a0df389fdfef5bfa4a31f2efa8d385bf2f43cd69c27e61165c3667a01bbe04543bb6bf8026ee3ec2a3ec3d6173a60c090008b59779f767e5769d7a0aa051d347ec61c7dde5c4149a943d0aa489544cbea511ed3d7f4fc6aaa52a420d3ea05358bc8e1e1f20e510887226d67efee73769d0b13ebb24a3e750c2214ef090d5a04df1c24ebf40befce60c8eb30a31894102881454fcdeb6f7b83e1fb916c953a8a00a85e04f30a4978712c58a825e7bd2f8a83731ab1aa3e234a0207e918790505fa0778a45437218486b7849aef890d483dcc2deb1423cb81e488b7be2921d505bf4a051dbaef3c3d3fe82bd1484954f38508f651d867f387f71dedbfb0f7355987ed5a061679f43f3db26673bb687c584f30ae3cff7261e71acf07ed1feaecae098fc79a099761ea7d94e01b14285b7ced7dcd1677fbd3ce093a627a8e1472074baad8bd9a0bb6d269fc61443aa28b14af0448aaf6f1f570477d8b4ef2eb7d31543202ce602a06c41cd2d1701b058853591a2f306ddcfd1e55d3e12011cadb100e7c525aaf460a0bcf37abaac566bb98e091575af403804dbb278fbfa5547de6805cbaa529ae137a0de9918a2a976a2b0b3f4aeff801fc79557426b19c15d414ddf8fae843785b0b780"
|
||||
|
||||
func TestDecodeNodePortal(t *testing.T) {
|
||||
dataBytes := hexutil.MustDecode(data)
|
||||
n, _ := DecodeTrieNode(nil, dataBytes)
|
||||
t.Log(n)
|
||||
}
|
||||
Loading…
Reference in a new issue