Move ModuleAccount to x/auth (#6029)
* Move ModuleAccount to x/auth * Update x/auth module * Update x/staking * Update x/mint * Update x/gov * Update x/distribution * Update simapp * Update x/bank * Update std codec * Add changelog entries * Update CHANGELOG.md Co-Authored-By: Federico Kunze <31522760+fedekunze@users.noreply.github.com> Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
This commit is contained in:
Alexander Bezobchuk
GitHub
parent
1083fa948e
commit
fea231556a
|
|
@ -57,6 +57,7 @@ older clients.
|
|||
|
||||
### API Breaking Changes
|
||||
|
||||
* (x/auth) [\#6029](https://github.com/cosmos/cosmos-sdk/pull/6029) Module accounts have been moved from `x/supply` to `x/auth`.
|
||||
* (x/supply) [\#6010](https://github.com/cosmos/cosmos-sdk/pull/6010) All `x/supply` types and APIs have been moved to `x/bank`.
|
||||
* (baseapp) [\#5865](https://github.com/cosmos/cosmos-sdk/pull/5865) The `SimulationResponse` returned from tx simulation is now JSON encoded instead of Amino binary.
|
||||
* [\#5719](https://github.com/cosmos/cosmos-sdk/pull/5719) Bump Go requirement to 1.14+
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ type Account_PeriodicVestingAccount struct {
|
|||
PeriodicVestingAccount *types1.PeriodicVestingAccount `protobuf:"bytes,4,opt,name=periodic_vesting_account,json=periodicVestingAccount,proto3,oneof" json:"periodic_vesting_account,omitempty"`
|
||||
}
|
||||
type Account_ModuleAccount struct {
|
||||
ModuleAccount *types2.ModuleAccount `protobuf:"bytes,5,opt,name=module_account,json=moduleAccount,proto3,oneof" json:"module_account,omitempty"`
|
||||
ModuleAccount *types.ModuleAccount `protobuf:"bytes,5,opt,name=module_account,json=moduleAccount,proto3,oneof" json:"module_account,omitempty"`
|
||||
}
|
||||
|
||||
func (*Account_BaseAccount) isAccount_Sum() {}
|
||||
|
|
@ -150,7 +150,7 @@ func (m *Account) GetPeriodicVestingAccount() *types1.PeriodicVestingAccount {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (m *Account) GetModuleAccount() *types2.ModuleAccount {
|
||||
func (m *Account) GetModuleAccount() *types.ModuleAccount {
|
||||
if x, ok := m.GetSum().(*Account_ModuleAccount); ok {
|
||||
return x.ModuleAccount
|
||||
}
|
||||
|
|
@ -1191,116 +1191,116 @@ func init() { proto.RegisterFile("codec/std/codec.proto", fileDescriptor_daf09dc
|
|||
|
||||
var fileDescriptor_daf09dc2dfa19bb4 = []byte{
|
||||
// 1753 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x41, 0x93, 0x1b, 0x47,
|
||||
0x15, 0x9e, 0xf1, 0xca, 0x2b, 0x6d, 0xaf, 0xbc, 0xde, 0xed, 0xd8, 0xac, 0x58, 0x1c, 0xc9, 0x56,
|
||||
0xc0, 0x04, 0x07, 0x4b, 0x71, 0x0c, 0x09, 0x56, 0x91, 0xc2, 0xd6, 0xae, 0xb7, 0xb4, 0x24, 0x0b,
|
||||
0xae, 0x59, 0xdb, 0x14, 0x54, 0x60, 0xaa, 0x35, 0xd3, 0x9e, 0x6d, 0x56, 0x3d, 0x3d, 0x99, 0xee,
|
||||
0xd1, 0x4a, 0x54, 0x71, 0xa2, 0x8a, 0x82, 0x5b, 0xaa, 0x28, 0xee, 0x01, 0x8a, 0x0b, 0x5c, 0x73,
|
||||
0xe2, 0x07, 0x50, 0xa9, 0x9c, 0x7c, 0xe4, 0xb4, 0x50, 0xeb, 0x0b, 0x95, 0xa3, 0x0f, 0x9c, 0xa9,
|
||||
0xee, 0xe9, 0x19, 0xcd, 0x48, 0x23, 0xed, 0xe6, 0x90, 0x8b, 0x6a, 0xba, 0xdf, 0xfb, 0xbe, 0xf7,
|
||||
0x4d, 0xf7, 0x7b, 0xfd, 0x7a, 0x04, 0xae, 0x3a, 0xcc, 0xc5, 0x4e, 0x9b, 0x0b, 0xb7, 0xad, 0x9e,
|
||||
0x5a, 0x41, 0xc8, 0x04, 0x83, 0x9b, 0x0e, 0xe3, 0x94, 0x71, 0x9b, 0xbb, 0x47, 0xad, 0x78, 0x9e,
|
||||
0x0b, 0xb7, 0x35, 0xbc, 0xb3, 0xf5, 0x86, 0x38, 0x24, 0xa1, 0x6b, 0x07, 0x28, 0x14, 0xe3, 0xb6,
|
||||
0xf2, 0x6d, 0xc7, 0xae, 0xb7, 0xb3, 0x83, 0x98, 0x65, 0xeb, 0xe6, 0xac, 0xb3, 0xc7, 0x3c, 0x36,
|
||||
0x79, 0xd2, 0x7e, 0x1b, 0x62, 0x1c, 0x60, 0xde, 0x56, 0xbf, 0x7a, 0xaa, 0x36, 0x6a, 0xa3, 0x48,
|
||||
0x1c, 0xb6, 0x67, 0x2d, 0xd7, 0xb5, 0x65, 0x88, 0xb9, 0x20, 0xbe, 0xd7, 0x2e, 0xc4, 0xf6, 0x91,
|
||||
0x7f, 0x54, 0x60, 0xd9, 0x1a, 0xb5, 0x9d, 0x90, 0x70, 0xc2, 0x8b, 0x79, 0x5d, 0xc2, 0x45, 0x48,
|
||||
0xfa, 0x91, 0x20, 0xcc, 0x2f, 0xf0, 0xb8, 0x36, 0x6a, 0xe3, 0x21, 0x71, 0xb1, 0xef, 0xe0, 0x02,
|
||||
0xeb, 0xe6, 0xa8, 0xed, 0xb1, 0x61, 0x31, 0x8c, 0x0f, 0x10, 0x3f, 0x2c, 0x16, 0xfb, 0xb5, 0x51,
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x41, 0x73, 0x1b, 0x49,
|
||||
0x15, 0x9e, 0x89, 0x15, 0x4b, 0x6e, 0x2b, 0x8e, 0xdd, 0x9b, 0x60, 0x61, 0xb2, 0x52, 0xa2, 0x85,
|
||||
0xb0, 0x64, 0x89, 0xb4, 0xd9, 0xc0, 0x2e, 0x51, 0xb1, 0x45, 0x22, 0x3b, 0x2e, 0x99, 0x5d, 0x43,
|
||||
0x6a, 0x9c, 0x98, 0x82, 0x5a, 0x98, 0x6a, 0xcd, 0xb4, 0xc7, 0x8d, 0xd5, 0xd3, 0xb3, 0xd3, 0x3d,
|
||||
0xb2, 0x44, 0x15, 0x27, 0xaa, 0x28, 0xb8, 0x6d, 0x15, 0xc5, 0x7d, 0x81, 0xe2, 0x02, 0xd7, 0x3d,
|
||||
0xf1, 0x03, 0xa8, 0xad, 0x3d, 0xe5, 0xc8, 0xc9, 0x50, 0xce, 0x85, 0xda, 0x63, 0x0e, 0x9c, 0xa9,
|
||||
0xee, 0xe9, 0x19, 0xcd, 0x48, 0x63, 0xd9, 0x7b, 0xd8, 0x8b, 0x6a, 0xba, 0xdf, 0xfb, 0xbe, 0xf7,
|
||||
0x4d, 0xf7, 0x7b, 0xfd, 0x7a, 0x04, 0xae, 0x3b, 0xcc, 0xc5, 0x4e, 0x9b, 0x0b, 0xb7, 0xad, 0x9e,
|
||||
0x5a, 0x41, 0xc8, 0x04, 0x83, 0xeb, 0x0e, 0xe3, 0x94, 0x71, 0x9b, 0xbb, 0x47, 0xad, 0x78, 0x9e,
|
||||
0x0b, 0xb7, 0x35, 0xbc, 0xb7, 0xf1, 0x86, 0x38, 0x24, 0xa1, 0x6b, 0x07, 0x28, 0x14, 0xe3, 0xb6,
|
||||
0xf2, 0x6d, 0xc7, 0xae, 0x77, 0xb3, 0x83, 0x98, 0x65, 0xe3, 0xf6, 0xac, 0xb3, 0xc7, 0x3c, 0x36,
|
||||
0x79, 0xd2, 0x7e, 0x6b, 0x62, 0x1c, 0x60, 0xde, 0x56, 0xbf, 0x7a, 0xaa, 0x36, 0x6a, 0xa3, 0x48,
|
||||
0x1c, 0xb6, 0x67, 0x2d, 0x37, 0xb5, 0x65, 0x88, 0xb9, 0x20, 0xbe, 0xd7, 0x2e, 0xc4, 0xf6, 0x91,
|
||||
0x7f, 0x54, 0x60, 0xd9, 0x18, 0xb5, 0x9d, 0x90, 0x70, 0xc2, 0x8b, 0x79, 0x5d, 0xc2, 0x45, 0x48,
|
||||
0xfa, 0x91, 0x20, 0xcc, 0x2f, 0xf0, 0xb8, 0x31, 0x6a, 0xe3, 0x21, 0x71, 0xb1, 0xef, 0xe0, 0x02,
|
||||
0xeb, 0xfa, 0xa8, 0xed, 0xb1, 0x61, 0x31, 0x8c, 0x0f, 0x10, 0x3f, 0x2c, 0x16, 0xfb, 0xb5, 0x51,
|
||||
0x9b, 0x0b, 0x74, 0x54, 0x6c, 0x7c, 0x6d, 0xd4, 0x0e, 0x50, 0x88, 0x68, 0xa2, 0x37, 0x08, 0x59,
|
||||
0xc0, 0x38, 0x1a, 0x4c, 0x33, 0x44, 0x81, 0x17, 0x22, 0xb7, 0x40, 0x55, 0xf3, 0x1f, 0x25, 0x50,
|
||||
0x7e, 0xe0, 0x38, 0x2c, 0xf2, 0x05, 0xdc, 0x05, 0xd5, 0x3e, 0xe2, 0xd8, 0x46, 0xf1, 0xb8, 0x66,
|
||||
0x5e, 0x37, 0x5f, 0x5f, 0x7d, 0xeb, 0x46, 0x2b, 0xb3, 0xd7, 0xa3, 0x96, 0x5c, 0xdb, 0xd6, 0xf0,
|
||||
0x4e, 0xab, 0x8b, 0x38, 0xd6, 0xc0, 0x9e, 0x61, 0xad, 0xf6, 0x27, 0x43, 0x38, 0x04, 0x5b, 0x0e,
|
||||
0xf3, 0x05, 0xf1, 0x23, 0x16, 0x71, 0x5b, 0xef, 0x43, 0xca, 0x7a, 0x41, 0xb1, 0xbe, 0x5d, 0xc4,
|
||||
0x1a, 0x7b, 0x4a, 0xf6, 0xed, 0x14, 0xff, 0x34, 0x9e, 0x9c, 0x84, 0xaa, 0x39, 0x73, 0x6c, 0x90,
|
||||
0x82, 0x4d, 0x17, 0x0f, 0xd0, 0x18, 0xbb, 0x33, 0x41, 0x97, 0x54, 0xd0, 0xbb, 0x8b, 0x83, 0xee,
|
||||
0xc4, 0xe0, 0x99, 0x88, 0x57, 0xdd, 0x22, 0x03, 0x0c, 0x40, 0x2d, 0xc0, 0x21, 0x61, 0x2e, 0x71,
|
||||
0x66, 0xe2, 0x95, 0x54, 0xbc, 0xef, 0x2c, 0x8e, 0xf7, 0x48, 0xa3, 0x67, 0x02, 0x7e, 0x25, 0x28,
|
||||
0xb4, 0xc0, 0xf7, 0xc1, 0x1a, 0x65, 0x6e, 0x34, 0x98, 0x6c, 0xd1, 0x45, 0x15, 0xe7, 0xb5, 0x7c,
|
||||
0x1c, 0x99, 0xdc, 0x92, 0x7f, 0x5f, 0xf9, 0x4e, 0x68, 0x2f, 0xd1, 0xec, 0x44, 0xe7, 0xde, 0x67,
|
||||
0x9f, 0xdc, 0xfe, 0xee, 0x2d, 0x8f, 0x88, 0xc3, 0xa8, 0xdf, 0x72, 0x18, 0xd5, 0xb5, 0x99, 0xd4,
|
||||
0x2b, 0x77, 0x8f, 0xda, 0xba, 0x94, 0xf0, 0x28, 0x60, 0xa1, 0xc0, 0x6e, 0x4b, 0x43, 0xbb, 0x17,
|
||||
0xc1, 0x12, 0x8f, 0x68, 0xf3, 0xb7, 0x26, 0x58, 0x3e, 0x88, 0x82, 0x60, 0x30, 0x86, 0x6f, 0x83,
|
||||
0x65, 0xae, 0x9e, 0x74, 0xd6, 0x5c, 0x2b, 0x96, 0x14, 0x7b, 0xf7, 0x0c, 0x4b, 0x7b, 0x77, 0xde,
|
||||
0xfd, 0xef, 0xc7, 0x0d, 0xf3, 0x3c, 0x42, 0x54, 0xc5, 0xa6, 0x42, 0x62, 0x9e, 0xbd, 0x44, 0xc8,
|
||||
0x9f, 0x4d, 0x50, 0x79, 0xa8, 0x4b, 0x0f, 0xbe, 0x0f, 0xaa, 0xf8, 0xc3, 0x88, 0x0c, 0x99, 0x83,
|
||||
0x64, 0xa1, 0x6a, 0x41, 0x37, 0xf3, 0x82, 0x92, 0x42, 0x95, 0xa2, 0x1e, 0x66, 0xbc, 0x7b, 0x86,
|
||||
0x95, 0x43, 0x77, 0x1e, 0x68, 0x81, 0xf7, 0xce, 0xd0, 0x97, 0x56, 0x7e, 0xaa, 0x31, 0x11, 0x94,
|
||||
0x88, 0xfc, 0xbb, 0x09, 0x36, 0xf6, 0xb9, 0x77, 0x10, 0xf5, 0x29, 0x11, 0xa9, 0xda, 0x7d, 0x50,
|
||||
0x92, 0xb5, 0xa3, 0x55, 0xb6, 0xe7, 0xab, 0x9c, 0x81, 0xca, 0x0a, 0xec, 0x56, 0x3e, 0x3d, 0x69,
|
||||
0x18, 0xcf, 0x4f, 0x1a, 0xa6, 0xa5, 0x68, 0xe0, 0xbb, 0xa0, 0x92, 0x80, 0x74, 0xa5, 0xe5, 0xea,
|
||||
0x37, 0x7b, 0x56, 0xa7, 0x02, 0xad, 0x14, 0xd2, 0xa9, 0xfc, 0xee, 0xe3, 0x86, 0x21, 0xdf, 0xb8,
|
||||
0xf9, 0x97, 0xac, 0xda, 0x47, 0xfa, 0x5c, 0x81, 0xbd, 0x9c, 0xda, 0x5b, 0x79, 0xb5, 0x1e, 0x1b,
|
||||
0xe6, 0x84, 0x26, 0xa8, 0x42, 0xa1, 0x1d, 0x50, 0x96, 0x85, 0x8c, 0xd3, 0x13, 0xe1, 0xfa, 0x5c,
|
||||
0x9d, 0xdb, 0xb1, 0x9f, 0x95, 0x00, 0x32, 0x2a, 0xff, 0x60, 0x82, 0x4a, 0x2a, 0xee, 0x07, 0x39,
|
||||
0x71, 0x37, 0x0a, 0xc5, 0x2d, 0xd4, 0x74, 0xff, 0x0b, 0x6b, 0xea, 0x96, 0x24, 0xc5, 0x44, 0x59,
|
||||
0x49, 0xa9, 0xfa, 0x53, 0x09, 0x94, 0xb5, 0x03, 0x7c, 0x07, 0x94, 0x04, 0x1e, 0x89, 0x85, 0xa2,
|
||||
0x1e, 0xe3, 0x51, 0xba, 0x58, 0x3d, 0xc3, 0x52, 0x00, 0xf8, 0x01, 0x58, 0x57, 0x67, 0x3b, 0x16,
|
||||
0x38, 0xb4, 0x9d, 0x43, 0xe4, 0x7b, 0xc9, 0x8e, 0x4e, 0x25, 0x49, 0xdc, 0x01, 0xd4, 0xcb, 0x25,
|
||||
0xfe, 0xdb, 0xca, 0x3d, 0x43, 0x79, 0x39, 0xc8, 0x9b, 0xe0, 0xcf, 0xc1, 0x3a, 0x67, 0xcf, 0xc4,
|
||||
0x31, 0x0a, 0xb1, 0xad, 0xbb, 0x83, 0x3e, 0x24, 0xdf, 0xcc, 0xb3, 0x6b, 0xa3, 0x2a, 0x5e, 0x0d,
|
||||
0x78, 0x12, 0x4f, 0x65, 0xe9, 0x79, 0xde, 0x04, 0x03, 0xb0, 0xe9, 0x20, 0xdf, 0xc1, 0x03, 0x7b,
|
||||
0x26, 0x4a, 0xa9, 0xe8, 0xfc, 0xcf, 0x44, 0xd9, 0x56, 0xb8, 0xf9, 0xb1, 0xae, 0x3a, 0x45, 0x0e,
|
||||
0x70, 0x00, 0xae, 0x38, 0x8c, 0xd2, 0xc8, 0x27, 0x62, 0x6c, 0x07, 0x8c, 0x0d, 0x6c, 0x1e, 0x60,
|
||||
0xdf, 0xd5, 0x27, 0xe4, 0xf7, 0xf2, 0xe1, 0xb2, 0x8d, 0x3c, 0xde, 0x4d, 0x8d, 0x7c, 0xc4, 0xd8,
|
||||
0xe0, 0x40, 0xe2, 0x32, 0x01, 0xa1, 0x33, 0x63, 0xed, 0xdc, 0xd3, 0xa7, 0xc2, 0x9d, 0xb3, 0x8e,
|
||||
0xad, 0xb4, 0xe5, 0xa7, 0x19, 0xa3, 0x4f, 0x83, 0x3f, 0x9a, 0x60, 0xf5, 0x71, 0x88, 0x7c, 0x8e,
|
||||
0x1c, 0xa9, 0x02, 0xee, 0xe4, 0x92, 0xb7, 0x39, 0x37, 0xf1, 0x0e, 0x84, 0xfb, 0x78, 0xa4, 0xb2,
|
||||
0xb7, 0x9a, 0x64, 0xef, 0xe7, 0x32, 0x05, 0x93, 0xaa, 0x2a, 0x51, 0xee, 0xf1, 0xda, 0x85, 0xeb,
|
||||
0x4b, 0x0b, 0xd3, 0x77, 0x1f, 0x73, 0x8e, 0x3c, 0xac, 0xd3, 0x57, 0x61, 0x3a, 0x25, 0x59, 0x55,
|
||||
0xcd, 0x7f, 0x56, 0x41, 0x59, 0x5b, 0x61, 0x07, 0x54, 0x28, 0xf7, 0x6c, 0x2e, 0xd7, 0x31, 0xd6,
|
||||
0xf5, 0xea, 0x9c, 0x4e, 0xc3, 0xbd, 0x03, 0xec, 0xbb, 0x3d, 0xc3, 0x2a, 0xd3, 0xf8, 0x11, 0xfe,
|
||||
0x10, 0xac, 0x49, 0x2c, 0x8d, 0x06, 0x82, 0xc4, 0x0c, 0x17, 0x66, 0xdf, 0x2c, 0xc7, 0xb0, 0x2f,
|
||||
0x5d, 0x35, 0x4d, 0x95, 0x66, 0xc6, 0xf0, 0x17, 0xe0, 0x8a, 0xe4, 0x1a, 0xe2, 0x90, 0x3c, 0x1b,
|
||||
0xdb, 0xc4, 0x1f, 0xa2, 0x90, 0xa0, 0xb4, 0xab, 0x4f, 0x9d, 0x42, 0xf1, 0x05, 0x4e, 0x73, 0x3e,
|
||||
0x55, 0x90, 0xbd, 0x04, 0x21, 0x77, 0x93, 0xce, 0xcc, 0x42, 0x1f, 0xd4, 0xe2, 0xf7, 0x14, 0xf6,
|
||||
0x31, 0x11, 0x87, 0x6e, 0x88, 0x8e, 0x6d, 0xe4, 0xba, 0x21, 0xe6, 0x5c, 0xa7, 0xeb, 0xdd, 0xc5,
|
||||
0xf9, 0xa3, 0xde, 0x5f, 0xfc, 0x44, 0x63, 0x1f, 0xc4, 0x50, 0x99, 0xab, 0xb4, 0xc8, 0x00, 0x7f,
|
||||
0x0d, 0x5e, 0x95, 0xf1, 0xd2, 0x58, 0x2e, 0x1e, 0x60, 0x0f, 0x09, 0x16, 0xda, 0x21, 0x3e, 0x46,
|
||||
0xe1, 0x39, 0x93, 0x76, 0x9f, 0x7b, 0x09, 0xf1, 0x4e, 0x42, 0x60, 0x29, 0x7c, 0xcf, 0xb0, 0xb6,
|
||||
0xe8, 0x5c, 0x2b, 0xfc, 0xbd, 0x09, 0x6e, 0xe4, 0xe2, 0x0f, 0xd1, 0x80, 0xb8, 0x2a, 0xbe, 0x4c,
|
||||
0x75, 0xc2, 0xb9, 0x6c, 0x9b, 0xcb, 0x4a, 0xc3, 0xf7, 0xcf, 0xad, 0xe1, 0x69, 0x42, 0xb2, 0x9d,
|
||||
0x72, 0xf4, 0x0c, 0xab, 0x4e, 0x17, 0x7a, 0xc0, 0x23, 0xb0, 0x29, 0xa5, 0x3c, 0x8b, 0x7c, 0xd7,
|
||||
0xce, 0xd7, 0x6f, 0xad, 0xac, 0x04, 0xbc, 0x75, 0xa6, 0x80, 0xdd, 0xc8, 0x77, 0x73, 0x05, 0xdc,
|
||||
0x33, 0x2c, 0x99, 0x2f, 0x33, 0xf3, 0xf0, 0x03, 0xf0, 0x8a, 0xda, 0x67, 0xd5, 0x9d, 0xec, 0xb4,
|
||||
0x4f, 0x56, 0x66, 0xd3, 0x28, 0x5f, 0x2c, 0xd3, 0x9d, 0xb7, 0x67, 0x58, 0x1b, 0x74, 0xa6, 0x93,
|
||||
0xe7, 0xd9, 0x93, 0xab, 0x78, 0x6d, 0xe5, 0xbc, 0xec, 0x99, 0x23, 0x67, 0xc2, 0x9e, 0x36, 0xb7,
|
||||
0x7b, 0x71, 0x2d, 0x0e, 0x99, 0xc0, 0x35, 0x50, 0x74, 0xc5, 0x9a, 0x74, 0xdf, 0xa7, 0x4c, 0x60,
|
||||
0x5d, 0x8a, 0xf2, 0x11, 0x76, 0xc1, 0xaa, 0x84, 0xba, 0x38, 0x60, 0x9c, 0x88, 0xda, 0xaa, 0x42,
|
||||
0x37, 0xe6, 0xa1, 0x77, 0x62, 0xb7, 0x9e, 0x61, 0x01, 0x9a, 0x8e, 0xe0, 0x0e, 0x90, 0x23, 0x3b,
|
||||
0xf2, 0x7f, 0x89, 0xc8, 0xa0, 0x56, 0x2d, 0xba, 0x76, 0x26, 0x1f, 0x31, 0x9a, 0xe7, 0x89, 0x72,
|
||||
0xed, 0x19, 0xd6, 0x0a, 0x4d, 0x06, 0xd0, 0x8e, 0x0b, 0xd9, 0x09, 0x31, 0x12, 0x78, 0x92, 0x76,
|
||||
0xb5, 0x4b, 0x8a, 0xef, 0x8d, 0x29, 0xbe, 0xf8, 0xb3, 0x47, 0xd3, 0x6d, 0x2b, 0x4c, 0x9a, 0x42,
|
||||
0xba, 0x92, 0xa7, 0x66, 0xe1, 0x4f, 0x81, 0x9c, 0xb5, 0xb1, 0x4b, 0x44, 0x86, 0x7e, 0x4d, 0xd1,
|
||||
0x7f, 0x6b, 0x11, 0xfd, 0x43, 0x97, 0x88, 0x2c, 0xf9, 0x3a, 0x9d, 0x9a, 0x83, 0x7b, 0xa0, 0x1a,
|
||||
0xaf, 0xa2, 0x2a, 0x26, 0x5c, 0xbb, 0xac, 0x48, 0xbf, 0xbe, 0x88, 0x54, 0x17, 0x9e, 0xdc, 0x8c,
|
||||
0x55, 0x3a, 0x19, 0x26, 0xcb, 0xd0, 0xc7, 0x1e, 0xf1, 0xed, 0x10, 0xa7, 0x94, 0xeb, 0x67, 0x2f,
|
||||
0x43, 0x57, 0x62, 0xac, 0x14, 0xa2, 0x97, 0x61, 0x6a, 0x16, 0xfe, 0x38, 0x3e, 0x7c, 0x23, 0x3f,
|
||||
0xa5, 0xde, 0x28, 0xba, 0x04, 0xe7, 0xa9, 0x9f, 0xf8, 0x19, 0xd6, 0x4b, 0x34, 0x3b, 0xd1, 0xb9,
|
||||
0xf5, 0xd9, 0x27, 0xb7, 0x6f, 0x2e, 0x6c, 0x75, 0x71, 0x93, 0x93, 0x0a, 0x75, 0x83, 0xfb, 0xc8,
|
||||
0x04, 0xe5, 0x03, 0xe2, 0xf9, 0x3b, 0xcc, 0x81, 0x7b, 0xb9, 0xe6, 0xf6, 0xcd, 0x45, 0xcd, 0x4d,
|
||||
0x43, 0xbe, 0x8c, 0x0e, 0xd7, 0xfc, 0x8d, 0xfc, 0x5e, 0x11, 0xee, 0x2e, 0x96, 0xf7, 0x9f, 0x65,
|
||||
0x44, 0xf5, 0x57, 0xae, 0x24, 0x7a, 0x25, 0x4b, 0xa4, 0x6e, 0x04, 0xc4, 0xef, 0xbe, 0x29, 0xb1,
|
||||
0x7f, 0xfb, 0x77, 0xe3, 0xf5, 0x73, 0xbc, 0xb9, 0x04, 0x70, 0x4b, 0x93, 0xc2, 0x75, 0xb0, 0xe4,
|
||||
0x21, 0xae, 0x5a, 0x5e, 0xc9, 0x92, 0x8f, 0x99, 0x3b, 0xeb, 0xaf, 0x40, 0x55, 0xbf, 0x27, 0x12,
|
||||
0x51, 0x88, 0xe1, 0x2e, 0x28, 0x07, 0x51, 0xdf, 0x3e, 0xc2, 0xf1, 0xb7, 0x53, 0xb5, 0x7b, 0xfb,
|
||||
0xf3, 0x93, 0xc6, 0x95, 0x20, 0xea, 0x0f, 0x88, 0x23, 0x67, 0xbf, 0xcd, 0x28, 0x11, 0x98, 0x06,
|
||||
0x62, 0xfc, 0xf2, 0xa4, 0xb1, 0x31, 0x46, 0x74, 0xd0, 0x69, 0x4e, 0xac, 0x4d, 0x6b, 0x39, 0x88,
|
||||
0xfa, 0xef, 0xe1, 0x31, 0xbc, 0x06, 0x56, 0x78, 0x42, 0xaa, 0x22, 0x57, 0xad, 0xc9, 0x84, 0xee,
|
||||
0xee, 0x7f, 0x35, 0xc1, 0x4a, 0x7a, 0x83, 0x80, 0xef, 0x80, 0xa5, 0x67, 0x38, 0xd9, 0x95, 0xc6,
|
||||
0xa2, 0x5d, 0xd9, 0xc5, 0xc9, 0x4a, 0x4a, 0x04, 0x7c, 0x0f, 0x80, 0x94, 0x39, 0xd9, 0x8a, 0x6f,
|
||||
0x9c, 0xb5, 0xab, 0xca, 0x5b, 0xb3, 0x64, 0xe0, 0x10, 0x82, 0x12, 0xc5, 0x94, 0xa9, 0x6e, 0xbe,
|
||||
0x62, 0xa9, 0xe7, 0xe6, 0xff, 0x4c, 0xb0, 0x96, 0x4f, 0x06, 0x79, 0x00, 0x3a, 0x87, 0x88, 0xf8,
|
||||
0x36, 0x89, 0x2f, 0x23, 0x2b, 0xdd, 0xfa, 0xe9, 0x49, 0xa3, 0xbc, 0x2d, 0xe7, 0xf6, 0x76, 0x5e,
|
||||
0x9e, 0x34, 0x2e, 0xc7, 0x4b, 0x93, 0x38, 0x35, 0xad, 0xb2, 0x7a, 0xdc, 0x73, 0xe1, 0x7d, 0xb0,
|
||||
0xa6, 0x3f, 0x98, 0x6d, 0x3f, 0xa2, 0x7d, 0x1c, 0xc6, 0x1b, 0xd3, 0xfd, 0xea, 0xcb, 0x93, 0xc6,
|
||||
0xd5, 0x18, 0x95, 0xb7, 0x37, 0xad, 0x4b, 0x7a, 0xe2, 0x47, 0x6a, 0x0c, 0xb7, 0x40, 0x85, 0xe3,
|
||||
0x0f, 0x23, 0xd5, 0x2e, 0x96, 0xd4, 0xa6, 0xa6, 0xe3, 0x54, 0x7f, 0x69, 0xa2, 0x3f, 0x59, 0xd9,
|
||||
0x8b, 0x5f, 0x74, 0x65, 0xbb, 0xf7, 0x3f, 0x3d, 0xad, 0x9b, 0xcf, 0x4f, 0xeb, 0xe6, 0x7f, 0x4e,
|
||||
0xeb, 0xe6, 0x47, 0x2f, 0xea, 0xc6, 0xf3, 0x17, 0x75, 0xe3, 0x5f, 0x2f, 0xea, 0xc6, 0xcf, 0x16,
|
||||
0x97, 0x5f, 0xfa, 0x37, 0x5d, 0x7f, 0x59, 0xfd, 0xb1, 0x73, 0xf7, 0xff, 0x01, 0x00, 0x00, 0xff,
|
||||
0xff, 0x4c, 0xcb, 0x8a, 0xbd, 0xba, 0x13, 0x00, 0x00,
|
||||
0x7e, 0xe4, 0x38, 0x2c, 0xf2, 0x05, 0xdc, 0x06, 0xd5, 0x3e, 0xe2, 0xd8, 0x46, 0xf1, 0xb8, 0x66,
|
||||
0xde, 0x34, 0x5f, 0x5f, 0x7e, 0xeb, 0x56, 0x2b, 0xb3, 0xd7, 0xa3, 0x96, 0x5c, 0xdb, 0xd6, 0xf0,
|
||||
0x5e, 0xab, 0x8b, 0x38, 0xd6, 0xc0, 0x9e, 0x61, 0x2d, 0xf7, 0x27, 0x43, 0x38, 0x04, 0x1b, 0x0e,
|
||||
0xf3, 0x05, 0xf1, 0x23, 0x16, 0x71, 0x5b, 0xef, 0x43, 0xca, 0x7a, 0x49, 0xb1, 0xbe, 0x5d, 0xc4,
|
||||
0x1a, 0x7b, 0x4a, 0xf6, 0xcd, 0x14, 0xbf, 0x1f, 0x4f, 0x4e, 0x42, 0xd5, 0x9c, 0x33, 0x6c, 0x90,
|
||||
0x82, 0x75, 0x17, 0x0f, 0xd0, 0x18, 0xbb, 0x33, 0x41, 0x17, 0x54, 0xd0, 0xfb, 0xf3, 0x83, 0x6e,
|
||||
0xc5, 0xe0, 0x99, 0x88, 0xd7, 0xdd, 0x22, 0x03, 0x0c, 0x40, 0x2d, 0xc0, 0x21, 0x61, 0x2e, 0x71,
|
||||
0x66, 0xe2, 0x95, 0x54, 0xbc, 0xef, 0xcc, 0x8f, 0xf7, 0x44, 0xa3, 0x67, 0x02, 0x7e, 0x25, 0x28,
|
||||
0xb4, 0xc0, 0xf7, 0xc1, 0x0a, 0x65, 0x6e, 0x34, 0x98, 0x6c, 0xd1, 0x65, 0x15, 0xe7, 0xb5, 0xe2,
|
||||
0x2d, 0xda, 0x55, 0xbe, 0x13, 0xda, 0x2b, 0x34, 0x3b, 0xd1, 0x79, 0xf0, 0xd9, 0x27, 0x77, 0xbf,
|
||||
0x7b, 0xc7, 0x23, 0xe2, 0x30, 0xea, 0xb7, 0x1c, 0x46, 0x75, 0x6d, 0x26, 0xf5, 0xca, 0xdd, 0xa3,
|
||||
0xb6, 0x2e, 0x25, 0x3c, 0x0a, 0x58, 0x28, 0xb0, 0xdb, 0xd2, 0xd0, 0xee, 0x65, 0xb0, 0xc0, 0x23,
|
||||
0xda, 0xfc, 0xad, 0x09, 0x16, 0xf7, 0xa2, 0x20, 0x18, 0x8c, 0xe1, 0xdb, 0x60, 0x91, 0xab, 0x27,
|
||||
0x9d, 0x35, 0x37, 0xf2, 0x92, 0x64, 0xbd, 0x49, 0x49, 0xb1, 0x77, 0xcf, 0xb0, 0xb4, 0x77, 0xe7,
|
||||
0xdd, 0xff, 0x7e, 0xdc, 0x30, 0x2f, 0x22, 0x44, 0x55, 0x6c, 0x2a, 0x24, 0xe6, 0xd9, 0x49, 0x84,
|
||||
0xfc, 0xd9, 0x04, 0x95, 0xc7, 0xba, 0xf4, 0xe0, 0xfb, 0xa0, 0x8a, 0x3f, 0x8c, 0xc8, 0x90, 0x39,
|
||||
0x48, 0x16, 0xaa, 0x16, 0x74, 0x3b, 0x2f, 0x28, 0x29, 0x54, 0x29, 0xea, 0x71, 0xc6, 0xbb, 0x67,
|
||||
0x58, 0x39, 0x74, 0xe7, 0x91, 0x16, 0xf8, 0xe0, 0x1c, 0x7d, 0x69, 0xe5, 0xa7, 0x1a, 0x13, 0x41,
|
||||
0x89, 0xc8, 0xbf, 0x9b, 0x60, 0x6d, 0x97, 0x7b, 0x7b, 0x51, 0x9f, 0x12, 0x91, 0xaa, 0xdd, 0x05,
|
||||
0x25, 0x59, 0x3b, 0x5a, 0x65, 0xfb, 0x6c, 0x95, 0x33, 0x50, 0x59, 0x81, 0xdd, 0xca, 0xa7, 0x27,
|
||||
0x0d, 0xe3, 0xf9, 0x49, 0xc3, 0xb4, 0x14, 0x0d, 0x7c, 0x17, 0x54, 0x12, 0x90, 0xae, 0xb4, 0x5c,
|
||||
0xfd, 0x66, 0xcf, 0xea, 0x54, 0xa0, 0x95, 0x42, 0x3a, 0x95, 0xdf, 0x7d, 0xdc, 0x30, 0xe4, 0x1b,
|
||||
0x37, 0xff, 0x92, 0x55, 0xfb, 0x44, 0x9f, 0x2b, 0xb0, 0x97, 0x53, 0x7b, 0x27, 0xaf, 0xd6, 0x63,
|
||||
0xc3, 0x9c, 0xd0, 0x04, 0x55, 0x28, 0xb4, 0x03, 0xca, 0xb2, 0x90, 0x71, 0x7a, 0x22, 0xdc, 0x3c,
|
||||
0x53, 0xe7, 0x66, 0xec, 0x67, 0x25, 0x80, 0x8c, 0xca, 0x3f, 0x98, 0xa0, 0x92, 0x8a, 0xfb, 0x41,
|
||||
0x4e, 0xdc, 0xad, 0x42, 0x71, 0x73, 0x35, 0x3d, 0xfc, 0xc2, 0x9a, 0xba, 0x25, 0x49, 0x31, 0x51,
|
||||
0x56, 0x52, 0xaa, 0xfe, 0x54, 0x02, 0x65, 0xed, 0x00, 0xdf, 0x01, 0x25, 0x81, 0x47, 0x62, 0xae,
|
||||
0xa8, 0xa7, 0x78, 0x94, 0x2e, 0x56, 0xcf, 0xb0, 0x14, 0x00, 0x7e, 0x00, 0x56, 0xd5, 0xd9, 0x8e,
|
||||
0x05, 0x0e, 0x6d, 0xe7, 0x10, 0xf9, 0x5e, 0xb2, 0xa3, 0x53, 0x49, 0x12, 0x77, 0x00, 0xf5, 0x72,
|
||||
0x89, 0xff, 0xa6, 0x72, 0xcf, 0x50, 0x5e, 0x0d, 0xf2, 0x26, 0xf8, 0x73, 0xb0, 0xca, 0xd9, 0x81,
|
||||
0x38, 0x46, 0x21, 0xb6, 0x75, 0x77, 0xd0, 0x87, 0xe4, 0x9b, 0x79, 0x76, 0x6d, 0x54, 0xc5, 0xab,
|
||||
0x01, 0xcf, 0xe2, 0xa9, 0x2c, 0x3d, 0xcf, 0x9b, 0x60, 0x00, 0xd6, 0x1d, 0xe4, 0x3b, 0x78, 0x60,
|
||||
0xcf, 0x44, 0x29, 0x15, 0x9d, 0xff, 0x99, 0x28, 0x9b, 0x0a, 0x77, 0x76, 0xac, 0xeb, 0x4e, 0x91,
|
||||
0x03, 0x1c, 0x80, 0x6b, 0x0e, 0xa3, 0x34, 0xf2, 0x89, 0x18, 0xdb, 0x01, 0x63, 0x03, 0x9b, 0x07,
|
||||
0xd8, 0x77, 0xf5, 0x09, 0xf9, 0xbd, 0x7c, 0xb8, 0x6c, 0x23, 0x8f, 0x77, 0x53, 0x23, 0x9f, 0x30,
|
||||
0x36, 0xd8, 0x93, 0xb8, 0x4c, 0x40, 0xe8, 0xcc, 0x58, 0x3b, 0x0f, 0xf4, 0xa9, 0x70, 0xef, 0xbc,
|
||||
0x63, 0x2b, 0x6d, 0xf9, 0x69, 0xc6, 0xe8, 0xd3, 0xe0, 0x8f, 0x26, 0x58, 0x7e, 0x1a, 0x22, 0x9f,
|
||||
0x23, 0x47, 0xaa, 0x80, 0x5b, 0xb9, 0xe4, 0x6d, 0x9e, 0x99, 0x78, 0x7b, 0xc2, 0x7d, 0x3a, 0x52,
|
||||
0xd9, 0x5b, 0x4d, 0xb2, 0xf7, 0x73, 0x99, 0x82, 0x49, 0x55, 0x95, 0x28, 0xf7, 0x78, 0xed, 0xd2,
|
||||
0xcd, 0x85, 0xb9, 0xe9, 0xbb, 0x8b, 0x39, 0x47, 0x1e, 0xd6, 0xe9, 0xab, 0x30, 0x9d, 0x92, 0xac,
|
||||
0xaa, 0xe6, 0x3f, 0xab, 0xa0, 0xac, 0xad, 0xb0, 0x03, 0x2a, 0x94, 0x7b, 0x36, 0x97, 0xeb, 0x18,
|
||||
0xeb, 0x7a, 0xb5, 0xf8, 0x58, 0x97, 0x25, 0x8f, 0x7d, 0xb7, 0x67, 0x58, 0x65, 0x1a, 0x3f, 0xc2,
|
||||
0x1f, 0x82, 0x15, 0x89, 0xa5, 0xd1, 0x40, 0x90, 0x98, 0xe1, 0xd2, 0xec, 0x9b, 0xe5, 0x18, 0x76,
|
||||
0xa5, 0xab, 0xa6, 0xa9, 0xd2, 0xcc, 0x18, 0xfe, 0x02, 0x5c, 0x93, 0x5c, 0x43, 0x1c, 0x92, 0x83,
|
||||
0xb1, 0x4d, 0xfc, 0x21, 0x0a, 0x09, 0x4a, 0xbb, 0xfa, 0xd4, 0x29, 0x14, 0x5f, 0xe0, 0x34, 0xe7,
|
||||
0xbe, 0x82, 0xec, 0x24, 0x08, 0xb9, 0x9b, 0x74, 0x66, 0x16, 0xfa, 0xa0, 0x16, 0xbf, 0xa7, 0xb0,
|
||||
0x8f, 0x89, 0x38, 0x74, 0x43, 0x74, 0x6c, 0x23, 0xd7, 0x0d, 0x31, 0xe7, 0x3a, 0x5d, 0xef, 0xcf,
|
||||
0xcf, 0x1f, 0xf5, 0xfe, 0xe2, 0x27, 0x1a, 0xfb, 0x28, 0x86, 0xca, 0x5c, 0xa5, 0x45, 0x06, 0xf8,
|
||||
0x6b, 0xf0, 0xaa, 0x8c, 0x97, 0xc6, 0x72, 0xf1, 0x00, 0x7b, 0x48, 0xb0, 0xd0, 0x0e, 0xf1, 0x31,
|
||||
0x0a, 0x2f, 0x98, 0xb4, 0xbb, 0xdc, 0x4b, 0x88, 0xb7, 0x12, 0x02, 0x4b, 0xe1, 0x7b, 0x86, 0xb5,
|
||||
0x41, 0xcf, 0xb4, 0xc2, 0xdf, 0x9b, 0xe0, 0x56, 0x2e, 0xfe, 0x10, 0x0d, 0x88, 0xab, 0xe2, 0xcb,
|
||||
0x54, 0x27, 0x9c, 0xcb, 0xb6, 0xb9, 0xa8, 0x34, 0x7c, 0xff, 0xc2, 0x1a, 0xf6, 0x13, 0x92, 0xcd,
|
||||
0x94, 0xa3, 0x67, 0x58, 0x75, 0x3a, 0xd7, 0x03, 0x1e, 0x81, 0x75, 0x29, 0xe5, 0x20, 0xf2, 0x5d,
|
||||
0x3b, 0x5f, 0xbf, 0xb5, 0xb2, 0x12, 0xf0, 0xd6, 0xb9, 0x02, 0xb6, 0x23, 0xdf, 0xcd, 0x15, 0x70,
|
||||
0xcf, 0xb0, 0x64, 0xbe, 0xcc, 0xcc, 0xc3, 0x0f, 0xc0, 0x2b, 0x6a, 0x9f, 0x55, 0x77, 0xb2, 0xd3,
|
||||
0x3e, 0x59, 0x99, 0x4d, 0xa3, 0x7c, 0xb1, 0x4c, 0x77, 0xde, 0x9e, 0x61, 0xad, 0xd1, 0x99, 0x4e,
|
||||
0x9e, 0x67, 0x4f, 0xae, 0xe2, 0xb5, 0xa5, 0x8b, 0xb2, 0x67, 0x8e, 0x9c, 0x09, 0x7b, 0xda, 0xdc,
|
||||
0x1e, 0xc4, 0xb5, 0x38, 0x64, 0x02, 0xd7, 0x40, 0xd1, 0x15, 0x6b, 0xd2, 0x7d, 0xf7, 0x99, 0xc0,
|
||||
0xba, 0x14, 0xe5, 0x23, 0xec, 0x82, 0x65, 0x09, 0x75, 0x71, 0xc0, 0x38, 0x11, 0xb5, 0x65, 0x85,
|
||||
0x6e, 0x9c, 0x85, 0xde, 0x8a, 0xdd, 0x7a, 0x86, 0x05, 0x68, 0x3a, 0x82, 0x5b, 0x40, 0x8e, 0xec,
|
||||
0xc8, 0xff, 0x25, 0x22, 0x83, 0x5a, 0xb5, 0xe8, 0xda, 0x99, 0x7c, 0xc4, 0x68, 0x9e, 0x67, 0xca,
|
||||
0xb5, 0x67, 0x58, 0x4b, 0x34, 0x19, 0x40, 0x3b, 0x2e, 0x64, 0x27, 0xc4, 0x48, 0xe0, 0x49, 0xda,
|
||||
0xd5, 0xae, 0x28, 0xbe, 0x37, 0xa6, 0xf8, 0xe2, 0xcf, 0x1e, 0x4d, 0xb7, 0xa9, 0x30, 0x69, 0x0a,
|
||||
0xe9, 0x4a, 0x9e, 0x9a, 0x85, 0x3f, 0x05, 0x72, 0xd6, 0xc6, 0x2e, 0x11, 0x19, 0xfa, 0x15, 0x45,
|
||||
0xff, 0xad, 0x79, 0xf4, 0x8f, 0x5d, 0x22, 0xb2, 0xe4, 0xab, 0x74, 0x6a, 0x0e, 0xee, 0x80, 0x6a,
|
||||
0xbc, 0x8a, 0xaa, 0x98, 0x70, 0xed, 0xaa, 0x22, 0xfd, 0xfa, 0x3c, 0x52, 0x5d, 0x78, 0x72, 0x33,
|
||||
0x96, 0xe9, 0x64, 0x98, 0x2c, 0x43, 0x1f, 0x7b, 0xc4, 0xb7, 0x43, 0x9c, 0x52, 0xae, 0x9e, 0xbf,
|
||||
0x0c, 0x5d, 0x89, 0xb1, 0x52, 0x88, 0x5e, 0x86, 0xa9, 0x59, 0xf8, 0xe3, 0xf8, 0xf0, 0x8d, 0xfc,
|
||||
0x94, 0x7a, 0xad, 0xe8, 0x12, 0x9c, 0xa7, 0x7e, 0xe6, 0x67, 0x58, 0xaf, 0xd0, 0xec, 0x44, 0xe7,
|
||||
0xce, 0x67, 0x9f, 0xdc, 0xbd, 0x3d, 0xb7, 0xd5, 0xc5, 0x4d, 0x4e, 0x2a, 0xd4, 0x0d, 0xee, 0x23,
|
||||
0x13, 0x94, 0xf7, 0x88, 0xe7, 0x6f, 0x31, 0x07, 0xee, 0xe4, 0x9a, 0xdb, 0x37, 0xe7, 0x35, 0x37,
|
||||
0x0d, 0xf9, 0x32, 0x3a, 0x5c, 0xf3, 0x37, 0xf2, 0x7b, 0x45, 0xb8, 0xdb, 0x58, 0xde, 0x7f, 0x16,
|
||||
0x11, 0xd5, 0x5f, 0xb9, 0x92, 0xe8, 0x95, 0x2c, 0x91, 0xba, 0x11, 0x10, 0xbf, 0xfb, 0xa6, 0xc4,
|
||||
0xfe, 0xed, 0xdf, 0x8d, 0xd7, 0x2f, 0xf0, 0xe6, 0x12, 0xc0, 0x2d, 0x4d, 0x0a, 0x57, 0xc1, 0x82,
|
||||
0x87, 0xb8, 0x6a, 0x79, 0x25, 0x4b, 0x3e, 0x66, 0xee, 0xac, 0xbf, 0x02, 0x55, 0xfd, 0x9e, 0x48,
|
||||
0x44, 0x21, 0x86, 0xdb, 0xa0, 0x1c, 0x44, 0x7d, 0xfb, 0x08, 0xc7, 0xdf, 0x4e, 0xd5, 0xee, 0xdd,
|
||||
0xcf, 0x4f, 0x1a, 0xd7, 0x82, 0xa8, 0x3f, 0x20, 0x8e, 0x9c, 0xfd, 0x36, 0xa3, 0x44, 0x60, 0x1a,
|
||||
0x88, 0xf1, 0xcb, 0x93, 0xc6, 0xda, 0x18, 0xd1, 0x41, 0xa7, 0x39, 0xb1, 0x36, 0xad, 0xc5, 0x20,
|
||||
0xea, 0xbf, 0x87, 0xc7, 0xf0, 0x06, 0x58, 0xe2, 0x09, 0xa9, 0x8a, 0x5c, 0xb5, 0x26, 0x13, 0xba,
|
||||
0xbb, 0xff, 0xd5, 0x04, 0x4b, 0xe9, 0x0d, 0x02, 0xbe, 0x03, 0x16, 0x0e, 0x70, 0xb2, 0x2b, 0x8d,
|
||||
0x79, 0xbb, 0xb2, 0x8d, 0x93, 0x95, 0x94, 0x08, 0xf8, 0x1e, 0x00, 0x29, 0x73, 0xb2, 0x15, 0xdf,
|
||||
0x38, 0x6f, 0x57, 0x95, 0xb7, 0x66, 0xc9, 0xc0, 0x21, 0x04, 0x25, 0x8a, 0x29, 0x53, 0xdd, 0x7c,
|
||||
0xc9, 0x52, 0xcf, 0xcd, 0xff, 0x99, 0x60, 0x25, 0x9f, 0x0c, 0xf2, 0x00, 0x74, 0x0e, 0x11, 0xf1,
|
||||
0x6d, 0x12, 0x5f, 0x46, 0x96, 0xba, 0xf5, 0xd3, 0x93, 0x46, 0x79, 0x53, 0xce, 0xed, 0x6c, 0xbd,
|
||||
0x3c, 0x69, 0x5c, 0x8d, 0x97, 0x26, 0x71, 0x6a, 0x5a, 0x65, 0xf5, 0xb8, 0xe3, 0xc2, 0x87, 0x60,
|
||||
0x45, 0x7f, 0x30, 0xdb, 0x7e, 0x44, 0xfb, 0x38, 0x8c, 0x37, 0xa6, 0xfb, 0xd5, 0x97, 0x27, 0x8d,
|
||||
0xeb, 0x31, 0x2a, 0x6f, 0x6f, 0x5a, 0x57, 0xf4, 0xc4, 0x8f, 0xd4, 0x18, 0x6e, 0x80, 0x0a, 0xc7,
|
||||
0x1f, 0x46, 0xaa, 0x5d, 0x2c, 0xa8, 0x4d, 0x4d, 0xc7, 0xa9, 0xfe, 0xd2, 0x44, 0x7f, 0xb2, 0xb2,
|
||||
0x97, 0xbf, 0xe8, 0xca, 0x76, 0x1f, 0x7e, 0x7a, 0x5a, 0x37, 0x9f, 0x9f, 0xd6, 0xcd, 0xff, 0x9c,
|
||||
0xd6, 0xcd, 0x8f, 0x5e, 0xd4, 0x8d, 0xe7, 0x2f, 0xea, 0xc6, 0xbf, 0x5e, 0xd4, 0x8d, 0x9f, 0xcd,
|
||||
0x2f, 0xbf, 0xf4, 0x6f, 0xba, 0xfe, 0xa2, 0xfa, 0x63, 0xe7, 0xfe, 0xff, 0x03, 0x00, 0x00, 0xff,
|
||||
0xff, 0x02, 0x85, 0x89, 0xbb, 0xba, 0x13, 0x00, 0x00,
|
||||
}
|
||||
|
||||
func (this *Supply) Equal(that interface{}) bool {
|
||||
|
|
@ -1711,7 +1711,7 @@ func (this *Account) SetAccount(value github_com_cosmos_cosmos_sdk_x_auth_export
|
|||
case *types1.PeriodicVestingAccount:
|
||||
this.Sum = &Account_PeriodicVestingAccount{vt}
|
||||
return nil
|
||||
case *types2.ModuleAccount:
|
||||
case *types.ModuleAccount:
|
||||
this.Sum = &Account_ModuleAccount{vt}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -3943,7 +3943,7 @@ func (m *Account) Unmarshal(dAtA []byte) error {
|
|||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
v := &types2.ModuleAccount{}
|
||||
v := &types.ModuleAccount{}
|
||||
if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ message Account {
|
|||
cosmos_sdk.x.auth.vesting.v1.ContinuousVestingAccount continuous_vesting_account = 2;
|
||||
cosmos_sdk.x.auth.vesting.v1.DelayedVestingAccount delayed_vesting_account = 3;
|
||||
cosmos_sdk.x.auth.vesting.v1.PeriodicVestingAccount periodic_vesting_account = 4;
|
||||
cosmos_sdk.x.bank.v1.ModuleAccount module_account = 5;
|
||||
cosmos_sdk.x.auth.v1.ModuleAccount module_account = 5;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,11 +75,11 @@ var (
|
|||
maccPerms = map[string][]string{
|
||||
auth.FeeCollectorName: nil,
|
||||
distr.ModuleName: nil,
|
||||
mint.ModuleName: {bank.Minter},
|
||||
staking.BondedPoolName: {bank.Burner, bank.Staking},
|
||||
staking.NotBondedPoolName: {bank.Burner, bank.Staking},
|
||||
gov.ModuleName: {bank.Burner},
|
||||
transfer.GetModuleAccountName(): {bank.Minter, bank.Burner},
|
||||
mint.ModuleName: {auth.Minter},
|
||||
staking.BondedPoolName: {auth.Burner, auth.Staking},
|
||||
staking.NotBondedPoolName: {auth.Burner, auth.Staking},
|
||||
gov.ModuleName: {auth.Burner},
|
||||
transfer.GetModuleAccountName(): {auth.Minter, auth.Burner},
|
||||
}
|
||||
|
||||
// module accounts that are allowed to receive tokens
|
||||
|
|
@ -188,21 +188,21 @@ func NewSimApp(
|
|||
|
||||
// add keepers
|
||||
app.AccountKeeper = auth.NewAccountKeeper(
|
||||
appCodec, keys[auth.StoreKey], app.subspaces[auth.ModuleName], auth.ProtoBaseAccount,
|
||||
appCodec, keys[auth.StoreKey], app.subspaces[auth.ModuleName], auth.ProtoBaseAccount, maccPerms,
|
||||
)
|
||||
app.BankKeeper = bank.NewBaseKeeper(
|
||||
appCodec, keys[bank.StoreKey], app.AccountKeeper, app.subspaces[bank.ModuleName], app.BlacklistedAccAddrs(), maccPerms,
|
||||
appCodec, keys[bank.StoreKey], app.AccountKeeper, app.subspaces[bank.ModuleName], app.BlacklistedAccAddrs(),
|
||||
)
|
||||
stakingKeeper := staking.NewKeeper(
|
||||
appCodec, keys[staking.StoreKey], app.BankKeeper, app.subspaces[staking.ModuleName],
|
||||
appCodec, keys[staking.StoreKey], app.AccountKeeper, app.BankKeeper, app.subspaces[staking.ModuleName],
|
||||
)
|
||||
app.MintKeeper = mint.NewKeeper(
|
||||
appCodec, keys[mint.StoreKey], app.subspaces[mint.ModuleName], &stakingKeeper,
|
||||
app.BankKeeper, auth.FeeCollectorName,
|
||||
app.AccountKeeper, app.BankKeeper, auth.FeeCollectorName,
|
||||
)
|
||||
app.DistrKeeper = distr.NewKeeper(
|
||||
appCodec, keys[distr.StoreKey], app.subspaces[distr.ModuleName], app.BankKeeper, &stakingKeeper,
|
||||
auth.FeeCollectorName, app.ModuleAccountAddrs(),
|
||||
appCodec, keys[distr.StoreKey], app.subspaces[distr.ModuleName], app.AccountKeeper, app.BankKeeper,
|
||||
&stakingKeeper, auth.FeeCollectorName, app.ModuleAccountAddrs(),
|
||||
)
|
||||
app.SlashingKeeper = slashing.NewKeeper(
|
||||
appCodec, keys[slashing.StoreKey], &stakingKeeper, app.subspaces[slashing.ModuleName],
|
||||
|
|
@ -219,7 +219,7 @@ func NewSimApp(
|
|||
AddRoute(distr.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)).
|
||||
AddRoute(upgrade.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper))
|
||||
app.GovKeeper = gov.NewKeeper(
|
||||
appCodec, keys[gov.StoreKey], app.subspaces[gov.ModuleName], app.BankKeeper,
|
||||
appCodec, keys[gov.StoreKey], app.subspaces[gov.ModuleName], app.AccountKeeper, app.BankKeeper,
|
||||
&stakingKeeper, govRouter,
|
||||
)
|
||||
|
||||
|
|
@ -238,7 +238,7 @@ func NewSimApp(
|
|||
app.TransferKeeper = transfer.NewKeeper(
|
||||
app.cdc, keys[transfer.StoreKey],
|
||||
app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper,
|
||||
app.BankKeeper, scopedTransferKeeper,
|
||||
app.AccountKeeper, app.BankKeeper, scopedTransferKeeper,
|
||||
)
|
||||
transferModule := transfer.NewAppModule(app.TransferKeeper)
|
||||
|
||||
|
|
@ -261,12 +261,12 @@ func NewSimApp(
|
|||
// must be passed by reference here.
|
||||
app.mm = module.NewManager(
|
||||
genutil.NewAppModule(app.AccountKeeper, app.StakingKeeper, app.BaseApp.DeliverTx),
|
||||
auth.NewAppModule(app.AccountKeeper, app.BankKeeper),
|
||||
auth.NewAppModule(app.AccountKeeper),
|
||||
bank.NewAppModule(app.BankKeeper, app.AccountKeeper),
|
||||
capability.NewAppModule(*app.CapabilityKeeper),
|
||||
crisis.NewAppModule(&app.CrisisKeeper),
|
||||
gov.NewAppModule(app.GovKeeper, app.AccountKeeper, app.BankKeeper),
|
||||
mint.NewAppModule(app.MintKeeper, app.BankKeeper),
|
||||
mint.NewAppModule(app.MintKeeper, app.AccountKeeper),
|
||||
slashing.NewAppModule(app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
|
||||
distr.NewAppModule(app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
|
||||
staking.NewAppModule(app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
|
||||
|
|
@ -302,10 +302,10 @@ func NewSimApp(
|
|||
// NOTE: this is not required apps that don't use the simulator for fuzz testing
|
||||
// transactions
|
||||
app.sm = module.NewSimulationManager(
|
||||
auth.NewAppModule(app.AccountKeeper, app.BankKeeper),
|
||||
auth.NewAppModule(app.AccountKeeper),
|
||||
bank.NewAppModule(app.BankKeeper, app.AccountKeeper),
|
||||
gov.NewAppModule(app.GovKeeper, app.AccountKeeper, app.BankKeeper),
|
||||
mint.NewAppModule(app.MintKeeper, app.BankKeeper),
|
||||
mint.NewAppModule(app.MintKeeper, app.AccountKeeper),
|
||||
staking.NewAppModule(app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
|
||||
distr.NewAppModule(app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
|
||||
slashing.NewAppModule(app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
|
||||
|
|
@ -376,7 +376,7 @@ func (app *SimApp) LoadHeight(height int64) error {
|
|||
func (app *SimApp) ModuleAccountAddrs() map[string]bool {
|
||||
modAccAddrs := make(map[string]bool)
|
||||
for acc := range maccPerms {
|
||||
modAccAddrs[bank.NewModuleAddress(acc).String()] = true
|
||||
modAccAddrs[auth.NewModuleAddress(acc).String()] = true
|
||||
}
|
||||
|
||||
return modAccAddrs
|
||||
|
|
@ -386,7 +386,7 @@ func (app *SimApp) ModuleAccountAddrs() map[string]bool {
|
|||
func (app *SimApp) BlacklistedAccAddrs() map[string]bool {
|
||||
blacklistedAddrs := make(map[string]bool)
|
||||
for acc := range maccPerms {
|
||||
blacklistedAddrs[bank.NewModuleAddress(acc).String()] = !allowedReceivingModAcc[acc]
|
||||
blacklistedAddrs[auth.NewModuleAddress(acc).String()] = !allowedReceivingModAcc[acc]
|
||||
}
|
||||
|
||||
return blacklistedAddrs
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ func TestBlackListedAddrs(t *testing.T) {
|
|||
app := NewSimApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0)
|
||||
|
||||
for acc := range maccPerms {
|
||||
require.Equal(t, !allowedReceivingModAcc[acc], app.BankKeeper.BlacklistedAddr(app.BankKeeper.GetModuleAddress(acc)))
|
||||
require.Equal(t, !allowedReceivingModAcc[acc], app.BankKeeper.BlacklistedAddr(app.AccountKeeper.GetModuleAddress(acc)))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ import (
|
|||
"errors"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
)
|
||||
|
||||
var _ authexported.GenesisAccount = (*SimGenesisAccount)(nil)
|
||||
|
|
@ -37,7 +37,7 @@ func (sga SimGenesisAccount) Validate() error {
|
|||
}
|
||||
|
||||
if sga.ModuleName != "" {
|
||||
ma := bank.ModuleAccount{
|
||||
ma := auth.ModuleAccount{
|
||||
BaseAccount: sga.BaseAccount, Name: sga.ModuleName, Permissions: sga.ModulePermissions,
|
||||
}
|
||||
if err := ma.Validate(); err != nil {
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@ const (
|
|||
QueryAccount = types.QueryAccount
|
||||
QueryParams = types.QueryParams
|
||||
MaxGasWanted = types.MaxGasWanted
|
||||
Minter = types.Minter
|
||||
Burner = types.Burner
|
||||
Staking = types.Staking
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
@ -60,6 +63,9 @@ var (
|
|||
ValidateGenAccounts = types.ValidateGenAccounts
|
||||
GetGenesisStateFromAppState = types.GetGenesisStateFromAppState
|
||||
NewStdSignature = types.NewStdSignature
|
||||
NewModuleAddress = types.NewModuleAddress
|
||||
NewEmptyModuleAccount = types.NewEmptyModuleAccount
|
||||
NewModuleAccount = types.NewModuleAccount
|
||||
|
||||
// variable aliases
|
||||
ModuleCdc = types.ModuleCdc
|
||||
|
|
@ -89,4 +95,5 @@ type (
|
|||
TxBuilder = types.TxBuilder
|
||||
GenesisAccountIterator = types.GenesisAccountIterator
|
||||
Codec = types.Codec
|
||||
ModuleAccount = types.ModuleAccount
|
||||
)
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@ func TestAnteHandlerFees(t *testing.T) {
|
|||
app.BankKeeper.SetBalances(ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("atom", 149)))
|
||||
checkInvalidTx(t, anteHandler, ctx, tx, false, sdkerrors.ErrInsufficientFunds)
|
||||
|
||||
modAcc := app.BankKeeper.GetModuleAccount(ctx, types.FeeCollectorName)
|
||||
modAcc := app.AccountKeeper.GetModuleAccount(ctx, types.FeeCollectorName)
|
||||
|
||||
require.True(t, app.BankKeeper.GetAllBalances(ctx, modAcc.GetAddress()).Empty())
|
||||
require.True(sdk.IntEq(t, app.BankKeeper.GetAllBalances(ctx, addr1).AmountOf("atom"), sdk.NewInt(149)))
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ func (dfd DeductFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo
|
|||
return ctx, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx")
|
||||
}
|
||||
|
||||
if addr := dfd.bankKeeper.GetModuleAddress(types.FeeCollectorName); addr == nil {
|
||||
if addr := dfd.ak.GetModuleAddress(types.FeeCollectorName); addr == nil {
|
||||
panic(fmt.Sprintf("%s module account has not been set", types.FeeCollectorName))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,16 @@ type Account interface {
|
|||
String() string
|
||||
}
|
||||
|
||||
// ModuleAccountI defines an account interface for modules that hold tokens in
|
||||
// an escrow.
|
||||
type ModuleAccountI interface {
|
||||
Account
|
||||
|
||||
GetName() string
|
||||
GetPermissions() []string
|
||||
HasPermission(string) bool
|
||||
}
|
||||
|
||||
// GenesisAccounts defines a slice of GenesisAccount objects
|
||||
type GenesisAccounts []GenesisAccount
|
||||
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@ package auth
|
|||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
)
|
||||
|
||||
// InitGenesis - Init store state from genesis data
|
||||
//
|
||||
// CONTRACT: old coins from the FeeCollectionKeeper need to be transferred through
|
||||
// a genesis port script to the new fee collector account
|
||||
func InitGenesis(ctx sdk.Context, ak AccountKeeper, bk types.BankKeeper, data GenesisState) {
|
||||
func InitGenesis(ctx sdk.Context, ak AccountKeeper, data GenesisState) {
|
||||
ak.SetParams(ctx, data.Params)
|
||||
data.Accounts = SanitizeGenesisAccounts(data.Accounts)
|
||||
|
||||
|
|
@ -19,7 +18,7 @@ func InitGenesis(ctx sdk.Context, ak AccountKeeper, bk types.BankKeeper, data Ge
|
|||
ak.SetAccount(ctx, acc)
|
||||
}
|
||||
|
||||
bk.GetModuleAccount(ctx, FeeCollectorName)
|
||||
ak.GetModuleAccount(ctx, FeeCollectorName)
|
||||
}
|
||||
|
||||
// ExportGenesis returns a GenesisState for a given context and keeper
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ type AccountKeeper struct {
|
|||
key sdk.StoreKey
|
||||
cdc types.Codec
|
||||
paramSubspace paramtypes.Subspace
|
||||
permAddrs map[string]types.PermissionsForAddress
|
||||
|
||||
// The prototypical Account constructor.
|
||||
proto func() exported.Account
|
||||
|
|
@ -29,6 +30,7 @@ type AccountKeeper struct {
|
|||
// (binary) encode and decode concrete sdk.Accounts.
|
||||
func NewAccountKeeper(
|
||||
cdc types.Codec, key sdk.StoreKey, paramstore paramtypes.Subspace, proto func() exported.Account,
|
||||
maccPerms map[string][]string,
|
||||
) AccountKeeper {
|
||||
|
||||
// set KeyTable if it has not already been set
|
||||
|
|
@ -36,11 +38,17 @@ func NewAccountKeeper(
|
|||
paramstore = paramstore.WithKeyTable(types.ParamKeyTable())
|
||||
}
|
||||
|
||||
permAddrs := make(map[string]types.PermissionsForAddress)
|
||||
for name, perms := range maccPerms {
|
||||
permAddrs[name] = types.NewPermissionsForAddress(name, perms)
|
||||
}
|
||||
|
||||
return AccountKeeper{
|
||||
key: key,
|
||||
proto: proto,
|
||||
cdc: cdc,
|
||||
paramSubspace: paramstore,
|
||||
permAddrs: permAddrs,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -96,6 +104,76 @@ func (ak AccountKeeper) GetNextAccountNumber(ctx sdk.Context) uint64 {
|
|||
return accNumber
|
||||
}
|
||||
|
||||
// ValidatePermissions validates that the module account has been granted
|
||||
// permissions within its set of allowed permissions.
|
||||
func (ak AccountKeeper) ValidatePermissions(macc exported.ModuleAccountI) error {
|
||||
permAddr := ak.permAddrs[macc.GetName()]
|
||||
for _, perm := range macc.GetPermissions() {
|
||||
if !permAddr.HasPermission(perm) {
|
||||
return fmt.Errorf("invalid module permission %s", perm)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetModuleAddress returns an address based on the module name
|
||||
func (ak AccountKeeper) GetModuleAddress(moduleName string) sdk.AccAddress {
|
||||
permAddr, ok := ak.permAddrs[moduleName]
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
return permAddr.GetAddress()
|
||||
}
|
||||
|
||||
// GetModuleAddressAndPermissions returns an address and permissions based on the module name
|
||||
func (ak AccountKeeper) GetModuleAddressAndPermissions(moduleName string) (addr sdk.AccAddress, permissions []string) {
|
||||
permAddr, ok := ak.permAddrs[moduleName]
|
||||
if !ok {
|
||||
return addr, permissions
|
||||
}
|
||||
|
||||
return permAddr.GetAddress(), permAddr.GetPermissions()
|
||||
}
|
||||
|
||||
// GetModuleAccountAndPermissions gets the module account from the auth account store and its
|
||||
// registered permissions
|
||||
func (ak AccountKeeper) GetModuleAccountAndPermissions(ctx sdk.Context, moduleName string) (exported.ModuleAccountI, []string) {
|
||||
addr, perms := ak.GetModuleAddressAndPermissions(moduleName)
|
||||
if addr == nil {
|
||||
return nil, []string{}
|
||||
}
|
||||
|
||||
acc := ak.GetAccount(ctx, addr)
|
||||
if acc != nil {
|
||||
macc, ok := acc.(exported.ModuleAccountI)
|
||||
if !ok {
|
||||
panic("account is not a module account")
|
||||
}
|
||||
return macc, perms
|
||||
}
|
||||
|
||||
// create a new module account
|
||||
macc := types.NewEmptyModuleAccount(moduleName, perms...)
|
||||
maccI := (ak.NewAccount(ctx, macc)).(exported.ModuleAccountI) // set the account number
|
||||
ak.SetModuleAccount(ctx, maccI)
|
||||
|
||||
return maccI, perms
|
||||
}
|
||||
|
||||
// GetModuleAccount gets the module account from the auth account store, if the account does not
|
||||
// exist in the AccountKeeper, then it is created.
|
||||
func (ak AccountKeeper) GetModuleAccount(ctx sdk.Context, moduleName string) exported.ModuleAccountI {
|
||||
acc, _ := ak.GetModuleAccountAndPermissions(ctx, moduleName)
|
||||
return acc
|
||||
}
|
||||
|
||||
// SetModuleAccount sets the module account to the auth account store
|
||||
func (ak AccountKeeper) SetModuleAccount(ctx sdk.Context, macc exported.ModuleAccountI) { //nolint:interfacer
|
||||
ak.SetAccount(ctx, macc)
|
||||
}
|
||||
|
||||
func (ak AccountKeeper) decodeAccount(bz []byte) exported.Account {
|
||||
acc, err := ak.cdc.UnmarshalAccount(bz)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -5,10 +5,24 @@ import (
|
|||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
)
|
||||
|
||||
const (
|
||||
holder = "holder"
|
||||
multiPerm = "multiple permissions account"
|
||||
randomPerm = "random permission"
|
||||
)
|
||||
|
||||
var (
|
||||
multiPermAcc = auth.NewEmptyModuleAccount(multiPerm, auth.Burner, auth.Minter, auth.Staking)
|
||||
randomPermAcc = auth.NewEmptyModuleAccount(randomPerm, "random")
|
||||
)
|
||||
|
||||
func TestAccountMapperGetSet(t *testing.T) {
|
||||
app, ctx := createTestApp(true)
|
||||
addr := sdk.AccAddress([]byte("some-address"))
|
||||
|
|
@ -81,3 +95,32 @@ func TestGetSetParams(t *testing.T) {
|
|||
actualParams := app.AccountKeeper.GetParams(ctx)
|
||||
require.Equal(t, params, actualParams)
|
||||
}
|
||||
|
||||
func TestSupply_ValidatePermissions(t *testing.T) {
|
||||
app, _ := createTestApp(true)
|
||||
|
||||
// add module accounts to supply keeper
|
||||
maccPerms := simapp.GetMaccPerms()
|
||||
maccPerms[holder] = nil
|
||||
maccPerms[types.Burner] = []string{types.Burner}
|
||||
maccPerms[auth.Minter] = []string{types.Minter}
|
||||
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
|
||||
maccPerms[randomPerm] = []string{"random"}
|
||||
|
||||
appCodec := codecstd.NewAppCodec(app.Codec())
|
||||
keeper := auth.NewAccountKeeper(
|
||||
appCodec, app.GetKey(types.StoreKey), app.GetSubspace(types.ModuleName),
|
||||
types.ProtoBaseAccount, maccPerms,
|
||||
)
|
||||
|
||||
err := keeper.ValidatePermissions(multiPermAcc)
|
||||
require.NoError(t, err)
|
||||
|
||||
err = keeper.ValidatePermissions(randomPermAcc)
|
||||
require.NoError(t, err)
|
||||
|
||||
// unregistered permissions
|
||||
otherAcc := types.NewEmptyModuleAccount("other", "other")
|
||||
err = app.AccountKeeper.ValidatePermissions(otherAcc)
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,15 +77,13 @@ type AppModule struct {
|
|||
AppModuleBasic
|
||||
|
||||
accountKeeper AccountKeeper
|
||||
bankKeeper types.BankKeeper
|
||||
}
|
||||
|
||||
// NewAppModule creates a new AppModule object
|
||||
func NewAppModule(accountKeeper AccountKeeper, bankKeeper types.BankKeeper) AppModule {
|
||||
func NewAppModule(accountKeeper AccountKeeper) AppModule {
|
||||
return AppModule{
|
||||
AppModuleBasic: AppModuleBasic{},
|
||||
accountKeeper: accountKeeper,
|
||||
bankKeeper: bankKeeper,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -118,7 +116,7 @@ func (am AppModule) NewQuerierHandler() sdk.Querier {
|
|||
func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONMarshaler, data json.RawMessage) []abci.ValidatorUpdate {
|
||||
var genesisState GenesisState
|
||||
cdc.MustUnmarshalJSON(data, &genesisState)
|
||||
InitGenesis(ctx, am.accountKeeper, am.bankKeeper, genesisState)
|
||||
InitGenesis(ctx, am.accountKeeper, genesisState)
|
||||
return []abci.ValidatorUpdate{}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import (
|
|||
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
)
|
||||
|
||||
func TestItCreatesModuleAccountOnInitBlock(t *testing.T) {
|
||||
|
|
@ -22,6 +21,6 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) {
|
|||
},
|
||||
)
|
||||
|
||||
acc := app.AccountKeeper.GetAccount(ctx, bank.NewModuleAddress(auth.FeeCollectorName))
|
||||
acc := app.AccountKeeper.GetAccount(ctx, auth.NewModuleAddress(auth.FeeCollectorName))
|
||||
require.NotNil(t, acc)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ import (
|
|||
"bytes"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/tendermint/tendermint/crypto"
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
|
|
@ -12,8 +14,12 @@ import (
|
|||
"github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
)
|
||||
|
||||
var _ exported.Account = (*BaseAccount)(nil)
|
||||
var _ exported.GenesisAccount = (*BaseAccount)(nil)
|
||||
var (
|
||||
_ exported.Account = (*BaseAccount)(nil)
|
||||
_ exported.GenesisAccount = (*BaseAccount)(nil)
|
||||
_ exported.GenesisAccount = (*ModuleAccount)(nil)
|
||||
_ exported.ModuleAccountI = (*ModuleAccount)(nil)
|
||||
)
|
||||
|
||||
// NewBaseAccount creates a new BaseAccount object
|
||||
func NewBaseAccount(address sdk.AccAddress, pubKey crypto.PubKey, accountNumber, sequence uint64) *BaseAccount {
|
||||
|
|
@ -188,3 +194,137 @@ func (acc *BaseAccount) UnmarshalJSON(bz []byte) error {
|
|||
|
||||
return nil
|
||||
}
|
||||
|
||||
// NewModuleAddress creates an AccAddress from the hash of the module's name
|
||||
func NewModuleAddress(name string) sdk.AccAddress {
|
||||
return sdk.AccAddress(crypto.AddressHash([]byte(name)))
|
||||
}
|
||||
|
||||
// NewEmptyModuleAccount creates a empty ModuleAccount from a string
|
||||
func NewEmptyModuleAccount(name string, permissions ...string) *ModuleAccount {
|
||||
moduleAddress := NewModuleAddress(name)
|
||||
baseAcc := NewBaseAccountWithAddress(moduleAddress)
|
||||
|
||||
if err := validatePermissions(permissions...); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return &ModuleAccount{
|
||||
BaseAccount: baseAcc,
|
||||
Name: name,
|
||||
Permissions: permissions,
|
||||
}
|
||||
}
|
||||
|
||||
// NewModuleAccount creates a new ModuleAccount instance
|
||||
func NewModuleAccount(ba *BaseAccount, name string, permissions ...string) *ModuleAccount {
|
||||
if err := validatePermissions(permissions...); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return &ModuleAccount{
|
||||
BaseAccount: ba,
|
||||
Name: name,
|
||||
Permissions: permissions,
|
||||
}
|
||||
}
|
||||
|
||||
// HasPermission returns whether or not the module account has permission.
|
||||
func (ma ModuleAccount) HasPermission(permission string) bool {
|
||||
for _, perm := range ma.Permissions {
|
||||
if perm == permission {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// GetName returns the the name of the holder's module
|
||||
func (ma ModuleAccount) GetName() string {
|
||||
return ma.Name
|
||||
}
|
||||
|
||||
// GetPermissions returns permissions granted to the module account
|
||||
func (ma ModuleAccount) GetPermissions() []string {
|
||||
return ma.Permissions
|
||||
}
|
||||
|
||||
// SetPubKey - Implements Account
|
||||
func (ma ModuleAccount) SetPubKey(pubKey crypto.PubKey) error {
|
||||
return fmt.Errorf("not supported for module accounts")
|
||||
}
|
||||
|
||||
// SetSequence - Implements Account
|
||||
func (ma ModuleAccount) SetSequence(seq uint64) error {
|
||||
return fmt.Errorf("not supported for module accounts")
|
||||
}
|
||||
|
||||
// Validate checks for errors on the account fields
|
||||
func (ma ModuleAccount) Validate() error {
|
||||
if strings.TrimSpace(ma.Name) == "" {
|
||||
return errors.New("module account name cannot be blank")
|
||||
}
|
||||
if !ma.Address.Equals(sdk.AccAddress(crypto.AddressHash([]byte(ma.Name)))) {
|
||||
return fmt.Errorf("address %s cannot be derived from the module name '%s'", ma.Address, ma.Name)
|
||||
}
|
||||
|
||||
return ma.BaseAccount.Validate()
|
||||
}
|
||||
|
||||
type moduleAccountPretty struct {
|
||||
Address sdk.AccAddress `json:"address" yaml:"address"`
|
||||
PubKey string `json:"public_key" yaml:"public_key"`
|
||||
AccountNumber uint64 `json:"account_number" yaml:"account_number"`
|
||||
Sequence uint64 `json:"sequence" yaml:"sequence"`
|
||||
Name string `json:"name" yaml:"name"`
|
||||
Permissions []string `json:"permissions" yaml:"permissions"`
|
||||
}
|
||||
|
||||
func (ma ModuleAccount) String() string {
|
||||
out, _ := ma.MarshalYAML()
|
||||
return out.(string)
|
||||
}
|
||||
|
||||
// MarshalYAML returns the YAML representation of a ModuleAccount.
|
||||
func (ma ModuleAccount) MarshalYAML() (interface{}, error) {
|
||||
bs, err := yaml.Marshal(moduleAccountPretty{
|
||||
Address: ma.Address,
|
||||
PubKey: "",
|
||||
AccountNumber: ma.AccountNumber,
|
||||
Sequence: ma.Sequence,
|
||||
Name: ma.Name,
|
||||
Permissions: ma.Permissions,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return string(bs), nil
|
||||
}
|
||||
|
||||
// MarshalJSON returns the JSON representation of a ModuleAccount.
|
||||
func (ma ModuleAccount) MarshalJSON() ([]byte, error) {
|
||||
return json.Marshal(moduleAccountPretty{
|
||||
Address: ma.Address,
|
||||
PubKey: "",
|
||||
AccountNumber: ma.AccountNumber,
|
||||
Sequence: ma.Sequence,
|
||||
Name: ma.Name,
|
||||
Permissions: ma.Permissions,
|
||||
})
|
||||
}
|
||||
|
||||
// UnmarshalJSON unmarshals raw JSON bytes into a ModuleAccount.
|
||||
func (ma *ModuleAccount) UnmarshalJSON(bz []byte) error {
|
||||
var alias moduleAccountPretty
|
||||
if err := json.Unmarshal(bz, &alias); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ma.BaseAccount = NewBaseAccount(alias.Address, nil, alias.AccountNumber, alias.Sequence)
|
||||
ma.Name = alias.Name
|
||||
ma.Permissions = alias.Permissions
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
package types_test
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
"github.com/tendermint/tendermint/crypto/secp256k1"
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
|
|
@ -107,3 +111,87 @@ func TestGenesisAccountValidate(t *testing.T) {
|
|||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestModuleAccountMarshalYAML(t *testing.T) {
|
||||
name := "test"
|
||||
moduleAcc := types.NewEmptyModuleAccount(name, types.Minter, types.Burner, types.Staking)
|
||||
bs, err := yaml.Marshal(moduleAcc)
|
||||
require.NoError(t, err)
|
||||
|
||||
want := "|\n address: cosmos1n7rdpqvgf37ktx30a2sv2kkszk3m7ncmg5drhe\n public_key: \"\"\n account_number: 0\n sequence: 0\n name: test\n permissions:\n - minter\n - burner\n - staking\n"
|
||||
require.Equal(t, want, string(bs))
|
||||
}
|
||||
|
||||
func TestHasPermissions(t *testing.T) {
|
||||
name := "test"
|
||||
macc := types.NewEmptyModuleAccount(name, types.Staking, types.Minter, types.Burner)
|
||||
cases := []struct {
|
||||
permission string
|
||||
expectHas bool
|
||||
}{
|
||||
{types.Staking, true},
|
||||
{types.Minter, true},
|
||||
{types.Burner, true},
|
||||
{"other", false},
|
||||
}
|
||||
|
||||
for i, tc := range cases {
|
||||
hasPerm := macc.HasPermission(tc.permission)
|
||||
if tc.expectHas {
|
||||
require.True(t, hasPerm, "test case #%d", i)
|
||||
} else {
|
||||
require.False(t, hasPerm, "test case #%d", i)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidate(t *testing.T) {
|
||||
addr := sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
|
||||
baseAcc := types.NewBaseAccount(addr, nil, 0, 0)
|
||||
tests := []struct {
|
||||
name string
|
||||
acc exported.GenesisAccount
|
||||
expErr error
|
||||
}{
|
||||
{
|
||||
"valid module account",
|
||||
types.NewEmptyModuleAccount("test"),
|
||||
nil,
|
||||
},
|
||||
{
|
||||
"invalid name and address pair",
|
||||
types.NewModuleAccount(baseAcc, "test"),
|
||||
fmt.Errorf("address %s cannot be derived from the module name 'test'", addr),
|
||||
},
|
||||
{
|
||||
"empty module account name",
|
||||
types.NewModuleAccount(baseAcc, " "),
|
||||
errors.New("module account name cannot be blank"),
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
tt := tt
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
err := tt.acc.Validate()
|
||||
require.Equal(t, tt.expErr, err)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestModuleAccountJSON(t *testing.T) {
|
||||
pubkey := secp256k1.GenPrivKey().PubKey()
|
||||
addr := sdk.AccAddress(pubkey.Address())
|
||||
baseAcc := types.NewBaseAccount(addr, nil, 10, 50)
|
||||
acc := types.NewModuleAccount(baseAcc, "test", "burner")
|
||||
|
||||
bz, err := json.Marshal(acc)
|
||||
require.NoError(t, err)
|
||||
|
||||
bz1, err := acc.MarshalJSON()
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, string(bz1), string(bz))
|
||||
|
||||
var a types.ModuleAccount
|
||||
require.NoError(t, json.Unmarshal(bz, &a))
|
||||
require.Equal(t, acc.String(), a.String())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,9 +20,11 @@ type Codec interface {
|
|||
// RegisterCodec registers the account interfaces and concrete types on the
|
||||
// provided Amino codec.
|
||||
func RegisterCodec(cdc *codec.Codec) {
|
||||
cdc.RegisterInterface((*exported.ModuleAccountI)(nil), nil)
|
||||
cdc.RegisterInterface((*exported.GenesisAccount)(nil), nil)
|
||||
cdc.RegisterInterface((*exported.Account)(nil), nil)
|
||||
cdc.RegisterConcrete(&BaseAccount{}, "cosmos-sdk/Account", nil)
|
||||
cdc.RegisterConcrete(&ModuleAccount{}, "cosmos-sdk/ModuleAccount", nil)
|
||||
cdc.RegisterConcrete(StdTx{}, "cosmos-sdk/StdTx", nil)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,9 @@ package types
|
|||
|
||||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
)
|
||||
|
||||
// BankKeeper defines the contract needed for supply related APIs (noalias)
|
||||
type BankKeeper interface {
|
||||
SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
|
||||
GetModuleAccount(ctx sdk.Context, moduleName string) exported.ModuleAccountI
|
||||
GetModuleAddress(moduleName string) sdk.AccAddress
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,45 @@ func (m *BaseAccount) XXX_DiscardUnknown() {
|
|||
|
||||
var xxx_messageInfo_BaseAccount proto.InternalMessageInfo
|
||||
|
||||
// ModuleAccount defines an account for modules that holds coins on a pool
|
||||
type ModuleAccount struct {
|
||||
*BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty" yaml:"base_account"`
|
||||
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
|
||||
Permissions []string `protobuf:"bytes,3,rep,name=permissions,proto3" json:"permissions,omitempty"`
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) Reset() { *m = ModuleAccount{} }
|
||||
func (*ModuleAccount) ProtoMessage() {}
|
||||
func (*ModuleAccount) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_2d526fa662daab74, []int{1}
|
||||
}
|
||||
func (m *ModuleAccount) XXX_Unmarshal(b []byte) error {
|
||||
return m.Unmarshal(b)
|
||||
}
|
||||
func (m *ModuleAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||
if deterministic {
|
||||
return xxx_messageInfo_ModuleAccount.Marshal(b, m, deterministic)
|
||||
} else {
|
||||
b = b[:cap(b)]
|
||||
n, err := m.MarshalToSizedBuffer(b)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return b[:n], nil
|
||||
}
|
||||
}
|
||||
func (m *ModuleAccount) XXX_Merge(src proto.Message) {
|
||||
xxx_messageInfo_ModuleAccount.Merge(m, src)
|
||||
}
|
||||
func (m *ModuleAccount) XXX_Size() int {
|
||||
return m.Size()
|
||||
}
|
||||
func (m *ModuleAccount) XXX_DiscardUnknown() {
|
||||
xxx_messageInfo_ModuleAccount.DiscardUnknown(m)
|
||||
}
|
||||
|
||||
var xxx_messageInfo_ModuleAccount proto.InternalMessageInfo
|
||||
|
||||
// Params defines the parameters for the auth module.
|
||||
type Params struct {
|
||||
MaxMemoCharacters uint64 `protobuf:"varint,1,opt,name=max_memo_characters,json=maxMemoCharacters,proto3" json:"max_memo_characters,omitempty" yaml:"max_memo_characters"`
|
||||
|
|
@ -78,7 +117,7 @@ type Params struct {
|
|||
func (m *Params) Reset() { *m = Params{} }
|
||||
func (*Params) ProtoMessage() {}
|
||||
func (*Params) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_2d526fa662daab74, []int{1}
|
||||
return fileDescriptor_2d526fa662daab74, []int{2}
|
||||
}
|
||||
func (m *Params) XXX_Unmarshal(b []byte) error {
|
||||
return m.Unmarshal(b)
|
||||
|
|
@ -144,48 +183,54 @@ func (m *Params) GetSigVerifyCostSecp256k1() uint64 {
|
|||
|
||||
func init() {
|
||||
proto.RegisterType((*BaseAccount)(nil), "cosmos_sdk.x.auth.v1.BaseAccount")
|
||||
proto.RegisterType((*ModuleAccount)(nil), "cosmos_sdk.x.auth.v1.ModuleAccount")
|
||||
proto.RegisterType((*Params)(nil), "cosmos_sdk.x.auth.v1.Params")
|
||||
}
|
||||
|
||||
func init() { proto.RegisterFile("x/auth/types/types.proto", fileDescriptor_2d526fa662daab74) }
|
||||
|
||||
var fileDescriptor_2d526fa662daab74 = []byte{
|
||||
// 558 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0x3f, 0x6f, 0xd3, 0x40,
|
||||
0x14, 0x8f, 0xdb, 0xd0, 0x56, 0x47, 0x41, 0xaa, 0x9b, 0xb6, 0x6e, 0x85, 0x7c, 0x91, 0x07, 0x54,
|
||||
0x24, 0x9a, 0x28, 0x45, 0x41, 0x6a, 0x06, 0x44, 0x1c, 0x60, 0x29, 0x54, 0x95, 0x23, 0x31, 0xb0,
|
||||
0x58, 0xe7, 0xf3, 0xe1, 0x58, 0xc9, 0xe5, 0x5c, 0xdf, 0xb9, 0xb2, 0xfb, 0x09, 0x10, 0x13, 0x23,
|
||||
0x63, 0x3e, 0x0e, 0x63, 0x47, 0x26, 0x83, 0x92, 0x05, 0x31, 0x7a, 0x64, 0x42, 0xf6, 0xa5, 0x69,
|
||||
0x52, 0x05, 0x16, 0xdb, 0xef, 0xfd, 0xfe, 0x9d, 0x9e, 0xef, 0x01, 0x2d, 0xae, 0xa3, 0x48, 0xf4,
|
||||
0xea, 0x22, 0x09, 0x08, 0x97, 0xcf, 0x5a, 0x10, 0x32, 0xc1, 0xd4, 0x0a, 0x66, 0x9c, 0x32, 0x6e,
|
||||
0x73, 0xb7, 0x5f, 0x8b, 0x6b, 0x39, 0xa9, 0x76, 0xd9, 0x38, 0x78, 0x2c, 0x7a, 0x7e, 0xe8, 0xda,
|
||||
0x01, 0x0a, 0x45, 0x52, 0x2f, 0x88, 0x75, 0x8f, 0x79, 0xec, 0xf6, 0x4b, 0xaa, 0x8d, 0xcf, 0x2b,
|
||||
0xe0, 0xbe, 0x89, 0x38, 0x69, 0x63, 0xcc, 0xa2, 0xa1, 0x50, 0x4f, 0xc1, 0x3a, 0x72, 0xdd, 0x90,
|
||||
0x70, 0xae, 0x29, 0x55, 0xe5, 0x70, 0xd3, 0x6c, 0xfc, 0x49, 0xe1, 0x91, 0xe7, 0x8b, 0x5e, 0xe4,
|
||||
0xd4, 0x30, 0xa3, 0x75, 0x99, 0x36, 0x7d, 0x1d, 0x71, 0xb7, 0x3f, 0x3d, 0x4c, 0x1b, 0xe3, 0xb6,
|
||||
0x14, 0x5a, 0x37, 0x0e, 0xea, 0x1b, 0xb0, 0x1e, 0x44, 0x8e, 0xdd, 0x27, 0x89, 0xb6, 0x52, 0x98,
|
||||
0x1d, 0xfd, 0x4e, 0x61, 0x25, 0x88, 0x9c, 0x81, 0x8f, 0xf3, 0xee, 0x53, 0x46, 0x7d, 0x41, 0x68,
|
||||
0x20, 0x92, 0x2c, 0x85, 0x5b, 0x09, 0xa2, 0x83, 0x96, 0x71, 0x8b, 0x1a, 0xd6, 0x5a, 0x10, 0x39,
|
||||
0xa7, 0x24, 0x51, 0x5f, 0x82, 0x87, 0x48, 0x9e, 0xcf, 0x1e, 0x46, 0xd4, 0x21, 0xa1, 0xb6, 0x5a,
|
||||
0x55, 0x0e, 0xcb, 0xe6, 0x7e, 0x96, 0xc2, 0x1d, 0x29, 0x5b, 0xc4, 0x0d, 0xeb, 0xc1, 0xb4, 0x71,
|
||||
0x56, 0xd4, 0xea, 0x01, 0xd8, 0xe0, 0xe4, 0x22, 0x22, 0x43, 0x4c, 0xb4, 0x72, 0xae, 0xb5, 0x66,
|
||||
0x75, 0x6b, 0xe3, 0xd3, 0x08, 0x96, 0xbe, 0x8e, 0x60, 0xc9, 0xf8, 0xb1, 0x0a, 0xd6, 0xce, 0x51,
|
||||
0x88, 0x28, 0x57, 0xcf, 0xc0, 0x36, 0x45, 0xb1, 0x4d, 0x09, 0x65, 0x36, 0xee, 0xa1, 0x10, 0x61,
|
||||
0x41, 0x42, 0x39, 0x93, 0xb2, 0xa9, 0x67, 0x29, 0x3c, 0x90, 0xb9, 0x4b, 0x48, 0x86, 0xb5, 0x45,
|
||||
0x51, 0xfc, 0x8e, 0x50, 0xd6, 0x99, 0xf5, 0xd4, 0x13, 0xb0, 0x29, 0x62, 0x9b, 0xfb, 0x9e, 0x3d,
|
||||
0xf0, 0xa9, 0x2f, 0x8a, 0x79, 0x94, 0xcd, 0xbd, 0x2c, 0x85, 0xdb, 0xd2, 0x68, 0x1e, 0x35, 0x2c,
|
||||
0x20, 0xe2, 0xae, 0xef, 0xbd, 0xcd, 0x0b, 0xd5, 0x02, 0x3b, 0x05, 0x78, 0x45, 0x6c, 0xcc, 0xb8,
|
||||
0xb0, 0x03, 0x12, 0xda, 0x4e, 0x22, 0xc8, 0x74, 0x08, 0xd5, 0x2c, 0x85, 0x8f, 0xe6, 0x3c, 0xee,
|
||||
0xd2, 0x0c, 0x6b, 0x2b, 0x37, 0xbb, 0x22, 0x1d, 0xc6, 0xc5, 0x39, 0x09, 0xcd, 0x44, 0x10, 0xf5,
|
||||
0x02, 0xec, 0xe5, 0x69, 0x97, 0x24, 0xf4, 0x3f, 0x26, 0x92, 0x4f, 0xdc, 0xe3, 0x66, 0xb3, 0x71,
|
||||
0x22, 0xc7, 0x63, 0xb6, 0xc6, 0x29, 0xac, 0x74, 0x7d, 0xef, 0x7d, 0xc1, 0xc8, 0xa5, 0xaf, 0x5f,
|
||||
0x15, 0x78, 0x96, 0x42, 0x5d, 0xa6, 0xfd, 0xc3, 0xc0, 0xb0, 0x2a, 0x7c, 0x41, 0x27, 0xdb, 0x6a,
|
||||
0x02, 0xf6, 0xef, 0x2a, 0x38, 0xc1, 0xc1, 0x71, 0xf3, 0x79, 0xbf, 0xa1, 0xdd, 0x2b, 0x42, 0x5f,
|
||||
0x8c, 0x53, 0xb8, 0xbb, 0x10, 0xda, 0xbd, 0x61, 0x64, 0x29, 0xac, 0x2e, 0x8f, 0x9d, 0x99, 0x18,
|
||||
0xd6, 0x2e, 0x5f, 0xaa, 0x6d, 0x6d, 0xe4, 0x7f, 0xf7, 0xd7, 0x08, 0x2a, 0x66, 0xe7, 0xdb, 0x58,
|
||||
0x57, 0xae, 0xc7, 0xba, 0xf2, 0x73, 0xac, 0x2b, 0x5f, 0x26, 0x7a, 0xe9, 0x7a, 0xa2, 0x97, 0xbe,
|
||||
0x4f, 0xf4, 0xd2, 0x87, 0x27, 0xff, 0xbd, 0xe3, 0xf3, 0xdb, 0xe7, 0xac, 0x15, 0xab, 0xf3, 0xec,
|
||||
0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x8c, 0x0a, 0xa8, 0x94, 0x03, 0x00, 0x00,
|
||||
// 640 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xbf, 0x6f, 0xd3, 0x40,
|
||||
0x14, 0x8e, 0x9b, 0xd0, 0x1f, 0x97, 0x16, 0xa9, 0x6e, 0xda, 0xba, 0x05, 0xf9, 0x82, 0x07, 0x54,
|
||||
0x24, 0xea, 0x28, 0x45, 0x45, 0x6a, 0x06, 0x44, 0x5d, 0x60, 0x29, 0xad, 0xaa, 0xab, 0xc4, 0xc0,
|
||||
0x62, 0x9d, 0xed, 0x23, 0xb1, 0x92, 0xcb, 0xb9, 0xbe, 0x73, 0x15, 0xf7, 0x2f, 0x40, 0x4c, 0x8c,
|
||||
0x8c, 0xfd, 0x1b, 0xf8, 0x2b, 0x18, 0x3b, 0x32, 0x19, 0x94, 0x2e, 0x88, 0xd1, 0x23, 0x13, 0xb2,
|
||||
0x2f, 0x4d, 0x9d, 0x2a, 0xb0, 0xd8, 0xf7, 0xde, 0xfb, 0xbe, 0xef, 0x3d, 0x7f, 0x4f, 0x67, 0xa0,
|
||||
0x0d, 0x1a, 0x38, 0x12, 0x9d, 0x86, 0x88, 0x03, 0xc2, 0xe5, 0xd3, 0x0c, 0x42, 0x26, 0x98, 0x5a,
|
||||
0x73, 0x19, 0xa7, 0x8c, 0xdb, 0xdc, 0xeb, 0x9a, 0x03, 0x33, 0x03, 0x99, 0xe7, 0xcd, 0xcd, 0xc7,
|
||||
0xa2, 0xe3, 0x87, 0x9e, 0x1d, 0xe0, 0x50, 0xc4, 0x8d, 0x1c, 0xd8, 0x68, 0xb3, 0x36, 0xbb, 0x3d,
|
||||
0x49, 0xb6, 0xf1, 0x69, 0x06, 0x54, 0x2d, 0xcc, 0xc9, 0xbe, 0xeb, 0xb2, 0xa8, 0x2f, 0xd4, 0x43,
|
||||
0x30, 0x87, 0x3d, 0x2f, 0x24, 0x9c, 0x6b, 0x4a, 0x5d, 0xd9, 0x5a, 0xb4, 0x9a, 0x7f, 0x12, 0xb8,
|
||||
0xdd, 0xf6, 0x45, 0x27, 0x72, 0x4c, 0x97, 0xd1, 0x86, 0xec, 0x36, 0x7a, 0x6d, 0x73, 0xaf, 0x3b,
|
||||
0x1a, 0x66, 0xdf, 0x75, 0xf7, 0x25, 0x11, 0xdd, 0x28, 0xa8, 0x6f, 0xc0, 0x5c, 0x10, 0x39, 0x76,
|
||||
0x97, 0xc4, 0xda, 0x4c, 0x2e, 0xb6, 0xfd, 0x3b, 0x81, 0xb5, 0x20, 0x72, 0x7a, 0xbe, 0x9b, 0x65,
|
||||
0x9f, 0x32, 0xea, 0x0b, 0x42, 0x03, 0x11, 0xa7, 0x09, 0x5c, 0x8e, 0x31, 0xed, 0xb5, 0x8c, 0xdb,
|
||||
0xaa, 0x81, 0x66, 0x83, 0xc8, 0x39, 0x24, 0xb1, 0xfa, 0x12, 0xdc, 0xc7, 0x72, 0x3e, 0xbb, 0x1f,
|
||||
0x51, 0x87, 0x84, 0x5a, 0xb9, 0xae, 0x6c, 0x55, 0xac, 0x8d, 0x34, 0x81, 0xab, 0x92, 0x36, 0x59,
|
||||
0x37, 0xd0, 0xd2, 0x28, 0x71, 0x9c, 0xc7, 0xea, 0x26, 0x98, 0xe7, 0xe4, 0x2c, 0x22, 0x7d, 0x97,
|
||||
0x68, 0x95, 0x8c, 0x8b, 0xc6, 0x71, 0x6b, 0xfe, 0xe3, 0x25, 0x2c, 0x7d, 0xb9, 0x84, 0x25, 0xe3,
|
||||
0xab, 0x02, 0x96, 0x8e, 0x98, 0x17, 0xf5, 0xc6, 0x76, 0x60, 0xb0, 0xe8, 0x60, 0x4e, 0xec, 0x91,
|
||||
0x5a, 0xee, 0x49, 0x75, 0xe7, 0x91, 0x39, 0xcd, 0x73, 0xb3, 0xe0, 0xa3, 0xf5, 0xe0, 0x2a, 0x81,
|
||||
0x4a, 0x9a, 0xc0, 0x15, 0x39, 0x5e, 0x51, 0xc4, 0x40, 0x55, 0xa7, 0xe0, 0xb8, 0x0a, 0x2a, 0x7d,
|
||||
0x4c, 0x49, 0xee, 0xd0, 0x02, 0xca, 0xcf, 0x6a, 0x1d, 0x54, 0x03, 0x12, 0x52, 0x9f, 0x73, 0x9f,
|
||||
0xf5, 0xb9, 0x56, 0xae, 0x97, 0xb7, 0x16, 0x50, 0x31, 0x55, 0x18, 0xfa, 0x47, 0x19, 0xcc, 0x9e,
|
||||
0xe0, 0x10, 0x53, 0xae, 0x1e, 0x83, 0x15, 0x8a, 0x07, 0x36, 0x25, 0x94, 0xd9, 0x6e, 0x07, 0x87,
|
||||
0xd8, 0x15, 0x24, 0x94, 0x8b, 0xac, 0x58, 0x7a, 0x9a, 0xc0, 0x4d, 0x39, 0xcd, 0x14, 0x90, 0x81,
|
||||
0x96, 0x29, 0x1e, 0x1c, 0x11, 0xca, 0x0e, 0xc6, 0x39, 0x75, 0x0f, 0x2c, 0x8a, 0x81, 0xcd, 0xfd,
|
||||
0xb6, 0xdd, 0xf3, 0xa9, 0x2f, 0xf2, 0x11, 0x2b, 0xd6, 0xfa, 0xed, 0x67, 0x15, 0xab, 0x06, 0x02,
|
||||
0x62, 0x70, 0xea, 0xb7, 0xdf, 0x66, 0x81, 0x8a, 0xc0, 0x6a, 0x5e, 0xbc, 0x20, 0xb6, 0xcb, 0xb8,
|
||||
0xb0, 0x03, 0x12, 0xda, 0x4e, 0x2c, 0xc8, 0x68, 0x73, 0xf5, 0x34, 0x81, 0x0f, 0x0b, 0x1a, 0x77,
|
||||
0x61, 0x06, 0x5a, 0xce, 0xc4, 0x2e, 0xc8, 0x01, 0xe3, 0xe2, 0x84, 0x84, 0x56, 0x2c, 0x88, 0x7a,
|
||||
0x06, 0xd6, 0xb3, 0x6e, 0xe7, 0x24, 0xf4, 0x3f, 0xc4, 0x12, 0x4f, 0xbc, 0x9d, 0xdd, 0xdd, 0xe6,
|
||||
0x9e, 0xdc, 0xa9, 0xd5, 0x1a, 0x26, 0xb0, 0x76, 0xea, 0xb7, 0xdf, 0xe5, 0x88, 0x8c, 0xfa, 0xfa,
|
||||
0x55, 0x5e, 0x4f, 0x13, 0xa8, 0xcb, 0x6e, 0xff, 0x10, 0x30, 0x50, 0x8d, 0x4f, 0xf0, 0x64, 0x5a,
|
||||
0x8d, 0xc1, 0xc6, 0x5d, 0x06, 0x27, 0x6e, 0xb0, 0xb3, 0xfb, 0xbc, 0xdb, 0xd4, 0xee, 0xe5, 0x4d,
|
||||
0x5f, 0x0c, 0x13, 0xb8, 0x36, 0xd1, 0xf4, 0xf4, 0x06, 0x91, 0x26, 0xb0, 0x3e, 0xbd, 0xed, 0x58,
|
||||
0xc4, 0x40, 0x6b, 0x7c, 0x2a, 0xb7, 0x35, 0x9f, 0x6d, 0xf7, 0xd7, 0x25, 0x54, 0xac, 0x83, 0x6f,
|
||||
0x43, 0x5d, 0xb9, 0x1a, 0xea, 0xca, 0xcf, 0xa1, 0xae, 0x7c, 0xbe, 0xd6, 0x4b, 0x57, 0xd7, 0x7a,
|
||||
0xe9, 0xfb, 0xb5, 0x5e, 0x7a, 0xff, 0xe4, 0xbf, 0x17, 0xb3, 0xf8, 0xcb, 0x70, 0x66, 0xf3, 0xfb,
|
||||
0xfe, 0xec, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc6, 0x00, 0xf0, 0x01, 0x49, 0x04, 0x00, 0x00,
|
||||
}
|
||||
|
||||
func (this *Params) Equal(that interface{}) bool {
|
||||
|
|
@ -271,6 +316,57 @@ func (m *BaseAccount) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
|||
return len(dAtA) - i, nil
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) Marshal() (dAtA []byte, err error) {
|
||||
size := m.Size()
|
||||
dAtA = make([]byte, size)
|
||||
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return dAtA[:n], nil
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) MarshalTo(dAtA []byte) (int, error) {
|
||||
size := m.Size()
|
||||
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||
i := len(dAtA)
|
||||
_ = i
|
||||
var l int
|
||||
_ = l
|
||||
if len(m.Permissions) > 0 {
|
||||
for iNdEx := len(m.Permissions) - 1; iNdEx >= 0; iNdEx-- {
|
||||
i -= len(m.Permissions[iNdEx])
|
||||
copy(dAtA[i:], m.Permissions[iNdEx])
|
||||
i = encodeVarintTypes(dAtA, i, uint64(len(m.Permissions[iNdEx])))
|
||||
i--
|
||||
dAtA[i] = 0x1a
|
||||
}
|
||||
}
|
||||
if len(m.Name) > 0 {
|
||||
i -= len(m.Name)
|
||||
copy(dAtA[i:], m.Name)
|
||||
i = encodeVarintTypes(dAtA, i, uint64(len(m.Name)))
|
||||
i--
|
||||
dAtA[i] = 0x12
|
||||
}
|
||||
if m.BaseAccount != nil {
|
||||
{
|
||||
size, err := m.BaseAccount.MarshalToSizedBuffer(dAtA[:i])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
i -= size
|
||||
i = encodeVarintTypes(dAtA, i, uint64(size))
|
||||
}
|
||||
i--
|
||||
dAtA[i] = 0xa
|
||||
}
|
||||
return len(dAtA) - i, nil
|
||||
}
|
||||
|
||||
func (m *Params) Marshal() (dAtA []byte, err error) {
|
||||
size := m.Size()
|
||||
dAtA = make([]byte, size)
|
||||
|
|
@ -353,6 +449,29 @@ func (m *BaseAccount) Size() (n int) {
|
|||
return n
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) Size() (n int) {
|
||||
if m == nil {
|
||||
return 0
|
||||
}
|
||||
var l int
|
||||
_ = l
|
||||
if m.BaseAccount != nil {
|
||||
l = m.BaseAccount.Size()
|
||||
n += 1 + l + sovTypes(uint64(l))
|
||||
}
|
||||
l = len(m.Name)
|
||||
if l > 0 {
|
||||
n += 1 + l + sovTypes(uint64(l))
|
||||
}
|
||||
if len(m.Permissions) > 0 {
|
||||
for _, s := range m.Permissions {
|
||||
l = len(s)
|
||||
n += 1 + l + sovTypes(uint64(l))
|
||||
}
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
func (m *Params) Size() (n int) {
|
||||
if m == nil {
|
||||
return 0
|
||||
|
|
@ -542,6 +661,159 @@ func (m *BaseAccount) Unmarshal(dAtA []byte) error {
|
|||
}
|
||||
return nil
|
||||
}
|
||||
func (m *ModuleAccount) Unmarshal(dAtA []byte) error {
|
||||
l := len(dAtA)
|
||||
iNdEx := 0
|
||||
for iNdEx < l {
|
||||
preIndex := iNdEx
|
||||
var wire uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowTypes
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
wire |= uint64(b&0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
fieldNum := int32(wire >> 3)
|
||||
wireType := int(wire & 0x7)
|
||||
if wireType == 4 {
|
||||
return fmt.Errorf("proto: ModuleAccount: wiretype end group for non-group")
|
||||
}
|
||||
if fieldNum <= 0 {
|
||||
return fmt.Errorf("proto: ModuleAccount: illegal tag %d (wire type %d)", fieldNum, wire)
|
||||
}
|
||||
switch fieldNum {
|
||||
case 1:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field BaseAccount", wireType)
|
||||
}
|
||||
var msglen int
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowTypes
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
msglen |= int(b&0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
if msglen < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
postIndex := iNdEx + msglen
|
||||
if postIndex < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
if m.BaseAccount == nil {
|
||||
m.BaseAccount = &BaseAccount{}
|
||||
}
|
||||
if err := m.BaseAccount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
|
||||
return err
|
||||
}
|
||||
iNdEx = postIndex
|
||||
case 2:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
|
||||
}
|
||||
var stringLen uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowTypes
|
||||
}
|
||||
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 ErrInvalidLengthTypes
|
||||
}
|
||||
postIndex := iNdEx + intStringLen
|
||||
if postIndex < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.Name = string(dAtA[iNdEx:postIndex])
|
||||
iNdEx = postIndex
|
||||
case 3:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field Permissions", wireType)
|
||||
}
|
||||
var stringLen uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowTypes
|
||||
}
|
||||
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 ErrInvalidLengthTypes
|
||||
}
|
||||
postIndex := iNdEx + intStringLen
|
||||
if postIndex < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.Permissions = append(m.Permissions, string(dAtA[iNdEx:postIndex]))
|
||||
iNdEx = postIndex
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
skippy, err := skipTypes(dAtA[iNdEx:])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if skippy < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if (iNdEx + skippy) < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if (iNdEx + skippy) > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
iNdEx += skippy
|
||||
}
|
||||
}
|
||||
|
||||
if iNdEx > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
return nil
|
||||
}
|
||||
func (m *Params) Unmarshal(dAtA []byte) error {
|
||||
l := len(dAtA)
|
||||
iNdEx := 0
|
||||
|
|
|
|||
|
|
@ -18,6 +18,16 @@ message BaseAccount {
|
|||
uint64 sequence = 4;
|
||||
}
|
||||
|
||||
// ModuleAccount defines an account for modules that holds coins on a pool
|
||||
message ModuleAccount {
|
||||
option (gogoproto.goproto_getters) = false;
|
||||
option (gogoproto.goproto_stringer) = false;
|
||||
|
||||
BaseAccount base_account = 1 [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""];
|
||||
string name = 2;
|
||||
repeated string permissions = 3;
|
||||
}
|
||||
|
||||
// Params defines the parameters for the auth module.
|
||||
message Params {
|
||||
option (gogoproto.equal) = true;
|
||||
|
|
@ -27,8 +37,7 @@ message Params {
|
|||
uint64 tx_sig_limit = 2 [(gogoproto.moretags) = "yaml:\"tx_sig_limit\""];
|
||||
uint64 tx_size_cost_per_byte = 3 [(gogoproto.moretags) = "yaml:\"tx_size_cost_per_byte\""];
|
||||
uint64 sig_verify_cost_ed25519 = 4
|
||||
[(gogoproto.customname) = "SigVerifyCostED25519", (gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\""];
|
||||
[(gogoproto.customname) = "SigVerifyCostED25519", (gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\""];
|
||||
uint64 sig_verify_cost_secp256k1 = 5
|
||||
[(gogoproto.customname) = "SigVerifyCostSecp256k1", (gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\""];
|
||||
[(gogoproto.customname) = "SigVerifyCostSecp256k1", (gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\""];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,9 +22,6 @@ const (
|
|||
StoreKey = types.StoreKey
|
||||
RouterKey = types.RouterKey
|
||||
QuerierRoute = types.QuerierRoute
|
||||
Minter = types.Minter
|
||||
Burner = types.Burner
|
||||
Staking = types.Staking
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
@ -57,9 +54,6 @@ var (
|
|||
AddressFromBalancesStore = types.AddressFromBalancesStore
|
||||
AllInvariants = keeper.AllInvariants
|
||||
TotalSupply = keeper.TotalSupply
|
||||
NewModuleAddress = types.NewModuleAddress
|
||||
NewEmptyModuleAccount = types.NewEmptyModuleAccount
|
||||
NewModuleAccount = types.NewModuleAccount
|
||||
NewSupply = types.NewSupply
|
||||
DefaultSupply = types.DefaultSupply
|
||||
)
|
||||
|
|
@ -79,7 +73,6 @@ type (
|
|||
QueryAllBalancesParams = types.QueryAllBalancesParams
|
||||
GenesisBalancesIterator = types.GenesisBalancesIterator
|
||||
Keeper = keeper.Keeper
|
||||
ModuleAccount = types.ModuleAccount
|
||||
GenesisState = types.GenesisState
|
||||
Supply = types.Supply
|
||||
Codec = types.Codec
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import (
|
|||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
"github.com/cosmos/cosmos-sdk/x/distribution"
|
||||
|
||||
abci "github.com/tendermint/tendermint/abci/types"
|
||||
|
|
@ -147,7 +146,7 @@ func TestSendToModuleAcc(t *testing.T) {
|
|||
{
|
||||
name: "Allowed module account can be the recipient of bank sends",
|
||||
fromBalance: coins,
|
||||
msg: types.NewMsgSend(addr1, bank.NewModuleAddress(distribution.ModuleName), coins),
|
||||
msg: types.NewMsgSend(addr1, auth.NewModuleAddress(distribution.ModuleName), coins),
|
||||
expPass: true,
|
||||
expSimPass: true,
|
||||
expFromBalance: sdk.NewCoins(),
|
||||
|
|
|
|||
|
|
@ -10,11 +10,10 @@ import (
|
|||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
"github.com/cosmos/cosmos-sdk/x/staking"
|
||||
)
|
||||
|
||||
var moduleAccAddr = bank.NewModuleAddress(staking.BondedPoolName)
|
||||
var moduleAccAddr = auth.NewModuleAddress(staking.BondedPoolName)
|
||||
|
||||
func BenchmarkOneBankSendTxPerBlock(b *testing.B) {
|
||||
// Add an account at genesis
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package exported
|
|||
|
||||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
)
|
||||
|
||||
// GenesisBalance defines a genesis balance interface that allows for account
|
||||
|
|
@ -12,16 +11,6 @@ type GenesisBalance interface {
|
|||
GetCoins() sdk.Coins
|
||||
}
|
||||
|
||||
// ModuleAccountI defines an account interface for modules that hold tokens in
|
||||
// an escrow.
|
||||
type ModuleAccountI interface {
|
||||
authexported.Account
|
||||
|
||||
GetName() string
|
||||
GetPermissions() []string
|
||||
HasPermission(string) bool
|
||||
}
|
||||
|
||||
// SupplyI defines an inflationary supply interface for modules that handle
|
||||
// token supply.
|
||||
type SupplyI interface {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import (
|
|||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/types"
|
||||
|
|
@ -22,14 +23,6 @@ type Keeper interface {
|
|||
GetSupply(ctx sdk.Context) exported.SupplyI
|
||||
SetSupply(ctx sdk.Context, supply exported.SupplyI)
|
||||
|
||||
ValidatePermissions(macc exported.ModuleAccountI) error
|
||||
|
||||
GetModuleAddress(moduleName string) sdk.AccAddress
|
||||
GetModuleAddressAndPermissions(moduleName string) (addr sdk.AccAddress, permissions []string)
|
||||
GetModuleAccountAndPermissions(ctx sdk.Context, moduleName string) (exported.ModuleAccountI, []string)
|
||||
GetModuleAccount(ctx sdk.Context, moduleName string) exported.ModuleAccountI
|
||||
SetModuleAccount(ctx sdk.Context, macc exported.ModuleAccountI)
|
||||
|
||||
SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
SendCoinsFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error
|
||||
SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
|
||||
|
|
@ -50,12 +43,11 @@ type BaseKeeper struct {
|
|||
cdc types.Codec
|
||||
storeKey sdk.StoreKey
|
||||
paramSpace paramtypes.Subspace
|
||||
permAddrs map[string]types.PermissionsForAddress
|
||||
}
|
||||
|
||||
func NewBaseKeeper(
|
||||
cdc types.Codec, storeKey sdk.StoreKey, ak types.AccountKeeper, paramSpace paramtypes.Subspace,
|
||||
blacklistedAddrs map[string]bool, maccPerms map[string][]string,
|
||||
blacklistedAddrs map[string]bool,
|
||||
) BaseKeeper {
|
||||
|
||||
// set KeyTable if it has not already been set
|
||||
|
|
@ -63,18 +55,12 @@ func NewBaseKeeper(
|
|||
paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable())
|
||||
}
|
||||
|
||||
permAddrs := make(map[string]types.PermissionsForAddress)
|
||||
for name, perms := range maccPerms {
|
||||
permAddrs[name] = types.NewPermissionsForAddress(name, perms)
|
||||
}
|
||||
|
||||
return BaseKeeper{
|
||||
BaseSendKeeper: NewBaseSendKeeper(cdc, storeKey, ak, paramSpace, blacklistedAddrs),
|
||||
ak: ak,
|
||||
cdc: cdc,
|
||||
storeKey: storeKey,
|
||||
paramSpace: paramSpace,
|
||||
permAddrs: permAddrs,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -181,83 +167,13 @@ func (k BaseKeeper) SetSupply(ctx sdk.Context, supply exported.SupplyI) {
|
|||
store.Set(types.SupplyKey, bz)
|
||||
}
|
||||
|
||||
// ValidatePermissions validates that the module account has been granted
|
||||
// permissions within its set of allowed permissions.
|
||||
func (k BaseKeeper) ValidatePermissions(macc exported.ModuleAccountI) error {
|
||||
permAddr := k.permAddrs[macc.GetName()]
|
||||
for _, perm := range macc.GetPermissions() {
|
||||
if !permAddr.HasPermission(perm) {
|
||||
return fmt.Errorf("invalid module permission %s", perm)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetModuleAddress returns an address based on the module name
|
||||
func (k BaseKeeper) GetModuleAddress(moduleName string) sdk.AccAddress {
|
||||
permAddr, ok := k.permAddrs[moduleName]
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
return permAddr.GetAddress()
|
||||
}
|
||||
|
||||
// GetModuleAddressAndPermissions returns an address and permissions based on the module name
|
||||
func (k BaseKeeper) GetModuleAddressAndPermissions(moduleName string) (addr sdk.AccAddress, permissions []string) {
|
||||
permAddr, ok := k.permAddrs[moduleName]
|
||||
if !ok {
|
||||
return addr, permissions
|
||||
}
|
||||
|
||||
return permAddr.GetAddress(), permAddr.GetPermissions()
|
||||
}
|
||||
|
||||
// GetModuleAccountAndPermissions gets the module account from the auth account store and its
|
||||
// registered permissions
|
||||
func (k BaseKeeper) GetModuleAccountAndPermissions(ctx sdk.Context, moduleName string) (exported.ModuleAccountI, []string) {
|
||||
addr, perms := k.GetModuleAddressAndPermissions(moduleName)
|
||||
if addr == nil {
|
||||
return nil, []string{}
|
||||
}
|
||||
|
||||
acc := k.ak.GetAccount(ctx, addr)
|
||||
if acc != nil {
|
||||
macc, ok := acc.(exported.ModuleAccountI)
|
||||
if !ok {
|
||||
panic("account is not a module account")
|
||||
}
|
||||
return macc, perms
|
||||
}
|
||||
|
||||
// create a new module account
|
||||
macc := types.NewEmptyModuleAccount(moduleName, perms...)
|
||||
maccI := (k.ak.NewAccount(ctx, macc)).(exported.ModuleAccountI) // set the account number
|
||||
k.SetModuleAccount(ctx, maccI)
|
||||
|
||||
return maccI, perms
|
||||
}
|
||||
|
||||
// GetModuleAccount gets the module account from the auth account store, if the account does not
|
||||
// exist in the AccountKeeper, then it is created.
|
||||
func (k BaseKeeper) GetModuleAccount(ctx sdk.Context, moduleName string) exported.ModuleAccountI {
|
||||
acc, _ := k.GetModuleAccountAndPermissions(ctx, moduleName)
|
||||
return acc
|
||||
}
|
||||
|
||||
// SetModuleAccount sets the module account to the auth account store
|
||||
func (k BaseKeeper) SetModuleAccount(ctx sdk.Context, macc exported.ModuleAccountI) { //nolint:interfacer
|
||||
k.ak.SetAccount(ctx, macc)
|
||||
}
|
||||
|
||||
// SendCoinsFromModuleToAccount transfers coins from a ModuleAccount to an AccAddress.
|
||||
// It will panic if the module account does not exist.
|
||||
func (k BaseKeeper) SendCoinsFromModuleToAccount(
|
||||
ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins,
|
||||
) error {
|
||||
|
||||
senderAddr := k.GetModuleAddress(senderModule)
|
||||
senderAddr := k.ak.GetModuleAddress(senderModule)
|
||||
if senderAddr == nil {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", senderModule))
|
||||
}
|
||||
|
|
@ -271,12 +187,12 @@ func (k BaseKeeper) SendCoinsFromModuleToModule(
|
|||
ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins,
|
||||
) error {
|
||||
|
||||
senderAddr := k.GetModuleAddress(senderModule)
|
||||
senderAddr := k.ak.GetModuleAddress(senderModule)
|
||||
if senderAddr == nil {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", senderModule))
|
||||
}
|
||||
|
||||
recipientAcc := k.GetModuleAccount(ctx, recipientModule)
|
||||
recipientAcc := k.ak.GetModuleAccount(ctx, recipientModule)
|
||||
if recipientAcc == nil {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", recipientModule))
|
||||
}
|
||||
|
|
@ -290,7 +206,7 @@ func (k BaseKeeper) SendCoinsFromAccountToModule(
|
|||
ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins,
|
||||
) error {
|
||||
|
||||
recipientAcc := k.GetModuleAccount(ctx, recipientModule)
|
||||
recipientAcc := k.ak.GetModuleAccount(ctx, recipientModule)
|
||||
if recipientAcc == nil {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", recipientModule))
|
||||
}
|
||||
|
|
@ -305,12 +221,12 @@ func (k BaseKeeper) DelegateCoinsFromAccountToModule(
|
|||
ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins,
|
||||
) error {
|
||||
|
||||
recipientAcc := k.GetModuleAccount(ctx, recipientModule)
|
||||
recipientAcc := k.ak.GetModuleAccount(ctx, recipientModule)
|
||||
if recipientAcc == nil {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", recipientModule))
|
||||
}
|
||||
|
||||
if !recipientAcc.HasPermission(types.Staking) {
|
||||
if !recipientAcc.HasPermission(auth.Staking) {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "module account %s does not have permissions to receive delegated coins", recipientModule))
|
||||
}
|
||||
|
||||
|
|
@ -324,12 +240,12 @@ func (k BaseKeeper) UndelegateCoinsFromModuleToAccount(
|
|||
ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins,
|
||||
) error {
|
||||
|
||||
acc := k.GetModuleAccount(ctx, senderModule)
|
||||
acc := k.ak.GetModuleAccount(ctx, senderModule)
|
||||
if acc == nil {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", senderModule))
|
||||
}
|
||||
|
||||
if !acc.HasPermission(types.Staking) {
|
||||
if !acc.HasPermission(auth.Staking) {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "module account %s does not have permissions to undelegate coins", senderModule))
|
||||
}
|
||||
|
||||
|
|
@ -339,12 +255,12 @@ func (k BaseKeeper) UndelegateCoinsFromModuleToAccount(
|
|||
// MintCoins creates new coins from thin air and adds it to the module account.
|
||||
// It will panic if the module account does not exist or is unauthorized.
|
||||
func (k BaseKeeper) MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error {
|
||||
acc := k.GetModuleAccount(ctx, moduleName)
|
||||
acc := k.ak.GetModuleAccount(ctx, moduleName)
|
||||
if acc == nil {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", moduleName))
|
||||
}
|
||||
|
||||
if !acc.HasPermission(types.Minter) {
|
||||
if !acc.HasPermission(auth.Minter) {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "module account %s does not have permissions to mint tokens", moduleName))
|
||||
}
|
||||
|
||||
|
|
@ -368,12 +284,12 @@ func (k BaseKeeper) MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins)
|
|||
// BurnCoins burns coins deletes coins from the balance of the module account.
|
||||
// It will panic if the module account does not exist or is unauthorized.
|
||||
func (k BaseKeeper) BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error {
|
||||
acc := k.GetModuleAccount(ctx, moduleName)
|
||||
acc := k.ak.GetModuleAccount(ctx, moduleName)
|
||||
if acc == nil {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "module account %s does not exist", moduleName))
|
||||
}
|
||||
|
||||
if !acc.HasPermission(types.Burner) {
|
||||
if !acc.HasPermission(auth.Burner) {
|
||||
panic(sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "module account %s does not have permissions to burn tokens", moduleName))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@ const (
|
|||
)
|
||||
|
||||
var (
|
||||
holderAcc = types.NewEmptyModuleAccount(holder)
|
||||
burnerAcc = types.NewEmptyModuleAccount(types.Burner, types.Burner)
|
||||
minterAcc = types.NewEmptyModuleAccount(types.Minter, types.Minter)
|
||||
multiPermAcc = types.NewEmptyModuleAccount(multiPerm, types.Burner, types.Minter, types.Staking)
|
||||
randomPermAcc = types.NewEmptyModuleAccount(randomPerm, "random")
|
||||
holderAcc = auth.NewEmptyModuleAccount(holder)
|
||||
burnerAcc = auth.NewEmptyModuleAccount(auth.Burner, auth.Burner)
|
||||
minterAcc = auth.NewEmptyModuleAccount(auth.Minter, auth.Minter)
|
||||
multiPermAcc = auth.NewEmptyModuleAccount(multiPerm, auth.Burner, auth.Minter, auth.Staking)
|
||||
randomPermAcc = auth.NewEmptyModuleAccount(randomPerm, "random")
|
||||
|
||||
initTokens = sdk.TokensFromConsensusPower(initialPower)
|
||||
initCoins = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, initTokens))
|
||||
|
|
@ -48,7 +48,7 @@ func newBarCoin(amt int64) sdk.Coin {
|
|||
|
||||
// nolint: interfacer
|
||||
func getCoinsByName(ctx sdk.Context, bk bank.Keeper, ak types.AccountKeeper, moduleName string) sdk.Coins {
|
||||
moduleAddress := bk.GetModuleAddress(moduleName)
|
||||
moduleAddress := ak.GetModuleAddress(moduleName)
|
||||
macc := ak.GetAccount(ctx, moduleAddress)
|
||||
if macc == nil {
|
||||
return sdk.Coins(nil)
|
||||
|
|
@ -75,35 +75,6 @@ func (suite *IntegrationTestSuite) SetupTest() {
|
|||
suite.ctx = ctx
|
||||
}
|
||||
|
||||
func (suite *IntegrationTestSuite) TestSupply_ValidatePermissions() {
|
||||
app := suite.app
|
||||
|
||||
// add module accounts to supply keeper
|
||||
maccPerms := simapp.GetMaccPerms()
|
||||
maccPerms[holder] = nil
|
||||
maccPerms[types.Burner] = []string{types.Burner}
|
||||
maccPerms[types.Minter] = []string{types.Minter}
|
||||
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
|
||||
maccPerms[randomPerm] = []string{"random"}
|
||||
|
||||
appCodec := codecstd.NewAppCodec(app.Codec())
|
||||
keeper := bank.NewBaseKeeper(
|
||||
appCodec, app.GetKey(types.StoreKey), app.AccountKeeper,
|
||||
app.GetSubspace(bank.ModuleName), make(map[string]bool), maccPerms,
|
||||
)
|
||||
|
||||
err := keeper.ValidatePermissions(multiPermAcc)
|
||||
suite.Require().NoError(err)
|
||||
|
||||
err = keeper.ValidatePermissions(randomPermAcc)
|
||||
suite.Require().NoError(err)
|
||||
|
||||
// unregistered permissions
|
||||
otherAcc := types.NewEmptyModuleAccount("other", "other")
|
||||
err = app.BankKeeper.ValidatePermissions(otherAcc)
|
||||
suite.Require().Error(err)
|
||||
}
|
||||
|
||||
func (suite *IntegrationTestSuite) TestSupply() {
|
||||
app, ctx := suite.app, suite.ctx
|
||||
|
||||
|
|
@ -125,30 +96,34 @@ func (suite *IntegrationTestSuite) TestSupply_SendCoins() {
|
|||
// add module accounts to supply keeper
|
||||
maccPerms := simapp.GetMaccPerms()
|
||||
maccPerms[holder] = nil
|
||||
maccPerms[types.Burner] = []string{types.Burner}
|
||||
maccPerms[types.Minter] = []string{types.Minter}
|
||||
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
|
||||
maccPerms[auth.Burner] = []string{auth.Burner}
|
||||
maccPerms[auth.Minter] = []string{auth.Minter}
|
||||
maccPerms[multiPerm] = []string{auth.Burner, auth.Minter, auth.Staking}
|
||||
maccPerms[randomPerm] = []string{"random"}
|
||||
|
||||
authKeeper := auth.NewAccountKeeper(
|
||||
appCodec, app.GetKey(types.StoreKey), app.GetSubspace(types.ModuleName),
|
||||
auth.ProtoBaseAccount, maccPerms,
|
||||
)
|
||||
keeper := bank.NewBaseKeeper(
|
||||
appCodec, app.GetKey(types.StoreKey), app.AccountKeeper,
|
||||
app.GetSubspace(bank.ModuleName), make(map[string]bool), maccPerms,
|
||||
appCodec, app.GetKey(types.StoreKey), authKeeper,
|
||||
app.GetSubspace(bank.ModuleName), make(map[string]bool),
|
||||
)
|
||||
|
||||
baseAcc := app.AccountKeeper.NewAccountWithAddress(ctx, types.NewModuleAddress("baseAcc"))
|
||||
baseAcc := authKeeper.NewAccountWithAddress(ctx, auth.NewModuleAddress("baseAcc"))
|
||||
suite.Require().NoError(keeper.SetBalances(ctx, holderAcc.GetAddress(), initCoins))
|
||||
keeper.SetSupply(ctx, types.NewSupply(initCoins))
|
||||
|
||||
keeper.SetModuleAccount(ctx, holderAcc)
|
||||
keeper.SetModuleAccount(ctx, burnerAcc)
|
||||
app.AccountKeeper.SetAccount(ctx, baseAcc)
|
||||
keeper.SetSupply(ctx, types.NewSupply(initCoins))
|
||||
authKeeper.SetModuleAccount(ctx, holderAcc)
|
||||
authKeeper.SetModuleAccount(ctx, burnerAcc)
|
||||
authKeeper.SetAccount(ctx, baseAcc)
|
||||
|
||||
suite.Require().Panics(func() {
|
||||
keeper.SendCoinsFromModuleToModule(ctx, "", holderAcc.GetName(), initCoins) // nolint:errcheck
|
||||
})
|
||||
|
||||
suite.Require().Panics(func() {
|
||||
keeper.SendCoinsFromModuleToModule(ctx, types.Burner, "", initCoins) // nolint:errcheck
|
||||
keeper.SendCoinsFromModuleToModule(ctx, auth.Burner, "", initCoins) // nolint:errcheck
|
||||
})
|
||||
|
||||
suite.Require().Panics(func() {
|
||||
|
|
@ -160,20 +135,20 @@ func (suite *IntegrationTestSuite) TestSupply_SendCoins() {
|
|||
)
|
||||
|
||||
suite.Require().NoError(
|
||||
keeper.SendCoinsFromModuleToModule(ctx, holderAcc.GetName(), types.Burner, initCoins),
|
||||
keeper.SendCoinsFromModuleToModule(ctx, holderAcc.GetName(), auth.Burner, initCoins),
|
||||
)
|
||||
suite.Require().Equal(sdk.Coins(nil), getCoinsByName(ctx, keeper, app.AccountKeeper, holderAcc.GetName()))
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, app.AccountKeeper, types.Burner))
|
||||
suite.Require().Equal(sdk.Coins(nil), getCoinsByName(ctx, keeper, authKeeper, holderAcc.GetName()))
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, authKeeper, auth.Burner))
|
||||
|
||||
suite.Require().NoError(
|
||||
keeper.SendCoinsFromModuleToAccount(ctx, types.Burner, baseAcc.GetAddress(), initCoins),
|
||||
keeper.SendCoinsFromModuleToAccount(ctx, auth.Burner, baseAcc.GetAddress(), initCoins),
|
||||
)
|
||||
suite.Require().Equal(sdk.Coins(nil), getCoinsByName(ctx, keeper, app.AccountKeeper, types.Burner))
|
||||
suite.Require().Equal(sdk.Coins(nil), getCoinsByName(ctx, keeper, authKeeper, auth.Burner))
|
||||
suite.Require().Equal(initCoins, keeper.GetAllBalances(ctx, baseAcc.GetAddress()))
|
||||
|
||||
suite.Require().NoError(keeper.SendCoinsFromAccountToModule(ctx, baseAcc.GetAddress(), types.Burner, initCoins))
|
||||
suite.Require().NoError(keeper.SendCoinsFromAccountToModule(ctx, baseAcc.GetAddress(), auth.Burner, initCoins))
|
||||
suite.Require().Equal(sdk.Coins(nil), keeper.GetAllBalances(ctx, baseAcc.GetAddress()))
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, app.AccountKeeper, types.Burner))
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, authKeeper, auth.Burner))
|
||||
}
|
||||
|
||||
func (suite *IntegrationTestSuite) TestSupply_MintCoins() {
|
||||
|
|
@ -184,35 +159,39 @@ func (suite *IntegrationTestSuite) TestSupply_MintCoins() {
|
|||
// add module accounts to supply keeper
|
||||
maccPerms := simapp.GetMaccPerms()
|
||||
maccPerms[holder] = nil
|
||||
maccPerms[types.Burner] = []string{types.Burner}
|
||||
maccPerms[types.Minter] = []string{types.Minter}
|
||||
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
|
||||
maccPerms[auth.Burner] = []string{auth.Burner}
|
||||
maccPerms[auth.Minter] = []string{auth.Minter}
|
||||
maccPerms[multiPerm] = []string{auth.Burner, auth.Minter, auth.Staking}
|
||||
maccPerms[randomPerm] = []string{"random"}
|
||||
|
||||
authKeeper := auth.NewAccountKeeper(
|
||||
appCodec, app.GetKey(types.StoreKey), app.GetSubspace(types.ModuleName),
|
||||
auth.ProtoBaseAccount, maccPerms,
|
||||
)
|
||||
keeper := bank.NewBaseKeeper(
|
||||
appCodec, app.GetKey(types.StoreKey), app.AccountKeeper,
|
||||
app.GetSubspace(bank.ModuleName), make(map[string]bool), maccPerms,
|
||||
appCodec, app.GetKey(types.StoreKey), authKeeper,
|
||||
app.GetSubspace(bank.ModuleName), make(map[string]bool),
|
||||
)
|
||||
|
||||
keeper.SetModuleAccount(ctx, burnerAcc)
|
||||
keeper.SetModuleAccount(ctx, minterAcc)
|
||||
keeper.SetModuleAccount(ctx, multiPermAcc)
|
||||
keeper.SetModuleAccount(ctx, randomPermAcc)
|
||||
authKeeper.SetModuleAccount(ctx, burnerAcc)
|
||||
authKeeper.SetModuleAccount(ctx, minterAcc)
|
||||
authKeeper.SetModuleAccount(ctx, multiPermAcc)
|
||||
authKeeper.SetModuleAccount(ctx, randomPermAcc)
|
||||
|
||||
initialSupply := keeper.GetSupply(ctx)
|
||||
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, "", initCoins) }, "no module account") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, types.Burner, initCoins) }, "invalid permission") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, "", initCoins) }, "no module account") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, auth.Burner, initCoins) }, "invalid permission") // nolint:errcheck
|
||||
|
||||
err := keeper.MintCoins(ctx, types.Minter, sdk.Coins{sdk.Coin{Denom: "denom", Amount: sdk.NewInt(-10)}})
|
||||
err := keeper.MintCoins(ctx, auth.Minter, sdk.Coins{sdk.Coin{Denom: "denom", Amount: sdk.NewInt(-10)}})
|
||||
suite.Require().Error(err, "insufficient coins")
|
||||
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, randomPerm, initCoins) }) // nolint:errcheck
|
||||
|
||||
err = keeper.MintCoins(ctx, types.Minter, initCoins)
|
||||
err = keeper.MintCoins(ctx, auth.Minter, initCoins)
|
||||
suite.Require().NoError(err)
|
||||
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, app.AccountKeeper, types.Minter))
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, authKeeper, auth.Minter))
|
||||
suite.Require().Equal(initialSupply.GetTotal().Add(initCoins...), keeper.GetSupply(ctx).GetTotal())
|
||||
|
||||
// test same functionality on module account with multiple permissions
|
||||
|
|
@ -221,9 +200,9 @@ func (suite *IntegrationTestSuite) TestSupply_MintCoins() {
|
|||
err = keeper.MintCoins(ctx, multiPermAcc.GetName(), initCoins)
|
||||
suite.Require().NoError(err)
|
||||
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, app.AccountKeeper, multiPermAcc.GetName()))
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, authKeeper, multiPermAcc.GetName()))
|
||||
suite.Require().Equal(initialSupply.GetTotal().Add(initCoins...), keeper.GetSupply(ctx).GetTotal())
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, types.Burner, initCoins) }) // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, auth.Burner, initCoins) }) // nolint:errcheck
|
||||
}
|
||||
|
||||
func (suite *IntegrationTestSuite) TestSupply_BurnCoins() {
|
||||
|
|
@ -234,33 +213,37 @@ func (suite *IntegrationTestSuite) TestSupply_BurnCoins() {
|
|||
// add module accounts to supply keeper
|
||||
maccPerms := simapp.GetMaccPerms()
|
||||
maccPerms[holder] = nil
|
||||
maccPerms[types.Burner] = []string{types.Burner}
|
||||
maccPerms[types.Minter] = []string{types.Minter}
|
||||
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
|
||||
maccPerms[auth.Burner] = []string{auth.Burner}
|
||||
maccPerms[auth.Minter] = []string{auth.Minter}
|
||||
maccPerms[multiPerm] = []string{auth.Burner, auth.Minter, auth.Staking}
|
||||
maccPerms[randomPerm] = []string{"random"}
|
||||
|
||||
authKeeper := auth.NewAccountKeeper(
|
||||
appCodec, app.GetKey(types.StoreKey), app.GetSubspace(types.ModuleName),
|
||||
auth.ProtoBaseAccount, maccPerms,
|
||||
)
|
||||
keeper := bank.NewBaseKeeper(
|
||||
appCodec, app.GetKey(types.StoreKey), app.AccountKeeper,
|
||||
app.GetSubspace(bank.ModuleName), make(map[string]bool), maccPerms,
|
||||
appCodec, app.GetKey(types.StoreKey), authKeeper,
|
||||
app.GetSubspace(bank.ModuleName), make(map[string]bool),
|
||||
)
|
||||
|
||||
suite.Require().NoError(keeper.SetBalances(ctx, burnerAcc.GetAddress(), initCoins))
|
||||
keeper.SetSupply(ctx, types.NewSupply(initCoins))
|
||||
keeper.SetModuleAccount(ctx, burnerAcc)
|
||||
authKeeper.SetModuleAccount(ctx, burnerAcc)
|
||||
|
||||
initialSupply := keeper.GetSupply(ctx)
|
||||
initialSupply.Inflate(initCoins)
|
||||
keeper.SetSupply(ctx, initialSupply)
|
||||
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, "", initCoins) }, "no module account") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, types.Minter, initCoins) }, "invalid permission") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, auth.Minter, initCoins) }, "invalid permission") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, randomPerm, initialSupply.GetTotal()) }, "random permission") // nolint:errcheck
|
||||
err := keeper.BurnCoins(ctx, types.Burner, initialSupply.GetTotal())
|
||||
err := keeper.BurnCoins(ctx, auth.Burner, initialSupply.GetTotal())
|
||||
suite.Require().Error(err, "insufficient coins")
|
||||
|
||||
err = keeper.BurnCoins(ctx, types.Burner, initCoins)
|
||||
err = keeper.BurnCoins(ctx, auth.Burner, initCoins)
|
||||
suite.Require().NoError(err)
|
||||
suite.Require().Equal(sdk.Coins(nil), getCoinsByName(ctx, keeper, app.AccountKeeper, types.Burner))
|
||||
suite.Require().Equal(sdk.Coins(nil), getCoinsByName(ctx, keeper, authKeeper, auth.Burner))
|
||||
suite.Require().Equal(initialSupply.GetTotal().Sub(initCoins), keeper.GetSupply(ctx).GetTotal())
|
||||
|
||||
// test same functionality on module account with multiple permissions
|
||||
|
|
@ -269,11 +252,11 @@ func (suite *IntegrationTestSuite) TestSupply_BurnCoins() {
|
|||
keeper.SetSupply(ctx, initialSupply)
|
||||
|
||||
suite.Require().NoError(keeper.SetBalances(ctx, multiPermAcc.GetAddress(), initCoins))
|
||||
keeper.SetModuleAccount(ctx, multiPermAcc)
|
||||
authKeeper.SetModuleAccount(ctx, multiPermAcc)
|
||||
|
||||
err = keeper.BurnCoins(ctx, multiPermAcc.GetName(), initCoins)
|
||||
suite.Require().NoError(err)
|
||||
suite.Require().Equal(sdk.Coins(nil), getCoinsByName(ctx, keeper, app.AccountKeeper, multiPermAcc.GetName()))
|
||||
suite.Require().Equal(sdk.Coins(nil), getCoinsByName(ctx, keeper, authKeeper, multiPermAcc.GetName()))
|
||||
suite.Require().Equal(initialSupply.GetTotal().Sub(initCoins), keeper.GetSupply(ctx).GetTotal())
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,155 +0,0 @@
|
|||
package types
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/tendermint/tendermint/crypto"
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
)
|
||||
|
||||
var (
|
||||
_ authexported.GenesisAccount = (*ModuleAccount)(nil)
|
||||
_ exported.ModuleAccountI = (*ModuleAccount)(nil)
|
||||
)
|
||||
|
||||
// NewModuleAddress creates an AccAddress from the hash of the module's name
|
||||
func NewModuleAddress(name string) sdk.AccAddress {
|
||||
return sdk.AccAddress(crypto.AddressHash([]byte(name)))
|
||||
}
|
||||
|
||||
// NewEmptyModuleAccount creates a empty ModuleAccount from a string
|
||||
func NewEmptyModuleAccount(name string, permissions ...string) *ModuleAccount {
|
||||
moduleAddress := NewModuleAddress(name)
|
||||
baseAcc := authtypes.NewBaseAccountWithAddress(moduleAddress)
|
||||
|
||||
if err := validatePermissions(permissions...); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return &ModuleAccount{
|
||||
BaseAccount: baseAcc,
|
||||
Name: name,
|
||||
Permissions: permissions,
|
||||
}
|
||||
}
|
||||
|
||||
// NewModuleAccount creates a new ModuleAccount instance
|
||||
func NewModuleAccount(ba *authtypes.BaseAccount, name string, permissions ...string) *ModuleAccount {
|
||||
if err := validatePermissions(permissions...); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return &ModuleAccount{
|
||||
BaseAccount: ba,
|
||||
Name: name,
|
||||
Permissions: permissions,
|
||||
}
|
||||
}
|
||||
|
||||
// HasPermission returns whether or not the module account has permission.
|
||||
func (ma ModuleAccount) HasPermission(permission string) bool {
|
||||
for _, perm := range ma.Permissions {
|
||||
if perm == permission {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// GetName returns the the name of the holder's module
|
||||
func (ma ModuleAccount) GetName() string {
|
||||
return ma.Name
|
||||
}
|
||||
|
||||
// GetPermissions returns permissions granted to the module account
|
||||
func (ma ModuleAccount) GetPermissions() []string {
|
||||
return ma.Permissions
|
||||
}
|
||||
|
||||
// SetPubKey - Implements Account
|
||||
func (ma ModuleAccount) SetPubKey(pubKey crypto.PubKey) error {
|
||||
return fmt.Errorf("not supported for module accounts")
|
||||
}
|
||||
|
||||
// SetSequence - Implements Account
|
||||
func (ma ModuleAccount) SetSequence(seq uint64) error {
|
||||
return fmt.Errorf("not supported for module accounts")
|
||||
}
|
||||
|
||||
// Validate checks for errors on the account fields
|
||||
func (ma ModuleAccount) Validate() error {
|
||||
if strings.TrimSpace(ma.Name) == "" {
|
||||
return errors.New("module account name cannot be blank")
|
||||
}
|
||||
if !ma.Address.Equals(sdk.AccAddress(crypto.AddressHash([]byte(ma.Name)))) {
|
||||
return fmt.Errorf("address %s cannot be derived from the module name '%s'", ma.Address, ma.Name)
|
||||
}
|
||||
|
||||
return ma.BaseAccount.Validate()
|
||||
}
|
||||
|
||||
type moduleAccountPretty struct {
|
||||
Address sdk.AccAddress `json:"address" yaml:"address"`
|
||||
PubKey string `json:"public_key" yaml:"public_key"`
|
||||
AccountNumber uint64 `json:"account_number" yaml:"account_number"`
|
||||
Sequence uint64 `json:"sequence" yaml:"sequence"`
|
||||
Name string `json:"name" yaml:"name"`
|
||||
Permissions []string `json:"permissions" yaml:"permissions"`
|
||||
}
|
||||
|
||||
func (ma ModuleAccount) String() string {
|
||||
out, _ := ma.MarshalYAML()
|
||||
return out.(string)
|
||||
}
|
||||
|
||||
// MarshalYAML returns the YAML representation of a ModuleAccount.
|
||||
func (ma ModuleAccount) MarshalYAML() (interface{}, error) {
|
||||
bs, err := yaml.Marshal(moduleAccountPretty{
|
||||
Address: ma.Address,
|
||||
PubKey: "",
|
||||
AccountNumber: ma.AccountNumber,
|
||||
Sequence: ma.Sequence,
|
||||
Name: ma.Name,
|
||||
Permissions: ma.Permissions,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return string(bs), nil
|
||||
}
|
||||
|
||||
// MarshalJSON returns the JSON representation of a ModuleAccount.
|
||||
func (ma ModuleAccount) MarshalJSON() ([]byte, error) {
|
||||
return json.Marshal(moduleAccountPretty{
|
||||
Address: ma.Address,
|
||||
PubKey: "",
|
||||
AccountNumber: ma.AccountNumber,
|
||||
Sequence: ma.Sequence,
|
||||
Name: ma.Name,
|
||||
Permissions: ma.Permissions,
|
||||
})
|
||||
}
|
||||
|
||||
// UnmarshalJSON unmarshals raw JSON bytes into a ModuleAccount.
|
||||
func (ma *ModuleAccount) UnmarshalJSON(bz []byte) error {
|
||||
var alias moduleAccountPretty
|
||||
if err := json.Unmarshal(bz, &alias); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ma.BaseAccount = authtypes.NewBaseAccount(alias.Address, nil, alias.AccountNumber, alias.Sequence)
|
||||
ma.Name = alias.Name
|
||||
ma.Permissions = alias.Permissions
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
package types
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
"github.com/tendermint/tendermint/crypto/secp256k1"
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
)
|
||||
|
||||
func TestModuleAccountMarshalYAML(t *testing.T) {
|
||||
name := "test"
|
||||
moduleAcc := NewEmptyModuleAccount(name, Minter, Burner, Staking)
|
||||
bs, err := yaml.Marshal(moduleAcc)
|
||||
require.NoError(t, err)
|
||||
|
||||
want := "|\n address: cosmos1n7rdpqvgf37ktx30a2sv2kkszk3m7ncmg5drhe\n public_key: \"\"\n account_number: 0\n sequence: 0\n name: test\n permissions:\n - minter\n - burner\n - staking\n"
|
||||
require.Equal(t, want, string(bs))
|
||||
}
|
||||
|
||||
func TestHasPermissions(t *testing.T) {
|
||||
name := "test"
|
||||
macc := NewEmptyModuleAccount(name, Staking, Minter, Burner)
|
||||
cases := []struct {
|
||||
permission string
|
||||
expectHas bool
|
||||
}{
|
||||
{Staking, true},
|
||||
{Minter, true},
|
||||
{Burner, true},
|
||||
{"other", false},
|
||||
}
|
||||
|
||||
for i, tc := range cases {
|
||||
hasPerm := macc.HasPermission(tc.permission)
|
||||
if tc.expectHas {
|
||||
require.True(t, hasPerm, "test case #%d", i)
|
||||
} else {
|
||||
require.False(t, hasPerm, "test case #%d", i)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidate(t *testing.T) {
|
||||
addr := sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
|
||||
baseAcc := authtypes.NewBaseAccount(addr, nil, 0, 0)
|
||||
tests := []struct {
|
||||
name string
|
||||
acc authexported.GenesisAccount
|
||||
expErr error
|
||||
}{
|
||||
{
|
||||
"valid module account",
|
||||
NewEmptyModuleAccount("test"),
|
||||
nil,
|
||||
},
|
||||
{
|
||||
"invalid name and address pair",
|
||||
NewModuleAccount(baseAcc, "test"),
|
||||
fmt.Errorf("address %s cannot be derived from the module name 'test'", addr),
|
||||
},
|
||||
{
|
||||
"empty module account name",
|
||||
NewModuleAccount(baseAcc, " "),
|
||||
errors.New("module account name cannot be blank"),
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
tt := tt
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
err := tt.acc.Validate()
|
||||
require.Equal(t, tt.expErr, err)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestModuleAccountJSON(t *testing.T) {
|
||||
pubkey := secp256k1.GenPrivKey().PubKey()
|
||||
addr := sdk.AccAddress(pubkey.Address())
|
||||
baseAcc := authtypes.NewBaseAccount(addr, nil, 10, 50)
|
||||
acc := NewModuleAccount(baseAcc, "test", "burner")
|
||||
|
||||
bz, err := json.Marshal(acc)
|
||||
require.NoError(t, err)
|
||||
|
||||
bz1, err := acc.MarshalJSON()
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, string(bz1), string(bz))
|
||||
|
||||
var a ModuleAccount
|
||||
require.NoError(t, json.Unmarshal(bz, &a))
|
||||
require.Equal(t, acc.String(), a.String())
|
||||
}
|
||||
|
|
@ -20,9 +20,7 @@ type Codec interface {
|
|||
// RegisterCodec registers the necessary x/bank interfaces and concrete types
|
||||
// on the provided Amino codec. These types are used for Amino JSON serialization.
|
||||
func RegisterCodec(cdc *codec.Codec) {
|
||||
cdc.RegisterInterface((*exported.ModuleAccountI)(nil), nil)
|
||||
cdc.RegisterInterface((*exported.SupplyI)(nil), nil)
|
||||
cdc.RegisterConcrete(&ModuleAccount{}, "cosmos-sdk/ModuleAccount", nil)
|
||||
cdc.RegisterConcrete(&Supply{}, "cosmos-sdk/Supply", nil)
|
||||
cdc.RegisterConcrete(MsgSend{}, "cosmos-sdk/MsgSend", nil)
|
||||
cdc.RegisterConcrete(MsgMultiSend{}, "cosmos-sdk/MsgMultiSend", nil)
|
||||
|
|
|
|||
|
|
@ -16,4 +16,12 @@ type AccountKeeper interface {
|
|||
SetAccount(ctx sdk.Context, acc exported.Account)
|
||||
|
||||
IterateAccounts(ctx sdk.Context, process func(exported.Account) bool)
|
||||
|
||||
ValidatePermissions(macc exported.ModuleAccountI) error
|
||||
|
||||
GetModuleAddress(moduleName string) sdk.AccAddress
|
||||
GetModuleAddressAndPermissions(moduleName string) (addr sdk.AccAddress, permissions []string)
|
||||
GetModuleAccountAndPermissions(ctx sdk.Context, moduleName string) (exported.ModuleAccountI, []string)
|
||||
GetModuleAccount(ctx sdk.Context, moduleName string) exported.ModuleAccountI
|
||||
SetModuleAccount(ctx sdk.Context, macc exported.ModuleAccountI)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import (
|
|||
fmt "fmt"
|
||||
github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
|
||||
types "github.com/cosmos/cosmos-sdk/types"
|
||||
types1 "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
_ "github.com/gogo/protobuf/gogoproto"
|
||||
proto "github.com/gogo/protobuf/proto"
|
||||
io "io"
|
||||
|
|
@ -247,45 +246,6 @@ func (m *MsgMultiSend) GetOutputs() []Output {
|
|||
return nil
|
||||
}
|
||||
|
||||
// ModuleAccount defines an account for modules that holds coins on a pool
|
||||
type ModuleAccount struct {
|
||||
*types1.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty" yaml:"base_account"`
|
||||
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
|
||||
Permissions []string `protobuf:"bytes,3,rep,name=permissions,proto3" json:"permissions,omitempty"`
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) Reset() { *m = ModuleAccount{} }
|
||||
func (*ModuleAccount) ProtoMessage() {}
|
||||
func (*ModuleAccount) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_934ff6b24d3432e2, []int{4}
|
||||
}
|
||||
func (m *ModuleAccount) XXX_Unmarshal(b []byte) error {
|
||||
return m.Unmarshal(b)
|
||||
}
|
||||
func (m *ModuleAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||
if deterministic {
|
||||
return xxx_messageInfo_ModuleAccount.Marshal(b, m, deterministic)
|
||||
} else {
|
||||
b = b[:cap(b)]
|
||||
n, err := m.MarshalToSizedBuffer(b)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return b[:n], nil
|
||||
}
|
||||
}
|
||||
func (m *ModuleAccount) XXX_Merge(src proto.Message) {
|
||||
xxx_messageInfo_ModuleAccount.Merge(m, src)
|
||||
}
|
||||
func (m *ModuleAccount) XXX_Size() int {
|
||||
return m.Size()
|
||||
}
|
||||
func (m *ModuleAccount) XXX_DiscardUnknown() {
|
||||
xxx_messageInfo_ModuleAccount.DiscardUnknown(m)
|
||||
}
|
||||
|
||||
var xxx_messageInfo_ModuleAccount proto.InternalMessageInfo
|
||||
|
||||
// Supply represents a struct that passively keeps track of the total supply
|
||||
// amounts in the network.
|
||||
type Supply struct {
|
||||
|
|
@ -295,7 +255,7 @@ type Supply struct {
|
|||
func (m *Supply) Reset() { *m = Supply{} }
|
||||
func (*Supply) ProtoMessage() {}
|
||||
func (*Supply) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_934ff6b24d3432e2, []int{5}
|
||||
return fileDescriptor_934ff6b24d3432e2, []int{4}
|
||||
}
|
||||
func (m *Supply) XXX_Unmarshal(b []byte) error {
|
||||
return m.Unmarshal(b)
|
||||
|
|
@ -329,49 +289,42 @@ func init() {
|
|||
proto.RegisterType((*Input)(nil), "cosmos_sdk.x.bank.v1.Input")
|
||||
proto.RegisterType((*Output)(nil), "cosmos_sdk.x.bank.v1.Output")
|
||||
proto.RegisterType((*MsgMultiSend)(nil), "cosmos_sdk.x.bank.v1.MsgMultiSend")
|
||||
proto.RegisterType((*ModuleAccount)(nil), "cosmos_sdk.x.bank.v1.ModuleAccount")
|
||||
proto.RegisterType((*Supply)(nil), "cosmos_sdk.x.bank.v1.Supply")
|
||||
}
|
||||
|
||||
func init() { proto.RegisterFile("x/bank/types/types.proto", fileDescriptor_934ff6b24d3432e2) }
|
||||
|
||||
var fileDescriptor_934ff6b24d3432e2 = []byte{
|
||||
// 549 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0xbf, 0x6f, 0xd3, 0x4c,
|
||||
0x18, 0xf6, 0xa5, 0x69, 0xf2, 0xe5, 0x92, 0x6f, 0xe8, 0x95, 0x21, 0x4a, 0x91, 0x1d, 0x3c, 0xa0,
|
||||
0x30, 0xf4, 0x4c, 0xca, 0x44, 0xc4, 0x12, 0x57, 0x42, 0x20, 0x14, 0x21, 0xb9, 0x1b, 0x08, 0x45,
|
||||
0x17, 0xdb, 0x24, 0x56, 0x62, 0x9f, 0xe5, 0x3b, 0x57, 0xc9, 0x7f, 0xc0, 0x82, 0xc4, 0xc8, 0x98,
|
||||
0x99, 0x91, 0x05, 0x66, 0xa6, 0x8e, 0x19, 0x99, 0x0c, 0x4a, 0x16, 0xe6, 0x8e, 0x4c, 0xe8, 0xce,
|
||||
0x36, 0x71, 0xd5, 0x0a, 0x01, 0xea, 0xc2, 0x62, 0xdf, 0xf9, 0xee, 0xf9, 0xe1, 0xe7, 0xbd, 0xf7,
|
||||
0x60, 0x73, 0x6e, 0x8c, 0x48, 0x30, 0x35, 0xf8, 0x22, 0x74, 0x59, 0xfa, 0xc4, 0x61, 0x44, 0x39,
|
||||
0x45, 0x37, 0x6c, 0xca, 0x7c, 0xca, 0x86, 0xcc, 0x99, 0xe2, 0x39, 0x16, 0x9b, 0xf0, 0x69, 0xb7,
|
||||
0x75, 0x9b, 0x4f, 0xbc, 0xc8, 0x19, 0x86, 0x24, 0xe2, 0x0b, 0x43, 0x6e, 0x34, 0xc6, 0x74, 0x4c,
|
||||
0xb7, 0xa3, 0x14, 0xdd, 0xda, 0xbb, 0x44, 0xd8, 0x6a, 0xce, 0x0d, 0x12, 0xf3, 0xc9, 0x65, 0x29,
|
||||
0xfd, 0x53, 0x09, 0x56, 0x07, 0x6c, 0x7c, 0xe2, 0x06, 0x0e, 0x9a, 0xc2, 0xc6, 0xcb, 0x88, 0xfa,
|
||||
0x43, 0xe2, 0x38, 0x91, 0xcb, 0x58, 0x13, 0xb4, 0x41, 0xa7, 0x61, 0x3e, 0x3a, 0x4f, 0xb4, 0xfd,
|
||||
0x05, 0xf1, 0x67, 0x3d, 0xbd, 0xb8, 0xaa, 0x7f, 0x4f, 0xb4, 0xc3, 0xb1, 0xc7, 0x27, 0xf1, 0x08,
|
||||
0xdb, 0xd4, 0x37, 0x52, 0xcb, 0xd9, 0xeb, 0x90, 0x39, 0xd9, 0x7f, 0xe1, 0xbe, 0x6d, 0xf7, 0x53,
|
||||
0x84, 0x55, 0x17, 0xf8, 0x6c, 0x82, 0x5c, 0x08, 0x39, 0xfd, 0x29, 0x55, 0x92, 0x52, 0x0f, 0xcf,
|
||||
0x13, 0x6d, 0x2f, 0x95, 0xda, 0xae, 0xfd, 0x85, 0x50, 0x8d, 0xd3, 0x5c, 0xe6, 0x05, 0xac, 0x10,
|
||||
0x9f, 0xc6, 0x01, 0x6f, 0xee, 0xb4, 0x77, 0x3a, 0xf5, 0xa3, 0x7d, 0x5c, 0xc8, 0xf6, 0xb4, 0x8b,
|
||||
0x8f, 0xa9, 0x17, 0x98, 0x77, 0xcf, 0x12, 0x4d, 0x79, 0xf7, 0x45, 0xeb, 0xfc, 0x86, 0x8c, 0x00,
|
||||
0x30, 0x2b, 0x23, 0xed, 0x95, 0xbf, 0x2d, 0x35, 0xa0, 0x7f, 0x00, 0x70, 0xf7, 0x71, 0x10, 0xc6,
|
||||
0x1c, 0x3d, 0x81, 0xd5, 0x8b, 0xe9, 0x75, 0xff, 0xdc, 0x7d, 0xce, 0x80, 0x9e, 0xc3, 0x5d, 0x5b,
|
||||
0xa8, 0x35, 0x4b, 0xd7, 0x69, 0x3d, 0xe5, 0xcc, 0x9c, 0x7f, 0x04, 0xb0, 0xf2, 0x34, 0xe6, 0xff,
|
||||
0xa2, 0xf5, 0xd7, 0x00, 0x36, 0x06, 0x6c, 0x3c, 0x88, 0x67, 0xdc, 0x93, 0xc7, 0xf7, 0x3e, 0xac,
|
||||
0x78, 0xa2, 0x08, 0xc2, 0xbf, 0x10, 0x3d, 0xc0, 0x57, 0xb5, 0x11, 0x96, 0x85, 0x32, 0xcb, 0x42,
|
||||
0xdc, 0xca, 0x00, 0xe8, 0x01, 0xac, 0x52, 0x99, 0x42, 0x6e, 0xf8, 0xe6, 0xd5, 0xd8, 0x34, 0xaa,
|
||||
0x0c, 0x9c, 0x43, 0x32, 0x3f, 0xef, 0x01, 0xfc, 0x7f, 0x40, 0x9d, 0x78, 0xe6, 0xf6, 0x6d, 0x5b,
|
||||
0x1c, 0x0e, 0x44, 0x60, 0x63, 0x44, 0x98, 0x3b, 0x24, 0xe9, 0x5c, 0xc6, 0x5a, 0x3f, 0xba, 0x75,
|
||||
0x91, 0x5a, 0xf4, 0xa5, 0xa0, 0x36, 0x09, 0xcb, 0x81, 0xe6, 0xc1, 0x2a, 0xd1, 0xc0, 0xb6, 0xed,
|
||||
0x8a, 0x24, 0xba, 0x55, 0x1f, 0x6d, 0x77, 0x22, 0x04, 0xcb, 0x01, 0xf1, 0x5d, 0xd9, 0x3f, 0x35,
|
||||
0x4b, 0x8e, 0x51, 0x1b, 0xd6, 0x43, 0x37, 0xf2, 0x3d, 0xc6, 0x3c, 0x1a, 0x30, 0x79, 0xee, 0x6b,
|
||||
0x56, 0xf1, 0x53, 0xef, 0xbf, 0x57, 0x4b, 0x4d, 0x79, 0xbb, 0xd4, 0x14, 0x9d, 0xc1, 0xca, 0x49,
|
||||
0x1c, 0x86, 0xb3, 0x85, 0xa8, 0x18, 0xa7, 0x9c, 0xcc, 0xb2, 0xf0, 0xae, 0xab, 0x62, 0x92, 0xb3,
|
||||
0xd7, 0xc8, 0x05, 0x45, 0x52, 0xe6, 0xf1, 0xd9, 0x5a, 0x05, 0xab, 0xb5, 0x0a, 0xbe, 0xae, 0x55,
|
||||
0xf0, 0x66, 0xa3, 0x2a, 0xab, 0x8d, 0xaa, 0x7c, 0xde, 0xa8, 0xca, 0xb3, 0x3b, 0xbf, 0x24, 0x2e,
|
||||
0xde, 0x97, 0xa3, 0x8a, 0xbc, 0xbf, 0xee, 0xfd, 0x08, 0x00, 0x00, 0xff, 0xff, 0x55, 0x55, 0x67,
|
||||
0x85, 0x46, 0x05, 0x00, 0x00,
|
||||
// 449 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xa8, 0xd0, 0x4f, 0x4a,
|
||||
0xcc, 0xcb, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0x86, 0x90, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9,
|
||||
0x42, 0x22, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, 0xf1, 0xc5, 0x29, 0xd9, 0x7a, 0x15, 0x7a, 0x20,
|
||||
0x45, 0x7a, 0x65, 0x86, 0x52, 0x6a, 0x25, 0x19, 0x99, 0x45, 0x29, 0xf1, 0x05, 0x89, 0x45, 0x25,
|
||||
0x95, 0xfa, 0x60, 0x85, 0xfa, 0xe9, 0xf9, 0xe9, 0xf9, 0x08, 0x16, 0x44, 0xb7, 0x94, 0x20, 0x86,
|
||||
0x81, 0x4a, 0x87, 0x98, 0xb8, 0xd8, 0x7d, 0x8b, 0xd3, 0x83, 0x53, 0xf3, 0x52, 0x84, 0xb2, 0xb9,
|
||||
0x78, 0xd2, 0x8a, 0xf2, 0x73, 0xe3, 0x13, 0x53, 0x52, 0x8a, 0x52, 0x8b, 0x8b, 0x25, 0x18, 0x15,
|
||||
0x18, 0x35, 0x78, 0x9c, 0x3c, 0x3e, 0xdd, 0x93, 0x17, 0xae, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0x42,
|
||||
0x96, 0x55, 0xfa, 0x75, 0x4f, 0x5e, 0x37, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f,
|
||||
0x57, 0x1f, 0xe2, 0x30, 0x28, 0xa5, 0x5b, 0x9c, 0x02, 0x75, 0xbd, 0x9e, 0x63, 0x72, 0xb2, 0x23,
|
||||
0x44, 0x47, 0x10, 0x37, 0x48, 0x3f, 0x94, 0x23, 0x94, 0xca, 0xc5, 0x55, 0x92, 0x0f, 0xb7, 0x8a,
|
||||
0x09, 0x6c, 0x95, 0xdb, 0xa7, 0x7b, 0xf2, 0x82, 0x10, 0xab, 0x10, 0x72, 0x64, 0x58, 0xc4, 0x59,
|
||||
0x92, 0x0f, 0xb3, 0x26, 0x96, 0x8b, 0x2d, 0x31, 0x37, 0xbf, 0x34, 0xaf, 0x44, 0x82, 0x59, 0x81,
|
||||
0x59, 0x83, 0xdb, 0x48, 0x58, 0x0f, 0x29, 0x04, 0xcb, 0x0c, 0xf5, 0x9c, 0xf3, 0x33, 0xf3, 0x9c,
|
||||
0x0c, 0x4e, 0xdc, 0x93, 0x67, 0x58, 0x75, 0x5f, 0x5e, 0x83, 0x08, 0x6b, 0x40, 0x1a, 0x8a, 0x83,
|
||||
0xa0, 0x86, 0x5a, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xa8, 0xb4, 0x9d, 0x91, 0x8b, 0xd5, 0x33, 0xaf,
|
||||
0xa0, 0xb4, 0x44, 0xc8, 0x9b, 0x8b, 0x1d, 0x35, 0xf4, 0x0c, 0x49, 0x77, 0x3d, 0xcc, 0x04, 0xa1,
|
||||
0x68, 0x2e, 0xd6, 0x64, 0x90, 0x6d, 0x12, 0x4c, 0xd4, 0x74, 0x3a, 0xc4, 0x4c, 0xa8, 0xcb, 0x77,
|
||||
0x30, 0x72, 0xb1, 0xf9, 0x97, 0x96, 0x0c, 0x45, 0xa7, 0xf7, 0x32, 0x72, 0xf1, 0xf8, 0x16, 0xa7,
|
||||
0xfb, 0x96, 0xe6, 0x94, 0x64, 0x82, 0x93, 0xaf, 0x25, 0x17, 0x5b, 0x26, 0x28, 0x12, 0x40, 0xee,
|
||||
0x07, 0x59, 0x2a, 0xad, 0x87, 0x2d, 0xb3, 0xe8, 0x81, 0x23, 0xca, 0x89, 0x05, 0x64, 0x79, 0x10,
|
||||
0x54, 0x83, 0x90, 0x0d, 0x17, 0x7b, 0x3e, 0x38, 0x14, 0x60, 0x0e, 0x96, 0xc1, 0xae, 0x17, 0x12,
|
||||
0x54, 0x50, 0xcd, 0x30, 0x2d, 0x50, 0xf7, 0x14, 0x73, 0xb1, 0x05, 0x97, 0x16, 0x14, 0xe4, 0x54,
|
||||
0x82, 0x3c, 0x5f, 0x92, 0x5f, 0x92, 0x98, 0x03, 0x75, 0x07, 0xb5, 0x3c, 0x0f, 0x36, 0xd3, 0x8a,
|
||||
0xa7, 0x63, 0x81, 0x3c, 0xc3, 0x8c, 0x05, 0xf2, 0x0c, 0x20, 0x4b, 0x9d, 0x9c, 0x4f, 0x3c, 0x92,
|
||||
0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c,
|
||||
0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x13, 0xaf, 0xc1, 0xc8, 0x05, 0x4c, 0x12, 0x1b,
|
||||
0xb8, 0x28, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x0e, 0x1e, 0x07, 0x77, 0x04, 0x00,
|
||||
0x00,
|
||||
}
|
||||
|
||||
func (this *MsgSend) Equal(that interface{}) bool {
|
||||
|
|
@ -729,57 +682,6 @@ func (m *MsgMultiSend) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
|||
return len(dAtA) - i, nil
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) Marshal() (dAtA []byte, err error) {
|
||||
size := m.Size()
|
||||
dAtA = make([]byte, size)
|
||||
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return dAtA[:n], nil
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) MarshalTo(dAtA []byte) (int, error) {
|
||||
size := m.Size()
|
||||
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||
i := len(dAtA)
|
||||
_ = i
|
||||
var l int
|
||||
_ = l
|
||||
if len(m.Permissions) > 0 {
|
||||
for iNdEx := len(m.Permissions) - 1; iNdEx >= 0; iNdEx-- {
|
||||
i -= len(m.Permissions[iNdEx])
|
||||
copy(dAtA[i:], m.Permissions[iNdEx])
|
||||
i = encodeVarintTypes(dAtA, i, uint64(len(m.Permissions[iNdEx])))
|
||||
i--
|
||||
dAtA[i] = 0x1a
|
||||
}
|
||||
}
|
||||
if len(m.Name) > 0 {
|
||||
i -= len(m.Name)
|
||||
copy(dAtA[i:], m.Name)
|
||||
i = encodeVarintTypes(dAtA, i, uint64(len(m.Name)))
|
||||
i--
|
||||
dAtA[i] = 0x12
|
||||
}
|
||||
if m.BaseAccount != nil {
|
||||
{
|
||||
size, err := m.BaseAccount.MarshalToSizedBuffer(dAtA[:i])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
i -= size
|
||||
i = encodeVarintTypes(dAtA, i, uint64(size))
|
||||
}
|
||||
i--
|
||||
dAtA[i] = 0xa
|
||||
}
|
||||
return len(dAtA) - i, nil
|
||||
}
|
||||
|
||||
func (m *Supply) Marshal() (dAtA []byte, err error) {
|
||||
size := m.Size()
|
||||
dAtA = make([]byte, size)
|
||||
|
|
@ -910,29 +812,6 @@ func (m *MsgMultiSend) Size() (n int) {
|
|||
return n
|
||||
}
|
||||
|
||||
func (m *ModuleAccount) Size() (n int) {
|
||||
if m == nil {
|
||||
return 0
|
||||
}
|
||||
var l int
|
||||
_ = l
|
||||
if m.BaseAccount != nil {
|
||||
l = m.BaseAccount.Size()
|
||||
n += 1 + l + sovTypes(uint64(l))
|
||||
}
|
||||
l = len(m.Name)
|
||||
if l > 0 {
|
||||
n += 1 + l + sovTypes(uint64(l))
|
||||
}
|
||||
if len(m.Permissions) > 0 {
|
||||
for _, s := range m.Permissions {
|
||||
l = len(s)
|
||||
n += 1 + l + sovTypes(uint64(l))
|
||||
}
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
func (m *Supply) Size() (n int) {
|
||||
if m == nil {
|
||||
return 0
|
||||
|
|
@ -1472,159 +1351,6 @@ func (m *MsgMultiSend) Unmarshal(dAtA []byte) error {
|
|||
}
|
||||
return nil
|
||||
}
|
||||
func (m *ModuleAccount) Unmarshal(dAtA []byte) error {
|
||||
l := len(dAtA)
|
||||
iNdEx := 0
|
||||
for iNdEx < l {
|
||||
preIndex := iNdEx
|
||||
var wire uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowTypes
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
wire |= uint64(b&0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
fieldNum := int32(wire >> 3)
|
||||
wireType := int(wire & 0x7)
|
||||
if wireType == 4 {
|
||||
return fmt.Errorf("proto: ModuleAccount: wiretype end group for non-group")
|
||||
}
|
||||
if fieldNum <= 0 {
|
||||
return fmt.Errorf("proto: ModuleAccount: illegal tag %d (wire type %d)", fieldNum, wire)
|
||||
}
|
||||
switch fieldNum {
|
||||
case 1:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field BaseAccount", wireType)
|
||||
}
|
||||
var msglen int
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowTypes
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
msglen |= int(b&0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
if msglen < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
postIndex := iNdEx + msglen
|
||||
if postIndex < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
if m.BaseAccount == nil {
|
||||
m.BaseAccount = &types1.BaseAccount{}
|
||||
}
|
||||
if err := m.BaseAccount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
|
||||
return err
|
||||
}
|
||||
iNdEx = postIndex
|
||||
case 2:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
|
||||
}
|
||||
var stringLen uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowTypes
|
||||
}
|
||||
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 ErrInvalidLengthTypes
|
||||
}
|
||||
postIndex := iNdEx + intStringLen
|
||||
if postIndex < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.Name = string(dAtA[iNdEx:postIndex])
|
||||
iNdEx = postIndex
|
||||
case 3:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field Permissions", wireType)
|
||||
}
|
||||
var stringLen uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowTypes
|
||||
}
|
||||
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 ErrInvalidLengthTypes
|
||||
}
|
||||
postIndex := iNdEx + intStringLen
|
||||
if postIndex < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.Permissions = append(m.Permissions, string(dAtA[iNdEx:postIndex]))
|
||||
iNdEx = postIndex
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
skippy, err := skipTypes(dAtA[iNdEx:])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if skippy < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if (iNdEx + skippy) < 0 {
|
||||
return ErrInvalidLengthTypes
|
||||
}
|
||||
if (iNdEx + skippy) > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
iNdEx += skippy
|
||||
}
|
||||
}
|
||||
|
||||
if iNdEx > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
return nil
|
||||
}
|
||||
func (m *Supply) Unmarshal(dAtA []byte) error {
|
||||
l := len(dAtA)
|
||||
iNdEx := 0
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package cosmos_sdk.x.bank.v1;
|
|||
|
||||
import "third_party/proto/gogoproto/gogo.proto";
|
||||
import "types/types.proto";
|
||||
import "x/auth/types/types.proto";
|
||||
|
||||
option go_package = "github.com/cosmos/cosmos-sdk/x/bank/types";
|
||||
|
||||
|
|
@ -49,17 +48,6 @@ message MsgMultiSend {
|
|||
repeated Output outputs = 2 [(gogoproto.nullable) = false];
|
||||
}
|
||||
|
||||
// ModuleAccount defines an account for modules that holds coins on a pool
|
||||
message ModuleAccount {
|
||||
option (gogoproto.goproto_getters) = false;
|
||||
option (gogoproto.goproto_stringer) = false;
|
||||
|
||||
cosmos_sdk.x.auth.v1.BaseAccount base_account = 1
|
||||
[(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""];
|
||||
string name = 2;
|
||||
repeated string permissions = 3;
|
||||
}
|
||||
|
||||
// Supply represents a struct that passively keeps track of the total supply
|
||||
// amounts in the network.
|
||||
message Supply {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
)
|
||||
|
||||
// InitGenesis sets distribution information for genesis
|
||||
func InitGenesis(ctx sdk.Context, bk types.BankKeeper, keeper Keeper, data types.GenesisState) {
|
||||
func InitGenesis(ctx sdk.Context, ak types.AccountKeeper, bk types.BankKeeper, keeper Keeper, data types.GenesisState) {
|
||||
var moduleHoldings sdk.DecCoins
|
||||
|
||||
keeper.SetFeePool(ctx, data.FeePool)
|
||||
|
|
@ -52,7 +52,7 @@ func InitGenesis(ctx sdk.Context, bk types.BankKeeper, keeper Keeper, data types
|
|||
panic(err)
|
||||
}
|
||||
|
||||
bk.SetModuleAccount(ctx, moduleAcc)
|
||||
ak.SetModuleAccount(ctx, moduleAcc)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package keeper
|
|||
|
||||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/distribution/types"
|
||||
)
|
||||
|
||||
|
|
@ -17,6 +17,6 @@ func (k Keeper) GetFeePoolCommunityCoins(ctx sdk.Context) sdk.DecCoins {
|
|||
}
|
||||
|
||||
// GetDistributionAccount returns the distribution ModuleAccount
|
||||
func (k Keeper) GetDistributionAccount(ctx sdk.Context) exported.ModuleAccountI {
|
||||
return k.bankKeeper.GetModuleAccount(ctx, types.ModuleName)
|
||||
func (k Keeper) GetDistributionAccount(ctx sdk.Context) authexported.ModuleAccountI {
|
||||
return k.authKeeper.GetModuleAccount(ctx, types.ModuleName)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ func (k Keeper) AllocateTokens(
|
|||
// fetch and clear the collected fees for distribution, since this is
|
||||
// called in BeginBlock, collected fees will be from the previous block
|
||||
// (and distributed to the previous proposer)
|
||||
feeCollector := k.bankKeeper.GetModuleAccount(ctx, k.feeCollectorName)
|
||||
feeCollector := k.authKeeper.GetModuleAccount(ctx, k.feeCollectorName)
|
||||
feesCollectedInt := k.bankKeeper.GetAllBalances(ctx, feeCollector.GetAddress())
|
||||
feesCollected := sdk.NewDecCoinsFromCoins(feesCollectedInt...)
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ func TestAllocateTokensToManyValidators(t *testing.T) {
|
|||
|
||||
// allocate tokens as if both had voted and second was proposer
|
||||
fees := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100)))
|
||||
feeCollector := app.BankKeeper.GetModuleAccount(ctx, types.FeeCollectorName)
|
||||
feeCollector := app.AccountKeeper.GetModuleAccount(ctx, types.FeeCollectorName)
|
||||
require.NotNil(t, feeCollector)
|
||||
|
||||
err = app.BankKeeper.SetBalances(ctx, feeCollector.GetAddress(), fees)
|
||||
|
|
@ -189,7 +189,7 @@ func TestAllocateTokensTruncation(t *testing.T) {
|
|||
// allocate tokens as if both had voted and second was proposer
|
||||
fees := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(634195840)))
|
||||
|
||||
feeCollector := app.BankKeeper.GetModuleAccount(ctx, types.FeeCollectorName)
|
||||
feeCollector := app.AccountKeeper.GetModuleAccount(ctx, types.FeeCollectorName)
|
||||
require.NotNil(t, feeCollector)
|
||||
|
||||
err = app.BankKeeper.SetBalances(ctx, feeCollector.GetAddress(), fees)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package keeper_test
|
|||
import (
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/distribution/types"
|
||||
)
|
||||
|
||||
|
|
@ -17,5 +17,5 @@ var (
|
|||
valConsAddr1 = sdk.ConsAddress(valConsPk1.Address())
|
||||
valConsAddr2 = sdk.ConsAddress(valConsPk2.Address())
|
||||
|
||||
distrAcc = bank.NewEmptyModuleAccount(types.ModuleName)
|
||||
distrAcc = auth.NewEmptyModuleAccount(types.ModuleName)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ func TestWithdrawDelegationRewardsBasic(t *testing.T) {
|
|||
// set module account coins
|
||||
distrAcc := app.DistrKeeper.GetDistributionAccount(ctx)
|
||||
require.NoError(t, app.BankKeeper.SetBalances(ctx, distrAcc.GetAddress(), sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, balanceTokens))))
|
||||
app.BankKeeper.SetModuleAccount(ctx, distrAcc)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, distrAcc)
|
||||
|
||||
// create validator with 50% commission
|
||||
power := int64(100)
|
||||
|
|
@ -555,7 +555,7 @@ func TestCalculateRewardsMultiDelegatorMultWithdraw(t *testing.T) {
|
|||
distrAcc := app.DistrKeeper.GetDistributionAccount(ctx)
|
||||
err := app.BankKeeper.SetBalances(ctx, distrAcc.GetAddress(), sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1000))))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, distrAcc)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, distrAcc)
|
||||
|
||||
tokens := sdk.DecCoins{sdk.NewDecCoinFromDec(sdk.DefaultBondDenom, sdk.NewDec(initial))}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ type Keeper struct {
|
|||
storeKey sdk.StoreKey
|
||||
cdc codec.Marshaler
|
||||
paramSpace paramtypes.Subspace
|
||||
authKeeper types.AccountKeeper
|
||||
bankKeeper types.BankKeeper
|
||||
stakingKeeper types.StakingKeeper
|
||||
|
||||
|
|
@ -27,12 +28,13 @@ type Keeper struct {
|
|||
|
||||
// NewKeeper creates a new distribution Keeper instance
|
||||
func NewKeeper(
|
||||
cdc codec.Marshaler, key sdk.StoreKey, paramSpace paramtypes.Subspace, bk types.BankKeeper,
|
||||
sk types.StakingKeeper, feeCollectorName string, blacklistedAddrs map[string]bool,
|
||||
cdc codec.Marshaler, key sdk.StoreKey, paramSpace paramtypes.Subspace,
|
||||
ak types.AccountKeeper, bk types.BankKeeper, sk types.StakingKeeper,
|
||||
feeCollectorName string, blacklistedAddrs map[string]bool,
|
||||
) Keeper {
|
||||
|
||||
// ensure distribution module account is set
|
||||
if addr := bk.GetModuleAddress(types.ModuleName); addr == nil {
|
||||
if addr := ak.GetModuleAddress(types.ModuleName); addr == nil {
|
||||
panic(fmt.Sprintf("%s module account has not been set", types.ModuleName))
|
||||
}
|
||||
|
||||
|
|
@ -45,6 +47,7 @@ func NewKeeper(
|
|||
storeKey: key,
|
||||
cdc: cdc,
|
||||
paramSpace: paramSpace,
|
||||
authKeeper: ak,
|
||||
bankKeeper: bk,
|
||||
stakingKeeper: sk,
|
||||
feeCollectorName: feeCollectorName,
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ func TestWithdrawValidatorCommission(t *testing.T) {
|
|||
sdk.NewCoin("stake", sdk.NewInt(2)),
|
||||
))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, distrAcc)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, distrAcc)
|
||||
|
||||
// check initial balance
|
||||
balance := app.BankKeeper.GetAllBalances(ctx, sdk.AccAddress(valAddrs[0]))
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ func (am AppModule) NewQuerierHandler() sdk.Querier {
|
|||
func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONMarshaler, data json.RawMessage) []abci.ValidatorUpdate {
|
||||
var genesisState GenesisState
|
||||
cdc.MustUnmarshalJSON(data, &genesisState)
|
||||
InitGenesis(ctx, am.bankKeeper, am.keeper, genesisState)
|
||||
InitGenesis(ctx, am.accountKeeper, am.bankKeeper, am.keeper, genesisState)
|
||||
return []abci.ValidatorUpdate{}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"github.com/tendermint/tendermint/abci/types"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/distribution"
|
||||
)
|
||||
|
||||
|
|
@ -22,6 +22,6 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) {
|
|||
},
|
||||
)
|
||||
|
||||
acc := app.AccountKeeper.GetAccount(ctx, bank.NewModuleAddress(distribution.ModuleName))
|
||||
acc := app.AccountKeeper.GetAccount(ctx, auth.NewModuleAddress(distribution.ModuleName))
|
||||
require.NotNil(t, acc)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ func TestProposalHandlerPassed(t *testing.T) {
|
|||
err := app.BankKeeper.SetBalances(ctx, macc.GetAddress(), balances.Add(amount...))
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, macc)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, macc)
|
||||
|
||||
account := app.AccountKeeper.NewAccountWithAddress(ctx, recipient)
|
||||
app.AccountKeeper.SetAccount(ctx, account)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package types
|
|||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
bankexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/staking"
|
||||
stakingexported "github.com/cosmos/cosmos-sdk/x/staking/exported"
|
||||
)
|
||||
|
|
@ -11,6 +10,12 @@ import (
|
|||
// AccountKeeper defines the expected account keeper used for simulations (noalias)
|
||||
type AccountKeeper interface {
|
||||
GetAccount(ctx sdk.Context, addr sdk.AccAddress) authexported.Account
|
||||
|
||||
GetModuleAddress(name string) sdk.AccAddress
|
||||
GetModuleAccount(ctx sdk.Context, name string) authexported.ModuleAccountI
|
||||
|
||||
// TODO remove with genesis 2-phases refactor https://github.com/cosmos/cosmos-sdk/issues/2862
|
||||
SetModuleAccount(sdk.Context, authexported.ModuleAccountI)
|
||||
}
|
||||
|
||||
// BankKeeper defines the expected interface needed to retrieve account balances.
|
||||
|
|
@ -21,12 +26,6 @@ type BankKeeper interface {
|
|||
LockedCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
|
||||
SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
|
||||
|
||||
GetModuleAddress(name string) sdk.AccAddress
|
||||
GetModuleAccount(ctx sdk.Context, name string) bankexported.ModuleAccountI
|
||||
|
||||
// TODO remove with genesis 2-phases refactor https://github.com/cosmos/cosmos-sdk/issues/2862
|
||||
SetModuleAccount(sdk.Context, bankexported.ModuleAccountI)
|
||||
|
||||
SendCoinsFromModuleToModule(ctx sdk.Context, senderModule string, recipientModule string, amt sdk.Coins) error
|
||||
SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
)
|
||||
|
||||
// InitGenesis - store genesis parameters
|
||||
func InitGenesis(ctx sdk.Context, bk types.BankKeeper, k Keeper, data GenesisState) {
|
||||
func InitGenesis(ctx sdk.Context, ak types.AccountKeeper, bk types.BankKeeper, k Keeper, data GenesisState) {
|
||||
k.SetProposalID(ctx, data.StartingProposalID)
|
||||
k.SetDepositParams(ctx, data.DepositParams)
|
||||
k.SetVotingParams(ctx, data.VotingParams)
|
||||
|
|
@ -46,7 +46,7 @@ func InitGenesis(ctx sdk.Context, bk types.BankKeeper, k Keeper, data GenesisSta
|
|||
panic(err)
|
||||
}
|
||||
|
||||
bk.SetModuleAccount(ctx, moduleAcc)
|
||||
ak.SetModuleAccount(ctx, moduleAcc)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ func createValidators(ctx sdk.Context, app *simapp.SimApp, powers []int64) ([]sd
|
|||
app.StakingKeeper = staking.NewKeeper(
|
||||
appCodec,
|
||||
app.GetKey(staking.StoreKey),
|
||||
app.AccountKeeper,
|
||||
app.BankKeeper,
|
||||
app.GetSubspace(staking.ModuleName),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"github.com/tendermint/tendermint/libs/log"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/gov/types"
|
||||
)
|
||||
|
||||
|
|
@ -16,6 +16,7 @@ type Keeper struct {
|
|||
// The reference to the Paramstore to get and set gov specific params
|
||||
paramSpace types.ParamSubspace
|
||||
|
||||
authKeeper types.AccountKeeper
|
||||
bankKeeper types.BankKeeper
|
||||
|
||||
// The reference to the DelegationSet and ValidatorSet to get information about validators and delegators
|
||||
|
|
@ -40,11 +41,11 @@ type Keeper struct {
|
|||
// CONTRACT: the parameter Subspace must have the param key table already initialized
|
||||
func NewKeeper(
|
||||
cdc types.Codec, key sdk.StoreKey, paramSpace types.ParamSubspace,
|
||||
bankKeeper types.BankKeeper, sk types.StakingKeeper, rtr types.Router,
|
||||
authKeeper types.AccountKeeper, bankKeeper types.BankKeeper, sk types.StakingKeeper, rtr types.Router,
|
||||
) Keeper {
|
||||
|
||||
// ensure governance module account is set
|
||||
if addr := bankKeeper.GetModuleAddress(types.ModuleName); addr == nil {
|
||||
if addr := authKeeper.GetModuleAddress(types.ModuleName); addr == nil {
|
||||
panic(fmt.Sprintf("%s module account has not been set", types.ModuleName))
|
||||
}
|
||||
|
||||
|
|
@ -56,6 +57,7 @@ func NewKeeper(
|
|||
return Keeper{
|
||||
storeKey: key,
|
||||
paramSpace: paramSpace,
|
||||
authKeeper: authKeeper,
|
||||
bankKeeper: bankKeeper,
|
||||
sk: sk,
|
||||
cdc: cdc,
|
||||
|
|
@ -74,8 +76,8 @@ func (keeper Keeper) Router() types.Router {
|
|||
}
|
||||
|
||||
// GetGovernanceAccount returns the governance ModuleAccount
|
||||
func (keeper Keeper) GetGovernanceAccount(ctx sdk.Context) exported.ModuleAccountI {
|
||||
return keeper.bankKeeper.GetModuleAccount(ctx, types.ModuleName)
|
||||
func (keeper Keeper) GetGovernanceAccount(ctx sdk.Context) authexported.ModuleAccountI {
|
||||
return keeper.authKeeper.GetModuleAccount(ctx, types.ModuleName)
|
||||
}
|
||||
|
||||
// ProposalQueues
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ func (am AppModule) NewQuerierHandler() sdk.Querier {
|
|||
func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONMarshaler, data json.RawMessage) []abci.ValidatorUpdate {
|
||||
var genesisState GenesisState
|
||||
cdc.MustUnmarshalJSON(data, &genesisState)
|
||||
InitGenesis(ctx, am.bankKeeper, am.keeper, genesisState)
|
||||
InitGenesis(ctx, am.accountKeeper, am.bankKeeper, am.keeper, genesisState)
|
||||
return []abci.ValidatorUpdate{}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"github.com/tendermint/tendermint/abci/types"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/gov"
|
||||
)
|
||||
|
||||
|
|
@ -22,6 +22,6 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) {
|
|||
},
|
||||
)
|
||||
|
||||
acc := app.AccountKeeper.GetAccount(ctx, bank.NewModuleAddress(gov.ModuleName))
|
||||
acc := app.AccountKeeper.GetAccount(ctx, auth.NewModuleAddress(gov.ModuleName))
|
||||
require.NotNil(t, acc)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package types
|
|||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
bankexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
stakingexported "github.com/cosmos/cosmos-sdk/x/staking/exported"
|
||||
)
|
||||
|
||||
|
|
@ -30,6 +29,12 @@ type StakingKeeper interface {
|
|||
// AccountKeeper defines the expected account keeper (noalias)
|
||||
type AccountKeeper interface {
|
||||
GetAccount(ctx sdk.Context, addr sdk.AccAddress) authexported.Account
|
||||
|
||||
GetModuleAddress(name string) sdk.AccAddress
|
||||
GetModuleAccount(ctx sdk.Context, name string) authexported.ModuleAccountI
|
||||
|
||||
// TODO remove with genesis 2-phases refactor https://github.com/cosmos/cosmos-sdk/issues/2862
|
||||
SetModuleAccount(sdk.Context, authexported.ModuleAccountI)
|
||||
}
|
||||
|
||||
// BankKeeper defines the expected interface needed to retrieve account balances.
|
||||
|
|
@ -40,12 +45,6 @@ type BankKeeper interface {
|
|||
LockedCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
|
||||
SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
|
||||
|
||||
GetModuleAddress(name string) sdk.AccAddress
|
||||
GetModuleAccount(ctx sdk.Context, name string) bankexported.ModuleAccountI
|
||||
|
||||
// TODO remove with genesis 2-phases refactor https://github.com/cosmos/cosmos-sdk/issues/2862
|
||||
SetModuleAccount(sdk.Context, bankexported.ModuleAccountI)
|
||||
|
||||
SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
|
||||
BurnCoins(ctx sdk.Context, name string, amt sdk.Coins) error
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
"github.com/cosmos/cosmos-sdk/codec"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
||||
bankexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/capability"
|
||||
channel "github.com/cosmos/cosmos-sdk/x/ibc/04-channel"
|
||||
channelexported "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/exported"
|
||||
|
|
@ -29,6 +29,7 @@ type Keeper struct {
|
|||
|
||||
channelKeeper types.ChannelKeeper
|
||||
portKeeper types.PortKeeper
|
||||
authKeeper types.AccountKeeper
|
||||
bankKeeper types.BankKeeper
|
||||
scopedKeeper capability.ScopedKeeper
|
||||
}
|
||||
|
|
@ -37,11 +38,11 @@ type Keeper struct {
|
|||
func NewKeeper(
|
||||
cdc *codec.Codec, key sdk.StoreKey,
|
||||
channelKeeper types.ChannelKeeper, portKeeper types.PortKeeper,
|
||||
bankKeeper types.BankKeeper, scopedKeeper capability.ScopedKeeper,
|
||||
authKeeper types.AccountKeeper, bankKeeper types.BankKeeper, scopedKeeper capability.ScopedKeeper,
|
||||
) Keeper {
|
||||
|
||||
// ensure ibc transfer module account is set
|
||||
if addr := bankKeeper.GetModuleAddress(types.GetModuleAccountName()); addr == nil {
|
||||
if addr := authKeeper.GetModuleAddress(types.GetModuleAccountName()); addr == nil {
|
||||
panic("the IBC transfer module account has not been set")
|
||||
}
|
||||
|
||||
|
|
@ -50,6 +51,7 @@ func NewKeeper(
|
|||
cdc: cdc,
|
||||
channelKeeper: channelKeeper,
|
||||
portKeeper: portKeeper,
|
||||
authKeeper: authKeeper,
|
||||
bankKeeper: bankKeeper,
|
||||
scopedKeeper: scopedKeeper,
|
||||
}
|
||||
|
|
@ -61,8 +63,8 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger {
|
|||
}
|
||||
|
||||
// GetTransferAccount returns the ICS20 - transfers ModuleAccount
|
||||
func (k Keeper) GetTransferAccount(ctx sdk.Context) bankexported.ModuleAccountI {
|
||||
return k.bankKeeper.GetModuleAccount(ctx, types.GetModuleAccountName())
|
||||
func (k Keeper) GetTransferAccount(ctx sdk.Context) authexported.ModuleAccountI {
|
||||
return k.authKeeper.GetModuleAccount(ctx, types.GetModuleAccountName())
|
||||
}
|
||||
|
||||
// PacketExecuted defines a wrapper function for the channel Keeper's function
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package types
|
|||
|
||||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
bankexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/capability"
|
||||
clientexported "github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported"
|
||||
connection "github.com/cosmos/cosmos-sdk/x/ibc/03-connection"
|
||||
|
|
@ -10,12 +10,15 @@ import (
|
|||
channelexported "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/exported"
|
||||
)
|
||||
|
||||
// AccountKeeper defines the contract required for account APIs.
|
||||
type AccountKeeper interface {
|
||||
GetModuleAddress(name string) sdk.AccAddress
|
||||
GetModuleAccount(ctx sdk.Context, name string) authexported.ModuleAccountI
|
||||
}
|
||||
|
||||
// BankKeeper defines the expected bank keeper
|
||||
type BankKeeper interface {
|
||||
SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
|
||||
GetModuleAddress(name string) sdk.AccAddress
|
||||
GetModuleAccount(ctx sdk.Context, name string) bankexported.ModuleAccountI
|
||||
MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
|
||||
BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
|
||||
SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ import (
|
|||
)
|
||||
|
||||
// InitGenesis new mint genesis
|
||||
func InitGenesis(ctx sdk.Context, keeper Keeper, bankKeeper types.BankKeeper, data GenesisState) {
|
||||
func InitGenesis(ctx sdk.Context, keeper Keeper, ak types.AccountKeeper, data GenesisState) {
|
||||
keeper.SetMinter(ctx, data.Minter)
|
||||
keeper.SetParams(ctx, data.Params)
|
||||
bankKeeper.GetModuleAccount(ctx, ModuleName)
|
||||
ak.GetModuleAccount(ctx, ModuleName)
|
||||
}
|
||||
|
||||
// ExportGenesis returns a GenesisState for a given context and keeper.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ type Keeper struct {
|
|||
cdc codec.Marshaler
|
||||
storeKey sdk.StoreKey
|
||||
paramSpace paramtypes.Subspace
|
||||
sk types.StakingKeeper
|
||||
stakingKeeper types.StakingKeeper
|
||||
bankKeeper types.BankKeeper
|
||||
feeCollectorName string
|
||||
}
|
||||
|
|
@ -24,11 +24,12 @@ type Keeper struct {
|
|||
// NewKeeper creates a new mint Keeper instance
|
||||
func NewKeeper(
|
||||
cdc codec.Marshaler, key sdk.StoreKey, paramSpace paramtypes.Subspace,
|
||||
sk types.StakingKeeper, bankKeeper types.BankKeeper, feeCollectorName string,
|
||||
sk types.StakingKeeper, ak types.AccountKeeper, bk types.BankKeeper,
|
||||
feeCollectorName string,
|
||||
) Keeper {
|
||||
|
||||
// ensure mint module account is set
|
||||
if addr := bankKeeper.GetModuleAddress(types.ModuleName); addr == nil {
|
||||
if addr := ak.GetModuleAddress(types.ModuleName); addr == nil {
|
||||
panic("the mint module account has not been set")
|
||||
}
|
||||
|
||||
|
|
@ -41,8 +42,8 @@ func NewKeeper(
|
|||
cdc: cdc,
|
||||
storeKey: key,
|
||||
paramSpace: paramSpace,
|
||||
sk: sk,
|
||||
bankKeeper: bankKeeper,
|
||||
stakingKeeper: sk,
|
||||
bankKeeper: bk,
|
||||
feeCollectorName: feeCollectorName,
|
||||
}
|
||||
}
|
||||
|
|
@ -91,13 +92,13 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
|
|||
// StakingTokenSupply implements an alias call to the underlying staking keeper's
|
||||
// StakingTokenSupply to be used in BeginBlocker.
|
||||
func (k Keeper) StakingTokenSupply(ctx sdk.Context) sdk.Int {
|
||||
return k.sk.StakingTokenSupply(ctx)
|
||||
return k.stakingKeeper.StakingTokenSupply(ctx)
|
||||
}
|
||||
|
||||
// BondedRatio implements an alias call to the underlying staking keeper's
|
||||
// BondedRatio to be used in BeginBlocker.
|
||||
func (k Keeper) BondedRatio(ctx sdk.Context) sdk.Dec {
|
||||
return k.sk.BondedRatio(ctx)
|
||||
return k.stakingKeeper.BondedRatio(ctx)
|
||||
}
|
||||
|
||||
// MintCoins implements an alias call to the underlying supply keeper's
|
||||
|
|
|
|||
|
|
@ -75,15 +75,15 @@ type AppModule struct {
|
|||
AppModuleBasic
|
||||
|
||||
keeper Keeper
|
||||
bankKeeper types.BankKeeper
|
||||
authKeeper types.AccountKeeper
|
||||
}
|
||||
|
||||
// NewAppModule creates a new AppModule object
|
||||
func NewAppModule(keeper Keeper, bankKeeper types.BankKeeper) AppModule {
|
||||
func NewAppModule(keeper Keeper, ak types.AccountKeeper) AppModule {
|
||||
return AppModule{
|
||||
AppModuleBasic: AppModuleBasic{},
|
||||
keeper: keeper,
|
||||
bankKeeper: bankKeeper,
|
||||
authKeeper: ak,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONMarshaler, data j
|
|||
var genesisState GenesisState
|
||||
cdc.MustUnmarshalJSON(data, &genesisState)
|
||||
|
||||
InitGenesis(ctx, am.keeper, am.bankKeeper, genesisState)
|
||||
InitGenesis(ctx, am.keeper, am.authKeeper, genesisState)
|
||||
return []abci.ValidatorUpdate{}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"github.com/tendermint/tendermint/abci/types"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/mint"
|
||||
)
|
||||
|
||||
|
|
@ -22,6 +22,6 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) {
|
|||
},
|
||||
)
|
||||
|
||||
acc := app.AccountKeeper.GetAccount(ctx, bank.NewModuleAddress(mint.ModuleName))
|
||||
acc := app.AccountKeeper.GetAccount(ctx, auth.NewModuleAddress(mint.ModuleName))
|
||||
require.NotNil(t, acc)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package types // noalias
|
|||
|
||||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
)
|
||||
|
||||
// StakingKeeper defines the expected staking keeper
|
||||
|
|
@ -11,15 +11,18 @@ type StakingKeeper interface {
|
|||
BondedRatio(ctx sdk.Context) sdk.Dec
|
||||
}
|
||||
|
||||
// BankKeeper defines the contract needed to be fulfilled for banking and supply
|
||||
// dependencies.
|
||||
type BankKeeper interface {
|
||||
// AccountKeeper defines the contract required for account APIs.
|
||||
type AccountKeeper interface {
|
||||
GetModuleAddress(name string) sdk.AccAddress
|
||||
|
||||
// TODO remove with genesis 2-phases refactor https://github.com/cosmos/cosmos-sdk/issues/2862
|
||||
SetModuleAccount(sdk.Context, exported.ModuleAccountI)
|
||||
GetModuleAccount(ctx sdk.Context, moduleName string) exported.ModuleAccountI
|
||||
SetModuleAccount(sdk.Context, authexported.ModuleAccountI)
|
||||
GetModuleAccount(ctx sdk.Context, moduleName string) authexported.ModuleAccountI
|
||||
}
|
||||
|
||||
// BankKeeper defines the contract needed to be fulfilled for banking and supply
|
||||
// dependencies.
|
||||
type BankKeeper interface {
|
||||
SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
SendCoinsFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error
|
||||
MintCoins(ctx sdk.Context, name string, amt sdk.Coins) error
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ func getBaseSimappWithCustomKeeper() (*codec.Codec, *simapp.SimApp, sdk.Context)
|
|||
app.StakingKeeper = keeper.NewKeeper(
|
||||
appCodec,
|
||||
app.GetKey(staking.StoreKey),
|
||||
app.AccountKeeper,
|
||||
app.BankKeeper,
|
||||
app.GetSubspace(staking.ModuleName),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ func InitGenesis(
|
|||
panic(err)
|
||||
}
|
||||
|
||||
bankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
accountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
}
|
||||
|
||||
notBondedPool := keeper.GetNotBondedPool(ctx)
|
||||
|
|
@ -118,7 +118,7 @@ func InitGenesis(
|
|||
panic(err)
|
||||
}
|
||||
|
||||
bankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
accountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
}
|
||||
|
||||
// don't need to run Tendermint updates if we exported
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ func bootstrapGenesisTest(t *testing.T, power int64, numAddrs int) (*simapp.SimA
|
|||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), totalSupply)
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.BankKeeper.SetSupply(ctx, bank.NewSupply(totalSupply))
|
||||
|
||||
return app, ctx, addrDels, addrVals
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ func bootstrapHandlerGenesisTest(t *testing.T, power int64, numAddrs int, accAmo
|
|||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), totalSupply)
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.BankKeeper.SetSupply(ctx, bank.NewSupply(totalSupply))
|
||||
|
||||
return app, ctx, addrDels, addrVals
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ func createTestInput() (*codec.Codec, *simapp.SimApp, sdk.Context) {
|
|||
app.StakingKeeper = keeper.NewKeeper(
|
||||
appCodec,
|
||||
app.GetKey(staking.StoreKey),
|
||||
app.AccountKeeper,
|
||||
app.BankKeeper,
|
||||
app.GetSubspace(staking.ModuleName),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ func TestUnbondDelegation(t *testing.T) {
|
|||
sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), startTokens)),
|
||||
),
|
||||
)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
// create a validator and a delegator to that validator
|
||||
// note this validator starts not-bonded
|
||||
|
|
@ -234,7 +234,7 @@ func TestUnbondingDelegationsMaxEntries(t *testing.T) {
|
|||
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), sdk.NewCoins(sdk.NewCoin(bondDenom, startTokens)))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
// create a validator and a delegator to that validator
|
||||
validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
|
||||
|
|
@ -324,7 +324,7 @@ func TestUndelegateSelfDelegationBelowMinSelfDelegation(t *testing.T) {
|
|||
oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
validator = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator, true)
|
||||
require.True(t, validator.IsBonded())
|
||||
|
|
@ -337,7 +337,7 @@ func TestUndelegateSelfDelegationBelowMinSelfDelegation(t *testing.T) {
|
|||
oldBonded := app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress())
|
||||
err = app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), oldBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
// create a second delegation to this validator
|
||||
app.StakingKeeper.DeleteValidatorByPowerIndex(ctx, validator)
|
||||
|
|
@ -349,7 +349,7 @@ func TestUndelegateSelfDelegationBelowMinSelfDelegation(t *testing.T) {
|
|||
oldBonded = app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress())
|
||||
err = app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), oldBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
validator = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator, true)
|
||||
delegation := types.NewDelegation(addrDels[0], addrVals[0], issuedShares)
|
||||
|
|
@ -389,7 +389,7 @@ func TestUndelegateFromUnbondingValidator(t *testing.T) {
|
|||
oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
validator = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator, true)
|
||||
require.True(t, validator.IsBonded())
|
||||
|
|
@ -401,7 +401,7 @@ func TestUndelegateFromUnbondingValidator(t *testing.T) {
|
|||
oldBonded := app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress())
|
||||
err = app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), oldBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
// create a second delegation to this validator
|
||||
app.StakingKeeper.DeleteValidatorByPowerIndex(ctx, validator)
|
||||
|
|
@ -412,7 +412,7 @@ func TestUndelegateFromUnbondingValidator(t *testing.T) {
|
|||
oldBonded = app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress())
|
||||
err = app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), oldBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
validator = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator, true)
|
||||
delegation := types.NewDelegation(addrDels[1], addrVals[0], issuedShares)
|
||||
|
|
@ -421,7 +421,7 @@ func TestUndelegateFromUnbondingValidator(t *testing.T) {
|
|||
oldBonded = app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress())
|
||||
err = app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), oldBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
header := ctx.BlockHeader()
|
||||
blockHeight := int64(10)
|
||||
|
|
@ -476,7 +476,7 @@ func TestUndelegateFromUnbondedValidator(t *testing.T) {
|
|||
oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
// create a validator with a self-delegation
|
||||
validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
|
||||
|
|
@ -495,7 +495,7 @@ func TestUndelegateFromUnbondedValidator(t *testing.T) {
|
|||
oldBonded := app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress())
|
||||
err = app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), oldBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
// create a second delegation to this validator
|
||||
app.StakingKeeper.DeleteValidatorByPowerIndex(ctx, validator)
|
||||
|
|
@ -560,7 +560,7 @@ func TestUnbondingAllDelegationFromValidator(t *testing.T) {
|
|||
oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
//create a validator with a self-delegation
|
||||
validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
|
||||
|
|
@ -585,7 +585,7 @@ func TestUnbondingAllDelegationFromValidator(t *testing.T) {
|
|||
oldBonded := app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress())
|
||||
err = app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), oldBonded.Add(delCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
validator = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator, true)
|
||||
require.True(t, validator.IsBonded())
|
||||
|
|
@ -727,7 +727,7 @@ func TestRedelegateToSameValidator(t *testing.T) {
|
|||
oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
// create a validator with a self-delegation
|
||||
validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
|
||||
|
|
@ -758,7 +758,7 @@ func TestRedelegationMaxEntries(t *testing.T) {
|
|||
oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
// create a validator with a self-delegation
|
||||
validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
|
||||
|
|
@ -816,7 +816,7 @@ func TestRedelegateSelfDelegation(t *testing.T) {
|
|||
oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
//create a validator with a self-delegation
|
||||
validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
|
||||
|
|
@ -873,7 +873,7 @@ func TestRedelegateFromUnbondingValidator(t *testing.T) {
|
|||
oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
//create a validator with a self-delegation
|
||||
validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
|
||||
|
|
@ -957,7 +957,7 @@ func TestRedelegateFromUnbondedValidator(t *testing.T) {
|
|||
oldNotBonded := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), oldNotBonded.Add(startCoins...))
|
||||
require.NoError(t, err)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
//create a validator with a self-delegation
|
||||
validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ var _ types.DelegationSet = Keeper{}
|
|||
type Keeper struct {
|
||||
storeKey sdk.StoreKey
|
||||
cdc codec.Marshaler
|
||||
authKeeper types.AccountKeeper
|
||||
bankKeeper types.BankKeeper
|
||||
hooks types.StakingHooks
|
||||
paramstore paramtypes.Subspace
|
||||
|
|
@ -33,7 +34,8 @@ type Keeper struct {
|
|||
|
||||
// NewKeeper creates a new staking Keeper instance
|
||||
func NewKeeper(
|
||||
cdc codec.Marshaler, key sdk.StoreKey, bk types.BankKeeper, ps paramtypes.Subspace,
|
||||
cdc codec.Marshaler, key sdk.StoreKey, ak types.AccountKeeper, bk types.BankKeeper,
|
||||
ps paramtypes.Subspace,
|
||||
) Keeper {
|
||||
|
||||
// set KeyTable if it has not already been set
|
||||
|
|
@ -42,17 +44,18 @@ func NewKeeper(
|
|||
}
|
||||
|
||||
// ensure bonded and not bonded module accounts are set
|
||||
if addr := bk.GetModuleAddress(types.BondedPoolName); addr == nil {
|
||||
if addr := ak.GetModuleAddress(types.BondedPoolName); addr == nil {
|
||||
panic(fmt.Sprintf("%s module account has not been set", types.BondedPoolName))
|
||||
}
|
||||
|
||||
if addr := bk.GetModuleAddress(types.NotBondedPoolName); addr == nil {
|
||||
if addr := ak.GetModuleAddress(types.NotBondedPoolName); addr == nil {
|
||||
panic(fmt.Sprintf("%s module account has not been set", types.NotBondedPoolName))
|
||||
}
|
||||
|
||||
return Keeper{
|
||||
storeKey: key,
|
||||
cdc: cdc,
|
||||
authKeeper: ak,
|
||||
bankKeeper: bk,
|
||||
paramstore: ps,
|
||||
hooks: nil,
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@ package keeper
|
|||
|
||||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/staking/types"
|
||||
)
|
||||
|
||||
// GetBondedPool returns the bonded tokens pool's module account
|
||||
func (k Keeper) GetBondedPool(ctx sdk.Context) (bondedPool exported.ModuleAccountI) {
|
||||
return k.bankKeeper.GetModuleAccount(ctx, types.BondedPoolName)
|
||||
func (k Keeper) GetBondedPool(ctx sdk.Context) (bondedPool authexported.ModuleAccountI) {
|
||||
return k.authKeeper.GetModuleAccount(ctx, types.BondedPoolName)
|
||||
}
|
||||
|
||||
// GetNotBondedPool returns the not bonded tokens pool's module account
|
||||
func (k Keeper) GetNotBondedPool(ctx sdk.Context) (notBondedPool exported.ModuleAccountI) {
|
||||
return k.bankKeeper.GetModuleAccount(ctx, types.NotBondedPoolName)
|
||||
func (k Keeper) GetNotBondedPool(ctx sdk.Context) (notBondedPool authexported.ModuleAccountI) {
|
||||
return k.authKeeper.GetModuleAccount(ctx, types.NotBondedPoolName)
|
||||
}
|
||||
|
||||
// bondedTokensToNotBonded transfers coins from the bonded to the not bonded pool within staking
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ func bootstrapSlashTest(t *testing.T, power int64) (*simapp.SimApp, sdk.Context,
|
|||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), totalSupply)
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
numVals := int64(3)
|
||||
bondedCoins := sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), amt.MulRaw(numVals)))
|
||||
|
|
@ -37,7 +37,7 @@ func bootstrapSlashTest(t *testing.T, power int64) (*simapp.SimApp, sdk.Context,
|
|||
err = app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), bondedCoins)
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.BankKeeper.SetSupply(ctx, bank.NewSupply(totalSupply))
|
||||
|
||||
for i := int64(0); i < numVals; i++ {
|
||||
|
|
@ -129,7 +129,7 @@ func TestSlashRedelegation(t *testing.T) {
|
|||
balances := app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress())
|
||||
|
||||
require.NoError(t, app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), balances.Add(startCoins...)))
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
// set a redelegation with an expiration timestamp beyond which the
|
||||
// redelegation shouldn't be slashed
|
||||
|
|
@ -416,7 +416,7 @@ func TestSlashWithRedelegation(t *testing.T) {
|
|||
err := app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), balances.Add(rdCoins...))
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
oldBonded := app.BankKeeper.GetBalance(ctx, bondedPool.GetAddress(), bondDenom).Amount
|
||||
oldNotBonded := app.BankKeeper.GetBalance(ctx, notBondedPool.GetAddress(), bondDenom).Amount
|
||||
|
|
@ -583,8 +583,8 @@ func TestSlashBoth(t *testing.T) {
|
|||
notBondedPoolBalances := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
require.NoError(t, app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), notBondedPoolBalances.Add(notBondedCoins...)))
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
oldBonded := app.BankKeeper.GetBalance(ctx, bondedPool.GetAddress(), bondDenom).Amount
|
||||
oldNotBonded := app.BankKeeper.GetBalance(ctx, notBondedPool.GetAddress(), bondDenom).Amount
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ func bootstrapValidatorTest(t *testing.T, power int64, numAddrs int) (*simapp.Si
|
|||
err := app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), totalSupply)
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.BankKeeper.SetSupply(ctx, bank.NewSupply(totalSupply))
|
||||
|
||||
return app, ctx, addrDels, addrVals
|
||||
|
|
@ -100,8 +100,8 @@ func TestUpdateValidatorByPowerIndex(t *testing.T) {
|
|||
err = app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), sdk.TokensFromConsensusPower(10000))))
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
// add a validator
|
||||
validator := types.NewValidator(addrVals[0], PKs[0], types.Description{})
|
||||
|
|
@ -152,8 +152,8 @@ func TestUpdateBondedValidatorsDecreaseCliff(t *testing.T) {
|
|||
err = app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), sdk.TokensFromConsensusPower(10000))))
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
validators := make([]types.Validator, numVals)
|
||||
for i := 0; i < len(validators); i++ {
|
||||
|
|
@ -205,7 +205,7 @@ func TestSlashToZeroPowerRemoved(t *testing.T) {
|
|||
err := app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), valTokens)))
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
validator, _ = validator.AddTokensFromDel(valTokens)
|
||||
require.Equal(t, sdk.Unbonded, validator.Status)
|
||||
|
|
@ -414,8 +414,8 @@ func TestGetValidatorSortingMixed(t *testing.T) {
|
|||
err = app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), sdk.TokensFromConsensusPower(0))))
|
||||
require.NoError(t, err)
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
// now 2 max resValidators
|
||||
params := app.StakingKeeper.GetParams(ctx)
|
||||
|
|
@ -489,7 +489,7 @@ func TestGetValidatorsEdgeCases(t *testing.T) {
|
|||
balances := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
require.NoError(t, app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), balances.Add(sdk.NewCoin(params.BondDenom, tokens))))
|
||||
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
validators[i] = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validators[i], true)
|
||||
}
|
||||
|
||||
|
|
@ -509,7 +509,7 @@ func TestGetValidatorsEdgeCases(t *testing.T) {
|
|||
balances := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
|
||||
require.NoError(t, app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), balances.Add(newTokens...)))
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
// test that the two largest validators are
|
||||
// a) validator 0 with 500 tokens
|
||||
|
|
@ -542,7 +542,7 @@ func TestGetValidatorsEdgeCases(t *testing.T) {
|
|||
newTokens = sdk.NewCoins(sdk.NewCoin(params.BondDenom, sdk.TokensFromConsensusPower(1)))
|
||||
balances = app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
require.NoError(t, app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), balances.Add(newTokens...)))
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
validators[3] = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validators[3], true)
|
||||
resValidators = app.StakingKeeper.GetBondedValidatorsByPower(ctx)
|
||||
|
|
@ -558,7 +558,7 @@ func TestGetValidatorsEdgeCases(t *testing.T) {
|
|||
bondedPool := app.StakingKeeper.GetBondedPool(ctx)
|
||||
balances = app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress())
|
||||
require.NoError(t, app.BankKeeper.SetBalances(ctx, bondedPool.GetAddress(), balances.Add(sdk.NewCoin(params.BondDenom, rmTokens))))
|
||||
app.BankKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, bondedPool)
|
||||
|
||||
validators[3] = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validators[3], true)
|
||||
resValidators = app.StakingKeeper.GetBondedValidatorsByPower(ctx)
|
||||
|
|
@ -573,7 +573,7 @@ func TestGetValidatorsEdgeCases(t *testing.T) {
|
|||
notBondedPool = app.StakingKeeper.GetNotBondedPool(ctx)
|
||||
balances = app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress())
|
||||
require.NoError(t, app.BankKeeper.SetBalances(ctx, notBondedPool.GetAddress(), balances.Add(sdk.NewCoin(params.BondDenom, sdk.NewInt(200)))))
|
||||
app.BankKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
|
||||
|
||||
validators[3] = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validators[3], true)
|
||||
resValidators = app.StakingKeeper.GetBondedValidatorsByPower(ctx)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"github.com/tendermint/tendermint/abci/types"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/staking"
|
||||
)
|
||||
|
||||
|
|
@ -22,9 +22,9 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) {
|
|||
},
|
||||
)
|
||||
|
||||
acc := app.AccountKeeper.GetAccount(ctx, bank.NewModuleAddress(staking.BondedPoolName))
|
||||
acc := app.AccountKeeper.GetAccount(ctx, auth.NewModuleAddress(staking.BondedPoolName))
|
||||
require.NotNil(t, acc)
|
||||
|
||||
acc = app.AccountKeeper.GetAccount(ctx, bank.NewModuleAddress(staking.NotBondedPoolName))
|
||||
acc = app.AccountKeeper.GetAccount(ctx, auth.NewModuleAddress(staking.NotBondedPoolName))
|
||||
require.NotNil(t, acc)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,12 @@ type DistributionKeeper interface {
|
|||
type AccountKeeper interface {
|
||||
IterateAccounts(ctx sdk.Context, process func(authexported.Account) (stop bool))
|
||||
GetAccount(ctx sdk.Context, addr sdk.AccAddress) authexported.Account // only used for simulation
|
||||
|
||||
GetModuleAddress(name string) sdk.AccAddress
|
||||
GetModuleAccount(ctx sdk.Context, moduleName string) authexported.ModuleAccountI
|
||||
|
||||
// TODO remove with genesis 2-phases refactor https://github.com/cosmos/cosmos-sdk/issues/2862
|
||||
SetModuleAccount(sdk.Context, authexported.ModuleAccountI)
|
||||
}
|
||||
|
||||
// BankKeeper defines the expected interface needed to retrieve account balances.
|
||||
|
|
@ -29,12 +35,6 @@ type BankKeeper interface {
|
|||
|
||||
GetSupply(ctx sdk.Context) bankexported.SupplyI
|
||||
|
||||
GetModuleAddress(name string) sdk.AccAddress
|
||||
GetModuleAccount(ctx sdk.Context, moduleName string) bankexported.ModuleAccountI
|
||||
|
||||
// TODO remove with genesis 2-phases refactor https://github.com/cosmos/cosmos-sdk/issues/2862
|
||||
SetModuleAccount(sdk.Context, bankexported.ModuleAccountI)
|
||||
|
||||
SendCoinsFromModuleToModule(ctx sdk.Context, senderPool, recipientPool string, amt sdk.Coins) error
|
||||
UndelegateCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
DelegateCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
|
||||
|
|
|
|||
Loading…
Reference in New Issue