Some significant changes that impact the swap implementation are the restructuring of protocols found in swarm/network/protocol.go So far I have added back swap specific properties to the Bzz Struct and Peer Struct.
Right now, everything compiles and runs - but when I connect two swarm peers there is not any swap accounting happening. This is to be expected because I haven't yet implemented the swap instances on the Bzz or Peer Structs. I am planning to begin implementing this here
Would you mind taking a quick look at what's been done so far and help me understand if I'm headed the right direction, or if I'm way off in my approach thus far. And