adjust nonce generation logic

Author: keithsue

x/dlc/keeper/price.go

@@ -1,21 +1,28 @@
 package keeper
 
 import (
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/sideprotocol/side/x/dlc/types"
 )
 
 // GetPrice gets the current price for the specified pair
-func (k Keeper) GetPrice(ctx sdk.Context, pair string) uint64 {
+func (k Keeper) GetPrice(ctx sdk.Context, pair string) sdkmath.Int {
 	store := ctx.KVStore(k.storeKey)
 
 	bz := store.Get(types.PriceKey(pair))
-	return sdk.BigEndianToUint64(bz)
+	price, ok := sdkmath.NewIntFromString(string(bz))
+	if !ok {
+		price = sdkmath.ZeroInt()
+	}
+
+	return price
 }
 
 // SetPrice sets the price for the specified pair
-func (k Keeper) SetPrice(ctx sdk.Context, pair string, price uint64) {
+func (k Keeper) SetPrice(ctx sdk.Context, pair string, price string) {
 	store := ctx.KVStore(k.storeKey)
 
-	store.Set(types.PriceKey(pair), sdk.Uint64ToBigEndian(price))
+	store.Set(types.PriceKey(pair), []byte(price))
 }

x/dlc/keeper/queries.go

@@ -128,5 +128,5 @@ func (k Keeper) Price(goCtx context.Context, req *types.QueryPriceRequest) (*typ
 
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	return &types.QueryPriceResponse{Price: uint64(k.GetPrice(ctx, req.Symbol))}, nil
+	return &types.QueryPriceResponse{Price: k.GetPrice(ctx, req.Symbol).Uint64()}, nil
 }

x/dlc/module/abci.go

@@ -105,9 +105,14 @@ func generateNonces(ctx sdk.Context, k keeper.Keeper) {
 	selectedOracleId := ctx.BlockHeight() % int64(len(oracles))
 	oracle := oracles[selectedOracleId]
 
-	// check nonce index
+	// get nonce index and params
 	nonceIndex := k.GetNonceIndex(ctx, oracle.Id)
-	if nonceIndex >= uint64(k.GetNonceQueueSize(ctx)) {
+	nonceQueueSize := uint64(k.GetNonceQueueSize(ctx))
+
+	// check if nonces need to be generated
+	currentPrice := k.GetPrice(ctx, "BTC-USD")
+	currentEventPrice := k.GetCurrentEventPrice(ctx, "BTC-USD")
+	if currentEventPrice > 0 && currentEventPrice >= currentPrice.Int64() && nonceIndex >= nonceQueueSize {
 		return
 	}
 

x/lending/keeper/msg_server.go

@@ -21,7 +21,9 @@ func (m msgServer) SubmitPrice(goCtx context.Context, msg *types.MsgSubmitPrice)
 	}
 
 	ctx := sdk.UnwrapSDKContext(goCtx)
+
 	m.SetPrice(ctx, msg.Price)
+	m.dlcKeeper.SetPrice(ctx, "BTC-USD", msg.Price)
 
 	return &types.MsgSubmitPriceResponse{}, nil
 }

x/lending/types/expected_keepers.go

@@ -62,6 +62,8 @@ type DLCKeeper interface {
 	GetAgency(ctx sdk.Context, id uint64) *dlctypes.Agency
 
 	TriggerEvent(ctx sdk.Context, id uint64)
+
+	SetPrice(ctx sdk.Context, pair string, price string)
 }
 
 // BtcBridgeKeeper defines the expected BtcBridge keeper interface