From 89659f85b49b48f4409ed9f522397b99728b214b Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Fri, 8 Nov 2019 08:36:12 +0100 Subject: [PATCH] Upgrade status-protocol-go (#1664) --- VERSION | 2 +- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/status-im/status-protocol-go/v1/decoder.go | 2 ++ vendor/github.com/status-im/status-protocol-go/v1/message.go | 1 + vendor/modules.txt | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index a56e95371..364cd3446 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.34.0-beta.6 +0.34.0-beta.7 diff --git a/go.mod b/go.mod index 4f3772921..80dcc693e 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/russolsen/transit v0.0.0-20180705123435-0794b4c4505a github.com/status-im/migrate/v4 v4.6.2-status.2 github.com/status-im/rendezvous v1.3.0 - github.com/status-im/status-protocol-go v0.4.5-0.20191106131458-03adc878d803 + github.com/status-im/status-protocol-go v0.4.5-0.20191107122821-775d17008edf github.com/status-im/whisper v1.5.2 github.com/stretchr/testify v1.4.0 github.com/syndtr/goleveldb v1.0.0 diff --git a/go.sum b/go.sum index 6614f94f4..b78cc9894 100644 --- a/go.sum +++ b/go.sum @@ -576,8 +576,8 @@ github.com/status-im/migrate/v4 v4.6.2-status.2 h1:SdC+sMDl/aI7vUlwD2qj2p7KsK4T6 github.com/status-im/migrate/v4 v4.6.2-status.2/go.mod h1:c/kc90n47GZu/58nnz1OMLTf7uE4Da4gZP5qmU+A/v8= github.com/status-im/rendezvous v1.3.0 h1:7RK/MXXW+tlm0asKm1u7Qp7Yni6AO29a7j8+E4Lbjg4= github.com/status-im/rendezvous v1.3.0/go.mod h1:+hzjuP+j/XzLPeF6E50b88pWOTLdTcwjvNYt+Gh1W1s= -github.com/status-im/status-protocol-go v0.4.5-0.20191106131458-03adc878d803 h1:EfrFkBu1iNGZMMiFNx7UI3pyKdh7Oklkrx8HEivnChw= -github.com/status-im/status-protocol-go v0.4.5-0.20191106131458-03adc878d803/go.mod h1:r8TgqNOpY+fGKkBfR9PldxSSaBN0EsEEY4a3WsIh9LY= +github.com/status-im/status-protocol-go v0.4.5-0.20191107122821-775d17008edf h1:1boOd5yMePhXxYei97Rm/hFF45alUpMl87ZAWvlSKtg= +github.com/status-im/status-protocol-go v0.4.5-0.20191107122821-775d17008edf/go.mod h1:r8TgqNOpY+fGKkBfR9PldxSSaBN0EsEEY4a3WsIh9LY= github.com/status-im/whisper v1.5.2 h1:26NgiKusmPic38eQdtXnaY+iaQ/LuQ3Dh0kCGYT/Uxs= github.com/status-im/whisper v1.5.2/go.mod h1:emrOxzJme0k66QtbbQ2bdd3P8RCdLZ8sTD7SkwH1s2s= github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE= diff --git a/vendor/github.com/status-im/status-protocol-go/v1/decoder.go b/vendor/github.com/status-im/status-protocol-go/v1/decoder.go index 7999a1d10..13b715aa8 100644 --- a/vendor/github.com/status-im/status-protocol-go/v1/decoder.go +++ b/vendor/github.com/status-im/status-protocol-go/v1/decoder.go @@ -78,6 +78,8 @@ func statusMessageHandler(d transit.Decoder, value interface{}) (interface{}, er sm.Content.Text, ok = contentVal.(string) case transit.Keyword("response-to"): sm.Content.ResponseTo, ok = contentVal.(string) + case transit.Keyword("name"): + sm.Content.Name, ok = contentVal.(string) case transit.Keyword("chat-id"): sm.Content.ChatID, ok = contentVal.(string) } diff --git a/vendor/github.com/status-im/status-protocol-go/v1/message.go b/vendor/github.com/status-im/status-protocol-go/v1/message.go index b22f97f22..71eedacc9 100644 --- a/vendor/github.com/status-im/status-protocol-go/v1/message.go +++ b/vendor/github.com/status-im/status-protocol-go/v1/message.go @@ -37,6 +37,7 @@ type Content struct { ChatID string `json:"chat_id"` Text string `json:"text"` ResponseTo string `json:"response-to"` + Name string `json:"name"` // the ENS name of the sender } // TimestampInMs is a timestamp in milliseconds. diff --git a/vendor/modules.txt b/vendor/modules.txt index ab689ce6c..f2778122f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -365,7 +365,7 @@ github.com/status-im/migrate/v4/source/go_bindata github.com/status-im/rendezvous github.com/status-im/rendezvous/protocol github.com/status-im/rendezvous/server -# github.com/status-im/status-protocol-go v0.4.5-0.20191106131458-03adc878d803 +# github.com/status-im/status-protocol-go v0.4.5-0.20191107122821-775d17008edf github.com/status-im/status-protocol-go github.com/status-im/status-protocol-go/applicationmetadata github.com/status-im/status-protocol-go/bridge/geth