Fixed proto issues

Author: Sahith Reddy Narahari

codec/std/codec.pb.go

@@ -100,6 +100,7 @@ message Content {
 // FeeAllowance defines the application-level fee allowance to be used in
 // feegrant module
 message FeeAllowance {
+  option (gogoproto.equal)           = true;
   option (cosmos_proto.interface_type) = "github.com/cosmos/cosmos-sdk/x/feegrant/exported.FeeAllowance";
 
   oneof sum{
@@ -111,7 +112,6 @@ message FeeAllowance {
 // MsgGrantFeeAllowance adds permission for Grantee to spend up to Allowance
 // of fees from the account of Granter.
 message MsgGrantFeeAllowance{
-  option (gogoproto.equal)           = true;
   option (gogoproto.goproto_getters) = false;
 
   FeeAllowance Allowance = 1;
@@ -120,9 +120,9 @@ message MsgGrantFeeAllowance{
 
 // FeeAllowanceGrant is stored in the KVStore to record a grant with full context
 message FeeAllowanceGrant{
-  option (gogoproto.equal)           = true;
   option (gogoproto.goproto_getters) = false;
 
   FeeAllowance Allowance = 3;
   cosmos_sdk.x.feegrant.v1.FeeAllowanceGrantBase base     = 2 [(gogoproto.nullable) = false, (gogoproto.embed) = true];
+
 }

codec/std/codec.proto

@@ -1,6 +1,8 @@
 package std
 
 import (
+	"time"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/evidence"
@@ -116,8 +118,30 @@ func (msg MsgGrantFeeAllowance) GetGranter() sdk.AccAddress {
 	return msg.Granter
 }
 
-func (grant FeeAllowanceGrant) ValidateBasic() error {
-	return nil
+// PrepareForExport will make all needed changes to the allowance to prepare to be
+// re-imported at height 0, and return a copy of this grant.
+func (a MsgGrantFeeAllowance) PrepareForExport(dumpTime time.Time, dumpHeight int64) feeexported.FeeAllowanceGrant {
+	err := a.GetFeeGrant().PrepareForExport(dumpTime, dumpHeight)
+	if err != nil {
+		//TODO handle this error
+	}
+	return a
+}
+
+// ValidateBasic performs basic validation on
+// FeeAllowanceGrant
+func (a FeeAllowanceGrant) ValidateBasic() error {
+	if a.Granter.Empty() {
+		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "missing granter address")
+	}
+	if a.Grantee.Empty() {
+		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "missing grantee address")
+	}
+	if a.Grantee.Equals(a.Granter) {
+		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "cannot self-grant fee authorization")
+	}
+
+	return a.ValidateBasic()
 }
 
 func (grant FeeAllowanceGrant) GetFeeGrant() feeexported.FeeAllowance {
@@ -131,3 +155,13 @@ func (grant FeeAllowanceGrant) GetGrantee() sdk.AccAddress {
 func (grant FeeAllowanceGrant) GetGranter() sdk.AccAddress {
 	return grant.Granter
 }
+
+// PrepareForExport will make all needed changes to the allowance to prepare to be
+// re-imported at height 0, and return a copy of this grant.
+func (a FeeAllowanceGrant) PrepareForExport(dumpTime time.Time, dumpHeight int64) feeexported.FeeAllowanceGrant {
+	err := a.GetFeeGrant().PrepareForExport(dumpTime, dumpHeight)
+	if err != nil {
+		//TODO handle this error
+	}
+	return a
+}

codec/std/msgs.go

@@ -1,6 +1,8 @@
 package exported
 
 import (
+	"time"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	auth "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	supply "github.com/cosmos/cosmos-sdk/x/supply/exported"
@@ -26,10 +28,14 @@ type MsgGrantFeeAllowance interface {
 	GetFeeGrant() FeeAllowance
 	GetGranter() sdk.AccAddress
 	GetGrantee() sdk.AccAddress
+	PrepareForExport(time.Time, int64) FeeAllowanceGrant
 }
 
 type FeeAllowanceGrant interface {
 	GetFeeGrant() FeeAllowance
 	GetGranter() sdk.AccAddress
 	GetGrantee() sdk.AccAddress
+
+	ValidateBasic() error
+	PrepareForExport(time.Time, int64) FeeAllowanceGrant
 }

x/feegrant/exported/external.go

@@ -38,7 +38,7 @@ func ExportGenesis(ctx sdk.Context, k Keeper) (GenesisState, error) {
 	var grants []exported.FeeAllowanceGrant
 
 	err := k.IterateAllFeeAllowances(ctx, func(grant exported.FeeAllowanceGrant) bool {
-		grants = append(grants, grant.GetFeeGrant().PrepareForExport(time, height))
+		grants = append(grants, grant.PrepareForExport(time, height))
 		return false
 	})