good morning!!!!

Skip to content
Snippets Groups Projects
Commit d88c6ce6 authored by Louis Holbrook's avatar Louis Holbrook Committed by Viktor Trón
Browse files

swarm: Reinstate Pss Protocol add call through swarm service (#19117) 

* swarm: Reinstate Pss Protocol add call through swarm service

* swarm: Even less self
parent 3c62f965
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 56 additions and 51 deletions
swarm/swarm.go
+ 56
− 51
View file @ d88c6ce6
...@@ -344,51 +344,51 @@ Start is called when the stack is started ...@@ -344,51 +344,51 @@ Start is called when the stack is started
* TODO: start subservices like sword, swear, swarmdns * TODO: start subservices like sword, swear, swarmdns
*/ */
// implements the node.Service interface // implements the node.Service interface
func (self *Swarm) Start(srv *p2p.Server) error { func (s *Swarm) Start(srv *p2p.Server) error {
startTime := time.Now() startTime := time.Now()
self.tracerClose = tracing.Closer s.tracerClose = tracing.Closer
// update uaddr to correct enode // update uaddr to correct enode
newaddr := self.bzz.UpdateLocalAddr([]byte(srv.Self().String())) newaddr := s.bzz.UpdateLocalAddr([]byte(srv.Self().String()))
log.Info("Updated bzz local addr", "oaddr", fmt.Sprintf("%x", newaddr.OAddr), "uaddr", fmt.Sprintf("%s", newaddr.UAddr)) log.Info("Updated bzz local addr", "oaddr", fmt.Sprintf("%x", newaddr.OAddr), "uaddr", fmt.Sprintf("%s", newaddr.UAddr))
// set chequebook // set chequebook
//TODO: Currently if swap is enabled and no chequebook (or inexistent) contract is provided, the node would crash. //TODO: Currently if swap is enabled and no chequebook (or inexistent) contract is provided, the node would crash.
//Once we integrate back the contracts, this check MUST be revisited //Once we integrate back the contracts, this check MUST be revisited
if self.config.SwapEnabled && self.config.SwapAPI != "" { if s.config.SwapEnabled && s.config.SwapAPI != "" {
ctx := context.Background() // The initial setup has no deadline. ctx := context.Background() // The initial setup has no deadline.
err := self.SetChequebook(ctx) err := s.SetChequebook(ctx)
if err != nil { if err != nil {
return fmt.Errorf("Unable to set chequebook for SWAP: %v", err) return fmt.Errorf("Unable to set chequebook for SWAP: %v", err)
} }
log.Debug(fmt.Sprintf("-> cheque book for SWAP: %v", self.config.Swap.Chequebook())) log.Debug(fmt.Sprintf("-> cheque book for SWAP: %v", s.config.Swap.Chequebook()))
} else { } else {
log.Debug(fmt.Sprintf("SWAP disabled: no cheque book set")) log.Debug(fmt.Sprintf("SWAP disabled: no cheque book set"))
} }
log.Info("Starting bzz service") log.Info("Starting bzz service")
err := self.bzz.Start(srv) err := s.bzz.Start(srv)
if err != nil { if err != nil {
log.Error("bzz failed", "err", err) log.Error("bzz failed", "err", err)
return err return err
} }
log.Info("Swarm network started", "bzzaddr", fmt.Sprintf("%x", self.bzz.Hive.BaseAddr())) log.Info("Swarm network started", "bzzaddr", fmt.Sprintf("%x", s.bzz.Hive.BaseAddr()))
if self.ps != nil { if s.ps != nil {
self.ps.Start(srv) s.ps.Start(srv)
} }
// start swarm http proxy server // start swarm http proxy server
if self.config.Port != "" { if s.config.Port != "" {
addr := net.JoinHostPort(self.config.ListenAddr, self.config.Port) addr := net.JoinHostPort(s.config.ListenAddr, s.config.Port)
server := httpapi.NewServer(self.api, self.config.Cors) server := httpapi.NewServer(s.api, s.config.Cors)
if self.config.Cors != "" { if s.config.Cors != "" {
log.Debug("Swarm HTTP proxy CORS headers", "allowedOrigins", self.config.Cors) log.Debug("Swarm HTTP proxy CORS headers", "allowedOrigins", s.config.Cors)
} }
log.Debug("Starting Swarm HTTP proxy", "port", self.config.Port) log.Debug("Starting Swarm HTTP proxy", "port", s.config.Port)
go func() { go func() {
err := server.ListenAndServe(addr) err := server.ListenAndServe(addr)
if err != nil { if err != nil {
...@@ -399,7 +399,7 @@ func (self *Swarm) Start(srv *p2p.Server) error { ...@@ -399,7 +399,7 @@ func (self *Swarm) Start(srv *p2p.Server) error {
doneC := make(chan struct{}) doneC := make(chan struct{})
self.cleanupFuncs = append(self.cleanupFuncs, func() error { s.cleanupFuncs = append(s.cleanupFuncs, func() error {
close(doneC) close(doneC)
return nil return nil
}) })
...@@ -409,7 +409,7 @@ func (self *Swarm) Start(srv *p2p.Server) error { ...@@ -409,7 +409,7 @@ func (self *Swarm) Start(srv *p2p.Server) error {
select { select {
case <-time.After(updateGaugesPeriod): case <-time.After(updateGaugesPeriod):
uptimeGauge.Update(time.Since(startTime).Nanoseconds()) uptimeGauge.Update(time.Since(startTime).Nanoseconds())
requestsCacheGauge.Update(int64(self.netStore.RequestsCacheLen())) requestsCacheGauge.Update(int64(s.netStore.RequestsCacheLen()))
case <-doneC: case <-doneC:
return return
} }
...@@ -417,46 +417,46 @@ func (self *Swarm) Start(srv *p2p.Server) error { ...@@ -417,46 +417,46 @@ func (self *Swarm) Start(srv *p2p.Server) error {
}(startTime) }(startTime)
startCounter.Inc(1) startCounter.Inc(1)
self.streamer.Start(srv) s.streamer.Start(srv)
return nil return nil
} }
// implements the node.Service interface // implements the node.Service interface
// stops all component services. // stops all component services.
func (self *Swarm) Stop() error { func (s *Swarm) Stop() error {
if self.tracerClose != nil { if s.tracerClose != nil {
err := self.tracerClose.Close() err := s.tracerClose.Close()
if err != nil { if err != nil {
return err return err
} }
} }
if self.ps != nil { if s.ps != nil {
self.ps.Stop() s.ps.Stop()
} }
if ch := self.config.Swap.Chequebook(); ch != nil { if ch := s.config.Swap.Chequebook(); ch != nil {
ch.Stop() ch.Stop()
ch.Save() ch.Save()
} }
if self.swap != nil { if s.swap != nil {
self.swap.Close() s.swap.Close()
} }
if self.accountingMetrics != nil { if s.accountingMetrics != nil {
self.accountingMetrics.Close() s.accountingMetrics.Close()
} }
if self.netStore != nil { if s.netStore != nil {
self.netStore.Close() s.netStore.Close()
} }
self.sfs.Stop() s.sfs.Stop()
stopCounter.Inc(1) stopCounter.Inc(1)
self.streamer.Stop() s.streamer.Stop()
err := self.bzz.Stop() err := s.bzz.Stop()
if self.stateStore != nil { if s.stateStore != nil {
self.stateStore.Close() s.stateStore.Close()
} }
for _, cleanF := range self.cleanupFuncs { for _, cleanF := range s.cleanupFuncs {
err = cleanF() err = cleanF()
if err != nil { if err != nil {
log.Error("encountered an error while running cleanup function", "err", err) log.Error("encountered an error while running cleanup function", "err", err)
...@@ -482,68 +482,73 @@ func (s *Swarm) Protocols() (protos []p2p.Protocol) { ...@@ -482,68 +482,73 @@ func (s *Swarm) Protocols() (protos []p2p.Protocol) {
// implements node.Service // implements node.Service
// APIs returns the RPC API descriptors the Swarm implementation offers // APIs returns the RPC API descriptors the Swarm implementation offers
func (self *Swarm) APIs() []rpc.API { func (s *Swarm) APIs() []rpc.API {
apis := []rpc.API{ apis := []rpc.API{
// public APIs // public APIs
{ {
Namespace: "bzz", Namespace: "bzz",
Version: "3.0", Version: "3.0",
Service: &Info{self.config, chequebook.ContractParams}, Service: &Info{s.config, chequebook.ContractParams},
Public: true, Public: true,
}, },
// admin APIs // admin APIs
{ {
Namespace: "bzz", Namespace: "bzz",
Version: "3.0", Version: "3.0",
Service: api.NewInspector(self.api, self.bzz.Hive, self.netStore), Service: api.NewInspector(s.api, s.bzz.Hive, s.netStore),
Public: false, Public: false,
}, },
{ {
Namespace: "chequebook", Namespace: "chequebook",
Version: chequebook.Version, Version: chequebook.Version,
Service: chequebook.NewAPI(self.config.Swap.Chequebook), Service: chequebook.NewAPI(s.config.Swap.Chequebook),
Public: false, Public: false,
}, },
{ {
Namespace: "swarmfs", Namespace: "swarmfs",
Version: fuse.Swarmfs_Version, Version: fuse.Swarmfs_Version,
Service: self.sfs, Service: s.sfs,
Public: false, Public: false,
}, },
{ {
Namespace: "accounting", Namespace: "accounting",
Version: protocols.AccountingVersion, Version: protocols.AccountingVersion,
Service: protocols.NewAccountingApi(self.accountingMetrics), Service: protocols.NewAccountingApi(s.accountingMetrics),
Public: false, Public: false,
}, },
} }
apis = append(apis, self.bzz.APIs()...) apis = append(apis, s.bzz.APIs()...)
if self.ps != nil { if s.ps != nil {
apis = append(apis, self.ps.APIs()...) apis = append(apis, s.ps.APIs()...)
} }
return apis return apis
} }
// SetChequebook ensures that the local checquebook is set up on chain. // SetChequebook ensures that the local checquebook is set up on chain.
func (self *Swarm) SetChequebook(ctx context.Context) error { func (s *Swarm) SetChequebook(ctx context.Context) error {
err := self.config.Swap.SetChequebook(ctx, self.backend, self.config.Path) err := s.config.Swap.SetChequebook(ctx, s.backend, s.config.Path)
if err != nil { if err != nil {
return err return err
} }
log.Info(fmt.Sprintf("new chequebook set (%v): saving config file, resetting all connections in the hive", self.config.Swap.Contract.Hex())) log.Info(fmt.Sprintf("new chequebook set (%v): saving config file, resetting all connections in the hive", s.config.Swap.Contract.Hex()))
return nil return nil
} }
// RegisterPssProtocol adds a devp2p protocol to the swarm node's Pss instance
func (s *Swarm) RegisterPssProtocol(topic *pss.Topic, spec *protocols.Spec, targetprotocol *p2p.Protocol, options *pss.ProtocolParams) (*pss.Protocol, error) {
return pss.RegisterProtocol(s.ps, topic, spec, targetprotocol, options)
}
// serialisable info about swarm // serialisable info about swarm
type Info struct { type Info struct {
*api.Config *api.Config
*chequebook.Params *chequebook.Params
} }
func (self *Info) Info() *Info { func (s *Info) Info() *Info {
return self return s
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment