fix: validatorupdateblock update every block cause messy of upgrade (#57

)

x/oracle/keeper/cache/caches.go

@@ -177,11 +177,13 @@ func (c *Cache) GetCache(i any) bool {
 		for addr, power := range c.validators.validators {
 			item[addr] = power
 		}
+		return c.validators.update
 	case ItemP:
 		if item == nil {
 			return false
 		}
 		*item = *(c.params.params)
+		return c.params.update
 	case *[]*ItemM:
 		if item == nil {
 			return false
@@ -191,10 +193,10 @@ func (c *Cache) GetCache(i any) bool {
 			tmp = append(tmp, msgs...)
 		}
 		*item = tmp
+		return len(c.msg) > 0
 	default:
 		return false
 	}
-	return true
 }
 
 // SkipCommit skip real commit by setting the updage flag to false

x/oracle/keeper/single.go

@@ -104,9 +104,24 @@ func recacheAggregatorContext(ctx sdk.Context, agc *aggregator.AggregatorContext
 		agc.SealRound(ctx, false)
 	}
 
-	// fill params cache
-	c.AddCache(cache.ItemP(&pTmp))
+	if from >= to {
+		// backwards compatible for that the validatorUpdateBlock updated every block
+		prev := int64(0)
+		for b, p := range recentParamsMap {
+			if b > prev {
+				// pTmp be set at least once, since len(recentParamsMap)>0
+				pTmp = common.Params(*p)
+				prev = b
+			}
+		}
+		agc.SetParams(&pTmp)
+	}
 
+	var pRet common.Params
+	if updated := c.GetCache(cache.ItemP(&pRet)); !updated {
+		c.AddCache(cache.ItemP(&pTmp))
+	}
+	// fill params cache
 	agc.PrepareRound(ctx, uint64(to))
 
 	return true

x/oracle/module.go

@@ -216,6 +216,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.Val
 	logger.Info("prepare for next oracle round of each tokenFeeder")
 	agc.PrepareRound(ctx, 0)
 
+	// TODO: update params happened during this block for cache, for the case: agc is recached from history and cache'params is set with the latest params by recache, but parmas changed during this block as well. or force agc to be GET first before cache be GET(later approch is better)
 	cs.CommitCache(ctx, false, am.keeper)
 	return []abci.ValidatorUpdate{}
 }