Merge branch 'master' into am/11331-v1

cosmos · Mar 11, 2022 · d262105 · d262105
2 parents 8d2afa0 + 142cf67
commit d262105
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/proto/cosmos/feegrant/v1beta1/feegrant.proto b/proto/cosmos/feegrant/v1beta1/feegrant.proto
@@ -58,7 +58,7 @@ message AllowedMsgAllowance {
   option (gogoproto.goproto_getters)         = false;
   option (cosmos_proto.implements_interface) = "FeeAllowanceI";
 
-  // allowance can be any of basic and filtered fee allowance.
+  // allowance can be any of basic and periodic fee allowance.
   google.protobuf.Any allowance = 1 [(cosmos_proto.accepts_interface) = "FeeAllowanceI"];
 
   // allowed_messages are the messages for which the grantee has the access.
@@ -73,6 +73,6 @@ message Grant {
   // grantee is the address of the user being granted an allowance of another user's funds.
   string grantee = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
-  // allowance can be any of basic and filtered fee allowance.
+  // allowance can be any of basic, periodic, allowed fee allowance.
   google.protobuf.Any allowance = 3 [(cosmos_proto.accepts_interface) = "FeeAllowanceI"];
 }
diff --git a/proto/cosmos/feegrant/v1beta1/tx.proto b/proto/cosmos/feegrant/v1beta1/tx.proto
@@ -31,7 +31,7 @@ message MsgGrantAllowance {
   // grantee is the address of the user being granted an allowance of another user's funds.
   string grantee = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
-  // allowance can be any of basic and filtered fee allowance.
+  // allowance can be any of basic, periodic, allowed fee allowance.
   google.protobuf.Any allowance = 3 [(cosmos_proto.accepts_interface) = "FeeAllowanceI"];
 }
 

diff --git a/x/feegrant/feegrant.pb.go b/x/feegrant/feegrant.pb.go
diff --git a/x/feegrant/spec/01_concepts.md b/x/feegrant/spec/01_concepts.md
@@ -20,6 +20,7 @@ There are two types of fee allowances present at the moment:
 
 * `BasicAllowance`
 * `PeriodicAllowance`
+* `AllowedMsgAllowance`
 
 ## BasicAllowance
 
@@ -49,6 +50,16 @@ There are two types of fee allowances present at the moment:
 
 * `period_reset` keeps track of when a next period reset should happen.
 
+## AllowedMsgAllowance
+
+`AllowedMsgAllowance` is a fee allowance, it can be any of `BasicFeeAllowance`, `PeriodicAllowance` but restricted only to the allowed messages mentioned by the granter.
+
++++ https://github.com/cosmos/cosmos-sdk/blob/691032b8be0f7539ec99f8882caecefc51f33d1f/proto/cosmos/feegrant/v1beta1/feegrant.proto#L55-L65
+
+* `allowance` is either `BasicAllowance` or `PeriodicAllowance`.
+
+* `allowed_messages` is array of messages allowed to execute the given allowance.
+
 ## FeeGranter flag
 
 `feegrant` module introduces a `FeeGranter` flag for CLI for the sake of executing transactions with fee granter. When this flag is set, `clientCtx` will append the granter account address for transactions generated through CLI.

diff --git a/x/feegrant/tx.pb.go b/x/feegrant/tx.pb.go