Merge pull request #2001 from obscuren/fixes

cmd, crypto: updated web3

cmd/geth/js.go

@@ -299,12 +299,12 @@ func (js *jsre) apiBindings(f xeth.Frontend) error {
 		utils.Fatalf("Error loading web3.js: %v", err)
 	}
 
-	_, err = js.re.Run("var web3 = require('web3');")
+	_, err = js.re.Run("var Web3 = require('web3');")
 	if err != nil {
 		utils.Fatalf("Error requiring web3: %v", err)
 	}
 
-	_, err = js.re.Run("web3.setProvider(jeth)")
+	_, err = js.re.Run("var web3 = new Web3(jeth);")
 	if err != nil {
 		utils.Fatalf("Error setting web3 provider: %v", err)
 	}

xeth/xeth.go

@@ -644,8 +644,10 @@ func (p *XEth) NewWhisperFilter(to, from string, topics [][]string) int {
 	callback := func(msg WhisperMessage) {
 		p.messagesMu.RLock() // Only read lock to the filter pool
 		defer p.messagesMu.RUnlock()
+		if p.messages[id] != nil {
 			p.messages[id].insert(msg)
 		}
+	}
 	// Initialize the core whisper filter and wrap into xeth
 	id = p.Whisper().Watch(to, from, topics, callback)