Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

U v0360 #117

Merged
merged 5 commits into from
Aug 9, 2024
Merged

U v0360 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
acd924a
update go-libp2p and protocol
AstaFrode Aug 7, 2024
1ee8e19
add RecordCacheLen
AstaFrode Aug 7, 2024
37fe3b6
update timeout
AstaFrode Aug 8, 2024
9e67cdd
update go-libp2p and prtocol
AstaFrode Aug 8, 2024
e989d20
add ctx to protocol
AstaFrode Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,16 @@

package config

import (
"github.com/libp2p/go-libp2p/core/connmgr"
)

// Config describes a set of settings for a libp2p node
type Config struct {
ListenPort int
ConnManager connmgr.ConnManager
BootPeers []string
Workspace string
PrivatekeyPath string
ProtocolPrefix string
PublicIpv4 string
BucketSize int
Version string
RecordCacheLen int
DialTimeout int
}

// Option is a libp2p config option that can be given to the libp2p constructor
Expand Down
176 changes: 0 additions & 176 deletions core/fileblock.go
View file
Open in desktop

This file was deleted.

34 changes: 16 additions & 18 deletions core/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"context"
"crypto/rand"
"fmt"
"log"
"os"
"path/filepath"
"sync/atomic"
Expand All @@ -23,7 +24,6 @@ import (
"github.com/gogo/protobuf/proto"
"github.com/libp2p/go-libp2p"
dht "github.com/libp2p/go-libp2p-kad-dht"
"github.com/libp2p/go-libp2p/p2p/transport/tcp"

"github.com/libp2p/go-libp2p/core/connmgr"
"github.com/libp2p/go-libp2p/core/crypto"
Expand All @@ -34,7 +34,6 @@ import (
"github.com/libp2p/go-libp2p/core/peerstore"
"github.com/libp2p/go-libp2p/core/protocol"
rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
tls "github.com/libp2p/go-libp2p/p2p/security/tls"
"github.com/mr-tron/base58"
ma "github.com/multiformats/go-multiaddr"
"github.com/pkg/errors"
Expand Down Expand Up @@ -296,12 +295,12 @@ func NewPeerNode(ctx context.Context, cfg *config.Config) (*PeerNode, error) {
opts = append(opts,
libp2p.Identity(prvKey),
libp2p.ListenAddrStrings(fmt.Sprintf("/ip4/0.0.0.0/tcp/%d", cfg.ListenPort)),
libp2p.ConnectionManager(cfg.ConnManager),
libp2p.Transport(tcp.NewTCPTransport),
libp2p.Security(tls.ID, tls.New),
libp2p.ProtocolVersion(cfg.ProtocolPrefix+p2pProtocolVer),
libp2p.WithDialTimeout(time.Second*time.Duration(cfg.DialTimeout)),
libp2p.DisableIdentifyAddressDiscovery(),
libp2p.DisableMetrics(),
libp2p.EnableRelay(),
libp2p.DisableRelay(),
libp2p.Ping(false),
)

bhost, err := libp2p.New(opts...)
Expand Down Expand Up @@ -331,22 +330,24 @@ func NewPeerNode(ctx context.Context, cfg *config.Config) (*PeerNode, error) {
protocols: NewProtocol(),
}

peer_node.dhtable, peer_node.bootnode, peer_node.netenv, err = NewDHT(ctx, bhost, cfg.BucketSize, cfg.Version, boots, cfg.ProtocolPrefix, peer_node.dhtProtocolVersion)
peer_node.dhtable, peer_node.bootnode, peer_node.netenv, err = NewDHT(ctx, bhost, boots, cfg.ProtocolPrefix, peer_node.dhtProtocolVersion)
if err != nil {
return nil, fmt.Errorf("[NewDHT] %v", err)
}

peer_node.initProtocol(cfg.ProtocolPrefix, cfg.RecordCacheLen)

if len(boots) > 0 {
peer_node.dir, err = mkdir(cfg.Workspace)
if err != nil {
return nil, err
}
peer_node.initProtocol(cfg.ProtocolPrefix)
bootstrapAddr, _ := ma.NewMultiaddr(peer_node.bootnode)
peerinfo, _ := peer.AddrInfoFromP2pAddr(bootstrapAddr)
peer_node.OnlineAction(peerinfo.ID)
} else {
peer_node.OnlineProtocol = peer_node.NewOnlineProtocol()
err = peer_node.OnlineAction(peerinfo.ID)
if err != nil {
log.Println("online failed: ", err)
}
}

return peer_node, nil
Expand Down Expand Up @@ -648,22 +649,19 @@ func verifyWorkspace(ws string) error {
return nil
}

func (n *PeerNode) initProtocol(protocolPrefix string) {
func (n *PeerNode) initProtocol(protocolPrefix string, cacheLen int) {
n.SetProtocolPrefix(protocolPrefix)
n.WriteFileProtocol = n.NewWriteFileProtocol()
n.ReadFileProtocol = n.NewReadFileProtocol()
n.ReadDataProtocol = n.NewReadDataProtocol()
n.ReadDataStatProtocol = n.NewReadDataStatProtocol()
n.OnlineProtocol = n.NewOnlineProtocol()
n.OnlineProtocol = n.NewOnlineProtocol(cacheLen)
n.WriteDataProtocol = n.NewWriteDataProtocol()
}

func NewDHT(ctx context.Context, h host.Host, bucketsize int, version string, boot_nodes []string, protocolPrefix, dhtProtocol string) (*dht.IpfsDHT, string, string, error) {
func NewDHT(ctx context.Context, h host.Host, boot_nodes []string, protocolPrefix, dhtProtocol string) (*dht.IpfsDHT, string, string, error) {
var options []dht.Option
options = append(options,
dht.ProtocolPrefix(protocol.ID(protocolPrefix)),
dht.V1ProtocolOverride(protocol.ID(dhtProtocol)),
dht.Resiliency(10),
dht.BucketSize(bucketsize),
)

if len(boot_nodes) == 0 {
Expand Down
Loading
Loading