Merge remote-tracking branch 'origin/master' into next

2021-01-26 00:47:22 +01:00
parent 422f0991e9 cb187ac093
commit fabcbb621d
13 changed files with 97 additions and 49 deletions
@@ -229,6 +229,9 @@ func gasEstimateGasLimit(
 	pending, ts := mpool.PendingFor(fromA)
 	priorMsgs := make([]types.ChainMsg, 0, len(pending))
 	for _, m := range pending {
+		if m.Message.Nonce == msg.Nonce {
+			break
+		}
 		priorMsgs = append(priorMsgs, m)
 	}