LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add Fee granter field (#7418)

Browse Source 
* WIP on adding Fee granter field

* WIP on adding Fee granter field

* WIP on adding Fee granter field

* Update comments, add tests
This commit is contained in:
Aaron Craelius 2020-10-05 17:56:09 -04:00 committed by GitHub
parent 435fc83ba7
commit 4a1b2fba43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 227 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proto/cosmos/tx/v1beta1/tx.proto
View File

@ -174,4 +174,9 @@ message Fee {
// the payer must be a tx signer (and thus have signed this field in AuthInfo).
// setting this field does *not* change the ordering of required signers for the transaction.
string payer = 3;
// if set, the fee payer (either the first signer or the value of the payer field) requests that a fee grant be used
// to pay fees instead of the fee payer's own balance. If an appropriate fee grant does not exist or the chain does
// not support fee grants, this will fail
string granter = 4;
}

161
types/tx/tx.pb.go
View File

@ -676,6 +676,10 @@ type Fee struct {
// the payer must be a tx signer (and thus have signed this field in AuthInfo).
// setting this field does *not* change the ordering of required signers for the transaction.
Payer string `protobuf:"bytes,3,opt,name=payer,proto3" json:"payer,omitempty"`
// if set, the fee payer (either the first signer or the value of the payer field) requests that a fee grant be used
// to pay fees instead of the fee payer's own balance. If an appropriate fee grant does not exist or the chain does
// not support fee grants, this will fail
Granter string `protobuf:"bytes,4,opt,name=granter,proto3" json:"granter,omitempty"`
}
func (m *Fee) Reset() { *m = Fee{} }
@ -732,6 +736,13 @@ func (m *Fee) GetPayer() string {
return ""
}
func (m *Fee) GetGranter() string {
if m != nil {
return m.Granter
}
return ""
}
func init() {
proto.RegisterType((*Tx)(nil), "cosmos.tx.v1beta1.Tx")
proto.RegisterType((*TxRaw)(nil), "cosmos.tx.v1beta1.TxRaw")
@ -748,59 +759,60 @@ func init() {
func init() { proto.RegisterFile("cosmos/tx/v1beta1/tx.proto", fileDescriptor_96d1575ffde80842) }
var fileDescriptor_96d1575ffde80842 = []byte{
// 830 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x6f, 0xdc, 0x44,
0x18, 0x5e, 0xef, 0x57, 0xbc, 0x6f, 0x92, 0x96, 0x8e, 0x22, 0xb4, 0xd9, 0xa8, 0x6e, 0x30, 0x2a,
0xec, 0x25, 0x76, 0x9b, 0x1e, 0xf8, 0x10, 0x12, 0x64, 0x0b, 0x55, 0xaa, 0x52, 0x90, 0x26, 0x39,
0xf5, 0x62, 0x8d, 0xbd, 0x13, 0xef, 0xa8, 0xeb, 0x99, 0xc5, 0x33, 0x2e, 0xf6, 0x8f, 0x40, 0xaa,
0x90, 0x10, 0x27, 0xfe, 0x00, 0xbf, 0xa4, 0xc7, 0x1e, 0x39, 0x41, 0x95, 0xfc, 0x10, 0xd0, 0x8c,
0xc7, 0x4e, 0x04, 0xab, 0xe4, 0xc2, 0xc9, 0x33, 0xef, 0x3c, 0xef, 0xf3, 0x3e, 0x7e, 0xbf, 0x60,
0x92, 0x08, 0x99, 0x09, 0x19, 0xaa, 0x32, 0x7c, 0xf5, 0x30, 0xa6, 0x8a, 0x3c, 0x0c, 0x55, 0x19,
0xac, 0x72, 0xa1, 0x04, 0xba, 0x53, 0xbf, 0x05, 0xaa, 0x0c, 0xec, 0xdb, 0x64, 0x27, 0x15, 0xa9,
0x30, 0xaf, 0xa1, 0x3e, 0xd5, 0xc0, 0xc9, 0x81, 0x25, 0x49, 0xf2, 0x6a, 0xa5, 0x44, 0x98, 0x15,
0x4b, 0xc5, 0x24, 0x4b, 0x5b, 0xc6, 0xc6, 0x60, 0xe1, 0x9e, 0x85, 0xc7, 0x44, 0xd2, 0x16, 0x93,
0x08, 0xc6, 0xed, 0xfb, 0xc7, 0x97, 0x9a, 0x24, 0x4b, 0x39, 0xe3, 0x97, 0x4c, 0xf6, 0x6e, 0x81,
0xbb, 0xa9, 0x10, 0xe9, 0x92, 0x86, 0xe6, 0x16, 0x17, 0x67, 0x21, 0xe1, 0x55, 0xfd, 0xe4, 0xff,
0xe4, 0x40, 0xf7, 0xb4, 0x44, 0x07, 0xd0, 0x8f, 0xc5, 0xbc, 0x1a, 0x3b, 0xfb, 0xce, 0x74, 0xf3,
0x70, 0x37, 0xf8, 0xcf, 0x1f, 0x05, 0xa7, 0xe5, 0x4c, 0xcc, 0x2b, 0x6c, 0x60, 0xe8, 0x53, 0x18,
0x91, 0x42, 0x2d, 0x22, 0xc6, 0xcf, 0xc4, 0xb8, 0x6b, 0x7c, 0xf6, 0xd6, 0xf8, 0x1c, 0x15, 0x6a,
0xf1, 0x94, 0x9f, 0x09, 0xec, 0x12, 0x7b, 0x42, 0x1e, 0x80, 0xd6, 0x46, 0x54, 0x91, 0x53, 0x39,
0xee, 0xed, 0xf7, 0xa6, 0x5b, 0xf8, 0x8a, 0xc5, 0xe7, 0x30, 0x38, 0x2d, 0x31, 0xf9, 0x11, 0xdd,
0x05, 0xd0, 0xa1, 0xa2, 0xb8, 0x52, 0x54, 0x1a, 0x5d, 0x5b, 0x78, 0xa4, 0x2d, 0x33, 0x6d, 0x40,
0x1f, 0xc1, 0xed, 0x56, 0x81, 0xc5, 0x74, 0x0d, 0x66, 0xbb, 0x09, 0x55, 0xe3, 0x6e, 0x8a, 0xf7,
0xb3, 0x03, 0x1b, 0x27, 0x2c, 0xe5, 0x5f, 0x8b, 0xe4, 0xff, 0x0a, 0xb9, 0x0b, 0x6e, 0xb2, 0x20,
0x8c, 0x47, 0x6c, 0x3e, 0xee, 0xed, 0x3b, 0xd3, 0x11, 0xde, 0x30, 0xf7, 0xa7, 0x73, 0x74, 0x1f,
0x6e, 0x91, 0x24, 0x11, 0x05, 0x57, 0x11, 0x2f, 0xb2, 0x98, 0xe6, 0xe3, 0xfe, 0xbe, 0x33, 0xed,
0xe3, 0x6d, 0x6b, 0xfd, 0xce, 0x18, 0xfd, 0x5f, 0xba, 0x30, 0xac, 0xf3, 0x8d, 0x1e, 0x80, 0x9b,
0x51, 0x29, 0x49, 0x6a, 0x14, 0xf5, 0xa6, 0x9b, 0x87, 0x3b, 0x41, 0x5d, 0xcd, 0xa0, 0xa9, 0x66,
0x70, 0xc4, 0x2b, 0xdc, 0xa2, 0x10, 0x82, 0x7e, 0x46, 0xb3, 0xba, 0x2c, 0x23, 0x6c, 0xce, 0x3a,
0xae, 0x62, 0x19, 0x15, 0x85, 0x8a, 0x16, 0x94, 0xa5, 0x0b, 0x65, 0x84, 0xf5, 0xf1, 0xb6, 0xb5,
0x1e, 0x1b, 0x23, 0x9a, 0xc1, 0x1d, 0x5a, 0x2a, 0xca, 0x25, 0x13, 0x3c, 0x12, 0x2b, 0xc5, 0x04,
0x97, 0xe3, 0xbf, 0x37, 0xae, 0x09, 0xfb, 0x5e, 0x8b, 0xff, 0xbe, 0x86, 0xa3, 0x17, 0xe0, 0x71,
0xc1, 0xa3, 0x24, 0x67, 0x8a, 0x25, 0x64, 0x19, 0xad, 0x21, 0xbc, 0x7d, 0x0d, 0xe1, 0x1e, 0x17,
0xfc, 0xb1, 0xf5, 0xfd, 0xe6, 0x5f, 0xdc, 0xfe, 0x2b, 0x70, 0x9b, 0x96, 0x42, 0x5f, 0xc1, 0x96,
0x2e, 0x23, 0xcd, 0x4d, 0x3d, 0x9a, 0xe4, 0xdc, 0x5d, 0xd3, 0x85, 0x27, 0x06, 0x66, 0xfa, 0x70,
0x53, 0xb6, 0x67, 0x89, 0xa6, 0xd0, 0x3b, 0xa3, 0xd4, 0xb6, 0xef, 0xfb, 0x6b, 0x1c, 0x9f, 0x50,
0x8a, 0x35, 0xc4, 0xff, 0xd5, 0x01, 0xb8, 0x64, 0x41, 0x8f, 0x00, 0x56, 0x45, 0xbc, 0x64, 0x49,
0xf4, 0x92, 0x36, 0x23, 0xb3, 0xfe, 0x6f, 0x46, 0x35, 0xee, 0x19, 0x35, 0x23, 0x93, 0x89, 0x39,
0xbd, 0x69, 0x64, 0x9e, 0x8b, 0x39, 0xad, 0x47, 0x26, 0xb3, 0x27, 0x34, 0x01, 0x57, 0xd2, 0x1f,
0x0a, 0xca, 0x13, 0x6a, 0xcb, 0xd6, 0xde, 0xfd, 0x77, 0x5d, 0x70, 0x1b, 0x17, 0xf4, 0x05, 0x0c,
0x25, 0xe3, 0xe9, 0x92, 0x5a, 0x4d, 0xfe, 0x35, 0xfc, 0xc1, 0x89, 0x41, 0x1e, 0x77, 0xb0, 0xf5,
0x41, 0x9f, 0xc1, 0xc0, 0xec, 0x1f, 0x2b, 0xee, 0x83, 0xeb, 0x9c, 0x9f, 0x6b, 0xe0, 0x71, 0x07,
0xd7, 0x1e, 0x93, 0x23, 0x18, 0xd6, 0x74, 0xe8, 0x13, 0xe8, 0x6b, 0xdd, 0x46, 0xc0, 0xad, 0xc3,
0x0f, 0xaf, 0x70, 0x34, 0x1b, 0xe9, 0x6a, 0x55, 0x34, 0x1f, 0x36, 0x0e, 0x93, 0xd7, 0x0e, 0x0c,
0x0c, 0x2b, 0x7a, 0x06, 0x6e, 0xcc, 0x14, 0xc9, 0x73, 0xd2, 0xe4, 0x36, 0x6c, 0x68, 0xea, 0xbd,
0x19, 0xb4, 0x6b, 0xb2, 0xe1, 0x7a, 0x2c, 0xb2, 0x15, 0x49, 0xd4, 0x8c, 0xa9, 0x23, 0xed, 0x86,
0x5b, 0x02, 0xf4, 0x39, 0x40, 0x9b, 0x75, 0x3d, 0xae, 0xbd, 0x9b, 0xd2, 0x3e, 0x6a, 0xd2, 0x2e,
0x67, 0x03, 0xe8, 0xc9, 0x22, 0xf3, 0x7f, 0x73, 0xa0, 0xf7, 0x84, 0x52, 0x94, 0xc0, 0x90, 0x64,
0x7a, 0x48, 0x6d, 0xab, 0xb5, 0x4b, 0x52, 0xaf, 0xe7, 0x2b, 0x52, 0x18, 0x9f, 0x3d, 0x78, 0xf3,
0xe7, 0xbd, 0xce, 0xef, 0x7f, 0xdd, 0x9b, 0xa6, 0x4c, 0x2d, 0x8a, 0x38, 0x48, 0x44, 0x16, 0x36,
0xab, 0xdf, 0x7c, 0x0e, 0xe4, 0xfc, 0x65, 0xa8, 0xaa, 0x15, 0x95, 0xc6, 0x41, 0x62, 0x4b, 0x8d,
0xf6, 0x60, 0x94, 0x12, 0x19, 0x2d, 0x59, 0xc6, 0x94, 0x29, 0x44, 0x1f, 0xbb, 0x29, 0x91, 0xdf,
0xea, 0x3b, 0xda, 0x81, 0xc1, 0x8a, 0x54, 0x34, 0xb7, 0x5b, 0xa5, 0xbe, 0xcc, 0xbe, 0x7c, 0x73,
0xee, 0x39, 0x6f, 0xcf, 0x3d, 0xe7, 0xdd, 0xb9, 0xe7, 0xbc, 0xbe, 0xf0, 0x3a, 0x6f, 0x2f, 0xbc,
0xce, 0x1f, 0x17, 0x5e, 0xe7, 0xc5, 0xfd, 0x9b, 0xc3, 0x87, 0xaa, 0x8c, 0x87, 0xa6, 0x65, 0x1f,
0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xdf, 0x9b, 0x65, 0xe3, 0x06, 0x00, 0x00,
// 843 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xdd, 0x6e, 0xdc, 0x44,
0x14, 0x5e, 0xef, 0x5f, 0xd6, 0x27, 0x49, 0x4b, 0x47, 0x11, 0xda, 0x6c, 0x54, 0x37, 0x18, 0x15,
0xf6, 0x26, 0x76, 0x9b, 0x5e, 0xf0, 0x23, 0x24, 0xc8, 0x16, 0xaa, 0x54, 0xa5, 0x20, 0x4d, 0x72,
0xd5, 0x1b, 0x6b, 0xec, 0x9d, 0x78, 0x47, 0x5d, 0xcf, 0x2c, 0x9e, 0x71, 0xb1, 0x1f, 0x02, 0xa9,
0x42, 0x42, 0xbc, 0x03, 0x2f, 0xc0, 0x2b, 0xf4, 0xb2, 0x97, 0x5c, 0x41, 0x95, 0x3c, 0x08, 0x68,
0xc6, 0x63, 0x27, 0x82, 0x55, 0x72, 0xc3, 0x95, 0xe7, 0x9c, 0xf9, 0xce, 0x37, 0x9f, 0xcf, 0x1f,
0x4c, 0x12, 0x21, 0x33, 0x21, 0x43, 0x55, 0x86, 0xaf, 0x1e, 0xc6, 0x54, 0x91, 0x87, 0xa1, 0x2a,
0x83, 0x55, 0x2e, 0x94, 0x40, 0x77, 0xea, 0xbb, 0x40, 0x95, 0x81, 0xbd, 0x9b, 0xec, 0xa4, 0x22,
0x15, 0xe6, 0x36, 0xd4, 0xa7, 0x1a, 0x38, 0x39, 0xb0, 0x24, 0x49, 0x5e, 0xad, 0x94, 0x08, 0xb3,
0x62, 0xa9, 0x98, 0x64, 0x69, 0xcb, 0xd8, 0x38, 0x2c, 0xdc, 0xb3, 0xf0, 0x98, 0x48, 0xda, 0x62,
0x12, 0xc1, 0xb8, 0xbd, 0xff, 0xf8, 0x52, 0x93, 0x64, 0x29, 0x67, 0xfc, 0x92, 0xc9, 0xda, 0x16,
0xb8, 0x9b, 0x0a, 0x91, 0x2e, 0x69, 0x68, 0xac, 0xb8, 0x38, 0x0b, 0x09, 0xaf, 0xea, 0x2b, 0xff,
0x27, 0x07, 0xba, 0xa7, 0x25, 0x3a, 0x80, 0x7e, 0x2c, 0xe6, 0xd5, 0xd8, 0xd9, 0x77, 0xa6, 0x9b,
0x87, 0xbb, 0xc1, 0x7f, 0xfe, 0x28, 0x38, 0x2d, 0x67, 0x62, 0x5e, 0x61, 0x03, 0x43, 0x9f, 0x82,
0x4b, 0x0a, 0xb5, 0x88, 0x18, 0x3f, 0x13, 0xe3, 0xae, 0x89, 0xd9, 0x5b, 0x13, 0x73, 0x54, 0xa8,
0xc5, 0x53, 0x7e, 0x26, 0xf0, 0x88, 0xd8, 0x13, 0xf2, 0x00, 0xb4, 0x36, 0xa2, 0x8a, 0x9c, 0xca,
0x71, 0x6f, 0xbf, 0x37, 0xdd, 0xc2, 0x57, 0x3c, 0x3e, 0x87, 0xc1, 0x69, 0x89, 0xc9, 0x8f, 0xe8,
0x2e, 0x80, 0x7e, 0x2a, 0x8a, 0x2b, 0x45, 0xa5, 0xd1, 0xb5, 0x85, 0x5d, 0xed, 0x99, 0x69, 0x07,
0xfa, 0x08, 0x6e, 0xb7, 0x0a, 0x2c, 0xa6, 0x6b, 0x30, 0xdb, 0xcd, 0x53, 0x35, 0xee, 0xa6, 0xf7,
0x7e, 0x76, 0x60, 0xe3, 0x84, 0xa5, 0xfc, 0x6b, 0x91, 0xfc, 0x5f, 0x4f, 0xee, 0xc2, 0x28, 0x59,
0x10, 0xc6, 0x23, 0x36, 0x1f, 0xf7, 0xf6, 0x9d, 0xa9, 0x8b, 0x37, 0x8c, 0xfd, 0x74, 0x8e, 0xee,
0xc3, 0x2d, 0x92, 0x24, 0xa2, 0xe0, 0x2a, 0xe2, 0x45, 0x16, 0xd3, 0x7c, 0xdc, 0xdf, 0x77, 0xa6,
0x7d, 0xbc, 0x6d, 0xbd, 0xdf, 0x19, 0xa7, 0xff, 0x4b, 0x17, 0x86, 0x75, 0xbe, 0xd1, 0x03, 0x18,
0x65, 0x54, 0x4a, 0x92, 0x1a, 0x45, 0xbd, 0xe9, 0xe6, 0xe1, 0x4e, 0x50, 0x57, 0x33, 0x68, 0xaa,
0x19, 0x1c, 0xf1, 0x0a, 0xb7, 0x28, 0x84, 0xa0, 0x9f, 0xd1, 0xac, 0x2e, 0x8b, 0x8b, 0xcd, 0x59,
0xbf, 0xab, 0x58, 0x46, 0x45, 0xa1, 0xa2, 0x05, 0x65, 0xe9, 0x42, 0x19, 0x61, 0x7d, 0xbc, 0x6d,
0xbd, 0xc7, 0xc6, 0x89, 0x66, 0x70, 0x87, 0x96, 0x8a, 0x72, 0xc9, 0x04, 0x8f, 0xc4, 0x4a, 0x31,
0xc1, 0xe5, 0xf8, 0xef, 0x8d, 0x6b, 0x9e, 0x7d, 0xaf, 0xc5, 0x7f, 0x5f, 0xc3, 0xd1, 0x0b, 0xf0,
0xb8, 0xe0, 0x51, 0x92, 0x33, 0xc5, 0x12, 0xb2, 0x8c, 0xd6, 0x10, 0xde, 0xbe, 0x86, 0x70, 0x8f,
0x0b, 0xfe, 0xd8, 0xc6, 0x7e, 0xf3, 0x2f, 0x6e, 0xff, 0x15, 0x8c, 0x9a, 0x96, 0x42, 0x5f, 0xc1,
0x96, 0x2e, 0x23, 0xcd, 0x4d, 0x3d, 0x9a, 0xe4, 0xdc, 0x5d, 0xd3, 0x85, 0x27, 0x06, 0x66, 0xfa,
0x70, 0x53, 0xb6, 0x67, 0x89, 0xa6, 0xd0, 0x3b, 0xa3, 0xd4, 0xb6, 0xef, 0xfb, 0x6b, 0x02, 0x9f,
0x50, 0x8a, 0x35, 0xc4, 0xff, 0xd5, 0x01, 0xb8, 0x64, 0x41, 0x8f, 0x00, 0x56, 0x45, 0xbc, 0x64,
0x49, 0xf4, 0x92, 0x36, 0x23, 0xb3, 0xfe, 0x6f, 0xdc, 0x1a, 0xf7, 0x8c, 0x9a, 0x91, 0xc9, 0xc4,
0x9c, 0xde, 0x34, 0x32, 0xcf, 0xc5, 0x9c, 0xd6, 0x23, 0x93, 0xd9, 0x13, 0x9a, 0xc0, 0x48, 0xd2,
0x1f, 0x0a, 0xca, 0x13, 0x6a, 0xcb, 0xd6, 0xda, 0xfe, 0xbb, 0x2e, 0x8c, 0x9a, 0x10, 0xf4, 0x05,
0x0c, 0x25, 0xe3, 0xe9, 0x92, 0x5a, 0x4d, 0xfe, 0x35, 0xfc, 0xc1, 0x89, 0x41, 0x1e, 0x77, 0xb0,
0x8d, 0x41, 0x9f, 0xc1, 0xc0, 0xec, 0x1f, 0x2b, 0xee, 0x83, 0xeb, 0x82, 0x9f, 0x6b, 0xe0, 0x71,
0x07, 0xd7, 0x11, 0x93, 0x23, 0x18, 0xd6, 0x74, 0xe8, 0x13, 0xe8, 0x6b, 0xdd, 0x46, 0xc0, 0xad,
0xc3, 0x0f, 0xaf, 0x70, 0x34, 0x1b, 0xe9, 0x6a, 0x55, 0x34, 0x1f, 0x36, 0x01, 0x93, 0xd7, 0x0e,
0x0c, 0x0c, 0x2b, 0x7a, 0x06, 0xa3, 0x98, 0x29, 0x92, 0xe7, 0xa4, 0xc9, 0x6d, 0xd8, 0xd0, 0xd4,
0x7b, 0x33, 0x68, 0xd7, 0x64, 0xc3, 0xf5, 0x58, 0x64, 0x2b, 0x92, 0xa8, 0x19, 0x53, 0x47, 0x3a,
0x0c, 0xb7, 0x04, 0xe8, 0x73, 0x80, 0x36, 0xeb, 0x7a, 0x5c, 0x7b, 0x37, 0xa5, 0xdd, 0x6d, 0xd2,
0x2e, 0x67, 0x03, 0xe8, 0xc9, 0x22, 0xf3, 0x7f, 0x77, 0xa0, 0xf7, 0x84, 0x52, 0x94, 0xc0, 0x90,
0x64, 0x7a, 0x48, 0x6d, 0xab, 0xb5, 0x4b, 0x52, 0xaf, 0xe7, 0x2b, 0x52, 0x18, 0x9f, 0x3d, 0x78,
0xf3, 0xe7, 0xbd, 0xce, 0x6f, 0x7f, 0xdd, 0x9b, 0xa6, 0x4c, 0x2d, 0x8a, 0x38, 0x48, 0x44, 0x16,
0x36, 0xab, 0xdf, 0x7c, 0x0e, 0xe4, 0xfc, 0x65, 0xa8, 0xaa, 0x15, 0x95, 0x26, 0x40, 0x62, 0x4b,
0x8d, 0xf6, 0xc0, 0x4d, 0x89, 0x8c, 0x96, 0x2c, 0x63, 0xca, 0x14, 0xa2, 0x8f, 0x47, 0x29, 0x91,
0xdf, 0x6a, 0x1b, 0xed, 0xc0, 0x60, 0x45, 0x2a, 0x9a, 0xdb, 0xad, 0x52, 0x1b, 0x68, 0x0c, 0x1b,
0x69, 0x4e, 0xb8, 0xb2, 0xcb, 0xc4, 0xc5, 0x8d, 0x39, 0xfb, 0xf2, 0xcd, 0xb9, 0xe7, 0xbc, 0x3d,
0xf7, 0x9c, 0x77, 0xe7, 0x9e, 0xf3, 0xfa, 0xc2, 0xeb, 0xbc, 0xbd, 0xf0, 0x3a, 0x7f, 0x5c, 0x78,
0x9d, 0x17, 0xf7, 0x6f, 0x16, 0x16, 0xaa, 0x32, 0x1e, 0x9a, 0x66, 0x7e, 0xf4, 0x4f, 0x00, 0x00,
0x00, 0xff, 0xff, 0xd4, 0xb7, 0x75, 0x7d, 0xfd, 0x06, 0x00, 0x00,
}
func (m *Tx) Marshal() (dAtA []byte, err error) {
@ -1307,6 +1319,13 @@ func (m *Fee) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if len(m.Granter) > 0 {
i -= len(m.Granter)
copy(dAtA[i:], m.Granter)
i = encodeVarintTx(dAtA, i, uint64(len(m.Granter)))
i--
dAtA[i] = 0x22
}
if len(m.Payer) > 0 {
i -= len(m.Payer)
copy(dAtA[i:], m.Payer)
@ -1576,6 +1595,10 @@ func (m *Fee) Size() (n int) {
if l > 0 {
n += 1 + l + sovTx(uint64(l))
}
l = len(m.Granter)
if l > 0 {
n += 1 + l + sovTx(uint64(l))
}
return n
}
@ -2972,6 +2995,38 @@ func (m *Fee) Unmarshal(dAtA []byte) error {
}
m.Payer = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Granter", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTx
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
stringLen |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthTx
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthTx
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Granter = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipTx(dAtA[iNdEx:])

1
types/tx_msg.go
View File

@ -62,6 +62,7 @@ type (
GetGas() uint64
GetFee() Coins
FeePayer() AccAddress
FeeGranter() AccAddress
}
// Tx must have GetMemo() method to use ValidateMemoDecorator

1
x/auth/ante/ante.go
View File

@ -22,6 +22,7 @@ func NewAnteHandler(
TxTimeoutHeightDecorator{},
NewValidateMemoDecorator(ak),
NewConsumeGasForTxSizeDecorator(ak),
NewRejectFeeGranterDecorator(),
NewSetPubKeyDecorator(ak), // SetPubKeyDecorator must be called before all signature verification decorators
NewValidateSigCountDecorator(ak),
NewDeductFeeDecorator(ak, bankKeeper),

27
x/auth/ante/fee_grant.go Normal file
View File

@ -0,0 +1,27 @@
package ante
import (
"github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
)
// RejectFeeGranterDecorator is an AnteDecorator which rejects transactions which
// have the Fee.granter field set. It is to be used by chains which do not support
// fee grants.
type RejectFeeGranterDecorator struct{}
// NewRejectFeeGranterDecorator returns a new RejectFeeGranterDecorator.
func NewRejectFeeGranterDecorator() RejectFeeGranterDecorator {
return RejectFeeGranterDecorator{}
}
var _ types.AnteDecorator = RejectFeeGranterDecorator{}
func (d RejectFeeGranterDecorator) AnteHandle(ctx types.Context, tx types.Tx, simulate bool, next types.AnteHandler) (newCtx types.Context, err error) {
feeTx, ok := tx.(types.FeeTx)
if ok && len(feeTx.FeeGranter()) != 0 {
return ctx, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "fee grants are not supported")
}
return next(ctx, tx, simulate)
}

32
x/auth/ante/fee_grant_test.go Normal file
View File

@ -0,0 +1,32 @@
package ante_test
import (
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/tx"
)
type setFeeGranter interface {
SetFeeGranter(feeGranter sdk.AccAddress)
}
func (suite *AnteTestSuite) TestRejectFeeGranter() {
suite.SetupTest(true) // setup
txConfig := tx.NewTxConfig(codec.NewProtoCodec(types.NewInterfaceRegistry()), tx.DefaultSignModes)
txBuilder := txConfig.NewTxBuilder()
d := ante.NewRejectFeeGranterDecorator()
antehandler := sdk.ChainAnteDecorators(d)
_, err := antehandler(suite.ctx, txBuilder.GetTx(), false)
suite.Require().NoError(err)
setGranterTx := txBuilder.(setFeeGranter)
_, _, addr := testdata.KeyTestPubAddr()
setGranterTx.SetFeeGranter(addr)
_, err = antehandler(suite.ctx, txBuilder.GetTx(), false)
suite.Require().Error(err)
}

5
x/auth/legacy/legacytx/stdtx.go
View File

@ -264,6 +264,11 @@ func (tx StdTx) FeePayer() sdk.AccAddress {
return sdk.AccAddress{}
}
// FeeGranter always returns nil for StdTx
func (tx StdTx) FeeGranter() sdk.AccAddress {
return nil
}
func (tx StdTx) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error {
for _, m := range tx.Msgs {
err := codectypes.UnpackInterfaces(m, unpacker)

3
x/auth/legacy/legacytx/stdtx_test.go
View File

@ -67,6 +67,9 @@ func TestStdTx(t *testing.T) {
feePayer := tx.GetSigners()[0]
require.Equal(t, addr, feePayer)
feeGranter := tx.FeeGranter()
require.Empty(t, feeGranter)
}
func TestStdSignBytes(t *testing.T) {

23
x/auth/tx/builder.go
View File

@ -144,6 +144,18 @@ func (w *wrapper) FeePayer() sdk.AccAddress {
return w.GetSigners()[0]
}
func (w *wrapper) FeeGranter() sdk.AccAddress {
feePayer := w.tx.AuthInfo.Fee.Granter
if feePayer != "" {
granterAddr, err := sdk.AccAddressFromBech32(feePayer)
if err != nil {
panic(err)
}
return granterAddr
}
return nil
}
func (w *wrapper) GetMemo() string {
return w.tx.Body.Memo
}
@ -255,6 +267,17 @@ func (w *wrapper) SetFeePayer(feePayer sdk.AccAddress) {
w.authInfoBz = nil
}
func (w *wrapper) SetFeeGranter(feeGranter sdk.AccAddress) {
if w.tx.AuthInfo.Fee == nil {
w.tx.AuthInfo.Fee = &tx.Fee{}
}
w.tx.AuthInfo.Fee.Granter = feeGranter.String()
// set authInfoBz to nil because the cached authInfoBz no longer matches tx.AuthInfo
w.authInfoBz = nil
}
func (w *wrapper) SetSignatures(signatures ...signing.SignatureV2) error {
n := len(signatures)
signerInfos := make([]*tx.SignerInfo, n)

22
x/auth/tx/builder_test.go
View File

@ -289,3 +289,25 @@ func TestBuilderFeePayer(t *testing.T) {
})
}
}
func TestBuilderFeeGranter(t *testing.T) {
// keys and addresses
_, _, addr1 := testdata.KeyTestPubAddr()
// msg and signatures
msg1 := testdata.NewTestMsg(addr1, addr2)
feeAmount := testdata.NewTestFeeAmount()
msgs := []sdk.Msg{msg1}
txBuilder := newBuilder()
err := txBuilder.SetMsgs(msgs...)
require.NoError(t, err)
txBuilder.SetGasLimit(200000)
txBuilder.SetFeeAmount(feeAmount)
require.Empty(t, txBuilder.GetTx().FeeGranter())
// set fee granter
txBuilder.SetFeeGranter(addr1)
require.Equal(t, addr1, txBuilder.GetTx().FeeGranter())
}