Swarm accounting #18050
Swarm accounting #18050
Conversation
holisticode
force-pushed
the
swarm-accounting
branch
from
3c31d0e to
a363d9e
Compare
| @@ -353,7 +359,7 @@ func (self *Swarm) Start(srv *p2p.Server) error { | |||
| newaddr := self.bzz.UpdateLocalAddr([]byte(srv.Self().String())) | |||
| log.Info("Updated bzz local addr", "oaddr", fmt.Sprintf("%x", newaddr.OAddr), "uaddr", fmt.Sprintf("%s", newaddr.UAddr)) | |||
| // set chequebook | |||
| if self.config.SwapEnabled { | |||
| if self.config.SwapEnabled && self.config.SwapAPI != "" { | |||
There was a problem hiding this comment.
where does swapAPI this come from and what is it supposed to be?
There was a problem hiding this comment.
This is the chequebook contract as far as I remember. Currently, if swapEnabled, then the code will try to access the contract and it will fail.
This is probably only a temporary fix until we have the last phase of Swap working, which is a working contract.
There was a problem hiding this comment.
I believe it needs to be revisited at the time when we integrate chequebook contracts again, and probably we will need a different strategy.
But currently it would not be possible to run any tests with swap as if swap is enabled and no chequebook contract (or a fake one) is provided, then the node would just crash.
I'll add a comment accordingly here (TODO).
There was a problem hiding this comment.
maybe let's disable the chequebook altogether and revisit that once we reach the point in which it is relevant again?
holisticode
force-pushed
the
swarm-accounting
branch
from
1a35563 to
8cfa50f
Compare
| @@ -353,7 +359,7 @@ func (self *Swarm) Start(srv *p2p.Server) error { | |||
| newaddr := self.bzz.UpdateLocalAddr([]byte(srv.Self().String())) | |||
| log.Info("Updated bzz local addr", "oaddr", fmt.Sprintf("%x", newaddr.OAddr), "uaddr", fmt.Sprintf("%s", newaddr.UAddr)) | |||
| // set chequebook | |||
| if self.config.SwapEnabled { | |||
| if self.config.SwapEnabled && self.config.SwapAPI != "" { | |||
zelig
force-pushed
the
swarm-accounting
branch
2 times, most recently
from
ed8d7af to
d2a3830
Compare
holisticode
force-pushed
the
swarm-accounting
branch
from
739ad4a to
a42ce93
Compare
|
@holisticode we seem to have lost @janos changes that correct the travis issues |
| @@ -228,6 +235,17 @@ func NewRegistry(localID enode.ID, delivery *Delivery, syncChunkStore storage.Sy | |||
| return streamer | |||
| } | |||
|
|
|||
| //we need to construct a spec instance per node instance | |||
| func (r *Registry) setupSpec() { | |||
There was a problem hiding this comment.
can we please have this as setupProtocolSpec? and the corresponding createSpec as createProtocolSpec? these function names are over-generalised
There was a problem hiding this comment.
Any specific reason for that? I have had many "obvious" wording in previous PRs required to be edited away, The variable was called Spec before and in p2p/protocols/protocol.go it is still just called Spec. So I don't see a over-generalization here?
| @@ -353,7 +359,7 @@ func (self *Swarm) Start(srv *p2p.Server) error { | |||
| newaddr := self.bzz.UpdateLocalAddr([]byte(srv.Self().String())) | |||
| log.Info("Updated bzz local addr", "oaddr", fmt.Sprintf("%x", newaddr.OAddr), "uaddr", fmt.Sprintf("%s", newaddr.UAddr)) | |||
| // set chequebook | |||
| if self.config.SwapEnabled { | |||
| if self.config.SwapEnabled && self.config.SwapAPI != "" { | |||
There was a problem hiding this comment.
maybe let's disable the chequebook altogether and revisit that once we reach the point in which it is relevant again?
* swarm: completed 1st phase of swap accounting * swarm: swap accounting for swarm with p2p accounting * swarm/swap: addressed PR comments * swarm/swap: ignore ErrNotFound on stateStore.Get() * swarm/swap: GetPeerBalance test; add TODO for chequebook API check * swarm/network/stream: fix NewRegistry calls with new arguments * swarm/swap: address @justelad's PR comments
Building on p2p accounting, this PR introduces swarm accounting.
This is basically an implementation of the required interfaces of p2p accounting for swarm.
This is a further step in adding swap accounting to swarm.
The last PR will be adding the pricing interface to the streamer package.