Skip to content

Commit 9325dca

Browse files
albertchonalbertchon
committed
re-gen
1 parent f937d4f commit 9325dca

File tree

15 files changed

+4638
-2171
lines changed

15 files changed

+4638
-2171
lines changed

‎chain/client/context.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
peggy "github.com/InjectiveLabs/sdk-go/chain/peggy/types"
2323
chaintypes "github.com/InjectiveLabs/sdk-go/chain/types"
2424

25+
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
2526
cosmostypes "github.com/cosmos/cosmos-sdk/types"
2627
signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
2728
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -71,6 +72,7 @@ func NewTxConfig(signModes []signingtypes.SignMode) client.TxConfig {
7172
stakingtypes.RegisterInterfaces(interfaceRegistry)
7273
upgradetypes.RegisterInterfaces(interfaceRegistry)
7374
feegranttypes.RegisterInterfaces(interfaceRegistry)
75+
wasmtypes.RegisterInterfaces(interfaceRegistry)
7476

7577
marshaler := codec.NewProtoCodec(interfaceRegistry)
7678
return tx.NewTxConfig(marshaler, signModes)
@@ -111,6 +113,8 @@ func NewClientContext(
111113
slashingtypes.RegisterInterfaces(interfaceRegistry)
112114
stakingtypes.RegisterInterfaces(interfaceRegistry)
113115
upgradetypes.RegisterInterfaces(interfaceRegistry)
116+
wasmtypes.RegisterInterfaces(interfaceRegistry)
117+
114118

115119
marshaler := codec.NewProtoCodec(interfaceRegistry)
116120
encodingConfig := EncodingConfig{

‎chain/exchange/types/codec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
4242
cdc.RegisterConcrete(&DerivativeMarketParamUpdateProposal{}, "exchange/DerivativeMarketParamUpdateProposal", nil)
4343
cdc.RegisterConcrete(&TradingRewardCampaignLaunchProposal{}, "exchange/TradingRewardCampaignLaunchProposal", nil)
4444
cdc.RegisterConcrete(&TradingRewardCampaignUpdateProposal{}, "exchange/TradingRewardCampaignUpdateProposal", nil)
45-
cdc.RegisterConcrete(&TradingRewardPointsUpdateProposal{}, "exchange/TradingRewardPointsUpdateProposal", nil)
45+
cdc.RegisterConcrete(&TradingRewardPendingPointsUpdateProposal{}, "exchange/TradingRewardPendingPointsUpdateProposal", nil)
4646
cdc.RegisterConcrete(&FeeDiscountProposal{}, "exchange/FeeDiscountProposal", nil)
4747
cdc.RegisterConcrete(&BatchCommunityPoolSpendProposal{}, "exchange/BatchCommunityPoolSpendProposal", nil)
4848
}
@@ -82,7 +82,7 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
8282
&DerivativeMarketParamUpdateProposal{},
8383
&TradingRewardCampaignLaunchProposal{},
8484
&TradingRewardCampaignUpdateProposal{},
85-
&TradingRewardPointsUpdateProposal{},
85+
&TradingRewardPendingPointsUpdateProposal{},
8686
&FeeDiscountProposal{},
8787
&BatchCommunityPoolSpendProposal{},
8888
)

‎chain/exchange/types/derivative_orders.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@ import (
77
)
88

99
func NewMarketOrderForLiquidation(position *Position, positionSubaccountID common.Hash, liquidator sdk.AccAddress) *DerivativeMarketOrder {
10+
var (
11+
worstPrice sdk.Dec
12+
orderType OrderType
13+
)
1014

1115
// if long position, market sell order at price 0
1216
// if short position, market buy order at price infinity
13-
var worstPrice sdk.Dec
14-
var orderType OrderType
1517
if position.IsLong {
1618
worstPrice = sdk.ZeroDec()
1719
orderType = OrderType_SELL
1820
} else {
19-
// cap the worst price to sell a position at 200x the entry price
20-
worstPrice = position.EntryPrice.MulInt64(200)
21+
worstPrice = MaxOrderPrice
2122
orderType = OrderType_BUY
2223
}
2324

‎chain/exchange/types/errors.go‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -5,62 +5,62 @@ import (
55
)
66

77
var (
8-
ErrOrderInvalid = sdkerrors.Register(ModuleName, 1, "failed to validate order")
9-
ErrSpotMarketNotFound = sdkerrors.Register(ModuleName, 2, "spot market not found")
10-
ErrSpotMarketExists = sdkerrors.Register(ModuleName, 3, "spot market exists")
11-
ErrBadField = sdkerrors.Register(ModuleName, 4, "struct field error")
12-
ErrMarketInvalid = sdkerrors.Register(ModuleName, 5, "failed to validate market")
13-
ErrInsufficientDeposit = sdkerrors.Register(ModuleName, 6, "subaccount has insufficient deposits")
14-
ErrUnrecognizedOrderType = sdkerrors.Register(ModuleName, 7, "unrecognized order type")
15-
ErrInsufficientPositionQuantity = sdkerrors.Register(ModuleName, 8, "position quantity insufficient for order")
16-
ErrOrderHashInvalid = sdkerrors.Register(ModuleName, 9, "order hash is not valid")
17-
ErrBadSubaccountID = sdkerrors.Register(ModuleName, 10, "subaccount id is not valid")
18-
ErrInvalidTicker = sdkerrors.Register(ModuleName, 11, "invalid ticker")
19-
ErrInvalidBaseDenom = sdkerrors.Register(ModuleName, 12, "invalid base denom")
20-
ErrInvalidQuoteDenom = sdkerrors.Register(ModuleName, 13, "invalid quote denom")
21-
ErrInvalidOracle = sdkerrors.Register(ModuleName, 14, "invalid oracle")
22-
ErrInvalidExpiry = sdkerrors.Register(ModuleName, 15, "invalid expiry")
23-
ErrInvalidPrice = sdkerrors.Register(ModuleName, 16, "invalid price")
24-
ErrInvalidQuantity = sdkerrors.Register(ModuleName, 17, "invalid quantity")
25-
ErrUnsupportedOracleType = sdkerrors.Register(ModuleName, 18, "unsupported oracle type")
26-
ErrOrderDoesntExist = sdkerrors.Register(ModuleName, 19, "order doesnt exist")
27-
ErrOrderbookFillInvalid = sdkerrors.Register(ModuleName, 20, "spot limit orderbook fill invalid")
28-
ErrPerpetualMarketExists = sdkerrors.Register(ModuleName, 21, "perpetual market exists")
29-
ErrExpiryFuturesMarketExists = sdkerrors.Register(ModuleName, 22, "expiry futures market exists")
30-
ErrExpiryFuturesMarketExpired = sdkerrors.Register(ModuleName, 23, "expiry futures market expired")
31-
ErrNoLiquidity = sdkerrors.Register(ModuleName, 24, "no liquidity on the orderbook!")
32-
ErrSlippageExceedsWorstPrice = sdkerrors.Register(ModuleName, 25, "Orderbook liquidity cannot satisfy current worst price")
33-
ErrInsufficientOrderMargin = sdkerrors.Register(ModuleName, 26, "Order has insufficient margin")
34-
ErrDerivativeMarketNotFound = sdkerrors.Register(ModuleName, 27, "Derivative market not found")
35-
ErrPositionNotFound = sdkerrors.Register(ModuleName, 28, "Position not found")
36-
ErrInvalidReduceOnlyPositionDirection = sdkerrors.Register(ModuleName, 29, "Position direction does not oppose the reduce-only order")
37-
ErrPriceSurpassesBankruptcyPrice = sdkerrors.Register(ModuleName, 30, "Price Surpasses Bankruptcy Price")
38-
ErrPositionNotLiquidable = sdkerrors.Register(ModuleName, 31, "Position not liquidable")
39-
ErrInvalidTriggerPrice = sdkerrors.Register(ModuleName, 32, "invalid trigger price")
40-
ErrInvalidOracleType = sdkerrors.Register(ModuleName, 33, "invalid oracle type")
41-
ErrInvalidPriceTickSize = sdkerrors.Register(ModuleName, 34, "invalid minimum price tick size")
42-
ErrInvalidQuantityTickSize = sdkerrors.Register(ModuleName, 35, "invalid minimum quantity tick size")
43-
ErrInvalidMargin = sdkerrors.Register(ModuleName, 36, "invalid minimum order margin")
44-
ErrExceedsOrderSideCount = sdkerrors.Register(ModuleName, 37, "Exceeds order side count")
45-
ErrDerivativeMarketOrderAlreadyExists = sdkerrors.Register(ModuleName, 38, "Subaccount cannot place a market order when a market order or limit order in the same market was already placed in same block")
46-
ErrDerivativeLimitOrderAlreadyExists = sdkerrors.Register(ModuleName, 39, "Subaccount cannot place a limit order when a market order in the same market was already placed in the same block")
47-
ErrMarketLaunchProposalAlreadyExists = sdkerrors.Register(ModuleName, 40, "An equivalent market launch proposal already exists.")
48-
ErrInvalidMarketStatus = sdkerrors.Register(ModuleName, 41, "Invalid Market Status")
49-
ErrSameDenoms = sdkerrors.Register(ModuleName, 42, "base denom cannot be same with quote denom")
50-
ErrSameOracles = sdkerrors.Register(ModuleName, 43, "oracle base cannot be same with oracle quote")
51-
ErrFeeRatesRelation = sdkerrors.Register(ModuleName, 44, "MakerFeeRate does not match TakerFeeRate requirements")
52-
ErrMarginsRelation = sdkerrors.Register(ModuleName, 45, "MaintenanceMarginRatio cannot be greater than InitialMarginRatio")
53-
ErrExceedsMaxOracleScaleFactor = sdkerrors.Register(ModuleName, 46, "OracleScaleFactor cannot be greater than MaxOracleScaleFactor")
54-
ErrSpotExchangeNotEnabled = sdkerrors.Register(ModuleName, 47, "Spot exchange is not enabled yet")
55-
ErrDerivativesExchangeNotEnabled = sdkerrors.Register(ModuleName, 48, "Derivatives exchange is not enabled yet")
56-
ErrOraclePriceDeltaExceedsThreshold = sdkerrors.Register(ModuleName, 49, "Oracle price delta exceeds threshold")
57-
ErrInvalidHourlyInterestRate = sdkerrors.Register(ModuleName, 50, "Invalid hourly interest rate")
58-
ErrInvalidHourlyFundingRateCap = sdkerrors.Register(ModuleName, 51, "Invalid hourly funding rate cap")
59-
ErrInvalidMarketFundingParamUpdate = sdkerrors.Register(ModuleName, 52, "Only perpetual markets can update funding parameters")
60-
ErrInvalidTradingRewardCampaign = sdkerrors.Register(ModuleName, 53, "Invalid trading reward campaign")
61-
ErrInvalidFeeDiscountSchedule = sdkerrors.Register(ModuleName, 54, "Invalid fee discount schedule")
62-
ErrInvalidReduceOnlyPosition = sdkerrors.Register(ModuleName, 55, "Invalid position to reduce")
63-
ErrTradingRewardCampaignDistributionError = sdkerrors.Register(ModuleName, 56, "Unknown error happened for campaign distributions")
64-
ErrInvalidTradingRewardsPointsUpdate = sdkerrors.Register(ModuleName, 57, "Invalid trading reward points update")
65-
ErrInvalidBatchMsgUpdate = sdkerrors.Register(ModuleName, 58, "Invalid batch msg update")
8+
ErrOrderInvalid = sdkerrors.Register(ModuleName, 1, "failed to validate order")
9+
ErrSpotMarketNotFound = sdkerrors.Register(ModuleName, 2, "spot market not found")
10+
ErrSpotMarketExists = sdkerrors.Register(ModuleName, 3, "spot market exists")
11+
ErrBadField = sdkerrors.Register(ModuleName, 4, "struct field error")
12+
ErrMarketInvalid = sdkerrors.Register(ModuleName, 5, "failed to validate market")
13+
ErrInsufficientDeposit = sdkerrors.Register(ModuleName, 6, "subaccount has insufficient deposits")
14+
ErrUnrecognizedOrderType = sdkerrors.Register(ModuleName, 7, "unrecognized order type")
15+
ErrInsufficientPositionQuantity = sdkerrors.Register(ModuleName, 8, "position quantity insufficient for order")
16+
ErrOrderHashInvalid = sdkerrors.Register(ModuleName, 9, "order hash is not valid")
17+
ErrBadSubaccountID = sdkerrors.Register(ModuleName, 10, "subaccount id is not valid")
18+
ErrInvalidTicker = sdkerrors.Register(ModuleName, 11, "invalid ticker")
19+
ErrInvalidBaseDenom = sdkerrors.Register(ModuleName, 12, "invalid base denom")
20+
ErrInvalidQuoteDenom = sdkerrors.Register(ModuleName, 13, "invalid quote denom")
21+
ErrInvalidOracle = sdkerrors.Register(ModuleName, 14, "invalid oracle")
22+
ErrInvalidExpiry = sdkerrors.Register(ModuleName, 15, "invalid expiry")
23+
ErrInvalidPrice = sdkerrors.Register(ModuleName, 16, "invalid price")
24+
ErrInvalidQuantity = sdkerrors.Register(ModuleName, 17, "invalid quantity")
25+
ErrUnsupportedOracleType = sdkerrors.Register(ModuleName, 18, "unsupported oracle type")
26+
ErrOrderDoesntExist = sdkerrors.Register(ModuleName, 19, "order doesnt exist")
27+
ErrOrderbookFillInvalid = sdkerrors.Register(ModuleName, 20, "spot limit orderbook fill invalid")
28+
ErrPerpetualMarketExists = sdkerrors.Register(ModuleName, 21, "perpetual market exists")
29+
ErrExpiryFuturesMarketExists = sdkerrors.Register(ModuleName, 22, "expiry futures market exists")
30+
ErrExpiryFuturesMarketExpired = sdkerrors.Register(ModuleName, 23, "expiry futures market expired")
31+
ErrNoLiquidity = sdkerrors.Register(ModuleName, 24, "no liquidity on the orderbook!")
32+
ErrSlippageExceedsWorstPrice = sdkerrors.Register(ModuleName, 25, "Orderbook liquidity cannot satisfy current worst price")
33+
ErrInsufficientOrderMargin = sdkerrors.Register(ModuleName, 26, "Order has insufficient margin")
34+
ErrDerivativeMarketNotFound = sdkerrors.Register(ModuleName, 27, "Derivative market not found")
35+
ErrPositionNotFound = sdkerrors.Register(ModuleName, 28, "Position not found")
36+
ErrInvalidReduceOnlyPositionDirection = sdkerrors.Register(ModuleName, 29, "Position direction does not oppose the reduce-only order")
37+
ErrPriceSurpassesBankruptcyPrice = sdkerrors.Register(ModuleName, 30, "Price Surpasses Bankruptcy Price")
38+
ErrPositionNotLiquidable = sdkerrors.Register(ModuleName, 31, "Position not liquidable")
39+
ErrInvalidTriggerPrice = sdkerrors.Register(ModuleName, 32, "invalid trigger price")
40+
ErrInvalidOracleType = sdkerrors.Register(ModuleName, 33, "invalid oracle type")
41+
ErrInvalidPriceTickSize = sdkerrors.Register(ModuleName, 34, "invalid minimum price tick size")
42+
ErrInvalidQuantityTickSize = sdkerrors.Register(ModuleName, 35, "invalid minimum quantity tick size")
43+
ErrInvalidMargin = sdkerrors.Register(ModuleName, 36, "invalid minimum order margin")
44+
ErrExceedsOrderSideCount = sdkerrors.Register(ModuleName, 37, "Exceeds order side count")
45+
ErrDerivativeMarketOrderAlreadyExists = sdkerrors.Register(ModuleName, 38, "Subaccount cannot place a market order when a market order or limit order in the same market was already placed in same block")
46+
ErrDerivativeLimitOrderAlreadyExists = sdkerrors.Register(ModuleName, 39, "Subaccount cannot place a limit order when a market order in the same market was already placed in the same block")
47+
ErrMarketLaunchProposalAlreadyExists = sdkerrors.Register(ModuleName, 40, "An equivalent market launch proposal already exists.")
48+
ErrInvalidMarketStatus = sdkerrors.Register(ModuleName, 41, "Invalid Market Status")
49+
ErrSameDenoms = sdkerrors.Register(ModuleName, 42, "base denom cannot be same with quote denom")
50+
ErrSameOracles = sdkerrors.Register(ModuleName, 43, "oracle base cannot be same with oracle quote")
51+
ErrFeeRatesRelation = sdkerrors.Register(ModuleName, 44, "MakerFeeRate does not match TakerFeeRate requirements")
52+
ErrMarginsRelation = sdkerrors.Register(ModuleName, 45, "MaintenanceMarginRatio cannot be greater than InitialMarginRatio")
53+
ErrExceedsMaxOracleScaleFactor = sdkerrors.Register(ModuleName, 46, "OracleScaleFactor cannot be greater than MaxOracleScaleFactor")
54+
ErrSpotExchangeNotEnabled = sdkerrors.Register(ModuleName, 47, "Spot exchange is not enabled yet")
55+
ErrDerivativesExchangeNotEnabled = sdkerrors.Register(ModuleName, 48, "Derivatives exchange is not enabled yet")
56+
ErrOraclePriceDeltaExceedsThreshold = sdkerrors.Register(ModuleName, 49, "Oracle price delta exceeds threshold")
57+
ErrInvalidHourlyInterestRate = sdkerrors.Register(ModuleName, 50, "Invalid hourly interest rate")
58+
ErrInvalidHourlyFundingRateCap = sdkerrors.Register(ModuleName, 51, "Invalid hourly funding rate cap")
59+
ErrInvalidMarketFundingParamUpdate = sdkerrors.Register(ModuleName, 52, "Only perpetual markets can update funding parameters")
60+
ErrInvalidTradingRewardCampaign = sdkerrors.Register(ModuleName, 53, "Invalid trading reward campaign")
61+
ErrInvalidFeeDiscountSchedule = sdkerrors.Register(ModuleName, 54, "Invalid fee discount schedule")
62+
ErrInvalidReduceOnlyPosition = sdkerrors.Register(ModuleName, 55, "Invalid position to reduce")
63+
ErrTradingRewardCampaignDistributionError = sdkerrors.Register(ModuleName, 56, "Unknown error happened for campaign distributions")
64+
ErrInvalidTradingRewardsPendingPointsUpdate = sdkerrors.Register(ModuleName, 57, "Invalid trading reward pending points update")
65+
ErrInvalidBatchMsgUpdate = sdkerrors.Register(ModuleName, 58, "Invalid batch msg update")
6666
)

0 commit comments

Comments
 (0)