tendermint: update to rc3 (#6892)
* modify light imports * change abci.header to tmproto.header * use rc * rc * fix import * Merge PR #6893: fix key imports * fix rc2 * tendermint: update 3 (#6899) * tendermint: update 4 (#6919) Co-authored-by: Alexander Bezobchuk <alexanderbez@users.noreply.github.com> * tendermint: update 5 (#6923) Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> * bump to latest master * tendermint: update (#6972) Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com> Co-authored-by: Cory Levinson <cjlevinson@gmail.com> * Update x/ibc/07-tendermint/types/test_utils.go Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> * address comment * go mod * bring back things * fix test * update tm proto files Co-authored-by: Alexander Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com> Co-authored-by: Cory Levinson <cjlevinson@gmail.com> Co-authored-by: Federico Kunze <federico.kunze94@gmail.com>
This commit is contained in:
Marko
co-authored by
Alexander Bezobchuk
Federico Kunze
Aleksandr Bezobchuk
Cory Levinson
Federico Kunze
Alexander Bezobchuk
Federico Kunze
Aleksandr Bezobchuk
Cory Levinson
Federico Kunze
parent
f87624e9de
commit
8de96d16f9
+51
-51
@@ -515,57 +515,57 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptor_4e37629bc7eb0df8 = []byte{
|
||||
// 787 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xbd, 0x4e, 0x1b, 0x4b,
|
||||
0x14, 0xf6, 0xda, 0x66, 0xed, 0x1d, 0xc3, 0xe5, 0xde, 0xb9, 0x4e, 0x58, 0x08, 0xb1, 0xcd, 0x92,
|
||||
0x48, 0x6e, 0xb2, 0x16, 0x90, 0x48, 0x91, 0x8b, 0x28, 0x6c, 0xfe, 0xb0, 0x04, 0xcd, 0x62, 0x14,
|
||||
0x29, 0x8d, 0x35, 0xf6, 0x0e, 0xe3, 0x15, 0xde, 0x1d, 0x6b, 0x67, 0x0c, 0x76, 0x97, 0x32, 0x65,
|
||||
0x2a, 0x8a, 0x54, 0xa9, 0xf3, 0x24, 0x94, 0x94, 0x14, 0x91, 0x93, 0x98, 0x37, 0xe0, 0x09, 0xa2,
|
||||
0x99, 0x59, 0xff, 0x90, 0xc8, 0x34, 0xf6, 0x99, 0xf3, 0x37, 0xe7, 0x7c, 0xdf, 0x37, 0x0b, 0x36,
|
||||
0x5b, 0x94, 0x05, 0x94, 0x55, 0x9a, 0x88, 0xe1, 0x0a, 0x6a, 0xb6, 0xfc, 0xca, 0xe9, 0x56, 0x13,
|
||||
0x73, 0xb4, 0x25, 0x0f, 0x76, 0x37, 0xa2, 0x9c, 0x42, 0x53, 0x25, 0xd9, 0x22, 0xc9, 0x96, 0xfe,
|
||||
0x38, 0x69, 0x6d, 0x83, 0xe3, 0xd0, 0xc3, 0x51, 0xe0, 0x87, 0x5c, 0x55, 0xf3, 0x41, 0x17, 0x33,
|
||||
0xf5, 0xab, 0x8a, 0xd7, 0xf2, 0x84, 0x12, 0x2a, 0xcd, 0x8a, 0xb0, 0x62, 0xef, 0x2a, 0xa1, 0x94,
|
||||
0x74, 0x70, 0x45, 0x9e, 0x9a, 0xbd, 0xe3, 0x0a, 0x0a, 0x07, 0x2a, 0x64, 0x9d, 0xa7, 0x00, 0xa8,
|
||||
0xf7, 0x5d, 0xcc, 0xba, 0x34, 0x64, 0x18, 0xde, 0x07, 0x7a, 0x1b, 0xfb, 0xa4, 0xcd, 0x4d, 0xad,
|
||||
0xa4, 0x95, 0x53, 0x6e, 0x7c, 0x82, 0x16, 0xd0, 0x79, 0xbf, 0x8d, 0x58, 0xdb, 0x4c, 0x96, 0xb4,
|
||||
0xb2, 0xe1, 0x80, 0xd1, 0xb0, 0xa8, 0xd7, 0xfb, 0x7b, 0x88, 0xb5, 0xdd, 0x38, 0x02, 0xd7, 0x81,
|
||||
0xd1, 0xa2, 0x1e, 0x66, 0x5d, 0xd4, 0xc2, 0x66, 0x4a, 0xa4, 0xb9, 0x53, 0x07, 0x84, 0x20, 0x2d,
|
||||
0x0e, 0x66, 0xba, 0xa4, 0x95, 0x97, 0x5c, 0x69, 0x0b, 0x9f, 0x87, 0x38, 0x32, 0x17, 0x64, 0xb2,
|
||||
0xb4, 0xe1, 0x0a, 0xc8, 0x44, 0xe8, 0xac, 0xd1, 0xa1, 0xc4, 0xd4, 0xa5, 0x5b, 0x8f, 0xd0, 0xd9,
|
||||
0x3e, 0x25, 0xf0, 0x08, 0xa4, 0x3b, 0x94, 0x30, 0x33, 0x53, 0x4a, 0x95, 0x73, 0xdb, 0x65, 0x7b,
|
||||
0x1e, 0x4c, 0xf6, 0xae, 0xf3, 0xaa, 0x76, 0x80, 0x19, 0x43, 0x04, 0xef, 0x53, 0xe2, 0xac, 0x5c,
|
||||
0x0c, 0x8b, 0x89, 0x6f, 0x3f, 0x8a, 0xcb, 0xb7, 0xfd, 0xcc, 0x95, 0xed, 0xc4, 0x0c, 0x7e, 0x78,
|
||||
0x4c, 0xcd, 0xac, 0x9a, 0x41, 0xd8, 0xf0, 0x21, 0x00, 0x04, 0xb1, 0xc6, 0x19, 0x0a, 0x39, 0xf6,
|
||||
0x4c, 0x43, 0x22, 0x61, 0x10, 0xc4, 0xde, 0x4b, 0x07, 0x5c, 0x05, 0x59, 0x11, 0xee, 0x31, 0xec,
|
||||
0x99, 0x40, 0x06, 0x33, 0x04, 0xb1, 0x23, 0x86, 0x3d, 0xf8, 0x08, 0x24, 0x79, 0xdf, 0xcc, 0x95,
|
||||
0xb4, 0x72, 0x6e, 0x3b, 0x6f, 0x2b, 0xd8, 0xed, 0x31, 0xec, 0xf6, 0x6e, 0x38, 0x70, 0x93, 0xbc,
|
||||
0x2f, 0x90, 0xe2, 0x7e, 0x80, 0x19, 0x47, 0x41, 0xd7, 0x5c, 0x54, 0x48, 0x4d, 0x1c, 0xd5, 0xf4,
|
||||
0xa7, 0xaf, 0xc5, 0x84, 0xf5, 0x45, 0x03, 0xff, 0xdc, 0x9e, 0x18, 0x3e, 0x00, 0x46, 0xc0, 0x48,
|
||||
0xc3, 0x0f, 0x3d, 0xdc, 0x97, 0xfc, 0x2c, 0xb9, 0xd9, 0x80, 0x91, 0x9a, 0x38, 0xc3, 0x7f, 0x41,
|
||||
0x4a, 0x60, 0x26, 0xe9, 0x71, 0x85, 0x09, 0x0f, 0x81, 0x8e, 0x4f, 0x71, 0xc8, 0x99, 0x99, 0x92,
|
||||
0x90, 0x3d, 0x9e, 0x0f, 0xd9, 0x21, 0x8f, 0xfc, 0x90, 0xbc, 0x11, 0xd9, 0x4e, 0x3e, 0xc6, 0x6b,
|
||||
0x71, 0xc6, 0xc9, 0xdc, 0xb8, 0x55, 0x35, 0xfd, 0xf1, 0x7b, 0x49, 0xb3, 0x22, 0x90, 0x9b, 0x89,
|
||||
0x0a, 0x0c, 0x85, 0x08, 0xe5, 0x4c, 0x86, 0x2b, 0x6d, 0x58, 0x03, 0x00, 0x71, 0x1e, 0xf9, 0xcd,
|
||||
0x1e, 0xc7, 0xcc, 0x4c, 0xca, 0x09, 0x36, 0xef, 0x20, 0x6d, 0x9c, 0xeb, 0xa4, 0xc5, 0xfd, 0xee,
|
||||
0x4c, 0x71, 0x7c, 0xe7, 0x0e, 0x30, 0x26, 0x49, 0x62, 0xdb, 0x13, 0x3c, 0x88, 0x2f, 0x14, 0x26,
|
||||
0xcc, 0x83, 0x85, 0x53, 0xd4, 0xe9, 0xe1, 0x18, 0x01, 0x75, 0xb0, 0x28, 0xc8, 0xbc, 0x43, 0xac,
|
||||
0x26, 0x48, 0x7d, 0x7a, 0x8b, 0x54, 0x51, 0x99, 0x76, 0xee, 0xdd, 0x0c, 0x8b, 0xff, 0x0d, 0x50,
|
||||
0xd0, 0xa9, 0x5a, 0xd3, 0x98, 0x35, 0xcb, 0xb5, 0x3d, 0xc3, 0x75, 0x52, 0xd6, 0xfc, 0x7f, 0x33,
|
||||
0x2c, 0x2e, 0x4f, 0x6b, 0x44, 0xc4, 0x9a, 0x08, 0xc0, 0xea, 0x02, 0xdd, 0xc5, 0xac, 0xd7, 0xe1,
|
||||
0x13, 0x71, 0x8b, 0x9b, 0x16, 0x63, 0x71, 0xff, 0x4d, 0x52, 0xf5, 0x0f, 0x92, 0xd6, 0xed, 0xe9,
|
||||
0x23, 0x57, 0x08, 0xa9, 0xe7, 0xad, 0xb8, 0x51, 0xd8, 0x4c, 0xb8, 0x90, 0x42, 0x39, 0xd7, 0x00,
|
||||
0x3c, 0xf4, 0x83, 0x5e, 0x07, 0x71, 0x9f, 0x86, 0x93, 0x97, 0xfc, 0x56, 0x0d, 0x2e, 0xb5, 0xad,
|
||||
0x49, 0x3d, 0x6e, 0xcc, 0x47, 0x3f, 0xc6, 0xc8, 0xc9, 0x8a, 0xfe, 0x97, 0xc3, 0xa2, 0x26, 0x17,
|
||||
0x92, 0xb0, 0x3d, 0x07, 0x7a, 0x24, 0x17, 0x92, 0x53, 0xe7, 0xb6, 0x4b, 0xf3, 0xbb, 0xa8, 0xc5,
|
||||
0xdd, 0x38, 0xdf, 0x7a, 0x01, 0x32, 0x07, 0x8c, 0xbc, 0x16, 0x7b, 0xaf, 0x02, 0x21, 0xd4, 0xc6,
|
||||
0x8c, 0x48, 0x32, 0x01, 0x23, 0x75, 0xa1, 0x93, 0x31, 0x4c, 0xc9, 0x29, 0x4c, 0x31, 0xe1, 0x7b,
|
||||
0xc0, 0xa8, 0xf7, 0xc7, 0x1d, 0x9e, 0x4d, 0xd0, 0x4c, 0xdd, 0xbd, 0x4a, 0x5c, 0x30, 0xdb, 0xc9,
|
||||
0x79, 0x79, 0xf5, 0xab, 0x90, 0xb8, 0x18, 0x15, 0xb4, 0xcb, 0x51, 0x41, 0xfb, 0x39, 0x2a, 0x68,
|
||||
0x9f, 0xaf, 0x0b, 0x89, 0xcb, 0xeb, 0x42, 0xe2, 0xea, 0xba, 0x90, 0xf8, 0x60, 0x11, 0x9f, 0xb7,
|
||||
0x7b, 0x4d, 0xbb, 0x45, 0x83, 0x4a, 0xfc, 0x81, 0x56, 0x7f, 0x4f, 0x98, 0x77, 0xa2, 0xbe, 0xae,
|
||||
0x4d, 0x5d, 0xbe, 0xe1, 0x9d, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xbb, 0x16, 0xe4, 0xc2,
|
||||
0x05, 0x00, 0x00,
|
||||
// 786 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0x4b, 0x6f, 0xdb, 0x46,
|
||||
0x10, 0x16, 0x25, 0x99, 0x12, 0x47, 0x76, 0xdd, 0x6e, 0x55, 0x9b, 0xb6, 0x5b, 0x49, 0xa5, 0x5b,
|
||||
0x40, 0x97, 0x52, 0xf0, 0xa3, 0x40, 0xe1, 0x43, 0x51, 0xb3, 0x2f, 0x0b, 0xb0, 0x2f, 0xb4, 0x8c,
|
||||
0x00, 0xb9, 0x08, 0x2b, 0x71, 0xbd, 0x62, 0x2c, 0x72, 0x05, 0xee, 0xca, 0x96, 0x6e, 0x39, 0xe6,
|
||||
0x98, 0x93, 0x0f, 0x39, 0xe5, 0x9c, 0x5f, 0xe2, 0xa3, 0x8f, 0x3e, 0x04, 0x4a, 0x22, 0xff, 0x03,
|
||||
0xff, 0x82, 0x60, 0x97, 0xd4, 0xc3, 0x09, 0xe4, 0x13, 0xe7, 0xf1, 0xed, 0xec, 0xcc, 0xf7, 0xcd,
|
||||
0x12, 0xb6, 0xdb, 0x8c, 0x07, 0x8c, 0xd7, 0x5a, 0x98, 0x93, 0x1a, 0x6e, 0xb5, 0xfd, 0xda, 0xe5,
|
||||
0x4e, 0x8b, 0x08, 0xbc, 0xa3, 0x1c, 0xbb, 0x17, 0x31, 0xc1, 0x90, 0x19, 0x83, 0x6c, 0x09, 0xb2,
|
||||
0x55, 0x3c, 0x01, 0x6d, 0x16, 0x29, 0xa3, 0x4c, 0x81, 0x6a, 0xd2, 0x8a, 0xf1, 0x9b, 0x5b, 0x82,
|
||||
0x84, 0x1e, 0x89, 0x02, 0x3f, 0x14, 0x71, 0x4d, 0x31, 0xec, 0x11, 0x9e, 0x24, 0x37, 0x28, 0x63,
|
||||
0xb4, 0x4b, 0x6a, 0xca, 0x6b, 0xf5, 0xcf, 0x6b, 0x38, 0x1c, 0xc6, 0x29, 0xeb, 0x3a, 0x03, 0xd0,
|
||||
0x18, 0xb8, 0x84, 0xf7, 0x58, 0xc8, 0x09, 0x5a, 0x03, 0xbd, 0x43, 0x7c, 0xda, 0x11, 0xa6, 0x56,
|
||||
0xd1, 0xaa, 0x19, 0x37, 0xf1, 0x90, 0x05, 0xba, 0x18, 0x74, 0x30, 0xef, 0x98, 0xe9, 0x8a, 0x56,
|
||||
0x35, 0x1c, 0x18, 0x8f, 0xca, 0x7a, 0x63, 0x70, 0x84, 0x79, 0xc7, 0x4d, 0x32, 0xe8, 0x47, 0x30,
|
||||
0xda, 0xcc, 0x23, 0xbc, 0x87, 0xdb, 0xc4, 0xcc, 0x48, 0x98, 0x3b, 0x0b, 0x20, 0x04, 0x59, 0xe9,
|
||||
0x98, 0xd9, 0x8a, 0x56, 0x5d, 0x71, 0x95, 0x2d, 0x63, 0x1e, 0x16, 0xd8, 0x5c, 0x52, 0x60, 0x65,
|
||||
0xa3, 0x75, 0xc8, 0x45, 0xf8, 0xaa, 0xd9, 0x65, 0xd4, 0xd4, 0x55, 0x58, 0x8f, 0xf0, 0xd5, 0x31,
|
||||
0xa3, 0xe8, 0x0c, 0xb2, 0x5d, 0x46, 0xb9, 0x99, 0xab, 0x64, 0xaa, 0x85, 0xdd, 0xaa, 0xbd, 0x88,
|
||||
0x20, 0xfb, 0xd0, 0xf9, 0xbb, 0x7e, 0x42, 0x38, 0xc7, 0x94, 0x1c, 0x33, 0xea, 0xac, 0xdf, 0x8c,
|
||||
0xca, 0xa9, 0x77, 0x1f, 0xca, 0xab, 0x8f, 0xe3, 0xdc, 0x55, 0xe5, 0x64, 0x0f, 0x7e, 0x78, 0xce,
|
||||
0xcc, 0x7c, 0xdc, 0x83, 0xb4, 0xd1, 0x4f, 0x00, 0x14, 0xf3, 0xe6, 0x15, 0x0e, 0x05, 0xf1, 0x4c,
|
||||
0x43, 0x31, 0x61, 0x50, 0xcc, 0x9f, 0xa9, 0x00, 0xda, 0x80, 0xbc, 0x4c, 0xf7, 0x39, 0xf1, 0x4c,
|
||||
0x50, 0xc9, 0x1c, 0xc5, 0xfc, 0x8c, 0x13, 0x0f, 0xfd, 0x02, 0x69, 0x31, 0x30, 0x0b, 0x15, 0xad,
|
||||
0x5a, 0xd8, 0x2d, 0xda, 0x31, 0xed, 0xf6, 0x84, 0x76, 0xfb, 0x30, 0x1c, 0xba, 0x69, 0x31, 0x90,
|
||||
0x4c, 0x09, 0x3f, 0x20, 0x5c, 0xe0, 0xa0, 0x67, 0x2e, 0xc7, 0x4c, 0x4d, 0x03, 0x07, 0xd9, 0x57,
|
||||
0x6f, 0xcb, 0x29, 0xeb, 0x8d, 0x06, 0xdf, 0x3c, 0xee, 0x18, 0x6d, 0x81, 0x11, 0x70, 0xda, 0xf4,
|
||||
0x43, 0x8f, 0x0c, 0x94, 0x3e, 0x2b, 0x6e, 0x3e, 0xe0, 0xb4, 0x2e, 0x7d, 0xf4, 0x2d, 0x64, 0x24,
|
||||
0x67, 0x4a, 0x1e, 0x57, 0x9a, 0xe8, 0x14, 0x74, 0x72, 0x49, 0x42, 0xc1, 0xcd, 0x8c, 0xa2, 0xec,
|
||||
0xd7, 0xc5, 0x94, 0x9d, 0x8a, 0xc8, 0x0f, 0xe9, 0xbf, 0x12, 0xed, 0x14, 0x13, 0xbe, 0x96, 0xe7,
|
||||
0x82, 0xdc, 0x4d, 0x4a, 0x1d, 0x64, 0x5f, 0xbe, 0xaf, 0x68, 0x56, 0x04, 0x85, 0xb9, 0xac, 0xe4,
|
||||
0x50, 0xae, 0x9b, 0xea, 0xc9, 0x70, 0x95, 0x8d, 0xea, 0x00, 0x58, 0x88, 0xc8, 0x6f, 0xf5, 0x05,
|
||||
0xe1, 0x66, 0x5a, 0x75, 0xb0, 0xfd, 0x84, 0x68, 0x13, 0xac, 0x93, 0x95, 0xf7, 0xbb, 0x73, 0x87,
|
||||
0x93, 0x3b, 0xf7, 0xc0, 0x98, 0x82, 0xe4, 0xb4, 0x17, 0x64, 0x98, 0x5c, 0x28, 0x4d, 0x54, 0x84,
|
||||
0xa5, 0x4b, 0xdc, 0xed, 0x93, 0x84, 0x81, 0xd8, 0xb1, 0x18, 0xe4, 0xfe, 0xc7, 0xbc, 0x2e, 0x45,
|
||||
0xdd, 0x7f, 0x24, 0xaa, 0x3c, 0x99, 0x75, 0x7e, 0x78, 0x18, 0x95, 0xbf, 0x1b, 0xe2, 0xa0, 0x7b,
|
||||
0x60, 0xcd, 0x72, 0xd6, 0xbc, 0xd6, 0xf6, 0x9c, 0xd6, 0x69, 0x75, 0xe6, 0xfb, 0x87, 0x51, 0x79,
|
||||
0x75, 0x76, 0x46, 0x66, 0xac, 0xe9, 0x02, 0x58, 0x2f, 0x40, 0x77, 0x09, 0xef, 0x77, 0xc5, 0x74,
|
||||
0xb9, 0xe5, 0x4d, 0xcb, 0xc9, 0x72, 0x7f, 0x2d, 0xd2, 0xfe, 0x17, 0x22, 0xad, 0xd9, 0xb3, 0x87,
|
||||
0x1c, 0x33, 0x14, 0xab, 0x12, 0xb3, 0x32, 0x55, 0x41, 0xad, 0xc8, 0xb5, 0x06, 0xe8, 0xd4, 0x0f,
|
||||
0xfa, 0x5d, 0x2c, 0x7c, 0x16, 0x4e, 0xdf, 0xf0, 0x7f, 0x71, 0xcb, 0x6a, 0xab, 0x35, 0xb5, 0x89,
|
||||
0x3f, 0x2f, 0xe6, 0x3d, 0x61, 0xc7, 0xc9, 0xcb, 0xfa, 0xb7, 0xa3, 0xb2, 0xa6, 0x46, 0x51, 0x84,
|
||||
0xfd, 0x01, 0x7a, 0xa4, 0x46, 0x51, 0xfd, 0x16, 0x76, 0x2b, 0x8b, 0xab, 0xc4, 0x23, 0xbb, 0x09,
|
||||
0xde, 0xfa, 0x13, 0x72, 0x27, 0x9c, 0xfe, 0x23, 0x27, 0xde, 0x00, 0xb9, 0xa2, 0xcd, 0xb9, 0xf5,
|
||||
0xc8, 0x05, 0x9c, 0x36, 0xe4, 0x86, 0x4c, 0x08, 0x4a, 0xcf, 0x08, 0x4a, 0xa4, 0x3e, 0x02, 0xa3,
|
||||
0x31, 0x98, 0x54, 0xf8, 0x7d, 0xca, 0x63, 0xe6, 0xe9, 0x51, 0x92, 0x03, 0xf3, 0x95, 0x9c, 0xbf,
|
||||
0xee, 0x3e, 0x95, 0x52, 0x37, 0xe3, 0x92, 0x76, 0x3b, 0x2e, 0x69, 0x1f, 0xc7, 0x25, 0xed, 0xf5,
|
||||
0x7d, 0x29, 0x75, 0x7b, 0x5f, 0x4a, 0xdd, 0xdd, 0x97, 0x52, 0xcf, 0x2d, 0xea, 0x8b, 0x4e, 0xbf,
|
||||
0x65, 0xb7, 0x59, 0x50, 0x4b, 0x7e, 0xca, 0xf1, 0xe7, 0x37, 0xee, 0x5d, 0xc4, 0x7f, 0xd0, 0x96,
|
||||
0xae, 0x5e, 0xef, 0xde, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf3, 0x2c, 0x53, 0x4a, 0xb6, 0x05,
|
||||
0x00, 0x00,
|
||||
}
|
||||
|
||||
func (m *TxResponse) Marshal() (dAtA []byte, err error) {
|
||||
|
||||
+4
-3
@@ -11,7 +11,8 @@ import (
|
||||
"github.com/tendermint/tendermint/crypto"
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
|
||||
tmamino "github.com/cosmos/cosmos-sdk/crypto/codec"
|
||||
"github.com/cosmos/cosmos-sdk/codec/legacy"
|
||||
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
|
||||
"github.com/cosmos/cosmos-sdk/types/bech32"
|
||||
)
|
||||
|
||||
@@ -625,7 +626,7 @@ func Bech32ifyPubKey(pkt Bech32PubKeyType, pubkey crypto.PubKey) (string, error)
|
||||
|
||||
}
|
||||
|
||||
return bech32.ConvertAndEncode(bech32Prefix, pubkey.Bytes())
|
||||
return bech32.ConvertAndEncode(bech32Prefix, legacy.Cdc.MustMarshalBinaryBare(pubkey))
|
||||
}
|
||||
|
||||
// MustBech32ifyPubKey calls Bech32ifyPubKey except it panics on error.
|
||||
@@ -660,7 +661,7 @@ func GetPubKeyFromBech32(pkt Bech32PubKeyType, pubkeyStr string) (crypto.PubKey,
|
||||
return nil, err
|
||||
}
|
||||
|
||||
pk, err := tmamino.PubKeyFromBytes(bz)
|
||||
pk, err := cryptocodec.PubKeyFromBytes(bz)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -13,14 +13,14 @@ import (
|
||||
)
|
||||
|
||||
func BenchmarkBech32ifyPubKey(b *testing.B) {
|
||||
var pk ed25519.PubKeyEd25519
|
||||
pk := make(ed25519.PubKey, ed25519.PubKeySize)
|
||||
rng := rand.New(rand.NewSource(time.Now().Unix()))
|
||||
|
||||
b.ResetTimer()
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
b.StopTimer()
|
||||
rng.Read(pk[:])
|
||||
rng.Read(pk)
|
||||
b.StartTimer()
|
||||
|
||||
_, err := types.Bech32ifyPubKey(types.Bech32PubKeyTypeConsPub, pk)
|
||||
@@ -29,14 +29,14 @@ func BenchmarkBech32ifyPubKey(b *testing.B) {
|
||||
}
|
||||
|
||||
func BenchmarkGetPubKeyFromBech32(b *testing.B) {
|
||||
var pk ed25519.PubKeyEd25519
|
||||
pk := make(ed25519.PubKey, ed25519.PubKeySize)
|
||||
rng := rand.New(rand.NewSource(time.Now().Unix()))
|
||||
|
||||
b.ResetTimer()
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
b.StopTimer()
|
||||
rng.Read(pk[:])
|
||||
rng.Read(pk)
|
||||
|
||||
pkStr, err := types.Bech32ifyPubKey(types.Bech32PubKeyTypeConsPub, pk)
|
||||
require.NoError(b, err)
|
||||
|
||||
@@ -58,10 +58,10 @@ func TestEmptyAddresses(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestRandBech32PubkeyConsistency(t *testing.T) {
|
||||
var pub ed25519.PubKeyEd25519
|
||||
pub := make(ed25519.PubKey, ed25519.PubKeySize)
|
||||
|
||||
for i := 0; i < 1000; i++ {
|
||||
rand.Read(pub[:])
|
||||
rand.Read(pub)
|
||||
|
||||
mustBech32AccPub := types.MustBech32ifyPubKey(types.Bech32PubKeyTypeAccPub, pub)
|
||||
bech32AccPub, err := types.Bech32ifyPubKey(types.Bech32PubKeyTypeAccPub, pub)
|
||||
@@ -116,10 +116,10 @@ func TestYAMLMarshalers(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestRandBech32AccAddrConsistency(t *testing.T) {
|
||||
var pub ed25519.PubKeyEd25519
|
||||
pub := make(ed25519.PubKey, ed25519.PubKeySize)
|
||||
|
||||
for i := 0; i < 1000; i++ {
|
||||
rand.Read(pub[:])
|
||||
rand.Read(pub)
|
||||
|
||||
acc := types.AccAddress(pub.Address())
|
||||
res := types.AccAddress{}
|
||||
@@ -154,7 +154,7 @@ func TestRandBech32AccAddrConsistency(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestValAddr(t *testing.T) {
|
||||
var pub ed25519.PubKeyEd25519
|
||||
pub := make(ed25519.PubKey, ed25519.PubKeySize)
|
||||
|
||||
for i := 0; i < 20; i++ {
|
||||
rand.Read(pub[:])
|
||||
@@ -194,7 +194,7 @@ func TestValAddr(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestConsAddress(t *testing.T) {
|
||||
var pub ed25519.PubKeyEd25519
|
||||
pub := make(ed25519.PubKey, ed25519.PubKeySize)
|
||||
|
||||
for i := 0; i < 20; i++ {
|
||||
rand.Read(pub[:])
|
||||
@@ -243,7 +243,7 @@ func RandString(n int) string {
|
||||
}
|
||||
|
||||
func TestConfiguredPrefix(t *testing.T) {
|
||||
var pub ed25519.PubKeyEd25519
|
||||
pub := make(ed25519.PubKey, ed25519.PubKeySize)
|
||||
for length := 1; length < 10; length++ {
|
||||
for times := 1; times < 20; times++ {
|
||||
rand.Read(pub[:])
|
||||
@@ -298,8 +298,8 @@ func TestConfiguredPrefix(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestAddressInterface(t *testing.T) {
|
||||
var pub ed25519.PubKeyEd25519
|
||||
rand.Read(pub[:])
|
||||
pub := make(ed25519.PubKey, ed25519.PubKeySize)
|
||||
rand.Read(pub)
|
||||
|
||||
addrs := []types.Address{
|
||||
types.ConsAddress(pub.Address()),
|
||||
|
||||
+6
-5
@@ -7,6 +7,7 @@ import (
|
||||
"github.com/gogo/protobuf/proto"
|
||||
abci "github.com/tendermint/tendermint/abci/types"
|
||||
"github.com/tendermint/tendermint/libs/log"
|
||||
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/store/gaskv"
|
||||
stypes "github.com/cosmos/cosmos-sdk/store/types"
|
||||
@@ -23,7 +24,7 @@ and standard additions here would be better just to add to the Context struct
|
||||
type Context struct {
|
||||
ctx context.Context
|
||||
ms MultiStore
|
||||
header abci.Header
|
||||
header tmproto.Header
|
||||
chainID string
|
||||
txBytes []byte
|
||||
logger log.Logger
|
||||
@@ -57,8 +58,8 @@ func (c Context) MinGasPrices() DecCoins { return c.minGasPrice }
|
||||
func (c Context) EventManager() *EventManager { return c.eventManager }
|
||||
|
||||
// clone the header before returning
|
||||
func (c Context) BlockHeader() abci.Header {
|
||||
var msg = proto.Clone(&c.header).(*abci.Header)
|
||||
func (c Context) BlockHeader() tmproto.Header {
|
||||
var msg = proto.Clone(&c.header).(*tmproto.Header)
|
||||
return *msg
|
||||
}
|
||||
|
||||
@@ -67,7 +68,7 @@ func (c Context) ConsensusParams() *abci.ConsensusParams {
|
||||
}
|
||||
|
||||
// create a new context
|
||||
func NewContext(ms MultiStore, header abci.Header, isCheckTx bool, logger log.Logger) Context {
|
||||
func NewContext(ms MultiStore, header tmproto.Header, isCheckTx bool, logger log.Logger) Context {
|
||||
// https://github.com/gogo/protobuf/issues/519
|
||||
header.Time = header.Time.UTC()
|
||||
return Context{
|
||||
@@ -96,7 +97,7 @@ func (c Context) WithMultiStore(ms MultiStore) Context {
|
||||
}
|
||||
|
||||
// WithBlockHeader returns a Context with an updated tendermint block header in UTC time.
|
||||
func (c Context) WithBlockHeader(header abci.Header) Context {
|
||||
func (c Context) WithBlockHeader(header tmproto.Header) Context {
|
||||
// https://github.com/gogo/protobuf/issues/519
|
||||
header.Time = header.Time.UTC()
|
||||
c.header = header
|
||||
|
||||
+14
-16
@@ -6,13 +6,11 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/tendermint/tendermint/libs/log"
|
||||
dbm "github.com/tendermint/tm-db"
|
||||
|
||||
abci "github.com/tendermint/tendermint/abci/types"
|
||||
|
||||
"github.com/tendermint/tendermint/crypto/secp256k1"
|
||||
"github.com/tendermint/tendermint/libs/log"
|
||||
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
|
||||
dbm "github.com/tendermint/tm-db"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/store"
|
||||
"github.com/cosmos/cosmos-sdk/types"
|
||||
@@ -51,7 +49,7 @@ func defaultContext(t *testing.T, key types.StoreKey) types.Context {
|
||||
cms.MountStoreWithDB(key, types.StoreTypeIAVL, db)
|
||||
err := cms.LoadLatestVersion()
|
||||
require.NoError(t, err)
|
||||
ctx := types.NewContext(cms, abci.Header{}, false, log.NewNopLogger())
|
||||
ctx := types.NewContext(cms, tmproto.Header{}, false, log.NewNopLogger())
|
||||
return ctx
|
||||
}
|
||||
|
||||
@@ -104,7 +102,7 @@ func TestContextWithCustom(t *testing.T) {
|
||||
var ctx types.Context
|
||||
require.True(t, ctx.IsZero())
|
||||
|
||||
header := abci.Header{}
|
||||
header := tmproto.Header{}
|
||||
height := int64(1)
|
||||
chainid := "chainid"
|
||||
ischeck := true
|
||||
@@ -164,7 +162,7 @@ func TestContextHeader(t *testing.T) {
|
||||
addr := secp256k1.GenPrivKey().PubKey().Address()
|
||||
proposer := types.ConsAddress(addr)
|
||||
|
||||
ctx = types.NewContext(nil, abci.Header{}, false, nil)
|
||||
ctx = types.NewContext(nil, tmproto.Header{}, false, nil)
|
||||
|
||||
ctx = ctx.
|
||||
WithBlockHeight(height).
|
||||
@@ -178,35 +176,35 @@ func TestContextHeader(t *testing.T) {
|
||||
|
||||
func TestContextHeaderClone(t *testing.T) {
|
||||
cases := map[string]struct {
|
||||
h abci.Header
|
||||
h tmproto.Header
|
||||
}{
|
||||
"empty": {
|
||||
h: abci.Header{},
|
||||
h: tmproto.Header{},
|
||||
},
|
||||
"height": {
|
||||
h: abci.Header{
|
||||
h: tmproto.Header{
|
||||
Height: 77,
|
||||
},
|
||||
},
|
||||
"time": {
|
||||
h: abci.Header{
|
||||
h: tmproto.Header{
|
||||
Time: time.Unix(12345677, 12345),
|
||||
},
|
||||
},
|
||||
"zero time": {
|
||||
h: abci.Header{
|
||||
h: tmproto.Header{
|
||||
Time: time.Unix(0, 0),
|
||||
},
|
||||
},
|
||||
"many items": {
|
||||
h: abci.Header{
|
||||
h: tmproto.Header{
|
||||
Height: 823,
|
||||
Time: time.Unix(9999999999, 0),
|
||||
ChainID: "silly-demo",
|
||||
},
|
||||
},
|
||||
"many items with hash": {
|
||||
h: abci.Header{
|
||||
h: tmproto.Header{
|
||||
Height: 823,
|
||||
Time: time.Unix(9999999999, 0),
|
||||
ChainID: "silly-demo",
|
||||
@@ -233,7 +231,7 @@ func TestContextHeaderClone(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestUnwrapSDKContext(t *testing.T) {
|
||||
sdkCtx := types.NewContext(nil, abci.Header{}, false, nil)
|
||||
sdkCtx := types.NewContext(nil, tmproto.Header{}, false, nil)
|
||||
ctx := types.WrapSDKContext(sdkCtx)
|
||||
sdkCtx2 := types.UnwrapSDKContext(ctx)
|
||||
require.Equal(t, sdkCtx, sdkCtx2)
|
||||
|
||||
+2
-3
@@ -6,7 +6,6 @@ import (
|
||||
"strings"
|
||||
|
||||
abci "github.com/tendermint/tendermint/abci/types"
|
||||
tmkv "github.com/tendermint/tendermint/libs/kv"
|
||||
)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -79,8 +78,8 @@ func (a Attribute) String() string {
|
||||
}
|
||||
|
||||
// ToKVPair converts an Attribute object into a Tendermint key/value pair.
|
||||
func (a Attribute) ToKVPair() tmkv.Pair {
|
||||
return tmkv.Pair{Key: toBytes(a.Key), Value: toBytes(a.Value)}
|
||||
func (a Attribute) ToKVPair() abci.EventAttribute {
|
||||
return abci.EventAttribute{Key: toBytes(a.Key), Value: toBytes(a.Value)}
|
||||
}
|
||||
|
||||
// AppendAttributes adds one or more attributes to an Event.
|
||||
|
||||
@@ -5,24 +5,21 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
|
||||
dbm "github.com/tendermint/tm-db"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/baseapp"
|
||||
"github.com/cosmos/cosmos-sdk/codec"
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
"github.com/cosmos/cosmos-sdk/store"
|
||||
"github.com/cosmos/cosmos-sdk/store/prefix"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/types/query"
|
||||
authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
|
||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/baseapp"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/types"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
abci "github.com/tendermint/tendermint/abci/types"
|
||||
dbm "github.com/tendermint/tm-db"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
"github.com/cosmos/cosmos-sdk/store"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/types/query"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -187,7 +184,7 @@ func ExamplePaginate() {
|
||||
|
||||
func setupTest() (*simapp.SimApp, sdk.Context, codec.Marshaler) {
|
||||
app := simapp.Setup(false)
|
||||
ctx := app.BaseApp.NewContext(false, abci.Header{Height: 1})
|
||||
ctx := app.BaseApp.NewContext(false, tmproto.Header{Height: 1})
|
||||
appCodec := app.AppCodec()
|
||||
|
||||
db := dbm.NewMemDB()
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"math/rand"
|
||||
|
||||
"github.com/tendermint/tendermint/crypto"
|
||||
"github.com/tendermint/tendermint/crypto/ed25519"
|
||||
"github.com/tendermint/tendermint/crypto/secp256k1"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
@@ -16,6 +17,7 @@ type Account struct {
|
||||
PrivKey crypto.PrivKey
|
||||
PubKey crypto.PubKey
|
||||
Address sdk.AccAddress
|
||||
ConsKey crypto.PrivKey
|
||||
}
|
||||
|
||||
// Equals returns true if two accounts are equal
|
||||
@@ -39,9 +41,11 @@ func RandomAccounts(r *rand.Rand, n int) []Account {
|
||||
privkeySeed := make([]byte, 15)
|
||||
r.Read(privkeySeed)
|
||||
|
||||
accs[i].PrivKey = secp256k1.GenPrivKeySecp256k1(privkeySeed)
|
||||
accs[i].PrivKey = secp256k1.GenPrivKeyFromSecret(privkeySeed)
|
||||
accs[i].PubKey = accs[i].PrivKey.PubKey()
|
||||
accs[i].Address = sdk.AccAddress(accs[i].PubKey.Address())
|
||||
|
||||
accs[i].ConsKey = ed25519.GenPrivKeyFromSecret(privkeySeed)
|
||||
}
|
||||
|
||||
return accs
|
||||
|
||||
+2
-1
@@ -91,7 +91,8 @@ func NewLevelDB(name, dir string) (db dbm.DB, err error) {
|
||||
err = fmt.Errorf("couldn't create db: %v", r)
|
||||
}
|
||||
}()
|
||||
return dbm.NewDB(name, backend, dir), err
|
||||
|
||||
return dbm.NewDB(name, backend, dir)
|
||||
}
|
||||
|
||||
// copy bytes
|
||||
|
||||
Reference in New Issue
Block a user