Skip to content

Commit 0d45bae

Browse files
aarmoaaarmoa
committed
[C-750] Updated injective chain proto definitions to the branch with cross margin related changes (C-750)
1 parent 1077e88 commit 0d45bae

48 files changed

Lines changed: 8548 additions & 4922 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ clone-injective-indexer:
44
git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.18.3 --depth 1 --single-branch
55

66
clone-injective-core:
7-
git clone https://github.com/InjectiveLabs/injective-core.git -b v1.18.0 --depth 1 --single-branch
7+
git clone https://github.com/InjectiveLabs/injective-core.git -b C-750 --depth 1 --single-branch
88

99
copy-exchange-client: clone-injective-indexer
1010
rm -rf exchange/*
@@ -88,14 +88,6 @@ copy-chain-types: clone-injective-core
8888
mkdir -p chain/insurance/types && \
8989
cp injective-core/injective-chain/modules/insurance/types/*.pb.go chain/insurance/types && \
9090
cp injective-core/injective-chain/modules/insurance/types/codec.go chain/insurance/types
91-
mkdir -p chain/ocr/types && \
92-
cp injective-core/injective-chain/modules/ocr/types/*.pb.go chain/ocr/types && \
93-
cp injective-core/injective-chain/modules/ocr/types/errors.go chain/ocr/types && \
94-
cp injective-core/injective-chain/modules/ocr/types/key.go chain/ocr/types && \
95-
cp injective-core/injective-chain/modules/ocr/types/params.go chain/ocr/types && \
96-
cp injective-core/injective-chain/modules/ocr/types/proposal.go chain/ocr/types && \
97-
cp injective-core/injective-chain/modules/ocr/types/types.go chain/ocr/types && \
98-
cp injective-core/injective-chain/modules/ocr/types/codec.go chain/ocr/types
9991
mkdir -p chain/oracle/types && \
10092
cp injective-core/injective-chain/modules/oracle/types/*.pb.go chain/oracle/types && \
10193
cp injective-core/injective-chain/modules/oracle/types/codec.go chain/oracle/types && \

‎chain/exchange/types/errors.go‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,27 @@ import (
66
)
77

88
var (
9-
ErrOrderInvalid = errors.Register(ModuleName, 1, "failed to validate order")
10-
ErrSpotMarketNotFound = errors.Register(ModuleName, 2, "spot market not found")
11-
ErrSpotMarketExists = errors.Register(ModuleName, 3, "spot market exists")
12-
ErrBadField = errors.Register(ModuleName, 4, "struct field error")
13-
ErrMarketInvalid = errors.Register(ModuleName, 5, "failed to validate market")
14-
ErrInsufficientDeposit = errors.Register(ModuleName, 6, "subaccount has insufficient deposits")
15-
ErrUnrecognizedOrderType = errors.Register(ModuleName, 7, "unrecognized order type")
16-
ErrInsufficientPositionQuantity = errors.Register(ModuleName, 8, "position quantity insufficient for order")
17-
ErrOrderHashInvalid = errors.Register(ModuleName, 9, "order hash is not valid")
18-
ErrBadSubaccountID = errors.Register(ModuleName, 10, "subaccount id is not valid")
19-
ErrInvalidTicker = errors.Register(ModuleName, 11, "invalid ticker")
20-
ErrInvalidBaseDenom = errors.Register(ModuleName, 12, "invalid base denom")
21-
ErrInvalidQuoteDenom = errors.Register(ModuleName, 13, "invalid quote denom")
22-
ErrInvalidOracle = errors.Register(ModuleName, 14, "invalid oracle")
23-
ErrInvalidExpiry = errors.Register(ModuleName, 15, "invalid expiry")
24-
ErrInvalidPrice = errors.Register(ModuleName, 16, "invalid price")
25-
ErrInvalidQuantity = errors.Register(ModuleName, 17, "invalid quantity")
26-
ErrUnsupportedOracleType = errors.Register(ModuleName, 18, "unsupported oracle type")
27-
ErrOrderDoesntExist = errors.Register(ModuleName, 19, "order doesnt exist")
28-
ErrOrderbookFillInvalid = errors.Register(ModuleName, 20, "spot limit orderbook fill invalid")
9+
ErrOrderInvalid = errors.Register(ModuleName, 1, "failed to validate order")
10+
ErrSpotMarketNotFound = errors.Register(ModuleName, 2, "spot market not found")
11+
ErrSpotMarketExists = errors.Register(ModuleName, 3, "spot market exists")
12+
ErrBadField = errors.Register(ModuleName, 4, "struct field error")
13+
ErrMarketInvalid = errors.Register(ModuleName, 5, "failed to validate market")
14+
ErrInsufficientDeposit = errors.Register(ModuleName, 6, "subaccount has insufficient deposits")
15+
ErrUnrecognizedOrderType = errors.Register(ModuleName, 7, "unrecognized order type")
16+
ErrInsufficientPositionQuantity = errors.Register(ModuleName, 8, "position quantity insufficient for order")
17+
ErrOrderHashInvalid = errors.Register(ModuleName, 9, "order hash is not valid")
18+
ErrBadSubaccountID = errors.Register(ModuleName, 10, "subaccount id is not valid")
19+
ErrInvalidTicker = errors.Register(ModuleName, 11, "invalid ticker")
20+
ErrInvalidBaseDenom = errors.Register(ModuleName, 12, "invalid base denom")
21+
ErrInvalidQuoteDenom = errors.Register(ModuleName, 13, "invalid quote denom")
22+
ErrInvalidOracle = errors.Register(ModuleName, 14, "invalid oracle")
23+
ErrInvalidExpiry = errors.Register(ModuleName, 15, "invalid expiry")
24+
ErrInvalidPrice = errors.Register(ModuleName, 16, "invalid price")
25+
ErrInvalidQuantity = errors.Register(ModuleName, 17, "invalid quantity")
26+
ErrUnsupportedOracleType = errors.Register(ModuleName, 18, "unsupported oracle type")
27+
ErrOrderDoesntExist = errors.Register(ModuleName, 19, "order doesnt exist")
28+
// ErrOrderbookFillInvalid is not used anymore
29+
// ErrOrderbookFillInvalid = errors.Register(ModuleName, 20, "spot limit orderbook fill invalid")
2930
ErrPerpetualMarketExists = errors.Register(ModuleName, 21, "perpetual market exists")
3031
ErrExpiryFuturesMarketExists = errors.Register(ModuleName, 22, "expiry futures market exists")
3132
ErrExpiryFuturesMarketExpired = errors.Register(ModuleName, 23, "expiry futures market expired")

0 commit comments

Comments
 (0)