From ebe2d9d872c5482e02508f1d3e9c3a56e8a41d44 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 8 Dec 2014 12:43:33 +0100
Subject: First draft of Whisper messages relaying

---
 whisper/main.go | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 whisper/main.go

(limited to 'whisper/main.go')

diff --git a/whisper/main.go b/whisper/main.go
new file mode 100644
index 000000000..3868f604f
--- /dev/null
+++ b/whisper/main.go
@@ -0,0 +1,46 @@
+// +build none
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"net"
+	"os"
+
+	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/ethereum/go-ethereum/whisper"
+	"github.com/obscuren/secp256k1-go"
+)
+
+func main() {
+	logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.InfoLevel))
+
+	pub, sec := secp256k1.GenerateKeyPair()
+
+	whisper := whisper.New(pub, sec)
+
+	srv := p2p.Server{
+		MaxPeers:   10,
+		Identity:   p2p.NewSimpleClientIdentity("whisper-go", "1.0", "", string(pub)),
+		ListenAddr: ":30303",
+		NAT:        p2p.UPNP(),
+
+		Protocols: []p2p.Protocol{whisper.Protocol()},
+	}
+	if err := srv.Start(); err != nil {
+		fmt.Println("could not start server:", err)
+		os.Exit(1)
+	}
+
+	// add seed peers
+	seed, err := net.ResolveTCPAddr("tcp", "poc-7.ethdev.com:30300")
+	if err != nil {
+		fmt.Println("couldn't resolve:", err)
+		os.Exit(1)
+	}
+	srv.SuggestPeer(seed.IP, seed.Port, nil)
+
+	select {}
+}
-- 
cgit v1.2.3


From dda778eda7ad9b94acf14c3c91c1c29e711e170f Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 10 Dec 2014 14:17:32 +0100
Subject: Updated whisper messages to new crypto api + added tests

---
 whisper/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'whisper/main.go')

diff --git a/whisper/main.go b/whisper/main.go
index 3868f604f..80050d899 100644
--- a/whisper/main.go
+++ b/whisper/main.go
@@ -19,7 +19,7 @@ func main() {
 
 	pub, sec := secp256k1.GenerateKeyPair()
 
-	whisper := whisper.New(pub, sec)
+	whisper := whisper.New(sec)
 
 	srv := p2p.Server{
 		MaxPeers:   10,
-- 
cgit v1.2.3


From a17a1f9208f858601f6660dbd7f1b77dd9a3f3d9 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 12 Dec 2014 22:23:42 +0100
Subject: Implemented watching using filter package

* Added filters / watches
* Removed event dep
---
 whisper/main.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'whisper/main.go')

diff --git a/whisper/main.go b/whisper/main.go
index 80050d899..2ee2f3ff1 100644
--- a/whisper/main.go
+++ b/whisper/main.go
@@ -8,6 +8,7 @@ import (
 	"net"
 	"os"
 
+	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/whisper"
@@ -17,9 +18,9 @@ import (
 func main() {
 	logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.InfoLevel))
 
-	pub, sec := secp256k1.GenerateKeyPair()
+	pub, _ := secp256k1.GenerateKeyPair()
 
-	whisper := whisper.New(sec)
+	whisper := whisper.New(&event.TypeMux{})
 
 	srv := p2p.Server{
 		MaxPeers:   10,
-- 
cgit v1.2.3