forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-01 01:23:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix:fix hive rpc bug

Browse source 
Signed-off-by: Chen Kai <281165273grape@gmail.com>
This commit is contained in:
Chen Kai 2024-03-06 17:20:09 +08:00
parent e144a53def
commit 5fa84e3566
5 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
go.mod
View file

@ -53,7 +53,7 @@ require (
github.com/mattn/go-sqlite3 v1.14.18
github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
github.com/olekukonko/tablewriter v0.0.5
github.com/optimism-java/utp-go v0.0.0-20240304045621-8c83613b4635
github.com/optimism-java/utp-go v0.0.0-20240306022148-960d51736dfe
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7
github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7
github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7
@ -71,7 +71,7 @@ require (
golang.org/x/crypto v0.17.0
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
golang.org/x/sync v0.5.0
golang.org/x/sys v0.17.0
golang.org/x/sys v0.18.0
golang.org/x/text v0.14.0
golang.org/x/time v0.3.0
golang.org/x/tools v0.15.0

6
go.sum
View file

@ -499,6 +499,10 @@ github.com/optimism-java/utp-go v0.0.0-20240228122215-2a3f5b7e471b h1:x4Pj9Kq3aQ
github.com/optimism-java/utp-go v0.0.0-20240228122215-2a3f5b7e471b/go.mod h1:DZ0jYzLzt4ZsCmhI/iqYgGFoNx45OfpEoKzXB8HVALQ=
github.com/optimism-java/utp-go v0.0.0-20240304045621-8c83613b4635 h1:7XdL9X8csSzKcvN8OfIac/arkzsLhAAfASKW/WCk990=
github.com/optimism-java/utp-go v0.0.0-20240304045621-8c83613b4635/go.mod h1:DZ0jYzLzt4ZsCmhI/iqYgGFoNx45OfpEoKzXB8HVALQ=
github.com/optimism-java/utp-go v0.0.0-20240305092256-3bd34c160efc h1:4C4sZkeuI0aLv2yelS617Suod125k/XZk77qtq4i+TA=
github.com/optimism-java/utp-go v0.0.0-20240305092256-3bd34c160efc/go.mod h1:DZ0jYzLzt4ZsCmhI/iqYgGFoNx45OfpEoKzXB8HVALQ=
github.com/optimism-java/utp-go v0.0.0-20240306022148-960d51736dfe h1:cjp6RlF53/ARQBG+GgcRyMkKRJrFytVRyKKsAJe9dUk=
github.com/optimism-java/utp-go v0.0.0-20240306022148-960d51736dfe/go.mod h1:DZ0jYzLzt4ZsCmhI/iqYgGFoNx45OfpEoKzXB8HVALQ=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM=
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
@ -803,6 +807,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

12
p2p/discover/api.go
View file

@ -6,7 +6,6 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/p2p/discover/portalwire"
"github.com/ethereum/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/portalnetwork/storage"
"github.com/holiman/uint256"
)
@ -441,12 +440,7 @@ func (p *PortalAPI) HistoryRecursiveFindContent(contentKeyHex string) (*ContentI
return nil, err
}
content, utpTransfer, err := p.portalProtocol.ContentLookup(contentKey)
if errors.Is(err, storage.ErrContentNotFound) {
return &ContentInfo{
Content: "0x",
UtpTransfer: false,
}, nil
}
if err != nil {
return nil, err
}
@ -464,9 +458,7 @@ func (p *PortalAPI) HistoryLocalContent(contentKeyHex string) (string, error) {
}
contentId := p.portalProtocol.ToContentId(contentKey)
content, err := p.portalProtocol.Get(contentId)
if errors.Is(err, storage.ErrContentNotFound) {
return "0x", nil
}
if err != nil {
return "", err
}

15
p2p/discover/portal_protocol.go
View file

@ -16,9 +16,6 @@ import (
"sort"
"time"
"github.com/tetratelabs/wabin/leb128"
"go.uber.org/zap"
"github.com/VictoriaMetrics/fastcache"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p/discover/portalwire"
@ -31,6 +28,8 @@ import (
"github.com/holiman/uint256"
"github.com/optimism-java/utp-go"
"github.com/prysmaticlabs/go-bitfield"
"github.com/tetratelabs/wabin/leb128"
"go.uber.org/zap"
)
const (
@ -327,8 +326,14 @@ func (p *PortalProtocol) setupUDPListening() (*net.UDPConn, error) {
return len(buf), err
})
// TODO: ZAP PRODUCTION LOG
logger, err := zap.NewProductionConfig().Build()
ctx := context.Background()
var logger *zap.Logger
if p.log.Enabled(ctx, log.LevelDebug) || p.log.Enabled(ctx, log.LevelTrace) {
logger, err = zap.NewDevelopmentConfig().Build()
} else {
logger, err = zap.NewProductionConfig().Build()
}
if err != nil {
return nil, err
}

2
p2p/enode/nodedb.go
View file

@ -434,7 +434,7 @@ func (db *DB) localSeq(id ID) uint64 {
if seq := db.fetchUint64(localItemKey(id, dbLocalSeq)); seq > 0 {
return seq
}
return 1
return nowMilliseconds()
}
// storeLocalSeq stores the local record sequence counter.