re-gen

chain/exchange/types/codec.go

@@ -42,6 +42,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&TradingRewardCampaignLaunchProposal{}, "exchange/TradingRewardCampaignLaunchProposal", nil)
 	cdc.RegisterConcrete(&TradingRewardCampaignUpdateProposal{}, "exchange/TradingRewardCampaignUpdateProposal", nil)
 	cdc.RegisterConcrete(&FeeDiscountProposal{}, "exchange/FeeDiscountProposal", nil)
+	cdc.RegisterConcrete(&BatchCommunityPoolSpendProposal{}, "exchange/BatchCommunityPoolSpendProposal", nil)
 }
 
 func RegisterInterfaces(registry types.InterfaceRegistry) {
@@ -79,6 +80,7 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 		&TradingRewardCampaignLaunchProposal{},
 		&TradingRewardCampaignUpdateProposal{},
 		&FeeDiscountProposal{},
+		&BatchCommunityPoolSpendProposal{},
 	)
 
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)

chain/exchange/types/common_utils.go

@@ -136,7 +136,7 @@ func (s *Subaccount) GetSubaccountID() (*common.Hash, error) {
 	return SdkAddressWithNonceToSubaccountID(trader, s.SubaccountNonce)
 }
 
-func SdkAddressWithNonceToSubaccountID(addr sdk.Address, nonce uint32) (*common.Hash, error) {
+func SdkAddressWithNonceToSubaccountID(addr sdk.AccAddress, nonce uint32) (*common.Hash, error) {
 	if len(addr.Bytes()) > common.AddressLength {
 		return &AuctionSubaccountID, ErrBadSubaccountID
 	}
@@ -145,15 +145,15 @@ func SdkAddressWithNonceToSubaccountID(addr sdk.Address, nonce uint32) (*common.
 	return &subaccountID, nil
 }
 
-func SdkAddressToSubaccountID(addr sdk.Address) common.Hash {
+func SdkAddressToSubaccountID(addr sdk.AccAddress) common.Hash {
 	return common.BytesToHash(common.RightPadBytes(addr.Bytes(), 32))
 }
 
-func SdkAddressToEthAddress(addr sdk.Address) common.Address {
+func SdkAddressToEthAddress(addr sdk.AccAddress) common.Address {
 	return common.BytesToAddress(addr.Bytes())
 }
 
-func SubaccountIDToSdkAddress(subaccountID common.Hash) sdk.Address {
+func SubaccountIDToSdkAddress(subaccountID common.Hash) sdk.AccAddress {
 	return sdk.AccAddress(subaccountID[:common.AddressLength])
 }
 

chain/exchange/types/derivative_orders.go

@@ -6,7 +6,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-func NewMarketOrderForLiquidation(position *Position, positionSubaccountID common.Hash, liquidator sdk.Address) *DerivativeMarketOrder {
+func NewMarketOrderForLiquidation(position *Position, positionSubaccountID common.Hash, liquidator sdk.AccAddress) *DerivativeMarketOrder {
 
 	// if long position, market sell order at price 0
 	// if short position, market buy order at price infinity

chain/exchange/types/proposal.go

@@ -6,22 +6,24 @@ import (
 	oracletypes "github.com/InjectiveLabs/sdk-go/chain/oracle/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	gov "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/ethereum/go-ethereum/common"
 )
 
 // constants
 const (
-	ProposalTypeExchangeEnable              string = "ProposalTypeExchangeEnable"
-	ProposalTypeBatchExchangeModification   string = "ProposalTypeBatchExchangeModification"
-	ProposalTypeSpotMarketParamUpdate       string = "ProposalTypeSpotMarketParamUpdate"
-	ProposalTypeSpotMarketLaunch            string = "ProposalTypeSpotMarketLaunch"
-	ProposalTypePerpetualMarketLaunch       string = "ProposalTypePerpetualMarketLaunch"
-	ProposalTypeExpiryFuturesMarketLaunch   string = "ProposalTypeExpiryFuturesMarketLaunch"
-	ProposalTypeDerivativeMarketParamUpdate string = "ProposalTypeDerivativeMarketParamUpdate"
-	ProposalTypeTradingRewardCampaign       string = "ProposalTypeTradingRewardCampaign"
-	ProposalTypeTradingRewardCampaignUpdate string = "ProposalTypeTradingRewardCampaignUpdateProposal"
-	ProposalTypeFeeDiscountProposal         string = "ProposalTypeFeeDiscountProposal"
+	ProposalTypeExchangeEnable                  string = "ProposalTypeExchangeEnable"
+	ProposalTypeBatchExchangeModification       string = "ProposalTypeBatchExchangeModification"
+	ProposalTypeSpotMarketParamUpdate           string = "ProposalTypeSpotMarketParamUpdate"
+	ProposalTypeSpotMarketLaunch                string = "ProposalTypeSpotMarketLaunch"
+	ProposalTypePerpetualMarketLaunch           string = "ProposalTypePerpetualMarketLaunch"
+	ProposalTypeExpiryFuturesMarketLaunch       string = "ProposalTypeExpiryFuturesMarketLaunch"
+	ProposalTypeDerivativeMarketParamUpdate     string = "ProposalTypeDerivativeMarketParamUpdate"
+	ProposalTypeTradingRewardCampaign           string = "ProposalTypeTradingRewardCampaign"
+	ProposalTypeTradingRewardCampaignUpdate     string = "ProposalTypeTradingRewardCampaignUpdateProposal"
+	ProposalTypeFeeDiscountProposal             string = "ProposalTypeFeeDiscountProposal"
+	ProposalTypeBatchCommunityPoolSpendProposal string = "ProposalTypeBatchCommunityPoolSpendProposal"
 )
 
 func init() {
@@ -45,6 +47,8 @@ func init() {
 	gov.RegisterProposalTypeCodec(&TradingRewardCampaignUpdateProposal{}, "injective/TradingRewardCampaignUpdateProposal")
 	gov.RegisterProposalType(ProposalTypeFeeDiscountProposal)
 	gov.RegisterProposalTypeCodec(&FeeDiscountProposal{}, "injective/FeeDiscountProposal")
+	gov.RegisterProposalType(ProposalTypeBatchCommunityPoolSpendProposal)
+	gov.RegisterProposalTypeCodec(&BatchCommunityPoolSpendProposal{}, "injective/BatchCommunityPoolSpendProposal")
 }
 
 func SafeIsPositiveInt(v sdk.Int) bool {
@@ -1050,3 +1054,43 @@ func (t *FeeDiscountTierInfo) ValidateBasic() error {
 	}
 	return nil
 }
+
+// NewBatchCommunityPoolSpendProposal returns new instance of BatchCommunityPoolSpendProposal
+func NewBatchCommunityPoolSpendProposal(title, description string, proposals []*distributiontypes.CommunityPoolSpendProposal) *BatchCommunityPoolSpendProposal {
+	return &BatchCommunityPoolSpendProposal{
+		Title:       title,
+		Description: description,
+		Proposals:   proposals,
+	}
+}
+
+// Implements Proposal Interface
+var _ gov.Content = &BatchCommunityPoolSpendProposal{}
+
+// GetTitle returns the title of this proposal.
+func (p *BatchCommunityPoolSpendProposal) GetTitle() string {
+	return p.Title
+}
+
+// GetDescription returns the description of this proposal.
+func (p *BatchCommunityPoolSpendProposal) GetDescription() string {
+	return p.Description
+}
+
+// ProposalRoute returns router key of this proposal.
+func (p *BatchCommunityPoolSpendProposal) ProposalRoute() string { return RouterKey }
+
+// ProposalType returns proposal type of this proposal.
+func (p *BatchCommunityPoolSpendProposal) ProposalType() string {
+	return ProposalTypeBatchCommunityPoolSpendProposal
+}
+
+// ValidateBasic returns ValidateBasic result of this proposal.
+func (p *BatchCommunityPoolSpendProposal) ValidateBasic() error {
+	for _, proposal := range p.Proposals {
+		if err := proposal.ValidateBasic(); err != nil {
+			return err
+		}
+	}
+	return gov.ValidateAbstract(p)
+}