Remove memstate

go.mod

@@ -94,6 +94,7 @@ require (
 	github.com/firefart/nonamedreturns v1.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/fzipp/gocyclo v0.5.1 // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-critic/go-critic v0.6.3 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.0 // indirect
@@ -140,6 +141,7 @@ require (
 	github.com/gostaticanalysis/nilerr v0.1.1 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.13.0 // indirect
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect

go.sum

@@ -406,6 +406,7 @@ github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3n
 github.com/fzipp/gocyclo v0.5.1 h1:L66amyuYogbxl0j2U+vGqJXusPF2IkduvXLnYD5TFgw=
 github.com/fzipp/gocyclo v0.5.1/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
@@ -676,6 +677,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
 github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.13.0 h1:fi9bGIUJOGzzrHBbP8NWbTfNC5fKO6X7kFw40TOqGB8=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.13.0/go.mod h1:uY3Aurq+SxwQCpdX91xZ9CgxIMT1EsYtcidljXufYIY=
 github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
 github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=

proto/dex/order_cache.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+package seiprotocol.seichain.dex;
+
+option go_package = "github.com/sei-protocol/sei-chain/x/dex/types";
+import "dex/order.proto"; 
+import "gogoproto/gogo.proto";
+
+message BlockOrders {
+  repeated Order orders = 1 [
+    (gogoproto.jsontag) = "orders"
+  ]; 
+}
+
+message BlockCancels {
+  repeated Cancellation cancels = 1 [
+    (gogoproto.jsontag) = "cancels"
+  ]; 
+}

x/dex/cache/order.go → x/dex/keeper/order.go

@@ -1,34 +1,46 @@
-package dex
+package keeper
 
 import (
 	"sort"
 
+	"github.com/cosmos/cosmos-sdk/store/prefix"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/sei-protocol/sei-chain/utils"
 	"github.com/sei-protocol/sei-chain/x/dex/types"
 	"github.com/sei-protocol/sei-chain/x/dex/types/wasm"
 )
 
-type BlockOrders struct {
-	memStateItems[*types.Order]
-}
+func (k Keeper) AddOrder(ctx sdk.Context, contractAddr string, order *types.Order) {
+	store := prefix.NewStore(
+		ctx.KVStore(k.storeKey),
+		types.LimitBookPrefix(
+			contractAddr, order.PriceDenom, order.AssetDenom,
+		),
+	)
+	key := GetKeyForPrice(order.Price)
+	val := types.BlockOrders{}
+
+	if store.Has(key) {
+		b := store.Get(key)
+		k.Cdc.MustUnmarshal(b, &val)
+	}
+	val.Orders = append(val.Orders, order)
 
-func NewOrders() *BlockOrders {
-	return &BlockOrders{memStateItems: NewItems(utils.PtrCopier[types.Order])}
+	b := k.Cdc.MustMarshal(&val)
+	store.Set(key, b)
 }
 
-func (o *BlockOrders) Copy() *BlockOrders {
-	return &BlockOrders{memStateItems: *o.memStateItems.Copy()}
+type BlockOrders struct {
+	blockOrder types.BlockOrders
 }
 
 func (o *BlockOrders) MarkFailedToPlace(failedOrders []wasm.UnsuccessfulOrder) {
-	o.mu.Lock()
-	defer o.mu.Unlock()
 	failedOrdersMap := map[uint64]wasm.UnsuccessfulOrder{}
 	for _, failedOrder := range failedOrders {
 		failedOrdersMap[failedOrder.ID] = failedOrder
 	}
 	newOrders := []*types.Order{}
-	for _, order := range o.internal {
+	for _, order := range o.blockOrder.Orders {
 		if failedOrder, ok := failedOrdersMap[order.Id]; ok {
 			order.Status = types.OrderStatus_FAILED_TO_PLACE
 			order.StatusDescription = failedOrder.Reason
@@ -39,9 +51,6 @@ func (o *BlockOrders) MarkFailedToPlace(failedOrders []wasm.UnsuccessfulOrder) {
 }
 
 func (o *BlockOrders) GetSortedMarketOrders(direction types.PositionDirection, includeLiquidationOrders bool) []*types.Order {
-	o.mu.Lock()
-	defer o.mu.Unlock()
-
 	res := o.getOrdersByCriteria(types.OrderType_MARKET, direction)
 	res = append(res, o.getOrdersByCriteria(types.OrderType_FOKMARKET, direction)...)
 	if includeLiquidationOrders {
@@ -68,14 +77,10 @@ func (o *BlockOrders) GetSortedMarketOrders(direction types.PositionDirection, i
 }
 
 func (o *BlockOrders) GetLimitOrders(direction types.PositionDirection) []*types.Order {
-	o.mu.Lock()
-	defer o.mu.Unlock()
 	return o.getOrdersByCriteria(types.OrderType_LIMIT, direction)
 }
 
 func (o *BlockOrders) GetTriggeredOrders() []*types.Order {
-	o.mu.Lock()
-	defer o.mu.Unlock()
 	return o.getOrdersByCriteriaMap(
 		map[types.OrderType]bool{
 			types.OrderType_STOPLOSS:  true,

x/dex/types/keys.go

@@ -34,6 +34,33 @@ func PairPrefix(priceDenom string, assetDenom string) []byte {
 	return append([]byte(priceDenom), append([]byte(PairSeparator), []byte(assetDenom)...)...)
 }
 
+func LimitBookPrefix(contractAddr string, priceDenom string, assetDenom string) []byte {
+	prefix := KeyPrefix(LimitBookKey)
+
+	return append(
+		append(prefix, KeyPrefix(contractAddr)...),
+		PairPrefix(priceDenom, assetDenom)...,
+	)
+}
+
+func MarketBookPrefix(contractAddr string, priceDenom string, assetDenom string) []byte {
+	prefix := KeyPrefix(MarketBookKey)
+
+	return append(
+		append(prefix, KeyPrefix(contractAddr)...),
+		PairPrefix(priceDenom, assetDenom)...,
+	)
+}
+
+func CancelBookPrefix(contractAddr string, priceDenom string, assetDenom string) []byte {
+	prefix := KeyPrefix(CancelBookKey)
+
+	return append(
+		append(prefix, KeyPrefix(contractAddr)...),
+		PairPrefix(priceDenom, assetDenom)...,
+	)
+}
+
 func OrderBookPrefix(long bool, contractAddr string, priceDenom string, assetDenom string) []byte {
 	var prefix []byte
 	if long {
@@ -89,10 +116,6 @@ func TickSizeKeyPrefix(contractAddr string) []byte {
 	return append(KeyPrefix(TickSizeKey), KeyPrefix(contractAddr)...)
 }
 
-func OrderPrefix(contractAddr string) []byte {
-	return append(KeyPrefix(OrderKey), KeyPrefix(contractAddr)...)
-}
-
 func Cancel(contractAddr string) []byte {
 	return append(KeyPrefix(CancelKey), KeyPrefix(contractAddr)...)
 }
@@ -147,7 +170,10 @@ const (
 
 	ShortBookKey = "ShortBook-value-"
 
+	LimitBookKey   = "LimitBook-value-"
+	MarketBookKey  = "MarketBook-value-"
 	TriggerBookKey = "TriggerBook-value-"
+	CancelBookKey = "CancelBook-value-"
 
 	OrderKey               = "order"
 	AccountActiveOrdersKey = "account-active-orders"