xeth: fix #1485, data race in fiilter creation and event firing

1 files changed, 9 insertions, 0 deletions

diff --git a/xeth/xeth.go b/xeth/xeth.go
index 19d9c0ad4..34409a148 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -518,6 +518,9 @@ func (self *XEth) UninstallFilter(id int) bool {
 }
 
 func (self *XEth) NewLogFilter(earliest, latest int64, skip, max int, address []string, topics [][]string) int {
+	self.logMu.Lock()
+	defer self.logMu.Unlock()
+
 	var id int
 	filter := core.NewFilter(self.backend)
 	filter.SetEarliestBlock(earliest)
@@ -539,6 +542,9 @@ func (self *XEth) NewLogFilter(earliest, latest int64, skip, max int, address []
 }
 
 func (self *XEth) NewTransactionFilter() int {
+	self.transactionMu.Lock()
+	defer self.transactionMu.Unlock()
+
 	var id int
 	filter := core.NewFilter(self.backend)
 	filter.TransactionCallback = func(tx *types.Transaction) {
@@ -553,6 +559,9 @@ func (self *XEth) NewTransactionFilter() int {
 }
 
 func (self *XEth) NewBlockFilter() int {
+	self.blockMu.Lock()
+	defer self.blockMu.Unlock()
+
 	var id int
 	filter := core.NewFilter(self.backend)
 	filter.BlockCallback = func(block *types.Block, logs state.Logs) {