From f83423facd84abc11f64aa92b44fb75d1c1982b6 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Tue, 6 Apr 2021 19:27:54 -0400 Subject: [PATCH] update chat2 to use waku_payload encoding/decoding --- cmd/root.go | 69 ------------------------------------ examples/chat2/chat.go | 14 ++++---- examples/chat2/go.mod | 3 +- examples/chat2/go.sum | 26 ++++++++++++++ examples/chat2/main.go | 56 ++++++++++++++++++++++++++--- waku/v2/node/waku_payload.go | 2 -- 6 files changed, 88 insertions(+), 82 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index ad7f1ddd..4dc401b0 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -9,7 +9,6 @@ import ( "os" "os/signal" "syscall" - "time" "github.com/ethereum/go-ethereum/crypto" "github.com/spf13/cobra" @@ -27,52 +26,6 @@ func randomHex(n int) (string, error) { return hex.EncodeToString(bytes), nil } -func write(wakuNode *node.WakuNode, msgContent string) { - - var contentTopic uint32 = 1 - var version uint32 = 0 - var timestamp float64 = float64(time.Now().Unix()) / 1000000000 - - payload, err := node.Encode([]byte(wakuNode.ID()+" says "+msgContent), &node.KeyInfo{Kind: node.None}, 0) - msg := &protocol.WakuMessage{ - Payload: payload, - Version: &version, - ContentTopic: &contentTopic, - Timestamp: ×tamp, - } - - err = wakuNode.Publish(msg, nil) - if err != nil { - fmt.Println("Error sending a message", err) - } else { - fmt.Println("Message sent...") - } -} - -func writeLoop(wakuNode *node.WakuNode) { - for { - time.Sleep(2 * time.Second) - write(wakuNode, fmt.Sprint("Hey - ", time.Now().Unix())) - } -} - -func readLoop(wakuNode *node.WakuNode) { - sub, err := wakuNode.Subscribe(nil) - if err != nil { - fmt.Println("Could not subscribe:", err) - return - } - - for value := range sub.C { - payload, err := node.DecodePayload(value.Message(), &node.KeyInfo{Kind: node.None}) - if err != nil { - fmt.Println(err) - return - } - fmt.Println("Received message:", string(payload)) - } -} - type DBStore struct { store.MessageProvider } @@ -105,14 +58,10 @@ var rootCmd = &cobra.Command{ relay, _ := cmd.Flags().GetBool("relay") key, _ := cmd.Flags().GetString("nodekey") store, _ := cmd.Flags().GetBool("store") - startStore, _ := cmd.Flags().GetBool("start-store") storenode, _ := cmd.Flags().GetString("storenode") staticnodes, _ := cmd.Flags().GetStringSlice("staticnodes") query, _ := cmd.Flags().GetBool("query") - hey, _ := cmd.Flags().GetBool("hey") - listen, _ := cmd.Flags().GetBool("listen") - hostAddr, _ := net.ResolveTCPAddr("tcp", fmt.Sprint("0.0.0.0:", port)) if key == "" { @@ -139,13 +88,6 @@ var rootCmd = &cobra.Command{ if store { wakuNode.MountStore(new(DBStore)) - } - - if startStore { - if !store { - fmt.Println("Store protocol was not started") - return - } wakuNode.StartStore() } @@ -164,14 +106,6 @@ var rootCmd = &cobra.Command{ } } - if hey { - go writeLoop(wakuNode) - } - - if listen { - go readLoop(wakuNode) - } - if query { if !store { fmt.Println("Store protocol was not started") @@ -220,11 +154,8 @@ func init() { rootCmd.Flags().String("nodekey", "", "P2P node private key as hex (default random)") rootCmd.Flags().StringSlice("staticnodes", []string{}, "Multiaddr of peer to directly connect with. Argument may be repeated") rootCmd.Flags().Bool("store", false, "Enable store protocol") - rootCmd.Flags().Bool("start-store", false, "Store messages") rootCmd.Flags().String("storenode", "", "Multiaddr of peer to connect with for waku store protocol") rootCmd.Flags().Bool("relay", true, "Enable relay protocol") - rootCmd.Flags().Bool("hey", false, "Send \"hey!\" on default topic every 2 seconds") - rootCmd.Flags().Bool("listen", false, "Listen messages on default topic") rootCmd.Flags().Bool("query", false, "Asks the storenode for stored messages") } diff --git a/examples/chat2/chat.go b/examples/chat2/chat.go index 37835947..4c8aae97 100644 --- a/examples/chat2/chat.go +++ b/examples/chat2/chat.go @@ -3,7 +3,6 @@ package main import ( "chat2/pb" "context" - "encoding/binary" "time" "github.com/golang/protobuf/proto" @@ -12,8 +11,6 @@ import ( "github.com/status-im/go-waku/waku/v2/protocol" ) -var contentTopic uint32 = binary.LittleEndian.Uint32([]byte("dingpu")) - // Chat represents a subscription to a single PubSub topic. Messages // can be published to the topic with Chat.Publish, and received // messages are pushed to the Messages channel. @@ -69,8 +66,13 @@ func (cr *Chat) Publish(message string) error { var version uint32 = 0 var timestamp float64 = float64(time.Now().UnixNano()) + var keyInfo *node.KeyInfo = &node.KeyInfo{Kind: node.None} - payload, err := node.Encode(msgBytes, &node.KeyInfo{Kind: node.None}, 0) + p := new(node.Payload) + p.Data = msgBytes + p.Key = keyInfo + + payload, err := p.Encode(0) if err != nil { return err } @@ -78,7 +80,7 @@ func (cr *Chat) Publish(message string) error { wakuMsg := &protocol.WakuMessage{ Payload: payload, Version: &version, - ContentTopic: &contentTopic, + ContentTopic: &DefaultContentTopic, Timestamp: ×tamp, } @@ -94,7 +96,7 @@ func (cr *Chat) readLoop() { } msg := &pb.Chat2Message{} - if err := proto.Unmarshal(payload, msg); err != nil { + if err := proto.Unmarshal(payload.Data, msg); err != nil { continue } diff --git a/examples/chat2/go.mod b/examples/chat2/go.mod index 058505ed..57008124 100644 --- a/examples/chat2/go.mod +++ b/examples/chat2/go.mod @@ -6,9 +6,10 @@ require ( github.com/ethereum/go-ethereum v1.10.1 github.com/gdamore/tcell/v2 v2.2.0 github.com/golang/protobuf v1.4.3 + github.com/ipfs/go-log v1.0.4 github.com/ipfs/go-log/v2 v2.1.1 github.com/libp2p/go-libp2p-core v0.8.5 github.com/rivo/tview v0.0.0-20210312174852-ae9464cc3598 - github.com/status-im/go-waku v0.0.0-00010101000000-000000000000 + github.com/status-im/go-waku v0.0.0-20210406231752-e8f7a4d38c82 google.golang.org/protobuf v1.25.0 ) diff --git a/examples/chat2/go.sum b/examples/chat2/go.sum index 777caa98..11d4a390 100644 --- a/examples/chat2/go.sum +++ b/examples/chat2/go.sum @@ -145,6 +145,7 @@ github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 h1:u/UEqS66A5ckRmS4yNp github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= @@ -249,6 +250,7 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= @@ -262,6 +264,7 @@ github.com/huin/goupnp v1.0.1-0.20200620063722-49508fba0031 h1:HarGZ5h9HD9LgEg1y github.com/huin/goupnp v1.0.1-0.20200620063722-49508fba0031/go.mod h1:nNs7wvRfN1eKaMknBydLNQU6146XQim8t4h+q90biWo= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= @@ -506,6 +509,7 @@ github.com/libp2p/go-openssl v0.0.2/go.mod h1:v8Zw2ijCSWBQi8Pq5GAixw6DbFfa9u6VIY github.com/libp2p/go-openssl v0.0.3/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= github.com/libp2p/go-openssl v0.0.5/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= +github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw= github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA= github.com/libp2p/go-reuseport v0.0.2 h1:XSG94b1FJfGA01BUrT82imejHQyTxO4jEWqheyCXYvU= @@ -514,6 +518,7 @@ github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA2 github.com/libp2p/go-reuseport-transport v0.0.3/go.mod h1:Spv+MPft1exxARzP2Sruj2Wb5JSyHNncjf1Oi2dEbzM= github.com/libp2p/go-reuseport-transport v0.0.4 h1:OZGz0RB620QDGpv300n1zaOcKGGAoGVf8h9txtt/1uM= github.com/libp2p/go-reuseport-transport v0.0.4/go.mod h1:trPa7r/7TJK/d+0hdBLOCGvpQQVOU74OXbNCIMkufGw= +github.com/libp2p/go-sockaddr v0.0.2 h1:tCuXfpA9rq7llM/v834RKc/Xvovy/AqM9kHvTV/jY/Q= github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k= github.com/libp2p/go-stream-muxer v0.0.1/go.mod h1:bAo8x7YkSpadMTbtTaxGVHWUQsR/l5MEaHbKaliuT14= github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod h1:j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc= @@ -543,6 +548,7 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -583,6 +589,7 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -670,6 +677,7 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= @@ -725,26 +733,41 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0= +github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU= github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.5.1 h1:VHu76Lk0LSP1x254maIu2bplkWpfBWI+B+6fdoZprcg= github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= +github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc= +github.com/status-im/go-waku v0.0.0-20210406230816-100a26f49c1c h1:1kZkJXIF/jDAh4WQvN2PF763YN8+0cbvQocZ+Ix5PJk= +github.com/status-im/go-waku v0.0.0-20210406230816-100a26f49c1c/go.mod h1:949jqEGfl0gWv8NMWJU5xhW0hSRJicDxYWQAZkJMsqQ= +github.com/status-im/go-waku v0.0.0-20210406231153-0a0542324ca3 h1:7uoAWNPHI6rP4bCZminlWxgVbApNZb32rCS64T1HV/A= +github.com/status-im/go-waku v0.0.0-20210406231153-0a0542324ca3/go.mod h1:949jqEGfl0gWv8NMWJU5xhW0hSRJicDxYWQAZkJMsqQ= +github.com/status-im/go-waku v0.0.0-20210406231317-be168ebe3f2a h1:LYnUhbSs+F75rMr/dYK1286ghyonHI2f5njJhFMybGE= +github.com/status-im/go-waku v0.0.0-20210406231317-be168ebe3f2a/go.mod h1:949jqEGfl0gWv8NMWJU5xhW0hSRJicDxYWQAZkJMsqQ= +github.com/status-im/go-waku v0.0.0-20210406231752-e8f7a4d38c82 h1:80JU8pHRKQt0yBZDca5BXzwK0zsYmjjlLIwiJFfZm/s= +github.com/status-im/go-waku v0.0.0-20210406231752-e8f7a4d38c82/go.mod h1:949jqEGfl0gWv8NMWJU5xhW0hSRJicDxYWQAZkJMsqQ= github.com/status-im/go-wakurelay-pubsub v0.4.2 h1:F4UGcP80H0PGaeJ0mRMzA1Ux3DKYiyv/qu3bOR/efTg= github.com/status-im/go-wakurelay-pubsub v0.4.2/go.mod h1:LSCVYR7mnBBsxVJghrGpQ3yJAAATEe6XeQQqGCZhwrE= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= @@ -759,6 +782,7 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= @@ -1043,6 +1067,7 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= @@ -1057,6 +1082,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= diff --git a/examples/chat2/main.go b/examples/chat2/main.go index 1977d03b..cdeabe08 100644 --- a/examples/chat2/main.go +++ b/examples/chat2/main.go @@ -3,6 +3,7 @@ package main import ( "context" "crypto/rand" + "encoding/binary" "encoding/hex" "encoding/json" "flag" @@ -13,6 +14,8 @@ import ( "net" "net/http" "os" + "os/signal" + "syscall" "time" "github.com/ethereum/go-ethereum/crypto" @@ -20,12 +23,15 @@ import ( "github.com/status-im/go-waku/waku/v2/node" ) +var DefaultContentTopic uint32 = binary.LittleEndian.Uint32([]byte("dingpu")) + func main() { mrand.Seed(time.Now().UTC().UnixNano()) nickFlag := flag.String("nick", "", "nickname to use in chat. will be generated if empty") nodeKeyFlag := flag.String("nodekey", "", "private key for this node. will be generated if empty") staticNodeFlag := flag.String("staticnode", "", "connects to a node. will get a random node from fleets.status.im if empty") + storeNodeFlag := flag.String("storenode", "", "connects to a store node to retrieve messages. will get a random node from fleets.status.im if empty") port := flag.Int("port", 0, "port. Will be random if 0") flag.Parse() @@ -52,6 +58,7 @@ func main() { } wakuNode.MountRelay() + wakuNode.MountStore(nil) // use the nickname from the cli flag, or a default if blank nick := *nickFlag @@ -72,9 +79,17 @@ func main() { time.Sleep(200 * time.Millisecond) staticnode := *staticNodeFlag + storenode := *storeNodeFlag + //storenode = "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS" + storenode = "/ip4/127.0.0.1/tcp/60000/p2p/16Uiu2HAmULUvzjx7r5jcD8mtw6eGynjtAaDYUHFFbkbgcc3GNetZ" + var fleetData []byte + if len(staticnode) == 0 || len(storenode) == 0 { + fleetData = getFleetData() + } + if len(staticnode) == 0 { ui.displayMessage("No static peers configured. Choosing one at random from test fleet...") - staticnode = getRandomFleetNode() + staticnode = getRandomFleetNode(fleetData) } err = wakuNode.DialPeer(staticnode) @@ -85,12 +100,41 @@ func main() { ui.displayMessage("Connected to peer: " + staticnode) } + + if len(storenode) == 0 { + ui.displayMessage("No store node configured. Choosing one at random from test fleet...") + storenode = getRandomFleetNode(fleetData) + } + + err := wakuNode.AddStorePeer(storenode) + if err != nil { + ui.displayMessage("Could not connect to storenode: " + err.Error()) + return + } else { + ui.displayMessage("Connected to storenode: " + storenode) + } + + // TODO: query historic messages + /*time.Sleep(300 * time.Millisecond) + ui.displayMessage("Querying historic messages") + response, err := wakuNode.Query(DefaultContentTopic, true, 0) + if err != nil { + fmt.Println(err) + return + }*/ + }() - // draw the UI + //draw the UI if err = ui.Run(); err != nil { printErr("error running text UI: %s", err) } + + // Wait for a SIGINT or SIGTERM signal + ch := make(chan os.Signal, 1) + signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM) + <-ch + fmt.Println("\n\n\nReceived signal, shutting down...") } // Generates a random hex string with a length of n @@ -119,7 +163,7 @@ func shortID(p peer.ID) string { return pretty[len(pretty)-8:] } -func getRandomFleetNode() string { +func getFleetData() []byte { url := "https://fleets.status.im" httpClient := http.Client{ Timeout: time.Second * 2, @@ -144,8 +188,12 @@ func getRandomFleetNode() string { log.Fatal(readErr) } + return body +} + +func getRandomFleetNode(data []byte) string { var result map[string]interface{} - json.Unmarshal(body, &result) + json.Unmarshal(data, &result) fleets := result["fleets"].(map[string]interface{}) wakuv2Test := fleets["wakuv2.test"].(map[string]interface{}) diff --git a/waku/v2/node/waku_payload.go b/waku/v2/node/waku_payload.go index 8681d7d4..efe9c94c 100644 --- a/waku/v2/node/waku_payload.go +++ b/waku/v2/node/waku_payload.go @@ -6,7 +6,6 @@ import ( "crypto/ecdsa" crand "crypto/rand" "encoding/binary" - "fmt" mrand "math/rand" "errors" @@ -107,7 +106,6 @@ func DecodePayload(message *protocol.WakuMessage, keyInfo *KeyInfo) (*DecodedPay if err != nil { return nil, err } - fmt.Println("AAA") return decodedPayload, nil case Asymmetric: