bet

cosmos/runtime/miner/miner.go

@@ -114,9 +114,20 @@ func (m *Miner) submitPayloadForBuilding(ctx context.Context) error {
 	// to clock skew / rounding to commit two blocks in succession with the same
 	// unix time. This will prevent the block from being built.
 	prevBlockTs := uint64(0)
-	if finalBlock := m.bc.CurrentFinalBlock(); finalBlock != nil {
-		prevBlockTs = finalBlock.Time
+	if finalBlock := m.bc.GetBlockByNumber(uint64(sCtx.BlockHeight()) - 1); finalBlock != nil {
+		prevBlockTs = finalBlock.Time()
+	} else {
+		// If we fail to find the previous block, we minimum of the current time
+		// and the next block time, time.Now() is always increasing, so eventually
+		// time.Now() > sCtx.BlockTime() + 1.
+		prevBlockTs = min(uint64(time.Now().Unix()), uint64(sCtx.BlockTime().Unix())+1)
 	}
+
+	// Ensure that the block time is always increasing.
+	if prevBlockTs <= uint64(sCtx.BlockTime().Unix()) {
+		prevBlockTs = uint64(sCtx.BlockTime().Unix())
+	}
+
 	ts := max(uint64(sCtx.BlockTime().Unix()), prevBlockTs+1)
 
 	// Build Payload.

e2e/testapp/go.mod

@@ -5,6 +5,9 @@ go 1.21.6
 replace (
 	// use cosmos fork of keyring
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
+	// github.com/cockroachdb/pebble => github.com/cockroachdb/pebble v0.0.0-20220817183557-09c6e030a677
+	// Use branch with the mempool race condition fix.
+	github.com/comet/cometbft => github.com/cometbft/cometbft v0.38.3-0.20240117033245-e65a966827e0
 	// We replace `go-ethereum` with `polaris-geth` in order include our required changes.
 	github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v1.13.10-2-polar
 	// replace broken goleveldb