merged
This commit is contained in:
		
							parent
							
								
									bfa12d75f8
								
							
						
					
					
						commit
						c9f566269b
					
				@ -333,7 +333,6 @@ Rectangle {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
			case "shh_newIdentity":
 | 
								case "shh_newIdentity":
 | 
				
			||||||
				var id = shh.newIdentity()
 | 
									var id = shh.newIdentity()
 | 
				
			||||||
				console.log("newIdentity", id)
 | 
					 | 
				
			||||||
				postData(data._id, id)
 | 
									postData(data._id, id)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
				break
 | 
									break
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,6 @@
 | 
				
			|||||||
package qwhisper
 | 
					package qwhisper
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
	"fmt"
 | 
					 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/ethereum/go-ethereum/crypto"
 | 
						"github.com/ethereum/go-ethereum/crypto"
 | 
				
			||||||
@ -42,7 +41,6 @@ func (self *Whisper) Post(payload []string, to, from string, topics []string, pr
 | 
				
			|||||||
		data = append(data, ethutil.Hex2Bytes(d)...)
 | 
							data = append(data, ethutil.Hex2Bytes(d)...)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	fmt.Println(payload, data, "from", from, fromHex(from), crypto.ToECDSA(fromHex(from)))
 | 
					 | 
				
			||||||
	msg := whisper.NewMessage(data)
 | 
						msg := whisper.NewMessage(data)
 | 
				
			||||||
	envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{
 | 
						envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{
 | 
				
			||||||
		Ttl:    time.Duration(ttl),
 | 
							Ttl:    time.Duration(ttl),
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,6 @@ package whisper
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
	"crypto/ecdsa"
 | 
						"crypto/ecdsa"
 | 
				
			||||||
	"fmt"
 | 
					 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/ethereum/go-ethereum/crypto"
 | 
						"github.com/ethereum/go-ethereum/crypto"
 | 
				
			||||||
@ -54,7 +53,6 @@ type Opts struct {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (self *Message) Seal(pow time.Duration, opts Opts) (*Envelope, error) {
 | 
					func (self *Message) Seal(pow time.Duration, opts Opts) (*Envelope, error) {
 | 
				
			||||||
	fmt.Println(opts)
 | 
					 | 
				
			||||||
	if opts.From != nil {
 | 
						if opts.From != nil {
 | 
				
			||||||
		err := self.sign(opts.From)
 | 
							err := self.sign(opts.From)
 | 
				
			||||||
		if err != nil {
 | 
							if err != nil {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user