Update project to use Whisper v6. Part of #665

status-im · Feb 16, 2018 · 4aaf473 · 4aaf473
1 parent ff28eb0
commit 4aaf473
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 37 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/_assets/patches/geth/0004-whisper-notifications.patch b/_assets/patches/geth/0004-whisper-notifications.patch
@@ -15,7 +15,7 @@ index 000000000..de8ec85be
 +	"github.com/ethereum/go-ethereum/common"
 +	"github.com/ethereum/go-ethereum/crypto"
 +	"github.com/ethereum/go-ethereum/log"
-+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
++	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 +)
 +
 +const (
@@ -244,7 +244,7 @@ index 000000000..7f27f0301
 +	"github.com/ethereum/go-ethereum/crypto"
 +	"github.com/ethereum/go-ethereum/log"
 +	"github.com/ethereum/go-ethereum/p2p"
-+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
++	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 +	"github.com/status-im/status-go/geth/params"
 +)
 +
@@ -833,7 +833,7 @@ index 000000000..106752186
 +	"crypto/sha256"
 +
 +	crand "crypto/rand"
-+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
++	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 +	"golang.org/x/crypto/pbkdf2"
 +)
 +

diff --git a/_assets/patches/geth/0013-whisperv6-notifications-envelopeversion.patch b/_assets/patches/geth/0013-whisperv6-notifications-envelopeversion.patch
@@ -13,7 +13,7 @@ index 106752186..cca3fba71 100644
 
  	crand "crypto/rand"
 +
- 	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+ 	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
  	"golang.org/x/crypto/pbkdf2"
  )
 @@ -24,7 +25,7 @@ func makeSessionKey() ([]byte, error) {

diff --git a/geth/account/accounts_test.go b/geth/account/accounts_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	gethcommon "github.com/ethereum/go-ethereum/common"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/golang/mock/gomock"
 	"github.com/status-im/status-go/geth/common"
 	. "github.com/status-im/status-go/t/utils"

diff --git a/geth/common/types.go b/geth/common/types.go
@@ -16,7 +16,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/les"
 	"github.com/ethereum/go-ethereum/node"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/robertkrimen/otto"
 	"github.com/status-im/status-go/geth/params"
 	"github.com/status-im/status-go/geth/rpc"

diff --git a/geth/common/types_mock.go b/geth/common/types_mock.go
diff --git a/geth/mailservice/mailservice.go b/geth/mailservice/mailservice.go
@@ -4,7 +4,7 @@ import (
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/rpc"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 )
 
 // ServiceProvider provides node and required services.

diff --git a/geth/mailservice/mailservice_api.go b/geth/mailservice/mailservice_api.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/p2p/discover"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/status-im/status-go/geth/log"
 )
 

diff --git a/geth/mailservice/mailservice_api_test.go b/geth/mailservice/mailservice_api_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/node"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	gomock "github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )

diff --git a/geth/mailservice/mailservice_mock.go b/geth/mailservice/mailservice_mock.go
diff --git a/geth/node/manager.go b/geth/node/manager.go
@@ -14,7 +14,7 @@ import (
 	"github.com/ethereum/go-ethereum/les"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p/discover"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/status-im/status-go/geth/log"
 	"github.com/status-im/status-go/geth/mailservice"
 	"github.com/status-im/status-go/geth/params"

diff --git a/geth/node/node.go b/geth/node/node.go
@@ -20,7 +20,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/nat"
 	"github.com/ethereum/go-ethereum/whisper/mailserver"
 	"github.com/ethereum/go-ethereum/whisper/notifications"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/status-im/status-go/geth/log"
 	"github.com/status-im/status-go/geth/params"
 	shhmetrics "github.com/status-im/status-go/metrics/whisper"

diff --git a/metrics/whisper/tracer_expvar.go b/metrics/whisper/tracer_expvar.go
@@ -6,7 +6,7 @@ package whisper
 import (
 	"expvar"
 
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 )
 
 var (

diff --git a/metrics/whisper/tracer_log.go b/metrics/whisper/tracer_log.go
@@ -4,7 +4,7 @@
 package whisper
 
 import (
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/status-im/status-go/geth/log"
 )
 

diff --git a/metrics/whisper/tracer_prometheus.go b/metrics/whisper/tracer_prometheus.go
@@ -6,7 +6,7 @@ package whisper
 import (
 	"strconv"
 
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/t/e2e/node/manager_test.go b/t/e2e/node/manager_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/les"
 	gethnode "github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/rpc"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/status-im/status-go/geth/node"
 	"github.com/status-im/status-go/geth/params"
 

diff --git a/t/e2e/rpc/rpc_test.go b/t/e2e/rpc/rpc_test.go
@@ -64,7 +64,7 @@ func (s *RPCTestSuite) TestCallRPC() {
 			{
 				`{"jsonrpc":"2.0","method":"shh_version","params":[],"id":67}`,
 				func(resultJSON string) {
-					expected := `{"jsonrpc":"2.0","id":67,"result":"5.0"}`
+					expected := `{"jsonrpc":"2.0","id":67,"result":"6.0"}`
 					s.Equal(expected, resultJSON)
 				},
 			},
@@ -135,7 +135,7 @@ func (s *RPCTestSuite) TestCallRawResult() {
 	s.NotNil(client)
 
 	jsonResult := client.CallRaw(`{"jsonrpc":"2.0","method":"shh_version","params":[],"id":67}`)
-	s.Equal(`{"jsonrpc":"2.0","id":67,"result":"5.0"}`, jsonResult)
+	s.Equal(`{"jsonrpc":"2.0","id":67,"result":"6.0"}`, jsonResult)
 
 	s.NoError(s.NodeManager.StopNode())
 }

diff --git a/t/e2e/suites.go b/t/e2e/suites.go
@@ -2,7 +2,7 @@ package t
 
 import (
 	"github.com/ethereum/go-ethereum/les"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/status-im/status-go/geth/api"
 	"github.com/status-im/status-go/geth/common"
 	"github.com/status-im/status-go/geth/log"

diff --git a/t/e2e/whisper/whisper_jail_test.go b/t/e2e/whisper/whisper_jail_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/crypto"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/status-im/status-go/geth/common"
 	"github.com/status-im/status-go/static"
 	e2e "github.com/status-im/status-go/t/e2e"
@@ -79,7 +79,7 @@ func (s *WhisperJailTestSuite) TestJailWhisper() {
 		{
 			"test 0: ensure correct version of Whisper is used",
 			`
-				var expectedVersion = '5.0';
+				var expectedVersion = '6.0';
 				if (web3.version.whisper != expectedVersion) {
 					throw 'unexpected shh version, expected: ' + expectedVersion + ', got: ' + web3.version.whisper;
 				}

diff --git a/t/e2e/whisper/whisper_mailbox_test.go b/t/e2e/whisper/whisper_mailbox_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p/discover"
-	"github.com/ethereum/go-ethereum/whisper/whisperv5"
+	"github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/status-im/status-go/geth/api"
 	"github.com/status-im/status-go/geth/rpc"
 	e2e "github.com/status-im/status-go/t/e2e"
@@ -68,7 +68,7 @@ func (s *WhisperMailboxSuite) TestRequestMessageFromMailboxAsync() {
 	s.Require().NotNil(rpcClient)
 
 	//create topic
-	topic := whisperv5.BytesToTopic([]byte("topic name"))
+	topic := whisperv6.BytesToTopic([]byte("topic name"))
 
 	//Add key pair to whisper
 	keyID, err := senderWhisperService.NewKeyPair()
@@ -177,7 +177,7 @@ func (s *WhisperMailboxSuite) TestRequestMessagesInGroupChat() {
 	groupChatKey, err := aliceWhisperService.GetSymKey(groupChatKeyID)
 	s.Require().NoError(err)
 	//generate group chat topic
-	groupChatTopic := whisperv5.BytesToTopic([]byte("groupChatTopic"))
+	groupChatTopic := whisperv6.BytesToTopic([]byte("groupChatTopic"))
 	groupChatPayload := newGroupChatParams(groupChatKey, groupChatTopic)
 	payloadStr, err := groupChatPayload.Encode()
 	s.Require().NoError(err)
@@ -188,14 +188,14 @@ func (s *WhisperMailboxSuite) TestRequestMessagesInGroupChat() {
 	bobKey, err := bobWhisperService.GetPrivateKey(bobKeyID)
 	s.Require().NoError(err)
 	bobPubkey := hexutil.Bytes(crypto.FromECDSAPub(&bobKey.PublicKey))
-	bobAliceKeySendTopic := whisperv5.BytesToTopic([]byte("bobAliceKeySendTopic "))
+	bobAliceKeySendTopic := whisperv6.BytesToTopic([]byte("bobAliceKeySendTopic "))
 
 	charlieKeyID, err := charlieWhisperService.NewKeyPair()
 	s.Require().NoError(err)
 	charlieKey, err := charlieWhisperService.GetPrivateKey(charlieKeyID)
 	s.Require().NoError(err)
 	charliePubkey := hexutil.Bytes(crypto.FromECDSAPub(&charlieKey.PublicKey))
-	charlieAliceKeySendTopic := whisperv5.BytesToTopic([]byte("charlieAliceKeySendTopic "))
+	charlieAliceKeySendTopic := whisperv6.BytesToTopic([]byte("charlieAliceKeySendTopic "))
 
 	//bob and charlie create message filter
 	bobMessageFilterID := s.createPrivateChatMessageFilter(bobRPCClient, bobKeyID, bobAliceKeySendTopic.String())
@@ -277,7 +277,7 @@ func (s *WhisperMailboxSuite) TestRequestMessagesInGroupChat() {
 	s.Require().Equal(helloWorldMessage, messages[0]["payload"].(string))
 }
 
-func newGroupChatParams(symkey []byte, topic whisperv5.TopicType) groupChatParams {
+func newGroupChatParams(symkey []byte, topic whisperv6.TopicType) groupChatParams {
 	groupChatKeyStr := hexutil.Bytes(symkey).String()
 	return groupChatParams{
 		Key:   groupChatKeyStr,

diff --git a/t/e2e/whisper/whisper_test.go b/t/e2e/whisper/whisper_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/crypto"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
+	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"github.com/status-im/status-go/geth/account"
 	"github.com/status-im/status-go/geth/node"
 	e2e "github.com/status-im/status-go/t/e2e"

diff --git a/vendor/github.com/ethereum/go-ethereum/whisper/notifications/discovery.go b/vendor/github.com/ethereum/go-ethereum/whisper/notifications/discovery.go
diff --git a/vendor/github.com/ethereum/go-ethereum/whisper/notifications/server.go b/vendor/github.com/ethereum/go-ethereum/whisper/notifications/server.go
diff --git a/vendor/github.com/ethereum/go-ethereum/whisper/notifications/utils.go b/vendor/github.com/ethereum/go-ethereum/whisper/notifications/utils.go