Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add FOK Market to loadtest #802

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+26 −8
Open

Add FOK Market to loadtest #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
273c5ce
Add FOK Market to loadtest
May 23, 2023
5f2d353
Add percentage
May 26, 2023
21856ad
Test
May 30, 2023
0053bbf
test
May 31, 2023
fb78c4c
test
May 31, 2023
ad0f835
test
May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions loadtest/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@
"message_type_distribution": {
"dex": {
"limit_order_percentage": "0.2",
"market_order_percentage": "0.8"
"market_order_percentage": "0.4",
"fok_market_order_percentage": "0.2",
"fok_by_value_market_order_percentage": "0.2"
},
"staking": {
"delegate_percentage": "0.5",
"undelegate_percentage": "0.25",
"begin_redelegate_percentage": "0.25"
}
},
"constant": true,
"constant": false,
"loadtest_interval": 600,
"message_type": "bank,dex,tokenfactory,staking,failure_dex_malformed,failure_dex_invalid,collect_rewards,distribute_rewards",
"message_type": "dex",
"run_oracle": false,
"metrics_port": 9695,
"wasm_msg_types": {
Expand Down
6 changes: 6 additions & 0 deletions loadtest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,11 @@ func sampleDexOrderType(config Config) (orderType dextypes.OrderType) {
orderType = dextypes.OrderType_LIMIT
case Market:
orderType = dextypes.OrderType_MARKET
case FOKMarket:
orderType = dextypes.OrderType_FOKMARKET
case FOKByValueMarket:
fmt.Println("sampling fok by value")
orderType = dextypes.OrderType_FOKMARKETBYVALUE
default:
panic(fmt.Sprintf("Unknown message type %s\n", msgType))
}
Expand Down Expand Up @@ -359,6 +364,7 @@ func generateDexOrderPlacements(config Config, key cryptotypes.PrivKey, msgPerTx
AssetDenom: "ATOM",
OrderType: orderType,
Data: VortexData,
Nominal: price.Mul(quantity).Quo(FromMili).Quo(FromMili),
})
}
return orderPlacements
Expand Down
16 changes: 13 additions & 3 deletions loadtest/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ const (
Tokenfactory string = "tokenfactory"
Limit string = "limit"
Market string = "market"
FOKMarket string = "fok_market"
FOKByValueMarket string = "fok_by_value_market"
WasmMintNft string = "wasm_mint_nft"
Vortex string = "vortex"
)
Expand Down Expand Up @@ -88,8 +90,10 @@ func (d *NumericDistribution) InvalidSample() sdk.Dec {
}

type DexMsgTypeDistribution struct {
LimitOrderPct sdk.Dec `json:"limit_order_percentage"`
MarketOrderPct sdk.Dec `json:"market_order_percentage"`
LimitOrderPct sdk.Dec `json:"limit_order_percentage"`
MarketOrderPct sdk.Dec `json:"market_order_percentage"`
FOKMarketOrderPct sdk.Dec `json:"fok_market_order_percentage"`
FOKBYVALUEMarketOrderPct sdk.Dec `json:"fok_by_value_market_order_percentage"`
}

type StakingMsgTypeDistribution struct {
Expand All @@ -115,12 +119,18 @@ type WasmMintNftType struct {
}

func (d *MsgTypeDistribution) SampleDexMsgs() string {
if !d.Dex.LimitOrderPct.Add(d.Dex.MarketOrderPct).Equal(sdk.OneDec()) {
if !d.Dex.LimitOrderPct.Add(d.Dex.MarketOrderPct).Add(d.Dex.FOKMarketOrderPct).Add(d.Dex.FOKBYVALUEMarketOrderPct).Equal(sdk.OneDec()) {
panic("Distribution percentages must add up to 1")
}
randNum := sdk.MustNewDecFromStr(fmt.Sprintf("%f", rand.Float64()))
fokThreshold := d.Dex.LimitOrderPct.Add(d.Dex.FOKMarketOrderPct)
fokByValueThreshold := d.Dex.LimitOrderPct.Add(d.Dex.FOKMarketOrderPct).Add(d.Dex.FOKBYVALUEMarketOrderPct)
if randNum.LT(d.Dex.LimitOrderPct) {
return Limit
} else if randNum.LT(fokThreshold) {
return FOKMarket
} else if randNum.LT(fokByValueThreshold) {
return FOKByValueMarket
}
return Market
}
Expand Down
4 changes: 2 additions & 2 deletions x/dex/types/message_place_orders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ func (msg *MsgPlaceOrders) ValidateBasic() error {
if len(order.PriceDenom) == 0 {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid order, price denom is empty (%s)", err)
}
if order.OrderType == OrderType_FOKMARKETBYVALUE || order.OrderType == OrderType_FOKMARKET {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "FOK orders are temporarily disabled")
if order.OrderType == OrderType_FOKMARKETBYVALUE && (order.Nominal.IsNil() || order.Nominal.IsNegative()) {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid nominal value for market by value order (%s)", err)
}
if order.OrderType == OrderType_STOPLIMIT || order.OrderType == OrderType_STOPLOSS {
return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "stop loss/limit order (%s) are not supported yet", err)
Expand Down