Merge pull request #369 from InjectiveLabs/chore/release-v1.20.1

Author: dbrajovic

.gitignore

@@ -5,3 +5,4 @@
 .exchange_cookie
 coverage.out
 .env
+.cache

Makefile

@@ -1,10 +1,10 @@
 all:
 
 clone-injective-indexer:
-	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.20.2 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.20.49 --depth 1 --single-branch
 
 clone-injective-core:
-	git clone https://github.com/InjectiveLabs/injective-core.git -b v1.20.0 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-core.git -b v1.20.1-beta --depth 1 --single-branch
 
 copy-exchange-client: clone-injective-indexer
 	rm -rf exchange/*

chain/exchange/types/authz_exchange_generic.go

@@ -115,23 +115,24 @@ func (a GenericExchangeAuthorization) MsgTypeURL() string {
 }
 
 // Accept implements Authorization.Accept.
-func (a GenericExchangeAuthorization) Accept(ctx context.Context, msg sdk.Msg) (authz.AcceptResponse, error) {
-	// SpendLimit is optional, so we only check it if it is set
-	if a.SpendLimit != nil {
-		hold, ok := getHold(ctx)
-		if !ok {
+func (a GenericExchangeAuthorization) Accept(ctx context.Context, _ sdk.Msg) (authz.AcceptResponse, error) {
+	hold, _ := getHold(ctx)
+
+	if a.SpendLimit.IsZero() && !hold.IsZero() { // on an exhausted grant only allow zero hold messages (like cancellations) (BB-225)
+		return authz.AcceptResponse{Accept: false}, nil
+	}
+
+	limit := a.SpendLimit
+	for _, coin := range hold {
+		allowance := limit.AmountOf(coin.Denom)
+		if allowance.LT(coin.Amount) {
 			return authz.AcceptResponse{Accept: false}, nil
 		}
 
-		for _, coin := range hold {
-			allowed := a.SpendLimit.AmountOf(coin.Denom)
-			if allowed.LT(coin.Amount) {
-				return authz.AcceptResponse{Accept: false}, nil
-			}
-			a.SpendLimit = a.SpendLimit.Sub(sdk.NewCoin(coin.Denom, coin.Amount))
-		}
+		limit = limit.Sub(sdk.NewCoin(coin.Denom, coin.Amount))
 	}
-	return authz.AcceptResponse{Accept: true, Updated: &a}, nil
+
+	return authz.AcceptResponse{Accept: true, Updated: NewGenericExchangeAuthorization(a.Msg, limit)}, nil
 }
 
 // getHold returns the hold from the context. Hold is the amount of coins that

chain/exchange/types/v2/authz_exchange_generic.go

@@ -108,12 +108,9 @@ func (a GenericExchangeAuthorization) MsgTypeURL() string {
 // the incoming message type, and it would not have been created if the
 // message type was not allowed.
 func (a GenericExchangeAuthorization) Accept(ctx context.Context, _ sdk.Msg) (authz.AcceptResponse, error) {
-	if noLimit := a.SpendLimit == nil; noLimit {
-		return authz.AcceptResponse{Accept: true, Updated: NewGenericExchangeAuthorization(a.Msg, nil)}, nil
-	}
+	hold, _ := getHold(ctx)
 
-	hold, ok := getHold(ctx)
-	if !ok {
+	if a.SpendLimit.IsZero() && !hold.IsZero() { // on an exhausted grant only allow zero hold messages (like cancellations) (BB-225)
 		return authz.AcceptResponse{Accept: false}, nil
 	}
 

chain/exchange/types/v2/derivative_orders.go

@@ -201,10 +201,21 @@ func (m *DerivativeLimitOrder) GetCancelDepositDelta(feeRate math.LegacyDec) *v1
 func (m *DerivativeLimitOrder) GetCancelRefundAmount(feeRate math.LegacyDec) math.LegacyDec {
 	marginHoldRefund := math.LegacyZeroDec()
 	if m.IsVanilla() {
+		if !m.OrderInfo.Quantity.IsPositive() {
+			// Malformed legacy state can have no usable denominator; only release
+			// margin when there is remaining fillable quantity to cancel.
+			if !m.Fillable.IsPositive() {
+				return marginHoldRefund
+			}
+			return m.Margin
+		}
+
 		// negative fees are only accounted for upon matching
-		//nolint:all
 		// Refund = (FillableQuantity / Quantity) * (Margin + Price * Quantity * feeRate)
-		marginHoldRefund = m.Fillable.Mul(m.GetMarginHold(feeRate)).Quo(m.OrderInfo.Quantity)
+		positiveFeeRatePart := math.LegacyMaxDec(feeRate, math.LegacyZeroDec())
+		marginRefund := m.Fillable.Mul(m.Margin).Quo(m.OrderInfo.Quantity)
+		feeRefund := m.Fillable.Mul(m.OrderInfo.Price).Mul(positiveFeeRatePart)
+		marginHoldRefund = marginRefund.Add(feeRefund)
 	}
 	return marginHoldRefund
 }

chain/peggy/types/msgs.pb.go

@@ -8,10 +8,7 @@ import (
 	"cosmossdk.io/x/tx/signing"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	hyperlaneinterchainsecuritytypes "github.com/bcp-innovations/hyperlane-cosmos/x/core/01_interchain_security/types"
-	hyperlanepostdispatchtypes "github.com/bcp-innovations/hyperlane-cosmos/x/core/02_post_dispatch/types"
-	hyperlanecoretypes "github.com/bcp-innovations/hyperlane-cosmos/x/core/types"
-	hyperlanewarptypes "github.com/bcp-innovations/hyperlane-cosmos/x/warp/types"
+	probabilistic "github.com/cardano-foundation/cardano-ibc-incubator/cosmos/cardano-probabilistic-light-client-v8"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/address"
@@ -186,10 +183,9 @@ func createInjectiveProtoCodec() (injectiveCodec *codec.ProtoCodec, interfaceReg
 	ibcclienttypes.RegisterInterfaces(interfaceRegistry)
 	ibcconnectiontypes.RegisterInterfaces(interfaceRegistry)
 	ibctransfertypes.RegisterInterfaces(interfaceRegistry)
-	hyperlanecoretypes.RegisterInterfaces(interfaceRegistry)
-	hyperlanewarptypes.RegisterInterfaces(interfaceRegistry)
-	hyperlanepostdispatchtypes.RegisterInterfaces(interfaceRegistry)
-	hyperlaneinterchainsecuritytypes.RegisterInterfaces(interfaceRegistry)
+	evmtypes.RegisterInterfaces(interfaceRegistry)
+	erc20types.RegisterInterfaces(interfaceRegistry)
+	probabilistic.RegisterInterfaces(interfaceRegistry)
 
 	injectiveCodec = codec.NewProtoCodec(interfaceRegistry)