aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--eth/backend.go10
-rw-r--r--whisper/whisper.go3
2 files changed, 6 insertions, 7 deletions
diff --git a/eth/backend.go b/eth/backend.go
index 02d3dc942..ad0486309 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -134,24 +134,20 @@ func New(config *Config) (*Ethereum, error) {
eth.blockPool = NewBlockPool(hasBlock, insertChain, ezp.Verify)
ethProto := EthProtocol(eth.txPool, eth.chainManager, eth.blockPool)
- protocols := []p2p.Protocol{ethProto}
-
- if config.Shh {
- eth.whisper = whisper.New()
- protocols = append(protocols, eth.whisper.Protocol())
- }
+ protocols := []p2p.Protocol{ethProto, eth.whisper.Protocol()}
nat, err := p2p.ParseNAT(config.NATType, config.PMPGateway)
if err != nil {
return nil, err
}
+ fmt.Println(nat)
eth.net = &p2p.Server{
Identity: clientId,
MaxPeers: config.MaxPeers,
Protocols: protocols,
Blacklist: eth.blacklist,
- NAT: nat,
+ NAT: p2p.UPNP(),
NoDial: !config.Dial,
}
diff --git a/whisper/whisper.go b/whisper/whisper.go
index 3ff4bac5a..71a4e841e 100644
--- a/whisper/whisper.go
+++ b/whisper/whisper.go
@@ -4,6 +4,7 @@ import (
"bytes"
"crypto/ecdsa"
"errors"
+ "fmt"
"sync"
"time"
@@ -143,6 +144,7 @@ func (self *Whisper) msgHandler(peer *p2p.Peer, ws p2p.MsgReadWriter) error {
if err != nil {
return err
}
+ fmt.Println("reading message")
envelope, err := NewEnvelopeFromReader(msg.Payload)
if err != nil {
@@ -160,6 +162,7 @@ func (self *Whisper) msgHandler(peer *p2p.Peer, ws p2p.MsgReadWriter) error {
// takes care of adding envelopes to the messages pool. At this moment no sanity checks are being performed.
func (self *Whisper) add(envelope *Envelope) error {
+ fmt.Println("adding")
if !envelope.valid() {
return errors.New("invalid pow provided for envelope")
}