[CP-535] synced proto definitions with latest changes for v1.17

Author: aarmoa

Makefile

@@ -4,7 +4,7 @@ clone-injective-indexer:
 	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.16.69 --depth 1 --single-branch
 
 clone-injective-core:
-	git clone https://github.com/InjectiveLabs/injective-core.git -b v1.16.3 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-core.git -b cp-535/add_market_orders_creation_to_batch_update_orders_message --depth 1 --single-branch
 
 copy-exchange-client: clone-injective-indexer
 	rm -rf exchange/*

chain/evm/types/errors.go

@@ -7,6 +7,7 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -111,6 +112,11 @@ var (
 	ErrConfigOverrides = errorsmod.Register(ModuleName, codeErrConfigOverrides, "failed to apply state override")
 )
 
+var (
+	// RevertSelector is selector of ErrExecutionReverted
+	RevertSelector = crypto.Keccak256([]byte("Error(string)"))[:4]
+)
+
 // VMError is an interface that represents a reverted or failed EVM execution.
 // The Ret() method returns the revert reason bytes associated with the error, if any.
 // The Cause() method returns the unwrapped error. For ABCIInfo integration.
@@ -289,3 +295,19 @@ func (e *RevertError) ErrorCode() int {
 func (e *RevertError) ErrorData() interface{} {
 	return e.reason
 }
+
+// RevertReasonBytes converts a message to ABI-encoded revert bytes.
+func RevertReasonBytes(reason string) ([]byte, error) {
+	typ, err := abi.NewType("string", "", nil)
+	if err != nil {
+		return nil, err
+	}
+	packed, err := (abi.Arguments{{Type: typ}}).Pack(reason)
+	if err != nil {
+		return nil, err
+	}
+	bz := make([]byte, 0, len(RevertSelector)+len(packed))
+	bz = append(bz, RevertSelector...)
+	bz = append(bz, packed...)
+	return bz, nil
+}

chain/exchange/types/errors.go

@@ -82,7 +82,7 @@ var (
 	ErrSenderIsNotAnAdmin                       = errors.Register(ModuleName, 74, "sender should be a market admin")
 	ErrMarketAlreadyScheduledToSettle           = errors.Register(ModuleName, 75, "market is already scheduled to settle")
 	ErrGenericMarketNotFound                    = errors.Register(ModuleName, 76, "market not found")
-	ErrInvalidDenomDecimal                      = errors.Register(ModuleName, 77, "denom decimal cannot be higher than max scale factor")
+	ErrInvalidDenomDecimal                      = errors.Register(ModuleName, 77, "denom decimal should be greater than 0 and not greater than max scale factor")
 	ErrInvalidState                             = errors.Register(ModuleName, 78, "state is invalid")
 	ErrTransientOrdersUpToCancelNotSupported    = errors.Register(ModuleName, 79, "transient orders up to cancellation not supported")
 	ErrInvalidTrade                             = errors.Register(ModuleName, 80, "invalid trade")

chain/exchange/types/v2/codec.go

@@ -75,15 +75,23 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&ExpiryFuturesMarketLaunchProposal{}, "exchange/v2/ExpiryFuturesMarketLaunchProposal", nil)
 	cdc.RegisterConcrete(&DerivativeMarketParamUpdateProposal{}, "exchange/v2/DerivativeMarketParamUpdateProposal", nil)
 	cdc.RegisterConcrete(&MarketForcedSettlementProposal{}, "exchange/v2/MarketForcedSettlementProposal", nil)
-	cdc.RegisterConcrete(&UpdateDenomDecimalsProposal{}, "exchange/v2/UpdateDenomDecimalsProposal", nil)
+	cdc.RegisterConcrete(
+		&UpdateAuctionExchangeTransferDenomDecimalsProposal{},
+		"exchange/v2/UpdateAuctionExchangeTransferDenomDecimalsProposal",
+		nil,
+	)
 	cdc.RegisterConcrete(&TradingRewardCampaignLaunchProposal{}, "exchange/v2/TradingRewardCampaignLaunchProposal", nil)
 	cdc.RegisterConcrete(&TradingRewardCampaignUpdateProposal{}, "exchange/v2/TradingRewardCampaignUpdateProposal", nil)
 	cdc.RegisterConcrete(&TradingRewardPendingPointsUpdateProposal{}, "exchange/v2/TradingRewardPendingPointsUpdateProposal", nil)
 	cdc.RegisterConcrete(&FeeDiscountProposal{}, "exchange/v2/FeeDiscountProposal", nil)
 	cdc.RegisterConcrete(&BatchCommunityPoolSpendProposal{}, "exchange/v2/BatchCommunityPoolSpendProposal", nil)
 	cdc.RegisterConcrete(&BinaryOptionsMarketParamUpdateProposal{}, "exchange/v2/BinaryOptionsMarketParamUpdateProposal", nil)
 	cdc.RegisterConcrete(&BinaryOptionsMarketLaunchProposal{}, "exchange/v2/BinaryOptionsMarketLaunchProposal", nil)
-	cdc.RegisterConcrete(&AtomicMarketOrderFeeMultiplierScheduleProposal{}, "exchange/v2/AtomicMarketOrderFeeMultiplierScheduleProposal", nil)
+	cdc.RegisterConcrete(
+		&AtomicMarketOrderFeeMultiplierScheduleProposal{},
+		"exchange/v2/AtomicMarketOrderFeeMultiplierScheduleProposal",
+		nil,
+	)
 
 	cdc.RegisterConcrete(&CreateSpotLimitOrderAuthz{}, "exchange/v2/CreateSpotLimitOrderAuthz", nil)
 	cdc.RegisterConcrete(&CreateSpotMarketOrderAuthz{}, "exchange/v2/CreateSpotMarketOrderAuthz", nil)
@@ -159,7 +167,7 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 		&ExpiryFuturesMarketLaunchProposal{},
 		&DerivativeMarketParamUpdateProposal{},
 		&MarketForcedSettlementProposal{},
-		&UpdateDenomDecimalsProposal{},
+		&UpdateAuctionExchangeTransferDenomDecimalsProposal{},
 		&TradingRewardCampaignLaunchProposal{},
 		&TradingRewardCampaignUpdateProposal{},
 		&TradingRewardPendingPointsUpdateProposal{},

chain/exchange/types/v2/events.go

@@ -1,6 +1,9 @@
 package v2
 
-import "github.com/ethereum/go-ethereum/common"
+import (
+	"cosmossdk.io/math"
+	"github.com/ethereum/go-ethereum/common"
+)
 
 func NewEventOrderCancelFail(
 	marketID,
@@ -35,3 +38,11 @@ func (e *EventOrderFail) AddOrderFail(orderHash common.Hash, cid string, flag ui
 func (e *EventOrderFail) IsEmpty() bool {
 	return len(e.Flags) == 0 && len(e.Hashes) == 0 && len(e.Cids) == 0
 }
+
+func (m *EventTriggerConditionalMarketOrderFailed) GetMarkPrice() math.LegacyDec {
+	return m.MarkPrice
+}
+
+func (m *EventTriggerConditionalLimitOrderFailed) GetMarkPrice() math.LegacyDec {
+	return m.MarkPrice
+}