Merge pull request #194 from MinterTeam/dev

v0.9.4
MinterTeam · Dec 26, 2018 · 47332f2 · 47332f2
2 parents 700be43 + 57af2b5
commit 47332f2
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Changelog
 
 ## 0.9.4
+*Dec 26th, 2018*
+
+IMPROVEMENT
+
+- [mempool] Disable tx rechecking
+
+BUG FIXES
+
+- [core] Fix issue with bag tx occupying mempool
+
+## 0.9.3
 *Dec 25th, 2018*
 
 BUG FIXES

diff --git a/config/config.go b/config/config.go
@@ -100,6 +100,8 @@ func GetConfig() *Config {
 		cfg.RPC.GRPCListenAddress = ""
 	}
 
+	cfg.Mempool.Recheck = false
+
 	cfg.SetRoot(utils.GetMinterHome())
 	EnsureRoot(utils.GetMinterHome())
 

diff --git a/config/toml.go b/config/toml.go
@@ -202,7 +202,6 @@ private_peer_ids = "{{ .P2P.PrivatePeerIDs }}"
 ##### mempool configuration options #####
 [mempool]
 
-recheck = {{ .Mempool.Recheck }}
 broadcast = {{ .Mempool.Broadcast }}
 wal_dir = "{{ js .Mempool.WalPath }}"
 

diff --git a/core/transaction/executor.go b/core/transaction/executor.go
@@ -134,5 +134,11 @@ func RunTx(context *state.StateDB, isCheck bool, rawTx []byte, rewardPool *big.I
 			Log:  fmt.Sprintf("Unexpected nonce. Expected: %d, got %d.", expectedNonce, tx.Nonce)}
 	}
 
-	return tx.decodedData.Run(tx, context, isCheck, rewardPool, currentBlock)
+	response := tx.decodedData.Run(tx, context, isCheck, rewardPool, currentBlock)
+
+	if response.Code != code.TxFromSenderAlreadyInMempool && response.Code != code.OK {
+		delete(currentMempool, sender)
+	}
+
+	return response
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.4"
 services:
   minter:
-    image: minterteam/minter:0.9.3
+    image: minterteam/minter:0.9.4
     volumes:
       - ~/.minter:/minter
     ports:

diff --git a/version/version.go b/version/version.go
@@ -4,14 +4,14 @@ package version
 const (
 	Maj = "0"
 	Min = "9"
-	Fix = "3"
+	Fix = "4"
 
 	AppVer = 1
 )
 
 var (
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.9.3"
+	Version = "0.9.4"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string