From 7e5b24c7421347fe089a6b241bf4cfa6b3b30ce0 Mon Sep 17 00:00:00 2001 From: KonradStaniec Date: Thu, 7 Nov 2024 06:49:19 +0100 Subject: [PATCH 1/2] Avoid unnecessary bech32 decoding --- proto/babylon/finality/v1/finality.proto | 4 +- x/finality/keeper/power_table_test.go | 3 +- x/finality/types/finality.pb.go | 148 ++++++++++++----------- x/finality/types/power_table.go | 4 +- x/finality/types/power_table_test.go | 72 +++++------ 5 files changed, 117 insertions(+), 114 deletions(-) diff --git a/proto/babylon/finality/v1/finality.proto b/proto/babylon/finality/v1/finality.proto index c0e22ac6d..00c00ee7e 100644 --- a/proto/babylon/finality/v1/finality.proto +++ b/proto/babylon/finality/v1/finality.proto @@ -27,8 +27,8 @@ message FinalityProviderDistInfo { // btc_pk is the Bitcoin secp256k1 PK of this finality provider // the PK follows encoding in BIP-340 spec bytes btc_pk = 1 [ (gogoproto.customtype) = "github.com/babylonlabs-io/babylon/types.BIP340PubKey" ]; - // addr is the address to receive commission from delegations. - string addr = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // addr is the bytes of the address to receive commission from delegations. + bytes addr = 2; // commission defines the commission rate of finality provider string commission = 3 [ (cosmos_proto.scalar) = "cosmos.Dec", diff --git a/x/finality/keeper/power_table_test.go b/x/finality/keeper/power_table_test.go index b3c0fe70f..2618c3ef2 100644 --- a/x/finality/keeper/power_table_test.go +++ b/x/finality/keeper/power_table_test.go @@ -5,6 +5,7 @@ import ( "sort" "testing" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" @@ -235,7 +236,7 @@ func FuzzRecordVotingPowerDistCache(f *testing.F) { activeFPs := dc.GetActiveFinalityProviderSet() for _, fpDistInfo := range activeFPs { require.Equal(t, fpDistInfo.TotalBondedSat, numBTCDels*stakingValue) - fp, ok := fpsWithVotingPowerMap[fpDistInfo.Addr] + fp, ok := fpsWithVotingPowerMap[sdk.AccAddress(fpDistInfo.Addr).String()] require.True(t, ok) require.Equal(t, fpDistInfo.Commission, fp.Commission) require.Len(t, fpDistInfo.BtcDels, int(numBTCDels)) diff --git a/x/finality/types/finality.pb.go b/x/finality/types/finality.pb.go index 67590f46f..af7508c87 100644 --- a/x/finality/types/finality.pb.go +++ b/x/finality/types/finality.pb.go @@ -82,8 +82,8 @@ type FinalityProviderDistInfo struct { // btc_pk is the Bitcoin secp256k1 PK of this finality provider // the PK follows encoding in BIP-340 spec BtcPk *github_com_babylonlabs_io_babylon_types.BIP340PubKey `protobuf:"bytes,1,opt,name=btc_pk,json=btcPk,proto3,customtype=github.com/babylonlabs-io/babylon/types.BIP340PubKey" json:"btc_pk,omitempty"` - // addr is the address to receive commission from delegations. - Addr string `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"` + // addr is the bytes of the address to receive commission from delegations. + Addr []byte `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"` // commission defines the commission rate of finality provider Commission *cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=commission,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"commission,omitempty"` // total_bonded_sat is the total amount of bonded BTC stake (in Satoshi) of the finality provider @@ -135,11 +135,11 @@ func (m *FinalityProviderDistInfo) XXX_DiscardUnknown() { var xxx_messageInfo_FinalityProviderDistInfo proto.InternalMessageInfo -func (m *FinalityProviderDistInfo) GetAddr() string { +func (m *FinalityProviderDistInfo) GetAddr() []byte { if m != nil { return m.Addr } - return "" + return nil } func (m *FinalityProviderDistInfo) GetTotalBondedSat() uint64 { @@ -546,69 +546,69 @@ func init() { var fileDescriptor_ca5b87e52e3e6d02 = []byte{ // 1008 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0x26, 0x4e, 0x6c, 0x8f, 0xed, 0xb4, 0x99, 0x86, 0x6a, 0x9b, 0x80, 0xed, 0x9a, 0x1f, - 0xb2, 0x50, 0xb3, 0xa6, 0x69, 0x85, 0xa0, 0x07, 0xa4, 0x6c, 0xd2, 0xaa, 0x81, 0x40, 0xad, 0xb5, - 0xcb, 0x01, 0x21, 0x8d, 0x66, 0x77, 0xc7, 0xbb, 0x83, 0x77, 0x67, 0x56, 0x3b, 0xb3, 0x21, 0xe6, - 0x0f, 0x40, 0x1c, 0xcb, 0x8d, 0x23, 0x47, 0x8e, 0x1c, 0xca, 0xff, 0x50, 0x71, 0xaa, 0x7a, 0x42, - 0x39, 0x04, 0x48, 0x0e, 0xfc, 0x1b, 0x68, 0x67, 0xd7, 0xeb, 0xb8, 0x0a, 0xa2, 0x82, 0xf6, 0x62, - 0xed, 0x7c, 0xf3, 0xf6, 0x7d, 0xef, 0x9b, 0xef, 0xbd, 0x59, 0x83, 0x8e, 0x8d, 0xed, 0x49, 0xc0, - 0x59, 0x6f, 0x44, 0x19, 0x0e, 0xa8, 0x9c, 0xf4, 0x0e, 0x6f, 0x16, 0xcf, 0x46, 0x14, 0x73, 0xc9, - 0xe1, 0x95, 0x3c, 0xc6, 0x28, 0xf0, 0xc3, 0x9b, 0x1b, 0xd7, 0x1c, 0x2e, 0x42, 0x2e, 0x90, 0x0a, - 0xe9, 0x65, 0x8b, 0x2c, 0x7e, 0x63, 0xdd, 0xe3, 0x1e, 0xcf, 0xf0, 0xf4, 0x29, 0x47, 0xd7, 0x70, - 0x48, 0x19, 0xef, 0xa9, 0xdf, 0x1c, 0x6a, 0x79, 0x9c, 0x7b, 0x01, 0xe9, 0xa9, 0x95, 0x9d, 0x8c, - 0x7a, 0x92, 0x86, 0x44, 0x48, 0x1c, 0x46, 0x59, 0x40, 0xe7, 0x57, 0x0d, 0xac, 0x7f, 0xce, 0x25, - 0x65, 0x5e, 0x9f, 0x7f, 0x4d, 0xe2, 0x3d, 0x2a, 0xe4, 0x2e, 0x76, 0x7c, 0x02, 0xbb, 0xe0, 0xb2, - 0xe4, 0x12, 0x07, 0xc8, 0xe6, 0xcc, 0x25, 0x2e, 0x12, 0x58, 0xea, 0x5a, 0x5b, 0xeb, 0x96, 0xac, - 0x55, 0x85, 0x9b, 0x0a, 0x1e, 0x60, 0x09, 0xbf, 0x04, 0x70, 0x5a, 0x76, 0x5a, 0xeb, 0x21, 0x75, - 0x49, 0x2c, 0xf4, 0xc5, 0xf6, 0x52, 0xb7, 0xb6, 0xbd, 0x65, 0x5c, 0xa0, 0xcc, 0xb8, 0x97, 0x3f, - 0xf7, 0xf3, 0xe8, 0x94, 0x75, 0x9f, 0x8d, 0xb8, 0xb5, 0x36, 0x7a, 0x6e, 0x47, 0xc0, 0xb7, 0xc0, - 0x2a, 0x4b, 0x42, 0x84, 0x1d, 0x49, 0x0f, 0x09, 0x1a, 0x45, 0x42, 0x5f, 0x6a, 0x6b, 0xdd, 0x86, - 0x55, 0x67, 0x49, 0xb8, 0xa3, 0xc0, 0x7b, 0x91, 0xb8, 0x53, 0xfa, 0xee, 0xc7, 0xd6, 0x42, 0xe7, - 0x97, 0x25, 0xa0, 0xff, 0x53, 0x6e, 0xf8, 0x00, 0xac, 0xd8, 0xd2, 0x41, 0xd1, 0x58, 0xc9, 0xa8, - 0x9b, 0x1f, 0x1c, 0x9f, 0xb4, 0x6e, 0x7b, 0x54, 0xfa, 0x89, 0x6d, 0x38, 0x3c, 0xec, 0xe5, 0x85, - 0x06, 0xd8, 0x16, 0x5b, 0x94, 0x4f, 0x97, 0x3d, 0x39, 0x89, 0x88, 0x30, 0xcc, 0xfd, 0xfe, 0xad, - 0xdb, 0xef, 0xf5, 0x13, 0xfb, 0x13, 0x32, 0xb1, 0x96, 0x6d, 0xe9, 0xf4, 0xc7, 0xf0, 0x06, 0x28, - 0x61, 0xd7, 0x8d, 0xf5, 0xc5, 0xb6, 0xd6, 0xad, 0x9a, 0xfa, 0xb3, 0xc7, 0x5b, 0xeb, 0xb9, 0x49, - 0x3b, 0xae, 0x1b, 0x13, 0x21, 0x06, 0x32, 0xa6, 0xcc, 0xb3, 0x54, 0x14, 0xfc, 0x14, 0x00, 0x87, - 0x87, 0x21, 0x15, 0x82, 0x72, 0xa6, 0x34, 0x54, 0xcd, 0xad, 0xe3, 0x93, 0xd6, 0x66, 0xf6, 0x8e, - 0x70, 0xc7, 0x06, 0xe5, 0xbd, 0x10, 0x4b, 0xdf, 0x38, 0x20, 0x1e, 0x76, 0x26, 0x7b, 0xc4, 0x79, - 0xf6, 0x78, 0x0b, 0xe4, 0x29, 0xf7, 0x88, 0x63, 0x9d, 0x4b, 0x70, 0xa1, 0x3d, 0xa5, 0x0b, 0xed, - 0xf9, 0x08, 0x54, 0x52, 0xdd, 0x2e, 0x09, 0x84, 0xbe, 0xac, 0x4c, 0x79, 0xf3, 0x42, 0x53, 0xcc, - 0xe1, 0xee, 0x1e, 0x09, 0x0a, 0x2b, 0xca, 0xb6, 0x74, 0xf6, 0x48, 0x20, 0xe0, 0xdb, 0x60, 0x95, - 0x0a, 0x54, 0xf4, 0x0d, 0x71, 0xf5, 0x95, 0xb6, 0xd6, 0xad, 0x58, 0x0d, 0x2a, 0x86, 0x33, 0x10, - 0x6e, 0x82, 0x2a, 0x15, 0xe8, 0x2b, 0x4c, 0x03, 0xe2, 0xea, 0x65, 0x15, 0x51, 0xa1, 0xe2, 0x63, - 0xb5, 0x86, 0x6f, 0x00, 0x40, 0x05, 0x12, 0x01, 0x16, 0x3e, 0x71, 0xf5, 0x8a, 0xda, 0xad, 0x52, - 0x31, 0xc8, 0x80, 0xce, 0x9f, 0x1a, 0x58, 0x9d, 0xa7, 0x7f, 0xf9, 0x6e, 0x7d, 0x08, 0x6a, 0x42, - 0xe2, 0x31, 0x89, 0xd1, 0x0b, 0x99, 0x06, 0xb2, 0xe0, 0x14, 0x84, 0xef, 0x80, 0x4b, 0xe9, 0x8a, - 0x32, 0x0f, 0xc9, 0x23, 0xe4, 0x63, 0xe1, 0x67, 0xfe, 0x59, 0x8d, 0x1c, 0x1e, 0x1e, 0xdd, 0xc7, - 0xc2, 0x4f, 0x8f, 0x20, 0xf3, 0x64, 0x66, 0x46, 0x45, 0x01, 0x03, 0x2c, 0x3b, 0x08, 0xd4, 0xf7, - 0x99, 0x4b, 0x8e, 0x88, 0x6b, 0x06, 0xdc, 0x19, 0xc3, 0xab, 0x60, 0xc5, 0x27, 0xd4, 0xf3, 0xa7, - 0x53, 0x95, 0xaf, 0xe0, 0x35, 0x50, 0xc1, 0x51, 0x94, 0xb1, 0xa4, 0x45, 0xd6, 0xad, 0x32, 0x8e, - 0x22, 0x95, 0xff, 0x75, 0x50, 0xcd, 0x0c, 0xfb, 0x86, 0xb8, 0xaa, 0x82, 0x8a, 0x35, 0x03, 0x3a, - 0xdf, 0x6b, 0xa0, 0xd1, 0x4f, 0x6c, 0x0b, 0x33, 0x77, 0x37, 0xed, 0x13, 0x09, 0xaf, 0x83, 0xba, - 0x90, 0x38, 0x96, 0x68, 0x8e, 0xa8, 0xa6, 0xb0, 0xfb, 0x19, 0x5b, 0x1b, 0xa4, 0x73, 0x84, 0xa2, - 0xc4, 0x46, 0x31, 0x66, 0xae, 0x62, 0x2c, 0x59, 0x80, 0x25, 0x61, 0x9e, 0x0a, 0x36, 0xf3, 0xbe, - 0x95, 0x21, 0x61, 0x52, 0xb1, 0xd6, 0xad, 0x73, 0x48, 0x2a, 0x9a, 0x44, 0xdc, 0xf1, 0x11, 0x4b, - 0xc2, 0xa9, 0x68, 0x05, 0x7c, 0x96, 0x84, 0x9d, 0x6f, 0x4b, 0xa0, 0x72, 0x37, 0x1d, 0x43, 0xe6, - 0x10, 0x38, 0x04, 0xd5, 0x51, 0x84, 0x5e, 0x92, 0xab, 0xe5, 0x51, 0x64, 0x2a, 0x5f, 0xaf, 0x83, - 0xba, 0x9d, 0x1e, 0xe8, 0x54, 0x64, 0xa6, 0xa0, 0xa6, 0xb0, 0x5c, 0xe4, 0x43, 0x50, 0x29, 0x04, - 0x2a, 0x01, 0xe6, 0x9d, 0xe3, 0x93, 0xd6, 0xfb, 0x2f, 0xca, 0x3b, 0x70, 0x7c, 0xc6, 0xe3, 0x38, - 0x3f, 0x10, 0xab, 0x1c, 0xe5, 0x27, 0x73, 0x03, 0x40, 0x07, 0x33, 0xce, 0xa8, 0x83, 0x03, 0x54, - 0x78, 0x56, 0x52, 0x27, 0x74, 0xb9, 0xd8, 0xd9, 0xc9, 0xcd, 0xeb, 0x80, 0xc6, 0x88, 0xc7, 0xe3, - 0x59, 0xe0, 0xb2, 0x0a, 0xac, 0xa5, 0xe0, 0x34, 0x26, 0x02, 0x57, 0x67, 0x19, 0x8b, 0x3b, 0x55, - 0x50, 0x4f, 0x8d, 0xdc, 0x7f, 0x2b, 0xfb, 0xee, 0x83, 0xe1, 0x60, 0x40, 0x3d, 0x6b, 0xbd, 0xc8, - 0x3c, 0xbd, 0x21, 0x07, 0xd4, 0x83, 0x23, 0xb0, 0xa6, 0xaa, 0x9a, 0x23, 0x2b, 0xff, 0x6f, 0xb2, - 0x4b, 0x69, 0xd2, 0x73, 0x3c, 0x9d, 0x1f, 0x16, 0xc1, 0xe6, 0xf3, 0x37, 0xf3, 0x80, 0x7a, 0x8c, - 0x32, 0x4f, 0x8d, 0xfb, 0x2b, 0xeb, 0x8d, 0xb9, 0x01, 0x48, 0x7b, 0x63, 0x69, 0x7e, 0x00, 0xb6, - 0xc1, 0x6b, 0xe9, 0x95, 0x4a, 0x5c, 0xa4, 0x3a, 0x46, 0x20, 0x87, 0x27, 0x4c, 0x92, 0x58, 0x35, - 0xca, 0x92, 0x75, 0x25, 0xdb, 0x54, 0x23, 0x2b, 0x76, 0xb3, 0x2d, 0x78, 0x00, 0xea, 0xd9, 0x3d, - 0x87, 0x12, 0x26, 0x69, 0xa0, 0x2c, 0xaf, 0x6d, 0x6f, 0x18, 0xd9, 0xb7, 0xd6, 0x98, 0x7e, 0x6b, - 0x8d, 0xe2, 0x7a, 0x34, 0x1b, 0x4f, 0x4e, 0x5a, 0x0b, 0x8f, 0x7e, 0x6f, 0x69, 0x3f, 0xfd, 0xf5, - 0xf3, 0xbb, 0x9a, 0x55, 0xcb, 0x5e, 0x7f, 0x98, 0xbe, 0x6d, 0x1e, 0x3c, 0x39, 0x6d, 0x6a, 0x4f, - 0x4f, 0x9b, 0xda, 0x1f, 0xa7, 0x4d, 0xed, 0xd1, 0x59, 0x73, 0xe1, 0xe9, 0x59, 0x73, 0xe1, 0xb7, - 0xb3, 0xe6, 0xc2, 0x17, 0xdb, 0xff, 0xae, 0xfe, 0x68, 0xf6, 0xaf, 0x42, 0x1d, 0x84, 0xbd, 0xa2, - 0xd8, 0x6f, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x98, 0xec, 0xc2, 0x24, 0x76, 0x08, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xcf, 0x26, 0x4e, 0x6c, 0x8f, 0xed, 0xb4, 0x99, 0xe6, 0x5b, 0x6d, 0x93, 0x2f, 0x76, 0x6a, + 0x7e, 0xc8, 0x42, 0x78, 0x4d, 0xd3, 0x0a, 0x41, 0x0f, 0x48, 0xd9, 0xb8, 0x55, 0x03, 0x81, 0x5a, + 0x6b, 0x97, 0x03, 0x42, 0x1a, 0xcd, 0xee, 0x8e, 0x77, 0x07, 0xef, 0xce, 0xac, 0x76, 0x66, 0x43, + 0xcc, 0x1f, 0x80, 0x38, 0x96, 0x1b, 0x12, 0x17, 0x8e, 0x1c, 0x39, 0xf4, 0x8f, 0xa8, 0x38, 0x55, + 0x3d, 0xa1, 0x1c, 0x02, 0x24, 0x07, 0xfe, 0x0d, 0xb4, 0xb3, 0xeb, 0x75, 0x5c, 0x05, 0x81, 0xa0, + 0x5c, 0xa2, 0x99, 0xcf, 0x3c, 0xbf, 0xcf, 0x7b, 0xef, 0xf3, 0xde, 0xdb, 0x80, 0xb6, 0x8d, 0xed, + 0x69, 0xc0, 0x59, 0x6f, 0x4c, 0x19, 0x0e, 0xa8, 0x9c, 0xf6, 0x8e, 0x6e, 0x15, 0x67, 0x23, 0x8a, + 0xb9, 0xe4, 0xf0, 0x5a, 0x6e, 0x63, 0x14, 0xf8, 0xd1, 0xad, 0xad, 0x1b, 0x0e, 0x17, 0x21, 0x17, + 0x48, 0x99, 0xf4, 0xb2, 0x4b, 0x66, 0xbf, 0xb5, 0xe9, 0x71, 0x8f, 0x67, 0x78, 0x7a, 0xca, 0xd1, + 0x0d, 0x1c, 0x52, 0xc6, 0x7b, 0xea, 0x6f, 0x0e, 0xb5, 0x3c, 0xce, 0xbd, 0x80, 0xf4, 0xd4, 0xcd, + 0x4e, 0xc6, 0x3d, 0x49, 0x43, 0x22, 0x24, 0x0e, 0xa3, 0xcc, 0xa0, 0xfd, 0x93, 0x06, 0x36, 0x3f, + 0xe1, 0x92, 0x32, 0x6f, 0xc0, 0xbf, 0x20, 0x71, 0x9f, 0x0a, 0xb9, 0x8f, 0x1d, 0x9f, 0xc0, 0x0e, + 0xb8, 0x2a, 0xb9, 0xc4, 0x01, 0xb2, 0x39, 0x73, 0x89, 0x8b, 0x04, 0x96, 0xba, 0xb6, 0xa3, 0x75, + 0x4a, 0xd6, 0xba, 0xc2, 0x4d, 0x05, 0x0f, 0xb1, 0x84, 0x9f, 0x01, 0x38, 0x0b, 0x3b, 0x8d, 0xf5, + 0x88, 0xba, 0x24, 0x16, 0xfa, 0xf2, 0xce, 0x4a, 0xa7, 0xb6, 0xdb, 0x35, 0x2e, 0xc9, 0xcc, 0xb8, + 0x9f, 0x9f, 0x07, 0xb9, 0x75, 0xca, 0x7a, 0xc0, 0xc6, 0xdc, 0xda, 0x18, 0xbf, 0xf0, 0x22, 0xe0, + 0x6b, 0x60, 0x9d, 0x25, 0x21, 0xc2, 0x8e, 0xa4, 0x47, 0x04, 0x8d, 0x23, 0xa1, 0xaf, 0xec, 0x68, + 0x9d, 0x86, 0x55, 0x67, 0x49, 0xb8, 0xa7, 0xc0, 0xfb, 0x91, 0xb8, 0x5b, 0xfa, 0xfa, 0xfb, 0xd6, + 0x52, 0xfb, 0xbb, 0x15, 0xa0, 0xff, 0x99, 0x6f, 0xf8, 0x10, 0xac, 0xd9, 0xd2, 0x41, 0xd1, 0x44, + 0xa5, 0x51, 0x37, 0xdf, 0x3d, 0x39, 0x6d, 0xdd, 0xf1, 0xa8, 0xf4, 0x13, 0xdb, 0x70, 0x78, 0xd8, + 0xcb, 0x03, 0x0d, 0xb0, 0x2d, 0xba, 0x94, 0xcf, 0xae, 0x3d, 0x39, 0x8d, 0x88, 0x30, 0xcc, 0x83, + 0xc1, 0xed, 0x3b, 0x6f, 0x0f, 0x12, 0xfb, 0x43, 0x32, 0xb5, 0x56, 0x6d, 0xe9, 0x0c, 0x26, 0x10, + 0x82, 0x12, 0x76, 0xdd, 0x58, 0x5f, 0x4e, 0xdd, 0x59, 0xea, 0x0c, 0x3f, 0x02, 0xc0, 0xe1, 0x61, + 0x48, 0x85, 0xa0, 0x9c, 0xa9, 0x48, 0xab, 0x66, 0xf7, 0xe4, 0xb4, 0xb5, 0x9d, 0xc9, 0x27, 0xdc, + 0x89, 0x41, 0x79, 0x2f, 0xc4, 0xd2, 0x37, 0x0e, 0x89, 0x87, 0x9d, 0x69, 0x9f, 0x38, 0xcf, 0x9f, + 0x74, 0x41, 0xae, 0x6e, 0x9f, 0x38, 0xd6, 0x05, 0x07, 0x97, 0x8a, 0x50, 0xba, 0x54, 0x84, 0xf7, + 0x41, 0x25, 0xcd, 0xce, 0x25, 0x81, 0xd0, 0x57, 0x55, 0xe9, 0x5f, 0xbd, 0xb4, 0xf4, 0xe6, 0x68, + 0xbf, 0x4f, 0x82, 0xa2, 0xe0, 0x65, 0x5b, 0x3a, 0x7d, 0x12, 0x08, 0xf8, 0x3a, 0x58, 0xa7, 0x02, + 0x15, 0xdd, 0x41, 0x5c, 0x7d, 0x6d, 0x47, 0xeb, 0x54, 0xac, 0x06, 0x15, 0xa3, 0x39, 0x08, 0xb7, + 0x41, 0x95, 0x0a, 0xf4, 0x39, 0xa6, 0x01, 0x71, 0xf5, 0xb2, 0xb2, 0xa8, 0x50, 0xf1, 0x81, 0xba, + 0xc3, 0x57, 0x00, 0xa0, 0x02, 0x89, 0x00, 0x0b, 0x9f, 0xb8, 0x7a, 0x45, 0xbd, 0x56, 0xa9, 0x18, + 0x66, 0x40, 0xfb, 0x37, 0x0d, 0xac, 0x2f, 0xd2, 0xbf, 0x7c, 0x4d, 0xde, 0x03, 0x35, 0x21, 0xf1, + 0x84, 0xc4, 0xa8, 0x90, 0xa6, 0x6a, 0xea, 0xcf, 0x9f, 0x74, 0x37, 0xf3, 0x0a, 0xef, 0xb9, 0x6e, + 0x4c, 0x84, 0x18, 0xca, 0x98, 0x32, 0xcf, 0x02, 0x99, 0x71, 0x0a, 0xc2, 0x37, 0xc0, 0x95, 0xf4, + 0x46, 0x99, 0x87, 0xe4, 0x31, 0xf2, 0xb1, 0xf0, 0x33, 0xfd, 0xac, 0x46, 0x0e, 0x8f, 0x8e, 0x1f, + 0x60, 0xe1, 0xa7, 0x25, 0xc8, 0x34, 0x99, 0x8b, 0x51, 0x51, 0xc0, 0x10, 0xcb, 0x36, 0x02, 0xf5, + 0x03, 0xe6, 0x92, 0x63, 0xe2, 0x9a, 0x01, 0x77, 0x26, 0xf0, 0x3a, 0x58, 0xf3, 0x09, 0xf5, 0xfc, + 0xd9, 0xec, 0xe4, 0x37, 0x78, 0x03, 0x54, 0x70, 0x14, 0x65, 0x2c, 0x59, 0xff, 0x94, 0x71, 0x14, + 0x29, 0xff, 0xff, 0x07, 0xd5, 0x4c, 0xb0, 0x2f, 0x89, 0xab, 0x22, 0xa8, 0x58, 0x73, 0xa0, 0xfd, + 0x8d, 0x06, 0x1a, 0x83, 0xc4, 0xb6, 0x30, 0x73, 0xf7, 0xd3, 0x3e, 0x91, 0xf0, 0x26, 0xa8, 0x0b, + 0x89, 0x63, 0x89, 0x16, 0x88, 0x6a, 0x0a, 0x7b, 0x90, 0xb1, 0xed, 0x80, 0x74, 0x5a, 0x50, 0x94, + 0xd8, 0x28, 0xc6, 0xcc, 0x55, 0x8c, 0x25, 0x0b, 0xb0, 0x24, 0xcc, 0x5d, 0xc1, 0x66, 0xde, 0xb7, + 0x32, 0x24, 0x4c, 0x2a, 0xd6, 0xba, 0x75, 0x01, 0x49, 0x93, 0x26, 0x11, 0x77, 0x7c, 0xc4, 0x92, + 0x70, 0x96, 0xb4, 0x02, 0x3e, 0x4e, 0xc2, 0xf6, 0x57, 0x25, 0x50, 0xb9, 0x97, 0x0e, 0x1b, 0x73, + 0x08, 0x1c, 0x81, 0xea, 0x38, 0x42, 0x2f, 0x49, 0xd5, 0xf2, 0x38, 0x32, 0x95, 0xae, 0x37, 0x41, + 0xdd, 0x4e, 0x0b, 0x3a, 0x4b, 0x32, 0xcb, 0xa0, 0xa6, 0xb0, 0x3c, 0xc9, 0x47, 0xa0, 0x52, 0x24, + 0xa8, 0x12, 0x30, 0xef, 0x9e, 0x9c, 0xb6, 0xde, 0xf9, 0xbb, 0xbc, 0x43, 0xc7, 0x67, 0x3c, 0x8e, + 0xf3, 0x82, 0x58, 0xe5, 0x28, 0xaf, 0xcc, 0x5b, 0x00, 0x3a, 0x98, 0x71, 0x46, 0x1d, 0x1c, 0xa0, + 0x42, 0xb3, 0x92, 0xaa, 0xd0, 0xd5, 0xe2, 0x65, 0x2f, 0x17, 0xaf, 0x0d, 0x1a, 0x63, 0x1e, 0x4f, + 0xe6, 0x86, 0xab, 0xca, 0xb0, 0x96, 0x82, 0x33, 0x9b, 0x08, 0x5c, 0x9f, 0x7b, 0x2c, 0x36, 0xa7, + 0xa0, 0x9e, 0x1a, 0xb9, 0x7f, 0x16, 0xf6, 0xbd, 0x87, 0xa3, 0xe1, 0x90, 0x7a, 0xd6, 0x66, 0xe1, + 0x79, 0xb6, 0x07, 0x87, 0xd4, 0x83, 0x63, 0xb0, 0xa1, 0xa2, 0x5a, 0x20, 0x2b, 0xff, 0x6b, 0xb2, + 0x2b, 0xa9, 0xd3, 0x0b, 0x3c, 0xed, 0x6f, 0x97, 0xc1, 0xf6, 0x8b, 0xfb, 0x77, 0x48, 0x3d, 0x46, + 0x99, 0xa7, 0xc6, 0xfd, 0x3f, 0xeb, 0x8d, 0x85, 0x01, 0x48, 0x7b, 0x63, 0x65, 0x71, 0x00, 0x76, + 0xc1, 0xff, 0xd2, 0x95, 0x4a, 0x5c, 0xa4, 0x3a, 0x46, 0x20, 0x87, 0x27, 0x4c, 0x92, 0x58, 0x35, + 0xca, 0x8a, 0x75, 0x2d, 0x7b, 0x54, 0x23, 0x2b, 0xf6, 0xb3, 0x27, 0x78, 0x08, 0xea, 0xd9, 0x9e, + 0x43, 0x09, 0x93, 0x34, 0x50, 0x92, 0xd7, 0x76, 0xb7, 0x8c, 0xec, 0x8b, 0x6a, 0xcc, 0xbe, 0xa8, + 0x46, 0xb1, 0x1e, 0xcd, 0xc6, 0xd3, 0xd3, 0xd6, 0xd2, 0xe3, 0x5f, 0x5a, 0xda, 0x0f, 0xbf, 0xff, + 0xf8, 0xa6, 0x66, 0xd5, 0xb2, 0x9f, 0x3f, 0x4a, 0x7f, 0x6d, 0x1e, 0x3e, 0x3d, 0x6b, 0x6a, 0xcf, + 0xce, 0x9a, 0xda, 0xaf, 0x67, 0x4d, 0xed, 0xf1, 0x79, 0x73, 0xe9, 0xd9, 0x79, 0x73, 0xe9, 0xe7, + 0xf3, 0xe6, 0xd2, 0xa7, 0xbb, 0x7f, 0x9d, 0xfd, 0xf1, 0xfc, 0x7f, 0x07, 0x55, 0x08, 0x7b, 0x4d, + 0xb1, 0xdf, 0xfe, 0x23, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xee, 0xba, 0xbd, 0x5c, 0x08, 0x00, 0x00, } func (m *VotingPowerDistCache) Marshal() (dAtA []byte, err error) { @@ -1437,7 +1437,7 @@ func (m *FinalityProviderDistInfo) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Addr", wireType) } - var stringLen uint64 + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowFinality @@ -1447,23 +1447,25 @@ func (m *FinalityProviderDistInfo) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if byteLen < 0 { return ErrInvalidLengthFinality } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthFinality } if postIndex > l { return io.ErrUnexpectedEOF } - m.Addr = string(dAtA[iNdEx:postIndex]) + m.Addr = append(m.Addr[:0], dAtA[iNdEx:postIndex]...) + if m.Addr == nil { + m.Addr = []byte{} + } iNdEx = postIndex case 3: if wireType != 2 { diff --git a/x/finality/types/power_table.go b/x/finality/types/power_table.go index 2fd0073dc..19bf001dd 100644 --- a/x/finality/types/power_table.go +++ b/x/finality/types/power_table.go @@ -163,7 +163,7 @@ func (dc *VotingPowerDistCache) GetFinalityProviderPortion(v *FinalityProviderDi func NewFinalityProviderDistInfo(fp *bstypes.FinalityProvider) *FinalityProviderDistInfo { return &FinalityProviderDistInfo{ BtcPk: fp.BtcPk, - Addr: fp.Addr, + Addr: sdk.MustAccAddressFromBech32(fp.Addr), Commission: fp.Commission, TotalBondedSat: 0, BtcDels: []*BTCDelDistInfo{}, @@ -171,7 +171,7 @@ func NewFinalityProviderDistInfo(fp *bstypes.FinalityProvider) *FinalityProvider } func (v *FinalityProviderDistInfo) GetAddress() sdk.AccAddress { - return sdk.MustAccAddressFromBech32(v.Addr) + return v.Addr } func (v *FinalityProviderDistInfo) AddBTCDel(btcDel *bstypes.BTCDelegation) { diff --git a/x/finality/types/power_table_test.go b/x/finality/types/power_table_test.go index 2775d6fc9..0c2e445e6 100644 --- a/x/finality/types/power_table_test.go +++ b/x/finality/types/power_table_test.go @@ -200,55 +200,55 @@ func TestSortFinalityProvidersWithZeroedVotingPower(t *testing.T) { { name: "Sort by voting power", fps: []*types.FinalityProviderDistInfo{ - {Addr: "fp1", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, - {Addr: "fp2", TotalBondedSat: 200, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, - {Addr: "fp3", TotalBondedSat: 150, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, + {Addr: []byte("fp1"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, + {Addr: []byte("fp2"), TotalBondedSat: 200, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, + {Addr: []byte("fp3"), TotalBondedSat: 150, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, }, expected: []*types.FinalityProviderDistInfo{ - {Addr: "fp2", TotalBondedSat: 200, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, - {Addr: "fp3", TotalBondedSat: 150, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, - {Addr: "fp1", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, + {Addr: []byte("fp2"), TotalBondedSat: 200, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, + {Addr: []byte("fp3"), TotalBondedSat: 150, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, + {Addr: []byte("fp1"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, }, }, { name: "Jailed and non-timestamped providers at the end", fps: []*types.FinalityProviderDistInfo{ - {Addr: "fp1", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x04}}, - {Addr: "fp2", TotalBondedSat: 200, IsJailed: true, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, - {Addr: "fp3", TotalBondedSat: 150, IsJailed: false, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x03}}, - {Addr: "fp4", TotalBondedSat: 50, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, + {Addr: []byte("fp1"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x04}}, + {Addr: []byte("fp2"), TotalBondedSat: 200, IsJailed: true, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, + {Addr: []byte("fp3"), TotalBondedSat: 150, IsJailed: false, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x03}}, + {Addr: []byte("fp4"), TotalBondedSat: 50, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, }, expected: []*types.FinalityProviderDistInfo{ - {Addr: "fp1", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x04}}, - {Addr: "fp4", TotalBondedSat: 50, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, - {Addr: "fp2", TotalBondedSat: 200, IsJailed: true, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, - {Addr: "fp3", TotalBondedSat: 150, IsJailed: false, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x03}}, + {Addr: []byte("fp1"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x04}}, + {Addr: []byte("fp4"), TotalBondedSat: 50, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, + {Addr: []byte("fp2"), TotalBondedSat: 200, IsJailed: true, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, + {Addr: []byte("fp3"), TotalBondedSat: 150, IsJailed: false, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x03}}, }, }, { name: "Equal voting power, sort by BTC public key", fps: []*types.FinalityProviderDistInfo{ - {Addr: "fp1", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, - {Addr: "fp2", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, - {Addr: "fp3", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, + {Addr: []byte("fp1"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, + {Addr: []byte("fp2"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, + {Addr: []byte("fp3"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, }, expected: []*types.FinalityProviderDistInfo{ - {Addr: "fp2", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, - {Addr: "fp3", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, - {Addr: "fp1", TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, + {Addr: []byte("fp2"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x01}}, + {Addr: []byte("fp3"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x02}}, + {Addr: []byte("fp1"), TotalBondedSat: 100, IsJailed: false, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, }, }, { name: "Zeroed voting power, sort by BTC public key", fps: []*types.FinalityProviderDistInfo{ - {Addr: "fp1", TotalBondedSat: 200, IsJailed: true, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, - {Addr: "fp2", TotalBondedSat: 150, IsJailed: false, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x01}}, - {Addr: "fp3", TotalBondedSat: 100, IsJailed: true, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x02}}, + {Addr: []byte("fp1"), TotalBondedSat: 200, IsJailed: true, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, + {Addr: []byte("fp2"), TotalBondedSat: 150, IsJailed: false, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x01}}, + {Addr: []byte("fp3"), TotalBondedSat: 100, IsJailed: true, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x02}}, }, expected: []*types.FinalityProviderDistInfo{ - {Addr: "fp2", TotalBondedSat: 150, IsJailed: false, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x01}}, - {Addr: "fp3", TotalBondedSat: 100, IsJailed: true, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x02}}, - {Addr: "fp1", TotalBondedSat: 200, IsJailed: true, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, + {Addr: []byte("fp2"), TotalBondedSat: 150, IsJailed: false, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x01}}, + {Addr: []byte("fp3"), TotalBondedSat: 100, IsJailed: true, IsTimestamped: false, BtcPk: &bbn.BIP340PubKey{0x02}}, + {Addr: []byte("fp1"), TotalBondedSat: 200, IsJailed: true, IsTimestamped: true, BtcPk: &bbn.BIP340PubKey{0x03}}, }, }, } @@ -287,11 +287,11 @@ func FuzzSortingDeterminism(f *testing.F) { require.NoError(t, err) fpsWithMeta := []*types.FinalityProviderDistInfo{ - {TotalBondedSat: vp0, IsJailed: false, IsTimestamped: true, Addr: "addr0", BtcPk: pk1}, - {TotalBondedSat: vp1, IsJailed: false, IsTimestamped: true, Addr: "addr1", BtcPk: pk2}, - {TotalBondedSat: vp2, IsJailed: false, IsTimestamped: true, Addr: "addr2", BtcPk: pk3}, - {TotalBondedSat: vp3, IsJailed: false, IsTimestamped: true, Addr: "addr3", BtcPk: pk4}, - {TotalBondedSat: vp4, IsJailed: false, IsTimestamped: true, Addr: "addr4", BtcPk: pk5}, + {TotalBondedSat: vp0, IsJailed: false, IsTimestamped: true, Addr: []byte("addr0"), BtcPk: pk1}, + {TotalBondedSat: vp1, IsJailed: false, IsTimestamped: true, Addr: []byte("addr1"), BtcPk: pk2}, + {TotalBondedSat: vp2, IsJailed: false, IsTimestamped: true, Addr: []byte("addr2"), BtcPk: pk3}, + {TotalBondedSat: vp3, IsJailed: false, IsTimestamped: true, Addr: []byte("addr3"), BtcPk: pk4}, + {TotalBondedSat: vp4, IsJailed: false, IsTimestamped: true, Addr: []byte("addr4"), BtcPk: pk5}, } jailedIdx := datagen.RandomInt(r, len(fpsWithMeta)) noTimestampedIdx := datagen.RandomIntOtherThan(r, int(jailedIdx), len(fpsWithMeta)) @@ -302,11 +302,11 @@ func FuzzSortingDeterminism(f *testing.F) { fpsWithMeta[noTimestampedIdx].IsTimestamped = false fpsWithMeta1 := []*types.FinalityProviderDistInfo{ - {TotalBondedSat: vp0, IsJailed: false, IsTimestamped: true, Addr: "addr0", BtcPk: pk1}, - {TotalBondedSat: vp1, IsJailed: false, IsTimestamped: true, Addr: "addr1", BtcPk: pk2}, - {TotalBondedSat: vp2, IsJailed: false, IsTimestamped: true, Addr: "addr2", BtcPk: pk3}, - {TotalBondedSat: vp3, IsJailed: false, IsTimestamped: true, Addr: "addr3", BtcPk: pk4}, - {TotalBondedSat: vp4, IsJailed: false, IsTimestamped: true, Addr: "addr4", BtcPk: pk5}, + {TotalBondedSat: vp0, IsJailed: false, IsTimestamped: true, Addr: []byte("addr0"), BtcPk: pk1}, + {TotalBondedSat: vp1, IsJailed: false, IsTimestamped: true, Addr: []byte("addr1"), BtcPk: pk2}, + {TotalBondedSat: vp2, IsJailed: false, IsTimestamped: true, Addr: []byte("addr2"), BtcPk: pk3}, + {TotalBondedSat: vp3, IsJailed: false, IsTimestamped: true, Addr: []byte("addr3"), BtcPk: pk4}, + {TotalBondedSat: vp4, IsJailed: false, IsTimestamped: true, Addr: []byte("addr4"), BtcPk: pk5}, } fpsWithMeta1[jailedIdx].IsJailed = true From 99c1679e84f3387675eeba9447341de567795f40 Mon Sep 17 00:00:00 2001 From: KonradStaniec Date: Thu, 7 Nov 2024 06:51:52 +0100 Subject: [PATCH 2/2] change log entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec4540fdf..5db71c67a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,11 @@ unbonding value mismatch unbonding output * [#253](https://github.com/babylonlabs-io/babylon/pull/253) Upgrade cometbft dependency +### State Machine Breaking + +* [#254](https://github.com/babylonlabs-io/babylon/pull/254) Avoid constant +bech-32 decoding in power table + ## v0.15.0 ### State Machine Breaking