Revert "Fix extreme slow oracle twap query (#2148)"

This reverts commit 946aedb.

Author: yzang2019

evmrpc/setup_test.go

@@ -652,7 +652,7 @@ func generateTxData() {
 		Data:      []byte("synthetic"),
 		ChainID:   chainId,
 	})
-	debugTraceTxBuilder, debugTraceEthTx := buildTx(ethtypes.DynamicFeeTx{
+	debugTraceTxBuilder, _ := buildTx(ethtypes.DynamicFeeTx{
 		Nonce:     0,
 		GasFeeCap: big.NewInt(1000000000),
 		Gas:       200000,
@@ -725,10 +725,6 @@ func generateTxData() {
 	}); err != nil {
 		panic(err)
 	}
-	_ = EVMKeeper.MockReceipt(Ctx, debugTraceEthTx.Hash(), &types.Receipt{
-		BlockNumber:       103,
-		EffectiveGasPrice: 1000000,
-	})
 	seiAddr, err := sdk.AccAddressFromHex(common.Bytes2Hex([]byte("seiAddr")))
 	if err != nil {
 		panic(err)

x/oracle/keeper/keeper.go

@@ -451,9 +451,9 @@ func (k Keeper) IteratePriceSnapshots(ctx sdk.Context, handler func(snapshot typ
 	}
 }
 
-func (k Keeper) IteratePriceSnapshotsReverse(ctx sdk.Context, keyPrefix []byte, handler func(snapshot types.PriceSnapshot) (stop bool)) {
+func (k Keeper) IteratePriceSnapshotsReverse(ctx sdk.Context, handler func(snapshot types.PriceSnapshot) (stop bool)) {
 	store := ctx.KVStore(k.storeKey)
-	iterator := sdk.KVStoreReversePrefixIterator(store, keyPrefix)
+	iterator := sdk.KVStoreReversePrefixIterator(store, types.PriceSnapshotKey)
 	defer iterator.Close()
 
 	for ; iterator.Valid(); iterator.Next() {
@@ -488,8 +488,7 @@ func (k Keeper) CalculateTwaps(ctx sdk.Context, lookbackSeconds uint64) (types.O
 		return false
 	})
 
-	keyPrefix := types.GetPriceSnapshotKeyForIteration(uint64(currentTime), uint64(currentTime)-lookbackSeconds)
-	k.IteratePriceSnapshotsReverse(ctx, keyPrefix, func(snapshot types.PriceSnapshot) (stop bool) {
+	k.IteratePriceSnapshotsReverse(ctx, func(snapshot types.PriceSnapshot) (stop bool) {
 		stop = false
 		snapshotTimestamp := snapshot.SnapshotTimestamp
 		if currentTime-int64(lookbackSeconds) > snapshotTimestamp {

x/oracle/keeper/keeper_test.go

@@ -521,8 +521,7 @@ func TestPriceSnapshotAdd(t *testing.T) {
 
 	// test iterate reverse
 	expectedTimestampsReverse := []int64{3660, 100, 50}
-	prefix := types.GetPriceSnapshotKeyForIteration(uint64(input.Ctx.BlockTime().Unix()), 0)
-	input.OracleKeeper.IteratePriceSnapshotsReverse(input.Ctx, prefix, func(snapshot types.PriceSnapshot) (stop bool) {
+	input.OracleKeeper.IteratePriceSnapshotsReverse(input.Ctx, func(snapshot types.PriceSnapshot) (stop bool) {
 		// assert that all the timestamps are correct
 		require.Equal(t, expectedTimestampsReverse[0], snapshot.SnapshotTimestamp)
 		expectedTimestampsReverse = expectedTimestampsReverse[1:]

x/oracle/types/keys.go

@@ -93,17 +93,3 @@ func GetKeyForTimestamp(timestamp uint64) []byte {
 func GetPriceSnapshotKey(timestamp uint64) []byte {
 	return append(PriceSnapshotKey, GetKeyForTimestamp(timestamp)...)
 }
-
-func GetPriceSnapshotKeyForIteration(timestampA uint64, timestampB uint64) []byte {
-	var result []byte
-	keyA := GetKeyForTimestamp(timestampA)
-	keyB := GetKeyForTimestamp(timestampB)
-	for i := 0; i < 8; i++ {
-		if keyA[i] == keyB[i] {
-			result = append(result, keyA[i])
-		} else {
-			break
-		}
-	}
-	return append(PriceSnapshotKey, result...)
-}