From 643a0ea41876d05c6ce72b0acfb74506961977fd Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Thu, 5 Sep 2024 11:03:53 +0800 Subject: [PATCH 01/12] detail the return error for operator info --- x/operator/keeper/opt.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x/operator/keeper/opt.go b/x/operator/keeper/opt.go index f58f4ef8a..fc0ab9b96 100644 --- a/x/operator/keeper/opt.go +++ b/x/operator/keeper/opt.go @@ -1,6 +1,7 @@ package keeper import ( + errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" delegationtypes "github.com/ExocoreNetwork/exocore/x/delegation/types" @@ -19,7 +20,7 @@ type AssetPriceAndDecimal struct { func (k *Keeper) OptIn(ctx sdk.Context, operatorAddress sdk.AccAddress, avsAddr string) error { // check that the operator is registered if !k.IsOperator(ctx, operatorAddress) { - return delegationtypes.ErrOperatorNotExist + return errorsmod.Wrapf(delegationtypes.ErrOperatorNotExist, "operator is :%s", operatorAddress) } // check that the AVS is registered if isAvs, _ := k.avsKeeper.IsAVS(ctx, avsAddr); !isAvs { From a7f2be16314d5395f8ec14e38d3f872af0b79fe7 Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Tue, 15 Oct 2024 09:33:32 +0800 Subject: [PATCH 02/12] add a file for validator snapshot --- x/operator/keeper/validator_snapshot.go | 1 + 1 file changed, 1 insertion(+) create mode 100644 x/operator/keeper/validator_snapshot.go diff --git a/x/operator/keeper/validator_snapshot.go b/x/operator/keeper/validator_snapshot.go new file mode 100644 index 000000000..b55569d4a --- /dev/null +++ b/x/operator/keeper/validator_snapshot.go @@ -0,0 +1 @@ +package keeper From 1dc08b59f5c52807aa1b00ebeaa35f3a3c78cf3f Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Fri, 18 Oct 2024 14:59:56 +0800 Subject: [PATCH 03/12] add the voting power snapshot data structure --- proto/exocore/operator/v1/tx.proto | 33 + x/operator/keeper/validator_snapshot.go | 1 - x/operator/keeper/voting_power_snapshot.go | 44 ++ x/operator/types/keys.go | 17 + x/operator/types/tx.pb.go | 779 ++++++++++++++++++--- 5 files changed, 758 insertions(+), 116 deletions(-) delete mode 100644 x/operator/keeper/validator_snapshot.go create mode 100644 x/operator/keeper/voting_power_snapshot.go diff --git a/proto/exocore/operator/v1/tx.proto b/proto/exocore/operator/v1/tx.proto index 0be9ee8ce..0b10b4d28 100644 --- a/proto/exocore/operator/v1/tx.proto +++ b/proto/exocore/operator/v1/tx.proto @@ -47,6 +47,39 @@ message OperatorOptedUSDValue { ]; } +// OperatorVotingPower represents the voting power for the specified operator address +message OperatorVotingPower { + // operator_addr is the operator address,its type should be a sdk.AccAddress + string operator_addr = 1 + [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // voting_power is the active voting power for the above operator address + string voting_power = 2 + [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; +} + +// VotingPowerSnapshot is used to record the historical voting power for AVSs +message VotingPowerSnapshot { + // height is the block height at which this snapshot is generated + int64 height = 1; + // total_voting_power is the total voting power of specified AVS + string total_voting_power = 2 + [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; + // operator_voting_powers records the active voting power of all operators + // for the specified AVS + repeated OperatorVotingPower voting_power_set = 3; + // last_changed_key is used to indicate the key of most recent change when + // the voting_power_set is nil, which can help to fall back to the correct key. + string last_changed_key = 4; +} + // ClientChainEarningAddrList is the list of client chain earning addresses. // Because the reward token provide by the AVS might be located at different client chain, the operator need to // provide the different client chain address to receive the token rewards. diff --git a/x/operator/keeper/validator_snapshot.go b/x/operator/keeper/validator_snapshot.go deleted file mode 100644 index b55569d4a..000000000 --- a/x/operator/keeper/validator_snapshot.go +++ /dev/null @@ -1 +0,0 @@ -package keeper diff --git a/x/operator/keeper/voting_power_snapshot.go b/x/operator/keeper/voting_power_snapshot.go new file mode 100644 index 000000000..60d229834 --- /dev/null +++ b/x/operator/keeper/voting_power_snapshot.go @@ -0,0 +1,44 @@ +package keeper + +import ( + assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" + "github.com/ExocoreNetwork/exocore/x/operator/types" + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "strconv" +) + +func (k *Keeper) StoreVotingPowerSnapshot(ctx sdk.Context, avsAddr, epochIdentifier string, epochNumber int64, height *int64, snapshot *types.VotingPowerSnapshot) error { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) + key := assetstype.GetJoinedStoreKey(avsAddr, epochIdentifier, strconv.FormatInt(epochNumber, 10)) + if height != nil && *height >= 0 { + key = assetstype.GetJoinedStoreKey(string(key), strconv.FormatInt(*height, 10)) + } + bz := k.cdc.MustMarshal(snapshot) + store.Set(key, bz) + return nil +} + +func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr, epochIdentifier string, epochNumber int64, height *int64) (*types.VotingPowerSnapshot, error) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) + var ret types.VotingPowerSnapshot + key := assetstype.GetJoinedStoreKey(avsAddr, epochIdentifier, strconv.FormatInt(epochNumber, 10)) + if height != nil && *height >= 0 { + key = assetstype.GetJoinedStoreKey(string(key), strconv.FormatInt(*height, 10)) + } + value := store.Get(key) + if value == nil { + return nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: key is %s", key) + } + k.cdc.MustUnmarshal(value, &ret) + + // fall back to the last snapshot if the voting power set is nil + if ret.VotingPowerSet == nil { + value = store.Get([]byte(ret.LastChangedKey)) + if value == nil { + return nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: fall back to the key %s", ret.LastChangedKey) + } + k.cdc.MustUnmarshal(value, &ret) + } + return &ret, nil +} diff --git a/x/operator/types/keys.go b/x/operator/types/keys.go index 1033799af..070caebf5 100644 --- a/x/operator/types/keys.go +++ b/x/operator/types/keys.go @@ -67,6 +67,9 @@ const ( // BytePrefixForOperatorKeyRemovalForChainID is the prefix to store that the operator with // the given address is in the process of unbonding their key for the given chainID. BytePrefixForOperatorKeyRemovalForChainID + + // BytePrefixForVotingPowerSnapshot is the prefix to store the voting power snapshot for all AVSs + BytePrefixForVotingPowerSnapshot ) var ( @@ -94,6 +97,20 @@ var ( // processedSlashHeight + '/' + assetID + '/' + stakerID -> SlashAmount // processedSlashHeight + '/' + assetID + '/' + operatorAddr -> SlashAmount KeyPrefixSlashAssetsState = []byte{prefixSlashAssetsState} + + // KeyPrefixVotingPowerSnapshot key-value: + // Including the epoch identifier in the key is used to address the case that AVSs will change + // their epoch configuration. + // In general, the key used to store the voting power snapshot is based on the epoch number as + // the smallest unit, since our voting power is updated once per epoch. However, when a slash event occurs, + // the voting power needs to be updated immediately to ensure the slash takes effect for the relevant operator. + // In this case, we need to store the voting power information at the corresponding block height. + // Therefore, when constructing the key, the slash height is appended as a suffix. + // This way, when executing a slash, we can accurately retrieve the historical voting power information + // using the provided epoch number and slash event height. + // AVSAddr+ '/' + epochIdentifier + '/' + epochNumber -> VotingPowerSnapshot + // AVSAddr+ '/' + epochIdentifier + '/' + epochNumber + '/' + slashHeight -> VotingPowerSnapshot + KeyPrefixVotingPowerSnapshot = []byte{BytePrefixForVotingPowerSnapshot} ) // ModuleAddress is the native module address for EVM diff --git a/x/operator/types/tx.pb.go b/x/operator/types/tx.pb.go index 1f5a8c1ed..faac055fc 100644 --- a/x/operator/types/tx.pb.go +++ b/x/operator/types/tx.pb.go @@ -152,6 +152,122 @@ func (m *OperatorOptedUSDValue) XXX_DiscardUnknown() { var xxx_messageInfo_OperatorOptedUSDValue proto.InternalMessageInfo +// OperatorVotingPower represents the voting power for the specified operator address +type OperatorVotingPower struct { + // operator_addr is the operator address,its type should be a sdk.AccAddress + OperatorAddr string `protobuf:"bytes,1,opt,name=operator_addr,json=operatorAddr,proto3" json:"operator_addr,omitempty"` + // voting_power is the active voting power for the above operator address + VotingPower github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=voting_power,json=votingPower,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"voting_power"` +} + +func (m *OperatorVotingPower) Reset() { *m = OperatorVotingPower{} } +func (m *OperatorVotingPower) String() string { return proto.CompactTextString(m) } +func (*OperatorVotingPower) ProtoMessage() {} +func (*OperatorVotingPower) Descriptor() ([]byte, []int) { + return fileDescriptor_b229d5663e4df167, []int{2} +} +func (m *OperatorVotingPower) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OperatorVotingPower) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OperatorVotingPower.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 *OperatorVotingPower) XXX_Merge(src proto.Message) { + xxx_messageInfo_OperatorVotingPower.Merge(m, src) +} +func (m *OperatorVotingPower) XXX_Size() int { + return m.Size() +} +func (m *OperatorVotingPower) XXX_DiscardUnknown() { + xxx_messageInfo_OperatorVotingPower.DiscardUnknown(m) +} + +var xxx_messageInfo_OperatorVotingPower proto.InternalMessageInfo + +func (m *OperatorVotingPower) GetOperatorAddr() string { + if m != nil { + return m.OperatorAddr + } + return "" +} + +// VotingPowerSnapshot is used to record the historical voting power for AVSs +type VotingPowerSnapshot struct { + // height is the block height at which this snapshot is generated + Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` + // total_voting_power is the total voting power of specified AVS + TotalVotingPower github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=total_voting_power,json=totalVotingPower,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"total_voting_power"` + // operator_voting_powers records the active voting power of all operators + // for the specified AVS + VotingPowerSet []*OperatorVotingPower `protobuf:"bytes,3,rep,name=voting_power_set,json=votingPowerSet,proto3" json:"voting_power_set,omitempty"` + // last_changed_key is used to indicate the key of most recent change when + // the voting_power_set is nil, which can help to fall back to the correct key. + LastChangedKey string `protobuf:"bytes,4,opt,name=last_changed_key,json=lastChangedKey,proto3" json:"last_changed_key,omitempty"` +} + +func (m *VotingPowerSnapshot) Reset() { *m = VotingPowerSnapshot{} } +func (m *VotingPowerSnapshot) String() string { return proto.CompactTextString(m) } +func (*VotingPowerSnapshot) ProtoMessage() {} +func (*VotingPowerSnapshot) Descriptor() ([]byte, []int) { + return fileDescriptor_b229d5663e4df167, []int{3} +} +func (m *VotingPowerSnapshot) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *VotingPowerSnapshot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_VotingPowerSnapshot.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 *VotingPowerSnapshot) XXX_Merge(src proto.Message) { + xxx_messageInfo_VotingPowerSnapshot.Merge(m, src) +} +func (m *VotingPowerSnapshot) XXX_Size() int { + return m.Size() +} +func (m *VotingPowerSnapshot) XXX_DiscardUnknown() { + xxx_messageInfo_VotingPowerSnapshot.DiscardUnknown(m) +} + +var xxx_messageInfo_VotingPowerSnapshot proto.InternalMessageInfo + +func (m *VotingPowerSnapshot) GetHeight() int64 { + if m != nil { + return m.Height + } + return 0 +} + +func (m *VotingPowerSnapshot) GetVotingPowerSet() []*OperatorVotingPower { + if m != nil { + return m.VotingPowerSet + } + return nil +} + +func (m *VotingPowerSnapshot) GetLastChangedKey() string { + if m != nil { + return m.LastChangedKey + } + return "" +} + // ClientChainEarningAddrList is the list of client chain earning addresses. // Because the reward token provide by the AVS might be located at different client chain, the operator need to // provide the different client chain address to receive the token rewards. @@ -164,7 +280,7 @@ func (m *ClientChainEarningAddrList) Reset() { *m = ClientChainEarningAd func (m *ClientChainEarningAddrList) String() string { return proto.CompactTextString(m) } func (*ClientChainEarningAddrList) ProtoMessage() {} func (*ClientChainEarningAddrList) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{2} + return fileDescriptor_b229d5663e4df167, []int{4} } func (m *ClientChainEarningAddrList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -212,7 +328,7 @@ func (m *ClientChainEarningAddrInfo) Reset() { *m = ClientChainEarningAd func (m *ClientChainEarningAddrInfo) String() string { return proto.CompactTextString(m) } func (*ClientChainEarningAddrInfo) ProtoMessage() {} func (*ClientChainEarningAddrInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{3} + return fileDescriptor_b229d5663e4df167, []int{5} } func (m *ClientChainEarningAddrInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -274,7 +390,7 @@ func (m *OperatorInfo) Reset() { *m = OperatorInfo{} } func (m *OperatorInfo) String() string { return proto.CompactTextString(m) } func (*OperatorInfo) ProtoMessage() {} func (*OperatorInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{4} + return fileDescriptor_b229d5663e4df167, []int{6} } func (m *OperatorInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -354,7 +470,7 @@ func (m *OptedInfo) Reset() { *m = OptedInfo{} } func (m *OptedInfo) String() string { return proto.CompactTextString(m) } func (*OptedInfo) ProtoMessage() {} func (*OptedInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{5} + return fileDescriptor_b229d5663e4df167, []int{7} } func (m *OptedInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -423,7 +539,7 @@ func (m *OptedInAssetState) Reset() { *m = OptedInAssetState{} } func (m *OptedInAssetState) String() string { return proto.CompactTextString(m) } func (*OptedInAssetState) ProtoMessage() {} func (*OptedInAssetState) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{6} + return fileDescriptor_b229d5663e4df167, []int{8} } func (m *OptedInAssetState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -466,7 +582,7 @@ func (m *SlashFromUndelegation) Reset() { *m = SlashFromUndelegation{} } func (m *SlashFromUndelegation) String() string { return proto.CompactTextString(m) } func (*SlashFromUndelegation) ProtoMessage() {} func (*SlashFromUndelegation) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{7} + return fileDescriptor_b229d5663e4df167, []int{9} } func (m *SlashFromUndelegation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -521,7 +637,7 @@ func (m *SlashFromAssetsPool) Reset() { *m = SlashFromAssetsPool{} } func (m *SlashFromAssetsPool) String() string { return proto.CompactTextString(m) } func (*SlashFromAssetsPool) ProtoMessage() {} func (*SlashFromAssetsPool) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{8} + return fileDescriptor_b229d5663e4df167, []int{10} } func (m *SlashFromAssetsPool) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -573,7 +689,7 @@ func (m *SlashExecutionInfo) Reset() { *m = SlashExecutionInfo{} } func (m *SlashExecutionInfo) String() string { return proto.CompactTextString(m) } func (*SlashExecutionInfo) ProtoMessage() {} func (*SlashExecutionInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{9} + return fileDescriptor_b229d5663e4df167, []int{11} } func (m *SlashExecutionInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -638,7 +754,7 @@ func (m *OperatorSlashInfo) Reset() { *m = OperatorSlashInfo{} } func (m *OperatorSlashInfo) String() string { return proto.CompactTextString(m) } func (*OperatorSlashInfo) ProtoMessage() {} func (*OperatorSlashInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{10} + return fileDescriptor_b229d5663e4df167, []int{12} } func (m *OperatorSlashInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -721,7 +837,7 @@ func (m *RegisterOperatorReq) Reset() { *m = RegisterOperatorReq{} } func (m *RegisterOperatorReq) String() string { return proto.CompactTextString(m) } func (*RegisterOperatorReq) ProtoMessage() {} func (*RegisterOperatorReq) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{11} + return fileDescriptor_b229d5663e4df167, []int{13} } func (m *RegisterOperatorReq) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -758,7 +874,7 @@ func (m *RegisterOperatorResponse) Reset() { *m = RegisterOperatorRespon func (m *RegisterOperatorResponse) String() string { return proto.CompactTextString(m) } func (*RegisterOperatorResponse) ProtoMessage() {} func (*RegisterOperatorResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{12} + return fileDescriptor_b229d5663e4df167, []int{14} } func (m *RegisterOperatorResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -803,7 +919,7 @@ func (m *OptIntoAVSReq) Reset() { *m = OptIntoAVSReq{} } func (m *OptIntoAVSReq) String() string { return proto.CompactTextString(m) } func (*OptIntoAVSReq) ProtoMessage() {} func (*OptIntoAVSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{13} + return fileDescriptor_b229d5663e4df167, []int{15} } func (m *OptIntoAVSReq) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -840,7 +956,7 @@ func (m *OptIntoAVSResponse) Reset() { *m = OptIntoAVSResponse{} } func (m *OptIntoAVSResponse) String() string { return proto.CompactTextString(m) } func (*OptIntoAVSResponse) ProtoMessage() {} func (*OptIntoAVSResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{14} + return fileDescriptor_b229d5663e4df167, []int{16} } func (m *OptIntoAVSResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -881,7 +997,7 @@ func (m *OptOutOfAVSReq) Reset() { *m = OptOutOfAVSReq{} } func (m *OptOutOfAVSReq) String() string { return proto.CompactTextString(m) } func (*OptOutOfAVSReq) ProtoMessage() {} func (*OptOutOfAVSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{15} + return fileDescriptor_b229d5663e4df167, []int{17} } func (m *OptOutOfAVSReq) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -918,7 +1034,7 @@ func (m *OptOutOfAVSResponse) Reset() { *m = OptOutOfAVSResponse{} } func (m *OptOutOfAVSResponse) String() string { return proto.CompactTextString(m) } func (*OptOutOfAVSResponse) ProtoMessage() {} func (*OptOutOfAVSResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{16} + return fileDescriptor_b229d5663e4df167, []int{18} } func (m *OptOutOfAVSResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -965,7 +1081,7 @@ func (m *SetConsKeyReq) Reset() { *m = SetConsKeyReq{} } func (m *SetConsKeyReq) String() string { return proto.CompactTextString(m) } func (*SetConsKeyReq) ProtoMessage() {} func (*SetConsKeyReq) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{17} + return fileDescriptor_b229d5663e4df167, []int{19} } func (m *SetConsKeyReq) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1002,7 +1118,7 @@ func (m *SetConsKeyResponse) Reset() { *m = SetConsKeyResponse{} } func (m *SetConsKeyResponse) String() string { return proto.CompactTextString(m) } func (*SetConsKeyResponse) ProtoMessage() {} func (*SetConsKeyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{18} + return fileDescriptor_b229d5663e4df167, []int{20} } func (m *SetConsKeyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1035,6 +1151,8 @@ func init() { proto.RegisterEnum("exocore.operator.v1.SlashType", SlashType_name, SlashType_value) proto.RegisterType((*DecValueField)(nil), "exocore.operator.v1.DecValueField") proto.RegisterType((*OperatorOptedUSDValue)(nil), "exocore.operator.v1.OperatorOptedUSDValue") + proto.RegisterType((*OperatorVotingPower)(nil), "exocore.operator.v1.OperatorVotingPower") + proto.RegisterType((*VotingPowerSnapshot)(nil), "exocore.operator.v1.VotingPowerSnapshot") proto.RegisterType((*ClientChainEarningAddrList)(nil), "exocore.operator.v1.ClientChainEarningAddrList") proto.RegisterType((*ClientChainEarningAddrInfo)(nil), "exocore.operator.v1.ClientChainEarningAddrInfo") proto.RegisterType((*OperatorInfo)(nil), "exocore.operator.v1.OperatorInfo") @@ -1057,104 +1175,112 @@ func init() { func init() { proto.RegisterFile("exocore/operator/v1/tx.proto", fileDescriptor_b229d5663e4df167) } var fileDescriptor_b229d5663e4df167 = []byte{ - // 1545 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcb, 0x4f, 0x1b, 0xd7, - 0x1a, 0x67, 0x6c, 0x5e, 0xfe, 0x6c, 0x63, 0x33, 0xe4, 0xe1, 0xf8, 0xe6, 0xe2, 0x30, 0xb9, 0x21, - 0x84, 0x7b, 0xb1, 0x05, 0xb9, 0xb9, 0x52, 0x72, 0xef, 0xe2, 0x1a, 0x0c, 0x8a, 0x1b, 0xb0, 0xd1, - 0x0c, 0x44, 0x6a, 0xaa, 0x6a, 0x34, 0x8c, 0x0f, 0x66, 0xc2, 0x78, 0xce, 0x74, 0xce, 0xb1, 0x0b, - 0x59, 0x55, 0x59, 0x45, 0x55, 0x17, 0x95, 0xb2, 0xaa, 0xda, 0x45, 0x56, 0x55, 0x97, 0x59, 0x64, - 0x5b, 0xb5, 0xdd, 0x65, 0x19, 0xa5, 0x5d, 0x54, 0x5d, 0xd0, 0x8a, 0x54, 0x4a, 0xff, 0x88, 0x56, - 0xaa, 0xce, 0x99, 0x33, 0x66, 0x9c, 0xd8, 0x24, 0x28, 0xa4, 0x1b, 0xe0, 0x7c, 0xaf, 0xdf, 0xef, - 0x7b, 0x9c, 0xef, 0xd8, 0xc0, 0x59, 0xb4, 0x83, 0x4d, 0xec, 0xa1, 0x02, 0x76, 0x91, 0x67, 0x50, - 0xec, 0x15, 0x5a, 0xb3, 0x05, 0xba, 0x93, 0x77, 0x3d, 0x4c, 0xb1, 0x3c, 0x26, 0xb4, 0xf9, 0x40, - 0x9b, 0x6f, 0xcd, 0x66, 0x47, 0x8d, 0x86, 0xe5, 0xe0, 0x02, 0xff, 0xe9, 0xdb, 0x65, 0x4f, 0x9b, - 0x98, 0x34, 0x30, 0x29, 0x34, 0x48, 0x9d, 0xf9, 0x37, 0x48, 0x5d, 0x28, 0xfe, 0x21, 0x14, 0x84, - 0x1a, 0xdb, 0x96, 0xc3, 0x94, 0x1b, 0x88, 0x1a, 0xb3, 0xc1, 0x59, 0x58, 0x9d, 0xf1, 0xad, 0x74, - 0x7e, 0x2a, 0xf8, 0x07, 0xa1, 0x3a, 0x51, 0xc7, 0x75, 0xec, 0xcb, 0xd9, 0x5f, 0x42, 0x7a, 0xb6, - 0x8e, 0x71, 0xdd, 0x46, 0x05, 0xc3, 0xb5, 0x0a, 0x86, 0xe3, 0x60, 0x6a, 0x50, 0x0b, 0x3b, 0xc2, - 0x47, 0x41, 0x90, 0x2c, 0x21, 0xf3, 0xa6, 0x61, 0x37, 0xd1, 0x92, 0x85, 0xec, 0x9a, 0xbc, 0x06, - 0x83, 0x46, 0x03, 0x37, 0x1d, 0x9a, 0x91, 0xce, 0x49, 0x53, 0xb1, 0xf9, 0xff, 0x3d, 0xde, 0xcb, - 0xf5, 0xfd, 0xb4, 0x97, 0x9b, 0xac, 0x5b, 0x74, 0xab, 0xb9, 0x91, 0x37, 0x71, 0x43, 0xa0, 0x8a, - 0x5f, 0x33, 0xa4, 0xb6, 0x5d, 0xa0, 0xbb, 0x2e, 0x22, 0xf9, 0x12, 0x32, 0x9f, 0x3e, 0x9a, 0x01, - 0x41, 0xaa, 0x84, 0x4c, 0x55, 0xc4, 0x52, 0x7e, 0x8f, 0xc0, 0xc9, 0xaa, 0xa8, 0x4b, 0xd5, 0xa5, - 0xa8, 0xb6, 0xae, 0x95, 0x38, 0xa8, 0xec, 0xc1, 0x08, 0x41, 0xf6, 0xa6, 0xde, 0x24, 0x35, 0xbd, - 0xc5, 0x24, 0x02, 0x77, 0xf9, 0x68, 0xb8, 0xfb, 0x7b, 0xb9, 0x84, 0x86, 0xec, 0xcd, 0x20, 0xee, - 0x0b, 0x3c, 0x12, 0x0c, 0x63, 0x9d, 0xd4, 0x7c, 0xcc, 0x26, 0xa4, 0x28, 0xa6, 0x86, 0x1d, 0x02, - 0x8d, 0x70, 0xd0, 0x95, 0x23, 0x83, 0x26, 0xd7, 0x58, 0xa0, 0x1e, 0xa8, 0x49, 0x8e, 0xd2, 0x86, - 0xdd, 0x81, 0xb4, 0x61, 0x52, 0xab, 0x85, 0x42, 0xb8, 0x51, 0x8e, 0x5b, 0x39, 0x32, 0xee, 0x48, - 0x91, 0x47, 0xea, 0x01, 0x3c, 0xe2, 0xe3, 0x04, 0xc8, 0xca, 0x2e, 0x64, 0x17, 0x6c, 0x0b, 0x39, - 0x74, 0x61, 0xcb, 0xb0, 0x9c, 0x45, 0xc3, 0x73, 0x2c, 0xa7, 0x5e, 0xac, 0xd5, 0xbc, 0x65, 0x8b, - 0x50, 0xf9, 0x3d, 0x18, 0x45, 0xbe, 0x48, 0xb7, 0x9c, 0x4d, 0xac, 0xdb, 0x16, 0x61, 0xdd, 0x8f, - 0x4e, 0xc5, 0xe7, 0x0a, 0xf9, 0x2e, 0x53, 0x9d, 0xef, 0x1e, 0xab, 0xec, 0x6c, 0x62, 0x35, 0x25, - 0x22, 0xb1, 0x03, 0x0b, 0xae, 0x7c, 0x26, 0xf5, 0xc2, 0x66, 0x26, 0xf2, 0xff, 0x41, 0xb6, 0xef, - 0xe8, 0x26, 0x37, 0xd0, 0x4d, 0x66, 0xa1, 0x5b, 0x35, 0x3e, 0x02, 0xfd, 0xf3, 0x63, 0xfb, 0x7b, - 0xb9, 0xd4, 0xf2, 0x9d, 0x90, 0x77, 0xb9, 0xa4, 0xa6, 0xec, 0x0e, 0x41, 0x4d, 0xbe, 0x0a, 0x67, - 0x3a, 0xdc, 0x83, 0x54, 0x8c, 0x5a, 0xcd, 0xf3, 0xdb, 0xaa, 0x9e, 0x32, 0xbb, 0x12, 0x50, 0xbe, - 0x8b, 0x40, 0x22, 0x98, 0x4a, 0xce, 0xe6, 0x3c, 0x24, 0x85, 0x3b, 0xf1, 0xfd, 0xf9, 0x2c, 0xaa, - 0x89, 0x40, 0xc8, 0xbc, 0xe4, 0x09, 0x48, 0x18, 0xae, 0xeb, 0xe1, 0x16, 0x0a, 0x63, 0xc4, 0x85, - 0x8c, 0x9b, 0xfc, 0x0b, 0xe4, 0xa0, 0x5e, 0x7a, 0x03, 0x51, 0x83, 0xd7, 0xd5, 0xef, 0xb5, 0x9a, - 0x0e, 0x34, 0x2b, 0x88, 0x1a, 0x1c, 0xd5, 0x86, 0x6c, 0xb7, 0x0c, 0x04, 0x85, 0xfe, 0x73, 0xd2, - 0x11, 0x1b, 0xc1, 0xea, 0xae, 0x9e, 0x7e, 0x39, 0x67, 0x9f, 0xfe, 0x0a, 0x80, 0x89, 0x1b, 0x0d, - 0x8b, 0x10, 0x0b, 0x3b, 0x99, 0x01, 0x1e, 0x5d, 0xc9, 0x8b, 0xe1, 0x09, 0x76, 0x8d, 0xd8, 0x3d, - 0xf9, 0x85, 0xb6, 0xe5, 0x7c, 0x8c, 0xcd, 0xe8, 0x57, 0xcf, 0x1f, 0x4e, 0x4b, 0x6a, 0x28, 0x80, - 0xf2, 0x85, 0x04, 0x31, 0x7e, 0xa3, 0x79, 0x2a, 0x17, 0x60, 0x84, 0xd8, 0x06, 0xd9, 0xd2, 0x4d, - 0xec, 0x50, 0xcf, 0x30, 0xc5, 0x16, 0x51, 0x93, 0x5c, 0xba, 0x20, 0x84, 0xf2, 0x24, 0xa4, 0x30, - 0xf3, 0xd1, 0x2d, 0x47, 0xdf, 0x42, 0x56, 0x7d, 0x8b, 0xf2, 0x2a, 0xf6, 0xab, 0x49, 0xec, 0x87, - 0xba, 0xce, 0x85, 0xf2, 0x14, 0xa4, 0x7d, 0x3b, 0xdc, 0xa4, 0x81, 0x61, 0x94, 0x1b, 0x8e, 0x70, - 0x79, 0xb5, 0x49, 0x85, 0xe5, 0x29, 0x18, 0xbc, 0x6d, 0x58, 0x36, 0xaa, 0xf1, 0x7a, 0x0d, 0xab, - 0xe2, 0xa4, 0x7c, 0x2d, 0xc1, 0xa8, 0xa0, 0x57, 0x24, 0x04, 0x51, 0x8d, 0x1a, 0x14, 0xbd, 0xd1, - 0x92, 0x2b, 0x3b, 0x34, 0x74, 0xdb, 0xca, 0x0e, 0x0d, 0x96, 0x9c, 0xac, 0xc2, 0x40, 0x78, 0x99, - 0xbc, 0xd9, 0xe6, 0xf4, 0x43, 0x29, 0xdf, 0x4a, 0x70, 0x52, 0x63, 0xb5, 0x5b, 0xf2, 0x70, 0x63, - 0xdd, 0xa9, 0x21, 0x1b, 0xd5, 0xf9, 0x02, 0x97, 0x2f, 0x41, 0x8c, 0x75, 0x0b, 0x79, 0xc1, 0x85, - 0x89, 0xcd, 0x27, 0xf6, 0xf7, 0x72, 0xc3, 0x1a, 0x17, 0x96, 0x4b, 0xea, 0xb0, 0xaf, 0x2e, 0xd7, - 0xe4, 0x49, 0x18, 0x36, 0x58, 0xf2, 0xcc, 0xd2, 0xe7, 0x16, 0xdf, 0xdf, 0xcb, 0x0d, 0xf1, 0x82, - 0x94, 0x4b, 0xea, 0x10, 0x57, 0x96, 0xc3, 0xbb, 0x3f, 0x7a, 0x7c, 0x65, 0x51, 0xee, 0x4b, 0x30, - 0xd6, 0x4e, 0x81, 0x63, 0x92, 0x55, 0x8c, 0xed, 0x0e, 0x56, 0xd2, 0x6b, 0xb1, 0x8a, 0x1c, 0x23, - 0xab, 0xcf, 0xa3, 0x20, 0x73, 0x56, 0x8b, 0x3b, 0xc8, 0x6c, 0xb2, 0x8a, 0xf2, 0x01, 0xae, 0x43, - 0xda, 0x1f, 0x60, 0xd7, 0xc3, 0x2e, 0xf6, 0x98, 0xfc, 0x58, 0x1e, 0xc2, 0x14, 0x8f, 0xba, 0xda, - 0x0e, 0x2a, 0xbf, 0x0f, 0x71, 0x1f, 0xe8, 0xf8, 0x46, 0x06, 0x78, 0x40, 0xff, 0xad, 0x31, 0x60, - 0xcc, 0x0f, 0xdf, 0x0c, 0xcd, 0x0c, 0xc9, 0x44, 0xf9, 0x56, 0x9f, 0xee, 0xba, 0x4c, 0xba, 0x8e, - 0xd9, 0x7c, 0x3f, 0xa3, 0xa4, 0xca, 0x3c, 0x58, 0x58, 0x41, 0xe4, 0x5b, 0x30, 0xea, 0x43, 0xf0, - 0x46, 0x11, 0xdd, 0xc5, 0xd8, 0xce, 0xf4, 0x73, 0x80, 0xa9, 0xc3, 0x01, 0x0e, 0x86, 0x40, 0x84, - 0xf7, 0xab, 0x73, 0x20, 0x56, 0xfe, 0x88, 0xb0, 0x6b, 0xeb, 0xbb, 0x72, 0xb7, 0xa3, 0x6c, 0x97, - 0x4b, 0x90, 0x26, 0xcd, 0x8d, 0x86, 0x45, 0xd9, 0xe6, 0x08, 0xad, 0x97, 0xa8, 0x9a, 0x6a, 0xcb, - 0xc5, 0xda, 0x98, 0x80, 0x04, 0x6a, 0xb1, 0xcd, 0x1b, 0x5a, 0x2e, 0x51, 0x35, 0xce, 0x65, 0xc2, - 0xe4, 0x6f, 0x10, 0xb3, 0x88, 0xde, 0x42, 0x14, 0xb7, 0x97, 0xcb, 0xb0, 0x45, 0x6e, 0xf2, 0x73, - 0xd7, 0x71, 0x19, 0x78, 0x1b, 0xe3, 0xf2, 0x77, 0xf0, 0xbb, 0xab, 0x33, 0x8f, 0xcc, 0xe0, 0x39, - 0x69, 0x2a, 0xa9, 0xc6, 0xb8, 0x64, 0x6d, 0xd7, 0x45, 0x72, 0x05, 0x46, 0x50, 0x30, 0xc7, 0xfe, - 0x63, 0x33, 0xc4, 0x17, 0xfb, 0xc5, 0xde, 0x8d, 0xe8, 0x98, 0x7b, 0x35, 0x89, 0xc2, 0x47, 0xe5, - 0x1b, 0x09, 0xc6, 0x54, 0x54, 0xb7, 0x08, 0x45, 0x5e, 0xd0, 0x07, 0x15, 0x7d, 0x20, 0xff, 0x17, - 0x12, 0x9b, 0x1e, 0x6e, 0xf0, 0x97, 0x09, 0x11, 0x22, 0xae, 0x46, 0xe6, 0xe9, 0xa3, 0x99, 0x13, - 0x82, 0x7d, 0xd1, 0xd7, 0x68, 0xd4, 0xb3, 0x9c, 0xba, 0x1a, 0x67, 0xd6, 0x42, 0x24, 0x5f, 0x81, - 0x7e, 0x4e, 0x2d, 0xc2, 0xa9, 0x4d, 0x74, 0xa5, 0x16, 0x7e, 0x8e, 0x55, 0x6e, 0x7e, 0xed, 0xdf, - 0xf7, 0x1e, 0xe4, 0xfa, 0x7e, 0x7b, 0x90, 0xeb, 0xbb, 0xfb, 0xfc, 0xe1, 0x74, 0x7c, 0xe9, 0x20, - 0xe0, 0xc7, 0xcf, 0x1f, 0x4e, 0x9f, 0x0e, 0x15, 0x33, 0xec, 0xab, 0x64, 0x21, 0xf3, 0x72, 0x02, - 0xc4, 0xc5, 0x0e, 0x41, 0xca, 0xcf, 0x12, 0x24, 0xab, 0x2e, 0x2d, 0x3b, 0x14, 0x17, 0x6f, 0x6a, - 0x6f, 0x9c, 0x57, 0x0e, 0xe2, 0x46, 0x8b, 0xb4, 0x7d, 0xfd, 0xcf, 0x03, 0x60, 0xb4, 0x48, 0x60, - 0x70, 0x15, 0x52, 0x6e, 0x73, 0xc3, 0xb6, 0x4c, 0x7d, 0x1b, 0xed, 0xea, 0xb7, 0x09, 0x76, 0xc4, - 0x82, 0x1d, 0x65, 0x9f, 0x20, 0x57, 0xb9, 0xea, 0x06, 0xda, 0x7d, 0x47, 0xab, 0x56, 0xd4, 0xa4, - 0xdb, 0x3e, 0x12, 0xec, 0x5c, 0xbb, 0x72, 0x58, 0xf2, 0x99, 0x8e, 0xe4, 0x43, 0xf9, 0x28, 0x27, - 0x40, 0x0e, 0x0b, 0x44, 0xde, 0x5f, 0x4a, 0x30, 0x52, 0x75, 0x69, 0xb5, 0x49, 0xab, 0x9b, 0x7f, - 0x45, 0xe2, 0xd7, 0xfe, 0x73, 0x18, 0xfb, 0x33, 0x9d, 0xec, 0x43, 0xac, 0x94, 0x93, 0x30, 0xd6, - 0x21, 0x11, 0xfc, 0x9f, 0x4a, 0x90, 0xd4, 0x10, 0x5d, 0xc0, 0x0e, 0xb9, 0x81, 0x76, 0x19, 0xfd, - 0x39, 0x18, 0x7a, 0x5d, 0xe6, 0x81, 0xe1, 0x5b, 0x6d, 0xd7, 0x6c, 0x38, 0xe1, 0x00, 0xf1, 0xc5, - 0x56, 0x75, 0xa4, 0xc0, 0x5a, 0x15, 0x16, 0xf8, 0xa9, 0x4e, 0xdb, 0x10, 0xd3, 0xda, 0xb7, 0x3b, - 0x0b, 0xa7, 0xb4, 0xe5, 0xa2, 0x76, 0x5d, 0x5f, 0x7b, 0x77, 0x75, 0x51, 0x5f, 0xaf, 0x68, 0xab, - 0x8b, 0x0b, 0xe5, 0xa5, 0xf2, 0x62, 0x29, 0xdd, 0x27, 0x9f, 0x85, 0x4c, 0x48, 0x57, 0xae, 0x68, - 0x6b, 0xc5, 0xca, 0x9a, 0xce, 0x45, 0x69, 0x49, 0xbe, 0x00, 0x13, 0x21, 0x6d, 0xa5, 0x1a, 0x18, - 0x14, 0x2b, 0x8b, 0xd5, 0x75, 0x4d, 0x98, 0x45, 0xe6, 0x7e, 0xe8, 0x87, 0xe8, 0x0a, 0xa9, 0xcb, - 0x0f, 0x24, 0x48, 0xbf, 0x78, 0x6b, 0xe4, 0xee, 0xcb, 0xbc, 0xcb, 0x76, 0xc8, 0xce, 0xbc, 0xa6, - 0xa5, 0x68, 0xe7, 0xe5, 0xbb, 0xdf, 0xff, 0x7a, 0x3f, 0x32, 0xa3, 0xfc, 0xb3, 0xd0, 0xfd, 0x8b, - 0x75, 0xa1, 0xdb, 0x06, 0xba, 0x27, 0x01, 0x1c, 0xd4, 0x4b, 0x56, 0xba, 0x2f, 0xb8, 0x70, 0x85, - 0xb3, 0x17, 0x5f, 0x69, 0x23, 0x08, 0xcd, 0x70, 0x42, 0x17, 0x95, 0x0b, 0xbd, 0x08, 0x75, 0x0e, - 0x1f, 0xa3, 0x72, 0x70, 0xcb, 0x7a, 0x50, 0xe9, 0xb8, 0x97, 0x3d, 0xa8, 0x74, 0xb9, 0xaa, 0xaf, - 0xa4, 0xd2, 0xb9, 0xbf, 0x3e, 0x91, 0x20, 0x1e, 0xba, 0x31, 0xf2, 0xf9, 0x5e, 0x38, 0xa1, 0x5b, - 0x96, 0x9d, 0x7a, 0xb5, 0x91, 0x60, 0x93, 0xe7, 0x6c, 0xa6, 0x94, 0xc9, 0x43, 0xd8, 0x84, 0x23, - 0x0f, 0x7c, 0xc4, 0xbe, 0x27, 0xcc, 0x2f, 0x3f, 0xde, 0x1f, 0x97, 0x9e, 0xec, 0x8f, 0x4b, 0xbf, - 0xec, 0x8f, 0x4b, 0x9f, 0x3e, 0x1b, 0xef, 0x7b, 0xf2, 0x6c, 0xbc, 0xef, 0xc7, 0x67, 0xe3, 0x7d, - 0xb7, 0xe6, 0x42, 0xaf, 0xe2, 0xa2, 0x1f, 0xb2, 0x82, 0xe8, 0x87, 0xd8, 0xdb, 0x6e, 0x23, 0xec, - 0x1c, 0x60, 0xf0, 0x57, 0x72, 0x63, 0x90, 0xff, 0xc7, 0xe2, 0xf2, 0x9f, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x0c, 0x47, 0x83, 0x3c, 0x87, 0x11, 0x00, 0x00, + // 1677 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1c, 0x49, + 0x15, 0x77, 0xcf, 0x38, 0x8e, 0xe7, 0xcd, 0xa7, 0xcb, 0xf9, 0x98, 0x0c, 0xc1, 0x93, 0xf4, 0x92, + 0x64, 0xd6, 0xe0, 0x19, 0x25, 0xcb, 0x22, 0x6d, 0x00, 0x09, 0xdb, 0xe3, 0x68, 0x87, 0x38, 0x33, + 0x56, 0xb7, 0x1d, 0x89, 0x45, 0xa8, 0xd5, 0x9e, 0x29, 0xb7, 0x3b, 0xe9, 0xe9, 0x6a, 0xba, 0x6a, + 0x66, 0xed, 0x3d, 0xa1, 0x3d, 0xad, 0x10, 0x07, 0xa4, 0x3d, 0x20, 0x04, 0x87, 0x9c, 0x10, 0xc7, + 0x1c, 0x96, 0x23, 0x02, 0x6e, 0x7b, 0x5c, 0x05, 0x0e, 0x88, 0x83, 0x41, 0x0e, 0x52, 0xf8, 0x23, + 0x40, 0x42, 0x55, 0x5d, 0x3d, 0xae, 0xc9, 0xf6, 0x38, 0xb1, 0xec, 0xec, 0x65, 0x37, 0xf5, 0xea, + 0xd5, 0xfb, 0xfd, 0xde, 0x77, 0x8f, 0xe1, 0x2a, 0xde, 0x23, 0x5d, 0x12, 0xe2, 0x06, 0x09, 0x70, + 0x68, 0x33, 0x12, 0x36, 0x86, 0xb7, 0x1b, 0x6c, 0xaf, 0x1e, 0x84, 0x84, 0x11, 0x34, 0x2f, 0x6f, + 0xeb, 0xf1, 0x6d, 0x7d, 0x78, 0xbb, 0x32, 0x67, 0xf7, 0x5d, 0x9f, 0x34, 0xc4, 0x7f, 0x23, 0xbd, + 0xca, 0xe5, 0x2e, 0xa1, 0x7d, 0x42, 0x1b, 0x7d, 0xea, 0xf0, 0xf7, 0x7d, 0xea, 0xc8, 0x8b, 0x6f, + 0xc8, 0x0b, 0xca, 0xec, 0xc7, 0xae, 0xcf, 0x2f, 0xb7, 0x31, 0xb3, 0x6f, 0xc7, 0x67, 0xa9, 0x75, + 0x25, 0xd2, 0xb2, 0xc4, 0xa9, 0x11, 0x1d, 0xe4, 0xd5, 0x05, 0x87, 0x38, 0x24, 0x92, 0xf3, 0x7f, + 0x49, 0xe9, 0x55, 0x87, 0x10, 0xc7, 0xc3, 0x0d, 0x3b, 0x70, 0x1b, 0xb6, 0xef, 0x13, 0x66, 0x33, + 0x97, 0xf8, 0xf2, 0x8d, 0x8e, 0x21, 0xdf, 0xc4, 0xdd, 0x87, 0xb6, 0x37, 0xc0, 0xf7, 0x5c, 0xec, + 0xf5, 0xd0, 0x26, 0xcc, 0xd8, 0x7d, 0x32, 0xf0, 0x59, 0x59, 0xbb, 0xa6, 0xd5, 0x32, 0x2b, 0xdf, + 0xfb, 0xfc, 0xa0, 0x3a, 0xf5, 0x8f, 0x83, 0xea, 0x4d, 0xc7, 0x65, 0xbb, 0x83, 0xed, 0x7a, 0x97, + 0xf4, 0x25, 0xaa, 0xfc, 0xdf, 0x12, 0xed, 0x3d, 0x6e, 0xb0, 0xfd, 0x00, 0xd3, 0x7a, 0x13, 0x77, + 0x9f, 0x7d, 0xb6, 0x04, 0x92, 0x54, 0x13, 0x77, 0x0d, 0x69, 0x4b, 0xff, 0x6f, 0x0a, 0x2e, 0x76, + 0x64, 0x5c, 0x3a, 0x01, 0xc3, 0xbd, 0x2d, 0xb3, 0x29, 0x40, 0x51, 0x08, 0x05, 0x8a, 0xbd, 0x1d, + 0x6b, 0x40, 0x7b, 0xd6, 0x90, 0x4b, 0x24, 0xee, 0xfa, 0xc9, 0x70, 0x0f, 0x0f, 0xaa, 0x39, 0x13, + 0x7b, 0x3b, 0xb1, 0xdd, 0x97, 0x78, 0xe4, 0x38, 0xc6, 0x16, 0xed, 0x45, 0x98, 0x03, 0x28, 0x32, + 0xc2, 0x6c, 0x4f, 0x01, 0x4d, 0x09, 0xd0, 0x07, 0x27, 0x06, 0xcd, 0x6f, 0x72, 0x43, 0x13, 0x50, + 0xf3, 0x02, 0x65, 0x04, 0xbb, 0x07, 0x25, 0xbb, 0xcb, 0xdc, 0x21, 0x56, 0x70, 0xd3, 0x02, 0xb7, + 0x7d, 0x62, 0xdc, 0xc2, 0xb2, 0xb0, 0x34, 0x01, 0xb8, 0x10, 0xe1, 0xc4, 0xc8, 0xfa, 0x1f, 0x34, + 0x98, 0x8f, 0xc3, 0xff, 0x90, 0x30, 0xd7, 0x77, 0x36, 0xc8, 0x87, 0x38, 0x44, 0xdf, 0x87, 0x7c, + 0x5c, 0xad, 0x96, 0xdd, 0xeb, 0x85, 0x32, 0xf6, 0xe5, 0x67, 0x9f, 0x2d, 0x5d, 0x90, 0xe6, 0x96, + 0x7b, 0xbd, 0x10, 0x53, 0x6a, 0xb2, 0xd0, 0xf5, 0x1d, 0x23, 0x17, 0xab, 0x73, 0x31, 0xb2, 0x20, + 0x37, 0x14, 0xd6, 0xac, 0x80, 0x9b, 0x93, 0x41, 0x3c, 0x5d, 0xc5, 0x64, 0x87, 0x47, 0xfc, 0xf4, + 0x5f, 0xa5, 0x60, 0x5e, 0xe1, 0x6b, 0xfa, 0x76, 0x40, 0x77, 0x09, 0x43, 0x97, 0x60, 0x66, 0x17, + 0xbb, 0xce, 0x6e, 0x54, 0xa4, 0x69, 0x43, 0x9e, 0xd0, 0x23, 0x40, 0x51, 0x62, 0xcf, 0x9c, 0x56, + 0x49, 0xd8, 0x55, 0x63, 0x67, 0x40, 0x49, 0x45, 0xb1, 0x28, 0x66, 0xe5, 0xf4, 0xb5, 0x74, 0x2d, + 0x7b, 0xa7, 0x56, 0x4f, 0x18, 0x05, 0xf5, 0x84, 0xf8, 0x1b, 0x05, 0xc5, 0x59, 0x13, 0x33, 0x54, + 0x83, 0x92, 0x67, 0x53, 0x66, 0x75, 0x77, 0x6d, 0xdf, 0xc1, 0x3d, 0xeb, 0x31, 0xde, 0x2f, 0x4f, + 0x73, 0xf6, 0x46, 0x81, 0xcb, 0x57, 0x23, 0xf1, 0x7d, 0xbc, 0xaf, 0xef, 0x43, 0x65, 0xd5, 0x73, + 0xb1, 0xcf, 0x65, 0xae, 0xbf, 0x66, 0x87, 0xbe, 0xeb, 0x3b, 0x3c, 0x29, 0xeb, 0x2e, 0x65, 0xe8, + 0xc7, 0x30, 0x87, 0x23, 0x91, 0xe5, 0xfa, 0x3b, 0xc4, 0xf2, 0x5c, 0xca, 0x43, 0xc5, 0xc9, 0x35, + 0x12, 0xc9, 0x25, 0xdb, 0x6a, 0xf9, 0x3b, 0xc4, 0x28, 0x4a, 0x4b, 0xfc, 0xc0, 0x8d, 0xeb, 0xbf, + 0xd6, 0x26, 0x61, 0x73, 0x15, 0xf4, 0x03, 0x40, 0xde, 0x47, 0x56, 0x57, 0x28, 0x70, 0x47, 0x5c, + 0xdf, 0x72, 0x7b, 0x22, 0x4f, 0xd3, 0x2b, 0xf3, 0x87, 0x07, 0xd5, 0xe2, 0xfa, 0x47, 0xca, 0xeb, + 0x56, 0xd3, 0x28, 0x7a, 0x63, 0x82, 0x1e, 0x7a, 0x0f, 0xae, 0x8c, 0x3d, 0x8f, 0x5d, 0x11, 0x15, + 0x2a, 0x92, 0x69, 0x5c, 0xea, 0x26, 0x12, 0xd0, 0xff, 0x92, 0x82, 0x5c, 0x1c, 0x68, 0xc1, 0xe6, + 0x2d, 0xc8, 0xcb, 0xe7, 0x54, 0xa9, 0x70, 0x23, 0x17, 0x0b, 0x45, 0x1d, 0x5f, 0x87, 0x9c, 0x1d, + 0x04, 0x21, 0x19, 0x62, 0x15, 0x23, 0x2b, 0x65, 0x42, 0xe5, 0x5b, 0x80, 0x46, 0x9d, 0xd2, 0xc7, + 0xcc, 0x16, 0x71, 0x8d, 0xba, 0xd7, 0x28, 0xc5, 0x37, 0x0f, 0x30, 0xb3, 0x05, 0xaa, 0x07, 0x95, + 0x24, 0x0f, 0x24, 0x05, 0x9e, 0xd1, 0x93, 0x25, 0x82, 0xc7, 0xdd, 0xb8, 0xfc, 0x65, 0x9f, 0x23, + 0xfa, 0x0f, 0x00, 0xba, 0xa4, 0xdf, 0x77, 0x29, 0x75, 0x89, 0x5f, 0x3e, 0x27, 0xac, 0xeb, 0x75, + 0x59, 0xbc, 0xf1, 0xf6, 0x90, 0xdb, 0xa4, 0xbe, 0x3a, 0xd2, 0x5c, 0xc9, 0xf0, 0x8e, 0xf8, 0xfd, + 0x8b, 0xa7, 0x8b, 0x9a, 0xa1, 0x18, 0xd0, 0x7f, 0xab, 0x41, 0x46, 0xcc, 0x68, 0xe1, 0xca, 0x0d, + 0x28, 0x50, 0xcf, 0xa6, 0xbb, 0x56, 0x97, 0xf8, 0x2c, 0xb4, 0xbb, 0x72, 0x2f, 0x18, 0x79, 0x21, + 0x5d, 0x95, 0x42, 0x74, 0x13, 0x8a, 0x84, 0xbf, 0xb1, 0x5c, 0xdf, 0x92, 0xad, 0xc9, 0xa3, 0x38, + 0x6d, 0xe4, 0x49, 0x64, 0xea, 0xfd, 0xa8, 0x43, 0x6b, 0x50, 0x8a, 0xf4, 0xc8, 0x80, 0xc5, 0x8a, + 0x69, 0xa1, 0x58, 0x10, 0xf2, 0xce, 0x80, 0x49, 0xcd, 0x4b, 0x30, 0xf3, 0xc8, 0x76, 0x3d, 0xdc, + 0x13, 0xf1, 0x9a, 0x35, 0xe4, 0x49, 0xff, 0xa3, 0x06, 0x73, 0x92, 0xde, 0x32, 0xa5, 0x98, 0x99, + 0xcc, 0x66, 0xf8, 0x54, 0x6b, 0xab, 0xe5, 0x33, 0xa5, 0xdb, 0x5b, 0x3e, 0x8b, 0xd7, 0x16, 0x32, + 0xe0, 0x9c, 0xba, 0x1e, 0x4e, 0x37, 0x42, 0x22, 0x53, 0xfa, 0x9f, 0x35, 0xb8, 0x68, 0xf2, 0xd8, + 0xdd, 0x0b, 0x49, 0x7f, 0xcb, 0xef, 0x61, 0x0f, 0x3b, 0x62, 0x25, 0xa3, 0xb7, 0x21, 0xc3, 0xb3, + 0x85, 0xc3, 0xb8, 0x61, 0x32, 0x2b, 0xb9, 0xc3, 0x83, 0xea, 0xac, 0x29, 0x84, 0xad, 0xa6, 0x31, + 0x1b, 0x5d, 0xb7, 0x7a, 0xe8, 0x26, 0xcc, 0xda, 0xdc, 0x79, 0xae, 0x19, 0x71, 0xcb, 0x1e, 0x1e, + 0x54, 0xcf, 0x8b, 0x80, 0xb4, 0x9a, 0xc6, 0x79, 0x71, 0xd9, 0x52, 0xb7, 0x79, 0xfa, 0xec, 0xc2, + 0xa2, 0x7f, 0xaa, 0xc1, 0xfc, 0xc8, 0x05, 0x81, 0x49, 0x37, 0x08, 0xf1, 0xc6, 0x58, 0x69, 0xaf, + 0xc5, 0x2a, 0x75, 0x86, 0xac, 0x7e, 0x93, 0x06, 0x24, 0x58, 0xad, 0xed, 0xe1, 0xee, 0x80, 0x47, + 0x54, 0x14, 0xb0, 0x03, 0xa5, 0xa8, 0x80, 0x83, 0x90, 0x04, 0x24, 0xe4, 0xf2, 0x33, 0xf9, 0xb4, + 0x29, 0x0a, 0xab, 0x1b, 0x23, 0xa3, 0xe8, 0x27, 0x90, 0x8d, 0x80, 0xce, 0xae, 0x64, 0x40, 0x18, + 0x8c, 0xbe, 0x1e, 0x6c, 0x98, 0x8f, 0xcc, 0x0f, 0x94, 0x9a, 0xa1, 0x72, 0xe5, 0x2c, 0x26, 0x0e, + 0x93, 0xc4, 0x32, 0x5b, 0x99, 0xe6, 0x94, 0x0c, 0x24, 0x8c, 0xa9, 0x17, 0x14, 0x7d, 0x00, 0x73, + 0x11, 0x84, 0x48, 0x14, 0xb5, 0x02, 0x42, 0xbc, 0xf2, 0xf4, 0x31, 0x3b, 0x2d, 0xa1, 0x08, 0xa4, + 0xf9, 0x28, 0x3a, 0x47, 0x62, 0xfd, 0x7f, 0x29, 0xde, 0xb6, 0xd1, 0x53, 0xf1, 0xec, 0x24, 0xd3, + 0xe5, 0x6d, 0x28, 0xd1, 0xc1, 0x76, 0xdf, 0x65, 0x7c, 0x72, 0x28, 0xe3, 0x25, 0x6d, 0x14, 0x47, + 0x72, 0x39, 0x36, 0xae, 0x43, 0x0e, 0x0f, 0xf9, 0xe4, 0x55, 0x86, 0x4b, 0xda, 0xc8, 0x0a, 0x99, + 0x54, 0xf9, 0x1a, 0x64, 0x5c, 0x6a, 0x0d, 0x31, 0x23, 0xa3, 0xe1, 0x32, 0xeb, 0xd2, 0x87, 0xe2, + 0x9c, 0x58, 0x2e, 0xe7, 0xde, 0x44, 0xb9, 0x7c, 0x1d, 0xa2, 0xec, 0x5a, 0xfc, 0x45, 0x79, 0xe6, + 0x9a, 0x56, 0xcb, 0x1b, 0x19, 0x21, 0xd9, 0xdc, 0x0f, 0x30, 0x6a, 0x43, 0x01, 0xc7, 0x75, 0x1c, + 0x2d, 0x9b, 0xf3, 0x62, 0xb0, 0xdf, 0x9a, 0x9c, 0x88, 0xb1, 0xba, 0x37, 0xf2, 0x58, 0x3d, 0xea, + 0x7f, 0xd2, 0x60, 0xde, 0xc0, 0x8e, 0x4b, 0x19, 0x0e, 0xe3, 0x3c, 0x18, 0xf8, 0xa7, 0xe8, 0xbb, + 0x90, 0xdb, 0x09, 0x49, 0x5f, 0x6c, 0x26, 0x4c, 0xe9, 0x2b, 0xbf, 0x00, 0xb3, 0x5c, 0x5b, 0x8a, + 0xd0, 0xbb, 0x30, 0x2d, 0xa8, 0xa5, 0x04, 0xb5, 0xeb, 0xc7, 0x7e, 0xf7, 0x08, 0x52, 0x42, 0xfd, + 0xee, 0xb7, 0x3f, 0x79, 0x52, 0x9d, 0xfa, 0xcf, 0x93, 0xea, 0xd4, 0xc7, 0x2f, 0x9e, 0x2e, 0x66, + 0xef, 0x1d, 0x19, 0xfc, 0xf9, 0x8b, 0xa7, 0x8b, 0x97, 0x95, 0x60, 0xaa, 0x6f, 0xf5, 0x0a, 0x94, + 0xbf, 0xec, 0x00, 0x0d, 0x88, 0x4f, 0xb1, 0xfe, 0x4f, 0x0d, 0xf2, 0x9d, 0x80, 0xb5, 0x7c, 0x46, + 0x96, 0x1f, 0x9a, 0xa7, 0xf6, 0xab, 0x0a, 0x59, 0x7b, 0x48, 0x47, 0x6f, 0xa3, 0xef, 0x01, 0xb0, + 0x87, 0x34, 0x56, 0x78, 0x0f, 0x8a, 0xc1, 0x60, 0xdb, 0x73, 0xbb, 0xfc, 0x13, 0xcd, 0x7a, 0x44, + 0x89, 0x2f, 0x07, 0xec, 0x1c, 0xff, 0x4d, 0xb0, 0x21, 0xae, 0xee, 0xe3, 0xfd, 0x1f, 0x9a, 0x9d, + 0xb6, 0x91, 0x0f, 0x46, 0x47, 0x4a, 0xfc, 0xbb, 0xef, 0x1e, 0xe7, 0x7c, 0x79, 0xcc, 0x79, 0xc5, + 0x1f, 0xfd, 0x02, 0x20, 0x55, 0x20, 0xfd, 0xfe, 0x9d, 0x06, 0x85, 0x4e, 0xc0, 0x3a, 0x03, 0xd6, + 0xd9, 0xf9, 0x2a, 0x1c, 0xbf, 0xfb, 0x9d, 0xe3, 0xd8, 0x5f, 0x19, 0x67, 0xaf, 0xb0, 0xd2, 0x2f, + 0xf2, 0x1f, 0x20, 0x8a, 0x44, 0xf2, 0x7f, 0xa6, 0x41, 0xde, 0xc4, 0x6c, 0x95, 0xf8, 0xf4, 0x3e, + 0xde, 0xe7, 0xf4, 0xef, 0xc0, 0xf9, 0xd7, 0x65, 0x1e, 0x2b, 0xbe, 0xd1, 0x74, 0xdd, 0x56, 0x1d, + 0x8e, 0x11, 0x5f, 0x4e, 0xd5, 0x98, 0x0b, 0x3c, 0x55, 0xaa, 0x20, 0x72, 0x75, 0xd1, 0x83, 0x8c, + 0x39, 0xea, 0xee, 0x0a, 0x5c, 0x32, 0xd7, 0x97, 0xcd, 0xf7, 0xad, 0xcd, 0x1f, 0x6d, 0xac, 0x59, + 0x5b, 0x6d, 0x73, 0x63, 0x6d, 0xb5, 0x75, 0xaf, 0xb5, 0xd6, 0x2c, 0x4d, 0xa1, 0xab, 0x50, 0x56, + 0xee, 0x5a, 0x6d, 0x73, 0x73, 0xb9, 0xbd, 0x69, 0x09, 0x51, 0x49, 0x43, 0x37, 0xe0, 0xba, 0x72, + 0xdb, 0xee, 0xc4, 0x0a, 0xcb, 0xed, 0xb5, 0xce, 0x96, 0x29, 0xd5, 0x52, 0x77, 0xfe, 0x36, 0x0d, + 0xe9, 0x07, 0xd4, 0x41, 0x4f, 0x34, 0x28, 0xbd, 0xdc, 0x35, 0x28, 0x79, 0x98, 0x27, 0x4c, 0x87, + 0xca, 0xd2, 0x6b, 0x6a, 0xca, 0x74, 0xbe, 0xf3, 0xf1, 0x5f, 0xff, 0xfd, 0x69, 0x6a, 0x49, 0xff, + 0x66, 0x23, 0xf9, 0x4f, 0x25, 0x8d, 0xa4, 0x09, 0xf4, 0x89, 0x06, 0x70, 0x14, 0x2f, 0xa4, 0x27, + 0x0f, 0x38, 0x35, 0xc2, 0x95, 0x5b, 0xaf, 0xd4, 0x91, 0x84, 0x96, 0x04, 0xa1, 0x5b, 0xfa, 0x8d, + 0x49, 0x84, 0xc6, 0x8b, 0x8f, 0x53, 0x39, 0xea, 0xb2, 0x09, 0x54, 0xc6, 0xfa, 0x72, 0x02, 0x95, + 0x84, 0x56, 0x7d, 0x25, 0x95, 0xf1, 0xf9, 0xf5, 0x0b, 0x0d, 0xb2, 0x4a, 0xc7, 0xa0, 0xb7, 0x26, + 0xe1, 0x28, 0x5d, 0x56, 0xa9, 0xbd, 0x5a, 0x49, 0xb2, 0xa9, 0x0b, 0x36, 0x35, 0xfd, 0xe6, 0x31, + 0x6c, 0x54, 0xcb, 0xe7, 0x7e, 0xc6, 0x7f, 0x27, 0xac, 0xac, 0x7f, 0x7e, 0xb8, 0xa0, 0x7d, 0x71, + 0xb8, 0xa0, 0xfd, 0xeb, 0x70, 0x41, 0xfb, 0xe5, 0xf3, 0x85, 0xa9, 0x2f, 0x9e, 0x2f, 0x4c, 0xfd, + 0xfd, 0xf9, 0xc2, 0xd4, 0x07, 0x77, 0x94, 0xad, 0xb8, 0x16, 0x99, 0x6c, 0x63, 0xf6, 0x21, 0x09, + 0x1f, 0x8f, 0x10, 0xf6, 0x8e, 0x30, 0xc4, 0x96, 0xdc, 0x9e, 0x11, 0x7f, 0x83, 0x7a, 0xe7, 0xff, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x93, 0x44, 0x68, 0x6f, 0x59, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1441,6 +1567,105 @@ func (m *OperatorOptedUSDValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *OperatorVotingPower) 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 *OperatorVotingPower) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OperatorVotingPower) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size := m.VotingPower.Size() + i -= size + if _, err := m.VotingPower.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.OperatorAddr) > 0 { + i -= len(m.OperatorAddr) + copy(dAtA[i:], m.OperatorAddr) + i = encodeVarintTx(dAtA, i, uint64(len(m.OperatorAddr))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *VotingPowerSnapshot) 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 *VotingPowerSnapshot) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *VotingPowerSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.LastChangedKey) > 0 { + i -= len(m.LastChangedKey) + copy(dAtA[i:], m.LastChangedKey) + i = encodeVarintTx(dAtA, i, uint64(len(m.LastChangedKey))) + i-- + dAtA[i] = 0x22 + } + if len(m.VotingPowerSet) > 0 { + for iNdEx := len(m.VotingPowerSet) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.VotingPowerSet[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } + { + size := m.TotalVotingPower.Size() + i -= size + if _, err := m.TotalVotingPower.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if m.Height != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *ClientChainEarningAddrList) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2203,6 +2428,45 @@ func (m *OperatorOptedUSDValue) Size() (n int) { return n } +func (m *OperatorVotingPower) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.OperatorAddr) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = m.VotingPower.Size() + n += 1 + l + sovTx(uint64(l)) + return n +} + +func (m *VotingPowerSnapshot) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Height != 0 { + n += 1 + sovTx(uint64(m.Height)) + } + l = m.TotalVotingPower.Size() + n += 1 + l + sovTx(uint64(l)) + if len(m.VotingPowerSet) > 0 { + for _, e := range m.VotingPowerSet { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } + l = len(m.LastChangedKey) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + func (m *ClientChainEarningAddrList) Size() (n int) { if m == nil { return 0 @@ -2740,6 +3004,291 @@ func (m *OperatorOptedUSDValue) Unmarshal(dAtA []byte) error { } return nil } +func (m *OperatorVotingPower) 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 ErrIntOverflowTx + } + 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: OperatorVotingPower: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: OperatorVotingPower: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field OperatorAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.OperatorAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VotingPower", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.VotingPower.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *VotingPowerSnapshot) 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 ErrIntOverflowTx + } + 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: VotingPowerSnapshot: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: VotingPowerSnapshot: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TotalVotingPower", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.TotalVotingPower.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VotingPowerSet", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VotingPowerSet = append(m.VotingPowerSet, &OperatorVotingPower{}) + if err := m.VotingPowerSet[len(m.VotingPowerSet)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastChangedKey", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.LastChangedKey = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *ClientChainEarningAddrList) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 From 8f0a1088a188ce80c94d33270ae94f9432ed587a Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Sun, 20 Oct 2024 22:14:22 +0800 Subject: [PATCH 04/12] implement the voting power snapshot --- precompiles/assets/assets_test.go | 1 - proto/exocore/operator/v1/tx.proto | 23 + x/avs/keeper/keeper.go | 18 + x/dogfood/keeper/abci.go | 57 +-- x/dogfood/types/expected_keepers.go | 1 + x/operator/keeper/abci.go | 108 ++++- x/operator/keeper/opt.go | 6 + x/operator/keeper/slash.go | 39 +- x/operator/keeper/voting_power_snapshot.go | 100 +++- x/operator/types/errors.go | 5 + x/operator/types/expected_keepers.go | 2 + x/operator/types/general.go | 20 +- x/operator/types/keys.go | 8 + x/operator/types/tx.pb.go | 515 ++++++++++++++++----- x/operator/types/utils.go | 10 + 15 files changed, 703 insertions(+), 210 deletions(-) diff --git a/precompiles/assets/assets_test.go b/precompiles/assets/assets_test.go index e42083492..e40bc1332 100644 --- a/precompiles/assets/assets_test.go +++ b/precompiles/assets/assets_test.go @@ -376,7 +376,6 @@ func (s *AssetsPrecompileSuite) TestRunWithdrawPrincipal() { readOnly: false, expPass: true, extra: func() { - stakerID, assetID := assetstype.GetStakerIDAndAssetID(s.ClientChains[0].LayerZeroChainID, s.Address.Bytes(), NSTAddress) // check depositNST successfully updated stakerAssetInfo in assets_module stakerAssetInfo, _ := s.App.AssetsKeeper.GetStakerSpecifiedAssetInfo(s.Ctx, stakerID, assetID) diff --git a/proto/exocore/operator/v1/tx.proto b/proto/exocore/operator/v1/tx.proto index 0b10b4d28..8983a4458 100644 --- a/proto/exocore/operator/v1/tx.proto +++ b/proto/exocore/operator/v1/tx.proto @@ -80,6 +80,29 @@ message VotingPowerSnapshot { string last_changed_key = 4; } +// SnapshotHelper is used to record the helper information for voting power snapshot update +message SnapshotHelper { + // last_changed_key indicates the key of the most recent change. + // It is used to set the `last_changed_key` field in `VotingPowerSnapshot`. + string last_changed_key = 1; + + // has_opt_out is used to indicate whether there has been any opt-out operation from + // the most recently saved snapshot to the current height. This is because, + // when an opt-out operation occurs, the related AVS validator information changes, + // and the snapshot needs to be updated. + // Currently, a boolean variable is used instead of an operator list + // because the snapshot is set by default to store all operator information related to AVS. + // Therefore, as long as any operator has opted out, the snapshot needs to be updated. + // If we later introduce a limit on the maximum number of validators in AVS, + // similar to the MaxValidatorNumber in Dogfood, this may need to be changed to an operator list + // to track all operators that have opted out, thereby assisting with the correct snapshot update. + bool has_opt_out = 2; + + // has_slash is used to indicate whether there is a slash event has been executed before the epoch expires. + // When a slash is executed, Dogfood can immediately update the voting power based on this flag. + bool has_slash = 3; +} + // ClientChainEarningAddrList is the list of client chain earning addresses. // Because the reward token provide by the AVS might be located at different client chain, the operator need to // provide the different client chain address to receive the token rewards. diff --git a/x/avs/keeper/keeper.go b/x/avs/keeper/keeper.go index 4c7d2e88c..45e85e3cc 100644 --- a/x/avs/keeper/keeper.go +++ b/x/avs/keeper/keeper.go @@ -8,6 +8,8 @@ import ( "strconv" "strings" + epochstypes "github.com/ExocoreNetwork/exocore/x/epochs/types" + "github.com/ethereum/go-ethereum/crypto" "github.com/prysmaticlabs/prysm/v4/crypto/bls" @@ -382,6 +384,22 @@ func (k Keeper) IterateAVSInfo(ctx sdk.Context, fn func(index int64, avsInfo typ } } +func (k Keeper) GetAVSEpochInfo(ctx sdk.Context, addr string) (*epochstypes.EpochInfo, error) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixAVSInfo) + value := store.Get(common.HexToAddress(addr).Bytes()) + if value == nil { + return nil, types.ErrNoKeyInTheStore.Wrapf("GetAVSInfo: key is %s", addr) + } + avsInfo := types.AVSInfo{} + k.cdc.MustUnmarshal(value, &avsInfo) + + epochInfo, found := k.epochsKeeper.GetEpochInfo(ctx, avsInfo.EpochIdentifier) + if !found { + return nil, types.ErrEpochNotFound.Wrapf("epoch info not found %s", avsInfo.EpochIdentifier) + } + return &epochInfo, nil +} + func (k Keeper) RaiseAndResolveChallenge(ctx sdk.Context, params *types.ChallengeParams) error { taskInfo, err := k.GetTaskInfo(ctx, strconv.FormatUint(params.TaskID, 10), params.TaskContractAddress.String()) if err != nil { diff --git a/x/dogfood/keeper/abci.go b/x/dogfood/keeper/abci.go index f09480ae3..067b952f9 100644 --- a/x/dogfood/keeper/abci.go +++ b/x/dogfood/keeper/abci.go @@ -20,7 +20,6 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { return []abci.ValidatorUpdate{} } defer k.ClearEpochEnd(ctx) - logger := k.Logger(ctx) chainIDWithoutRevision := avstypes.ChainIDWithoutRevision(ctx.ChainID()) // start by clearing the previous consensus keys for the chain. // each AVS can have a separate epoch and hence this function is a part of this module @@ -31,10 +30,7 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { for _, undelegation := range undelegations.GetList() { err := k.delegationKeeper.DecrementUndelegationHoldCount(ctx, undelegation) if err != nil { - logger.Error( - "error decrementing undelegation hold count", - "error", err, - ) + k.Logger(ctx).Error("error decrementing undelegation hold count", "error", err) } k.ClearUndelegationMaturityEpoch(ctx, undelegation) } @@ -46,10 +42,7 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { ctx, addr, chainIDWithoutRevision, ) if err != nil { - logger.Error( - "error completing operator key removal", - "error", err, - ) + k.Logger(ctx).Error("error completing operator key removal", "error", err) } } k.ClearPendingOptOuts(ctx) @@ -80,10 +73,7 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { pubKey, err := validator.ConsPubKey() if err != nil { // indicates an error in deserialization, and should never happen. - logger.Error( - "error deserializing consensus public key", - "error", err, - ) + k.Logger(ctx).Error("error deserializing consensus public key", "error", err) continue } addressString := sdk.GetConsAddress(pubKey).String() @@ -94,28 +84,23 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { ctx, operators, chainIDWithoutRevision, ) if err != nil { - logger.Error( - "error getting vote power for chain", - "error", err, - ) + k.Logger(ctx).Error("error getting vote power for chain", "error", err) return []abci.ValidatorUpdate{} } operators, keys, powers = utils.SortByPower(operators, keys, powers) maxVals := k.GetMaxValidators(ctx) - logger.Info("before loop", "maxVals", maxVals, "len(operators)", len(operators)) + k.Logger(ctx).Info("max validators", "maxVals", maxVals, "len(operators)", len(operators)) // the capacity of this list is twice the maximum number of validators. // this is because we can have a maximum of maxVals validators, and we can also have // a maximum of maxVals validators that are removed. res := make([]keytypes.WrappedConsKeyWithPower, 0, maxVals*2) for i := range operators { - logger.Debug("loop", i) // #nosec G701 // ok on 64-bit systems. if i >= int(maxVals) { // we have reached the maximum number of validators, amongst all the validators. // even if there are intersections with the previous validator set, this will // only be reached if we exceed the threshold. // if there are no intersections, this case is glaringly obvious. - logger.Debug("max validators reached", "i", i) break } power := powers[i] @@ -123,7 +108,6 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { // we have reached the bottom of the rung. // assumption is that negative vote power isn't provided by the module. // the consensus engine will reject it anyway and panic. - logger.Debug("power less than 1", "i", i) break } // find the previous power. @@ -133,24 +117,10 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { if found { // if the power has changed, queue an update. skip, otherwise. if prevPower != power { - logger.Debug( - "power changed", - "i", i, - "operator", operators[i].String(), - "power", power, - "prevPower", prevPower, - ) res = append(res, keytypes.WrappedConsKeyWithPower{ Key: wrappedKey, Power: power, }) - } else { - logger.Debug( - "power not changed", - "i", i, - "operator", operators[i].String(), - "power", power, - ) } // remove the validator from the previous map, so that 0 power // is not queued for it. @@ -161,21 +131,11 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { Key: wrappedKey, Power: power, }) - logger.Debug( - "new validator", - "i", i, - "operator", operators[i].String(), - "power", power, - ) } // all powers, regardless of whether the key exists, are added to the total power. totalPower = totalPower.Add(sdk.NewInt(power)) } - logger.Info( - "before removal", - "totalPower", totalPower, - "len(res)", len(res), - ) + k.Logger(ctx).Info("total power", "totalPower", totalPower, "len(res)", len(res)) // the remaining validators in prevMap have been removed. // we need to queue a change in power to 0 for them. for _, validator := range prevList { // O(N) @@ -192,10 +152,7 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { // so the previous power of these validators does not need to be subtracted. } } - logger.Info( - "after removal", - "len(res)", len(res), - ) + k.Logger(ctx).Info("total power", "totalPower", totalPower, "len(res)", len(res)) // if there are any updates, set total power on lookup index. if len(res) > 0 { k.SetLastTotalPower(ctx, totalPower) diff --git a/x/dogfood/types/expected_keepers.go b/x/dogfood/types/expected_keepers.go index f8732969f..cda789dba 100644 --- a/x/dogfood/types/expected_keepers.go +++ b/x/dogfood/types/expected_keepers.go @@ -83,6 +83,7 @@ type OperatorKeeper interface { GetOptedInAVSForOperator(ctx sdk.Context, operatorAddr string) ([]string, error) CalculateUSDValueForStaker(ctx sdk.Context, stakerID, avsAddr string, operator sdk.AccAddress) (math.LegacyDec, error) OperatorInfo(ctx sdk.Context, addr string) (info *operatortypes.OperatorInfo, err error) + HasSlash(ctx sdk.Context, avsAddr string) bool } // DelegationKeeper represents the expected keeper interface for the delegation module. diff --git a/x/operator/keeper/abci.go b/x/operator/keeper/abci.go index b5a16b4ba..850653db6 100644 --- a/x/operator/keeper/abci.go +++ b/x/operator/keeper/abci.go @@ -2,6 +2,9 @@ package keeper import ( "errors" + "strconv" + + assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" sdkmath "cosmossdk.io/math" operatortypes "github.com/ExocoreNetwork/exocore/x/operator/types" @@ -10,25 +13,35 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) +// VotingPowerActivationDuration indicates how many epochs after the current epoch's voting power calculation +// will be activated and used. By default, this is set to 1 for all AVS. If we want to support custom configurations +// for AVS, we need to add it to the AVS info. +const VotingPowerActivationDuration = 1 + // UpdateVotingPower update the voting power of the specified AVS and its operators at // the end of epoch. -func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr string) error { +func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier string, epochNumber int64, isForSlash bool) error { // get assets supported by the AVS // the mock keeper returns all registered assets. - assets, err := k.avsKeeper.GetAVSSupportedAssets(ctx, avsAddr) + assets, getAssetsErr := k.avsKeeper.GetAVSSupportedAssets(ctx, avsAddr) + // check if self USD value is more than the minimum self delegation. + minimumSelfDelegation, getSelfDelegationErr := k.avsKeeper.GetAVSMinimumSelfDelegation(ctx, avsAddr) // set the voting power to zero if an error is returned, which may prevent malicious behavior // where errors are intentionally triggered to avoid updating the voting power. - if err != nil || assets == nil { - ctx.Logger().Info("UpdateVotingPower the assets list supported by AVS is nil or can't get the assets list", "error", err) + if getAssetsErr != nil || assets == nil || getSelfDelegationErr != nil { + ctx.Logger().Info("UpdateVotingPower the assets list supported by AVS is nil or can't get AVS info", "getAssetsErr", getAssetsErr, "getSelfDelegationErr", getSelfDelegationErr) + // using cache context to ensure the atomicity of the operation. + cc, writeFunc := ctx.CacheContext() // clear the voting power regarding this AVS if there isn't any assets supported by it. - err = k.DeleteAllOperatorsUSDValueForAVS(ctx, avsAddr) + err := k.DeleteAllOperatorsUSDValueForAVS(cc, avsAddr) if err != nil { return err } - err = k.DeleteAVSUSDValue(ctx, avsAddr) + err = k.DeleteAVSUSDValue(cc, avsAddr) if err != nil { return err } + writeFunc() return nil } @@ -47,18 +60,14 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr string) error { } // TODO: for now, we ignore the error when the price round is not found and set the price to 1 to avoid panic } + // update the voting power of operators and AVS + isSnapshotChanged := false + votingPowerSet := make([]*operatortypes.OperatorVotingPower, 0) avsVotingPower := sdkmath.LegacyNewDec(0) - // check if self USD value is more than the minimum self delegation. - minimumSelfDelegation, err := k.avsKeeper.GetAVSMinimumSelfDelegation(ctx, avsAddr) - if err != nil { - // this error is handled earlier when calling `GetAVSSupportedAssets`, - // so we don't set the voting power to zero here. - return err - } - opFunc := func(operator string, optedUSDValues *operatortypes.OperatorOptedUSDValue) error { // clear the old voting power for the operator + lastOptedUSDValue := optedUSDValues *optedUSDValues = operatortypes.OperatorOptedUSDValue{ TotalUSDValue: sdkmath.LegacyNewDec(0), SelfUSDValue: sdkmath.LegacyNewDec(0), @@ -74,9 +83,21 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr string) error { optedUSDValues.ActiveUSDValue = stakingInfo.Staking avsVotingPower = avsVotingPower.Add(optedUSDValues.TotalUSDValue) } + + // prepare the voting power set in advance + if optedUSDValues.ActiveUSDValue.IsPositive() { + votingPowerSet = append(votingPowerSet, &operatortypes.OperatorVotingPower{ + OperatorAddr: operator, + VotingPower: optedUSDValues.ActiveUSDValue, + }) + } + // check whether the voting power snapshot should be changed + // The snapshot will be updated even if only one operator's active voting power changes. + if !isSnapshotChanged && !lastOptedUSDValue.ActiveUSDValue.Equal(optedUSDValues.ActiveUSDValue) { + isSnapshotChanged = true + } return nil } - // using cache context to ensure the atomicity of the operation. cc, writeFunc := ctx.CacheContext() // iterate all operators of the AVS to update their voting power @@ -90,6 +111,63 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr string) error { if err != nil { return err } + + // TODO: Consider not addressing the dogfood AVS, as its historical voting power + // has already been stored by CometBFT. + + // set voting power snapshot + // When the snapshot helper does not exist, it represents the initial state of AVS, + // where no snapshot information has been stored. Therefore, it is necessary to store + // both the snapshot and the helper information. + var snapshotHelper operatortypes.SnapshotHelper + if !k.HasSnapshotHelper(cc, avsAddr) { + isSnapshotChanged = true + } else { + snapshotHelper, err = k.GetSnapshotHelper(cc, avsAddr) + if err != nil { + return err + } + } + votingPowerSnapshot := operatortypes.VotingPowerSnapshot{ + Height: cc.BlockHeight(), + } + // The voting power calculated at the end of the current epoch will be + // used in the epoch following the VotingPowerActivationDuration. + // Therefore, when storing the voting power snapshot, we directly store + // the voting power information that is activated for the specified epoch. + // This way, during the slashing process, we do not need to consider the + // impact of VotingPowerActivationDuration. It can be directly used. + snapshotKey := assetstype.GetJoinedStoreKey(avsAddr, epochIdentifier, strconv.FormatInt(epochNumber+VotingPowerActivationDuration, 10)) + if isForSlash { + // When generating the snapshot key, there's no need to add VotingPowerActivationDuration + // to the epochNumber, because when a slash triggers a snapshot update, it updates the + // voting power information used in the current epoch. + snapshotKey = assetstype.GetJoinedStoreKey( + avsAddr, epochIdentifier, + strconv.FormatInt(epochNumber, 10), + strconv.FormatInt(ctx.BlockHeight(), 10)) + } + if snapshotHelper.HasOptOut || isSnapshotChanged { + votingPowerSnapshot.TotalVotingPower = avsVotingPower + votingPowerSnapshot.VotingPowerSet = votingPowerSet + snapshotHelper.LastChangedKey = string(snapshotKey) + // clear the hasOptOut flag if it's certain that the snapshot will be updated + snapshotHelper.HasOptOut = false + } + votingPowerSnapshot.LastChangedKey = snapshotHelper.LastChangedKey + if !isForSlash { + // clear the slash flag at the end of the epoch + snapshotHelper.HasSlash = false + } + err = k.SetSnapshotHelper(cc, avsAddr, &snapshotHelper) + if err != nil { + return err + } + err = k.SetVotingPowerSnapshot(cc, snapshotKey, &votingPowerSnapshot) + if err != nil { + return err + } + writeFunc() return nil } diff --git a/x/operator/keeper/opt.go b/x/operator/keeper/opt.go index 9128a9ad6..9a4989435 100644 --- a/x/operator/keeper/opt.go +++ b/x/operator/keeper/opt.go @@ -145,5 +145,11 @@ func (k *Keeper) OptOut(ctx sdk.Context, operatorAddress sdk.AccAddress, avsAddr if err != nil { return err } + + // mark opt out in the snapshot helper + err = k.SetOptOutFlag(ctx, avsAddr, true) + if err != nil { + return err + } return nil } diff --git a/x/operator/keeper/slash.go b/x/operator/keeper/slash.go index 1f1c6a58d..49bacae53 100644 --- a/x/operator/keeper/slash.go +++ b/x/operator/keeper/slash.go @@ -7,7 +7,6 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common/hexutil" - errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" @@ -46,22 +45,21 @@ func SlashFromUndelegation(undelegation *delegationtype.UndelegationRecord, slas func (k *Keeper) CheckSlashParameter(ctx sdk.Context, parameter *types.SlashInputInfo) error { if parameter.SlashProportion.IsNil() || parameter.SlashProportion.IsNegative() { - return errorsmod.Wrapf(types.ErrValueIsNilOrZero, "Invalid SlashProportion; expected non-nil and non-negative, got: %+v", parameter.SlashProportion) + return types.ErrValueIsNilOrZero.Wrapf("Invalid SlashProportion; expected non-nil and non-negative, got: %+v", parameter.SlashProportion) } height := ctx.BlockHeight() if parameter.SlashEventHeight > height { - return errorsmod.Wrapf(types.ErrSlashOccurredHeight, "slashEventHeight:%d,curHeight:%d", parameter.SlashEventHeight, height) + return types.ErrSlashOccurredHeight.Wrapf("slashEventHeight:%d,curHeight:%d", parameter.SlashEventHeight, height) } if parameter.IsDogFood { if parameter.Power <= 0 { - return errorsmod.Wrapf(types.ErrInvalidSlashPower, "slash for dogfood, the power is:%v", parameter.Power) + return types.ErrInvalidSlashPower.Wrapf("slash for dogfood, the power is:%v", parameter.Power) } } else { if parameter.Power != 0 { - return errorsmod.Wrapf(types.ErrInvalidSlashPower, "slash for other AVSs, the power is:%v", parameter.Power) + return types.ErrInvalidSlashPower.Wrapf("slash for other AVSs, the input power should be zero, power:%v", parameter.Power) } - // todo: get the historical voting power from the snapshot for the other AVSs } return nil } @@ -156,6 +154,22 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { return err } + // get the historical voting power from the snapshot for the other AVSs + if !parameter.IsDogFood { + snapshot, err := k.LoadVotingPowerSnapshot(ctx, parameter.AVSAddr, parameter.SlashEpochIdentifier, parameter.SlashEpochNumber, ¶meter.SlashEventHeight) + if err != nil { + return types.ErrFailToGetHistoricalVP.Wrapf("slash: failed to load voting power snapshot, err:%s", err) + } + votingPower := types.GetSpecifiedVotingPower(parameter.Operator.String(), snapshot.VotingPowerSet) + if votingPower == nil { + return types.ErrFailToGetHistoricalVP.Wrapf("slash: the operator isn't in the voting power set, addr:%s", parameter.Operator) + } + parameter.Power = votingPower.VotingPower.TruncateInt64() + if parameter.Power < 0 { + return types.ErrInvalidSlashPower.Wrapf("slash: valid voting power, the power is:%v", parameter.Power) + } + } + // slash assets according to the input information // using cache context to ensure the atomicity of slash execution. cc, writeFunc := ctx.CacheContext() @@ -178,6 +192,19 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { if err != nil { return err } + // update the voting power and save the snapshot caused by slash execution + epochInfo, err := k.avsKeeper.GetAVSEpochInfo(ctx, parameter.AVSAddr) + if err != nil { + return err + } + err = k.UpdateVotingPower(ctx, parameter.AVSAddr, epochInfo.Identifier, epochInfo.CurrentEpoch, true) + if err != nil { + return err + } + err = k.SetSlashFlag(ctx, parameter.AVSAddr, true) + if err != nil { + return err + } return nil } diff --git a/x/operator/keeper/voting_power_snapshot.go b/x/operator/keeper/voting_power_snapshot.go index 60d229834..44a64fbcf 100644 --- a/x/operator/keeper/voting_power_snapshot.go +++ b/x/operator/keeper/voting_power_snapshot.go @@ -1,19 +1,16 @@ package keeper import ( + "strconv" + assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" "github.com/ExocoreNetwork/exocore/x/operator/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "strconv" ) -func (k *Keeper) StoreVotingPowerSnapshot(ctx sdk.Context, avsAddr, epochIdentifier string, epochNumber int64, height *int64, snapshot *types.VotingPowerSnapshot) error { +func (k *Keeper) SetVotingPowerSnapshot(ctx sdk.Context, key []byte, snapshot *types.VotingPowerSnapshot) error { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) - key := assetstype.GetJoinedStoreKey(avsAddr, epochIdentifier, strconv.FormatInt(epochNumber, 10)) - if height != nil && *height >= 0 { - key = assetstype.GetJoinedStoreKey(string(key), strconv.FormatInt(*height, 10)) - } bz := k.cdc.MustMarshal(snapshot) store.Set(key, bz) return nil @@ -24,8 +21,26 @@ func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr, epochIdentifi var ret types.VotingPowerSnapshot key := assetstype.GetJoinedStoreKey(avsAddr, epochIdentifier, strconv.FormatInt(epochNumber, 10)) if height != nil && *height >= 0 { - key = assetstype.GetJoinedStoreKey(string(key), strconv.FormatInt(*height, 10)) + // When a snapshot caused by a slash exists for the specified epochNumber, + // the snapshot closest to the input height is the one used for its voting + // power information. The correct snapshot key can be found by taking advantage + // of the ascending order of data returned when using an iterator range. + keyWithHeight := assetstype.GetJoinedStoreKey(string(key), strconv.FormatInt(*height, 10)) + iterator := sdk.KVStorePrefixIterator(store, key) + defer iterator.Close() + var findKey []byte + for ; iterator.Valid(); iterator.Next() { + var amounts assetstype.OperatorAssetInfo + k.cdc.MustUnmarshal(iterator.Value(), &amounts) + if string(iterator.Key()) <= string(keyWithHeight) { + findKey = iterator.Key() + } else { + break + } + } + key = findKey } + value := store.Get(key) if value == nil { return nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: key is %s", key) @@ -42,3 +57,74 @@ func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr, epochIdentifi } return &ret, nil } + +func (k *Keeper) UpdateSnapshotHelper(ctx sdk.Context, avsAddr string, opFunc func(helper *types.SnapshotHelper) error) error { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSnapshotHelper) + var snapshotHelper types.SnapshotHelper + value := store.Get([]byte(avsAddr)) + if value != nil { + k.cdc.MustUnmarshal(value, &snapshotHelper) + } + err := opFunc(&snapshotHelper) + if err != nil { + return err + } + bz := k.cdc.MustMarshal(&snapshotHelper) + store.Set([]byte(avsAddr), bz) + return nil +} + +func (k *Keeper) SetOptOutFlag(ctx sdk.Context, avsAddr string, hasOptOut bool) error { + opFunc := func(helper *types.SnapshotHelper) error { + helper.HasOptOut = hasOptOut + return nil + } + return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) +} + +func (k *Keeper) SetSlashFlag(ctx sdk.Context, avsAddr string, hasSlash bool) error { + opFunc := func(helper *types.SnapshotHelper) error { + helper.HasSlash = hasSlash + return nil + } + return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) +} + +func (k *Keeper) SetLastChangedKey(ctx sdk.Context, avsAddr, lastChangeKey string) error { + opFunc := func(helper *types.SnapshotHelper) error { + helper.LastChangedKey = lastChangeKey + return nil + } + return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) +} + +func (k *Keeper) SetSnapshotHelper(ctx sdk.Context, avsAddr string, snapshotHelper *types.SnapshotHelper) error { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSnapshotHelper) + bz := k.cdc.MustMarshal(snapshotHelper) + store.Set([]byte(avsAddr), bz) + return nil +} + +func (k *Keeper) GetSnapshotHelper(ctx sdk.Context, avsAddr string) (types.SnapshotHelper, error) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSnapshotHelper) + var ret types.SnapshotHelper + value := store.Get([]byte(avsAddr)) + if value == nil { + return ret, types.ErrNoKeyInTheStore.Wrapf("GetSnapshotHelper: the key is %s", avsAddr) + } + k.cdc.MustUnmarshal(value, &ret) + return ret, nil +} + +func (k *Keeper) HasSnapshotHelper(ctx sdk.Context, avsAddr string) bool { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSnapshotHelper) + return store.Has([]byte(avsAddr)) +} + +func (k *Keeper) HasSlash(ctx sdk.Context, avsAddr string) bool { + helper, err := k.GetSnapshotHelper(ctx, avsAddr) + if err != nil { + return false + } + return helper.HasSlash +} diff --git a/x/operator/types/errors.go b/x/operator/types/errors.go index 0e0ad8827..d5967f9ee 100644 --- a/x/operator/types/errors.go +++ b/x/operator/types/errors.go @@ -111,4 +111,9 @@ var ( ModuleName, 24, "the operator USD value is less than the minimum self delegation", ) + + ErrFailToGetHistoricalVP = errorsmod.Register( + ModuleName, 25, + "failed to get the historical voting power", + ) ) diff --git a/x/operator/types/expected_keepers.go b/x/operator/types/expected_keepers.go index 2604e3d20..42112f2bb 100644 --- a/x/operator/types/expected_keepers.go +++ b/x/operator/types/expected_keepers.go @@ -6,6 +6,7 @@ import ( assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" delegationkeeper "github.com/ExocoreNetwork/exocore/x/delegation/keeper" delegationtype "github.com/ExocoreNetwork/exocore/x/delegation/types" + epochstypes "github.com/ExocoreNetwork/exocore/x/epochs/types" oracletype "github.com/ExocoreNetwork/exocore/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -110,6 +111,7 @@ type AVSKeeper interface { // IsAVS returns true if the address is a registered AVS address. IsAVS(ctx sdk.Context, addr string) (bool, error) IsAVSByChainID(ctx sdk.Context, chainID string) (bool, string) + GetAVSEpochInfo(ctx sdk.Context, addr string) (*epochstypes.EpochInfo, error) } type SlashKeeper interface { diff --git a/x/operator/types/general.go b/x/operator/types/general.go index f44efe85c..260cea755 100644 --- a/x/operator/types/general.go +++ b/x/operator/types/general.go @@ -18,13 +18,15 @@ type OperatorStakingInfo struct { } type SlashInputInfo struct { - IsDogFood bool - Power int64 - SlashType uint32 - Operator sdk.AccAddress - AVSAddr string - SlashContract string - SlashID string - SlashEventHeight int64 - SlashProportion sdkmath.LegacyDec + IsDogFood bool + Power int64 + SlashType uint32 + Operator sdk.AccAddress + AVSAddr string + SlashContract string + SlashID string + SlashEventHeight int64 + SlashEpochIdentifier string + SlashEpochNumber int64 + SlashProportion sdkmath.LegacyDec } diff --git a/x/operator/types/keys.go b/x/operator/types/keys.go index 070caebf5..54051f402 100644 --- a/x/operator/types/keys.go +++ b/x/operator/types/keys.go @@ -70,6 +70,10 @@ const ( // BytePrefixForVotingPowerSnapshot is the prefix to store the voting power snapshot for all AVSs BytePrefixForVotingPowerSnapshot + + // BytePrefixForSnapshotHelper is the prefix used to store helper information + // for voting power snapshot updates. + BytePrefixForSnapshotHelper ) var ( @@ -111,6 +115,10 @@ var ( // AVSAddr+ '/' + epochIdentifier + '/' + epochNumber -> VotingPowerSnapshot // AVSAddr+ '/' + epochIdentifier + '/' + epochNumber + '/' + slashHeight -> VotingPowerSnapshot KeyPrefixVotingPowerSnapshot = []byte{BytePrefixForVotingPowerSnapshot} + + // KeyPrefixSnapshotHelper key-value: + // avsAddr -> SnapshotHelper + KeyPrefixSnapshotHelper = []byte{BytePrefixForSnapshotHelper} ) // ModuleAddress is the native module address for EVM diff --git a/x/operator/types/tx.pb.go b/x/operator/types/tx.pb.go index faac055fc..8553878ec 100644 --- a/x/operator/types/tx.pb.go +++ b/x/operator/types/tx.pb.go @@ -268,6 +268,81 @@ func (m *VotingPowerSnapshot) GetLastChangedKey() string { return "" } +// SnapshotHelper is used to record the helper information for voting power snapshot update +type SnapshotHelper struct { + // last_changed_key indicates the key of the most recent change. + // It is used to set the `last_changed_key` field in `VotingPowerSnapshot`. + LastChangedKey string `protobuf:"bytes,1,opt,name=last_changed_key,json=lastChangedKey,proto3" json:"last_changed_key,omitempty"` + // has_opt_out is used to indicate whether there has been any opt-out operation from + // the most recently saved snapshot to the current height. This is because, + // when an opt-out operation occurs, the related AVS validator information changes, + // and the snapshot needs to be updated. + // Currently, a boolean variable is used instead of an operator list + // because the snapshot is set by default to store all operator information related to AVS. + // Therefore, as long as any operator has opted out, the snapshot needs to be updated. + // If we later introduce a limit on the maximum number of validators in AVS, + // similar to the MaxValidatorNumber in Dogfood, this may need to be changed to an operator list + // to track all operators that have opted out, thereby assisting with the correct snapshot update. + HasOptOut bool `protobuf:"varint,2,opt,name=has_opt_out,json=hasOptOut,proto3" json:"has_opt_out,omitempty"` + // has_slash is used to indicate whether there is a slash event has been executed before the epoch expires. + // When a slash is executed, Dogfood can immediately update the voting power based on this flag. + HasSlash bool `protobuf:"varint,3,opt,name=has_slash,json=hasSlash,proto3" json:"has_slash,omitempty"` +} + +func (m *SnapshotHelper) Reset() { *m = SnapshotHelper{} } +func (m *SnapshotHelper) String() string { return proto.CompactTextString(m) } +func (*SnapshotHelper) ProtoMessage() {} +func (*SnapshotHelper) Descriptor() ([]byte, []int) { + return fileDescriptor_b229d5663e4df167, []int{4} +} +func (m *SnapshotHelper) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SnapshotHelper) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SnapshotHelper.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 *SnapshotHelper) XXX_Merge(src proto.Message) { + xxx_messageInfo_SnapshotHelper.Merge(m, src) +} +func (m *SnapshotHelper) XXX_Size() int { + return m.Size() +} +func (m *SnapshotHelper) XXX_DiscardUnknown() { + xxx_messageInfo_SnapshotHelper.DiscardUnknown(m) +} + +var xxx_messageInfo_SnapshotHelper proto.InternalMessageInfo + +func (m *SnapshotHelper) GetLastChangedKey() string { + if m != nil { + return m.LastChangedKey + } + return "" +} + +func (m *SnapshotHelper) GetHasOptOut() bool { + if m != nil { + return m.HasOptOut + } + return false +} + +func (m *SnapshotHelper) GetHasSlash() bool { + if m != nil { + return m.HasSlash + } + return false +} + // ClientChainEarningAddrList is the list of client chain earning addresses. // Because the reward token provide by the AVS might be located at different client chain, the operator need to // provide the different client chain address to receive the token rewards. @@ -280,7 +355,7 @@ func (m *ClientChainEarningAddrList) Reset() { *m = ClientChainEarningAd func (m *ClientChainEarningAddrList) String() string { return proto.CompactTextString(m) } func (*ClientChainEarningAddrList) ProtoMessage() {} func (*ClientChainEarningAddrList) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{4} + return fileDescriptor_b229d5663e4df167, []int{5} } func (m *ClientChainEarningAddrList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -328,7 +403,7 @@ func (m *ClientChainEarningAddrInfo) Reset() { *m = ClientChainEarningAd func (m *ClientChainEarningAddrInfo) String() string { return proto.CompactTextString(m) } func (*ClientChainEarningAddrInfo) ProtoMessage() {} func (*ClientChainEarningAddrInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{5} + return fileDescriptor_b229d5663e4df167, []int{6} } func (m *ClientChainEarningAddrInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -390,7 +465,7 @@ func (m *OperatorInfo) Reset() { *m = OperatorInfo{} } func (m *OperatorInfo) String() string { return proto.CompactTextString(m) } func (*OperatorInfo) ProtoMessage() {} func (*OperatorInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{6} + return fileDescriptor_b229d5663e4df167, []int{7} } func (m *OperatorInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -470,7 +545,7 @@ func (m *OptedInfo) Reset() { *m = OptedInfo{} } func (m *OptedInfo) String() string { return proto.CompactTextString(m) } func (*OptedInfo) ProtoMessage() {} func (*OptedInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{7} + return fileDescriptor_b229d5663e4df167, []int{8} } func (m *OptedInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -539,7 +614,7 @@ func (m *OptedInAssetState) Reset() { *m = OptedInAssetState{} } func (m *OptedInAssetState) String() string { return proto.CompactTextString(m) } func (*OptedInAssetState) ProtoMessage() {} func (*OptedInAssetState) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{8} + return fileDescriptor_b229d5663e4df167, []int{9} } func (m *OptedInAssetState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -582,7 +657,7 @@ func (m *SlashFromUndelegation) Reset() { *m = SlashFromUndelegation{} } func (m *SlashFromUndelegation) String() string { return proto.CompactTextString(m) } func (*SlashFromUndelegation) ProtoMessage() {} func (*SlashFromUndelegation) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{9} + return fileDescriptor_b229d5663e4df167, []int{10} } func (m *SlashFromUndelegation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -637,7 +712,7 @@ func (m *SlashFromAssetsPool) Reset() { *m = SlashFromAssetsPool{} } func (m *SlashFromAssetsPool) String() string { return proto.CompactTextString(m) } func (*SlashFromAssetsPool) ProtoMessage() {} func (*SlashFromAssetsPool) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{10} + return fileDescriptor_b229d5663e4df167, []int{11} } func (m *SlashFromAssetsPool) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -689,7 +764,7 @@ func (m *SlashExecutionInfo) Reset() { *m = SlashExecutionInfo{} } func (m *SlashExecutionInfo) String() string { return proto.CompactTextString(m) } func (*SlashExecutionInfo) ProtoMessage() {} func (*SlashExecutionInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{11} + return fileDescriptor_b229d5663e4df167, []int{12} } func (m *SlashExecutionInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -754,7 +829,7 @@ func (m *OperatorSlashInfo) Reset() { *m = OperatorSlashInfo{} } func (m *OperatorSlashInfo) String() string { return proto.CompactTextString(m) } func (*OperatorSlashInfo) ProtoMessage() {} func (*OperatorSlashInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{12} + return fileDescriptor_b229d5663e4df167, []int{13} } func (m *OperatorSlashInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -837,7 +912,7 @@ func (m *RegisterOperatorReq) Reset() { *m = RegisterOperatorReq{} } func (m *RegisterOperatorReq) String() string { return proto.CompactTextString(m) } func (*RegisterOperatorReq) ProtoMessage() {} func (*RegisterOperatorReq) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{13} + return fileDescriptor_b229d5663e4df167, []int{14} } func (m *RegisterOperatorReq) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -874,7 +949,7 @@ func (m *RegisterOperatorResponse) Reset() { *m = RegisterOperatorRespon func (m *RegisterOperatorResponse) String() string { return proto.CompactTextString(m) } func (*RegisterOperatorResponse) ProtoMessage() {} func (*RegisterOperatorResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{14} + return fileDescriptor_b229d5663e4df167, []int{15} } func (m *RegisterOperatorResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -919,7 +994,7 @@ func (m *OptIntoAVSReq) Reset() { *m = OptIntoAVSReq{} } func (m *OptIntoAVSReq) String() string { return proto.CompactTextString(m) } func (*OptIntoAVSReq) ProtoMessage() {} func (*OptIntoAVSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{15} + return fileDescriptor_b229d5663e4df167, []int{16} } func (m *OptIntoAVSReq) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -956,7 +1031,7 @@ func (m *OptIntoAVSResponse) Reset() { *m = OptIntoAVSResponse{} } func (m *OptIntoAVSResponse) String() string { return proto.CompactTextString(m) } func (*OptIntoAVSResponse) ProtoMessage() {} func (*OptIntoAVSResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{16} + return fileDescriptor_b229d5663e4df167, []int{17} } func (m *OptIntoAVSResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -997,7 +1072,7 @@ func (m *OptOutOfAVSReq) Reset() { *m = OptOutOfAVSReq{} } func (m *OptOutOfAVSReq) String() string { return proto.CompactTextString(m) } func (*OptOutOfAVSReq) ProtoMessage() {} func (*OptOutOfAVSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{17} + return fileDescriptor_b229d5663e4df167, []int{18} } func (m *OptOutOfAVSReq) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1034,7 +1109,7 @@ func (m *OptOutOfAVSResponse) Reset() { *m = OptOutOfAVSResponse{} } func (m *OptOutOfAVSResponse) String() string { return proto.CompactTextString(m) } func (*OptOutOfAVSResponse) ProtoMessage() {} func (*OptOutOfAVSResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{18} + return fileDescriptor_b229d5663e4df167, []int{19} } func (m *OptOutOfAVSResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1081,7 +1156,7 @@ func (m *SetConsKeyReq) Reset() { *m = SetConsKeyReq{} } func (m *SetConsKeyReq) String() string { return proto.CompactTextString(m) } func (*SetConsKeyReq) ProtoMessage() {} func (*SetConsKeyReq) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{19} + return fileDescriptor_b229d5663e4df167, []int{20} } func (m *SetConsKeyReq) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1118,7 +1193,7 @@ func (m *SetConsKeyResponse) Reset() { *m = SetConsKeyResponse{} } func (m *SetConsKeyResponse) String() string { return proto.CompactTextString(m) } func (*SetConsKeyResponse) ProtoMessage() {} func (*SetConsKeyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b229d5663e4df167, []int{20} + return fileDescriptor_b229d5663e4df167, []int{21} } func (m *SetConsKeyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1153,6 +1228,7 @@ func init() { proto.RegisterType((*OperatorOptedUSDValue)(nil), "exocore.operator.v1.OperatorOptedUSDValue") proto.RegisterType((*OperatorVotingPower)(nil), "exocore.operator.v1.OperatorVotingPower") proto.RegisterType((*VotingPowerSnapshot)(nil), "exocore.operator.v1.VotingPowerSnapshot") + proto.RegisterType((*SnapshotHelper)(nil), "exocore.operator.v1.SnapshotHelper") proto.RegisterType((*ClientChainEarningAddrList)(nil), "exocore.operator.v1.ClientChainEarningAddrList") proto.RegisterType((*ClientChainEarningAddrInfo)(nil), "exocore.operator.v1.ClientChainEarningAddrInfo") proto.RegisterType((*OperatorInfo)(nil), "exocore.operator.v1.OperatorInfo") @@ -1175,112 +1251,116 @@ func init() { func init() { proto.RegisterFile("exocore/operator/v1/tx.proto", fileDescriptor_b229d5663e4df167) } var fileDescriptor_b229d5663e4df167 = []byte{ - // 1677 bytes of a gzipped FileDescriptorProto + // 1732 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1c, 0x49, - 0x15, 0x77, 0xcf, 0x38, 0x8e, 0xe7, 0xcd, 0xa7, 0xcb, 0xf9, 0x98, 0x0c, 0xc1, 0x93, 0xf4, 0x92, - 0x64, 0xd6, 0xe0, 0x19, 0x25, 0xcb, 0x22, 0x6d, 0x00, 0x09, 0xdb, 0xe3, 0x68, 0x87, 0x38, 0x33, - 0x56, 0xb7, 0x1d, 0x89, 0x45, 0xa8, 0xd5, 0x9e, 0x29, 0xb7, 0x3b, 0xe9, 0xe9, 0x6a, 0xba, 0x6a, - 0x66, 0xed, 0x3d, 0xa1, 0x3d, 0xad, 0x10, 0x07, 0xa4, 0x3d, 0x20, 0x04, 0x87, 0x9c, 0x10, 0xc7, - 0x1c, 0x96, 0x23, 0x02, 0x6e, 0x7b, 0x5c, 0x05, 0x0e, 0x88, 0x83, 0x41, 0x0e, 0x52, 0xf8, 0x23, - 0x40, 0x42, 0x55, 0x5d, 0x3d, 0xae, 0xc9, 0xf6, 0x38, 0xb1, 0xec, 0xec, 0x65, 0x37, 0xf5, 0xea, - 0xd5, 0xfb, 0xfd, 0xde, 0x77, 0x8f, 0xe1, 0x2a, 0xde, 0x23, 0x5d, 0x12, 0xe2, 0x06, 0x09, 0x70, - 0x68, 0x33, 0x12, 0x36, 0x86, 0xb7, 0x1b, 0x6c, 0xaf, 0x1e, 0x84, 0x84, 0x11, 0x34, 0x2f, 0x6f, - 0xeb, 0xf1, 0x6d, 0x7d, 0x78, 0xbb, 0x32, 0x67, 0xf7, 0x5d, 0x9f, 0x34, 0xc4, 0x7f, 0x23, 0xbd, - 0xca, 0xe5, 0x2e, 0xa1, 0x7d, 0x42, 0x1b, 0x7d, 0xea, 0xf0, 0xf7, 0x7d, 0xea, 0xc8, 0x8b, 0x6f, - 0xc8, 0x0b, 0xca, 0xec, 0xc7, 0xae, 0xcf, 0x2f, 0xb7, 0x31, 0xb3, 0x6f, 0xc7, 0x67, 0xa9, 0x75, - 0x25, 0xd2, 0xb2, 0xc4, 0xa9, 0x11, 0x1d, 0xe4, 0xd5, 0x05, 0x87, 0x38, 0x24, 0x92, 0xf3, 0x7f, - 0x49, 0xe9, 0x55, 0x87, 0x10, 0xc7, 0xc3, 0x0d, 0x3b, 0x70, 0x1b, 0xb6, 0xef, 0x13, 0x66, 0x33, - 0x97, 0xf8, 0xf2, 0x8d, 0x8e, 0x21, 0xdf, 0xc4, 0xdd, 0x87, 0xb6, 0x37, 0xc0, 0xf7, 0x5c, 0xec, - 0xf5, 0xd0, 0x26, 0xcc, 0xd8, 0x7d, 0x32, 0xf0, 0x59, 0x59, 0xbb, 0xa6, 0xd5, 0x32, 0x2b, 0xdf, - 0xfb, 0xfc, 0xa0, 0x3a, 0xf5, 0x8f, 0x83, 0xea, 0x4d, 0xc7, 0x65, 0xbb, 0x83, 0xed, 0x7a, 0x97, - 0xf4, 0x25, 0xaa, 0xfc, 0xdf, 0x12, 0xed, 0x3d, 0x6e, 0xb0, 0xfd, 0x00, 0xd3, 0x7a, 0x13, 0x77, - 0x9f, 0x7d, 0xb6, 0x04, 0x92, 0x54, 0x13, 0x77, 0x0d, 0x69, 0x4b, 0xff, 0x6f, 0x0a, 0x2e, 0x76, - 0x64, 0x5c, 0x3a, 0x01, 0xc3, 0xbd, 0x2d, 0xb3, 0x29, 0x40, 0x51, 0x08, 0x05, 0x8a, 0xbd, 0x1d, - 0x6b, 0x40, 0x7b, 0xd6, 0x90, 0x4b, 0x24, 0xee, 0xfa, 0xc9, 0x70, 0x0f, 0x0f, 0xaa, 0x39, 0x13, - 0x7b, 0x3b, 0xb1, 0xdd, 0x97, 0x78, 0xe4, 0x38, 0xc6, 0x16, 0xed, 0x45, 0x98, 0x03, 0x28, 0x32, - 0xc2, 0x6c, 0x4f, 0x01, 0x4d, 0x09, 0xd0, 0x07, 0x27, 0x06, 0xcd, 0x6f, 0x72, 0x43, 0x13, 0x50, - 0xf3, 0x02, 0x65, 0x04, 0xbb, 0x07, 0x25, 0xbb, 0xcb, 0xdc, 0x21, 0x56, 0x70, 0xd3, 0x02, 0xb7, - 0x7d, 0x62, 0xdc, 0xc2, 0xb2, 0xb0, 0x34, 0x01, 0xb8, 0x10, 0xe1, 0xc4, 0xc8, 0xfa, 0x1f, 0x34, - 0x98, 0x8f, 0xc3, 0xff, 0x90, 0x30, 0xd7, 0x77, 0x36, 0xc8, 0x87, 0x38, 0x44, 0xdf, 0x87, 0x7c, - 0x5c, 0xad, 0x96, 0xdd, 0xeb, 0x85, 0x32, 0xf6, 0xe5, 0x67, 0x9f, 0x2d, 0x5d, 0x90, 0xe6, 0x96, - 0x7b, 0xbd, 0x10, 0x53, 0x6a, 0xb2, 0xd0, 0xf5, 0x1d, 0x23, 0x17, 0xab, 0x73, 0x31, 0xb2, 0x20, - 0x37, 0x14, 0xd6, 0xac, 0x80, 0x9b, 0x93, 0x41, 0x3c, 0x5d, 0xc5, 0x64, 0x87, 0x47, 0xfc, 0xf4, - 0x5f, 0xa5, 0x60, 0x5e, 0xe1, 0x6b, 0xfa, 0x76, 0x40, 0x77, 0x09, 0x43, 0x97, 0x60, 0x66, 0x17, - 0xbb, 0xce, 0x6e, 0x54, 0xa4, 0x69, 0x43, 0x9e, 0xd0, 0x23, 0x40, 0x51, 0x62, 0xcf, 0x9c, 0x56, - 0x49, 0xd8, 0x55, 0x63, 0x67, 0x40, 0x49, 0x45, 0xb1, 0x28, 0x66, 0xe5, 0xf4, 0xb5, 0x74, 0x2d, - 0x7b, 0xa7, 0x56, 0x4f, 0x18, 0x05, 0xf5, 0x84, 0xf8, 0x1b, 0x05, 0xc5, 0x59, 0x13, 0x33, 0x54, - 0x83, 0x92, 0x67, 0x53, 0x66, 0x75, 0x77, 0x6d, 0xdf, 0xc1, 0x3d, 0xeb, 0x31, 0xde, 0x2f, 0x4f, - 0x73, 0xf6, 0x46, 0x81, 0xcb, 0x57, 0x23, 0xf1, 0x7d, 0xbc, 0xaf, 0xef, 0x43, 0x65, 0xd5, 0x73, - 0xb1, 0xcf, 0x65, 0xae, 0xbf, 0x66, 0x87, 0xbe, 0xeb, 0x3b, 0x3c, 0x29, 0xeb, 0x2e, 0x65, 0xe8, - 0xc7, 0x30, 0x87, 0x23, 0x91, 0xe5, 0xfa, 0x3b, 0xc4, 0xf2, 0x5c, 0xca, 0x43, 0xc5, 0xc9, 0x35, - 0x12, 0xc9, 0x25, 0xdb, 0x6a, 0xf9, 0x3b, 0xc4, 0x28, 0x4a, 0x4b, 0xfc, 0xc0, 0x8d, 0xeb, 0xbf, - 0xd6, 0x26, 0x61, 0x73, 0x15, 0xf4, 0x03, 0x40, 0xde, 0x47, 0x56, 0x57, 0x28, 0x70, 0x47, 0x5c, - 0xdf, 0x72, 0x7b, 0x22, 0x4f, 0xd3, 0x2b, 0xf3, 0x87, 0x07, 0xd5, 0xe2, 0xfa, 0x47, 0xca, 0xeb, - 0x56, 0xd3, 0x28, 0x7a, 0x63, 0x82, 0x1e, 0x7a, 0x0f, 0xae, 0x8c, 0x3d, 0x8f, 0x5d, 0x11, 0x15, - 0x2a, 0x92, 0x69, 0x5c, 0xea, 0x26, 0x12, 0xd0, 0xff, 0x92, 0x82, 0x5c, 0x1c, 0x68, 0xc1, 0xe6, - 0x2d, 0xc8, 0xcb, 0xe7, 0x54, 0xa9, 0x70, 0x23, 0x17, 0x0b, 0x45, 0x1d, 0x5f, 0x87, 0x9c, 0x1d, - 0x04, 0x21, 0x19, 0x62, 0x15, 0x23, 0x2b, 0x65, 0x42, 0xe5, 0x5b, 0x80, 0x46, 0x9d, 0xd2, 0xc7, - 0xcc, 0x16, 0x71, 0x8d, 0xba, 0xd7, 0x28, 0xc5, 0x37, 0x0f, 0x30, 0xb3, 0x05, 0xaa, 0x07, 0x95, - 0x24, 0x0f, 0x24, 0x05, 0x9e, 0xd1, 0x93, 0x25, 0x82, 0xc7, 0xdd, 0xb8, 0xfc, 0x65, 0x9f, 0x23, - 0xfa, 0x0f, 0x00, 0xba, 0xa4, 0xdf, 0x77, 0x29, 0x75, 0x89, 0x5f, 0x3e, 0x27, 0xac, 0xeb, 0x75, - 0x59, 0xbc, 0xf1, 0xf6, 0x90, 0xdb, 0xa4, 0xbe, 0x3a, 0xd2, 0x5c, 0xc9, 0xf0, 0x8e, 0xf8, 0xfd, - 0x8b, 0xa7, 0x8b, 0x9a, 0xa1, 0x18, 0xd0, 0x7f, 0xab, 0x41, 0x46, 0xcc, 0x68, 0xe1, 0xca, 0x0d, - 0x28, 0x50, 0xcf, 0xa6, 0xbb, 0x56, 0x97, 0xf8, 0x2c, 0xb4, 0xbb, 0x72, 0x2f, 0x18, 0x79, 0x21, - 0x5d, 0x95, 0x42, 0x74, 0x13, 0x8a, 0x84, 0xbf, 0xb1, 0x5c, 0xdf, 0x92, 0xad, 0xc9, 0xa3, 0x38, - 0x6d, 0xe4, 0x49, 0x64, 0xea, 0xfd, 0xa8, 0x43, 0x6b, 0x50, 0x8a, 0xf4, 0xc8, 0x80, 0xc5, 0x8a, - 0x69, 0xa1, 0x58, 0x10, 0xf2, 0xce, 0x80, 0x49, 0xcd, 0x4b, 0x30, 0xf3, 0xc8, 0x76, 0x3d, 0xdc, - 0x13, 0xf1, 0x9a, 0x35, 0xe4, 0x49, 0xff, 0xa3, 0x06, 0x73, 0x92, 0xde, 0x32, 0xa5, 0x98, 0x99, - 0xcc, 0x66, 0xf8, 0x54, 0x6b, 0xab, 0xe5, 0x33, 0xa5, 0xdb, 0x5b, 0x3e, 0x8b, 0xd7, 0x16, 0x32, - 0xe0, 0x9c, 0xba, 0x1e, 0x4e, 0x37, 0x42, 0x22, 0x53, 0xfa, 0x9f, 0x35, 0xb8, 0x68, 0xf2, 0xd8, - 0xdd, 0x0b, 0x49, 0x7f, 0xcb, 0xef, 0x61, 0x0f, 0x3b, 0x62, 0x25, 0xa3, 0xb7, 0x21, 0xc3, 0xb3, - 0x85, 0xc3, 0xb8, 0x61, 0x32, 0x2b, 0xb9, 0xc3, 0x83, 0xea, 0xac, 0x29, 0x84, 0xad, 0xa6, 0x31, - 0x1b, 0x5d, 0xb7, 0x7a, 0xe8, 0x26, 0xcc, 0xda, 0xdc, 0x79, 0xae, 0x19, 0x71, 0xcb, 0x1e, 0x1e, - 0x54, 0xcf, 0x8b, 0x80, 0xb4, 0x9a, 0xc6, 0x79, 0x71, 0xd9, 0x52, 0xb7, 0x79, 0xfa, 0xec, 0xc2, - 0xa2, 0x7f, 0xaa, 0xc1, 0xfc, 0xc8, 0x05, 0x81, 0x49, 0x37, 0x08, 0xf1, 0xc6, 0x58, 0x69, 0xaf, - 0xc5, 0x2a, 0x75, 0x86, 0xac, 0x7e, 0x93, 0x06, 0x24, 0x58, 0xad, 0xed, 0xe1, 0xee, 0x80, 0x47, - 0x54, 0x14, 0xb0, 0x03, 0xa5, 0xa8, 0x80, 0x83, 0x90, 0x04, 0x24, 0xe4, 0xf2, 0x33, 0xf9, 0xb4, - 0x29, 0x0a, 0xab, 0x1b, 0x23, 0xa3, 0xe8, 0x27, 0x90, 0x8d, 0x80, 0xce, 0xae, 0x64, 0x40, 0x18, - 0x8c, 0xbe, 0x1e, 0x6c, 0x98, 0x8f, 0xcc, 0x0f, 0x94, 0x9a, 0xa1, 0x72, 0xe5, 0x2c, 0x26, 0x0e, - 0x93, 0xc4, 0x32, 0x5b, 0x99, 0xe6, 0x94, 0x0c, 0x24, 0x8c, 0xa9, 0x17, 0x14, 0x7d, 0x00, 0x73, - 0x11, 0x84, 0x48, 0x14, 0xb5, 0x02, 0x42, 0xbc, 0xf2, 0xf4, 0x31, 0x3b, 0x2d, 0xa1, 0x08, 0xa4, - 0xf9, 0x28, 0x3a, 0x47, 0x62, 0xfd, 0x7f, 0x29, 0xde, 0xb6, 0xd1, 0x53, 0xf1, 0xec, 0x24, 0xd3, - 0xe5, 0x6d, 0x28, 0xd1, 0xc1, 0x76, 0xdf, 0x65, 0x7c, 0x72, 0x28, 0xe3, 0x25, 0x6d, 0x14, 0x47, - 0x72, 0x39, 0x36, 0xae, 0x43, 0x0e, 0x0f, 0xf9, 0xe4, 0x55, 0x86, 0x4b, 0xda, 0xc8, 0x0a, 0x99, - 0x54, 0xf9, 0x1a, 0x64, 0x5c, 0x6a, 0x0d, 0x31, 0x23, 0xa3, 0xe1, 0x32, 0xeb, 0xd2, 0x87, 0xe2, - 0x9c, 0x58, 0x2e, 0xe7, 0xde, 0x44, 0xb9, 0x7c, 0x1d, 0xa2, 0xec, 0x5a, 0xfc, 0x45, 0x79, 0xe6, - 0x9a, 0x56, 0xcb, 0x1b, 0x19, 0x21, 0xd9, 0xdc, 0x0f, 0x30, 0x6a, 0x43, 0x01, 0xc7, 0x75, 0x1c, - 0x2d, 0x9b, 0xf3, 0x62, 0xb0, 0xdf, 0x9a, 0x9c, 0x88, 0xb1, 0xba, 0x37, 0xf2, 0x58, 0x3d, 0xea, - 0x7f, 0xd2, 0x60, 0xde, 0xc0, 0x8e, 0x4b, 0x19, 0x0e, 0xe3, 0x3c, 0x18, 0xf8, 0xa7, 0xe8, 0xbb, - 0x90, 0xdb, 0x09, 0x49, 0x5f, 0x6c, 0x26, 0x4c, 0xe9, 0x2b, 0xbf, 0x00, 0xb3, 0x5c, 0x5b, 0x8a, - 0xd0, 0xbb, 0x30, 0x2d, 0xa8, 0xa5, 0x04, 0xb5, 0xeb, 0xc7, 0x7e, 0xf7, 0x08, 0x52, 0x42, 0xfd, - 0xee, 0xb7, 0x3f, 0x79, 0x52, 0x9d, 0xfa, 0xcf, 0x93, 0xea, 0xd4, 0xc7, 0x2f, 0x9e, 0x2e, 0x66, - 0xef, 0x1d, 0x19, 0xfc, 0xf9, 0x8b, 0xa7, 0x8b, 0x97, 0x95, 0x60, 0xaa, 0x6f, 0xf5, 0x0a, 0x94, - 0xbf, 0xec, 0x00, 0x0d, 0x88, 0x4f, 0xb1, 0xfe, 0x4f, 0x0d, 0xf2, 0x9d, 0x80, 0xb5, 0x7c, 0x46, - 0x96, 0x1f, 0x9a, 0xa7, 0xf6, 0xab, 0x0a, 0x59, 0x7b, 0x48, 0x47, 0x6f, 0xa3, 0xef, 0x01, 0xb0, - 0x87, 0x34, 0x56, 0x78, 0x0f, 0x8a, 0xc1, 0x60, 0xdb, 0x73, 0xbb, 0xfc, 0x13, 0xcd, 0x7a, 0x44, - 0x89, 0x2f, 0x07, 0xec, 0x1c, 0xff, 0x4d, 0xb0, 0x21, 0xae, 0xee, 0xe3, 0xfd, 0x1f, 0x9a, 0x9d, - 0xb6, 0x91, 0x0f, 0x46, 0x47, 0x4a, 0xfc, 0xbb, 0xef, 0x1e, 0xe7, 0x7c, 0x79, 0xcc, 0x79, 0xc5, - 0x1f, 0xfd, 0x02, 0x20, 0x55, 0x20, 0xfd, 0xfe, 0x9d, 0x06, 0x85, 0x4e, 0xc0, 0x3a, 0x03, 0xd6, - 0xd9, 0xf9, 0x2a, 0x1c, 0xbf, 0xfb, 0x9d, 0xe3, 0xd8, 0x5f, 0x19, 0x67, 0xaf, 0xb0, 0xd2, 0x2f, - 0xf2, 0x1f, 0x20, 0x8a, 0x44, 0xf2, 0x7f, 0xa6, 0x41, 0xde, 0xc4, 0x6c, 0x95, 0xf8, 0xf4, 0x3e, - 0xde, 0xe7, 0xf4, 0xef, 0xc0, 0xf9, 0xd7, 0x65, 0x1e, 0x2b, 0xbe, 0xd1, 0x74, 0xdd, 0x56, 0x1d, - 0x8e, 0x11, 0x5f, 0x4e, 0xd5, 0x98, 0x0b, 0x3c, 0x55, 0xaa, 0x20, 0x72, 0x75, 0xd1, 0x83, 0x8c, - 0x39, 0xea, 0xee, 0x0a, 0x5c, 0x32, 0xd7, 0x97, 0xcd, 0xf7, 0xad, 0xcd, 0x1f, 0x6d, 0xac, 0x59, - 0x5b, 0x6d, 0x73, 0x63, 0x6d, 0xb5, 0x75, 0xaf, 0xb5, 0xd6, 0x2c, 0x4d, 0xa1, 0xab, 0x50, 0x56, - 0xee, 0x5a, 0x6d, 0x73, 0x73, 0xb9, 0xbd, 0x69, 0x09, 0x51, 0x49, 0x43, 0x37, 0xe0, 0xba, 0x72, - 0xdb, 0xee, 0xc4, 0x0a, 0xcb, 0xed, 0xb5, 0xce, 0x96, 0x29, 0xd5, 0x52, 0x77, 0xfe, 0x36, 0x0d, - 0xe9, 0x07, 0xd4, 0x41, 0x4f, 0x34, 0x28, 0xbd, 0xdc, 0x35, 0x28, 0x79, 0x98, 0x27, 0x4c, 0x87, - 0xca, 0xd2, 0x6b, 0x6a, 0xca, 0x74, 0xbe, 0xf3, 0xf1, 0x5f, 0xff, 0xfd, 0x69, 0x6a, 0x49, 0xff, - 0x66, 0x23, 0xf9, 0x4f, 0x25, 0x8d, 0xa4, 0x09, 0xf4, 0x89, 0x06, 0x70, 0x14, 0x2f, 0xa4, 0x27, - 0x0f, 0x38, 0x35, 0xc2, 0x95, 0x5b, 0xaf, 0xd4, 0x91, 0x84, 0x96, 0x04, 0xa1, 0x5b, 0xfa, 0x8d, - 0x49, 0x84, 0xc6, 0x8b, 0x8f, 0x53, 0x39, 0xea, 0xb2, 0x09, 0x54, 0xc6, 0xfa, 0x72, 0x02, 0x95, - 0x84, 0x56, 0x7d, 0x25, 0x95, 0xf1, 0xf9, 0xf5, 0x0b, 0x0d, 0xb2, 0x4a, 0xc7, 0xa0, 0xb7, 0x26, - 0xe1, 0x28, 0x5d, 0x56, 0xa9, 0xbd, 0x5a, 0x49, 0xb2, 0xa9, 0x0b, 0x36, 0x35, 0xfd, 0xe6, 0x31, - 0x6c, 0x54, 0xcb, 0xe7, 0x7e, 0xc6, 0x7f, 0x27, 0xac, 0xac, 0x7f, 0x7e, 0xb8, 0xa0, 0x7d, 0x71, - 0xb8, 0xa0, 0xfd, 0xeb, 0x70, 0x41, 0xfb, 0xe5, 0xf3, 0x85, 0xa9, 0x2f, 0x9e, 0x2f, 0x4c, 0xfd, - 0xfd, 0xf9, 0xc2, 0xd4, 0x07, 0x77, 0x94, 0xad, 0xb8, 0x16, 0x99, 0x6c, 0x63, 0xf6, 0x21, 0x09, - 0x1f, 0x8f, 0x10, 0xf6, 0x8e, 0x30, 0xc4, 0x96, 0xdc, 0x9e, 0x11, 0x7f, 0x83, 0x7a, 0xe7, 0xff, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x93, 0x44, 0x68, 0x6f, 0x59, 0x13, 0x00, 0x00, + 0x15, 0x77, 0xcf, 0x38, 0x8e, 0xe7, 0xcd, 0x87, 0xc7, 0xe5, 0x7c, 0x4c, 0x66, 0x83, 0x27, 0xe9, + 0x25, 0xc9, 0xac, 0xc1, 0x33, 0x4a, 0x96, 0x45, 0xda, 0x00, 0x12, 0xb6, 0xc7, 0x51, 0x86, 0x38, + 0x33, 0x56, 0xb7, 0x1d, 0x89, 0x45, 0xa8, 0xd5, 0x9e, 0x29, 0xf7, 0x74, 0xd2, 0xd3, 0xd5, 0x74, + 0xd5, 0x4c, 0xec, 0x3d, 0xa1, 0x3d, 0xad, 0x10, 0x07, 0xa4, 0x3d, 0x20, 0x04, 0x87, 0x9c, 0x10, + 0xc7, 0x1c, 0x96, 0x23, 0x02, 0x6e, 0x7b, 0x5c, 0x05, 0x0e, 0x88, 0x83, 0x41, 0x0e, 0x52, 0xf8, + 0x23, 0x40, 0x42, 0x55, 0x5d, 0x3d, 0xae, 0xc9, 0xf6, 0x38, 0xb1, 0xe2, 0x70, 0x49, 0x5c, 0xaf, + 0x5e, 0xbd, 0xdf, 0xef, 0xbd, 0x7a, 0x1f, 0xd5, 0x03, 0x97, 0xf1, 0x1e, 0xe9, 0x90, 0x10, 0xd7, + 0x49, 0x80, 0x43, 0x9b, 0x91, 0xb0, 0x3e, 0xbc, 0x59, 0x67, 0x7b, 0xb5, 0x20, 0x24, 0x8c, 0xa0, + 0x05, 0xb9, 0x5b, 0x8b, 0x77, 0x6b, 0xc3, 0x9b, 0xe5, 0x79, 0xbb, 0xef, 0xfa, 0xa4, 0x2e, 0xfe, + 0x8d, 0xf4, 0xca, 0x17, 0x3b, 0x84, 0xf6, 0x09, 0xad, 0xf7, 0xa9, 0xc3, 0xcf, 0xf7, 0xa9, 0x23, + 0x37, 0xbe, 0x2e, 0x37, 0x28, 0xb3, 0x1f, 0xb9, 0x3e, 0xdf, 0xdc, 0xc1, 0xcc, 0xbe, 0x19, 0xaf, + 0xa5, 0xd6, 0xa5, 0x48, 0xcb, 0x12, 0xab, 0x7a, 0xb4, 0x90, 0x5b, 0xe7, 0x1c, 0xe2, 0x90, 0x48, + 0xce, 0xff, 0x92, 0xd2, 0xcb, 0x0e, 0x21, 0x8e, 0x87, 0xeb, 0x76, 0xe0, 0xd6, 0x6d, 0xdf, 0x27, + 0xcc, 0x66, 0x2e, 0xf1, 0xe5, 0x19, 0x1d, 0x43, 0xbe, 0x81, 0x3b, 0x0f, 0x6c, 0x6f, 0x80, 0xef, + 0xb8, 0xd8, 0xeb, 0xa2, 0x2d, 0x98, 0xb1, 0xfb, 0x64, 0xe0, 0xb3, 0x92, 0x76, 0x45, 0xab, 0x66, + 0x56, 0xbf, 0xfb, 0xc5, 0x41, 0x65, 0xea, 0xef, 0x07, 0x95, 0xeb, 0x8e, 0xcb, 0x7a, 0x83, 0x9d, + 0x5a, 0x87, 0xf4, 0x25, 0xaa, 0xfc, 0x6f, 0x99, 0x76, 0x1f, 0xd5, 0xd9, 0x7e, 0x80, 0x69, 0xad, + 0x81, 0x3b, 0xcf, 0x3e, 0x5f, 0x06, 0x49, 0xaa, 0x81, 0x3b, 0x86, 0xb4, 0xa5, 0xff, 0x27, 0x05, + 0xe7, 0xdb, 0x32, 0x2e, 0xed, 0x80, 0xe1, 0xee, 0xb6, 0xd9, 0x10, 0xa0, 0x28, 0x84, 0x02, 0xc5, + 0xde, 0xae, 0x35, 0xa0, 0x5d, 0x6b, 0xc8, 0x25, 0x12, 0x77, 0xe3, 0x64, 0xb8, 0x87, 0x07, 0x95, + 0x9c, 0x89, 0xbd, 0xdd, 0xd8, 0xee, 0x4b, 0x3c, 0x72, 0x1c, 0x63, 0x9b, 0x76, 0x23, 0xcc, 0x01, + 0xcc, 0x31, 0xc2, 0x6c, 0x4f, 0x01, 0x4d, 0x09, 0xd0, 0xfb, 0x27, 0x06, 0xcd, 0x6f, 0x71, 0x43, + 0x13, 0x50, 0xf3, 0x02, 0x65, 0x04, 0xbb, 0x07, 0x45, 0xbb, 0xc3, 0xdc, 0x21, 0x56, 0x70, 0xd3, + 0x02, 0xb7, 0x75, 0x62, 0xdc, 0xc2, 0x8a, 0xb0, 0x34, 0x01, 0xb8, 0x10, 0xe1, 0xc4, 0xc8, 0xfa, + 0xef, 0x35, 0x58, 0x88, 0xc3, 0xff, 0x80, 0x30, 0xd7, 0x77, 0x36, 0xc9, 0x63, 0x1c, 0xa2, 0xef, + 0x41, 0x3e, 0xce, 0x56, 0xcb, 0xee, 0x76, 0x43, 0x19, 0xfb, 0xd2, 0xb3, 0xcf, 0x97, 0xcf, 0x49, + 0x73, 0x2b, 0xdd, 0x6e, 0x88, 0x29, 0x35, 0x59, 0xe8, 0xfa, 0x8e, 0x91, 0x8b, 0xd5, 0xb9, 0x18, + 0x59, 0x90, 0x1b, 0x0a, 0x6b, 0x56, 0xc0, 0xcd, 0xc9, 0x20, 0xbe, 0x59, 0xc6, 0x64, 0x87, 0x47, + 0xfc, 0xf4, 0x5f, 0xa6, 0x60, 0x41, 0xe1, 0x6b, 0xfa, 0x76, 0x40, 0x7b, 0x84, 0xa1, 0x0b, 0x30, + 0xd3, 0xc3, 0xae, 0xd3, 0x8b, 0x92, 0x34, 0x6d, 0xc8, 0x15, 0x7a, 0x08, 0x28, 0xba, 0xd8, 0x53, + 0xa7, 0x55, 0x14, 0x76, 0xd5, 0xd8, 0x19, 0x50, 0x54, 0x51, 0x2c, 0x8a, 0x59, 0x29, 0x7d, 0x25, + 0x5d, 0xcd, 0xde, 0xaa, 0xd6, 0x12, 0x5a, 0x41, 0x2d, 0x21, 0xfe, 0x46, 0x41, 0x71, 0xd6, 0xc4, + 0x0c, 0x55, 0xa1, 0xe8, 0xd9, 0x94, 0x59, 0x9d, 0x9e, 0xed, 0x3b, 0xb8, 0x6b, 0x3d, 0xc2, 0xfb, + 0xa5, 0x69, 0xce, 0xde, 0x28, 0x70, 0xf9, 0x5a, 0x24, 0xbe, 0x87, 0xf7, 0xf5, 0xc7, 0x50, 0x88, + 0xa3, 0x71, 0x17, 0x7b, 0x01, 0x0e, 0x13, 0xcf, 0x6a, 0x49, 0x67, 0xd1, 0x22, 0x64, 0x7b, 0x36, + 0xb5, 0x48, 0xc0, 0x2c, 0x32, 0x60, 0x22, 0x3c, 0xb3, 0x46, 0xa6, 0x67, 0xd3, 0x76, 0xc0, 0xda, + 0x03, 0x86, 0xde, 0x01, 0xbe, 0xb0, 0xa8, 0x67, 0xd3, 0x9e, 0x48, 0xd0, 0x59, 0x63, 0xb6, 0x67, + 0x53, 0x93, 0xaf, 0xf5, 0x7d, 0x28, 0xaf, 0x79, 0x2e, 0xf6, 0xb9, 0x41, 0xd7, 0x5f, 0xb7, 0x43, + 0xdf, 0xf5, 0x1d, 0x9e, 0x0d, 0x1b, 0x2e, 0x65, 0xe8, 0x47, 0x30, 0x8f, 0x23, 0x91, 0xe5, 0xfa, + 0xbb, 0xc4, 0xf2, 0x5c, 0xca, 0xef, 0x88, 0x47, 0xa5, 0x9e, 0x18, 0x95, 0x64, 0x5b, 0x4d, 0x7f, + 0x97, 0x18, 0x73, 0xd2, 0x12, 0x5f, 0x70, 0xe3, 0xfa, 0xaf, 0xb4, 0x49, 0xd8, 0x5c, 0x05, 0x7d, + 0x1f, 0x90, 0xf7, 0xb1, 0xd5, 0x11, 0x0a, 0x3c, 0x0a, 0xae, 0x6f, 0xb9, 0x5d, 0x11, 0x82, 0xe9, + 0xd5, 0x85, 0xc3, 0x83, 0xca, 0xdc, 0xc6, 0xc7, 0xca, 0xe9, 0x66, 0xc3, 0x98, 0xf3, 0xc6, 0x04, + 0x5d, 0xf4, 0x21, 0x5c, 0x1a, 0x3b, 0x1e, 0xbb, 0x22, 0x4a, 0x43, 0x64, 0x91, 0x71, 0xa1, 0x93, + 0x48, 0x40, 0xff, 0x73, 0x0a, 0x72, 0xf1, 0x0d, 0x0b, 0x36, 0xef, 0x42, 0x5e, 0x1e, 0xa7, 0x4a, + 0x69, 0x19, 0xb9, 0x58, 0x28, 0x0a, 0xe8, 0x2a, 0xe4, 0xec, 0x20, 0x08, 0xc9, 0x10, 0xab, 0x18, + 0x59, 0x29, 0x13, 0x2a, 0xdf, 0x04, 0x34, 0x2a, 0xd1, 0x3e, 0x66, 0xb6, 0x88, 0x6b, 0xd4, 0x36, + 0x8c, 0x62, 0xbc, 0x73, 0x1f, 0x33, 0x5b, 0xa0, 0x7a, 0x50, 0x4e, 0xf2, 0x40, 0x52, 0xe0, 0xa9, + 0x74, 0xb2, 0x8b, 0xe0, 0x71, 0x37, 0x2e, 0x7e, 0xd5, 0xe7, 0x88, 0xfe, 0x7d, 0x80, 0x0e, 0xe9, + 0xf7, 0x5d, 0x4a, 0x5d, 0xe2, 0x97, 0xce, 0x08, 0xeb, 0x7a, 0x4d, 0x56, 0x4d, 0x3c, 0xb6, 0xe4, + 0x18, 0xab, 0xad, 0x8d, 0x34, 0x57, 0x33, 0xbc, 0x14, 0x7f, 0xf7, 0xe2, 0xe9, 0x92, 0x66, 0x28, + 0x06, 0xf4, 0xdf, 0x68, 0x90, 0x11, 0xc3, 0x41, 0xb8, 0x72, 0x0d, 0x0a, 0x22, 0x03, 0xad, 0x0e, + 0xf1, 0x59, 0x68, 0x77, 0xe4, 0x40, 0x32, 0xf2, 0x42, 0xba, 0x26, 0x85, 0xe8, 0x3a, 0xcc, 0x11, + 0x7e, 0xc6, 0x72, 0x7d, 0x4b, 0xf6, 0x04, 0x1e, 0xc5, 0x69, 0x23, 0x4f, 0x22, 0x53, 0x77, 0xa3, + 0xd6, 0x50, 0x85, 0x62, 0xa4, 0x47, 0x06, 0x2c, 0x56, 0x4c, 0x0b, 0xc5, 0x82, 0x90, 0xb7, 0x07, + 0x4c, 0x6a, 0x5e, 0x80, 0x99, 0x87, 0xb6, 0xeb, 0xe1, 0xae, 0x88, 0xd7, 0xac, 0x21, 0x57, 0xfa, + 0x1f, 0x34, 0x98, 0x97, 0xf4, 0x56, 0x28, 0xc5, 0xcc, 0x64, 0x36, 0xc3, 0x6f, 0x34, 0x2f, 0x9b, + 0x3e, 0x53, 0xda, 0x4c, 0xd3, 0x67, 0xf1, 0xbc, 0x44, 0x06, 0x9c, 0x51, 0xe7, 0xd2, 0x9b, 0xf5, + 0xae, 0xc8, 0x94, 0xfe, 0x27, 0x0d, 0xce, 0x8b, 0x1a, 0xbe, 0x13, 0x92, 0xfe, 0xb6, 0xdf, 0xc5, + 0x1e, 0x76, 0xc4, 0x5b, 0x00, 0xbd, 0x07, 0x19, 0x7e, 0x5b, 0x38, 0x8c, 0x0b, 0x26, 0xb3, 0x9a, + 0x3b, 0x3c, 0xa8, 0xcc, 0x9a, 0x42, 0xd8, 0x6c, 0x18, 0xb3, 0xd1, 0x76, 0xb3, 0x8b, 0xae, 0xc3, + 0xac, 0xcd, 0x9d, 0xe7, 0x9a, 0x11, 0xb7, 0xec, 0xe1, 0x41, 0xe5, 0xac, 0x08, 0x48, 0xb3, 0x61, + 0x9c, 0x15, 0x9b, 0x4d, 0xf5, 0x19, 0x91, 0x3e, 0xbd, 0xb0, 0xe8, 0x9f, 0x69, 0xb0, 0x30, 0x72, + 0x41, 0x60, 0xd2, 0x4d, 0x42, 0xbc, 0x31, 0x56, 0xda, 0x6b, 0xb1, 0x4a, 0x9d, 0x22, 0xab, 0x5f, + 0xa7, 0x01, 0x09, 0x56, 0xeb, 0x7b, 0xb8, 0x33, 0xe0, 0x11, 0x15, 0x09, 0xec, 0x40, 0x31, 0x4a, + 0xe0, 0x20, 0x24, 0x01, 0x09, 0xb9, 0xfc, 0x54, 0xde, 0x54, 0x73, 0xc2, 0xea, 0xe6, 0xc8, 0x28, + 0xfa, 0x31, 0x64, 0x23, 0xa0, 0xd3, 0x4b, 0x19, 0x10, 0x06, 0xa3, 0x67, 0x8b, 0x0d, 0x0b, 0x91, + 0xf9, 0x81, 0x92, 0x33, 0x54, 0xce, 0xba, 0xa5, 0xc4, 0x66, 0x92, 0x98, 0x66, 0xab, 0xd3, 0x9c, + 0x92, 0x81, 0x84, 0x31, 0x75, 0x83, 0xa2, 0x8f, 0x60, 0x3e, 0x82, 0x10, 0x17, 0x45, 0xad, 0x80, + 0x10, 0xaf, 0x34, 0x7d, 0xcc, 0x30, 0x4d, 0x48, 0x02, 0x69, 0x3e, 0x8a, 0xce, 0x91, 0x58, 0xff, + 0x6f, 0x8a, 0x97, 0x6d, 0x74, 0x54, 0x1c, 0x3b, 0x49, 0x77, 0x79, 0x0f, 0x8a, 0x74, 0xb0, 0xd3, + 0x77, 0x19, 0xef, 0x1c, 0x4a, 0x7b, 0x49, 0x1b, 0x73, 0x23, 0xb9, 0x6c, 0x1b, 0x57, 0x21, 0x87, + 0x87, 0xbc, 0xf3, 0x2a, 0xcd, 0x25, 0x6d, 0x64, 0x85, 0x4c, 0xaa, 0xbc, 0x03, 0x19, 0x97, 0x5a, + 0x43, 0xcc, 0xc8, 0xa8, 0xb9, 0xcc, 0xba, 0xf4, 0x81, 0x58, 0x27, 0xa6, 0xcb, 0x99, 0xb7, 0x91, + 0x2e, 0x5f, 0x83, 0xe8, 0x76, 0x2d, 0x7e, 0xa2, 0x34, 0x73, 0x45, 0xab, 0xe6, 0x8d, 0x8c, 0x90, + 0x6c, 0xed, 0x07, 0x18, 0xb5, 0xa0, 0x80, 0xe3, 0x3c, 0x8e, 0x86, 0xcd, 0x59, 0xd1, 0xd8, 0x6f, + 0x4c, 0xbe, 0x88, 0xb1, 0xbc, 0x37, 0xf2, 0x58, 0x5d, 0xea, 0x7f, 0xd4, 0x60, 0xc1, 0xc0, 0x8e, + 0x4b, 0x19, 0x0e, 0xe3, 0x7b, 0x30, 0xf0, 0x4f, 0xd0, 0x77, 0x20, 0xb7, 0x1b, 0x92, 0xbe, 0x98, + 0x4c, 0x98, 0xd2, 0x57, 0x3e, 0x3d, 0xb3, 0x5c, 0x5b, 0x8a, 0xd0, 0x07, 0x30, 0x2d, 0xa8, 0xa5, + 0x04, 0xb5, 0xab, 0xc7, 0x3e, 0xb8, 0x04, 0x29, 0xa1, 0x7e, 0xfb, 0x5b, 0x9f, 0x3e, 0xa9, 0x4c, + 0xfd, 0xfb, 0x49, 0x65, 0xea, 0x93, 0x17, 0x4f, 0x97, 0xb2, 0x77, 0x8e, 0x0c, 0xfe, 0xec, 0xc5, + 0xd3, 0xa5, 0x8b, 0x4a, 0x30, 0xd5, 0xb3, 0x7a, 0x19, 0x4a, 0x5f, 0x75, 0x80, 0x06, 0xc4, 0xa7, + 0x58, 0xff, 0x87, 0x06, 0xf9, 0x76, 0xc0, 0x9a, 0x3e, 0x23, 0x2b, 0x0f, 0xcc, 0x37, 0xf6, 0xab, + 0x02, 0x59, 0x7b, 0x48, 0x47, 0x67, 0xa3, 0xf7, 0x00, 0xd8, 0x43, 0x1a, 0x2b, 0x7c, 0x08, 0x73, + 0xc1, 0x60, 0xc7, 0x73, 0x3b, 0xfc, 0x7d, 0x67, 0x3d, 0xa4, 0xc4, 0x97, 0x0d, 0x76, 0x9e, 0x7f, + 0x8c, 0x6c, 0x8a, 0xad, 0x7b, 0x78, 0xff, 0x07, 0x66, 0xbb, 0x65, 0xe4, 0x83, 0xd1, 0x92, 0x12, + 0xff, 0xf6, 0x07, 0xc7, 0x39, 0x5f, 0x1a, 0x73, 0x5e, 0xf1, 0x47, 0x3f, 0x07, 0x48, 0x15, 0x48, + 0xbf, 0x7f, 0xab, 0x41, 0x21, 0x7a, 0x2e, 0xb6, 0x77, 0xff, 0x1f, 0x8e, 0xdf, 0xfe, 0xf6, 0x71, + 0xec, 0x2f, 0x8d, 0xb3, 0x57, 0x58, 0xe9, 0xe7, 0xf9, 0x97, 0x8f, 0x22, 0x91, 0xfc, 0x9f, 0x69, + 0x90, 0x37, 0x31, 0x5b, 0x23, 0x3e, 0xbd, 0x87, 0xf7, 0x39, 0xfd, 0x5b, 0x70, 0xf6, 0x75, 0x99, + 0xc7, 0x8a, 0x6f, 0xf5, 0xba, 0x6e, 0xaa, 0x0e, 0xc7, 0x88, 0x2f, 0x5f, 0xd5, 0x98, 0x0b, 0xfc, + 0xaa, 0x54, 0x41, 0xe4, 0xea, 0x92, 0x07, 0x19, 0x73, 0x54, 0xdd, 0x65, 0xb8, 0x60, 0x6e, 0xac, + 0x98, 0x77, 0xad, 0xad, 0x1f, 0x6e, 0xae, 0x5b, 0xdb, 0x2d, 0x73, 0x73, 0x7d, 0xad, 0x79, 0xa7, + 0xb9, 0xde, 0x28, 0x4e, 0xa1, 0xcb, 0x50, 0x52, 0xf6, 0x9a, 0x2d, 0x73, 0x6b, 0xa5, 0xb5, 0x65, + 0x09, 0x51, 0x51, 0x43, 0xd7, 0xe0, 0xaa, 0xb2, 0xdb, 0x6a, 0xc7, 0x0a, 0x2b, 0xad, 0xf5, 0xf6, + 0xb6, 0x29, 0xd5, 0x52, 0xb7, 0xfe, 0x3a, 0x0d, 0xe9, 0xfb, 0xd4, 0x41, 0x4f, 0x34, 0x28, 0xbe, + 0x5c, 0x35, 0x28, 0xb9, 0x99, 0x27, 0x74, 0x87, 0xf2, 0xf2, 0x6b, 0x6a, 0xca, 0xeb, 0x7c, 0xff, + 0x93, 0xbf, 0xfc, 0xeb, 0xb3, 0xd4, 0xb2, 0xfe, 0x8d, 0x7a, 0xf2, 0x6f, 0x34, 0xf5, 0xa4, 0x0e, + 0xf4, 0xa9, 0x06, 0x70, 0x14, 0x2f, 0xa4, 0x27, 0x37, 0x38, 0x35, 0xc2, 0xe5, 0x1b, 0xaf, 0xd4, + 0x91, 0x84, 0x96, 0x05, 0xa1, 0x1b, 0xfa, 0xb5, 0x49, 0x84, 0xc6, 0x93, 0x8f, 0x53, 0x39, 0xaa, + 0xb2, 0x09, 0x54, 0xc6, 0xea, 0x72, 0x02, 0x95, 0x84, 0x52, 0x7d, 0x25, 0x95, 0xf1, 0xfe, 0xf5, + 0x73, 0x0d, 0xb2, 0x4a, 0xc5, 0xa0, 0x77, 0x27, 0xe1, 0x28, 0x55, 0x56, 0xae, 0xbe, 0x5a, 0x49, + 0xb2, 0xa9, 0x09, 0x36, 0x55, 0xfd, 0xfa, 0x31, 0x6c, 0x54, 0xcb, 0x67, 0x7e, 0xca, 0xbf, 0x13, + 0x56, 0x37, 0xbe, 0x38, 0x5c, 0xd4, 0xbe, 0x3c, 0x5c, 0xd4, 0xfe, 0x79, 0xb8, 0xa8, 0xfd, 0xe2, + 0xf9, 0xe2, 0xd4, 0x97, 0xcf, 0x17, 0xa7, 0xfe, 0xf6, 0x7c, 0x71, 0xea, 0xa3, 0x5b, 0xca, 0x54, + 0x5c, 0x8f, 0x4c, 0xb6, 0x30, 0x7b, 0x4c, 0xc2, 0x47, 0x23, 0x84, 0xbd, 0x23, 0x0c, 0x31, 0x25, + 0x77, 0x66, 0xc4, 0x8f, 0x5f, 0xef, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xc1, 0x06, 0xf3, + 0xd2, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1666,6 +1746,56 @@ func (m *VotingPowerSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *SnapshotHelper) 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 *SnapshotHelper) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SnapshotHelper) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.HasSlash { + i-- + if m.HasSlash { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x18 + } + if m.HasOptOut { + i-- + if m.HasOptOut { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 + } + if len(m.LastChangedKey) > 0 { + i -= len(m.LastChangedKey) + copy(dAtA[i:], m.LastChangedKey) + i = encodeVarintTx(dAtA, i, uint64(len(m.LastChangedKey))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *ClientChainEarningAddrList) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2467,6 +2597,25 @@ func (m *VotingPowerSnapshot) Size() (n int) { return n } +func (m *SnapshotHelper) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.LastChangedKey) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + if m.HasOptOut { + n += 2 + } + if m.HasSlash { + n += 2 + } + return n +} + func (m *ClientChainEarningAddrList) Size() (n int) { if m == nil { return 0 @@ -3289,6 +3438,128 @@ func (m *VotingPowerSnapshot) Unmarshal(dAtA []byte) error { } return nil } +func (m *SnapshotHelper) 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 ErrIntOverflowTx + } + 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: SnapshotHelper: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SnapshotHelper: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastChangedKey", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.LastChangedKey = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field HasOptOut", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.HasOptOut = bool(v != 0) + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field HasSlash", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.HasSlash = bool(v != 0) + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *ClientChainEarningAddrList) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/x/operator/types/utils.go b/x/operator/types/utils.go index 6ec7351a9..81408de8b 100644 --- a/x/operator/types/utils.go +++ b/x/operator/types/utils.go @@ -25,3 +25,13 @@ func ChainIDWithLenKey(chainID string) []byte { []byte(chainID), ) } + +func GetSpecifiedVotingPower(operator string, votingPowerSet []*OperatorVotingPower) *OperatorVotingPower { + for idx := range votingPowerSet { + tmpVp := votingPowerSet[idx] + if tmpVp.OperatorAddr == operator { + return tmpVp + } + } + return nil +} From 9b2081c86d51bbae17563a5cf99171913fa9033d Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Thu, 24 Oct 2024 22:03:49 +0800 Subject: [PATCH 05/12] 1. fix the issue of using incorrect height when slashing pending undelegations. 2. add the voting power pruning --- proto/exocore/operator/v1/tx.proto | 30 +- x/avs/keeper/avs.go | 8 + x/operator/keeper/abci.go | 73 ++-- x/operator/keeper/impl_epoch_hook.go | 7 + x/operator/keeper/slash.go | 15 +- x/operator/keeper/slash_test.go | 2 +- x/operator/keeper/voting_power_snapshot.go | 82 +++- x/operator/types/errors.go | 5 + x/operator/types/expected_keepers.go | 1 + x/operator/types/general.go | 20 +- x/operator/types/keys.go | 16 +- x/operator/types/tx.pb.go | 469 ++++++++++++--------- 12 files changed, 449 insertions(+), 279 deletions(-) diff --git a/proto/exocore/operator/v1/tx.proto b/proto/exocore/operator/v1/tx.proto index 8983a4458..e75d6c2a6 100644 --- a/proto/exocore/operator/v1/tx.proto +++ b/proto/exocore/operator/v1/tx.proto @@ -7,6 +7,7 @@ import "cosmos/staking/v1beta1/staking.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; +import "google/protobuf/timestamp.proto"; option go_package = "github.com/ExocoreNetwork/exocore/x/operator/types"; @@ -63,10 +64,8 @@ message OperatorVotingPower { // VotingPowerSnapshot is used to record the historical voting power for AVSs message VotingPowerSnapshot { - // height is the block height at which this snapshot is generated - int64 height = 1; // total_voting_power is the total voting power of specified AVS - string total_voting_power = 2 + string total_voting_power = 1 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", @@ -74,17 +73,28 @@ message VotingPowerSnapshot { ]; // operator_voting_powers records the active voting power of all operators // for the specified AVS - repeated OperatorVotingPower voting_power_set = 3; - // last_changed_key is used to indicate the key of most recent change when - // the voting_power_set is nil, which can help to fall back to the correct key. - string last_changed_key = 4; + repeated OperatorVotingPower voting_power_set = 2; + // last_changed_height is used to indicate the height of most recent change when + // the voting_power_set is nil, which can help to fall back to the correct epoch height. + int64 last_changed_height = 3; + // epoch_identifier record the epoch info + string epoch_identifier = 4; + // epoch_number indicates which epoch this snapshot serve for + int64 epoch_number = 5; + // block_time records the block time when it is stored, and it is used for snapshot pruning + // The epoch_number would be sufficient for pruning if we don't support AVSs changing their + // epoch configuration. + google.protobuf.Timestamp block_time = 6 [ + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false + ]; } // SnapshotHelper is used to record the helper information for voting power snapshot update message SnapshotHelper { - // last_changed_key indicates the key of the most recent change. - // It is used to set the `last_changed_key` field in `VotingPowerSnapshot`. - string last_changed_key = 1; + // last_changed_height indicates the height of the most recent change. + // It is used to set the `last_changed_height` field in `VotingPowerSnapshot`. + int64 last_changed_height = 1; // has_opt_out is used to indicate whether there has been any opt-out operation from // the most recently saved snapshot to the current height. This is because, diff --git a/x/avs/keeper/avs.go b/x/avs/keeper/avs.go index a87868902..9730521a7 100644 --- a/x/avs/keeper/avs.go +++ b/x/avs/keeper/avs.go @@ -64,6 +64,14 @@ func (k *Keeper) GetAVSMinimumSelfDelegation(ctx sdk.Context, avsAddr string) (s return sdkmath.LegacyNewDec(int64(avsInfo.Info.MinSelfDelegation)), nil } +func (k *Keeper) GetAVSUnbondingDuration(ctx sdk.Context, avsAddr string) (uint64, error) { + avsInfo, err := k.GetAVSInfo(ctx, avsAddr) + if err != nil { + return 0, errorsmod.Wrap(err, fmt.Sprintf("GetAVSUnbondingDuration: key is %s", avsAddr)) + } + return avsInfo.Info.AvsUnbondingPeriod, nil +} + // GetEpochEndAVSs returns a list of hex AVS addresses for AVSs which are scheduled to start at the end of the // current epoch, or the beginning of the next one. The address format returned is hex. func (k *Keeper) GetEpochEndAVSs(ctx sdk.Context, epochIdentifier string, endingEpochNumber int64) []string { diff --git a/x/operator/keeper/abci.go b/x/operator/keeper/abci.go index 850653db6..453719b62 100644 --- a/x/operator/keeper/abci.go +++ b/x/operator/keeper/abci.go @@ -3,6 +3,7 @@ package keeper import ( "errors" "strconv" + "time" assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" @@ -13,11 +14,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -// VotingPowerActivationDuration indicates how many epochs after the current epoch's voting power calculation -// will be activated and used. By default, this is set to 1 for all AVS. If we want to support custom configurations -// for AVS, we need to add it to the AVS info. -const VotingPowerActivationDuration = 1 - // UpdateVotingPower update the voting power of the specified AVS and its operators at // the end of epoch. func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier string, epochNumber int64, isForSlash bool) error { @@ -129,40 +125,43 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str } } votingPowerSnapshot := operatortypes.VotingPowerSnapshot{ - Height: cc.BlockHeight(), + EpochIdentifier: epochIdentifier, + EpochNumber: epochNumber, + BlockTime: ctx.BlockTime(), } - // The voting power calculated at the end of the current epoch will be - // used in the epoch following the VotingPowerActivationDuration. - // Therefore, when storing the voting power snapshot, we directly store - // the voting power information that is activated for the specified epoch. - // This way, during the slashing process, we do not need to consider the - // impact of VotingPowerActivationDuration. It can be directly used. - snapshotKey := assetstype.GetJoinedStoreKey(avsAddr, epochIdentifier, strconv.FormatInt(epochNumber+VotingPowerActivationDuration, 10)) - if isForSlash { - // When generating the snapshot key, there's no need to add VotingPowerActivationDuration - // to the epochNumber, because when a slash triggers a snapshot update, it updates the - // voting power information used in the current epoch. - snapshotKey = assetstype.GetJoinedStoreKey( - avsAddr, epochIdentifier, - strconv.FormatInt(epochNumber, 10), - strconv.FormatInt(ctx.BlockHeight(), 10)) + + // The voting power calculated at the end of the current epoch will be applied + // to the next epoch. Therefore, when storing the voting power snapshot, we use + // the `start_height` of the next epoch as the key. This ensures that during the + // slashing process, there is no need to account for voting power activation delay; + // it can be used directly. + // Use the current height as the snapshot height when handling snapshots triggered + // by slashing. This prevents stakers from escaping slashes through backrunning + // undelegation. + snapshotHeight := ctx.BlockHeight() + if !isForSlash { + // clear the slash flag at the end of the epoch + snapshotHelper.HasSlash = false + // Use the start height of the next epoch as the snapshot key. + // The start height of the next epoch should be the current height plus 1, + // as voting power is updated at the end of the epoch. + snapshotHeight++ + votingPowerSnapshot.EpochNumber++ } if snapshotHelper.HasOptOut || isSnapshotChanged { votingPowerSnapshot.TotalVotingPower = avsVotingPower votingPowerSnapshot.VotingPowerSet = votingPowerSet - snapshotHelper.LastChangedKey = string(snapshotKey) + snapshotHelper.LastChangedHeight = snapshotHeight // clear the hasOptOut flag if it's certain that the snapshot will be updated snapshotHelper.HasOptOut = false } - votingPowerSnapshot.LastChangedKey = snapshotHelper.LastChangedKey - if !isForSlash { - // clear the slash flag at the end of the epoch - snapshotHelper.HasSlash = false - } + votingPowerSnapshot.LastChangedHeight = snapshotHelper.LastChangedHeight + err = k.SetSnapshotHelper(cc, avsAddr, &snapshotHelper) if err != nil { return err } + snapshotKey := assetstype.GetJoinedStoreKey(avsAddr, strconv.FormatInt(snapshotHeight, 10)) err = k.SetVotingPowerSnapshot(cc, snapshotKey, &votingPowerSnapshot) if err != nil { return err @@ -172,6 +171,26 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str return nil } +func (k *Keeper) ClearVotingPowerSnapshot(ctx sdk.Context, avs string) error { + // calculate the time before which the snapshot should be cleared. + unbondingDuration, err := k.avsKeeper.GetAVSUnbondingDuration(ctx, avs) + if err != nil { + return operatortypes.ErrFailToClearVPSnapshot.Wrapf("ClearVotingPowerSnapshot: failed to get the avs unbonding duration, err:%s, avs:%s", err, avs) + } + epochInfo, err := k.avsKeeper.GetAVSEpochInfo(ctx, avs) + if err != nil { + return operatortypes.ErrFailToClearVPSnapshot.Wrapf("ClearVotingPowerSnapshot: failed to get the avs epoch information, err:%s, avs:%s", err, avs) + } + + clearTime := ctx.BlockTime().Add(-epochInfo.Duration * time.Duration(unbondingDuration)) + err = k.RemoveVotingPowerSnapshot(ctx, avs, clearTime) + if err != nil { + ctx.Logger().Error("Failed to get the avs epoch information", "avs", avs, "error", err) + return operatortypes.ErrFailToClearVPSnapshot.Wrapf("ClearVotingPowerSnapshot: failed to remove voting power snapshot, err:%s, avs:%s", err, avs) + } + return nil +} + // EndBlock : update the assets' share when their prices change func (k *Keeper) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { return []abci.ValidatorUpdate{} diff --git a/x/operator/keeper/impl_epoch_hook.go b/x/operator/keeper/impl_epoch_hook.go index 432b6333f..bce55a5f1 100644 --- a/x/operator/keeper/impl_epoch_hook.go +++ b/x/operator/keeper/impl_epoch_hook.go @@ -36,6 +36,13 @@ func (wrapper EpochsHooksWrapper) AfterEpochEnd( // Handle the error gracefully, continue to the next AVS continue } + // clear the expired voting power snapshot. + err = wrapper.keeper.ClearVotingPowerSnapshot(ctx, avs) + if err != nil { + ctx.Logger().Error("Failed to clear voting power snapshot", "avs", avs, "error", err) + // Handle the error gracefully, continue to the next AVS + continue + } } } diff --git a/x/operator/keeper/slash.go b/x/operator/keeper/slash.go index 49bacae53..75c2b0dd3 100644 --- a/x/operator/keeper/slash.go +++ b/x/operator/keeper/slash.go @@ -69,7 +69,7 @@ func (k *Keeper) CheckSlashParameter(ctx sdk.Context, parameter *types.SlashInpu // If the remaining amount of the assets pool after slash is zero, the share of related // stakers should be cleared, because the divisor will be zero when calculating the share // of new delegation after the slash. -func (k *Keeper) SlashAssets(ctx sdk.Context, parameter *types.SlashInputInfo) (*types.SlashExecutionInfo, error) { +func (k *Keeper) SlashAssets(ctx sdk.Context, snapshotHeight int64, parameter *types.SlashInputInfo) (*types.SlashExecutionInfo, error) { // calculate the new slash proportion according to the historical power and current assets state slashUSDValue := sdkmath.LegacyNewDec(parameter.Power).Mul(parameter.SlashProportion) // calculate the current usd value of all assets pool for the operator @@ -98,7 +98,7 @@ func (k *Keeper) SlashAssets(ctx sdk.Context, parameter *types.SlashInputInfo) ( return nil } // #nosec G701 - heightFilter := uint64(parameter.SlashEventHeight) + heightFilter := uint64(snapshotHeight) err = k.delegationKeeper.IterateUndelegationsByOperator(ctx, parameter.Operator.String(), &heightFilter, true, opFunc) if err != nil { return nil, err @@ -153,13 +153,12 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { if err != nil { return err } - + snapshotHeight, snapshot, err := k.LoadVotingPowerSnapshot(ctx, parameter.AVSAddr, parameter.SlashEventHeight) + if err != nil { + return err + } // get the historical voting power from the snapshot for the other AVSs if !parameter.IsDogFood { - snapshot, err := k.LoadVotingPowerSnapshot(ctx, parameter.AVSAddr, parameter.SlashEpochIdentifier, parameter.SlashEpochNumber, ¶meter.SlashEventHeight) - if err != nil { - return types.ErrFailToGetHistoricalVP.Wrapf("slash: failed to load voting power snapshot, err:%s", err) - } votingPower := types.GetSpecifiedVotingPower(parameter.Operator.String(), snapshot.VotingPowerSet) if votingPower == nil { return types.ErrFailToGetHistoricalVP.Wrapf("slash: the operator isn't in the voting power set, addr:%s", parameter.Operator) @@ -173,7 +172,7 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { // slash assets according to the input information // using cache context to ensure the atomicity of slash execution. cc, writeFunc := ctx.CacheContext() - executionInfo, err := k.SlashAssets(cc, parameter) + executionInfo, err := k.SlashAssets(cc, snapshotHeight, parameter) if err != nil { return err } diff --git a/x/operator/keeper/slash_test.go b/x/operator/keeper/slash_test.go index afef3db5b..d2776268b 100644 --- a/x/operator/keeper/slash_test.go +++ b/x/operator/keeper/slash_test.go @@ -30,7 +30,7 @@ func (suite *OperatorTestSuite) TestSlashWithInfractionReason() { suite.NoError(err) // call the EndBlock to update the voting power suite.CommitAfter(time.Hour*24 + time.Nanosecond) - infractionHeight := suite.Ctx.BlockHeight() + infractionHeight := suite.Ctx.BlockHeight() + 1 optedUSDValues, err := suite.App.OperatorKeeper.GetOperatorOptedUSDValue(suite.Ctx, avsAddr, suite.operatorAddr.String()) suite.NoError(err) // get the historical voting power diff --git a/x/operator/keeper/voting_power_snapshot.go b/x/operator/keeper/voting_power_snapshot.go index 44a64fbcf..262a6dd38 100644 --- a/x/operator/keeper/voting_power_snapshot.go +++ b/x/operator/keeper/voting_power_snapshot.go @@ -2,6 +2,7 @@ package keeper import ( "strconv" + "time" assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" "github.com/ExocoreNetwork/exocore/x/operator/types" @@ -16,46 +17,87 @@ func (k *Keeper) SetVotingPowerSnapshot(ctx sdk.Context, key []byte, snapshot *t return nil } -func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr, epochIdentifier string, epochNumber int64, height *int64) (*types.VotingPowerSnapshot, error) { +// LoadVotingPowerSnapshot loads the voting power snapshot information for the provided height, +// returning the height of the first block in the epoch the snapshot serves, along with the specific +// voting power data. The start height will be used to filter pending undelegations during slashing. +func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr string, height int64) (int64, *types.VotingPowerSnapshot, error) { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) var ret types.VotingPowerSnapshot - key := assetstype.GetJoinedStoreKey(avsAddr, epochIdentifier, strconv.FormatInt(epochNumber, 10)) - if height != nil && *height >= 0 { - // When a snapshot caused by a slash exists for the specified epochNumber, - // the snapshot closest to the input height is the one used for its voting - // power information. The correct snapshot key can be found by taking advantage - // of the ascending order of data returned when using an iterator range. - keyWithHeight := assetstype.GetJoinedStoreKey(string(key), strconv.FormatInt(*height, 10)) - iterator := sdk.KVStorePrefixIterator(store, key) + // If there is no snapshot for the input height, we need to find the correct key. + // The snapshot closest to the input height is the one used for its voting + // power information. The correct snapshot key can be found by taking advantage + // of the ascending order of data returned when using an iterator range. + keyWithHeight := assetstype.GetJoinedStoreKey(avsAddr, strconv.FormatInt(height, 10)) + findKey := keyWithHeight + if !store.Has(keyWithHeight) { + iterator := sdk.KVStorePrefixIterator(store, []byte(avsAddr)) defer iterator.Close() - var findKey []byte for ; iterator.Valid(); iterator.Next() { - var amounts assetstype.OperatorAssetInfo - k.cdc.MustUnmarshal(iterator.Value(), &amounts) if string(iterator.Key()) <= string(keyWithHeight) { findKey = iterator.Key() } else { break } } - key = findKey } - value := store.Get(key) + value := store.Get(findKey) if value == nil { - return nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: key is %s", key) + return 0, nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: key is %s", findKey) } k.cdc.MustUnmarshal(value, &ret) // fall back to the last snapshot if the voting power set is nil if ret.VotingPowerSet == nil { - value = store.Get([]byte(ret.LastChangedKey)) + value = store.Get(assetstype.GetJoinedStoreKey(avsAddr, strconv.FormatInt(ret.LastChangedHeight, 10))) if value == nil { - return nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: fall back to the key %s", ret.LastChangedKey) + return 0, nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: fall back to the height %v", ret.LastChangedHeight) } k.cdc.MustUnmarshal(value, &ret) } - return &ret, nil + + keysList, err := assetstype.ParseJoinedKey(findKey) + if value == nil { + return 0, nil, err + } + findHeight, err := strconv.ParseInt(keysList[1], 10, 64) + if value == nil { + return 0, nil, err + } + return findHeight, &ret, nil +} + +// RemoveVotingPowerSnapshot remove all snapshots older than the input time. +func (k *Keeper) RemoveVotingPowerSnapshot(ctx sdk.Context, avsAddr string, time time.Time) error { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) + iterator := sdk.KVStorePrefixIterator(store, []byte(avsAddr)) + defer iterator.Close() + // the retained key is used to record the snapshot that will be fallen back to + // by snapshots earlier than the input time. + var retainedKey []byte + var snapshot types.VotingPowerSnapshot + for ; iterator.Valid(); iterator.Next() { + k.cdc.MustUnmarshal(iterator.Value(), &snapshot) + if snapshot.BlockTime.After(time) { + // delete the retained key, because the snapshots that is earlier than the input time + // don't need to retain any old snapshot key. + if snapshot.VotingPowerSet != nil && retainedKey != nil { + store.Delete(retainedKey) + } + break + } + if snapshot.VotingPowerSet != nil { + // delete the old retained key, because the key currently holding the voting power set + // will become the latest retained key. + if retainedKey != nil { + store.Delete(retainedKey) + } + retainedKey = iterator.Key() + } else { + store.Delete(iterator.Key()) + } + } + return nil } func (k *Keeper) UpdateSnapshotHelper(ctx sdk.Context, avsAddr string, opFunc func(helper *types.SnapshotHelper) error) error { @@ -90,9 +132,9 @@ func (k *Keeper) SetSlashFlag(ctx sdk.Context, avsAddr string, hasSlash bool) er return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) } -func (k *Keeper) SetLastChangedKey(ctx sdk.Context, avsAddr, lastChangeKey string) error { +func (k *Keeper) SetLastChangedHeight(ctx sdk.Context, avsAddr string, lastChangeHeight int64) error { opFunc := func(helper *types.SnapshotHelper) error { - helper.LastChangedKey = lastChangeKey + helper.LastChangedHeight = lastChangeHeight return nil } return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) diff --git a/x/operator/types/errors.go b/x/operator/types/errors.go index d5967f9ee..00ef07315 100644 --- a/x/operator/types/errors.go +++ b/x/operator/types/errors.go @@ -116,4 +116,9 @@ var ( ModuleName, 25, "failed to get the historical voting power", ) + + ErrFailToClearVPSnapshot = errorsmod.Register( + ModuleName, 26, + "failed to clear voting power snapshot", + ) ) diff --git a/x/operator/types/expected_keepers.go b/x/operator/types/expected_keepers.go index 42112f2bb..4b81e2fd5 100644 --- a/x/operator/types/expected_keepers.go +++ b/x/operator/types/expected_keepers.go @@ -112,6 +112,7 @@ type AVSKeeper interface { IsAVS(ctx sdk.Context, addr string) (bool, error) IsAVSByChainID(ctx sdk.Context, chainID string) (bool, string) GetAVSEpochInfo(ctx sdk.Context, addr string) (*epochstypes.EpochInfo, error) + GetAVSUnbondingDuration(ctx sdk.Context, avsAddr string) (uint64, error) } type SlashKeeper interface { diff --git a/x/operator/types/general.go b/x/operator/types/general.go index 260cea755..f44efe85c 100644 --- a/x/operator/types/general.go +++ b/x/operator/types/general.go @@ -18,15 +18,13 @@ type OperatorStakingInfo struct { } type SlashInputInfo struct { - IsDogFood bool - Power int64 - SlashType uint32 - Operator sdk.AccAddress - AVSAddr string - SlashContract string - SlashID string - SlashEventHeight int64 - SlashEpochIdentifier string - SlashEpochNumber int64 - SlashProportion sdkmath.LegacyDec + IsDogFood bool + Power int64 + SlashType uint32 + Operator sdk.AccAddress + AVSAddr string + SlashContract string + SlashID string + SlashEventHeight int64 + SlashProportion sdkmath.LegacyDec } diff --git a/x/operator/types/keys.go b/x/operator/types/keys.go index 54051f402..273c77563 100644 --- a/x/operator/types/keys.go +++ b/x/operator/types/keys.go @@ -103,17 +103,15 @@ var ( KeyPrefixSlashAssetsState = []byte{prefixSlashAssetsState} // KeyPrefixVotingPowerSnapshot key-value: - // Including the epoch identifier in the key is used to address the case that AVSs will change - // their epoch configuration. // In general, the key used to store the voting power snapshot is based on the epoch number as - // the smallest unit, since our voting power is updated once per epoch. However, when a slash event occurs, + // the smallest unit, since our voting power is updated once per epoch. When saving the snapshot, we use + // the `start_height` of current epoch to represent the whole epoch. Therefore, when in use, + // you only need to find the largest height that is less than or equal to the input height, + // which will be the correct snapshot key. + // Additionally, when a slash event occurs, // the voting power needs to be updated immediately to ensure the slash takes effect for the relevant operator. - // In this case, we need to store the voting power information at the corresponding block height. - // Therefore, when constructing the key, the slash height is appended as a suffix. - // This way, when executing a slash, we can accurately retrieve the historical voting power information - // using the provided epoch number and slash event height. - // AVSAddr+ '/' + epochIdentifier + '/' + epochNumber -> VotingPowerSnapshot - // AVSAddr+ '/' + epochIdentifier + '/' + epochNumber + '/' + slashHeight -> VotingPowerSnapshot + // In this case, we need to store an additional snapshot at the height where the slash is executed. + // AVSAddr+ '/' + Height -> VotingPowerSnapshot KeyPrefixVotingPowerSnapshot = []byte{BytePrefixForVotingPowerSnapshot} // KeyPrefixSnapshotHelper key-value: diff --git a/x/operator/types/tx.pb.go b/x/operator/types/tx.pb.go index 8553878ec..d49142f66 100644 --- a/x/operator/types/tx.pb.go +++ b/x/operator/types/tx.pb.go @@ -14,19 +14,23 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +var _ = time.Kitchen // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -202,16 +206,22 @@ func (m *OperatorVotingPower) GetOperatorAddr() string { // VotingPowerSnapshot is used to record the historical voting power for AVSs type VotingPowerSnapshot struct { - // height is the block height at which this snapshot is generated - Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` // total_voting_power is the total voting power of specified AVS - TotalVotingPower github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=total_voting_power,json=totalVotingPower,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"total_voting_power"` + TotalVotingPower github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=total_voting_power,json=totalVotingPower,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"total_voting_power"` // operator_voting_powers records the active voting power of all operators // for the specified AVS - VotingPowerSet []*OperatorVotingPower `protobuf:"bytes,3,rep,name=voting_power_set,json=votingPowerSet,proto3" json:"voting_power_set,omitempty"` - // last_changed_key is used to indicate the key of most recent change when - // the voting_power_set is nil, which can help to fall back to the correct key. - LastChangedKey string `protobuf:"bytes,4,opt,name=last_changed_key,json=lastChangedKey,proto3" json:"last_changed_key,omitempty"` + VotingPowerSet []*OperatorVotingPower `protobuf:"bytes,2,rep,name=voting_power_set,json=votingPowerSet,proto3" json:"voting_power_set,omitempty"` + // last_changed_height is used to indicate the height of most recent change when + // the voting_power_set is nil, which can help to fall back to the correct epoch height. + LastChangedHeight int64 `protobuf:"varint,3,opt,name=last_changed_height,json=lastChangedHeight,proto3" json:"last_changed_height,omitempty"` + // epoch_identifier record the epoch info + EpochIdentifier string `protobuf:"bytes,4,opt,name=epoch_identifier,json=epochIdentifier,proto3" json:"epoch_identifier,omitempty"` + // epoch_number indicates which epoch this snapshot serve for + EpochNumber int64 `protobuf:"varint,5,opt,name=epoch_number,json=epochNumber,proto3" json:"epoch_number,omitempty"` + // block_time records the block time when it is stored, and it is used for snapshot pruning + // The epoch_number would be sufficient for pruning if we don't support AVSs changing their + // epoch configuration. + BlockTime time.Time `protobuf:"bytes,6,opt,name=block_time,json=blockTime,proto3,stdtime" json:"block_time"` } func (m *VotingPowerSnapshot) Reset() { *m = VotingPowerSnapshot{} } @@ -247,32 +257,46 @@ func (m *VotingPowerSnapshot) XXX_DiscardUnknown() { var xxx_messageInfo_VotingPowerSnapshot proto.InternalMessageInfo -func (m *VotingPowerSnapshot) GetHeight() int64 { +func (m *VotingPowerSnapshot) GetVotingPowerSet() []*OperatorVotingPower { if m != nil { - return m.Height + return m.VotingPowerSet } - return 0 + return nil } -func (m *VotingPowerSnapshot) GetVotingPowerSet() []*OperatorVotingPower { +func (m *VotingPowerSnapshot) GetLastChangedHeight() int64 { if m != nil { - return m.VotingPowerSet + return m.LastChangedHeight } - return nil + return 0 } -func (m *VotingPowerSnapshot) GetLastChangedKey() string { +func (m *VotingPowerSnapshot) GetEpochIdentifier() string { if m != nil { - return m.LastChangedKey + return m.EpochIdentifier } return "" } +func (m *VotingPowerSnapshot) GetEpochNumber() int64 { + if m != nil { + return m.EpochNumber + } + return 0 +} + +func (m *VotingPowerSnapshot) GetBlockTime() time.Time { + if m != nil { + return m.BlockTime + } + return time.Time{} +} + // SnapshotHelper is used to record the helper information for voting power snapshot update type SnapshotHelper struct { - // last_changed_key indicates the key of the most recent change. - // It is used to set the `last_changed_key` field in `VotingPowerSnapshot`. - LastChangedKey string `protobuf:"bytes,1,opt,name=last_changed_key,json=lastChangedKey,proto3" json:"last_changed_key,omitempty"` + // last_changed_height indicates the height of the most recent change. + // It is used to set the `last_changed_height` field in `VotingPowerSnapshot`. + LastChangedHeight int64 `protobuf:"varint,1,opt,name=last_changed_height,json=lastChangedHeight,proto3" json:"last_changed_height,omitempty"` // has_opt_out is used to indicate whether there has been any opt-out operation from // the most recently saved snapshot to the current height. This is because, // when an opt-out operation occurs, the related AVS validator information changes, @@ -322,11 +346,11 @@ func (m *SnapshotHelper) XXX_DiscardUnknown() { var xxx_messageInfo_SnapshotHelper proto.InternalMessageInfo -func (m *SnapshotHelper) GetLastChangedKey() string { +func (m *SnapshotHelper) GetLastChangedHeight() int64 { if m != nil { - return m.LastChangedKey + return m.LastChangedHeight } - return "" + return 0 } func (m *SnapshotHelper) GetHasOptOut() bool { @@ -1251,116 +1275,121 @@ func init() { func init() { proto.RegisterFile("exocore/operator/v1/tx.proto", fileDescriptor_b229d5663e4df167) } var fileDescriptor_b229d5663e4df167 = []byte{ - // 1732 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1c, 0x49, - 0x15, 0x77, 0xcf, 0x38, 0x8e, 0xe7, 0xcd, 0x87, 0xc7, 0xe5, 0x7c, 0x4c, 0x66, 0x83, 0x27, 0xe9, - 0x25, 0xc9, 0xac, 0xc1, 0x33, 0x4a, 0x96, 0x45, 0xda, 0x00, 0x12, 0xb6, 0xc7, 0x51, 0x86, 0x38, - 0x33, 0x56, 0xb7, 0x1d, 0x89, 0x45, 0xa8, 0xd5, 0x9e, 0x29, 0xf7, 0x74, 0xd2, 0xd3, 0xd5, 0x74, - 0xd5, 0x4c, 0xec, 0x3d, 0xa1, 0x3d, 0xad, 0x10, 0x07, 0xa4, 0x3d, 0x20, 0x04, 0x87, 0x9c, 0x10, - 0xc7, 0x1c, 0x96, 0x23, 0x02, 0x6e, 0x7b, 0x5c, 0x05, 0x0e, 0x88, 0x83, 0x41, 0x0e, 0x52, 0xf8, - 0x23, 0x40, 0x42, 0x55, 0x5d, 0x3d, 0xae, 0xc9, 0xf6, 0x38, 0xb1, 0xe2, 0x70, 0x49, 0x5c, 0xaf, - 0x5e, 0xbd, 0xdf, 0xef, 0xbd, 0x7a, 0x1f, 0xd5, 0x03, 0x97, 0xf1, 0x1e, 0xe9, 0x90, 0x10, 0xd7, - 0x49, 0x80, 0x43, 0x9b, 0x91, 0xb0, 0x3e, 0xbc, 0x59, 0x67, 0x7b, 0xb5, 0x20, 0x24, 0x8c, 0xa0, - 0x05, 0xb9, 0x5b, 0x8b, 0x77, 0x6b, 0xc3, 0x9b, 0xe5, 0x79, 0xbb, 0xef, 0xfa, 0xa4, 0x2e, 0xfe, - 0x8d, 0xf4, 0xca, 0x17, 0x3b, 0x84, 0xf6, 0x09, 0xad, 0xf7, 0xa9, 0xc3, 0xcf, 0xf7, 0xa9, 0x23, - 0x37, 0xbe, 0x2e, 0x37, 0x28, 0xb3, 0x1f, 0xb9, 0x3e, 0xdf, 0xdc, 0xc1, 0xcc, 0xbe, 0x19, 0xaf, - 0xa5, 0xd6, 0xa5, 0x48, 0xcb, 0x12, 0xab, 0x7a, 0xb4, 0x90, 0x5b, 0xe7, 0x1c, 0xe2, 0x90, 0x48, - 0xce, 0xff, 0x92, 0xd2, 0xcb, 0x0e, 0x21, 0x8e, 0x87, 0xeb, 0x76, 0xe0, 0xd6, 0x6d, 0xdf, 0x27, - 0xcc, 0x66, 0x2e, 0xf1, 0xe5, 0x19, 0x1d, 0x43, 0xbe, 0x81, 0x3b, 0x0f, 0x6c, 0x6f, 0x80, 0xef, - 0xb8, 0xd8, 0xeb, 0xa2, 0x2d, 0x98, 0xb1, 0xfb, 0x64, 0xe0, 0xb3, 0x92, 0x76, 0x45, 0xab, 0x66, - 0x56, 0xbf, 0xfb, 0xc5, 0x41, 0x65, 0xea, 0xef, 0x07, 0x95, 0xeb, 0x8e, 0xcb, 0x7a, 0x83, 0x9d, - 0x5a, 0x87, 0xf4, 0x25, 0xaa, 0xfc, 0x6f, 0x99, 0x76, 0x1f, 0xd5, 0xd9, 0x7e, 0x80, 0x69, 0xad, - 0x81, 0x3b, 0xcf, 0x3e, 0x5f, 0x06, 0x49, 0xaa, 0x81, 0x3b, 0x86, 0xb4, 0xa5, 0xff, 0x27, 0x05, - 0xe7, 0xdb, 0x32, 0x2e, 0xed, 0x80, 0xe1, 0xee, 0xb6, 0xd9, 0x10, 0xa0, 0x28, 0x84, 0x02, 0xc5, - 0xde, 0xae, 0x35, 0xa0, 0x5d, 0x6b, 0xc8, 0x25, 0x12, 0x77, 0xe3, 0x64, 0xb8, 0x87, 0x07, 0x95, - 0x9c, 0x89, 0xbd, 0xdd, 0xd8, 0xee, 0x4b, 0x3c, 0x72, 0x1c, 0x63, 0x9b, 0x76, 0x23, 0xcc, 0x01, - 0xcc, 0x31, 0xc2, 0x6c, 0x4f, 0x01, 0x4d, 0x09, 0xd0, 0xfb, 0x27, 0x06, 0xcd, 0x6f, 0x71, 0x43, - 0x13, 0x50, 0xf3, 0x02, 0x65, 0x04, 0xbb, 0x07, 0x45, 0xbb, 0xc3, 0xdc, 0x21, 0x56, 0x70, 0xd3, - 0x02, 0xb7, 0x75, 0x62, 0xdc, 0xc2, 0x8a, 0xb0, 0x34, 0x01, 0xb8, 0x10, 0xe1, 0xc4, 0xc8, 0xfa, - 0xef, 0x35, 0x58, 0x88, 0xc3, 0xff, 0x80, 0x30, 0xd7, 0x77, 0x36, 0xc9, 0x63, 0x1c, 0xa2, 0xef, - 0x41, 0x3e, 0xce, 0x56, 0xcb, 0xee, 0x76, 0x43, 0x19, 0xfb, 0xd2, 0xb3, 0xcf, 0x97, 0xcf, 0x49, - 0x73, 0x2b, 0xdd, 0x6e, 0x88, 0x29, 0x35, 0x59, 0xe8, 0xfa, 0x8e, 0x91, 0x8b, 0xd5, 0xb9, 0x18, - 0x59, 0x90, 0x1b, 0x0a, 0x6b, 0x56, 0xc0, 0xcd, 0xc9, 0x20, 0xbe, 0x59, 0xc6, 0x64, 0x87, 0x47, - 0xfc, 0xf4, 0x5f, 0xa6, 0x60, 0x41, 0xe1, 0x6b, 0xfa, 0x76, 0x40, 0x7b, 0x84, 0xa1, 0x0b, 0x30, - 0xd3, 0xc3, 0xae, 0xd3, 0x8b, 0x92, 0x34, 0x6d, 0xc8, 0x15, 0x7a, 0x08, 0x28, 0xba, 0xd8, 0x53, - 0xa7, 0x55, 0x14, 0x76, 0xd5, 0xd8, 0x19, 0x50, 0x54, 0x51, 0x2c, 0x8a, 0x59, 0x29, 0x7d, 0x25, - 0x5d, 0xcd, 0xde, 0xaa, 0xd6, 0x12, 0x5a, 0x41, 0x2d, 0x21, 0xfe, 0x46, 0x41, 0x71, 0xd6, 0xc4, - 0x0c, 0x55, 0xa1, 0xe8, 0xd9, 0x94, 0x59, 0x9d, 0x9e, 0xed, 0x3b, 0xb8, 0x6b, 0x3d, 0xc2, 0xfb, - 0xa5, 0x69, 0xce, 0xde, 0x28, 0x70, 0xf9, 0x5a, 0x24, 0xbe, 0x87, 0xf7, 0xf5, 0xc7, 0x50, 0x88, - 0xa3, 0x71, 0x17, 0x7b, 0x01, 0x0e, 0x13, 0xcf, 0x6a, 0x49, 0x67, 0xd1, 0x22, 0x64, 0x7b, 0x36, - 0xb5, 0x48, 0xc0, 0x2c, 0x32, 0x60, 0x22, 0x3c, 0xb3, 0x46, 0xa6, 0x67, 0xd3, 0x76, 0xc0, 0xda, - 0x03, 0x86, 0xde, 0x01, 0xbe, 0xb0, 0xa8, 0x67, 0xd3, 0x9e, 0x48, 0xd0, 0x59, 0x63, 0xb6, 0x67, - 0x53, 0x93, 0xaf, 0xf5, 0x7d, 0x28, 0xaf, 0x79, 0x2e, 0xf6, 0xb9, 0x41, 0xd7, 0x5f, 0xb7, 0x43, - 0xdf, 0xf5, 0x1d, 0x9e, 0x0d, 0x1b, 0x2e, 0x65, 0xe8, 0x47, 0x30, 0x8f, 0x23, 0x91, 0xe5, 0xfa, - 0xbb, 0xc4, 0xf2, 0x5c, 0xca, 0xef, 0x88, 0x47, 0xa5, 0x9e, 0x18, 0x95, 0x64, 0x5b, 0x4d, 0x7f, - 0x97, 0x18, 0x73, 0xd2, 0x12, 0x5f, 0x70, 0xe3, 0xfa, 0xaf, 0xb4, 0x49, 0xd8, 0x5c, 0x05, 0x7d, - 0x1f, 0x90, 0xf7, 0xb1, 0xd5, 0x11, 0x0a, 0x3c, 0x0a, 0xae, 0x6f, 0xb9, 0x5d, 0x11, 0x82, 0xe9, - 0xd5, 0x85, 0xc3, 0x83, 0xca, 0xdc, 0xc6, 0xc7, 0xca, 0xe9, 0x66, 0xc3, 0x98, 0xf3, 0xc6, 0x04, - 0x5d, 0xf4, 0x21, 0x5c, 0x1a, 0x3b, 0x1e, 0xbb, 0x22, 0x4a, 0x43, 0x64, 0x91, 0x71, 0xa1, 0x93, - 0x48, 0x40, 0xff, 0x73, 0x0a, 0x72, 0xf1, 0x0d, 0x0b, 0x36, 0xef, 0x42, 0x5e, 0x1e, 0xa7, 0x4a, - 0x69, 0x19, 0xb9, 0x58, 0x28, 0x0a, 0xe8, 0x2a, 0xe4, 0xec, 0x20, 0x08, 0xc9, 0x10, 0xab, 0x18, - 0x59, 0x29, 0x13, 0x2a, 0xdf, 0x04, 0x34, 0x2a, 0xd1, 0x3e, 0x66, 0xb6, 0x88, 0x6b, 0xd4, 0x36, - 0x8c, 0x62, 0xbc, 0x73, 0x1f, 0x33, 0x5b, 0xa0, 0x7a, 0x50, 0x4e, 0xf2, 0x40, 0x52, 0xe0, 0xa9, - 0x74, 0xb2, 0x8b, 0xe0, 0x71, 0x37, 0x2e, 0x7e, 0xd5, 0xe7, 0x88, 0xfe, 0x7d, 0x80, 0x0e, 0xe9, - 0xf7, 0x5d, 0x4a, 0x5d, 0xe2, 0x97, 0xce, 0x08, 0xeb, 0x7a, 0x4d, 0x56, 0x4d, 0x3c, 0xb6, 0xe4, - 0x18, 0xab, 0xad, 0x8d, 0x34, 0x57, 0x33, 0xbc, 0x14, 0x7f, 0xf7, 0xe2, 0xe9, 0x92, 0x66, 0x28, - 0x06, 0xf4, 0xdf, 0x68, 0x90, 0x11, 0xc3, 0x41, 0xb8, 0x72, 0x0d, 0x0a, 0x22, 0x03, 0xad, 0x0e, - 0xf1, 0x59, 0x68, 0x77, 0xe4, 0x40, 0x32, 0xf2, 0x42, 0xba, 0x26, 0x85, 0xe8, 0x3a, 0xcc, 0x11, - 0x7e, 0xc6, 0x72, 0x7d, 0x4b, 0xf6, 0x04, 0x1e, 0xc5, 0x69, 0x23, 0x4f, 0x22, 0x53, 0x77, 0xa3, - 0xd6, 0x50, 0x85, 0x62, 0xa4, 0x47, 0x06, 0x2c, 0x56, 0x4c, 0x0b, 0xc5, 0x82, 0x90, 0xb7, 0x07, - 0x4c, 0x6a, 0x5e, 0x80, 0x99, 0x87, 0xb6, 0xeb, 0xe1, 0xae, 0x88, 0xd7, 0xac, 0x21, 0x57, 0xfa, - 0x1f, 0x34, 0x98, 0x97, 0xf4, 0x56, 0x28, 0xc5, 0xcc, 0x64, 0x36, 0xc3, 0x6f, 0x34, 0x2f, 0x9b, - 0x3e, 0x53, 0xda, 0x4c, 0xd3, 0x67, 0xf1, 0xbc, 0x44, 0x06, 0x9c, 0x51, 0xe7, 0xd2, 0x9b, 0xf5, - 0xae, 0xc8, 0x94, 0xfe, 0x27, 0x0d, 0xce, 0x8b, 0x1a, 0xbe, 0x13, 0x92, 0xfe, 0xb6, 0xdf, 0xc5, - 0x1e, 0x76, 0xc4, 0x5b, 0x00, 0xbd, 0x07, 0x19, 0x7e, 0x5b, 0x38, 0x8c, 0x0b, 0x26, 0xb3, 0x9a, - 0x3b, 0x3c, 0xa8, 0xcc, 0x9a, 0x42, 0xd8, 0x6c, 0x18, 0xb3, 0xd1, 0x76, 0xb3, 0x8b, 0xae, 0xc3, - 0xac, 0xcd, 0x9d, 0xe7, 0x9a, 0x11, 0xb7, 0xec, 0xe1, 0x41, 0xe5, 0xac, 0x08, 0x48, 0xb3, 0x61, - 0x9c, 0x15, 0x9b, 0x4d, 0xf5, 0x19, 0x91, 0x3e, 0xbd, 0xb0, 0xe8, 0x9f, 0x69, 0xb0, 0x30, 0x72, - 0x41, 0x60, 0xd2, 0x4d, 0x42, 0xbc, 0x31, 0x56, 0xda, 0x6b, 0xb1, 0x4a, 0x9d, 0x22, 0xab, 0x5f, - 0xa7, 0x01, 0x09, 0x56, 0xeb, 0x7b, 0xb8, 0x33, 0xe0, 0x11, 0x15, 0x09, 0xec, 0x40, 0x31, 0x4a, - 0xe0, 0x20, 0x24, 0x01, 0x09, 0xb9, 0xfc, 0x54, 0xde, 0x54, 0x73, 0xc2, 0xea, 0xe6, 0xc8, 0x28, - 0xfa, 0x31, 0x64, 0x23, 0xa0, 0xd3, 0x4b, 0x19, 0x10, 0x06, 0xa3, 0x67, 0x8b, 0x0d, 0x0b, 0x91, - 0xf9, 0x81, 0x92, 0x33, 0x54, 0xce, 0xba, 0xa5, 0xc4, 0x66, 0x92, 0x98, 0x66, 0xab, 0xd3, 0x9c, - 0x92, 0x81, 0x84, 0x31, 0x75, 0x83, 0xa2, 0x8f, 0x60, 0x3e, 0x82, 0x10, 0x17, 0x45, 0xad, 0x80, - 0x10, 0xaf, 0x34, 0x7d, 0xcc, 0x30, 0x4d, 0x48, 0x02, 0x69, 0x3e, 0x8a, 0xce, 0x91, 0x58, 0xff, - 0x6f, 0x8a, 0x97, 0x6d, 0x74, 0x54, 0x1c, 0x3b, 0x49, 0x77, 0x79, 0x0f, 0x8a, 0x74, 0xb0, 0xd3, - 0x77, 0x19, 0xef, 0x1c, 0x4a, 0x7b, 0x49, 0x1b, 0x73, 0x23, 0xb9, 0x6c, 0x1b, 0x57, 0x21, 0x87, - 0x87, 0xbc, 0xf3, 0x2a, 0xcd, 0x25, 0x6d, 0x64, 0x85, 0x4c, 0xaa, 0xbc, 0x03, 0x19, 0x97, 0x5a, - 0x43, 0xcc, 0xc8, 0xa8, 0xb9, 0xcc, 0xba, 0xf4, 0x81, 0x58, 0x27, 0xa6, 0xcb, 0x99, 0xb7, 0x91, - 0x2e, 0x5f, 0x83, 0xe8, 0x76, 0x2d, 0x7e, 0xa2, 0x34, 0x73, 0x45, 0xab, 0xe6, 0x8d, 0x8c, 0x90, - 0x6c, 0xed, 0x07, 0x18, 0xb5, 0xa0, 0x80, 0xe3, 0x3c, 0x8e, 0x86, 0xcd, 0x59, 0xd1, 0xd8, 0x6f, - 0x4c, 0xbe, 0x88, 0xb1, 0xbc, 0x37, 0xf2, 0x58, 0x5d, 0xea, 0x7f, 0xd4, 0x60, 0xc1, 0xc0, 0x8e, - 0x4b, 0x19, 0x0e, 0xe3, 0x7b, 0x30, 0xf0, 0x4f, 0xd0, 0x77, 0x20, 0xb7, 0x1b, 0x92, 0xbe, 0x98, - 0x4c, 0x98, 0xd2, 0x57, 0x3e, 0x3d, 0xb3, 0x5c, 0x5b, 0x8a, 0xd0, 0x07, 0x30, 0x2d, 0xa8, 0xa5, - 0x04, 0xb5, 0xab, 0xc7, 0x3e, 0xb8, 0x04, 0x29, 0xa1, 0x7e, 0xfb, 0x5b, 0x9f, 0x3e, 0xa9, 0x4c, - 0xfd, 0xfb, 0x49, 0x65, 0xea, 0x93, 0x17, 0x4f, 0x97, 0xb2, 0x77, 0x8e, 0x0c, 0xfe, 0xec, 0xc5, - 0xd3, 0xa5, 0x8b, 0x4a, 0x30, 0xd5, 0xb3, 0x7a, 0x19, 0x4a, 0x5f, 0x75, 0x80, 0x06, 0xc4, 0xa7, - 0x58, 0xff, 0x87, 0x06, 0xf9, 0x76, 0xc0, 0x9a, 0x3e, 0x23, 0x2b, 0x0f, 0xcc, 0x37, 0xf6, 0xab, - 0x02, 0x59, 0x7b, 0x48, 0x47, 0x67, 0xa3, 0xf7, 0x00, 0xd8, 0x43, 0x1a, 0x2b, 0x7c, 0x08, 0x73, - 0xc1, 0x60, 0xc7, 0x73, 0x3b, 0xfc, 0x7d, 0x67, 0x3d, 0xa4, 0xc4, 0x97, 0x0d, 0x76, 0x9e, 0x7f, - 0x8c, 0x6c, 0x8a, 0xad, 0x7b, 0x78, 0xff, 0x07, 0x66, 0xbb, 0x65, 0xe4, 0x83, 0xd1, 0x92, 0x12, - 0xff, 0xf6, 0x07, 0xc7, 0x39, 0x5f, 0x1a, 0x73, 0x5e, 0xf1, 0x47, 0x3f, 0x07, 0x48, 0x15, 0x48, - 0xbf, 0x7f, 0xab, 0x41, 0x21, 0x7a, 0x2e, 0xb6, 0x77, 0xff, 0x1f, 0x8e, 0xdf, 0xfe, 0xf6, 0x71, - 0xec, 0x2f, 0x8d, 0xb3, 0x57, 0x58, 0xe9, 0xe7, 0xf9, 0x97, 0x8f, 0x22, 0x91, 0xfc, 0x9f, 0x69, - 0x90, 0x37, 0x31, 0x5b, 0x23, 0x3e, 0xbd, 0x87, 0xf7, 0x39, 0xfd, 0x5b, 0x70, 0xf6, 0x75, 0x99, - 0xc7, 0x8a, 0x6f, 0xf5, 0xba, 0x6e, 0xaa, 0x0e, 0xc7, 0x88, 0x2f, 0x5f, 0xd5, 0x98, 0x0b, 0xfc, - 0xaa, 0x54, 0x41, 0xe4, 0xea, 0x92, 0x07, 0x19, 0x73, 0x54, 0xdd, 0x65, 0xb8, 0x60, 0x6e, 0xac, - 0x98, 0x77, 0xad, 0xad, 0x1f, 0x6e, 0xae, 0x5b, 0xdb, 0x2d, 0x73, 0x73, 0x7d, 0xad, 0x79, 0xa7, - 0xb9, 0xde, 0x28, 0x4e, 0xa1, 0xcb, 0x50, 0x52, 0xf6, 0x9a, 0x2d, 0x73, 0x6b, 0xa5, 0xb5, 0x65, - 0x09, 0x51, 0x51, 0x43, 0xd7, 0xe0, 0xaa, 0xb2, 0xdb, 0x6a, 0xc7, 0x0a, 0x2b, 0xad, 0xf5, 0xf6, - 0xb6, 0x29, 0xd5, 0x52, 0xb7, 0xfe, 0x3a, 0x0d, 0xe9, 0xfb, 0xd4, 0x41, 0x4f, 0x34, 0x28, 0xbe, - 0x5c, 0x35, 0x28, 0xb9, 0x99, 0x27, 0x74, 0x87, 0xf2, 0xf2, 0x6b, 0x6a, 0xca, 0xeb, 0x7c, 0xff, - 0x93, 0xbf, 0xfc, 0xeb, 0xb3, 0xd4, 0xb2, 0xfe, 0x8d, 0x7a, 0xf2, 0x6f, 0x34, 0xf5, 0xa4, 0x0e, - 0xf4, 0xa9, 0x06, 0x70, 0x14, 0x2f, 0xa4, 0x27, 0x37, 0x38, 0x35, 0xc2, 0xe5, 0x1b, 0xaf, 0xd4, - 0x91, 0x84, 0x96, 0x05, 0xa1, 0x1b, 0xfa, 0xb5, 0x49, 0x84, 0xc6, 0x93, 0x8f, 0x53, 0x39, 0xaa, - 0xb2, 0x09, 0x54, 0xc6, 0xea, 0x72, 0x02, 0x95, 0x84, 0x52, 0x7d, 0x25, 0x95, 0xf1, 0xfe, 0xf5, - 0x73, 0x0d, 0xb2, 0x4a, 0xc5, 0xa0, 0x77, 0x27, 0xe1, 0x28, 0x55, 0x56, 0xae, 0xbe, 0x5a, 0x49, - 0xb2, 0xa9, 0x09, 0x36, 0x55, 0xfd, 0xfa, 0x31, 0x6c, 0x54, 0xcb, 0x67, 0x7e, 0xca, 0xbf, 0x13, - 0x56, 0x37, 0xbe, 0x38, 0x5c, 0xd4, 0xbe, 0x3c, 0x5c, 0xd4, 0xfe, 0x79, 0xb8, 0xa8, 0xfd, 0xe2, - 0xf9, 0xe2, 0xd4, 0x97, 0xcf, 0x17, 0xa7, 0xfe, 0xf6, 0x7c, 0x71, 0xea, 0xa3, 0x5b, 0xca, 0x54, - 0x5c, 0x8f, 0x4c, 0xb6, 0x30, 0x7b, 0x4c, 0xc2, 0x47, 0x23, 0x84, 0xbd, 0x23, 0x0c, 0x31, 0x25, - 0x77, 0x66, 0xc4, 0x8f, 0x5f, 0xef, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xc1, 0x06, 0xf3, - 0xd2, 0x13, 0x00, 0x00, + // 1818 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1b, 0xc7, + 0x15, 0xd7, 0x52, 0xb4, 0x4d, 0x3e, 0x7e, 0x6a, 0xe4, 0x0f, 0x9a, 0x71, 0x45, 0x7b, 0x53, 0xdb, + 0xb2, 0x5b, 0x91, 0xb0, 0xd2, 0x14, 0x88, 0xdb, 0x02, 0xd5, 0x97, 0x61, 0x36, 0x32, 0x29, 0x2c, + 0x25, 0x03, 0x4d, 0x51, 0x2c, 0x56, 0xcb, 0x11, 0xb9, 0xd6, 0x72, 0x67, 0xbb, 0x33, 0x64, 0xa4, + 0x00, 0x05, 0x8a, 0x9c, 0x82, 0xa2, 0x87, 0x00, 0xb9, 0xb4, 0x68, 0x0f, 0x3e, 0x15, 0x3d, 0xfa, + 0x90, 0x1e, 0x8b, 0xb6, 0xb7, 0x1c, 0x03, 0xb7, 0x87, 0xa2, 0x07, 0xa5, 0x90, 0x0b, 0xb8, 0x7f, + 0x44, 0x0b, 0x14, 0xf3, 0x76, 0x96, 0x5a, 0x3a, 0xa4, 0x6c, 0xc1, 0x4a, 0x2e, 0x92, 0xe6, 0xbd, + 0x37, 0xef, 0xfd, 0xde, 0xf7, 0xac, 0xe0, 0x0a, 0xdd, 0x63, 0x36, 0x0b, 0x68, 0x8d, 0xf9, 0x34, + 0xb0, 0x04, 0x0b, 0x6a, 0x83, 0x3b, 0x35, 0xb1, 0x57, 0xf5, 0x03, 0x26, 0x18, 0x99, 0x55, 0xdc, + 0x6a, 0xc4, 0xad, 0x0e, 0xee, 0x94, 0x67, 0xac, 0x9e, 0xe3, 0xb1, 0x1a, 0xfe, 0x0c, 0xe5, 0xca, + 0x97, 0x6c, 0xc6, 0x7b, 0x8c, 0xd7, 0x7a, 0xbc, 0x23, 0xef, 0xf7, 0x78, 0x47, 0x31, 0xbe, 0xa9, + 0x18, 0x5c, 0x58, 0xbb, 0x8e, 0x27, 0x99, 0xdb, 0x54, 0x58, 0x77, 0xa2, 0xb3, 0x92, 0xba, 0x1c, + 0x4a, 0x99, 0x78, 0xaa, 0x85, 0x07, 0xc5, 0x3a, 0xdf, 0x61, 0x1d, 0x16, 0xd2, 0xe5, 0x5f, 0x8a, + 0x7a, 0xa5, 0xc3, 0x58, 0xc7, 0xa5, 0x35, 0xcb, 0x77, 0x6a, 0x96, 0xe7, 0x31, 0x61, 0x09, 0x87, + 0x79, 0xd1, 0x9d, 0x8a, 0xe2, 0xe2, 0x69, 0xbb, 0xbf, 0x53, 0x13, 0x4e, 0x8f, 0x72, 0x61, 0xf5, + 0xfc, 0x50, 0x40, 0xa7, 0x90, 0x5b, 0xa5, 0xf6, 0x43, 0xcb, 0xed, 0xd3, 0x7b, 0x0e, 0x75, 0xdb, + 0x64, 0x13, 0xce, 0x5a, 0x3d, 0xd6, 0xf7, 0x44, 0x49, 0xbb, 0xaa, 0xcd, 0xa7, 0x97, 0xbf, 0xff, + 0xd9, 0x41, 0x65, 0xea, 0x9f, 0x07, 0x95, 0x1b, 0x1d, 0x47, 0x74, 0xfb, 0xdb, 0x55, 0x9b, 0xf5, + 0x14, 0x2c, 0xf5, 0x6b, 0x81, 0xb7, 0x77, 0x6b, 0x62, 0xdf, 0xa7, 0xbc, 0xba, 0x4a, 0xed, 0xa7, + 0x9f, 0x2e, 0x80, 0x42, 0xbd, 0x4a, 0x6d, 0x43, 0xe9, 0xd2, 0xff, 0x9b, 0x80, 0x0b, 0x4d, 0x15, + 0xb8, 0xa6, 0x2f, 0x68, 0x7b, 0xab, 0xb5, 0x8a, 0x46, 0x49, 0x00, 0x79, 0x4e, 0xdd, 0x1d, 0xb3, + 0xcf, 0xdb, 0xe6, 0x40, 0x52, 0x94, 0xdd, 0xf5, 0x93, 0xd9, 0x3d, 0x3c, 0xa8, 0x64, 0x5b, 0xd4, + 0xdd, 0x89, 0xf4, 0xbe, 0x80, 0x23, 0x2b, 0x6d, 0x6c, 0xf1, 0x76, 0x68, 0xb3, 0x0f, 0x05, 0xc1, + 0x84, 0xe5, 0xc6, 0x8c, 0x26, 0xd0, 0xe8, 0x83, 0x13, 0x1b, 0xcd, 0x6d, 0x4a, 0x45, 0x13, 0xac, + 0xe6, 0xd0, 0xca, 0xd0, 0xec, 0x1e, 0x14, 0x2d, 0x5b, 0x38, 0x03, 0x1a, 0xb3, 0x3b, 0x8d, 0x76, + 0x1b, 0x27, 0xb6, 0x9b, 0x5f, 0x42, 0x4d, 0x13, 0x0c, 0xe7, 0x43, 0x3b, 0x91, 0x65, 0xfd, 0x8f, + 0x1a, 0xcc, 0x46, 0xe1, 0x7f, 0xc8, 0x84, 0xe3, 0x75, 0x36, 0xd8, 0xfb, 0x34, 0x20, 0x3f, 0x80, + 0x5c, 0x54, 0xce, 0xa6, 0xd5, 0x6e, 0x07, 0x2a, 0xf6, 0xa5, 0xa7, 0x9f, 0x2e, 0x9c, 0x57, 0xea, + 0x96, 0xda, 0xed, 0x80, 0x72, 0xde, 0x12, 0x81, 0xe3, 0x75, 0x8c, 0x6c, 0x24, 0x2e, 0xc9, 0xc4, + 0x84, 0xec, 0x00, 0xb5, 0x99, 0xbe, 0x54, 0xa7, 0x82, 0xf8, 0x7a, 0x15, 0x93, 0x19, 0x1c, 0xe1, + 0xd3, 0x7f, 0x3d, 0x0d, 0xb3, 0x31, 0xbc, 0x2d, 0xcf, 0xf2, 0x79, 0x97, 0x09, 0xf2, 0x08, 0x48, + 0x98, 0xc0, 0x11, 0xf3, 0xa7, 0x51, 0xb0, 0x45, 0xd4, 0x1b, 0x8f, 0x91, 0x01, 0xc5, 0xb8, 0x15, + 0x93, 0x53, 0x51, 0x4a, 0x5c, 0x9d, 0x9e, 0xcf, 0x2c, 0xce, 0x57, 0xc7, 0xcc, 0x84, 0xea, 0x98, + 0x38, 0x1b, 0xf9, 0x98, 0x53, 0x2d, 0x2a, 0x48, 0x15, 0x66, 0x5d, 0x8b, 0x0b, 0xd3, 0xee, 0x5a, + 0x5e, 0x87, 0xb6, 0xcd, 0x2e, 0x75, 0x3a, 0x5d, 0x81, 0xc5, 0x30, 0x6d, 0xcc, 0x48, 0xd6, 0x4a, + 0xc8, 0xb9, 0x8f, 0x0c, 0x72, 0x0b, 0x8a, 0xd4, 0x67, 0x76, 0xd7, 0x74, 0xda, 0xd4, 0x13, 0xce, + 0x8e, 0x43, 0x83, 0x52, 0x52, 0x7a, 0x6b, 0x14, 0x90, 0x5e, 0x1f, 0x92, 0xc9, 0x35, 0xc8, 0x86, + 0xa2, 0x5e, 0xbf, 0xb7, 0x4d, 0x83, 0xd2, 0x19, 0xd4, 0x99, 0x41, 0x5a, 0x03, 0x49, 0x64, 0x05, + 0x60, 0xdb, 0x65, 0xf6, 0xae, 0x29, 0x87, 0x41, 0xe9, 0xec, 0x55, 0x6d, 0x3e, 0xb3, 0x58, 0xae, + 0x86, 0x93, 0xa2, 0x1a, 0x4d, 0x8a, 0xea, 0x66, 0x34, 0x29, 0x96, 0x53, 0x32, 0xa2, 0x1f, 0x7f, + 0x51, 0xd1, 0x8c, 0x34, 0xde, 0x93, 0x1c, 0xfd, 0xe7, 0x90, 0x8f, 0xd2, 0x71, 0x9f, 0xba, 0x3e, + 0x0d, 0x26, 0x39, 0xa5, 0x4d, 0x72, 0x6a, 0x0e, 0x32, 0x5d, 0x8b, 0x9b, 0xcc, 0x17, 0x26, 0xeb, + 0x0b, 0x2c, 0x9e, 0x94, 0x91, 0xee, 0x5a, 0xbc, 0xe9, 0x8b, 0x66, 0x5f, 0x90, 0x37, 0x40, 0x1e, + 0x4c, 0xee, 0x5a, 0xbc, 0x8b, 0xa1, 0x49, 0x19, 0xa9, 0xae, 0xc5, 0x5b, 0xf2, 0xac, 0xef, 0x43, + 0x79, 0xc5, 0x75, 0xa8, 0x27, 0x75, 0x3a, 0xde, 0x9a, 0x15, 0x78, 0x8e, 0xd7, 0x91, 0x45, 0xb9, + 0xee, 0x70, 0x41, 0x7e, 0x02, 0x33, 0x34, 0x24, 0x99, 0x8e, 0xb7, 0xc3, 0x4c, 0xd7, 0xe1, 0x12, + 0x88, 0x4c, 0x5a, 0x6d, 0x6c, 0xd2, 0xc6, 0xeb, 0xaa, 0x7b, 0x3b, 0xcc, 0x28, 0x28, 0x4d, 0xf2, + 0x20, 0x95, 0xeb, 0xbf, 0xd1, 0x26, 0xd9, 0x96, 0x22, 0xe4, 0x87, 0x40, 0xdc, 0x0f, 0x4c, 0x1b, + 0x05, 0x64, 0x2c, 0x1c, 0xcf, 0x74, 0xda, 0x18, 0x85, 0xe4, 0xf2, 0xec, 0xe1, 0x41, 0xa5, 0xb0, + 0xfe, 0x41, 0xec, 0x76, 0x7d, 0xd5, 0x28, 0xb8, 0x23, 0x84, 0x36, 0x79, 0x07, 0x2e, 0x8f, 0x5c, + 0x8f, 0x5c, 0xc1, 0x0e, 0xc5, 0x1e, 0x33, 0x2e, 0xda, 0x63, 0x01, 0xe8, 0x7f, 0x4d, 0x40, 0x36, + 0x2a, 0x40, 0x44, 0xf3, 0x26, 0xe4, 0xd4, 0x75, 0x1e, 0xeb, 0x70, 0x23, 0x1b, 0x11, 0xb1, 0x8f, + 0xaf, 0x41, 0xd6, 0xf2, 0xfd, 0x80, 0x0d, 0x68, 0xdc, 0x46, 0x46, 0xd1, 0x50, 0xe4, 0xdb, 0x40, + 0x86, 0x93, 0xa2, 0x47, 0x85, 0x85, 0x71, 0x0d, 0xa7, 0x97, 0x51, 0x8c, 0x38, 0x0f, 0xa8, 0xb0, + 0xd0, 0xaa, 0x0b, 0xe5, 0x71, 0x1e, 0x28, 0x08, 0x49, 0xac, 0xb8, 0x93, 0x24, 0x42, 0xc6, 0xdd, + 0xb8, 0xf4, 0x65, 0x9f, 0x43, 0xf8, 0x0f, 0x00, 0x6c, 0xd6, 0xeb, 0x39, 0x9c, 0x3b, 0xcc, 0xc3, + 0x82, 0xcf, 0x2c, 0xea, 0x55, 0xd5, 0xd4, 0xd1, 0x7a, 0x55, 0xeb, 0xb6, 0xba, 0x32, 0x94, 0x5c, + 0x4e, 0xcb, 0xba, 0xfe, 0xc3, 0xf3, 0x27, 0xb7, 0x35, 0x23, 0xa6, 0x40, 0xff, 0x9d, 0x06, 0x69, + 0xdc, 0x51, 0xe8, 0xca, 0x75, 0xc8, 0x63, 0x05, 0x9a, 0x36, 0xf3, 0x44, 0x60, 0xd9, 0x6a, 0x2f, + 0x1a, 0x39, 0xa4, 0xae, 0x28, 0x22, 0xb9, 0x01, 0x05, 0x26, 0xef, 0x98, 0x8e, 0x17, 0x15, 0xbe, + 0x8c, 0x62, 0xd2, 0xc8, 0xb1, 0x50, 0x95, 0x2a, 0xfa, 0x79, 0x28, 0x86, 0x72, 0xac, 0x2f, 0xe2, + 0x6d, 0x9f, 0x34, 0xf2, 0x48, 0x6f, 0xf6, 0x85, 0x92, 0xbc, 0x08, 0x67, 0x1f, 0x59, 0x8e, 0x4b, + 0xdb, 0x18, 0xaf, 0x94, 0xa1, 0x4e, 0xfa, 0x9f, 0x34, 0x98, 0x51, 0xf0, 0x96, 0x38, 0xa7, 0xa2, + 0x25, 0x2c, 0x41, 0x5f, 0x6b, 0x6d, 0xd7, 0x3d, 0x11, 0x9b, 0x82, 0x75, 0x4f, 0x44, 0x6b, 0x9b, + 0x18, 0x70, 0x26, 0xbe, 0x1e, 0x5f, 0x6f, 0xb4, 0x86, 0xaa, 0xf4, 0xbf, 0x68, 0x70, 0x01, 0x7b, + 0xf8, 0x5e, 0xc0, 0x7a, 0x5b, 0x5e, 0x9b, 0xba, 0xb4, 0x83, 0x6f, 0x16, 0x72, 0x0b, 0xd2, 0x32, + 0x5b, 0x34, 0x88, 0x1a, 0x26, 0xbd, 0x9c, 0x3d, 0x3c, 0xa8, 0xa4, 0x5a, 0x48, 0xac, 0xaf, 0x1a, + 0xa9, 0x90, 0x5d, 0x6f, 0x93, 0x1b, 0x90, 0xb2, 0xa4, 0xf3, 0x52, 0x32, 0xc4, 0x96, 0x39, 0x3c, + 0xa8, 0x9c, 0xc3, 0x80, 0xd4, 0x57, 0x8d, 0x73, 0xc8, 0xac, 0xc7, 0x5f, 0x33, 0xd3, 0xa7, 0x17, + 0x16, 0xfd, 0x13, 0x0d, 0x66, 0x87, 0x2e, 0xa0, 0x4d, 0xbe, 0xc1, 0x98, 0x3b, 0x82, 0x4a, 0x7b, + 0x25, 0x54, 0x89, 0x53, 0x44, 0xf5, 0xdb, 0x69, 0x20, 0x88, 0x6a, 0x6d, 0x8f, 0xda, 0x7d, 0x19, + 0x51, 0x2c, 0xe0, 0x0e, 0x14, 0xc3, 0x02, 0xf6, 0x03, 0xe6, 0xb3, 0x40, 0xd2, 0x4f, 0x65, 0x53, + 0x16, 0x50, 0xeb, 0xc6, 0x50, 0x29, 0xf9, 0x29, 0x64, 0x42, 0x43, 0xa7, 0x57, 0x32, 0x80, 0x0a, + 0xc3, 0xd7, 0x93, 0x05, 0xb3, 0xa1, 0xfa, 0x7e, 0xac, 0x66, 0x78, 0x69, 0x1a, 0xa7, 0xfa, 0xed, + 0xb1, 0xc3, 0x64, 0x6c, 0x99, 0x2d, 0x27, 0x25, 0x24, 0x83, 0xa0, 0xb2, 0x38, 0x83, 0x93, 0xf7, + 0x60, 0x26, 0x34, 0x81, 0x89, 0xe2, 0xa6, 0xcf, 0x98, 0x5b, 0x4a, 0x1e, 0xb3, 0xeb, 0xc7, 0x14, + 0x81, 0x52, 0x1f, 0x46, 0xe7, 0x88, 0xac, 0xff, 0x2f, 0x21, 0xdb, 0x36, 0xbc, 0x8a, 0xd7, 0x4e, + 0x32, 0x5d, 0x6e, 0x41, 0x91, 0xf7, 0xb7, 0x7b, 0x8e, 0x10, 0x47, 0x7b, 0x35, 0x81, 0x7b, 0xb5, + 0x30, 0xa4, 0xab, 0xb1, 0x21, 0xf7, 0xff, 0x40, 0x4e, 0xde, 0x91, 0x37, 0x45, 0x06, 0x69, 0x4a, + 0xe4, 0x0d, 0x48, 0x3b, 0xdc, 0x1c, 0x50, 0xc1, 0x86, 0xc3, 0x25, 0xe5, 0xf0, 0x87, 0x78, 0x1e, + 0x5b, 0x2e, 0x67, 0xbe, 0x8a, 0x72, 0xf9, 0x06, 0x84, 0xd9, 0x35, 0xe5, 0x0d, 0x7c, 0x85, 0xe4, + 0x8c, 0x34, 0x52, 0x36, 0xf7, 0x7d, 0x4a, 0x1a, 0x90, 0xa7, 0x51, 0x1d, 0x87, 0xcb, 0xe6, 0x1c, + 0x0e, 0xf6, 0x9b, 0x93, 0x13, 0x31, 0x52, 0xf7, 0x46, 0x8e, 0xc6, 0x8f, 0xfa, 0x9f, 0x35, 0x98, + 0x35, 0x68, 0xc7, 0xe1, 0x82, 0x06, 0x51, 0x1e, 0x0c, 0xfa, 0x33, 0xf2, 0x3d, 0xc8, 0xee, 0x04, + 0xac, 0x87, 0x9b, 0x89, 0x72, 0xfe, 0xd2, 0x17, 0x70, 0x46, 0x4a, 0x2b, 0x12, 0x79, 0x1b, 0x92, + 0x08, 0x2d, 0x81, 0xd0, 0xae, 0x1d, 0xfb, 0x1e, 0x44, 0x50, 0x28, 0x7e, 0xf7, 0x3b, 0x1f, 0x3d, + 0xae, 0x4c, 0xfd, 0xe7, 0x71, 0x65, 0xea, 0xc3, 0xe7, 0x4f, 0x6e, 0x67, 0xee, 0x1d, 0x29, 0xfc, + 0xe5, 0xf3, 0x27, 0xb7, 0x2f, 0xc5, 0x82, 0x19, 0xbf, 0xab, 0x97, 0xa1, 0xf4, 0x65, 0x07, 0xb8, + 0xcf, 0x3c, 0x4e, 0xf5, 0x2f, 0x34, 0xc8, 0x35, 0x7d, 0x51, 0xf7, 0x04, 0x5b, 0x7a, 0xd8, 0x7a, + 0x6d, 0xbf, 0x2a, 0x90, 0xb1, 0x06, 0x7c, 0x78, 0x37, 0x7c, 0x0f, 0x80, 0x35, 0xe0, 0x91, 0xc0, + 0x3b, 0x50, 0xf0, 0xfb, 0xdb, 0xae, 0x63, 0x9b, 0xbb, 0x74, 0xdf, 0x7c, 0xc4, 0x99, 0xa7, 0x06, + 0xec, 0x8c, 0xfc, 0x26, 0xda, 0x40, 0xd6, 0xbb, 0x74, 0xff, 0x47, 0xad, 0x66, 0xc3, 0xc8, 0xf9, + 0xc3, 0x23, 0x67, 0xde, 0xdd, 0xb7, 0x8f, 0x73, 0xbe, 0x34, 0xe2, 0x7c, 0xcc, 0x1f, 0xfd, 0x3c, + 0x90, 0x38, 0x41, 0xf9, 0xfd, 0x7b, 0x0d, 0xf2, 0xe1, 0x73, 0xb1, 0xb9, 0xf3, 0x75, 0x38, 0x7e, + 0xf7, 0xbb, 0xc7, 0xa1, 0xbf, 0x3c, 0x8a, 0x3e, 0x86, 0x4a, 0xbf, 0x20, 0x3f, 0xc0, 0x62, 0x14, + 0x85, 0xff, 0xa9, 0x06, 0xb9, 0x16, 0x15, 0x2b, 0xcc, 0xe3, 0xef, 0xd2, 0x7d, 0x09, 0x7f, 0x11, + 0xce, 0xbd, 0x2a, 0xf2, 0x48, 0xf0, 0x2b, 0x4d, 0xd7, 0x9d, 0xb8, 0xc3, 0x91, 0xc5, 0x17, 0x53, + 0x35, 0xe2, 0x82, 0x4c, 0x55, 0x9c, 0x10, 0xba, 0x7a, 0xdb, 0x85, 0x74, 0x6b, 0xd8, 0xdd, 0x65, + 0xb8, 0xd8, 0x5a, 0x5f, 0x6a, 0xdd, 0x37, 0x37, 0x7f, 0xbc, 0xb1, 0x66, 0x6e, 0x35, 0x5a, 0x1b, + 0x6b, 0x2b, 0xf5, 0x7b, 0xf5, 0xb5, 0xd5, 0xe2, 0x14, 0xb9, 0x02, 0xa5, 0x18, 0xaf, 0xde, 0x68, + 0x6d, 0x2e, 0x35, 0x36, 0x4d, 0x24, 0x15, 0x35, 0x72, 0x1d, 0xae, 0xc5, 0xb8, 0x8d, 0x66, 0x24, + 0xb0, 0xd4, 0x58, 0x6b, 0x6e, 0xb5, 0x94, 0x58, 0x62, 0xf1, 0xef, 0x49, 0x98, 0x7e, 0xc0, 0x3b, + 0xe4, 0xb1, 0x06, 0xc5, 0x17, 0xbb, 0x86, 0x8c, 0x1f, 0xe6, 0x63, 0xa6, 0x43, 0x79, 0xe1, 0x15, + 0x25, 0x55, 0x3a, 0xdf, 0xfa, 0xf0, 0x6f, 0xff, 0xfe, 0x24, 0xb1, 0xa0, 0x7f, 0xab, 0x36, 0xfe, + 0x7f, 0x49, 0xb5, 0x71, 0x13, 0xe8, 0x23, 0x0d, 0xe0, 0x28, 0x5e, 0x44, 0x1f, 0x3f, 0xe0, 0xe2, + 0x11, 0x2e, 0xdf, 0x7c, 0xa9, 0x8c, 0x02, 0xb4, 0x80, 0x80, 0x6e, 0xea, 0xd7, 0x27, 0x01, 0x1a, + 0x2d, 0x3e, 0x09, 0xe5, 0xa8, 0xcb, 0x26, 0x40, 0x19, 0xe9, 0xcb, 0x09, 0x50, 0xc6, 0xb4, 0xea, + 0x4b, 0xa1, 0x8c, 0xce, 0xaf, 0x5f, 0x69, 0x90, 0x89, 0x75, 0x0c, 0x79, 0x73, 0x92, 0x9d, 0x58, + 0x97, 0x95, 0xe7, 0x5f, 0x2e, 0xa4, 0xd0, 0x54, 0x11, 0xcd, 0xbc, 0x7e, 0xe3, 0x18, 0x34, 0x71, + 0xcd, 0x67, 0x7e, 0x21, 0xbf, 0x13, 0x96, 0xd7, 0x3f, 0x3b, 0x9c, 0xd3, 0x3e, 0x3f, 0x9c, 0xd3, + 0xfe, 0x75, 0x38, 0xa7, 0x7d, 0xfc, 0x6c, 0x6e, 0xea, 0xf3, 0x67, 0x73, 0x53, 0xff, 0x78, 0x36, + 0x37, 0xf5, 0xde, 0x62, 0x6c, 0x2b, 0xae, 0x85, 0x2a, 0x1b, 0x54, 0xbc, 0xcf, 0x82, 0xdd, 0xa1, + 0x85, 0xbd, 0x23, 0x1b, 0xb8, 0x25, 0xb7, 0xcf, 0xe2, 0xc7, 0xf6, 0x5b, 0xff, 0x0f, 0x00, 0x00, + 0xff, 0xff, 0x50, 0x22, 0xdc, 0x02, 0x7a, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1707,13 +1736,31 @@ func (m *VotingPowerSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.LastChangedKey) > 0 { - i -= len(m.LastChangedKey) - copy(dAtA[i:], m.LastChangedKey) - i = encodeVarintTx(dAtA, i, uint64(len(m.LastChangedKey))) + n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.BlockTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.BlockTime):]) + if err1 != nil { + return 0, err1 + } + i -= n1 + i = encodeVarintTx(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x32 + if m.EpochNumber != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.EpochNumber)) + i-- + dAtA[i] = 0x28 + } + if len(m.EpochIdentifier) > 0 { + i -= len(m.EpochIdentifier) + copy(dAtA[i:], m.EpochIdentifier) + i = encodeVarintTx(dAtA, i, uint64(len(m.EpochIdentifier))) i-- dAtA[i] = 0x22 } + if m.LastChangedHeight != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.LastChangedHeight)) + i-- + dAtA[i] = 0x18 + } if len(m.VotingPowerSet) > 0 { for iNdEx := len(m.VotingPowerSet) - 1; iNdEx >= 0; iNdEx-- { { @@ -1725,7 +1772,7 @@ func (m *VotingPowerSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTx(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x12 } } { @@ -1737,12 +1784,7 @@ func (m *VotingPowerSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTx(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 - if m.Height != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.Height)) - i-- - dAtA[i] = 0x8 - } + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1786,12 +1828,10 @@ func (m *SnapshotHelper) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - if len(m.LastChangedKey) > 0 { - i -= len(m.LastChangedKey) - copy(dAtA[i:], m.LastChangedKey) - i = encodeVarintTx(dAtA, i, uint64(len(m.LastChangedKey))) + if m.LastChangedHeight != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.LastChangedHeight)) i-- - dAtA[i] = 0xa + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -2579,9 +2619,6 @@ func (m *VotingPowerSnapshot) Size() (n int) { } var l int _ = l - if m.Height != 0 { - n += 1 + sovTx(uint64(m.Height)) - } l = m.TotalVotingPower.Size() n += 1 + l + sovTx(uint64(l)) if len(m.VotingPowerSet) > 0 { @@ -2590,10 +2627,18 @@ func (m *VotingPowerSnapshot) Size() (n int) { n += 1 + l + sovTx(uint64(l)) } } - l = len(m.LastChangedKey) + if m.LastChangedHeight != 0 { + n += 1 + sovTx(uint64(m.LastChangedHeight)) + } + l = len(m.EpochIdentifier) if l > 0 { n += 1 + l + sovTx(uint64(l)) } + if m.EpochNumber != 0 { + n += 1 + sovTx(uint64(m.EpochNumber)) + } + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.BlockTime) + n += 1 + l + sovTx(uint64(l)) return n } @@ -2603,9 +2648,8 @@ func (m *SnapshotHelper) Size() (n int) { } var l int _ = l - l = len(m.LastChangedKey) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) + if m.LastChangedHeight != 0 { + n += 1 + sovTx(uint64(m.LastChangedHeight)) } if m.HasOptOut { n += 2 @@ -3299,25 +3343,6 @@ func (m *VotingPowerSnapshot) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) - } - m.Height = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Height |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TotalVotingPower", wireType) } @@ -3351,7 +3376,7 @@ func (m *VotingPowerSnapshot) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 3: + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field VotingPowerSet", wireType) } @@ -3385,9 +3410,28 @@ func (m *VotingPowerSnapshot) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field LastChangedHeight", wireType) + } + m.LastChangedHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.LastChangedHeight |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LastChangedKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EpochIdentifier", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3415,7 +3459,59 @@ func (m *VotingPowerSnapshot) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.LastChangedKey = string(dAtA[iNdEx:postIndex]) + m.EpochIdentifier = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field EpochNumber", wireType) + } + m.EpochNumber = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.EpochNumber |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockTime", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.BlockTime, dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -3468,10 +3564,10 @@ func (m *SnapshotHelper) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LastChangedKey", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field LastChangedHeight", wireType) } - var stringLen uint64 + m.LastChangedHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -3481,24 +3577,11 @@ func (m *SnapshotHelper) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.LastChangedHeight |= int64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LastChangedKey = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field HasOptOut", wireType) From 4d5662dc9474ac0203359712ba7181fc31ec4ab3 Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Sun, 27 Oct 2024 23:15:38 +0800 Subject: [PATCH 06/12] fix the voting power snapshot issues identified by the unit test add unit test for voting power snapshot --- utils/utils.go | 7 + x/epochs/keeper/abci.go | 1 + x/operator/keeper/abci.go | 34 +- x/operator/keeper/operator.go | 14 +- x/operator/keeper/operator_info_test.go | 5 +- x/operator/keeper/opt_test.go | 55 ++-- x/operator/keeper/setup_test.go | 18 +- x/operator/keeper/slash.go | 34 +- x/operator/keeper/slash_test.go | 11 +- x/operator/keeper/usd_value_test.go | 25 +- x/operator/keeper/voting_power_snapshot.go | 85 +++-- .../keeper/voting_power_snapshot_test.go | 303 ++++++++++++++++++ x/operator/types/keys.go | 21 ++ 13 files changed, 503 insertions(+), 110 deletions(-) create mode 100644 x/operator/keeper/voting_power_snapshot_test.go diff --git a/utils/utils.go b/utils/utils.go index 176cb0a95..cecc57290 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -2,6 +2,7 @@ package utils import ( "bytes" + "encoding/binary" "sort" "strings" @@ -210,3 +211,9 @@ func SortByPower( } return sortedOperatorAddrs, sortedPubKeys, sortedPowers } + +func EncodeHeightBytes(height uint64) []byte { + buf := make([]byte, 8) + binary.BigEndian.PutUint64(buf, height) + return buf +} diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go index b2590e518..6a4f7770c 100644 --- a/x/epochs/keeper/abci.go +++ b/x/epochs/keeper/abci.go @@ -63,6 +63,7 @@ func (k Keeper) BeginBlocker(ctx sdk.Context) { "ending epoch", "identifier", epochInfo.Identifier, "number", epochInfo.CurrentEpoch, + "height", ctx.BlockHeight(), ) ctx.EventManager().EmitEvent( sdk.NewEvent( diff --git a/x/operator/keeper/abci.go b/x/operator/keeper/abci.go index 453719b62..4f96ad148 100644 --- a/x/operator/keeper/abci.go +++ b/x/operator/keeper/abci.go @@ -2,10 +2,9 @@ package keeper import ( "errors" - "strconv" "time" - assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" + "github.com/ethereum/go-ethereum/common" sdkmath "cosmossdk.io/math" operatortypes "github.com/ExocoreNetwork/exocore/x/operator/types" @@ -61,9 +60,13 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str isSnapshotChanged := false votingPowerSet := make([]*operatortypes.OperatorVotingPower, 0) avsVotingPower := sdkmath.LegacyNewDec(0) + hasOptedOperator := false opFunc := func(operator string, optedUSDValues *operatortypes.OperatorOptedUSDValue) error { + if !hasOptedOperator { + hasOptedOperator = true + } // clear the old voting power for the operator - lastOptedUSDValue := optedUSDValues + lastOptedUSDValue := *optedUSDValues *optedUSDValues = operatortypes.OperatorOptedUSDValue{ TotalUSDValue: sdkmath.LegacyNewDec(0), SelfUSDValue: sdkmath.LegacyNewDec(0), @@ -138,22 +141,27 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str // Use the current height as the snapshot height when handling snapshots triggered // by slashing. This prevents stakers from escaping slashes through backrunning // undelegation. + // Use the start height of the next epoch as the snapshot key. + // The start height of the next epoch should be the current height, + // as the `AfterEpochEnd` is called in the beginBlock of next epoch's start height. snapshotHeight := ctx.BlockHeight() if !isForSlash { // clear the slash flag at the end of the epoch snapshotHelper.HasSlash = false - // Use the start height of the next epoch as the snapshot key. - // The start height of the next epoch should be the current height plus 1, - // as voting power is updated at the end of the epoch. - snapshotHeight++ + // the epoch number should plus 1, as it's updated after the hook `AfterEpochEnd` is called votingPowerSnapshot.EpochNumber++ } + isSetSnapshot := true if snapshotHelper.HasOptOut || isSnapshotChanged { votingPowerSnapshot.TotalVotingPower = avsVotingPower votingPowerSnapshot.VotingPowerSet = votingPowerSet snapshotHelper.LastChangedHeight = snapshotHeight // clear the hasOptOut flag if it's certain that the snapshot will be updated snapshotHelper.HasOptOut = false + } else if !hasOptedOperator { + // don’t set the snapshot if no operator has opted into the AVS, + // except for the first epoch after all operators have opted out of this AVS. + isSetSnapshot = false } votingPowerSnapshot.LastChangedHeight = snapshotHelper.LastChangedHeight @@ -161,12 +169,14 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str if err != nil { return err } - snapshotKey := assetstype.GetJoinedStoreKey(avsAddr, strconv.FormatInt(snapshotHeight, 10)) - err = k.SetVotingPowerSnapshot(cc, snapshotKey, &votingPowerSnapshot) - if err != nil { - return err - } + if isSetSnapshot { + snapshotKey := operatortypes.KeyForVotingPowerSnapshot(common.HexToAddress(avsAddr), snapshotHeight) + err = k.SetVotingPowerSnapshot(cc, snapshotKey, &votingPowerSnapshot) + if err != nil { + return err + } + } writeFunc() return nil } diff --git a/x/operator/keeper/operator.go b/x/operator/keeper/operator.go index 3e8f65196..ee0e9ca2d 100644 --- a/x/operator/keeper/operator.go +++ b/x/operator/keeper/operator.go @@ -188,11 +188,13 @@ func (k *Keeper) GetOptedInAVSForOperator(ctx sdk.Context, operatorAddr string) avsList := make([]string, 0) for ; iterator.Valid(); iterator.Next() { - keys, err := assetstype.ParseJoinedStoreKey(iterator.Key(), 2) - if err != nil { - return nil, err - } - if k.IsOptedIn(ctx, keys[0], keys[1]) { + var optedInfo operatortypes.OptedInfo + k.cdc.MustUnmarshal(iterator.Value(), &optedInfo) + if optedInfo.OptedOutHeight == operatortypes.DefaultOptedOutHeight { + keys, err := assetstype.ParseJoinedStoreKey(iterator.Key(), 2) + if err != nil { + return nil, err + } avsList = append(avsList, keys[1]) } } @@ -238,7 +240,7 @@ func (k *Keeper) GetOptedInOperatorListByAVS(ctx sdk.Context, avsAddr string) ([ if err != nil { return nil, err } - if strings.ToLower(avsAddr) == keys[1] && k.IsOptedIn(ctx, keys[0], keys[1]) { + if strings.ToLower(avsAddr) == keys[1] { operatorList = append(operatorList, keys[0]) } } diff --git a/x/operator/keeper/operator_info_test.go b/x/operator/keeper/operator_info_test.go index 8570181a6..8ec37b4bb 100644 --- a/x/operator/keeper/operator_info_test.go +++ b/x/operator/keeper/operator_info_test.go @@ -1,8 +1,6 @@ package keeper_test import ( - "fmt" - "cosmossdk.io/math" operatortype "github.com/ExocoreNetwork/exocore/x/operator/types" @@ -17,13 +15,12 @@ func (suite *OperatorTestSuite) TestOperatorInfo() { OperatorMetaInfo: "test operator", ClientChainEarningsAddr: &operatortype.ClientChainEarningAddrList{ EarningInfoList: []*operatortype.ClientChainEarningAddrInfo{ - {101, "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984"}, + {defaultClientChainID, "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984"}, }, }, Commission: stakingtypes.NewCommission(math.LegacyZeroDec(), math.LegacyZeroDec(), math.LegacyZeroDec()), } suite.Equal(operatortype.AccAddressLength, len(suite.AccAddress)) - fmt.Println("the acc address length is:", len(suite.AccAddress)) err := suite.App.OperatorKeeper.SetOperatorInfo(suite.Ctx, suite.AccAddress.String(), info) suite.NoError(err) diff --git a/x/operator/keeper/opt_test.go b/x/operator/keeper/opt_test.go index 56e54a175..eeed045ed 100644 --- a/x/operator/keeper/opt_test.go +++ b/x/operator/keeper/opt_test.go @@ -26,49 +26,51 @@ type StateForCheck struct { StakerShare sdkmath.LegacyDec } -func (suite *OperatorTestSuite) prepareOperator() { - opAccAddr, err := sdk.AccAddressFromBech32("exo13h6xg79g82e2g2vhjwg7j4r2z2hlncelwutkjr") - suite.operatorAddr = opAccAddr - suite.NoError(err) +func (suite *OperatorTestSuite) registerOperator(operator string) { // register operator registerReq := &operatorTypes.RegisterOperatorReq{ - FromAddress: suite.operatorAddr.String(), + FromAddress: operator, Info: &operatorTypes.OperatorInfo{ - EarningsAddr: suite.operatorAddr.String(), + EarningsAddr: operator, }, } - _, err = s.OperatorMsgServer.RegisterOperator(s.Ctx, registerReq) + _, err := s.OperatorMsgServer.RegisterOperator(s.Ctx, registerReq) suite.NoError(err) } -func (suite *OperatorTestSuite) prepareDeposit(assetAddr common.Address, amount sdkmath.Int) { - clientChainLzID := uint64(101) - suite.avsAddr = common.BytesToAddress([]byte("avsTestAddr")).String() +func (suite *OperatorTestSuite) prepareOperator() { + operator := "exo13h6xg79g82e2g2vhjwg7j4r2z2hlncelwutkjr" + opAccAddr, err := sdk.AccAddressFromBech32(operator) + suite.operatorAddr = opAccAddr + suite.NoError(err) + // register operator + suite.registerOperator(operator) +} + +func (suite *OperatorTestSuite) prepareDeposit(stakerAddr, assetAddr common.Address, amount sdkmath.Int) { suite.assetAddr = assetAddr - suite.assetDecimal = 6 - suite.clientChainLzID = clientChainLzID - suite.depositAmount = amount - suite.updatedAmountForOptIn = sdkmath.NewInt(20) - suite.stakerID, suite.assetID = assetstypes.GetStakerIDAndAssetID(suite.clientChainLzID, suite.Address[:], suite.assetAddr[:]) + suite.assetDecimal = uint32(assetDecimal) + suite.clientChainLzID = defaultClientChainID + suite.stakerID, suite.assetID = assetstypes.GetStakerIDAndAssetID(suite.clientChainLzID, stakerAddr[:], assetAddr[:]) // staking assets depositParam := &assetskeeper.DepositWithdrawParams{ ClientChainLzID: suite.clientChainLzID, Action: assetstypes.DepositLST, - StakerAddress: suite.Address[:], - OpAmount: suite.depositAmount, + StakerAddress: stakerAddr[:], + OpAmount: amount, AssetsAddress: assetAddr[:], } err := suite.App.AssetsKeeper.PerformDepositOrWithdraw(suite.Ctx, depositParam) suite.NoError(err) } -func (suite *OperatorTestSuite) prepareDelegation(isDelegation bool, assetAddr common.Address, amount sdkmath.Int) { +func (suite *OperatorTestSuite) prepareDelegation(isDelegation bool, staker, assetAddr common.Address, operator sdk.AccAddress, amount sdkmath.Int) { suite.delegationAmount = amount param := &delegationtype.DelegationOrUndelegationParams{ ClientChainID: suite.clientChainLzID, AssetsAddress: assetAddr[:], - OperatorAddress: suite.operatorAddr, - StakerAddress: suite.Address[:], + OperatorAddress: operator, + StakerAddress: staker[:], OpAmount: amount, LzNonce: 0, TxHash: common.HexToHash("0x24c4a315d757249c12a7a1d7b6fb96261d49deee26f06a3e1787d008b445c3ac"), @@ -83,20 +85,21 @@ func (suite *OperatorTestSuite) prepareDelegation(isDelegation bool, assetAddr c } func (suite *OperatorTestSuite) prepare() { - usdtAddress := common.HexToAddress("0xdAC17F958D2ee523a2206206994597C13D831ec7") depositAmount := sdkmath.NewInt(100) delegationAmount := sdkmath.NewInt(50) suite.prepareOperator() - suite.prepareDeposit(usdtAddress, depositAmount) - suite.prepareDelegation(true, usdtAddress, delegationAmount) + suite.prepareDeposit(suite.Address, usdtAddr, depositAmount) + suite.prepareDelegation(true, suite.Address, usdtAddr, suite.operatorAddr, delegationAmount) } func (suite *OperatorTestSuite) prepareAvs(assetIDs []string) { + suite.avsAddr = common.BytesToAddress([]byte("avsTestAddr")).String() err := suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{ Action: avstypes.RegisterAction, EpochIdentifier: epochstypes.HourEpochID, AvsAddress: common.HexToAddress(suite.avsAddr), AssetID: assetIDs, + UnbondingPeriod: 5, }) suite.NoError(err) } @@ -130,7 +133,7 @@ func (suite *OperatorTestSuite) CheckState(expectedState *StateForCheck) { func (suite *OperatorTestSuite) TestOptIn() { suite.prepare() - suite.prepareAvs([]string{"0xdac17f958d2ee523a2206206994597c13d831ec7_0x65"}) + suite.prepareAvs([]string{usdtAssetID}) err := suite.App.OperatorKeeper.OptIn(suite.Ctx, suite.operatorAddr, suite.avsAddr) suite.NoError(err) // check if the related state is correct @@ -158,7 +161,7 @@ func (suite *OperatorTestSuite) TestOptIn() { func (suite *OperatorTestSuite) TestOptInList() { suite.prepare() - suite.prepareAvs([]string{"0xdac17f958d2ee523a2206206994597c13d831ec7_0x65"}) + suite.prepareAvs([]string{usdtAssetID}) err := suite.App.OperatorKeeper.OptIn(suite.Ctx, suite.operatorAddr, suite.avsAddr) suite.NoError(err) // check if the related state is correct @@ -174,7 +177,7 @@ func (suite *OperatorTestSuite) TestOptInList() { func (suite *OperatorTestSuite) TestOptOut() { suite.prepare() - suite.prepareAvs([]string{"0xdac17f958d2ee523a2206206994597c13d831ec7_0x65"}) + suite.prepareAvs([]string{usdtAssetID}) err := suite.App.OperatorKeeper.OptOut(suite.Ctx, suite.operatorAddr, suite.avsAddr) suite.EqualError(err, operatorTypes.ErrNotOptedIn.Error()) diff --git a/x/operator/keeper/setup_test.go b/x/operator/keeper/setup_test.go index efb6ca9d3..8474f0251 100644 --- a/x/operator/keeper/setup_test.go +++ b/x/operator/keeper/setup_test.go @@ -18,16 +18,14 @@ type OperatorTestSuite struct { testutil.BaseTestSuite // needed by test - operatorAddr sdk.AccAddress - avsAddr string - assetID string - stakerID string - assetAddr common.Address - assetDecimal uint32 - clientChainLzID uint64 - depositAmount sdkmath.Int - delegationAmount sdkmath.Int - updatedAmountForOptIn sdkmath.Int + operatorAddr sdk.AccAddress + avsAddr string + assetID string + stakerID string + assetAddr common.Address + assetDecimal uint32 + clientChainLzID uint64 + delegationAmount sdkmath.Int } func TestOperatorTestSuite(t *testing.T) { diff --git a/x/operator/keeper/slash.go b/x/operator/keeper/slash.go index 75c2b0dd3..ea7c23469 100644 --- a/x/operator/keeper/slash.go +++ b/x/operator/keeper/slash.go @@ -153,7 +153,7 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { if err != nil { return err } - snapshotHeight, snapshot, err := k.LoadVotingPowerSnapshot(ctx, parameter.AVSAddr, parameter.SlashEventHeight) + snapshotKeyLastHeight, snapshot, err := k.LoadVotingPowerSnapshot(ctx, parameter.AVSAddr, parameter.SlashEventHeight) if err != nil { return err } @@ -168,11 +168,15 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { return types.ErrInvalidSlashPower.Wrapf("slash: valid voting power, the power is:%v", parameter.Power) } } + if parameter.Power == 0 { + k.Logger(ctx).Info("don't execute the slash if the historical voting power is zero") + return nil + } // slash assets according to the input information // using cache context to ensure the atomicity of slash execution. cc, writeFunc := ctx.CacheContext() - executionInfo, err := k.SlashAssets(cc, snapshotHeight, parameter) + executionInfo, err := k.SlashAssets(cc, snapshotKeyLastHeight, parameter) if err != nil { return err } @@ -191,18 +195,26 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { if err != nil { return err } - // update the voting power and save the snapshot caused by slash execution - epochInfo, err := k.avsKeeper.GetAVSEpochInfo(ctx, parameter.AVSAddr) - if err != nil { - return err - } - err = k.UpdateVotingPower(ctx, parameter.AVSAddr, epochInfo.Identifier, epochInfo.CurrentEpoch, true) + + // update the voting power and save the snapshot for all affected AVSs + avsList, err := k.GetOptedInAVSForOperator(ctx, parameter.Operator.String()) if err != nil { return err } - err = k.SetSlashFlag(ctx, parameter.AVSAddr, true) - if err != nil { - return err + for i := range avsList { + avs := avsList[i] + epochInfo, err := k.avsKeeper.GetAVSEpochInfo(ctx, avs) + if err != nil { + return err + } + err = k.UpdateVotingPower(ctx, avs, epochInfo.Identifier, epochInfo.CurrentEpoch, true) + if err != nil { + return err + } + err = k.SetSlashFlag(ctx, avs, true) + if err != nil { + return err + } } return nil } diff --git a/x/operator/keeper/slash_test.go b/x/operator/keeper/slash_test.go index d2776268b..4a2bd05f9 100644 --- a/x/operator/keeper/slash_test.go +++ b/x/operator/keeper/slash_test.go @@ -9,18 +9,15 @@ import ( "github.com/ExocoreNetwork/exocore/x/operator/types" abci "github.com/cometbft/cometbft/abci/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/ethereum/go-ethereum/common" ) func (suite *OperatorTestSuite) TestSlashWithInfractionReason() { // prepare the deposit and delegation suite.prepareOperator() - usdtAddress := common.HexToAddress("0xdAC17F958D2ee523a2206206994597C13D831ec7") - assetDecimal := 6 depositAmount := sdkmath.NewIntWithDecimal(200, assetDecimal) - suite.prepareDeposit(usdtAddress, depositAmount) + suite.prepareDeposit(suite.Address, usdtAddr, depositAmount) delegationAmount := sdkmath.NewIntWithDecimal(100, assetDecimal) - suite.prepareDelegation(true, suite.assetAddr, delegationAmount) + suite.prepareDelegation(true, suite.Address, suite.assetAddr, suite.operatorAddr, delegationAmount) err := suite.App.DelegationKeeper.AssociateOperatorWithStaker(suite.Ctx, suite.clientChainLzID, suite.operatorAddr, suite.Address[:]) suite.NoError(err) @@ -40,14 +37,14 @@ func (suite *OperatorTestSuite) TestSlashWithInfractionReason() { // delegates new amount to the operator newDelegateAmount := sdkmath.NewIntWithDecimal(20, assetDecimal) - suite.prepareDelegation(true, suite.assetAddr, newDelegateAmount) + suite.prepareDelegation(true, suite.Address, suite.assetAddr, suite.operatorAddr, newDelegateAmount) // updating the voting power suite.CommitAfter(time.Hour*24 + time.Nanosecond) newOptedUSDValues, err := suite.App.OperatorKeeper.GetOperatorOptedUSDValue(suite.Ctx, avsAddr, suite.operatorAddr.String()) suite.NoError(err) // submits an undelegation to test the slashFromUndelegation undelegationAmount := sdkmath.NewIntWithDecimal(10, assetDecimal) - suite.prepareDelegation(false, suite.assetAddr, undelegationAmount) + suite.prepareDelegation(false, suite.Address, suite.assetAddr, suite.operatorAddr, undelegationAmount) delegationRemaining := delegationAmount.Add(newDelegateAmount).Sub(undelegationAmount) startHeight := uint64(suite.Ctx.BlockHeight()) completedHeight := suite.App.OperatorKeeper.GetUnbondingExpirationBlockNumber(suite.Ctx, suite.operatorAddr, startHeight) diff --git a/x/operator/keeper/usd_value_test.go b/x/operator/keeper/usd_value_test.go index 116f3c6b4..1f19f1f61 100644 --- a/x/operator/keeper/usd_value_test.go +++ b/x/operator/keeper/usd_value_test.go @@ -14,7 +14,15 @@ const ( MaxDecForTotalSupply = 38 ) -var MaxAssetTotalSupply = sdkmath.NewIntWithDecimal(1, MaxDecForTotalSupply) +var ( + MaxAssetTotalSupply = sdkmath.NewIntWithDecimal(1, MaxDecForTotalSupply) + defaultClientChainID = uint64(101) + assetDecimal = 6 + usdcAddr = common.HexToAddress("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48") + usdcAssetID = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48_0x65" + usdtAddr = common.HexToAddress("0xdac17f958d2ee523a2206206994597c13d831ec7") + usdtAssetID = "0xdac17f958d2ee523a2206206994597c13d831ec7_0x65" +) func (suite *OperatorTestSuite) TestCalculateUSDValue() { suite.prepare() @@ -67,13 +75,12 @@ func (suite *OperatorTestSuite) TestCalculatedUSDValueOverflow() { func (suite *OperatorTestSuite) TestAVSUSDValue() { suite.prepare() // register the new token - usdcAddr := common.HexToAddress("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48") usdcClientChainAsset := assetstype.AssetInfo{ Name: "USD coin", Symbol: "USDC", Address: usdcAddr.String(), - Decimals: 6, - LayerZeroChainID: 101, + Decimals: uint32(assetDecimal), + LayerZeroChainID: defaultClientChainID, MetaInfo: "USDC", } err := suite.App.AssetsKeeper.SetStakingAssetInfo( @@ -85,7 +92,7 @@ func (suite *OperatorTestSuite) TestAVSUSDValue() { ) suite.NoError(err) // register the new AVS - suite.prepareAvs([]string{"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48_0x65", "0xdac17f958d2ee523a2206206994597c13d831ec7_0x65"}) + suite.prepareAvs([]string{usdcAssetID, usdtAssetID}) // opt in err = suite.App.OperatorKeeper.OptIn(suite.Ctx, suite.operatorAddr, suite.avsAddr) suite.NoError(err) @@ -94,11 +101,11 @@ func (suite *OperatorTestSuite) TestAVSUSDValue() { usdtValue := operatorKeeper.CalculateUSDValue(suite.delegationAmount, usdtPrice.Value, suite.assetDecimal, usdtPrice.Decimal) // deposit and delegate another asset to the operator suite.NoError(err) - suite.prepareDeposit(usdcAddr, sdkmath.NewInt(1e8)) + suite.prepareDeposit(suite.Address, usdcAddr, sdkmath.NewInt(1e8)) usdcPrice, err := suite.App.OperatorKeeper.OracleInterface().GetSpecifiedAssetsPrice(suite.Ctx, suite.assetID) suite.NoError(err) delegatedAmount := sdkmath.NewIntWithDecimal(8, 7) - suite.prepareDelegation(true, usdcAddr, delegatedAmount) + suite.prepareDelegation(true, suite.Address, usdcAddr, suite.operatorAddr, delegatedAmount) // updating the new voting power usdcValue := operatorKeeper.CalculateUSDValue(suite.delegationAmount, usdcPrice.Value, suite.assetDecimal, usdcPrice.Decimal) @@ -143,14 +150,14 @@ func (suite *OperatorTestSuite) TestVotingPowerForDogFood() { assetAddr := common.HexToAddress(asset.Address) depositAmount := sdkmath.NewIntWithDecimal(2, int(asset.Decimals)) delegationAmount := sdkmath.NewIntWithDecimal(int64(addPower), int(asset.Decimals)) - suite.prepareDeposit(assetAddr, depositAmount) + suite.prepareDeposit(suite.Address, assetAddr, depositAmount) // the order here is unknown, so we need to check which operator has the highest power if powers[0] > powers[1] { suite.operatorAddr = operators[0] } else { suite.operatorAddr = operators[1] } - suite.prepareDelegation(true, assetAddr, delegationAmount) + suite.prepareDelegation(true, suite.Address, assetAddr, suite.operatorAddr, delegationAmount) optedUSDValues, err := suite.App.OperatorKeeper.GetOperatorOptedUSDValue(suite.Ctx, avsAddress, suite.operatorAddr.String()) suite.NoError(err) initialOperatorUSDValue := optedUSDValues.TotalUSDValue diff --git a/x/operator/keeper/voting_power_snapshot.go b/x/operator/keeper/voting_power_snapshot.go index 262a6dd38..37d746fde 100644 --- a/x/operator/keeper/voting_power_snapshot.go +++ b/x/operator/keeper/voting_power_snapshot.go @@ -1,10 +1,10 @@ package keeper import ( - "strconv" "time" - assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" + "github.com/ethereum/go-ethereum/common" + "github.com/ExocoreNetwork/exocore/x/operator/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" @@ -17,6 +17,41 @@ func (k *Keeper) SetVotingPowerSnapshot(ctx sdk.Context, key []byte, snapshot *t return nil } +func (k *Keeper) GetVotingPowerSnapshot(ctx sdk.Context, key []byte) (*types.VotingPowerSnapshot, error) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) + var ret types.VotingPowerSnapshot + value := store.Get(key) + if value == nil { + return nil, types.ErrNoKeyInTheStore.Wrapf("GetVotingPowerSnapshot: key is %s", key) + } + k.cdc.MustUnmarshal(value, &ret) + return &ret, nil +} + +func (k *Keeper) IterateVotingPowerSnapshot(ctx sdk.Context, avsAddr string, isUpdate bool, opFunc func(height int64, snapshot *types.VotingPowerSnapshot) error) error { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) + iterator := sdk.KVStorePrefixIterator(store, common.HexToAddress(avsAddr).Bytes()) + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + var snapshot types.VotingPowerSnapshot + k.cdc.MustUnmarshal(iterator.Value(), &snapshot) + _, height, err := types.ParseVotingPowerSnapshotKey(iterator.Key()) + if err != nil { + return err + } + err = opFunc(height, &snapshot) + if err != nil { + return err + } + if isUpdate { + bz := k.cdc.MustMarshal(&snapshot) + store.Set(iterator.Key(), bz) + } + } + return nil +} + // LoadVotingPowerSnapshot loads the voting power snapshot information for the provided height, // returning the height of the first block in the epoch the snapshot serves, along with the specific // voting power data. The start height will be used to filter pending undelegations during slashing. @@ -27,14 +62,20 @@ func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr string, height // The snapshot closest to the input height is the one used for its voting // power information. The correct snapshot key can be found by taking advantage // of the ascending order of data returned when using an iterator range. - keyWithHeight := assetstype.GetJoinedStoreKey(avsAddr, strconv.FormatInt(height, 10)) - findKey := keyWithHeight - if !store.Has(keyWithHeight) { - iterator := sdk.KVStorePrefixIterator(store, []byte(avsAddr)) + avsEthAddr := common.HexToAddress(avsAddr) + findKey := types.KeyForVotingPowerSnapshot(avsEthAddr, height) + findHeight := height + if !store.Has(findKey) { + iterator := sdk.KVStorePrefixIterator(store, avsEthAddr.Bytes()) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { - if string(iterator.Key()) <= string(keyWithHeight) { + _, keyHeight, err := types.ParseVotingPowerSnapshotKey(iterator.Key()) + if err != nil { + return 0, nil, err + } + if keyHeight <= height { findKey = iterator.Key() + findHeight = keyHeight } else { break } @@ -43,50 +84,44 @@ func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr string, height value := store.Get(findKey) if value == nil { - return 0, nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: key is %s", findKey) + return 0, nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: height is %v", findHeight) } k.cdc.MustUnmarshal(value, &ret) - // fall back to the last snapshot if the voting power set is nil - if ret.VotingPowerSet == nil { - value = store.Get(assetstype.GetJoinedStoreKey(avsAddr, strconv.FormatInt(ret.LastChangedHeight, 10))) + // fall back to get the snapshot if the key height doesn't equal to the `LastChangedHeight` + if findHeight != ret.LastChangedHeight { + value = store.Get(types.KeyForVotingPowerSnapshot(common.HexToAddress(avsAddr), ret.LastChangedHeight)) if value == nil { return 0, nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: fall back to the height %v", ret.LastChangedHeight) } k.cdc.MustUnmarshal(value, &ret) } - - keysList, err := assetstype.ParseJoinedKey(findKey) - if value == nil { - return 0, nil, err - } - findHeight, err := strconv.ParseInt(keysList[1], 10, 64) - if value == nil { - return 0, nil, err - } return findHeight, &ret, nil } // RemoveVotingPowerSnapshot remove all snapshots older than the input time. func (k *Keeper) RemoveVotingPowerSnapshot(ctx sdk.Context, avsAddr string, time time.Time) error { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) - iterator := sdk.KVStorePrefixIterator(store, []byte(avsAddr)) + iterator := sdk.KVStorePrefixIterator(store, common.HexToAddress(avsAddr).Bytes()) defer iterator.Close() // the retained key is used to record the snapshot that will be fallen back to // by snapshots earlier than the input time. var retainedKey []byte - var snapshot types.VotingPowerSnapshot for ; iterator.Valid(); iterator.Next() { + var snapshot types.VotingPowerSnapshot k.cdc.MustUnmarshal(iterator.Value(), &snapshot) - if snapshot.BlockTime.After(time) { + _, height, _ := types.ParseVotingPowerSnapshotKey(iterator.Key()) + if snapshot.BlockTime.Compare(time) >= 0 { // delete the retained key, because the snapshots that is earlier than the input time // don't need to retain any old snapshot key. - if snapshot.VotingPowerSet != nil && retainedKey != nil { + if height == snapshot.LastChangedHeight && retainedKey != nil { store.Delete(retainedKey) } break } - if snapshot.VotingPowerSet != nil { + // When height == snapshot.LastChangedHeight, it indicates that the current snapshot + // contains the current voting power set, so there is no need to fall back to other keys. + if height == snapshot.LastChangedHeight { // delete the old retained key, because the key currently holding the voting power set // will become the latest retained key. if retainedKey != nil { diff --git a/x/operator/keeper/voting_power_snapshot_test.go b/x/operator/keeper/voting_power_snapshot_test.go new file mode 100644 index 000000000..4c0ac9fad --- /dev/null +++ b/x/operator/keeper/voting_power_snapshot_test.go @@ -0,0 +1,303 @@ +package keeper_test + +import ( + "encoding/json" + "fmt" + "math/big" + "sort" + "time" + + sdkmath "cosmossdk.io/math" + + testutiltx "github.com/ExocoreNetwork/exocore/testutil/tx" + epochstypes "github.com/ExocoreNetwork/exocore/x/epochs/types" + "github.com/ExocoreNetwork/exocore/x/operator/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/ethereum/go-ethereum/common" +) + +var ( + operatorNumber = 3 + blockNumberPerEpoch = int64(3) +) + +type testHelperInfo struct { + depositAmount sdkmath.Int + delegateAmount sdkmath.Int + operators []sdk.AccAddress + stakers []common.Address +} + +func (suite *OperatorTestSuite) prepareForSnapshotTesting(operatorNumber int) testHelperInfo { + // set default client chainID and asset + suite.clientChainLzID = defaultClientChainID + // prepare AVS + suite.prepareAvs([]string{usdtAssetID}) + // prepare stakers and operators + operators := make([]sdk.AccAddress, operatorNumber) + stakers := make([]common.Address, operatorNumber) + + decimalAmount := new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(assetDecimal)), nil) + depositAmount := sdkmath.NewInt(10000).Mul(sdkmath.NewIntFromBigInt(decimalAmount)) + delegateAmount := sdkmath.NewInt(1000).Mul(sdkmath.NewIntFromBigInt(decimalAmount)) + for i := 0; i < operatorNumber; i++ { + ethAddr := testutiltx.GenerateAddress() + stakers[i] = ethAddr + operators[i] = ethAddr.Bytes() + // register operator + suite.registerOperator(operators[i].String()) + // associate the stakers with operators + err := suite.App.DelegationKeeper.AssociateOperatorWithStaker(suite.Ctx, suite.clientChainLzID, operators[i], stakers[i].Bytes()) + suite.NoError(err) + // deposit assets + suite.prepareDeposit(stakers[i], usdtAddr, depositAmount) + // delegate assets + suite.prepareDelegation(true, stakers[i], usdtAddr, operators[i], delegateAmount) + // opt in + err = suite.App.OperatorKeeper.OptIn(suite.Ctx, operators[i], suite.avsAddr) + suite.NoError(err) + } + sort.Slice(stakers, func(i, j int) bool { + return operators[i].String() < operators[j].String() + }) + sort.Slice(operators, func(i, j int) bool { + return operators[i].String() < operators[j].String() + }) + + return testHelperInfo{ + depositAmount: depositAmount, + delegateAmount: delegateAmount, + operators: operators, + stakers: stakers, + } +} + +func (suite *OperatorTestSuite) runToEpochEnd() { + // the default AVS epoch identifier is hour + // Configure 3 blocks per epoch for testing, so the block duration is 20 minutes + // so starting from the initial block of the epoch, it takes three blocks to + // reach the epoch’s end block. + for i := int64(0); i < blockNumberPerEpoch; i++ { + suite.CommitAfter(time.Hour / time.Duration(blockNumberPerEpoch)) + } +} + +func (suite *OperatorTestSuite) printAllSnapshot() { + epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.HourEpochID) + suite.True(found) + fmt.Println("epoch", epochInfo.CurrentEpoch, "startHeight", epochInfo.CurrentEpochStartHeight) + opFunc := func(height int64, snapshot *types.VotingPowerSnapshot) error { + fmt.Println("snapshot height is：", height) + bytes, err := json.MarshalIndent(snapshot, " ", " ") + suite.NoError(err) + fmt.Println(string(bytes)) + return nil + } + err := suite.App.OperatorKeeper.IterateVotingPowerSnapshot(suite.Ctx, suite.avsAddr, false, opFunc) + suite.NoError(err) +} + +func (suite *OperatorTestSuite) TestInitializeSnapshot() { + helperInfo := suite.prepareForSnapshotTesting(operatorNumber) + suite.runToEpochEnd() + epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.HourEpochID) + suite.True(found) + // the height in the snapshot key should be the start height of next epoch. + snapshotHeight, snapshot, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, epochInfo.CurrentEpochStartHeight) + suite.NoError(err) + suite.Equal(epochInfo.CurrentEpochStartHeight, snapshotHeight) + avsUSDValue, err := suite.App.OperatorKeeper.GetAVSUSDValue(suite.Ctx, suite.avsAddr) + suite.NoError(err) + suite.Equal(avsUSDValue, snapshot.TotalVotingPower) + + expectedVotingPowerSet := make([]*types.OperatorVotingPower, operatorNumber) + for i := 0; i < operatorNumber; i++ { + expectedVotingPowerSet[i] = &types.OperatorVotingPower{ + OperatorAddr: helperInfo.operators[i].String(), + VotingPower: avsUSDValue.Quo(sdkmath.LegacyNewDec(int64(operatorNumber))), + } + } + expectedSnapshot := types.VotingPowerSnapshot{ + TotalVotingPower: avsUSDValue, + VotingPowerSet: expectedVotingPowerSet, + LastChangedHeight: epochInfo.CurrentEpochStartHeight, + EpochIdentifier: epochInfo.Identifier, + EpochNumber: epochInfo.CurrentEpoch, + BlockTime: suite.Ctx.BlockTime(), + } + suite.Equal(expectedSnapshot, *snapshot) + + snapshotHelper, err := suite.App.OperatorKeeper.GetSnapshotHelper(suite.Ctx, suite.avsAddr) + suite.NoError(err) + suite.Equal(types.SnapshotHelper{ + LastChangedHeight: snapshot.LastChangedHeight, + }, snapshotHelper) + + _, _, err = suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, epochInfo.CurrentEpochStartHeight-1) + suite.Error(err) +} + +func (suite *OperatorTestSuite) TestSnapshotVPUnchanged() { + suite.prepareForSnapshotTesting(operatorNumber) + suite.runToEpochEnd() + lastChangeHeight := suite.Ctx.BlockHeight() + _, initialSnapshot, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, lastChangeHeight) + suite.NoError(err) + runToEpochNumber := 2 + + for i := 0; i < runToEpochNumber; i++ { + suite.runToEpochEnd() + epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.HourEpochID) + suite.True(found) + startHeight := epochInfo.CurrentEpochStartHeight + endHeight := startHeight + blockNumberPerEpoch - 1 + for j := startHeight; j <= endHeight; j++ { + snapshotKeyLastHeight, snapshot, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, j) + suite.NoError(err) + suite.Equal(startHeight, snapshotKeyLastHeight) + suite.Equal(initialSnapshot, snapshot) + + snapshotHelper, err := suite.App.OperatorKeeper.GetSnapshotHelper(suite.Ctx, suite.avsAddr) + suite.NoError(err) + suite.Equal(types.SnapshotHelper{ + LastChangedHeight: snapshot.LastChangedHeight, + }, snapshotHelper) + + if j != startHeight { + key := types.KeyForVotingPowerSnapshot(suite.assetAddr, j) + _, err = suite.App.OperatorKeeper.GetVotingPowerSnapshot(suite.Ctx, key) + suite.Error(err) + } + } + } +} + +func (suite *OperatorTestSuite) TestSnapshotVPChanged() { + testHelper := suite.prepareForSnapshotTesting(operatorNumber) + suite.runToEpochEnd() + _, initialSnapshot, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) + suite.NoError(err) + + // change the voting power of the operator at index 0. + index := 0 + suite.prepareDelegation(true, testHelper.stakers[index], usdtAddr, testHelper.operators[index], testHelper.delegateAmount) + suite.runToEpochEnd() + _, snapshotAfterUpdate, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) + suite.NoError(err) + + addVotingPower := initialSnapshot.VotingPowerSet[index].VotingPower + expectedTotalVotingPower := initialSnapshot.TotalVotingPower.Add(addVotingPower) + expectedVotingPowerSet := initialSnapshot.VotingPowerSet + expectedVotingPowerSet[index].VotingPower = expectedVotingPowerSet[index].VotingPower.Add(addVotingPower) + suite.Equal(expectedTotalVotingPower, snapshotAfterUpdate.TotalVotingPower) + suite.Equal(expectedVotingPowerSet, snapshotAfterUpdate.VotingPowerSet) + suite.Equal(initialSnapshot.EpochNumber+1, snapshotAfterUpdate.EpochNumber) +} + +func (suite *OperatorTestSuite) TestSnapshotWithOptOut() { + testHelper := suite.prepareForSnapshotTesting(operatorNumber) + suite.runToEpochEnd() + + // opt out if the index of operator is 0. + index := 0 + err := suite.App.OperatorKeeper.OptOut(suite.Ctx, testHelper.operators[index], suite.avsAddr) + suite.NoError(err) + snapshotHelper, err := suite.App.OperatorKeeper.GetSnapshotHelper(suite.Ctx, suite.avsAddr) + suite.NoError(err) + suite.True(snapshotHelper.HasOptOut) + + suite.runToEpochEnd() + _, snapshot, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) + suite.NoError(err) + suite.Equal(operatorNumber-1, len(snapshot.VotingPowerSet)) + votingPower := types.GetSpecifiedVotingPower(testHelper.operators[index].String(), snapshot.VotingPowerSet) + suite.Nil(votingPower) + + snapshotHelper, err = suite.App.OperatorKeeper.GetSnapshotHelper(suite.Ctx, suite.avsAddr) + suite.NoError(err) + suite.False(snapshotHelper.HasOptOut) + + // opt all operators out of the AVS. + for i := index + 1; i < operatorNumber; i++ { + err = suite.App.OperatorKeeper.OptOut(suite.Ctx, testHelper.operators[i], suite.avsAddr) + suite.NoError(err) + } + suite.runToEpochEnd() + _, snapshot, err = suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) + suite.NoError(err) + suite.Equal(suite.Ctx.BlockHeight(), snapshot.LastChangedHeight) + suite.Equal(0, len(snapshot.VotingPowerSet)) + for i := 0; i < operatorNumber; i++ { + votingPower = types.GetSpecifiedVotingPower(testHelper.operators[i].String(), snapshot.VotingPowerSet) + suite.Nil(votingPower) + } + suite.runToEpochEnd() + key := types.KeyForVotingPowerSnapshot(common.HexToAddress(suite.avsAddr), suite.Ctx.BlockHeight()) + _, err = suite.App.OperatorKeeper.GetVotingPowerSnapshot(suite.Ctx, key) + suite.Error(err) +} + +func (suite *OperatorTestSuite) TestSnapshotWithSlash() { + testHelper := suite.prepareForSnapshotTesting(operatorNumber) + suite.runToEpochEnd() + _, snapshotBeforeSlash, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) + suite.NoError(err) + // run to next block to execute slashing + index := 0 + suite.CommitAfter(time.Hour / time.Duration(blockNumberPerEpoch)) + slashProportion := sdkmath.LegacyMustNewDecFromStr("0.1") + remainingProportion := sdkmath.LegacyNewDec(1).Sub(slashProportion) + slashParam := &types.SlashInputInfo{ + IsDogFood: false, + Power: 0, + SlashType: 0, + Operator: testHelper.operators[index], + AVSAddr: suite.avsAddr, + SlashID: "testSlashID", + SlashEventHeight: suite.Ctx.BlockHeight(), + SlashProportion: slashProportion, + } + err = suite.App.OperatorKeeper.Slash(suite.Ctx, slashParam) + suite.NoError(err) + _, snapshotAfterSlash, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) + suite.NoError(err) + suite.Equal(suite.Ctx.BlockHeight(), snapshotAfterSlash.LastChangedHeight) + operatorVPBeforeSlash := types.GetSpecifiedVotingPower(testHelper.operators[index].String(), snapshotBeforeSlash.VotingPowerSet) + operatorVPAfterSlash := types.GetSpecifiedVotingPower(testHelper.operators[index].String(), snapshotAfterSlash.VotingPowerSet) + suite.Equal(operatorVPBeforeSlash.VotingPower.Mul(remainingProportion), operatorVPAfterSlash.VotingPower) + + snapshotHelper, err := suite.App.OperatorKeeper.GetSnapshotHelper(suite.Ctx, suite.avsAddr) + suite.NoError(err) + suite.True(snapshotHelper.HasSlash) + suite.Equal(suite.Ctx.BlockHeight(), snapshotHelper.LastChangedHeight) +} + +func (suite *OperatorTestSuite) TestSnapshotPruning() { + testHelper := suite.prepareForSnapshotTesting(operatorNumber) + suite.runToEpochEnd() + firstSnapshotHeight := suite.Ctx.BlockHeight() + + avsUnbondingDuration, err := suite.App.AVSManagerKeeper.GetAVSUnbondingDuration(suite.Ctx, suite.avsAddr) + suite.NoError(err) + + runEpochNumber := avsUnbondingDuration + 2 + for i := uint64(0); i < runEpochNumber; i++ { + suite.runToEpochEnd() + } + _, _, err = suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, firstSnapshotHeight) + suite.NoError(err) + + key := types.KeyForVotingPowerSnapshot(common.HexToAddress(suite.avsAddr), firstSnapshotHeight+blockNumberPerEpoch) + _, err = suite.App.OperatorKeeper.GetVotingPowerSnapshot(suite.Ctx, key) + suite.Error(err) + + // change the voting power of the operator at index 0. + index := 0 + suite.prepareDelegation(true, testHelper.stakers[index], usdtAddr, testHelper.operators[index], testHelper.delegateAmount) + for i := uint64(0); i < runEpochNumber; i++ { + suite.runToEpochEnd() + } + key = types.KeyForVotingPowerSnapshot(common.HexToAddress(suite.avsAddr), firstSnapshotHeight) + _, err = suite.App.OperatorKeeper.GetVotingPowerSnapshot(suite.Ctx, key) + suite.Error(err) +} diff --git a/x/operator/types/keys.go b/x/operator/types/keys.go index 273c77563..005d9e97a 100644 --- a/x/operator/types/keys.go +++ b/x/operator/types/keys.go @@ -1,8 +1,11 @@ package types import ( + "encoding/binary" "math" + "github.com/ExocoreNetwork/exocore/utils" + "golang.org/x/xerrors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -158,6 +161,24 @@ func KeyForOperatorAndChainIDToConsKey(addr sdk.AccAddress, chainID string) []by ) } +func KeyForVotingPowerSnapshot(avs common.Address, height int64) []byte { + return AppendMany( + avs.Bytes(), + // Append the height + utils.EncodeHeightBytes(uint64(height)), + ) +} + +func ParseVotingPowerSnapshotKey(key []byte) (string, int64, error) { + if len(key) != common.AddressLength+ByteLengthForUint64 { + return "", 0, xerrors.Errorf("invalid snapshot key length,expected:%d,got:%d", common.AddressLength+ByteLengthForUint64, len(key)) + } + avsAddr := common.Address(key[:common.AddressLength]) + height := binary.BigEndian.Uint64(key[common.AddressLength:]) + // #nosec G115 + return avsAddr.String(), int64(height), nil +} + func ParseKeyForOperatorAndChainIDToConsKey(key []byte) (addr sdk.AccAddress, chainID string, err error) { if len(key) < AccAddressLength+ByteLengthForUint64 { return nil, "", xerrors.New("key length is too short to contain address and chainID length") From 15ab1896406955d9069e73724753705e811c8941 Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Tue, 29 Oct 2024 20:59:14 +0800 Subject: [PATCH 07/12] fix the issues identified by code comment --- proto/exocore/operator/v1/tx.proto | 2 +- x/avs/keeper/keeper.go | 11 +- x/operator/keeper/abci.go | 11 +- x/operator/keeper/slash.go | 4 +- x/operator/keeper/voting_power_snapshot.go | 13 +- .../keeper/voting_power_snapshot_test.go | 30 +-- x/operator/types/tx.pb.go | 252 +++++++++--------- 7 files changed, 164 insertions(+), 159 deletions(-) diff --git a/proto/exocore/operator/v1/tx.proto b/proto/exocore/operator/v1/tx.proto index e75d6c2a6..07be5203e 100644 --- a/proto/exocore/operator/v1/tx.proto +++ b/proto/exocore/operator/v1/tx.proto @@ -73,7 +73,7 @@ message VotingPowerSnapshot { ]; // operator_voting_powers records the active voting power of all operators // for the specified AVS - repeated OperatorVotingPower voting_power_set = 2; + repeated OperatorVotingPower operator_voting_powers = 2; // last_changed_height is used to indicate the height of most recent change when // the voting_power_set is nil, which can help to fall back to the correct epoch height. int64 last_changed_height = 3; diff --git a/x/avs/keeper/keeper.go b/x/avs/keeper/keeper.go index 45e85e3cc..603440170 100644 --- a/x/avs/keeper/keeper.go +++ b/x/avs/keeper/keeper.go @@ -385,14 +385,11 @@ func (k Keeper) IterateAVSInfo(ctx sdk.Context, fn func(index int64, avsInfo typ } func (k Keeper) GetAVSEpochInfo(ctx sdk.Context, addr string) (*epochstypes.EpochInfo, error) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixAVSInfo) - value := store.Get(common.HexToAddress(addr).Bytes()) - if value == nil { - return nil, types.ErrNoKeyInTheStore.Wrapf("GetAVSInfo: key is %s", addr) + avsInfoResp, err := k.GetAVSInfo(ctx, addr) + if err != nil { + return nil, err } - avsInfo := types.AVSInfo{} - k.cdc.MustUnmarshal(value, &avsInfo) - + avsInfo := avsInfoResp.Info epochInfo, found := k.epochsKeeper.GetEpochInfo(ctx, avsInfo.EpochIdentifier) if !found { return nil, types.ErrEpochNotFound.Wrapf("epoch info not found %s", avsInfo.EpochIdentifier) diff --git a/x/operator/keeper/abci.go b/x/operator/keeper/abci.go index 4f96ad148..9485f8890 100644 --- a/x/operator/keeper/abci.go +++ b/x/operator/keeper/abci.go @@ -24,7 +24,7 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str // set the voting power to zero if an error is returned, which may prevent malicious behavior // where errors are intentionally triggered to avoid updating the voting power. if getAssetsErr != nil || assets == nil || getSelfDelegationErr != nil { - ctx.Logger().Info("UpdateVotingPower the assets list supported by AVS is nil or can't get AVS info", "getAssetsErr", getAssetsErr, "getSelfDelegationErr", getSelfDelegationErr) + ctx.Logger().Error("UpdateVotingPower the assets list supported by AVS is nil or can't get AVS info", "getAssetsErr", getAssetsErr, "getSelfDelegationErr", getSelfDelegationErr) // using cache context to ensure the atomicity of the operation. cc, writeFunc := ctx.CacheContext() // clear the voting power regarding this AVS if there isn't any assets supported by it. @@ -118,7 +118,7 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str // When the snapshot helper does not exist, it represents the initial state of AVS, // where no snapshot information has been stored. Therefore, it is necessary to store // both the snapshot and the helper information. - var snapshotHelper operatortypes.SnapshotHelper + snapshotHelper := operatortypes.SnapshotHelper{} if !k.HasSnapshotHelper(cc, avsAddr) { isSnapshotChanged = true } else { @@ -154,7 +154,7 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str isSetSnapshot := true if snapshotHelper.HasOptOut || isSnapshotChanged { votingPowerSnapshot.TotalVotingPower = avsVotingPower - votingPowerSnapshot.VotingPowerSet = votingPowerSet + votingPowerSnapshot.OperatorVotingPowers = votingPowerSet snapshotHelper.LastChangedHeight = snapshotHeight // clear the hasOptOut flag if it's certain that the snapshot will be updated snapshotHelper.HasOptOut = false @@ -193,9 +193,12 @@ func (k *Keeper) ClearVotingPowerSnapshot(ctx sdk.Context, avs string) error { } clearTime := ctx.BlockTime().Add(-epochInfo.Duration * time.Duration(unbondingDuration)) + if clearTime.After(ctx.BlockTime()) { + return operatortypes.ErrFailToClearVPSnapshot.Wrapf("ClearVotingPowerSnapshot: clearTime %s is in the future", clearTime) + } err = k.RemoveVotingPowerSnapshot(ctx, avs, clearTime) if err != nil { - ctx.Logger().Error("Failed to get the avs epoch information", "avs", avs, "error", err) + ctx.Logger().Error("Failed to remove voting power snapshot", "avs", avs, "error", err) return operatortypes.ErrFailToClearVPSnapshot.Wrapf("ClearVotingPowerSnapshot: failed to remove voting power snapshot, err:%s, avs:%s", err, avs) } return nil diff --git a/x/operator/keeper/slash.go b/x/operator/keeper/slash.go index ea7c23469..8e50cca2e 100644 --- a/x/operator/keeper/slash.go +++ b/x/operator/keeper/slash.go @@ -159,13 +159,13 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { } // get the historical voting power from the snapshot for the other AVSs if !parameter.IsDogFood { - votingPower := types.GetSpecifiedVotingPower(parameter.Operator.String(), snapshot.VotingPowerSet) + votingPower := types.GetSpecifiedVotingPower(parameter.Operator.String(), snapshot.OperatorVotingPowers) if votingPower == nil { return types.ErrFailToGetHistoricalVP.Wrapf("slash: the operator isn't in the voting power set, addr:%s", parameter.Operator) } parameter.Power = votingPower.VotingPower.TruncateInt64() if parameter.Power < 0 { - return types.ErrInvalidSlashPower.Wrapf("slash: valid voting power, the power is:%v", parameter.Power) + return types.ErrInvalidSlashPower.Wrapf("slash: invalid voting power, power:%v", parameter.Power) } } if parameter.Power == 0 { diff --git a/x/operator/keeper/voting_power_snapshot.go b/x/operator/keeper/voting_power_snapshot.go index 37d746fde..481ffe20f 100644 --- a/x/operator/keeper/voting_power_snapshot.go +++ b/x/operator/keeper/voting_power_snapshot.go @@ -22,7 +22,11 @@ func (k *Keeper) GetVotingPowerSnapshot(ctx sdk.Context, key []byte) (*types.Vot var ret types.VotingPowerSnapshot value := store.Get(key) if value == nil { - return nil, types.ErrNoKeyInTheStore.Wrapf("GetVotingPowerSnapshot: key is %s", key) + avsAddr, height, err := types.ParseVotingPowerSnapshotKey(key) + if err != nil { + return nil, err + } + return nil, types.ErrNoKeyInTheStore.Wrapf("GetVotingPowerSnapshot: invalid key, avs:%s height:%v", avsAddr, height) } k.cdc.MustUnmarshal(value, &ret) return &ret, nil @@ -154,7 +158,7 @@ func (k *Keeper) UpdateSnapshotHelper(ctx sdk.Context, avsAddr string, opFunc fu func (k *Keeper) SetOptOutFlag(ctx sdk.Context, avsAddr string, hasOptOut bool) error { opFunc := func(helper *types.SnapshotHelper) error { helper.HasOptOut = hasOptOut - return nil + return nil // Reserve for future error handling } return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) } @@ -162,7 +166,7 @@ func (k *Keeper) SetOptOutFlag(ctx sdk.Context, avsAddr string, hasOptOut bool) func (k *Keeper) SetSlashFlag(ctx sdk.Context, avsAddr string, hasSlash bool) error { opFunc := func(helper *types.SnapshotHelper) error { helper.HasSlash = hasSlash - return nil + return nil // Reserve for future error handling } return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) } @@ -170,7 +174,7 @@ func (k *Keeper) SetSlashFlag(ctx sdk.Context, avsAddr string, hasSlash bool) er func (k *Keeper) SetLastChangedHeight(ctx sdk.Context, avsAddr string, lastChangeHeight int64) error { opFunc := func(helper *types.SnapshotHelper) error { helper.LastChangedHeight = lastChangeHeight - return nil + return nil // Reserve for future error handling } return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) } @@ -201,6 +205,7 @@ func (k *Keeper) HasSnapshotHelper(ctx sdk.Context, avsAddr string) bool { func (k *Keeper) HasSlash(ctx sdk.Context, avsAddr string) bool { helper, err := k.GetSnapshotHelper(ctx, avsAddr) if err != nil { + ctx.Logger().Error("Failed to get SnapshotHelper in HasSlash", "avsAddr", avsAddr, "error", err) return false } return helper.HasSlash diff --git a/x/operator/keeper/voting_power_snapshot_test.go b/x/operator/keeper/voting_power_snapshot_test.go index 4c0ac9fad..3ed406d58 100644 --- a/x/operator/keeper/voting_power_snapshot_test.go +++ b/x/operator/keeper/voting_power_snapshot_test.go @@ -118,12 +118,12 @@ func (suite *OperatorTestSuite) TestInitializeSnapshot() { } } expectedSnapshot := types.VotingPowerSnapshot{ - TotalVotingPower: avsUSDValue, - VotingPowerSet: expectedVotingPowerSet, - LastChangedHeight: epochInfo.CurrentEpochStartHeight, - EpochIdentifier: epochInfo.Identifier, - EpochNumber: epochInfo.CurrentEpoch, - BlockTime: suite.Ctx.BlockTime(), + TotalVotingPower: avsUSDValue, + OperatorVotingPowers: expectedVotingPowerSet, + LastChangedHeight: epochInfo.CurrentEpochStartHeight, + EpochIdentifier: epochInfo.Identifier, + EpochNumber: epochInfo.CurrentEpoch, + BlockTime: suite.Ctx.BlockTime(), } suite.Equal(expectedSnapshot, *snapshot) @@ -185,12 +185,12 @@ func (suite *OperatorTestSuite) TestSnapshotVPChanged() { _, snapshotAfterUpdate, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) suite.NoError(err) - addVotingPower := initialSnapshot.VotingPowerSet[index].VotingPower + addVotingPower := initialSnapshot.OperatorVotingPowers[index].VotingPower expectedTotalVotingPower := initialSnapshot.TotalVotingPower.Add(addVotingPower) - expectedVotingPowerSet := initialSnapshot.VotingPowerSet + expectedVotingPowerSet := initialSnapshot.OperatorVotingPowers expectedVotingPowerSet[index].VotingPower = expectedVotingPowerSet[index].VotingPower.Add(addVotingPower) suite.Equal(expectedTotalVotingPower, snapshotAfterUpdate.TotalVotingPower) - suite.Equal(expectedVotingPowerSet, snapshotAfterUpdate.VotingPowerSet) + suite.Equal(expectedVotingPowerSet, snapshotAfterUpdate.OperatorVotingPowers) suite.Equal(initialSnapshot.EpochNumber+1, snapshotAfterUpdate.EpochNumber) } @@ -209,8 +209,8 @@ func (suite *OperatorTestSuite) TestSnapshotWithOptOut() { suite.runToEpochEnd() _, snapshot, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) suite.NoError(err) - suite.Equal(operatorNumber-1, len(snapshot.VotingPowerSet)) - votingPower := types.GetSpecifiedVotingPower(testHelper.operators[index].String(), snapshot.VotingPowerSet) + suite.Equal(operatorNumber-1, len(snapshot.OperatorVotingPowers)) + votingPower := types.GetSpecifiedVotingPower(testHelper.operators[index].String(), snapshot.OperatorVotingPowers) suite.Nil(votingPower) snapshotHelper, err = suite.App.OperatorKeeper.GetSnapshotHelper(suite.Ctx, suite.avsAddr) @@ -226,9 +226,9 @@ func (suite *OperatorTestSuite) TestSnapshotWithOptOut() { _, snapshot, err = suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) suite.NoError(err) suite.Equal(suite.Ctx.BlockHeight(), snapshot.LastChangedHeight) - suite.Equal(0, len(snapshot.VotingPowerSet)) + suite.Equal(0, len(snapshot.OperatorVotingPowers)) for i := 0; i < operatorNumber; i++ { - votingPower = types.GetSpecifiedVotingPower(testHelper.operators[i].String(), snapshot.VotingPowerSet) + votingPower = types.GetSpecifiedVotingPower(testHelper.operators[i].String(), snapshot.OperatorVotingPowers) suite.Nil(votingPower) } suite.runToEpochEnd() @@ -262,8 +262,8 @@ func (suite *OperatorTestSuite) TestSnapshotWithSlash() { _, snapshotAfterSlash, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) suite.NoError(err) suite.Equal(suite.Ctx.BlockHeight(), snapshotAfterSlash.LastChangedHeight) - operatorVPBeforeSlash := types.GetSpecifiedVotingPower(testHelper.operators[index].String(), snapshotBeforeSlash.VotingPowerSet) - operatorVPAfterSlash := types.GetSpecifiedVotingPower(testHelper.operators[index].String(), snapshotAfterSlash.VotingPowerSet) + operatorVPBeforeSlash := types.GetSpecifiedVotingPower(testHelper.operators[index].String(), snapshotBeforeSlash.OperatorVotingPowers) + operatorVPAfterSlash := types.GetSpecifiedVotingPower(testHelper.operators[index].String(), snapshotAfterSlash.OperatorVotingPowers) suite.Equal(operatorVPBeforeSlash.VotingPower.Mul(remainingProportion), operatorVPAfterSlash.VotingPower) snapshotHelper, err := suite.App.OperatorKeeper.GetSnapshotHelper(suite.Ctx, suite.avsAddr) diff --git a/x/operator/types/tx.pb.go b/x/operator/types/tx.pb.go index d49142f66..3305a20e7 100644 --- a/x/operator/types/tx.pb.go +++ b/x/operator/types/tx.pb.go @@ -210,7 +210,7 @@ type VotingPowerSnapshot struct { TotalVotingPower github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=total_voting_power,json=totalVotingPower,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"total_voting_power"` // operator_voting_powers records the active voting power of all operators // for the specified AVS - VotingPowerSet []*OperatorVotingPower `protobuf:"bytes,2,rep,name=voting_power_set,json=votingPowerSet,proto3" json:"voting_power_set,omitempty"` + OperatorVotingPowers []*OperatorVotingPower `protobuf:"bytes,2,rep,name=operator_voting_powers,json=operatorVotingPowers,proto3" json:"operator_voting_powers,omitempty"` // last_changed_height is used to indicate the height of most recent change when // the voting_power_set is nil, which can help to fall back to the correct epoch height. LastChangedHeight int64 `protobuf:"varint,3,opt,name=last_changed_height,json=lastChangedHeight,proto3" json:"last_changed_height,omitempty"` @@ -257,9 +257,9 @@ func (m *VotingPowerSnapshot) XXX_DiscardUnknown() { var xxx_messageInfo_VotingPowerSnapshot proto.InternalMessageInfo -func (m *VotingPowerSnapshot) GetVotingPowerSet() []*OperatorVotingPower { +func (m *VotingPowerSnapshot) GetOperatorVotingPowers() []*OperatorVotingPower { if m != nil { - return m.VotingPowerSet + return m.OperatorVotingPowers } return nil } @@ -1275,121 +1275,121 @@ func init() { func init() { proto.RegisterFile("exocore/operator/v1/tx.proto", fileDescriptor_b229d5663e4df167) } var fileDescriptor_b229d5663e4df167 = []byte{ - // 1818 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x52, 0xb4, 0x4d, 0x3e, 0x7e, 0x6a, 0xe4, 0x0f, 0x9a, 0x71, 0x45, 0x7b, 0x53, 0xdb, - 0xb2, 0x5b, 0x91, 0xb0, 0xd2, 0x14, 0x88, 0xdb, 0x02, 0xd5, 0x97, 0x61, 0x36, 0x32, 0x29, 0x2c, - 0x25, 0x03, 0x4d, 0x51, 0x2c, 0x56, 0xcb, 0x11, 0xb9, 0xd6, 0x72, 0x67, 0xbb, 0x33, 0x64, 0xa4, - 0x00, 0x05, 0x8a, 0x9c, 0x82, 0xa2, 0x87, 0x00, 0xb9, 0xb4, 0x68, 0x0f, 0x3e, 0x15, 0x3d, 0xfa, - 0x90, 0x1e, 0x8b, 0xb6, 0xb7, 0x1c, 0x03, 0xb7, 0x87, 0xa2, 0x07, 0xa5, 0x90, 0x0b, 0xb8, 0x7f, - 0x44, 0x0b, 0x14, 0xf3, 0x76, 0x96, 0x5a, 0x3a, 0xa4, 0x6c, 0xc1, 0x4a, 0x2e, 0x92, 0xe6, 0xbd, - 0x37, 0xef, 0xfd, 0xde, 0xf7, 0xac, 0xe0, 0x0a, 0xdd, 0x63, 0x36, 0x0b, 0x68, 0x8d, 0xf9, 0x34, - 0xb0, 0x04, 0x0b, 0x6a, 0x83, 0x3b, 0x35, 0xb1, 0x57, 0xf5, 0x03, 0x26, 0x18, 0x99, 0x55, 0xdc, - 0x6a, 0xc4, 0xad, 0x0e, 0xee, 0x94, 0x67, 0xac, 0x9e, 0xe3, 0xb1, 0x1a, 0xfe, 0x0c, 0xe5, 0xca, - 0x97, 0x6c, 0xc6, 0x7b, 0x8c, 0xd7, 0x7a, 0xbc, 0x23, 0xef, 0xf7, 0x78, 0x47, 0x31, 0xbe, 0xa9, - 0x18, 0x5c, 0x58, 0xbb, 0x8e, 0x27, 0x99, 0xdb, 0x54, 0x58, 0x77, 0xa2, 0xb3, 0x92, 0xba, 0x1c, - 0x4a, 0x99, 0x78, 0xaa, 0x85, 0x07, 0xc5, 0x3a, 0xdf, 0x61, 0x1d, 0x16, 0xd2, 0xe5, 0x5f, 0x8a, - 0x7a, 0xa5, 0xc3, 0x58, 0xc7, 0xa5, 0x35, 0xcb, 0x77, 0x6a, 0x96, 0xe7, 0x31, 0x61, 0x09, 0x87, - 0x79, 0xd1, 0x9d, 0x8a, 0xe2, 0xe2, 0x69, 0xbb, 0xbf, 0x53, 0x13, 0x4e, 0x8f, 0x72, 0x61, 0xf5, - 0xfc, 0x50, 0x40, 0xa7, 0x90, 0x5b, 0xa5, 0xf6, 0x43, 0xcb, 0xed, 0xd3, 0x7b, 0x0e, 0x75, 0xdb, - 0x64, 0x13, 0xce, 0x5a, 0x3d, 0xd6, 0xf7, 0x44, 0x49, 0xbb, 0xaa, 0xcd, 0xa7, 0x97, 0xbf, 0xff, - 0xd9, 0x41, 0x65, 0xea, 0x9f, 0x07, 0x95, 0x1b, 0x1d, 0x47, 0x74, 0xfb, 0xdb, 0x55, 0x9b, 0xf5, - 0x14, 0x2c, 0xf5, 0x6b, 0x81, 0xb7, 0x77, 0x6b, 0x62, 0xdf, 0xa7, 0xbc, 0xba, 0x4a, 0xed, 0xa7, - 0x9f, 0x2e, 0x80, 0x42, 0xbd, 0x4a, 0x6d, 0x43, 0xe9, 0xd2, 0xff, 0x9b, 0x80, 0x0b, 0x4d, 0x15, - 0xb8, 0xa6, 0x2f, 0x68, 0x7b, 0xab, 0xb5, 0x8a, 0x46, 0x49, 0x00, 0x79, 0x4e, 0xdd, 0x1d, 0xb3, - 0xcf, 0xdb, 0xe6, 0x40, 0x52, 0x94, 0xdd, 0xf5, 0x93, 0xd9, 0x3d, 0x3c, 0xa8, 0x64, 0x5b, 0xd4, - 0xdd, 0x89, 0xf4, 0xbe, 0x80, 0x23, 0x2b, 0x6d, 0x6c, 0xf1, 0x76, 0x68, 0xb3, 0x0f, 0x05, 0xc1, - 0x84, 0xe5, 0xc6, 0x8c, 0x26, 0xd0, 0xe8, 0x83, 0x13, 0x1b, 0xcd, 0x6d, 0x4a, 0x45, 0x13, 0xac, - 0xe6, 0xd0, 0xca, 0xd0, 0xec, 0x1e, 0x14, 0x2d, 0x5b, 0x38, 0x03, 0x1a, 0xb3, 0x3b, 0x8d, 0x76, - 0x1b, 0x27, 0xb6, 0x9b, 0x5f, 0x42, 0x4d, 0x13, 0x0c, 0xe7, 0x43, 0x3b, 0x91, 0x65, 0xfd, 0x8f, - 0x1a, 0xcc, 0x46, 0xe1, 0x7f, 0xc8, 0x84, 0xe3, 0x75, 0x36, 0xd8, 0xfb, 0x34, 0x20, 0x3f, 0x80, - 0x5c, 0x54, 0xce, 0xa6, 0xd5, 0x6e, 0x07, 0x2a, 0xf6, 0xa5, 0xa7, 0x9f, 0x2e, 0x9c, 0x57, 0xea, - 0x96, 0xda, 0xed, 0x80, 0x72, 0xde, 0x12, 0x81, 0xe3, 0x75, 0x8c, 0x6c, 0x24, 0x2e, 0xc9, 0xc4, - 0x84, 0xec, 0x00, 0xb5, 0x99, 0xbe, 0x54, 0xa7, 0x82, 0xf8, 0x7a, 0x15, 0x93, 0x19, 0x1c, 0xe1, - 0xd3, 0x7f, 0x3d, 0x0d, 0xb3, 0x31, 0xbc, 0x2d, 0xcf, 0xf2, 0x79, 0x97, 0x09, 0xf2, 0x08, 0x48, - 0x98, 0xc0, 0x11, 0xf3, 0xa7, 0x51, 0xb0, 0x45, 0xd4, 0x1b, 0x8f, 0x91, 0x01, 0xc5, 0xb8, 0x15, - 0x93, 0x53, 0x51, 0x4a, 0x5c, 0x9d, 0x9e, 0xcf, 0x2c, 0xce, 0x57, 0xc7, 0xcc, 0x84, 0xea, 0x98, - 0x38, 0x1b, 0xf9, 0x98, 0x53, 0x2d, 0x2a, 0x48, 0x15, 0x66, 0x5d, 0x8b, 0x0b, 0xd3, 0xee, 0x5a, - 0x5e, 0x87, 0xb6, 0xcd, 0x2e, 0x75, 0x3a, 0x5d, 0x81, 0xc5, 0x30, 0x6d, 0xcc, 0x48, 0xd6, 0x4a, - 0xc8, 0xb9, 0x8f, 0x0c, 0x72, 0x0b, 0x8a, 0xd4, 0x67, 0x76, 0xd7, 0x74, 0xda, 0xd4, 0x13, 0xce, - 0x8e, 0x43, 0x83, 0x52, 0x52, 0x7a, 0x6b, 0x14, 0x90, 0x5e, 0x1f, 0x92, 0xc9, 0x35, 0xc8, 0x86, - 0xa2, 0x5e, 0xbf, 0xb7, 0x4d, 0x83, 0xd2, 0x19, 0xd4, 0x99, 0x41, 0x5a, 0x03, 0x49, 0x64, 0x05, - 0x60, 0xdb, 0x65, 0xf6, 0xae, 0x29, 0x87, 0x41, 0xe9, 0xec, 0x55, 0x6d, 0x3e, 0xb3, 0x58, 0xae, - 0x86, 0x93, 0xa2, 0x1a, 0x4d, 0x8a, 0xea, 0x66, 0x34, 0x29, 0x96, 0x53, 0x32, 0xa2, 0x1f, 0x7f, - 0x51, 0xd1, 0x8c, 0x34, 0xde, 0x93, 0x1c, 0xfd, 0xe7, 0x90, 0x8f, 0xd2, 0x71, 0x9f, 0xba, 0x3e, - 0x0d, 0x26, 0x39, 0xa5, 0x4d, 0x72, 0x6a, 0x0e, 0x32, 0x5d, 0x8b, 0x9b, 0xcc, 0x17, 0x26, 0xeb, - 0x0b, 0x2c, 0x9e, 0x94, 0x91, 0xee, 0x5a, 0xbc, 0xe9, 0x8b, 0x66, 0x5f, 0x90, 0x37, 0x40, 0x1e, - 0x4c, 0xee, 0x5a, 0xbc, 0x8b, 0xa1, 0x49, 0x19, 0xa9, 0xae, 0xc5, 0x5b, 0xf2, 0xac, 0xef, 0x43, - 0x79, 0xc5, 0x75, 0xa8, 0x27, 0x75, 0x3a, 0xde, 0x9a, 0x15, 0x78, 0x8e, 0xd7, 0x91, 0x45, 0xb9, - 0xee, 0x70, 0x41, 0x7e, 0x02, 0x33, 0x34, 0x24, 0x99, 0x8e, 0xb7, 0xc3, 0x4c, 0xd7, 0xe1, 0x12, - 0x88, 0x4c, 0x5a, 0x6d, 0x6c, 0xd2, 0xc6, 0xeb, 0xaa, 0x7b, 0x3b, 0xcc, 0x28, 0x28, 0x4d, 0xf2, - 0x20, 0x95, 0xeb, 0xbf, 0xd1, 0x26, 0xd9, 0x96, 0x22, 0xe4, 0x87, 0x40, 0xdc, 0x0f, 0x4c, 0x1b, - 0x05, 0x64, 0x2c, 0x1c, 0xcf, 0x74, 0xda, 0x18, 0x85, 0xe4, 0xf2, 0xec, 0xe1, 0x41, 0xa5, 0xb0, - 0xfe, 0x41, 0xec, 0x76, 0x7d, 0xd5, 0x28, 0xb8, 0x23, 0x84, 0x36, 0x79, 0x07, 0x2e, 0x8f, 0x5c, - 0x8f, 0x5c, 0xc1, 0x0e, 0xc5, 0x1e, 0x33, 0x2e, 0xda, 0x63, 0x01, 0xe8, 0x7f, 0x4d, 0x40, 0x36, - 0x2a, 0x40, 0x44, 0xf3, 0x26, 0xe4, 0xd4, 0x75, 0x1e, 0xeb, 0x70, 0x23, 0x1b, 0x11, 0xb1, 0x8f, - 0xaf, 0x41, 0xd6, 0xf2, 0xfd, 0x80, 0x0d, 0x68, 0xdc, 0x46, 0x46, 0xd1, 0x50, 0xe4, 0xdb, 0x40, - 0x86, 0x93, 0xa2, 0x47, 0x85, 0x85, 0x71, 0x0d, 0xa7, 0x97, 0x51, 0x8c, 0x38, 0x0f, 0xa8, 0xb0, - 0xd0, 0xaa, 0x0b, 0xe5, 0x71, 0x1e, 0x28, 0x08, 0x49, 0xac, 0xb8, 0x93, 0x24, 0x42, 0xc6, 0xdd, - 0xb8, 0xf4, 0x65, 0x9f, 0x43, 0xf8, 0x0f, 0x00, 0x6c, 0xd6, 0xeb, 0x39, 0x9c, 0x3b, 0xcc, 0xc3, - 0x82, 0xcf, 0x2c, 0xea, 0x55, 0xd5, 0xd4, 0xd1, 0x7a, 0x55, 0xeb, 0xb6, 0xba, 0x32, 0x94, 0x5c, - 0x4e, 0xcb, 0xba, 0xfe, 0xc3, 0xf3, 0x27, 0xb7, 0x35, 0x23, 0xa6, 0x40, 0xff, 0x9d, 0x06, 0x69, - 0xdc, 0x51, 0xe8, 0xca, 0x75, 0xc8, 0x63, 0x05, 0x9a, 0x36, 0xf3, 0x44, 0x60, 0xd9, 0x6a, 0x2f, - 0x1a, 0x39, 0xa4, 0xae, 0x28, 0x22, 0xb9, 0x01, 0x05, 0x26, 0xef, 0x98, 0x8e, 0x17, 0x15, 0xbe, - 0x8c, 0x62, 0xd2, 0xc8, 0xb1, 0x50, 0x95, 0x2a, 0xfa, 0x79, 0x28, 0x86, 0x72, 0xac, 0x2f, 0xe2, - 0x6d, 0x9f, 0x34, 0xf2, 0x48, 0x6f, 0xf6, 0x85, 0x92, 0xbc, 0x08, 0x67, 0x1f, 0x59, 0x8e, 0x4b, - 0xdb, 0x18, 0xaf, 0x94, 0xa1, 0x4e, 0xfa, 0x9f, 0x34, 0x98, 0x51, 0xf0, 0x96, 0x38, 0xa7, 0xa2, - 0x25, 0x2c, 0x41, 0x5f, 0x6b, 0x6d, 0xd7, 0x3d, 0x11, 0x9b, 0x82, 0x75, 0x4f, 0x44, 0x6b, 0x9b, - 0x18, 0x70, 0x26, 0xbe, 0x1e, 0x5f, 0x6f, 0xb4, 0x86, 0xaa, 0xf4, 0xbf, 0x68, 0x70, 0x01, 0x7b, - 0xf8, 0x5e, 0xc0, 0x7a, 0x5b, 0x5e, 0x9b, 0xba, 0xb4, 0x83, 0x6f, 0x16, 0x72, 0x0b, 0xd2, 0x32, - 0x5b, 0x34, 0x88, 0x1a, 0x26, 0xbd, 0x9c, 0x3d, 0x3c, 0xa8, 0xa4, 0x5a, 0x48, 0xac, 0xaf, 0x1a, - 0xa9, 0x90, 0x5d, 0x6f, 0x93, 0x1b, 0x90, 0xb2, 0xa4, 0xf3, 0x52, 0x32, 0xc4, 0x96, 0x39, 0x3c, - 0xa8, 0x9c, 0xc3, 0x80, 0xd4, 0x57, 0x8d, 0x73, 0xc8, 0xac, 0xc7, 0x5f, 0x33, 0xd3, 0xa7, 0x17, - 0x16, 0xfd, 0x13, 0x0d, 0x66, 0x87, 0x2e, 0xa0, 0x4d, 0xbe, 0xc1, 0x98, 0x3b, 0x82, 0x4a, 0x7b, - 0x25, 0x54, 0x89, 0x53, 0x44, 0xf5, 0xdb, 0x69, 0x20, 0x88, 0x6a, 0x6d, 0x8f, 0xda, 0x7d, 0x19, - 0x51, 0x2c, 0xe0, 0x0e, 0x14, 0xc3, 0x02, 0xf6, 0x03, 0xe6, 0xb3, 0x40, 0xd2, 0x4f, 0x65, 0x53, - 0x16, 0x50, 0xeb, 0xc6, 0x50, 0x29, 0xf9, 0x29, 0x64, 0x42, 0x43, 0xa7, 0x57, 0x32, 0x80, 0x0a, - 0xc3, 0xd7, 0x93, 0x05, 0xb3, 0xa1, 0xfa, 0x7e, 0xac, 0x66, 0x78, 0x69, 0x1a, 0xa7, 0xfa, 0xed, - 0xb1, 0xc3, 0x64, 0x6c, 0x99, 0x2d, 0x27, 0x25, 0x24, 0x83, 0xa0, 0xb2, 0x38, 0x83, 0x93, 0xf7, - 0x60, 0x26, 0x34, 0x81, 0x89, 0xe2, 0xa6, 0xcf, 0x98, 0x5b, 0x4a, 0x1e, 0xb3, 0xeb, 0xc7, 0x14, - 0x81, 0x52, 0x1f, 0x46, 0xe7, 0x88, 0xac, 0xff, 0x2f, 0x21, 0xdb, 0x36, 0xbc, 0x8a, 0xd7, 0x4e, - 0x32, 0x5d, 0x6e, 0x41, 0x91, 0xf7, 0xb7, 0x7b, 0x8e, 0x10, 0x47, 0x7b, 0x35, 0x81, 0x7b, 0xb5, - 0x30, 0xa4, 0xab, 0xb1, 0x21, 0xf7, 0xff, 0x40, 0x4e, 0xde, 0x91, 0x37, 0x45, 0x06, 0x69, 0x4a, - 0xe4, 0x0d, 0x48, 0x3b, 0xdc, 0x1c, 0x50, 0xc1, 0x86, 0xc3, 0x25, 0xe5, 0xf0, 0x87, 0x78, 0x1e, - 0x5b, 0x2e, 0x67, 0xbe, 0x8a, 0x72, 0xf9, 0x06, 0x84, 0xd9, 0x35, 0xe5, 0x0d, 0x7c, 0x85, 0xe4, - 0x8c, 0x34, 0x52, 0x36, 0xf7, 0x7d, 0x4a, 0x1a, 0x90, 0xa7, 0x51, 0x1d, 0x87, 0xcb, 0xe6, 0x1c, - 0x0e, 0xf6, 0x9b, 0x93, 0x13, 0x31, 0x52, 0xf7, 0x46, 0x8e, 0xc6, 0x8f, 0xfa, 0x9f, 0x35, 0x98, - 0x35, 0x68, 0xc7, 0xe1, 0x82, 0x06, 0x51, 0x1e, 0x0c, 0xfa, 0x33, 0xf2, 0x3d, 0xc8, 0xee, 0x04, - 0xac, 0x87, 0x9b, 0x89, 0x72, 0xfe, 0xd2, 0x17, 0x70, 0x46, 0x4a, 0x2b, 0x12, 0x79, 0x1b, 0x92, - 0x08, 0x2d, 0x81, 0xd0, 0xae, 0x1d, 0xfb, 0x1e, 0x44, 0x50, 0x28, 0x7e, 0xf7, 0x3b, 0x1f, 0x3d, - 0xae, 0x4c, 0xfd, 0xe7, 0x71, 0x65, 0xea, 0xc3, 0xe7, 0x4f, 0x6e, 0x67, 0xee, 0x1d, 0x29, 0xfc, - 0xe5, 0xf3, 0x27, 0xb7, 0x2f, 0xc5, 0x82, 0x19, 0xbf, 0xab, 0x97, 0xa1, 0xf4, 0x65, 0x07, 0xb8, - 0xcf, 0x3c, 0x4e, 0xf5, 0x2f, 0x34, 0xc8, 0x35, 0x7d, 0x51, 0xf7, 0x04, 0x5b, 0x7a, 0xd8, 0x7a, - 0x6d, 0xbf, 0x2a, 0x90, 0xb1, 0x06, 0x7c, 0x78, 0x37, 0x7c, 0x0f, 0x80, 0x35, 0xe0, 0x91, 0xc0, - 0x3b, 0x50, 0xf0, 0xfb, 0xdb, 0xae, 0x63, 0x9b, 0xbb, 0x74, 0xdf, 0x7c, 0xc4, 0x99, 0xa7, 0x06, - 0xec, 0x8c, 0xfc, 0x26, 0xda, 0x40, 0xd6, 0xbb, 0x74, 0xff, 0x47, 0xad, 0x66, 0xc3, 0xc8, 0xf9, - 0xc3, 0x23, 0x67, 0xde, 0xdd, 0xb7, 0x8f, 0x73, 0xbe, 0x34, 0xe2, 0x7c, 0xcc, 0x1f, 0xfd, 0x3c, - 0x90, 0x38, 0x41, 0xf9, 0xfd, 0x7b, 0x0d, 0xf2, 0xe1, 0x73, 0xb1, 0xb9, 0xf3, 0x75, 0x38, 0x7e, - 0xf7, 0xbb, 0xc7, 0xa1, 0xbf, 0x3c, 0x8a, 0x3e, 0x86, 0x4a, 0xbf, 0x20, 0x3f, 0xc0, 0x62, 0x14, - 0x85, 0xff, 0xa9, 0x06, 0xb9, 0x16, 0x15, 0x2b, 0xcc, 0xe3, 0xef, 0xd2, 0x7d, 0x09, 0x7f, 0x11, - 0xce, 0xbd, 0x2a, 0xf2, 0x48, 0xf0, 0x2b, 0x4d, 0xd7, 0x9d, 0xb8, 0xc3, 0x91, 0xc5, 0x17, 0x53, - 0x35, 0xe2, 0x82, 0x4c, 0x55, 0x9c, 0x10, 0xba, 0x7a, 0xdb, 0x85, 0x74, 0x6b, 0xd8, 0xdd, 0x65, - 0xb8, 0xd8, 0x5a, 0x5f, 0x6a, 0xdd, 0x37, 0x37, 0x7f, 0xbc, 0xb1, 0x66, 0x6e, 0x35, 0x5a, 0x1b, - 0x6b, 0x2b, 0xf5, 0x7b, 0xf5, 0xb5, 0xd5, 0xe2, 0x14, 0xb9, 0x02, 0xa5, 0x18, 0xaf, 0xde, 0x68, - 0x6d, 0x2e, 0x35, 0x36, 0x4d, 0x24, 0x15, 0x35, 0x72, 0x1d, 0xae, 0xc5, 0xb8, 0x8d, 0x66, 0x24, - 0xb0, 0xd4, 0x58, 0x6b, 0x6e, 0xb5, 0x94, 0x58, 0x62, 0xf1, 0xef, 0x49, 0x98, 0x7e, 0xc0, 0x3b, - 0xe4, 0xb1, 0x06, 0xc5, 0x17, 0xbb, 0x86, 0x8c, 0x1f, 0xe6, 0x63, 0xa6, 0x43, 0x79, 0xe1, 0x15, - 0x25, 0x55, 0x3a, 0xdf, 0xfa, 0xf0, 0x6f, 0xff, 0xfe, 0x24, 0xb1, 0xa0, 0x7f, 0xab, 0x36, 0xfe, - 0x7f, 0x49, 0xb5, 0x71, 0x13, 0xe8, 0x23, 0x0d, 0xe0, 0x28, 0x5e, 0x44, 0x1f, 0x3f, 0xe0, 0xe2, - 0x11, 0x2e, 0xdf, 0x7c, 0xa9, 0x8c, 0x02, 0xb4, 0x80, 0x80, 0x6e, 0xea, 0xd7, 0x27, 0x01, 0x1a, - 0x2d, 0x3e, 0x09, 0xe5, 0xa8, 0xcb, 0x26, 0x40, 0x19, 0xe9, 0xcb, 0x09, 0x50, 0xc6, 0xb4, 0xea, - 0x4b, 0xa1, 0x8c, 0xce, 0xaf, 0x5f, 0x69, 0x90, 0x89, 0x75, 0x0c, 0x79, 0x73, 0x92, 0x9d, 0x58, - 0x97, 0x95, 0xe7, 0x5f, 0x2e, 0xa4, 0xd0, 0x54, 0x11, 0xcd, 0xbc, 0x7e, 0xe3, 0x18, 0x34, 0x71, - 0xcd, 0x67, 0x7e, 0x21, 0xbf, 0x13, 0x96, 0xd7, 0x3f, 0x3b, 0x9c, 0xd3, 0x3e, 0x3f, 0x9c, 0xd3, - 0xfe, 0x75, 0x38, 0xa7, 0x7d, 0xfc, 0x6c, 0x6e, 0xea, 0xf3, 0x67, 0x73, 0x53, 0xff, 0x78, 0x36, - 0x37, 0xf5, 0xde, 0x62, 0x6c, 0x2b, 0xae, 0x85, 0x2a, 0x1b, 0x54, 0xbc, 0xcf, 0x82, 0xdd, 0xa1, - 0x85, 0xbd, 0x23, 0x1b, 0xb8, 0x25, 0xb7, 0xcf, 0xe2, 0xc7, 0xf6, 0x5b, 0xff, 0x0f, 0x00, 0x00, - 0xff, 0xff, 0x50, 0x22, 0xdc, 0x02, 0x7a, 0x14, 0x00, 0x00, + // 1820 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdd, 0x6f, 0x1b, 0x59, + 0x15, 0xcf, 0x38, 0x6e, 0x6b, 0x1f, 0xdb, 0xb1, 0x73, 0xd3, 0x0f, 0xd7, 0x5b, 0xe2, 0x76, 0x96, + 0xb6, 0x69, 0x20, 0xb6, 0x9a, 0x65, 0x91, 0xb6, 0x80, 0x44, 0xbe, 0xaa, 0x9a, 0x4d, 0xed, 0x68, + 0x9c, 0x54, 0x62, 0x11, 0x8c, 0x26, 0xe3, 0x1b, 0x7b, 0x9a, 0xf1, 0xdc, 0x61, 0xee, 0xb5, 0x37, + 0x59, 0x09, 0x09, 0xed, 0xd3, 0x0a, 0xf1, 0xb0, 0xd2, 0x3e, 0x21, 0x78, 0xe8, 0x03, 0x42, 0x3c, + 0xf6, 0x61, 0x79, 0x44, 0xc0, 0xdb, 0x3e, 0xae, 0x0a, 0x0f, 0x88, 0x87, 0x2c, 0x4a, 0x91, 0xca, + 0x1f, 0x01, 0x12, 0xba, 0x67, 0xee, 0x38, 0xe3, 0xd6, 0x4e, 0x1b, 0x35, 0xe5, 0x25, 0xc9, 0x3d, + 0xe7, 0xdc, 0x73, 0x7e, 0xe7, 0xfb, 0x4e, 0xe0, 0x0a, 0xdd, 0x63, 0x36, 0x0b, 0x68, 0x95, 0xf9, + 0x34, 0xb0, 0x04, 0x0b, 0xaa, 0xfd, 0xdb, 0x55, 0xb1, 0x57, 0xf1, 0x03, 0x26, 0x18, 0x99, 0x51, + 0xdc, 0x4a, 0xc4, 0xad, 0xf4, 0x6f, 0x97, 0xa6, 0xad, 0xae, 0xe3, 0xb1, 0x2a, 0xfe, 0x0c, 0xe5, + 0x4a, 0x97, 0x6c, 0xc6, 0xbb, 0x8c, 0x57, 0xbb, 0xbc, 0x2d, 0xef, 0x77, 0x79, 0x5b, 0x31, 0xbe, + 0xae, 0x18, 0x5c, 0x58, 0xbb, 0x8e, 0x27, 0x99, 0xdb, 0x54, 0x58, 0xb7, 0xa3, 0xb3, 0x92, 0xba, + 0x1c, 0x4a, 0x99, 0x78, 0xaa, 0x86, 0x07, 0xc5, 0x3a, 0xdf, 0x66, 0x6d, 0x16, 0xd2, 0xe5, 0x5f, + 0x8a, 0x7a, 0xa5, 0xcd, 0x58, 0xdb, 0xa5, 0x55, 0xcb, 0x77, 0xaa, 0x96, 0xe7, 0x31, 0x61, 0x09, + 0x87, 0x79, 0xd1, 0x9d, 0xb2, 0xe2, 0xe2, 0x69, 0xbb, 0xb7, 0x53, 0x15, 0x4e, 0x97, 0x72, 0x61, + 0x75, 0xfd, 0x50, 0x40, 0xa7, 0x90, 0x5b, 0xa5, 0xf6, 0x03, 0xcb, 0xed, 0xd1, 0xbb, 0x0e, 0x75, + 0x5b, 0x64, 0x13, 0xce, 0x5a, 0x5d, 0xd6, 0xf3, 0x44, 0x51, 0xbb, 0xaa, 0xcd, 0xa5, 0x97, 0xbf, + 0xfb, 0xc5, 0x41, 0x79, 0xe2, 0x1f, 0x07, 0xe5, 0x1b, 0x6d, 0x47, 0x74, 0x7a, 0xdb, 0x15, 0x9b, + 0x75, 0x15, 0x2c, 0xf5, 0x6b, 0x81, 0xb7, 0x76, 0xab, 0x62, 0xdf, 0xa7, 0xbc, 0xb2, 0x4a, 0xed, + 0x27, 0x9f, 0x2f, 0x80, 0x42, 0xbd, 0x4a, 0x6d, 0x43, 0xe9, 0xd2, 0xff, 0x93, 0x80, 0x0b, 0x0d, + 0x15, 0xb8, 0x86, 0x2f, 0x68, 0x6b, 0xab, 0xb9, 0x8a, 0x46, 0x49, 0x00, 0x53, 0x9c, 0xba, 0x3b, + 0x66, 0x8f, 0xb7, 0xcc, 0xbe, 0xa4, 0x28, 0xbb, 0xeb, 0x27, 0xb3, 0x7b, 0x78, 0x50, 0xce, 0x36, + 0xa9, 0xbb, 0x13, 0xe9, 0x7d, 0x0e, 0x47, 0x56, 0xda, 0xd8, 0xe2, 0xad, 0xd0, 0x66, 0x0f, 0xf2, + 0x82, 0x09, 0xcb, 0x8d, 0x19, 0x4d, 0xa0, 0xd1, 0xfb, 0x27, 0x36, 0x9a, 0xdb, 0x94, 0x8a, 0xc6, + 0x58, 0xcd, 0xa1, 0x95, 0x81, 0xd9, 0x3d, 0x28, 0x58, 0xb6, 0x70, 0xfa, 0x34, 0x66, 0x77, 0x12, + 0xed, 0xd6, 0x4f, 0x6c, 0x77, 0x6a, 0x09, 0x35, 0x8d, 0x31, 0x3c, 0x15, 0xda, 0x89, 0x2c, 0xeb, + 0x7f, 0xd0, 0x60, 0x26, 0x0a, 0xff, 0x03, 0x26, 0x1c, 0xaf, 0xbd, 0xc1, 0x3e, 0xa4, 0x01, 0xf9, + 0x1e, 0xe4, 0xa2, 0x72, 0x36, 0xad, 0x56, 0x2b, 0x50, 0xb1, 0x2f, 0x3e, 0xf9, 0x7c, 0xe1, 0xbc, + 0x52, 0xb7, 0xd4, 0x6a, 0x05, 0x94, 0xf3, 0xa6, 0x08, 0x1c, 0xaf, 0x6d, 0x64, 0x23, 0x71, 0x49, + 0x26, 0x26, 0x64, 0xfb, 0xa8, 0xcd, 0xf4, 0xa5, 0x3a, 0x15, 0xc4, 0xd7, 0xab, 0x98, 0x4c, 0xff, + 0x08, 0x9f, 0xfe, 0xdb, 0x49, 0x98, 0x89, 0xe1, 0x6d, 0x7a, 0x96, 0xcf, 0x3b, 0x4c, 0x90, 0x87, + 0x40, 0xc2, 0x04, 0x0e, 0x99, 0x3f, 0x8d, 0x82, 0x2d, 0xa0, 0xde, 0x78, 0x8c, 0x7e, 0x02, 0x17, + 0x07, 0x31, 0x8a, 0x9b, 0xe3, 0xc5, 0xc4, 0xd5, 0xc9, 0xb9, 0xcc, 0xe2, 0x5c, 0x65, 0xc4, 0x64, + 0xa8, 0x8c, 0x88, 0xb6, 0x71, 0x9e, 0xbd, 0x48, 0xe4, 0xa4, 0x02, 0x33, 0xae, 0xc5, 0x85, 0x69, + 0x77, 0x2c, 0xaf, 0x4d, 0x5b, 0x66, 0x87, 0x3a, 0xed, 0x8e, 0xc0, 0xc2, 0x98, 0x34, 0xa6, 0x25, + 0x6b, 0x25, 0xe4, 0xdc, 0x43, 0x06, 0xb9, 0x05, 0x05, 0xea, 0x33, 0xbb, 0x63, 0x3a, 0x2d, 0xea, + 0x09, 0x67, 0xc7, 0xa1, 0x41, 0x31, 0x29, 0x3d, 0x37, 0xf2, 0x48, 0xaf, 0x0d, 0xc8, 0xe4, 0x1a, + 0x64, 0x43, 0x51, 0xaf, 0xd7, 0xdd, 0xa6, 0x41, 0xf1, 0x0c, 0xea, 0xcc, 0x20, 0xad, 0x8e, 0x24, + 0xb2, 0x02, 0xb0, 0xed, 0x32, 0x7b, 0xd7, 0x94, 0x83, 0xa1, 0x78, 0xf6, 0xaa, 0x36, 0x97, 0x59, + 0x2c, 0x55, 0xc2, 0xa9, 0x51, 0x89, 0xa6, 0x46, 0x65, 0x33, 0x9a, 0x1a, 0xcb, 0x29, 0x19, 0xdd, + 0x4f, 0xbf, 0x2a, 0x6b, 0x46, 0x1a, 0xef, 0x49, 0x8e, 0xfe, 0x33, 0x98, 0x8a, 0x52, 0x73, 0x8f, + 0xba, 0x3e, 0x0d, 0xc6, 0x39, 0xa5, 0x8d, 0x73, 0x6a, 0x16, 0x32, 0x1d, 0x8b, 0x9b, 0xcc, 0x17, + 0x26, 0xeb, 0x09, 0x2c, 0xa4, 0x94, 0x91, 0xee, 0x58, 0xbc, 0xe1, 0x8b, 0x46, 0x4f, 0x90, 0xb7, + 0x40, 0x1e, 0x4c, 0xee, 0x5a, 0xbc, 0x83, 0xa1, 0x49, 0x19, 0xa9, 0x8e, 0xc5, 0x9b, 0xf2, 0xac, + 0xef, 0x43, 0x69, 0xc5, 0x75, 0xa8, 0x27, 0x75, 0x3a, 0xde, 0x9a, 0x15, 0x78, 0x8e, 0xd7, 0x96, + 0x05, 0xba, 0xee, 0x70, 0x41, 0x7e, 0x04, 0xd3, 0x34, 0x24, 0x99, 0x8e, 0xb7, 0xc3, 0x4c, 0xd7, + 0xe1, 0x12, 0x88, 0x4c, 0x5d, 0x75, 0x64, 0xea, 0x46, 0xeb, 0xaa, 0x79, 0x3b, 0xcc, 0xc8, 0x2b, + 0x4d, 0xf2, 0x20, 0x95, 0xeb, 0xbf, 0xd2, 0xc6, 0xd9, 0x96, 0x22, 0xe4, 0xfb, 0x40, 0xdc, 0x8f, + 0x4c, 0x1b, 0x05, 0x64, 0x2c, 0x1c, 0xcf, 0x74, 0x5a, 0x18, 0x85, 0xe4, 0xf2, 0xcc, 0xe1, 0x41, + 0x39, 0xbf, 0xfe, 0x51, 0xec, 0x76, 0x6d, 0xd5, 0xc8, 0xbb, 0x43, 0x84, 0x16, 0x79, 0x0f, 0x2e, + 0x0f, 0x5d, 0x8f, 0x5c, 0xc1, 0x6e, 0xc5, 0x7e, 0x33, 0x2e, 0xda, 0x23, 0x01, 0xe8, 0x7f, 0x49, + 0x40, 0x36, 0x2a, 0x43, 0x44, 0xf3, 0x36, 0xe4, 0xd4, 0x75, 0x1e, 0xeb, 0x76, 0x23, 0x1b, 0x11, + 0xb1, 0xa7, 0xaf, 0x41, 0xd6, 0xf2, 0xfd, 0x80, 0xf5, 0x69, 0xdc, 0x46, 0x46, 0xd1, 0x50, 0xe4, + 0x9b, 0x40, 0x06, 0x1d, 0xd1, 0xa5, 0xc2, 0xc2, 0xb8, 0x86, 0x93, 0xcc, 0x28, 0x44, 0x9c, 0xfb, + 0x54, 0x58, 0x68, 0xd5, 0x85, 0xd2, 0x28, 0x0f, 0x14, 0x84, 0x24, 0x56, 0xdc, 0x49, 0x12, 0x21, + 0xe3, 0x6e, 0x5c, 0x7a, 0xd1, 0xe7, 0x10, 0xfe, 0x7d, 0x00, 0x9b, 0x75, 0xbb, 0x0e, 0xe7, 0x0e, + 0xf3, 0xb0, 0xe0, 0x33, 0x8b, 0x7a, 0x45, 0x35, 0x78, 0xb4, 0x6a, 0xd5, 0xea, 0xad, 0xac, 0x0c, + 0x24, 0x97, 0xd3, 0xb2, 0xae, 0x7f, 0xff, 0xec, 0xf1, 0xbc, 0x66, 0xc4, 0x14, 0xe8, 0xbf, 0xd1, + 0x20, 0x8d, 0xfb, 0x0a, 0x5d, 0xb9, 0x0e, 0x53, 0x58, 0x81, 0xa6, 0xcd, 0x3c, 0x11, 0x58, 0xb6, + 0xda, 0x91, 0x46, 0x0e, 0xa9, 0x2b, 0x8a, 0x48, 0x6e, 0x40, 0x9e, 0xc9, 0x3b, 0xa6, 0xe3, 0x45, + 0x85, 0x2f, 0xa3, 0x98, 0x34, 0x72, 0x2c, 0x54, 0xa5, 0x8a, 0x7e, 0x0e, 0x0a, 0xa1, 0x1c, 0xeb, + 0x89, 0x78, 0xdb, 0x27, 0x8d, 0x29, 0xa4, 0x37, 0x7a, 0x42, 0x49, 0x5e, 0x84, 0xb3, 0x0f, 0x2d, + 0xc7, 0xa5, 0x2d, 0x8c, 0x57, 0xca, 0x50, 0x27, 0xfd, 0x8f, 0x1a, 0x4c, 0x2b, 0x78, 0x4b, 0x9c, + 0x53, 0xd1, 0x14, 0x96, 0xa0, 0xaf, 0xb5, 0xc2, 0x6b, 0x9e, 0x88, 0x4d, 0xc4, 0x9a, 0x27, 0xa2, + 0x15, 0x4e, 0x0c, 0x38, 0x13, 0x5f, 0x95, 0xaf, 0x37, 0x66, 0x43, 0x55, 0xfa, 0x9f, 0x35, 0xb8, + 0x80, 0x3d, 0x7c, 0x37, 0x60, 0xdd, 0x2d, 0xaf, 0x45, 0x5d, 0xda, 0xc6, 0xf7, 0x0b, 0xb9, 0x05, + 0x69, 0x99, 0x2d, 0x1a, 0x44, 0x0d, 0x93, 0x5e, 0xce, 0x1e, 0x1e, 0x94, 0x53, 0x4d, 0x24, 0xd6, + 0x56, 0x8d, 0x54, 0xc8, 0xae, 0xb5, 0xc8, 0x0d, 0x48, 0x59, 0xd2, 0x79, 0x29, 0x19, 0x62, 0xcb, + 0x1c, 0x1e, 0x94, 0xcf, 0x61, 0x40, 0x6a, 0xab, 0xc6, 0x39, 0x64, 0xd6, 0xe2, 0x2f, 0x9b, 0xc9, + 0xd3, 0x0b, 0x8b, 0xfe, 0x99, 0x06, 0x33, 0x03, 0x17, 0xd0, 0x26, 0xdf, 0x60, 0xcc, 0x1d, 0x42, + 0xa5, 0xbd, 0x12, 0xaa, 0xc4, 0x29, 0xa2, 0xfa, 0xf5, 0x24, 0x10, 0x44, 0xb5, 0xb6, 0x47, 0xed, + 0x9e, 0x8c, 0x28, 0x16, 0x70, 0x1b, 0x0a, 0x61, 0x01, 0xfb, 0x01, 0xf3, 0x59, 0x20, 0xe9, 0xa7, + 0xb2, 0x35, 0xf3, 0xa8, 0x75, 0x63, 0xa0, 0x94, 0xfc, 0x18, 0x32, 0xa1, 0xa1, 0xd3, 0x2b, 0x19, + 0x40, 0x85, 0xe1, 0x4b, 0xca, 0x82, 0x99, 0x50, 0x7d, 0x2f, 0x56, 0x33, 0xbc, 0x38, 0x89, 0x53, + 0x7d, 0x7e, 0xe4, 0x30, 0x19, 0x59, 0x66, 0xcb, 0x49, 0x09, 0xc9, 0x20, 0xa8, 0x2c, 0xce, 0xe0, + 0xe4, 0x03, 0x98, 0x0e, 0x4d, 0x60, 0xa2, 0xb8, 0xe9, 0x33, 0xe6, 0x16, 0x93, 0xc7, 0x6c, 0xfc, + 0x11, 0x45, 0xa0, 0xd4, 0x87, 0xd1, 0x39, 0x22, 0xeb, 0xff, 0x4d, 0xc8, 0xb6, 0x0d, 0xaf, 0xe2, + 0xb5, 0x93, 0x4c, 0x97, 0x5b, 0x50, 0xe0, 0xbd, 0xed, 0xae, 0x23, 0xc4, 0xd1, 0x5e, 0x4d, 0xe0, + 0x5e, 0xcd, 0x0f, 0xe8, 0x6a, 0x6c, 0xc8, 0xfd, 0xdf, 0x97, 0x93, 0x77, 0xe8, 0x4d, 0x91, 0x41, + 0x9a, 0x12, 0x79, 0x0b, 0xd2, 0x0e, 0x37, 0xfb, 0x54, 0xb0, 0xc1, 0x70, 0x49, 0x39, 0xfc, 0x01, + 0x9e, 0x47, 0x96, 0xcb, 0x99, 0x37, 0x51, 0x2e, 0x5f, 0x83, 0x30, 0xbb, 0xa6, 0xbc, 0x81, 0xaf, + 0x90, 0x9c, 0x91, 0x46, 0xca, 0xe6, 0xbe, 0x4f, 0x49, 0x1d, 0xa6, 0x68, 0x54, 0xc7, 0xe1, 0xb2, + 0x39, 0x87, 0x83, 0xfd, 0xe6, 0xf8, 0x44, 0x0c, 0xd5, 0xbd, 0x91, 0xa3, 0xf1, 0xa3, 0xfe, 0x27, + 0x0d, 0x66, 0x0c, 0xda, 0x76, 0xb8, 0xa0, 0x41, 0x94, 0x07, 0x83, 0xfe, 0x94, 0x7c, 0x07, 0xb2, + 0x3b, 0x01, 0xeb, 0xe2, 0x66, 0xa2, 0x9c, 0xbf, 0xf4, 0x35, 0x9c, 0x91, 0xd2, 0x8a, 0x44, 0xde, + 0x85, 0x24, 0x42, 0x4b, 0x20, 0xb4, 0x6b, 0xc7, 0xbe, 0x0a, 0x11, 0x14, 0x8a, 0xdf, 0xf9, 0xd6, + 0x27, 0x8f, 0xca, 0x13, 0xff, 0x7e, 0x54, 0x9e, 0xf8, 0xf8, 0xd9, 0xe3, 0xf9, 0xcc, 0xdd, 0x23, + 0x85, 0xbf, 0x78, 0xf6, 0x78, 0xfe, 0x52, 0x2c, 0x98, 0xf1, 0xbb, 0x7a, 0x09, 0x8a, 0x2f, 0x3a, + 0xc0, 0x7d, 0xe6, 0x71, 0xaa, 0x7f, 0xa5, 0x41, 0xae, 0xe1, 0x8b, 0x9a, 0x27, 0xd8, 0xd2, 0x83, + 0xe6, 0x6b, 0xfb, 0x55, 0x86, 0x8c, 0xd5, 0xe7, 0x83, 0xbb, 0xe1, 0x7b, 0x00, 0xac, 0x3e, 0x8f, + 0x04, 0xde, 0x83, 0xbc, 0xdf, 0xdb, 0x76, 0x1d, 0xdb, 0xdc, 0xa5, 0xfb, 0xe6, 0x43, 0xce, 0x3c, + 0x35, 0x60, 0xa7, 0xe5, 0xf7, 0xd1, 0x06, 0xb2, 0xde, 0xa7, 0xfb, 0x3f, 0x68, 0x36, 0xea, 0x46, + 0xce, 0x1f, 0x1c, 0x39, 0xf3, 0xee, 0xbc, 0x7b, 0x9c, 0xf3, 0xc5, 0x21, 0xe7, 0x63, 0xfe, 0xe8, + 0xe7, 0x81, 0xc4, 0x09, 0xca, 0xef, 0xdf, 0x69, 0x30, 0x15, 0x3e, 0x17, 0x1b, 0x3b, 0xff, 0x0f, + 0xc7, 0xef, 0x7c, 0xfb, 0x38, 0xf4, 0x97, 0x87, 0xd1, 0xc7, 0x50, 0xe9, 0x17, 0xe4, 0xc7, 0x58, + 0x8c, 0xa2, 0xf0, 0x3f, 0xd1, 0x20, 0xd7, 0xa4, 0x62, 0x85, 0x79, 0xfc, 0x7d, 0xba, 0x2f, 0xe1, + 0x2f, 0xc2, 0xb9, 0x57, 0x45, 0x1e, 0x09, 0xbe, 0xd1, 0x74, 0xdd, 0x8e, 0x3b, 0x1c, 0x59, 0x7c, + 0x3e, 0x55, 0x43, 0x2e, 0xc8, 0x54, 0xc5, 0x09, 0xa1, 0xab, 0xf3, 0x2e, 0xa4, 0x9b, 0x83, 0xee, + 0x2e, 0xc1, 0xc5, 0xe6, 0xfa, 0x52, 0xf3, 0x9e, 0xb9, 0xf9, 0xc3, 0x8d, 0x35, 0x73, 0xab, 0xde, + 0xdc, 0x58, 0x5b, 0xa9, 0xdd, 0xad, 0xad, 0xad, 0x16, 0x26, 0xc8, 0x15, 0x28, 0xc6, 0x78, 0xb5, + 0x7a, 0x73, 0x73, 0xa9, 0xbe, 0x69, 0x22, 0xa9, 0xa0, 0x91, 0xeb, 0x70, 0x2d, 0xc6, 0xad, 0x37, + 0x22, 0x81, 0xa5, 0xfa, 0x5a, 0x63, 0xab, 0xa9, 0xc4, 0x12, 0x8b, 0x7f, 0x4b, 0xc2, 0xe4, 0x7d, + 0xde, 0x26, 0x8f, 0x34, 0x28, 0x3c, 0xdf, 0x35, 0x64, 0xf4, 0x30, 0x1f, 0x31, 0x1d, 0x4a, 0x0b, + 0xaf, 0x28, 0xa9, 0xd2, 0xf9, 0xce, 0xc7, 0x7f, 0xfd, 0xd7, 0x67, 0x89, 0x05, 0xfd, 0x1b, 0xd5, + 0xd1, 0xff, 0x57, 0xaa, 0x8e, 0x9a, 0x40, 0x9f, 0x68, 0x00, 0x47, 0xf1, 0x22, 0xfa, 0xe8, 0x01, + 0x17, 0x8f, 0x70, 0xe9, 0xe6, 0x4b, 0x65, 0x14, 0xa0, 0x05, 0x04, 0x74, 0x53, 0xbf, 0x3e, 0x0e, + 0xd0, 0x70, 0xf1, 0x49, 0x28, 0x47, 0x5d, 0x36, 0x06, 0xca, 0x50, 0x5f, 0x8e, 0x81, 0x32, 0xa2, + 0x55, 0x5f, 0x0a, 0x65, 0x78, 0x7e, 0xfd, 0x52, 0x83, 0x4c, 0xac, 0x63, 0xc8, 0xdb, 0xe3, 0xec, + 0xc4, 0xba, 0xac, 0x34, 0xf7, 0x72, 0x21, 0x85, 0xa6, 0x82, 0x68, 0xe6, 0xf4, 0x1b, 0xc7, 0xa0, + 0x89, 0x6b, 0x3e, 0xf3, 0x73, 0xf9, 0x9d, 0xb0, 0xbc, 0xfe, 0xc5, 0xe1, 0xac, 0xf6, 0xe5, 0xe1, + 0xac, 0xf6, 0xcf, 0xc3, 0x59, 0xed, 0xd3, 0xa7, 0xb3, 0x13, 0x5f, 0x3e, 0x9d, 0x9d, 0xf8, 0xfb, + 0xd3, 0xd9, 0x89, 0x0f, 0x16, 0x63, 0x5b, 0x71, 0x2d, 0x54, 0x59, 0xa7, 0xe2, 0x43, 0x16, 0xec, + 0x0e, 0x2c, 0xec, 0x1d, 0xd9, 0xc0, 0x2d, 0xb9, 0x7d, 0x16, 0x3f, 0xb6, 0xdf, 0xf9, 0x5f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xd4, 0xc5, 0x1a, 0x3d, 0x86, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1761,10 +1761,10 @@ func (m *VotingPowerSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x18 } - if len(m.VotingPowerSet) > 0 { - for iNdEx := len(m.VotingPowerSet) - 1; iNdEx >= 0; iNdEx-- { + if len(m.OperatorVotingPowers) > 0 { + for iNdEx := len(m.OperatorVotingPowers) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.VotingPowerSet[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.OperatorVotingPowers[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2621,8 +2621,8 @@ func (m *VotingPowerSnapshot) Size() (n int) { _ = l l = m.TotalVotingPower.Size() n += 1 + l + sovTx(uint64(l)) - if len(m.VotingPowerSet) > 0 { - for _, e := range m.VotingPowerSet { + if len(m.OperatorVotingPowers) > 0 { + for _, e := range m.OperatorVotingPowers { l = e.Size() n += 1 + l + sovTx(uint64(l)) } @@ -3378,7 +3378,7 @@ func (m *VotingPowerSnapshot) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VotingPowerSet", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field OperatorVotingPowers", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3405,8 +3405,8 @@ func (m *VotingPowerSnapshot) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.VotingPowerSet = append(m.VotingPowerSet, &OperatorVotingPower{}) - if err := m.VotingPowerSet[len(m.VotingPowerSet)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.OperatorVotingPowers = append(m.OperatorVotingPowers, &OperatorVotingPower{}) + if err := m.OperatorVotingPowers[len(m.OperatorVotingPowers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex From 5854c524d13fe4c413b4d58d30212de903dad6f9 Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Thu, 31 Oct 2024 23:21:23 +0800 Subject: [PATCH 08/12] 1. add cli and rpc for voting power snapshot 2. use a hook to notify the Dogfood slash event 3. initialize the voting power snapshot for genesis AVSs 4. add a function to get the impactful AVS list for an operator --- app/app.go | 1 - proto/exocore/operator/v1/genesis.proto | 2 +- proto/exocore/operator/v1/query.proto | 73 +- proto/exocore/operator/v1/tx.proto | 11 - testutil/utils.go | 18 +- x/dogfood/keeper/abci.go | 5 +- x/dogfood/keeper/genesis.go | 10 + x/dogfood/keeper/impl_epochs_hooks.go | 2 +- x/dogfood/keeper/impl_operator_hooks.go | 26 + x/dogfood/keeper/keeper.go | 18 +- x/dogfood/types/expected_keepers.go | 2 +- x/dogfood/types/keys.go | 10 +- x/operator/client/cli/query.go | 104 ++ x/operator/keeper/abci.go | 13 +- x/operator/keeper/grpc_query.go | 51 + x/operator/keeper/operator.go | 113 +- x/operator/keeper/opt_test.go | 19 +- x/operator/keeper/slash.go | 11 +- x/operator/keeper/usd_value.go | 33 +- x/operator/keeper/usd_value_test.go | 6 +- x/operator/keeper/voting_power_snapshot.go | 108 +- .../keeper/voting_power_snapshot_test.go | 49 +- x/operator/types/expected_keepers.go | 10 +- x/operator/types/genesis.pb.go | 2 +- x/operator/types/hooks.go | 8 + x/operator/types/query.pb.go | 1007 ++++++++++------- x/operator/types/query.pb.gw.go | 233 ++-- x/operator/types/tx.pb.go | 327 ++---- 28 files changed, 1466 insertions(+), 806 deletions(-) diff --git a/app/app.go b/app/app.go index f84763c36..ee395d6d8 100644 --- a/app/app.go +++ b/app/app.go @@ -1179,7 +1179,6 @@ func (app *ExocoreApp) InitChainer( if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil { panic(err) } - app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()) return app.mm.InitGenesis(ctx, app.appCodec, genesisState) diff --git a/proto/exocore/operator/v1/genesis.proto b/proto/exocore/operator/v1/genesis.proto index 92e61121d..fa8299d2b 100644 --- a/proto/exocore/operator/v1/genesis.proto +++ b/proto/exocore/operator/v1/genesis.proto @@ -70,7 +70,7 @@ message AVSUSDValue { // it's corresponding to the kvStore `KeyPrefixUSDValueForOperator` message OperatorUSDValue { // key is used for storing the voting power of specified operator and AVS, - // which is the combination of operator and AVS address. + // which is the combination of AVS and operator address. string key = 1; // value is the USD value states for the AVS address OperatorOptedUSDValue opted_usd_value = 2 [(gogoproto.nullable) = false, (gogoproto.customname) = "OptedUSDValue"]; diff --git a/proto/exocore/operator/v1/query.proto b/proto/exocore/operator/v1/query.proto index 09f5afa23..d6289385f 100644 --- a/proto/exocore/operator/v1/query.proto +++ b/proto/exocore/operator/v1/query.proto @@ -19,7 +19,8 @@ option go_package = "github.com/ExocoreNetwork/exocore/x/operator/types"; // QueryOperatorInfoReq is the request to obtain the operator information. message GetOperatorInfoReq { // operator_addr is the operator address,its type should be a sdk.AccAddress - string operator_addr = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string operator_addr = 1 + [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // QueryAllOperatorsRequest is the request to obtain all operators. @@ -53,13 +54,15 @@ message QueryOperatorUSDValueRequest { // QueryOperatorUSDValueResponse is the response to obtain the USD value for operator. message QueryOperatorUSDValueResponse { // usd_info includes the self and total staking for the operator and AVS - OperatorOptedUSDValue usd_values = 1 [(gogoproto.customname) = "USDValues"]; + OperatorOptedUSDValue usd_values = 1 + [(gogoproto.customname) = "USDValues"]; } // QueryAVSUSDValueRequest is the request to obtain the USD value for AVS. message QueryAVSUSDValueRequest { // avs_address is the AVS address opted-in by the operator - string avs_address = 1 [(gogoproto.customname) = "AVSAddress"]; + string avs_address = 1 + [(gogoproto.customname) = "AVSAddress"]; } // QueryOperatorSlashInfoRequest is the request to obtain the slash information for the specified @@ -223,6 +226,55 @@ message QueryOptInfoRequest { OperatorAVSAddress operator_and_avs = 1 [(gogoproto.embed) = true]; } +// QuerySnapshotAndHelperRequest is the request to obtain the voting power snapshot +// and helper information. +message QuerySnapshotAndHelperRequest { + // avs address + string avs = 1; +} + +// QuerySpecifiedSnapshotRequest is the request to obtain the voting power snapshot +// at the specified height. +message QuerySpecifiedSnapshotRequest { + // avs address + string avs = 1; + // height is used to specify the snapshot height you want to query. + int64 height = 2; +} + +// VotingPowerSnapshotWithKeyHeight is used in the response of QuerySpecifiedSnapshot +// and QueryAllSnapshot +message VotingPowerSnapshotWithKeyHeight { + // snapshot_key_height when it is used in QuerySpecifiedSnapshot, it's the latest + // height with a snapshot key found based on the input height; this height is typically + // the start height of the epoch in which the input height is located. + // when it is used in QueryAllSnapshot, it's the height in the current snapshot key. + int64 snapshot_key_height =1; + // snapshot when it is used in QuerySpecifiedSnapshot, it is the final retrieved information + // containing the voting power set. + // when it is used in QueryAllSnapshot, It is the snapshot stored under `snapshot_key_height`, + // and its voting power set may be nil. + VotingPowerSnapshot snapshot = 2; +} + +// QueryAllSnapshotRequest is the request to obtain all voting power snapshot +// for the specified AVS +message QueryAllSnapshotRequest { + // avs address + string avs = 1; + // pagination related options. + cosmos.base.query.v1beta1.PageRequest pagination = 2; +} + +// QueryAllSnapshotResponse is the response to obtain all voting power snapshot +// for the specified AVS +message QueryAllSnapshotResponse { + // snapshots is a list of all snapshots for the specified AVS. + repeated VotingPowerSnapshotWithKeyHeight snapshots = 1; + // pagination related response. + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + // Query defines the gRPC querier service. service Query { // QueryOperatorInfo queries the operator information. @@ -307,6 +359,21 @@ service Query { }; } + // QuerySnapshotHelper queries the snapshot helper of the AVS + rpc QuerySnapshotHelper(QuerySnapshotAndHelperRequest) returns (SnapshotHelper) { + option (google.api.http).get = "/exocore/operator/v1/snapshot_helper/{avs}"; + } + + // QuerySnapshotHelper queries the snapshot helper of the AVS + rpc QuerySpecifiedSnapshot(QuerySpecifiedSnapshotRequest) returns (VotingPowerSnapshotWithKeyHeight) { + option (google.api.http).get = "/exocore/operator/v1/snapshot/{avs}/{height}"; + } + + // QueryAllSnapshot queries all voting power snapshot for the specified AVS + rpc QueryAllSnapshot(QueryAllSnapshotRequest) returns (QueryAllSnapshotResponse) { + option (google.api.http).get = "/exocore/operator/v1/all_snapshot/{avs}"; + } + // Validators queries all validators that match the given status. // When called from another module, this query might consume a high amount of // gas if the pagination field is incorrectly set. diff --git a/proto/exocore/operator/v1/tx.proto b/proto/exocore/operator/v1/tx.proto index 07be5203e..a920a94d9 100644 --- a/proto/exocore/operator/v1/tx.proto +++ b/proto/exocore/operator/v1/tx.proto @@ -81,13 +81,6 @@ message VotingPowerSnapshot { string epoch_identifier = 4; // epoch_number indicates which epoch this snapshot serve for int64 epoch_number = 5; - // block_time records the block time when it is stored, and it is used for snapshot pruning - // The epoch_number would be sufficient for pruning if we don't support AVSs changing their - // epoch configuration. - google.protobuf.Timestamp block_time = 6 [ - (gogoproto.stdtime) = true, - (gogoproto.nullable) = false - ]; } // SnapshotHelper is used to record the helper information for voting power snapshot update @@ -107,10 +100,6 @@ message SnapshotHelper { // similar to the MaxValidatorNumber in Dogfood, this may need to be changed to an operator list // to track all operators that have opted out, thereby assisting with the correct snapshot update. bool has_opt_out = 2; - - // has_slash is used to indicate whether there is a slash event has been executed before the epoch expires. - // When a slash is executed, Dogfood can immediately update the voting power based on this flag. - bool has_slash = 3; } // ClientChainEarningAddrList is the list of client chain earning addresses. diff --git a/testutil/utils.go b/testutil/utils.go index 52c189c7f..4a21f3690 100644 --- a/testutil/utils.go +++ b/testutil/utils.go @@ -81,7 +81,7 @@ func (suite *BaseTestSuite) SetupTest() { // that also act as delegators. func (suite *BaseTestSuite) SetupWithGenesisValSet(genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) { pruneOpts := pruningtypes.NewPruningOptionsFromString(pruningtypes.PruningOptionDefault) - appI, genesisState := exocoreapp.SetupTestingApp(utils.DefaultChainID, &pruneOpts, false)() + appI, genesisState := exocoreapp.SetupTestingApp(utils.DefaultChainID, &pruneOpts, true)() app, ok := appI.(*exocoreapp.ExocoreApp) suite.Require().True(ok) @@ -395,15 +395,13 @@ func (suite *BaseTestSuite) SetupWithGenesisValSet(genAccs []authtypes.GenesisAc // init chain will set the validator set and initialize the genesis accounts suite.InitTime = time.Now().UTC() - app.InitChain( - abci.RequestInitChain{ - Time: suite.InitTime, - ChainId: utils.DefaultChainID, - Validators: []abci.ValidatorUpdate{}, - ConsensusParams: exocoreapp.DefaultConsensusParams, - AppStateBytes: stateBytes, - }, - ) + app.InitChain(abci.RequestInitChain{ + Time: suite.InitTime, + ChainId: utils.DefaultChainID, + Validators: []abci.ValidatorUpdate{}, + ConsensusParams: exocoreapp.DefaultConsensusParams, + AppStateBytes: stateBytes, + }) // committing the chain now is not required. doing so will skip the first block. // instantiate new header diff --git a/x/dogfood/keeper/abci.go b/x/dogfood/keeper/abci.go index 067b952f9..ff896e184 100644 --- a/x/dogfood/keeper/abci.go +++ b/x/dogfood/keeper/abci.go @@ -15,12 +15,13 @@ func (k Keeper) BeginBlock(ctx sdk.Context) { } func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { - if !k.IsEpochEnd(ctx) { + if !k.ShouldUpdateValidatorSet(ctx) { k.SetValidatorUpdates(ctx, []abci.ValidatorUpdate{}) return []abci.ValidatorUpdate{} } - defer k.ClearEpochEnd(ctx) + defer k.ClearValidatorSetUpdateFlag(ctx) chainIDWithoutRevision := avstypes.ChainIDWithoutRevision(ctx.ChainID()) + // start by clearing the previous consensus keys for the chain. // each AVS can have a separate epoch and hence this function is a part of this module // and not the operator module. diff --git a/x/dogfood/keeper/genesis.go b/x/dogfood/keeper/genesis.go index bf6889cb5..5534c0d5b 100644 --- a/x/dogfood/keeper/genesis.go +++ b/x/dogfood/keeper/genesis.go @@ -110,6 +110,16 @@ func (k Keeper) InitGenesis( // ApplyValidatorChanges only gets changes and hence the vote power must be set here. k.SetLastTotalPower(ctx, genState.LastTotalPower) + // init the voting power snapshot for all default opting-in AVSs + // todo: It was originally intended to be called in the initGenesis function of the operator module, + // but since the dogfood AVS is currently initialized in this module,and this function depends on the + // AVS epoch configuration, it is temporarily called here. Once the initialization of dogfood + // AVS is implemented in the initGenesis function of the AVS module, it can be moved back to + // the operator module. + err = k.operatorKeeper.InitGenesisVPSnapshot(ctx) + if err != nil { + panic(fmt.Sprintf("cant init genesis voting power snapshot,err: %s", err)) + } // ApplyValidatorChanges will sort it internally return k.ApplyValidatorChanges( ctx, out, diff --git a/x/dogfood/keeper/impl_epochs_hooks.go b/x/dogfood/keeper/impl_epochs_hooks.go index cff81133c..03351d19b 100644 --- a/x/dogfood/keeper/impl_epochs_hooks.go +++ b/x/dogfood/keeper/impl_epochs_hooks.go @@ -33,7 +33,7 @@ func (wrapper EpochsHooksWrapper) AfterEpochEnd( // note that this hook is called during BeginBlock, and the "pending" operations will be // applied within this block. however, for clarity, it is highlighted that unbonding // takes N epochs + 1 block to complete. - wrapper.keeper.MarkEpochEnd(ctx) + wrapper.keeper.MarkUpdateValidatorSetFlag(ctx) ctx.Logger().Info("mark epoch end", "height", ctx.BlockHeight(), "identifier", identifier, "epoch", epoch) // find the opt outs that mature when this epoch ends, and move them to pending. optOuts := wrapper.keeper.GetOptOutsToFinish(ctx, epoch) diff --git a/x/dogfood/keeper/impl_operator_hooks.go b/x/dogfood/keeper/impl_operator_hooks.go index 7a9d284d8..715a4e632 100644 --- a/x/dogfood/keeper/impl_operator_hooks.go +++ b/x/dogfood/keeper/impl_operator_hooks.go @@ -91,3 +91,29 @@ func (h OperatorHooksWrapper) AfterOperatorKeyRemovalInitiated( } } } + +func (h OperatorHooksWrapper) AfterSlash( + ctx sdk.Context, operator sdk.AccAddress, affectedAVSList []string, +) { + chainIDWithoutRevision := avstypes.ChainIDWithoutRevision(ctx.ChainID()) + dogfoodAVSAddr := avstypes.GenerateAVSAddr(chainIDWithoutRevision) + for i := range affectedAVSList { + if affectedAVSList[i] == dogfoodAVSAddr { + // check if the operator is in the current validator set. + found, wrappedKey, err := h.keeper.operatorKeeper.GetOperatorConsKeyForChainID(ctx, operator, chainIDWithoutRevision) + if !found || err != nil { + ctx.Logger().Error("AfterSlash the consensus key isn't found by the chainIDWithoutRevision and operator address", "operatorAddr", operator, "chainIDWithoutRevision", chainIDWithoutRevision, "err", err) + return + } + // check if the key is active yet + isValidator := false + _, isValidator = h.keeper.GetExocoreValidator( + ctx, wrappedKey.ToConsAddr(), + ) + if isValidator { + h.keeper.MarkUpdateValidatorSetFlag(ctx) + } + break + } + } +} diff --git a/x/dogfood/keeper/keeper.go b/x/dogfood/keeper/keeper.go index 7198320fa..c05af7796 100644 --- a/x/dogfood/keeper/keeper.go +++ b/x/dogfood/keeper/keeper.go @@ -86,27 +86,27 @@ func (k Keeper) Hooks() types.DogfoodHooks { return types.MultiDogfoodHooks{} } -// MarkEpochEnd marks the end of the epoch. It is called within the BeginBlocker to inform +// MarkUpdateValidatorSetFlag marks the end of the epoch. It is called within the BeginBlocker to inform // the module to apply the validator updates at the end of this block. -func (k Keeper) MarkEpochEnd(ctx sdk.Context) { +func (k Keeper) MarkUpdateValidatorSetFlag(ctx sdk.Context) { store := ctx.KVStore(k.storeKey) - key := types.EpochEndKey() + key := types.ShouldUpdateValidatorSetByteKey() store.Set(key, []byte{1}) } -// IsEpochEnd returns true if the epoch ended in the beginning of this block, or the end of the +// ShouldUpdateValidatorSet returns true if the epoch ended in the beginning of this block, or the end of the // previous block. -func (k Keeper) IsEpochEnd(ctx sdk.Context) bool { +func (k Keeper) ShouldUpdateValidatorSet(ctx sdk.Context) bool { store := ctx.KVStore(k.storeKey) - key := types.EpochEndKey() + key := types.ShouldUpdateValidatorSetByteKey() return store.Has(key) } -// ClearEpochEnd clears the epoch end marker. It is called after the epoch end operations are +// ClearValidatorSetUpdateFlag clears the epoch end marker. It is called after the epoch end operations are // applied. -func (k Keeper) ClearEpochEnd(ctx sdk.Context) { +func (k Keeper) ClearValidatorSetUpdateFlag(ctx sdk.Context) { store := ctx.KVStore(k.storeKey) - key := types.EpochEndKey() + key := types.ShouldUpdateValidatorSetByteKey() store.Delete(key) } diff --git a/x/dogfood/types/expected_keepers.go b/x/dogfood/types/expected_keepers.go index cda789dba..454aebddf 100644 --- a/x/dogfood/types/expected_keepers.go +++ b/x/dogfood/types/expected_keepers.go @@ -83,7 +83,7 @@ type OperatorKeeper interface { GetOptedInAVSForOperator(ctx sdk.Context, operatorAddr string) ([]string, error) CalculateUSDValueForStaker(ctx sdk.Context, stakerID, avsAddr string, operator sdk.AccAddress) (math.LegacyDec, error) OperatorInfo(ctx sdk.Context, addr string) (info *operatortypes.OperatorInfo, err error) - HasSlash(ctx sdk.Context, avsAddr string) bool + InitGenesisVPSnapshot(ctx sdk.Context) error } // DelegationKeeper represents the expected keeper interface for the delegation module. diff --git a/x/dogfood/types/keys.go b/x/dogfood/types/keys.go index 0f73db7d9..20528d2c4 100644 --- a/x/dogfood/types/keys.go +++ b/x/dogfood/types/keys.go @@ -58,8 +58,8 @@ const ( // mature at the end of the current block. PendingUndelegationsByte - // EpochEndByte is the byte key for the epoch end store. - EpochEndByte + // ShouldUpdateValidatorSetByte is the byte key for the epoch end store. + ShouldUpdateValidatorSetByte // HistoricalInfoBytePrefix is the byte prefix for the historical info store. HistoricalInfoBytePrefix @@ -143,9 +143,9 @@ func PendingUndelegationsKey() []byte { return []byte{PendingUndelegationsByte} } -// EpochEndKey returns the key for the epoch end store. -func EpochEndKey() []byte { - return []byte{EpochEndByte} +// ShouldUpdateValidatorSetByteKey returns the key for the epoch end store. +func ShouldUpdateValidatorSetByteKey() []byte { + return []byte{ShouldUpdateValidatorSetByte} } // UndelegationMaturityEpochKey returns the key for the undelegation maturity epoch store. diff --git a/x/operator/client/cli/query.go b/x/operator/client/cli/query.go index 4d273d784..40e33ed0f 100644 --- a/x/operator/client/cli/query.go +++ b/x/operator/client/cli/query.go @@ -2,6 +2,7 @@ package cli import ( "context" + "strconv" "strings" "github.com/ExocoreNetwork/exocore/x/avs/types" @@ -63,6 +64,9 @@ func GetQueryCmd() *cobra.Command { QueryAllOperatorsWithOptInAVS(), QueryAllAVSsByOperator(), GetOptInfo(), + QuerySnapshotHelper(), + QueryAllSnapshot(), + QuerySpecifiedSnapshot(), ) return cmd } @@ -456,3 +460,103 @@ func GetOptInfo() *cobra.Command { flags.AddQueryFlagsToCmd(cmd) return cmd } + +func QuerySnapshotHelper() *cobra.Command { + cmd := &cobra.Command{ + Use: "QuerySnapshotHelper ", + Short: "Get the voting power snapshot helper for the avs", + Long: "Get the voting power snapshot helper for the avs", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + if !common.IsHexAddress(args[0]) { + return xerrors.Errorf("invalid avs address,err:%s", types.ErrInvalidAddr) + } + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := operatortypes.NewQueryClient(clientCtx) + req := &operatortypes.QuerySnapshotAndHelperRequest{ + Avs: strings.ToLower(args[0]), + } + res, err := queryClient.QuerySnapshotHelper(context.Background(), req) + if err != nil { + return err + } + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + return cmd +} + +func QueryAllSnapshot() *cobra.Command { + cmd := &cobra.Command{ + Use: "QueryAllSnapshot ", + Short: "Get the all voting power snapshots for the avs", + Long: "Get the all voting power snapshots for the avs", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + if !common.IsHexAddress(args[0]) { + return xerrors.Errorf("invalid avs address,err:%s", types.ErrInvalidAddr) + } + pageReq, err := client.ReadPageRequest(cmd.Flags()) + if err != nil { + return err + } + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := operatortypes.NewQueryClient(clientCtx) + req := &operatortypes.QueryAllSnapshotRequest{ + Avs: strings.ToLower(args[0]), + Pagination: pageReq, + } + res, err := queryClient.QueryAllSnapshot(context.Background(), req) + if err != nil { + return err + } + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + return cmd +} + +func QuerySpecifiedSnapshot() *cobra.Command { + cmd := &cobra.Command{ + Use: "QuerySpecifiedSnapshot ", + Short: "Get the AVS voting power snapshot at specified height", + Long: "Get the AVS voting power snapshot at specified height", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) error { + if !common.IsHexAddress(args[0]) { + return xerrors.Errorf("invalid avs address,err:%s", types.ErrInvalidAddr) + } + height, err := strconv.ParseUint(args[1], 10, 64) + if err != nil { + return err + } + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := operatortypes.NewQueryClient(clientCtx) + req := &operatortypes.QuerySpecifiedSnapshotRequest{ + Avs: strings.ToLower(args[0]), + Height: int64(height), // #nosec G115 + } + res, err := queryClient.QuerySpecifiedSnapshot(context.Background(), req) + if err != nil { + return err + } + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + return cmd +} diff --git a/x/operator/keeper/abci.go b/x/operator/keeper/abci.go index 9485f8890..8368d1c96 100644 --- a/x/operator/keeper/abci.go +++ b/x/operator/keeper/abci.go @@ -2,7 +2,6 @@ package keeper import ( "errors" - "time" "github.com/ethereum/go-ethereum/common" @@ -130,7 +129,6 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str votingPowerSnapshot := operatortypes.VotingPowerSnapshot{ EpochIdentifier: epochIdentifier, EpochNumber: epochNumber, - BlockTime: ctx.BlockTime(), } // The voting power calculated at the end of the current epoch will be applied @@ -146,8 +144,6 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str // as the `AfterEpochEnd` is called in the beginBlock of next epoch's start height. snapshotHeight := ctx.BlockHeight() if !isForSlash { - // clear the slash flag at the end of the epoch - snapshotHelper.HasSlash = false // the epoch number should plus 1, as it's updated after the hook `AfterEpochEnd` is called votingPowerSnapshot.EpochNumber++ } @@ -191,12 +187,11 @@ func (k *Keeper) ClearVotingPowerSnapshot(ctx sdk.Context, avs string) error { if err != nil { return operatortypes.ErrFailToClearVPSnapshot.Wrapf("ClearVotingPowerSnapshot: failed to get the avs epoch information, err:%s, avs:%s", err, avs) } - - clearTime := ctx.BlockTime().Add(-epochInfo.Duration * time.Duration(unbondingDuration)) - if clearTime.After(ctx.BlockTime()) { - return operatortypes.ErrFailToClearVPSnapshot.Wrapf("ClearVotingPowerSnapshot: clearTime %s is in the future", clearTime) + clearEpochNumber := epochInfo.CurrentEpoch - int64(unbondingDuration) // #nosec G115 + if clearEpochNumber < 0 { + return nil } - err = k.RemoveVotingPowerSnapshot(ctx, avs, clearTime) + err = k.RemoveVotingPowerSnapshot(ctx, avs, clearEpochNumber) if err != nil { ctx.Logger().Error("Failed to remove voting power snapshot", "avs", avs, "error", err) return operatortypes.ErrFailToClearVPSnapshot.Wrapf("ClearVotingPowerSnapshot: failed to remove voting power snapshot, err:%s, avs:%s", err, avs) diff --git a/x/operator/keeper/grpc_query.go b/x/operator/keeper/grpc_query.go index c0444b60a..b39f930c7 100644 --- a/x/operator/keeper/grpc_query.go +++ b/x/operator/keeper/grpc_query.go @@ -2,9 +2,12 @@ package keeper import ( "context" + "encoding/binary" "errors" "strings" + "github.com/ethereum/go-ethereum/common" + keytypes "github.com/ExocoreNetwork/exocore/types/keys" assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" avstypes "github.com/ExocoreNetwork/exocore/x/avs/types" @@ -338,3 +341,51 @@ func (k *Keeper) Validator(c context.Context, req *types.QueryValidatorRequest) return &types.QueryValidatorResponse{Validator: val}, nil } + +func (k *Keeper) QuerySnapshotHelper(goCtx context.Context, req *types.QuerySnapshotAndHelperRequest) (*types.SnapshotHelper, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + snapshotHelper, err := k.GetSnapshotHelper(ctx, strings.ToLower(req.Avs)) + if err != nil { + return nil, err + } + return &snapshotHelper, nil +} + +func (k *Keeper) QuerySpecifiedSnapshot(goCtx context.Context, req *types.QuerySpecifiedSnapshotRequest) (*types.VotingPowerSnapshotWithKeyHeight, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + findHeight, snapshot, err := k.LoadVotingPowerSnapshot(ctx, strings.ToLower(req.Avs), req.Height) + if err != nil { + return nil, err + } + return &types.VotingPowerSnapshotWithKeyHeight{ + SnapshotKeyHeight: findHeight, + Snapshot: snapshot, + }, nil +} + +func (k *Keeper) QueryAllSnapshot(goCtx context.Context, req *types.QueryAllSnapshotRequest) (*types.QueryAllSnapshotResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + res := make([]*types.VotingPowerSnapshotWithKeyHeight, 0) + + snapshotPrefix := types.AppendMany(types.KeyPrefixVotingPowerSnapshot, common.HexToAddress(req.Avs).Bytes()) + store := prefix.NewStore(ctx.KVStore(k.storeKey), snapshotPrefix) + pageRes, err := query.Paginate(store, req.Pagination, func(key []byte, value []byte) error { + ret := &types.VotingPowerSnapshot{} + // don't use MustUnmarshal to not panic for queries + if err := ret.Unmarshal(value); err != nil { + return err + } + res = append(res, &types.VotingPowerSnapshotWithKeyHeight{ + SnapshotKeyHeight: int64(binary.BigEndian.Uint64(key)), // #nosec G115 + Snapshot: ret, + }) + return nil + }) + if err != nil { + return nil, err + } + return &types.QueryAllSnapshotResponse{ + Snapshots: res, + Pagination: pageRes, + }, nil +} diff --git a/x/operator/keeper/operator.go b/x/operator/keeper/operator.go index ee0e9ca2d..c29fb02bf 100644 --- a/x/operator/keeper/operator.go +++ b/x/operator/keeper/operator.go @@ -180,23 +180,83 @@ func (k *Keeper) IsActive(ctx sdk.Context, operatorAddr sdk.AccAddress, avsAddr return true } -func (k *Keeper) GetOptedInAVSForOperator(ctx sdk.Context, operatorAddr string) ([]string, error) { +func (k *Keeper) IterateOptInfo(ctx sdk.Context, isUpdate bool, iteratePrefix []byte, opFunc func(key []byte, optedInfo *operatortypes.OptedInfo) error) error { // get all opted-in info store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixOperatorOptedAVSInfo) - iterator := sdk.KVStorePrefixIterator(store, []byte(operatorAddr)) + iterator := sdk.KVStorePrefixIterator(store, iteratePrefix) defer iterator.Close() - avsList := make([]string, 0) for ; iterator.Valid(); iterator.Next() { var optedInfo operatortypes.OptedInfo k.cdc.MustUnmarshal(iterator.Value(), &optedInfo) + err := opFunc(iterator.Key(), &optedInfo) + if err != nil { + return err + } + if isUpdate { + bz := k.cdc.MustMarshal(&optedInfo) + store.Set(iterator.Key(), bz) + } + } + return nil +} + +func (k *Keeper) GetOptedInAVSForOperator(ctx sdk.Context, operatorAddr string) ([]string, error) { + avsList := make([]string, 0) + opFunc := func(key []byte, optedInfo *operatortypes.OptedInfo) error { if optedInfo.OptedOutHeight == operatortypes.DefaultOptedOutHeight { - keys, err := assetstype.ParseJoinedStoreKey(iterator.Key(), 2) + keys, err := assetstype.ParseJoinedStoreKey(key, 2) if err != nil { - return nil, err + return err } avsList = append(avsList, keys[1]) } + return nil + } + err := k.IterateOptInfo(ctx, false, []byte(operatorAddr), opFunc) + if err != nil { + return nil, err + } + return avsList, nil +} + +func (k *Keeper) GetImpactfulAVSForOperator(ctx sdk.Context, operatorAddr string) ([]string, error) { + avsList := make([]string, 0) + opFunc := func(key []byte, optedInfo *operatortypes.OptedInfo) error { + keys, err := assetstype.ParseJoinedStoreKey(key, 2) + avsAddr := keys[1] + if err != nil { + return err + } + // add AVS currently opting in to the operator's list. + if optedInfo.OptedOutHeight == operatortypes.DefaultOptedOutHeight { + avsList = append(avsList, avsAddr) + } else { + // Add AVS that have opted out but are still within the unbonding duration, + // and therefore still affect the operator, to the list. + // #nosec G115 + epochNumber, err := k.GetEpochNumberByOptOutHeight(ctx, avsAddr, int64(optedInfo.OptedOutHeight)) + if err != nil { + return err + } + epochInfo, err := k.avsKeeper.GetAVSEpochInfo(ctx, avsAddr) + if err != nil { + return err + } + unbondingDuration, err := k.avsKeeper.GetAVSUnbondingDuration(ctx, avsAddr) + if err != nil { + return err + } + // #nosec G115 + if epochNumber+int64(unbondingDuration) <= epochInfo.CurrentEpoch { + avsList = append(avsList, avsAddr) + } + } + return nil + } + err := k.IterateOptInfo(ctx, false, []byte(operatorAddr), opFunc) + if err != nil { + return nil, err } return avsList, nil } @@ -212,37 +272,38 @@ func (k *Keeper) SetAllOptedInfo(ctx sdk.Context, optedStates []operatortypes.Op } func (k *Keeper) GetAllOptedInfo(ctx sdk.Context) ([]operatortypes.OptedState, error) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixOperatorOptedAVSInfo) - iterator := sdk.KVStorePrefixIterator(store, []byte{}) - defer iterator.Close() - ret := make([]operatortypes.OptedState, 0) - for ; iterator.Valid(); iterator.Next() { - var optedInfo operatortypes.OptedInfo - k.cdc.MustUnmarshal(iterator.Value(), &optedInfo) + opFunc := func(key []byte, optedInfo *operatortypes.OptedInfo) error { ret = append(ret, operatortypes.OptedState{ - Key: string(iterator.Key()), - OptInfo: optedInfo, + Key: string(key), + OptInfo: *optedInfo, }) + return nil + } + err := k.IterateOptInfo(ctx, false, []byte{}, opFunc) + if err != nil { + return nil, err } return ret, nil } func (k *Keeper) GetOptedInOperatorListByAVS(ctx sdk.Context, avsAddr string) ([]string, error) { - // get all opted-in info - store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixOperatorOptedAVSInfo) - iterator := sdk.KVStorePrefixIterator(store, nil) - defer iterator.Close() - operatorList := make([]string, 0) - for ; iterator.Valid(); iterator.Next() { - keys, err := assetstype.ParseJoinedStoreKey(iterator.Key(), 2) - if err != nil { - return nil, err - } - if strings.ToLower(avsAddr) == keys[1] { - operatorList = append(operatorList, keys[0]) + opFunc := func(key []byte, optedInfo *operatortypes.OptedInfo) error { + if optedInfo.OptedOutHeight == operatortypes.DefaultOptedOutHeight { + keys, err := assetstype.ParseJoinedStoreKey(key, 2) + if err != nil { + return err + } + if strings.ToLower(avsAddr) == keys[1] { + operatorList = append(operatorList, keys[0]) + } } + return nil + } + err := k.IterateOptInfo(ctx, false, []byte{}, opFunc) + if err != nil { + return nil, err } return operatorList, nil } diff --git a/x/operator/keeper/opt_test.go b/x/operator/keeper/opt_test.go index eeed045ed..217865094 100644 --- a/x/operator/keeper/opt_test.go +++ b/x/operator/keeper/opt_test.go @@ -4,12 +4,13 @@ import ( "strings" "time" - assetskeeper "github.com/ExocoreNetwork/exocore/x/assets/keeper" - avstypes "github.com/ExocoreNetwork/exocore/x/avs/types" - epochstypes "github.com/ExocoreNetwork/exocore/x/epochs/types" + "github.com/ExocoreNetwork/exocore/x/epochs/types" sdkmath "cosmossdk.io/math" + assetskeeper "github.com/ExocoreNetwork/exocore/x/assets/keeper" assetstypes "github.com/ExocoreNetwork/exocore/x/assets/types" + avskeeper "github.com/ExocoreNetwork/exocore/x/avs/keeper" + avstypes "github.com/ExocoreNetwork/exocore/x/avs/types" delegationtype "github.com/ExocoreNetwork/exocore/x/delegation/types" operatorKeeper "github.com/ExocoreNetwork/exocore/x/operator/keeper" operatorTypes "github.com/ExocoreNetwork/exocore/x/operator/types" @@ -92,11 +93,11 @@ func (suite *OperatorTestSuite) prepare() { suite.prepareDelegation(true, suite.Address, usdtAddr, suite.operatorAddr, delegationAmount) } -func (suite *OperatorTestSuite) prepareAvs(assetIDs []string) { +func (suite *OperatorTestSuite) prepareAvs(assetIDs []string, epochIdentifier string) { suite.avsAddr = common.BytesToAddress([]byte("avsTestAddr")).String() err := suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{ - Action: avstypes.RegisterAction, - EpochIdentifier: epochstypes.HourEpochID, + Action: avskeeper.RegisterAction, + EpochIdentifier: epochIdentifier, AvsAddress: common.HexToAddress(suite.avsAddr), AssetID: assetIDs, UnbondingPeriod: 5, @@ -133,7 +134,7 @@ func (suite *OperatorTestSuite) CheckState(expectedState *StateForCheck) { func (suite *OperatorTestSuite) TestOptIn() { suite.prepare() - suite.prepareAvs([]string{usdtAssetID}) + suite.prepareAvs([]string{usdtAssetID}, types.HourEpochID) err := suite.App.OperatorKeeper.OptIn(suite.Ctx, suite.operatorAddr, suite.avsAddr) suite.NoError(err) // check if the related state is correct @@ -161,7 +162,7 @@ func (suite *OperatorTestSuite) TestOptIn() { func (suite *OperatorTestSuite) TestOptInList() { suite.prepare() - suite.prepareAvs([]string{usdtAssetID}) + suite.prepareAvs([]string{usdtAssetID}, types.HourEpochID) err := suite.App.OperatorKeeper.OptIn(suite.Ctx, suite.operatorAddr, suite.avsAddr) suite.NoError(err) // check if the related state is correct @@ -177,7 +178,7 @@ func (suite *OperatorTestSuite) TestOptInList() { func (suite *OperatorTestSuite) TestOptOut() { suite.prepare() - suite.prepareAvs([]string{usdtAssetID}) + suite.prepareAvs([]string{usdtAssetID}, types.HourEpochID) err := suite.App.OperatorKeeper.OptOut(suite.Ctx, suite.operatorAddr, suite.avsAddr) suite.EqualError(err, operatorTypes.ErrNotOptedIn.Error()) diff --git a/x/operator/keeper/slash.go b/x/operator/keeper/slash.go index 8e50cca2e..70e8c48d2 100644 --- a/x/operator/keeper/slash.go +++ b/x/operator/keeper/slash.go @@ -197,12 +197,12 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { } // update the voting power and save the snapshot for all affected AVSs - avsList, err := k.GetOptedInAVSForOperator(ctx, parameter.Operator.String()) + affectedAVSList, err := k.GetImpactfulAVSForOperator(ctx, parameter.Operator.String()) if err != nil { return err } - for i := range avsList { - avs := avsList[i] + for i := range affectedAVSList { + avs := affectedAVSList[i] epochInfo, err := k.avsKeeper.GetAVSEpochInfo(ctx, avs) if err != nil { return err @@ -211,11 +211,8 @@ func (k *Keeper) Slash(ctx sdk.Context, parameter *types.SlashInputInfo) error { if err != nil { return err } - err = k.SetSlashFlag(ctx, avs, true) - if err != nil { - return err - } } + k.hooks.AfterSlash(ctx, parameter.Operator, affectedAVSList) return nil } diff --git a/x/operator/keeper/usd_value.go b/x/operator/keeper/usd_value.go index 16fb42e44..15dd3c9ea 100644 --- a/x/operator/keeper/usd_value.go +++ b/x/operator/keeper/usd_value.go @@ -270,7 +270,7 @@ func (k *Keeper) SetAllOperatorUSDValues(ctx sdk.Context, usdValues []operatorty for i := range usdValues { usdValue := usdValues[i] bz := k.cdc.MustMarshal(&usdValue.OptedUSDValue) - store.Set([]byte(usdValue.Key), bz) + store.Set([]byte(strings.ToLower(usdValue.Key)), bz) } return nil } @@ -302,19 +302,42 @@ func (k *Keeper) SetAllAVSUSDValues(ctx sdk.Context, usdValues []operatortypes.A return nil } -func (k *Keeper) GetAllAVSUSDValues(ctx sdk.Context) ([]operatortypes.AVSUSDValue, error) { +func (k *Keeper) IterateAVSUSDValues(ctx sdk.Context, isUpdate bool, opFunc func(avsAddr string, avsUSDValue *operatortypes.DecValueField) error) error { store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixUSDValueForAVS) iterator := sdk.KVStorePrefixIterator(store, []byte{}) defer iterator.Close() - ret := make([]operatortypes.AVSUSDValue, 0) for ; iterator.Valid(); iterator.Next() { var usdValue operatortypes.DecValueField k.cdc.MustUnmarshal(iterator.Value(), &usdValue) + err := opFunc(string(iterator.Key()), &usdValue) + if err != nil { + return err + } + if isUpdate { + bz := k.cdc.MustMarshal(&usdValue) + store.Set(iterator.Key(), bz) + } + } + return nil +} + +func (k *Keeper) GetAllAVSUSDValues(ctx sdk.Context) ([]operatortypes.AVSUSDValue, error) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixUSDValueForAVS) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + defer iterator.Close() + + ret := make([]operatortypes.AVSUSDValue, 0) + opFunc := func(avsAddr string, avsUSDValue *operatortypes.DecValueField) error { ret = append(ret, operatortypes.AVSUSDValue{ - AVSAddr: string(iterator.Key()), - Value: usdValue, + AVSAddr: avsAddr, + Value: *avsUSDValue, }) + return nil + } + err := k.IterateAVSUSDValues(ctx, false, opFunc) + if err != nil { + return nil, err } return ret, nil } diff --git a/x/operator/keeper/usd_value_test.go b/x/operator/keeper/usd_value_test.go index 1f19f1f61..b3808ca15 100644 --- a/x/operator/keeper/usd_value_test.go +++ b/x/operator/keeper/usd_value_test.go @@ -3,6 +3,8 @@ package keeper_test import ( "time" + "github.com/ExocoreNetwork/exocore/x/epochs/types" + sdkmath "cosmossdk.io/math" assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" avstypes "github.com/ExocoreNetwork/exocore/x/avs/types" @@ -92,7 +94,7 @@ func (suite *OperatorTestSuite) TestAVSUSDValue() { ) suite.NoError(err) // register the new AVS - suite.prepareAvs([]string{usdcAssetID, usdtAssetID}) + suite.prepareAvs([]string{usdcAssetID, usdtAssetID}, types.HourEpochID) // opt in err = suite.App.OperatorKeeper.OptIn(suite.Ctx, suite.operatorAddr, suite.avsAddr) suite.NoError(err) @@ -174,7 +176,7 @@ func (suite *OperatorTestSuite) TestVotingPowerForDogFood() { suite.NoError(err) suite.True(found) - suite.App.StakingKeeper.MarkEpochEnd(suite.Ctx) + suite.App.StakingKeeper.MarkUpdateValidatorSetFlag(suite.Ctx) validatorUpdates := suite.App.StakingKeeper.EndBlock(suite.Ctx) suite.Equal(1, len(validatorUpdates)) for i, update := range validatorUpdates { diff --git a/x/operator/keeper/voting_power_snapshot.go b/x/operator/keeper/voting_power_snapshot.go index 481ffe20f..c43af63b4 100644 --- a/x/operator/keeper/voting_power_snapshot.go +++ b/x/operator/keeper/voting_power_snapshot.go @@ -1,13 +1,10 @@ package keeper import ( - "time" - - "github.com/ethereum/go-ethereum/common" - "github.com/ExocoreNetwork/exocore/x/operator/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/ethereum/go-ethereum/common" ) func (k *Keeper) SetVotingPowerSnapshot(ctx sdk.Context, key []byte, snapshot *types.VotingPowerSnapshot) error { @@ -56,12 +53,8 @@ func (k *Keeper) IterateVotingPowerSnapshot(ctx sdk.Context, avsAddr string, isU return nil } -// LoadVotingPowerSnapshot loads the voting power snapshot information for the provided height, -// returning the height of the first block in the epoch the snapshot serves, along with the specific -// voting power data. The start height will be used to filter pending undelegations during slashing. -func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr string, height int64) (int64, *types.VotingPowerSnapshot, error) { +func (k *Keeper) GetSnapshotHeightAndKey(ctx sdk.Context, avsAddr string, height int64) (int64, []byte, error) { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) - var ret types.VotingPowerSnapshot // If there is no snapshot for the input height, we need to find the correct key. // The snapshot closest to the input height is the one used for its voting // power information. The correct snapshot key can be found by taking advantage @@ -85,11 +78,39 @@ func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr string, height } } } + return findHeight, findKey, nil +} +func (k *Keeper) GetEpochNumberByOptOutHeight(ctx sdk.Context, avsAddr string, optOutHeight int64) (int64, error) { + findHeight, findKey, err := k.GetSnapshotHeightAndKey(ctx, avsAddr, optOutHeight) + if err != nil { + return 0, err + } + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) value := store.Get(findKey) if value == nil { - return 0, nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: height is %v", findHeight) + return 0, types.ErrNoKeyInTheStore.Wrapf("GetEpochNumberByOptOutHeight: findHeight:%v, optOutHeight:%v", findHeight, optOutHeight) } + var ret types.VotingPowerSnapshot + k.cdc.MustUnmarshal(value, &ret) + return ret.EpochNumber, nil +} + +// LoadVotingPowerSnapshot loads the voting power snapshot information for the provided height, +// returning the height of the first block in the epoch the snapshot serves, along with the specific +// voting power data. The start height will be used to filter pending undelegations during slashing. +func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr string, height int64) (int64, *types.VotingPowerSnapshot, error) { + findHeight, findKey, err := k.GetSnapshotHeightAndKey(ctx, avsAddr, height) + if err != nil { + return 0, nil, err + } + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) + value := store.Get(findKey) + if value == nil { + avs, keyHeight, _ := types.ParseVotingPowerSnapshotKey(findKey) + return 0, nil, types.ErrNoKeyInTheStore.Wrapf("LoadVotingPowerSnapshot: findHeight is %v, avs:%s ,keyHeight:%v", findHeight, avs, keyHeight) + } + var ret types.VotingPowerSnapshot k.cdc.MustUnmarshal(value, &ret) // fall back to get the snapshot if the key height doesn't equal to the `LastChangedHeight` @@ -103,8 +124,8 @@ func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr string, height return findHeight, &ret, nil } -// RemoveVotingPowerSnapshot remove all snapshots older than the input time. -func (k *Keeper) RemoveVotingPowerSnapshot(ctx sdk.Context, avsAddr string, time time.Time) error { +// RemoveVotingPowerSnapshot remove all snapshots older than the input epoch number. +func (k *Keeper) RemoveVotingPowerSnapshot(ctx sdk.Context, avsAddr string, epochNumber int64) error { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) iterator := sdk.KVStorePrefixIterator(store, common.HexToAddress(avsAddr).Bytes()) defer iterator.Close() @@ -115,7 +136,7 @@ func (k *Keeper) RemoveVotingPowerSnapshot(ctx sdk.Context, avsAddr string, time var snapshot types.VotingPowerSnapshot k.cdc.MustUnmarshal(iterator.Value(), &snapshot) _, height, _ := types.ParseVotingPowerSnapshotKey(iterator.Key()) - if snapshot.BlockTime.Compare(time) >= 0 { + if snapshot.EpochNumber > epochNumber { // delete the retained key, because the snapshots that is earlier than the input time // don't need to retain any old snapshot key. if height == snapshot.LastChangedHeight && retainedKey != nil { @@ -163,14 +184,6 @@ func (k *Keeper) SetOptOutFlag(ctx sdk.Context, avsAddr string, hasOptOut bool) return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) } -func (k *Keeper) SetSlashFlag(ctx sdk.Context, avsAddr string, hasSlash bool) error { - opFunc := func(helper *types.SnapshotHelper) error { - helper.HasSlash = hasSlash - return nil // Reserve for future error handling - } - return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) -} - func (k *Keeper) SetLastChangedHeight(ctx sdk.Context, avsAddr string, lastChangeHeight int64) error { opFunc := func(helper *types.SnapshotHelper) error { helper.LastChangedHeight = lastChangeHeight @@ -202,11 +215,54 @@ func (k *Keeper) HasSnapshotHelper(ctx sdk.Context, avsAddr string) bool { return store.Has([]byte(avsAddr)) } -func (k *Keeper) HasSlash(ctx sdk.Context, avsAddr string) bool { - helper, err := k.GetSnapshotHelper(ctx, avsAddr) +func (k *Keeper) InitGenesisVPSnapshot(ctx sdk.Context) error { + snapshotStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) + snapshotHelperStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSnapshotHelper) + opFunc := func(avsAddr string, avsUSDValue *types.DecValueField) error { + votingPowerSet := make([]*types.OperatorVotingPower, 0) + opFunc := func(operator string, optedUSDValues *types.OperatorOptedUSDValue) error { + if optedUSDValues.ActiveUSDValue.IsPositive() { + votingPowerSet = append(votingPowerSet, &types.OperatorVotingPower{ + OperatorAddr: operator, + VotingPower: optedUSDValues.ActiveUSDValue, + }) + } + return nil + } + err := k.IterateOperatorsForAVS(ctx, avsAddr, false, opFunc) + if err != nil { + return err + } + epochInfo, err := k.avsKeeper.GetAVSEpochInfo(ctx, avsAddr) + if err != nil { + return err + } + genesisSnapshotHeight := ctx.BlockHeight() + 1 + epochNumber := epochInfo.CurrentEpoch + // set the epoch number to 1 when epoch start for the first time. + if !epochInfo.EpochCountingStarted { + epochNumber = 1 + } + bz := k.cdc.MustMarshal(&types.VotingPowerSnapshot{ + TotalVotingPower: avsUSDValue.Amount, + OperatorVotingPowers: votingPowerSet, + LastChangedHeight: genesisSnapshotHeight, + EpochIdentifier: epochInfo.Identifier, + EpochNumber: epochNumber, + }) + snapshotKey := types.KeyForVotingPowerSnapshot(common.HexToAddress(avsAddr), genesisSnapshotHeight) + snapshotStore.Set(snapshotKey, bz) + + bz = k.cdc.MustMarshal(&types.SnapshotHelper{ + LastChangedHeight: genesisSnapshotHeight, + HasOptOut: false, + }) + snapshotHelperStore.Set([]byte(avsAddr), bz) + return nil + } + err := k.IterateAVSUSDValues(ctx, false, opFunc) if err != nil { - ctx.Logger().Error("Failed to get SnapshotHelper in HasSlash", "avsAddr", avsAddr, "error", err) - return false + return err } - return helper.HasSlash + return nil } diff --git a/x/operator/keeper/voting_power_snapshot_test.go b/x/operator/keeper/voting_power_snapshot_test.go index 3ed406d58..e7aed870a 100644 --- a/x/operator/keeper/voting_power_snapshot_test.go +++ b/x/operator/keeper/voting_power_snapshot_test.go @@ -7,6 +7,8 @@ import ( "sort" "time" + avstypes "github.com/ExocoreNetwork/exocore/x/avs/types" + sdkmath "cosmossdk.io/math" testutiltx "github.com/ExocoreNetwork/exocore/testutil/tx" @@ -32,7 +34,7 @@ func (suite *OperatorTestSuite) prepareForSnapshotTesting(operatorNumber int) te // set default client chainID and asset suite.clientChainLzID = defaultClientChainID // prepare AVS - suite.prepareAvs([]string{usdtAssetID}) + suite.prepareAvs([]string{usdtAssetID}, epochstypes.DayEpochID) // prepare stakers and operators operators := make([]sdk.AccAddress, operatorNumber) stakers := make([]common.Address, operatorNumber) @@ -53,9 +55,16 @@ func (suite *OperatorTestSuite) prepareForSnapshotTesting(operatorNumber int) te suite.prepareDeposit(stakers[i], usdtAddr, depositAmount) // delegate assets suite.prepareDelegation(true, stakers[i], usdtAddr, operators[i], delegateAmount) - // opt in + // opt in the test AVS err = suite.App.OperatorKeeper.OptIn(suite.Ctx, operators[i], suite.avsAddr) suite.NoError(err) + // opt in the dogfood AVS + chainIDWithoutRevision := avstypes.ChainIDWithoutRevision(suite.Ctx.ChainID()) + dogfoodAVSAddr := avstypes.GenerateAVSAddr(chainIDWithoutRevision) + pubKey := testutiltx.GenerateConsensusKey() + suite.Require().NotNil(pubKey) + err = suite.App.OperatorKeeper.OptInWithConsKey(suite.Ctx, operators[i], dogfoodAVSAddr, pubKey) + suite.NoError(err) } sort.Slice(stakers, func(i, j int) bool { return operators[i].String() < operators[j].String() @@ -73,17 +82,17 @@ func (suite *OperatorTestSuite) prepareForSnapshotTesting(operatorNumber int) te } func (suite *OperatorTestSuite) runToEpochEnd() { - // the default AVS epoch identifier is hour - // Configure 3 blocks per epoch for testing, so the block duration is 20 minutes + // the default AVS epoch identifier is day + // Configure 3 blocks per epoch for testing, so the block duration is 8 hours // so starting from the initial block of the epoch, it takes three blocks to // reach the epoch’s end block. for i := int64(0); i < blockNumberPerEpoch; i++ { - suite.CommitAfter(time.Hour / time.Duration(blockNumberPerEpoch)) + suite.CommitAfter(8 * time.Hour) } } func (suite *OperatorTestSuite) printAllSnapshot() { - epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.HourEpochID) + epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.DayEpochID) suite.True(found) fmt.Println("epoch", epochInfo.CurrentEpoch, "startHeight", epochInfo.CurrentEpochStartHeight) opFunc := func(height int64, snapshot *types.VotingPowerSnapshot) error { @@ -100,7 +109,7 @@ func (suite *OperatorTestSuite) printAllSnapshot() { func (suite *OperatorTestSuite) TestInitializeSnapshot() { helperInfo := suite.prepareForSnapshotTesting(operatorNumber) suite.runToEpochEnd() - epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.HourEpochID) + epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.DayEpochID) suite.True(found) // the height in the snapshot key should be the start height of next epoch. snapshotHeight, snapshot, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, epochInfo.CurrentEpochStartHeight) @@ -123,7 +132,6 @@ func (suite *OperatorTestSuite) TestInitializeSnapshot() { LastChangedHeight: epochInfo.CurrentEpochStartHeight, EpochIdentifier: epochInfo.Identifier, EpochNumber: epochInfo.CurrentEpoch, - BlockTime: suite.Ctx.BlockTime(), } suite.Equal(expectedSnapshot, *snapshot) @@ -147,7 +155,7 @@ func (suite *OperatorTestSuite) TestSnapshotVPUnchanged() { for i := 0; i < runToEpochNumber; i++ { suite.runToEpochEnd() - epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.HourEpochID) + epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.DayEpochID) suite.True(found) startHeight := epochInfo.CurrentEpochStartHeight endHeight := startHeight + blockNumberPerEpoch - 1 @@ -244,7 +252,7 @@ func (suite *OperatorTestSuite) TestSnapshotWithSlash() { suite.NoError(err) // run to next block to execute slashing index := 0 - suite.CommitAfter(time.Hour / time.Duration(blockNumberPerEpoch)) + suite.CommitAfter(8 * time.Hour) slashProportion := sdkmath.LegacyMustNewDecFromStr("0.1") remainingProportion := sdkmath.LegacyNewDec(1).Sub(slashProportion) slashParam := &types.SlashInputInfo{ @@ -268,8 +276,27 @@ func (suite *OperatorTestSuite) TestSnapshotWithSlash() { snapshotHelper, err := suite.App.OperatorKeeper.GetSnapshotHelper(suite.Ctx, suite.avsAddr) suite.NoError(err) - suite.True(snapshotHelper.HasSlash) suite.Equal(suite.Ctx.BlockHeight(), snapshotHelper.LastChangedHeight) + + shouldUpdateValidatorSet := suite.App.StakingKeeper.ShouldUpdateValidatorSet(suite.Ctx) + suite.True(shouldUpdateValidatorSet) +} + +func (suite *OperatorTestSuite) TestGenesisSnapshot() { + suite.prepareForSnapshotTesting(operatorNumber) + firstBlockHeight := suite.Ctx.BlockHeight() + chainIDWithoutRevision := avstypes.ChainIDWithoutRevision(suite.Ctx.ChainID()) + dogfoodAVSAddr := avstypes.GenerateAVSAddr(chainIDWithoutRevision) + for i := int64(0); i < blockNumberPerEpoch; i++ { + height, snapshot, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, dogfoodAVSAddr, firstBlockHeight) + suite.NoError(err) + suite.Equal(firstBlockHeight, height) + suite.Equal(firstBlockHeight, snapshot.LastChangedHeight) + snapshotHelper, err := suite.App.OperatorKeeper.GetSnapshotHelper(suite.Ctx, dogfoodAVSAddr) + suite.NoError(err) + suite.Equal(firstBlockHeight, snapshotHelper.LastChangedHeight) + } + suite.printAllSnapshot() } func (suite *OperatorTestSuite) TestSnapshotPruning() { diff --git a/x/operator/types/expected_keepers.go b/x/operator/types/expected_keepers.go index 4b81e2fd5..7844c3344 100644 --- a/x/operator/types/expected_keepers.go +++ b/x/operator/types/expected_keepers.go @@ -120,19 +120,23 @@ type SlashKeeper interface { } type OperatorHooks interface { - // This hook is called when an operator declares the consensus key for the provided chain. + // AfterOperatorKeySet This hook is called when an operator declares the consensus key for the provided chain. AfterOperatorKeySet( ctx sdk.Context, addr sdk.AccAddress, chainID string, pubKey keytypes.WrappedConsKey, ) - // This hook is called when an operator's consensus key is replaced for a chain. + // AfterOperatorKeyReplaced This hook is called when an operator's consensus key is replaced for a chain. AfterOperatorKeyReplaced( ctx sdk.Context, addr sdk.AccAddress, oldKey keytypes.WrappedConsKey, newKey keytypes.WrappedConsKey, chainID string, ) - // This hook is called when an operator initiates the removal of a consensus key for a + // AfterOperatorKeyRemovalInitiated This hook is called when an operator initiates the removal of a consensus key for a // chain. AfterOperatorKeyRemovalInitiated( ctx sdk.Context, addr sdk.AccAddress, chainID string, key keytypes.WrappedConsKey, ) + // AfterSlash This hook is called when an operator is slashed + AfterSlash( + ctx sdk.Context, addr sdk.AccAddress, affectedAVSList []string, + ) } diff --git a/x/operator/types/genesis.pb.go b/x/operator/types/genesis.pb.go index 0b55379ab..2c0c802cf 100644 --- a/x/operator/types/genesis.pb.go +++ b/x/operator/types/genesis.pb.go @@ -315,7 +315,7 @@ func (m *AVSUSDValue) GetValue() DecValueField { // it's corresponding to the kvStore `KeyPrefixUSDValueForOperator` type OperatorUSDValue struct { // key is used for storing the voting power of specified operator and AVS, - // which is the combination of operator and AVS address. + // which is the combination of AVS and operator address. Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` // value is the USD value states for the AVS address OptedUSDValue OperatorOptedUSDValue `protobuf:"bytes,2,opt,name=opted_usd_value,json=optedUsdValue,proto3" json:"opted_usd_value"` diff --git a/x/operator/types/hooks.go b/x/operator/types/hooks.go index 2ade6e5f1..61cf6e4c2 100644 --- a/x/operator/types/hooks.go +++ b/x/operator/types/hooks.go @@ -43,3 +43,11 @@ func (hooks MultiOperatorHooks) AfterOperatorKeyRemovalInitiated( hook.AfterOperatorKeyRemovalInitiated(ctx, addr, chainID, key) } } + +func (hooks MultiOperatorHooks) AfterSlash( + ctx sdk.Context, addr sdk.AccAddress, affectedAVSList []string, +) { + for _, hook := range hooks { + hook.AfterSlash(ctx, addr, affectedAVSList) + } +} diff --git a/x/operator/types/query.pb.go b/x/operator/types/query.pb.go index 9e6cacd68..52e2bbed4 100644 --- a/x/operator/types/query.pb.go +++ b/x/operator/types/query.pb.go @@ -9,7 +9,6 @@ import ( crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/cosmos/cosmos-proto" query "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -1354,28 +1353,25 @@ func (m *QueryOptInfoRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryOptInfoRequest proto.InternalMessageInfo -// QueryValidatorsRequest is request type for Query/Validators RPC method. -type QueryValidatorsRequest struct { - // chain is the id of the chain served by the operator. here chain_id is not used since the - // Linter complains about capitalization, which can be set with a gogoproto.custom_name but - // that is not compatible with google.api.http.get in the Query service below. - Chain string `protobuf:"bytes,1,opt,name=chain,proto3" json:"chain,omitempty"` - // pagination defines an optional pagination for the request. - Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +// QuerySnapshotAndHelperRequest is the request to obtain the voting power snapshot +// and helper information. +type QuerySnapshotAndHelperRequest struct { + // avs address + Avs string `protobuf:"bytes,1,opt,name=avs,proto3" json:"avs,omitempty"` } -func (m *QueryValidatorsRequest) Reset() { *m = QueryValidatorsRequest{} } -func (m *QueryValidatorsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryValidatorsRequest) ProtoMessage() {} -func (*QueryValidatorsRequest) Descriptor() ([]byte, []int) { +func (m *QuerySnapshotAndHelperRequest) Reset() { *m = QuerySnapshotAndHelperRequest{} } +func (m *QuerySnapshotAndHelperRequest) String() string { return proto.CompactTextString(m) } +func (*QuerySnapshotAndHelperRequest) ProtoMessage() {} +func (*QuerySnapshotAndHelperRequest) Descriptor() ([]byte, []int) { return fileDescriptor_f91e795a3cecbdbf, []int{25} } -func (m *QueryValidatorsRequest) XXX_Unmarshal(b []byte) error { +func (m *QuerySnapshotAndHelperRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryValidatorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QuerySnapshotAndHelperRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryValidatorsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QuerySnapshotAndHelperRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1385,52 +1381,108 @@ func (m *QueryValidatorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryValidatorsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryValidatorsRequest.Merge(m, src) +func (m *QuerySnapshotAndHelperRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySnapshotAndHelperRequest.Merge(m, src) } -func (m *QueryValidatorsRequest) XXX_Size() int { +func (m *QuerySnapshotAndHelperRequest) XXX_Size() int { return m.Size() } -func (m *QueryValidatorsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryValidatorsRequest.DiscardUnknown(m) +func (m *QuerySnapshotAndHelperRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySnapshotAndHelperRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryValidatorsRequest proto.InternalMessageInfo +var xxx_messageInfo_QuerySnapshotAndHelperRequest proto.InternalMessageInfo -func (m *QueryValidatorsRequest) GetChain() string { +func (m *QuerySnapshotAndHelperRequest) GetAvs() string { if m != nil { - return m.Chain + return m.Avs } return "" } -func (m *QueryValidatorsRequest) GetPagination() *query.PageRequest { - if m != nil { - return m.Pagination +// QuerySpecifiedSnapshotRequest is the request to obtain the voting power snapshot +// at the specified height. +type QuerySpecifiedSnapshotRequest struct { + // avs address + Avs string `protobuf:"bytes,1,opt,name=avs,proto3" json:"avs,omitempty"` + // height is used to specify the snapshot height you want to query. + Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` +} + +func (m *QuerySpecifiedSnapshotRequest) Reset() { *m = QuerySpecifiedSnapshotRequest{} } +func (m *QuerySpecifiedSnapshotRequest) String() string { return proto.CompactTextString(m) } +func (*QuerySpecifiedSnapshotRequest) ProtoMessage() {} +func (*QuerySpecifiedSnapshotRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f91e795a3cecbdbf, []int{26} +} +func (m *QuerySpecifiedSnapshotRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySpecifiedSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySpecifiedSnapshotRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return nil +} +func (m *QuerySpecifiedSnapshotRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySpecifiedSnapshotRequest.Merge(m, src) +} +func (m *QuerySpecifiedSnapshotRequest) XXX_Size() int { + return m.Size() +} +func (m *QuerySpecifiedSnapshotRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySpecifiedSnapshotRequest.DiscardUnknown(m) } -// QueryValidatorsResponse is response type for the Query/Validators RPC method -type QueryValidatorsResponse struct { - // validators contains all the queried validators. - Validators []Validator `protobuf:"bytes,1,rep,name=validators,proto3" json:"validators"` - // pagination defines the pagination in the response. - Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +var xxx_messageInfo_QuerySpecifiedSnapshotRequest proto.InternalMessageInfo + +func (m *QuerySpecifiedSnapshotRequest) GetAvs() string { + if m != nil { + return m.Avs + } + return "" } -func (m *QueryValidatorsResponse) Reset() { *m = QueryValidatorsResponse{} } -func (m *QueryValidatorsResponse) String() string { return proto.CompactTextString(m) } -func (*QueryValidatorsResponse) ProtoMessage() {} -func (*QueryValidatorsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f91e795a3cecbdbf, []int{26} +func (m *QuerySpecifiedSnapshotRequest) GetHeight() int64 { + if m != nil { + return m.Height + } + return 0 +} + +// VotingPowerSnapshotWithKeyHeight is used in the response of QuerySpecifiedSnapshot +// and QueryAllSnapshot +type VotingPowerSnapshotWithKeyHeight struct { + // snapshot_key_height when it is used in QuerySpecifiedSnapshot, it's the latest + // height with a snapshot key found based on the input height; this height is typically + // the start height of the epoch in which the input height is located. + // when it is used in QueryAllSnapshot, it's the height in the current snapshot key. + SnapshotKeyHeight int64 `protobuf:"varint,1,opt,name=snapshot_key_height,json=snapshotKeyHeight,proto3" json:"snapshot_key_height,omitempty"` + // snapshot when it is used in QuerySpecifiedSnapshot, it is the final retrieved information + // containing the voting power set. + // when it is used in QueryAllSnapshot, It is the snapshot stored under `snapshot_key_height`, + // and its voting power set may be nil. + Snapshot *VotingPowerSnapshot `protobuf:"bytes,2,opt,name=snapshot,proto3" json:"snapshot,omitempty"` +} + +func (m *VotingPowerSnapshotWithKeyHeight) Reset() { *m = VotingPowerSnapshotWithKeyHeight{} } +func (m *VotingPowerSnapshotWithKeyHeight) String() string { return proto.CompactTextString(m) } +func (*VotingPowerSnapshotWithKeyHeight) ProtoMessage() {} +func (*VotingPowerSnapshotWithKeyHeight) Descriptor() ([]byte, []int) { + return fileDescriptor_f91e795a3cecbdbf, []int{27} } -func (m *QueryValidatorsResponse) XXX_Unmarshal(b []byte) error { +func (m *VotingPowerSnapshotWithKeyHeight) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryValidatorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *VotingPowerSnapshotWithKeyHeight) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryValidatorsResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_VotingPowerSnapshotWithKeyHeight.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1440,54 +1492,53 @@ func (m *QueryValidatorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (m *QueryValidatorsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryValidatorsResponse.Merge(m, src) +func (m *VotingPowerSnapshotWithKeyHeight) XXX_Merge(src proto.Message) { + xxx_messageInfo_VotingPowerSnapshotWithKeyHeight.Merge(m, src) } -func (m *QueryValidatorsResponse) XXX_Size() int { +func (m *VotingPowerSnapshotWithKeyHeight) XXX_Size() int { return m.Size() } -func (m *QueryValidatorsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryValidatorsResponse.DiscardUnknown(m) +func (m *VotingPowerSnapshotWithKeyHeight) XXX_DiscardUnknown() { + xxx_messageInfo_VotingPowerSnapshotWithKeyHeight.DiscardUnknown(m) } -var xxx_messageInfo_QueryValidatorsResponse proto.InternalMessageInfo +var xxx_messageInfo_VotingPowerSnapshotWithKeyHeight proto.InternalMessageInfo -func (m *QueryValidatorsResponse) GetValidators() []Validator { +func (m *VotingPowerSnapshotWithKeyHeight) GetSnapshotKeyHeight() int64 { if m != nil { - return m.Validators + return m.SnapshotKeyHeight } - return nil + return 0 } -func (m *QueryValidatorsResponse) GetPagination() *query.PageResponse { +func (m *VotingPowerSnapshotWithKeyHeight) GetSnapshot() *VotingPowerSnapshot { if m != nil { - return m.Pagination + return m.Snapshot } return nil } -// QueryValidatorRequest is response type for the Query/Validator RPC method -type QueryValidatorRequest struct { - // validator_acc_addr defines the validator address to query for. - ValidatorAccAddr string `protobuf:"bytes,1,opt,name=validator_acc_addr,json=validatorAccAddr,proto3" json:"validator_acc_addr,omitempty"` - // chain is the id of the chain served by the operator. here chain_id is not used since the - // Linter complains about capitalization, which can be set with a gogoproto.custom_name but - // that is not compatible with google.api.http.get in the Query service below. - Chain string `protobuf:"bytes,2,opt,name=chain,proto3" json:"chain,omitempty"` +// QueryAllSnapshotRequest is the request to obtain all voting power snapshot +// for the specified AVS +type QueryAllSnapshotRequest struct { + // avs address + Avs string `protobuf:"bytes,1,opt,name=avs,proto3" json:"avs,omitempty"` + // pagination related options. + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryValidatorRequest) Reset() { *m = QueryValidatorRequest{} } -func (m *QueryValidatorRequest) String() string { return proto.CompactTextString(m) } -func (*QueryValidatorRequest) ProtoMessage() {} -func (*QueryValidatorRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f91e795a3cecbdbf, []int{27} +func (m *QueryAllSnapshotRequest) Reset() { *m = QueryAllSnapshotRequest{} } +func (m *QueryAllSnapshotRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllSnapshotRequest) ProtoMessage() {} +func (*QueryAllSnapshotRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f91e795a3cecbdbf, []int{28} } -func (m *QueryValidatorRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllSnapshotRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryValidatorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryValidatorRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllSnapshotRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1497,50 +1548,53 @@ func (m *QueryValidatorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *QueryValidatorRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryValidatorRequest.Merge(m, src) +func (m *QueryAllSnapshotRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllSnapshotRequest.Merge(m, src) } -func (m *QueryValidatorRequest) XXX_Size() int { +func (m *QueryAllSnapshotRequest) XXX_Size() int { return m.Size() } -func (m *QueryValidatorRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryValidatorRequest.DiscardUnknown(m) +func (m *QueryAllSnapshotRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllSnapshotRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryValidatorRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllSnapshotRequest proto.InternalMessageInfo -func (m *QueryValidatorRequest) GetValidatorAccAddr() string { +func (m *QueryAllSnapshotRequest) GetAvs() string { if m != nil { - return m.ValidatorAccAddr + return m.Avs } return "" } -func (m *QueryValidatorRequest) GetChain() string { +func (m *QueryAllSnapshotRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Chain + return m.Pagination } - return "" + return nil } -// QueryValidatorResponse is response type for the Query/Validator RPC method -type QueryValidatorResponse struct { - // validator defines the validator info. - Validator Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator"` +// QueryAllSnapshotResponse is the response to obtain all voting power snapshot +// for the specified AVS +type QueryAllSnapshotResponse struct { + // snapshots is a list of all snapshots for the specified AVS. + Snapshots []*VotingPowerSnapshotWithKeyHeight `protobuf:"bytes,1,rep,name=snapshots,proto3" json:"snapshots,omitempty"` + // pagination related response. + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryValidatorResponse) Reset() { *m = QueryValidatorResponse{} } -func (m *QueryValidatorResponse) String() string { return proto.CompactTextString(m) } -func (*QueryValidatorResponse) ProtoMessage() {} -func (*QueryValidatorResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f91e795a3cecbdbf, []int{28} +func (m *QueryAllSnapshotResponse) Reset() { *m = QueryAllSnapshotResponse{} } +func (m *QueryAllSnapshotResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllSnapshotResponse) ProtoMessage() {} +func (*QueryAllSnapshotResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f91e795a3cecbdbf, []int{29} } -func (m *QueryValidatorResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryAllSnapshotResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryValidatorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllSnapshotResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryValidatorResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllSnapshotResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1550,23 +1604,30 @@ func (m *QueryValidatorResponse) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryValidatorResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryValidatorResponse.Merge(m, src) +func (m *QueryAllSnapshotResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllSnapshotResponse.Merge(m, src) } -func (m *QueryValidatorResponse) XXX_Size() int { +func (m *QueryAllSnapshotResponse) XXX_Size() int { return m.Size() } -func (m *QueryValidatorResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryValidatorResponse.DiscardUnknown(m) +func (m *QueryAllSnapshotResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllSnapshotResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryValidatorResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryAllSnapshotResponse proto.InternalMessageInfo -func (m *QueryValidatorResponse) GetValidator() Validator { +func (m *QueryAllSnapshotResponse) GetSnapshots() []*VotingPowerSnapshotWithKeyHeight { if m != nil { - return m.Validator + return m.Snapshots } - return Validator{} + return nil +} + +func (m *QueryAllSnapshotResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil } func init() { @@ -1595,121 +1656,126 @@ func init() { proto.RegisterType((*QueryAllAVSsByOperatorRequest)(nil), "exocore.operator.v1.QueryAllAVSsByOperatorRequest") proto.RegisterType((*QueryAllAVSsByOperatorResponse)(nil), "exocore.operator.v1.QueryAllAVSsByOperatorResponse") proto.RegisterType((*QueryOptInfoRequest)(nil), "exocore.operator.v1.QueryOptInfoRequest") - proto.RegisterType((*QueryValidatorsRequest)(nil), "exocore.operator.v1.QueryValidatorsRequest") - proto.RegisterType((*QueryValidatorsResponse)(nil), "exocore.operator.v1.QueryValidatorsResponse") - proto.RegisterType((*QueryValidatorRequest)(nil), "exocore.operator.v1.QueryValidatorRequest") - proto.RegisterType((*QueryValidatorResponse)(nil), "exocore.operator.v1.QueryValidatorResponse") + proto.RegisterType((*QuerySnapshotAndHelperRequest)(nil), "exocore.operator.v1.QuerySnapshotAndHelperRequest") + proto.RegisterType((*QuerySpecifiedSnapshotRequest)(nil), "exocore.operator.v1.QuerySpecifiedSnapshotRequest") + proto.RegisterType((*VotingPowerSnapshotWithKeyHeight)(nil), "exocore.operator.v1.VotingPowerSnapshotWithKeyHeight") + proto.RegisterType((*QueryAllSnapshotRequest)(nil), "exocore.operator.v1.QueryAllSnapshotRequest") + proto.RegisterType((*QueryAllSnapshotResponse)(nil), "exocore.operator.v1.QueryAllSnapshotResponse") } func init() { proto.RegisterFile("exocore/operator/v1/query.proto", fileDescriptor_f91e795a3cecbdbf) } var fileDescriptor_f91e795a3cecbdbf = []byte{ - // 1678 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x73, 0x14, 0x45, - 0x14, 0xcf, 0x04, 0x90, 0xec, 0x0b, 0x60, 0xd2, 0x09, 0x1a, 0x06, 0xd8, 0x85, 0x41, 0x49, 0x08, - 0x61, 0xc7, 0x84, 0x80, 0x16, 0x11, 0xad, 0x5d, 0x02, 0x18, 0xa0, 0x4c, 0x9c, 0x2d, 0x83, 0x5a, - 0xa5, 0x5b, 0x93, 0x9d, 0x61, 0x33, 0xc5, 0x64, 0x66, 0xd9, 0x9e, 0x5d, 0xd8, 0x4a, 0xc5, 0xb2, - 0x3c, 0xe1, 0xcd, 0x92, 0xa3, 0x85, 0x67, 0x2f, 0x5a, 0x1e, 0xac, 0xf2, 0xe0, 0x41, 0x8f, 0x1c, - 0x3c, 0x44, 0xbd, 0x78, 0x8a, 0x56, 0xa2, 0xe5, 0x5f, 0xe0, 0xc1, 0x9b, 0x35, 0x3d, 0xdd, 0xf3, - 0x3d, 0x93, 0x59, 0x88, 0x5c, 0x52, 0x3b, 0xd3, 0xef, 0xf5, 0xfb, 0xbd, 0xaf, 0x7e, 0xbf, 0x9e, - 0x40, 0x41, 0xbd, 0x67, 0xd6, 0xcc, 0xa6, 0x2a, 0x9a, 0x0d, 0xb5, 0x29, 0x5b, 0x66, 0x53, 0x6c, - 0x4f, 0x8a, 0x77, 0x5a, 0x6a, 0xb3, 0x53, 0x6c, 0x34, 0x4d, 0xcb, 0x44, 0x43, 0x54, 0xa0, 0xc8, - 0x04, 0x8a, 0xed, 0x49, 0x7e, 0x50, 0x5e, 0xd1, 0x0c, 0x53, 0x24, 0x7f, 0x1d, 0x39, 0x7e, 0xbc, - 0x66, 0xe2, 0x15, 0x13, 0x8b, 0x4b, 0x32, 0x56, 0x9d, 0x0d, 0xc4, 0xf6, 0xe4, 0x92, 0x6a, 0xc9, - 0x93, 0x62, 0x43, 0xae, 0x6b, 0x86, 0x6c, 0x69, 0xa6, 0x41, 0x65, 0x0f, 0x53, 0x59, 0x26, 0xe6, - 0x37, 0xc8, 0x1f, 0x72, 0x16, 0xab, 0xe4, 0x49, 0x74, 0x1e, 0xe8, 0xd2, 0x91, 0x38, 0xb0, 0xd6, - 0x3d, 0xba, 0x7a, 0x22, 0x6e, 0xb5, 0x2d, 0xeb, 0x9a, 0x42, 0x60, 0x3b, 0x42, 0xc3, 0x75, 0xb3, - 0x6e, 0x3a, 0x5b, 0xdb, 0xbf, 0xd8, 0xc6, 0x75, 0xd3, 0xac, 0xeb, 0xaa, 0x28, 0x37, 0x34, 0x51, - 0x36, 0x0c, 0xd3, 0x22, 0x68, 0x5d, 0xb3, 0x96, 0x6a, 0x28, 0x6a, 0x73, 0x45, 0x33, 0x2c, 0xb1, - 0xd6, 0xec, 0x34, 0x2c, 0x53, 0xbc, 0xad, 0x76, 0xe8, 0xaa, 0x50, 0x01, 0x74, 0x55, 0xb5, 0xe6, - 0xa9, 0xcd, 0x39, 0xe3, 0x96, 0x29, 0xa9, 0x77, 0xd0, 0x45, 0xd8, 0xcf, 0x60, 0x54, 0x65, 0x45, - 0x69, 0x8e, 0x70, 0xc7, 0xb8, 0xb1, 0x5c, 0x79, 0xe4, 0x97, 0x6f, 0xcf, 0x0c, 0x53, 0x9f, 0x4a, - 0x8a, 0xd2, 0x54, 0x31, 0xae, 0x58, 0x4d, 0xcd, 0xa8, 0x4b, 0xfb, 0x98, 0xb8, 0xfd, 0x5a, 0x58, - 0x82, 0x91, 0xb7, 0xec, 0x98, 0x94, 0x74, 0x9d, 0xed, 0x8c, 0x25, 0xf5, 0x4e, 0x4b, 0xc5, 0x16, - 0xba, 0x02, 0xe0, 0x45, 0x94, 0xec, 0xdb, 0x3f, 0x75, 0xb2, 0x48, 0x37, 0xb5, 0xc3, 0x5f, 0x74, - 0xc2, 0x49, 0xc3, 0x5f, 0x5c, 0x90, 0xeb, 0x2a, 0xd5, 0x95, 0x7c, 0x9a, 0xc2, 0x67, 0x1c, 0x1c, - 0x8a, 0x31, 0x82, 0x1b, 0xa6, 0x81, 0x55, 0x34, 0x01, 0xc8, 0x73, 0xa0, 0x56, 0x23, 0x4e, 0xe0, - 0x11, 0xee, 0xd8, 0xae, 0xb1, 0x9c, 0x34, 0xe0, 0x62, 0xad, 0xd5, 0x6c, 0xb8, 0x18, 0x5d, 0x0d, - 0x60, 0xea, 0x25, 0x98, 0x46, 0xb7, 0xc5, 0xe4, 0x98, 0x0a, 0x80, 0xb2, 0x00, 0x31, 0x2c, 0xa5, - 0xc5, 0x0a, 0x0d, 0xd1, 0x13, 0x46, 0x13, 0x15, 0xa0, 0x5f, 0x6e, 0x63, 0xa2, 0xa9, 0x62, 0x4c, - 0xe0, 0xe5, 0x24, 0x90, 0xdb, 0x98, 0x2a, 0x09, 0x77, 0xe1, 0x08, 0x89, 0x04, 0x33, 0xfd, 0x76, - 0x65, 0x76, 0x51, 0xd6, 0x5b, 0x2c, 0x6c, 0xe8, 0x26, 0x0c, 0x78, 0xf6, 0x0d, 0xa5, 0x2a, 0xb7, - 0x31, 0x0d, 0xfc, 0x68, 0x31, 0xa6, 0x3f, 0x8a, 0x51, 0x17, 0xca, 0xbb, 0xd7, 0x37, 0x0a, 0x9c, - 0x74, 0xc0, 0xc5, 0x65, 0x28, 0xa5, 0x36, 0x16, 0x3a, 0x70, 0x34, 0xc1, 0x30, 0x4d, 0xc3, 0x3b, - 0x00, 0x2d, 0xac, 0x54, 0xdb, 0xf6, 0x4b, 0x66, 0x73, 0x3c, 0xd5, 0xe6, 0x7c, 0xc3, 0x52, 0x15, - 0xb6, 0x4f, 0x79, 0xff, 0xe6, 0x46, 0x21, 0xc7, 0x9e, 0xb0, 0x94, 0x6b, 0x61, 0xc5, 0xf9, 0x29, - 0x5c, 0x83, 0xe7, 0x9d, 0xec, 0x2f, 0x56, 0xc2, 0xee, 0x8a, 0xc1, 0x78, 0x39, 0xc1, 0x3e, 0xb0, - 0xb9, 0x51, 0x00, 0xcf, 0xa1, 0x40, 0xfc, 0x7e, 0xe4, 0x42, 0x7e, 0x54, 0x74, 0x19, 0x2f, 0xd3, - 0x5e, 0xf8, 0x5f, 0x23, 0x18, 0xea, 0x86, 0xde, 0xc7, 0xee, 0x86, 0x55, 0x38, 0x18, 0x01, 0x5f, - 0xee, 0xcc, 0xcd, 0xa2, 0x93, 0xd0, 0x87, 0xed, 0x17, 0x55, 0x4d, 0xa1, 0x91, 0xe8, 0xdf, 0xdc, - 0x28, 0xec, 0x75, 0x84, 0x66, 0xa5, 0xbd, 0x64, 0x71, 0x4e, 0x41, 0x17, 0x60, 0xb7, 0x66, 0xdc, - 0x32, 0x5d, 0x08, 0x69, 0x5e, 0x79, 0xe1, 0x21, 0x3a, 0xc2, 0xf7, 0x1c, 0xe4, 0x93, 0xe2, 0x47, - 0x0b, 0x61, 0x01, 0x0e, 0xc8, 0xba, 0x5e, 0xa5, 0x50, 0x6c, 0x43, 0x76, 0x2f, 0x6e, 0x57, 0x0c, - 0x01, 0x57, 0xa4, 0x7d, 0xb2, 0xae, 0xbb, 0x6f, 0x76, 0xae, 0x67, 0xab, 0x70, 0x38, 0x00, 0xfe, - 0x92, 0x69, 0xe0, 0xeb, 0x6a, 0x87, 0xa5, 0x7e, 0x1c, 0x06, 0x23, 0x27, 0x89, 0x13, 0x49, 0xe9, - 0xd9, 0xd0, 0x41, 0x82, 0x86, 0x61, 0x4f, 0x6d, 0x59, 0xd6, 0x0c, 0xda, 0xa3, 0xce, 0x83, 0xf0, - 0x11, 0x17, 0xea, 0x4f, 0xd7, 0x02, 0x0d, 0x4e, 0x09, 0xa0, 0xd1, 0x5a, 0xd2, 0xb5, 0x5a, 0xf5, - 0xb6, 0xda, 0xa1, 0x75, 0x75, 0xa4, 0xe8, 0x1d, 0xdb, 0x45, 0xe7, 0xd8, 0x2e, 0x2e, 0x10, 0xa1, - 0xeb, 0x6a, 0xa7, 0xbc, 0xfb, 0xd1, 0x46, 0xa1, 0x47, 0xca, 0x35, 0xd8, 0x0b, 0x74, 0x14, 0xc0, - 0x6c, 0x58, 0x9a, 0x51, 0xaf, 0x9a, 0x2d, 0x8b, 0x98, 0xef, 0x93, 0x72, 0xce, 0x9b, 0xf9, 0x96, - 0x25, 0xd4, 0xa0, 0x10, 0x41, 0xc0, 0x3a, 0x61, 0xc7, 0xfc, 0xfc, 0x00, 0x8e, 0x25, 0x1b, 0xa1, - 0xae, 0x1e, 0x86, 0x5c, 0xcd, 0x34, 0xb0, 0x7f, 0xf7, 0xbe, 0x1a, 0x95, 0xdb, 0xce, 0x89, 0xfb, - 0x1c, 0x8c, 0x85, 0x4f, 0x7c, 0x1a, 0x4a, 0x5c, 0xee, 0x5c, 0xb2, 0x31, 0xcc, 0xcd, 0x32, 0x77, - 0x5c, 0x88, 0x9c, 0x0f, 0xe2, 0x8e, 0xb5, 0xdb, 0x4f, 0x1c, 0x9c, 0xca, 0x00, 0x85, 0x3a, 0xbd, - 0xe8, 0x1b, 0x46, 0xc4, 0x7b, 0x7b, 0xfe, 0xd2, 0x06, 0x18, 0x4b, 0x6d, 0x00, 0xba, 0xe7, 0x82, - 0xac, 0x35, 0xbd, 0xb1, 0xc5, 0x0c, 0xed, 0x5c, 0x0b, 0x3c, 0xe4, 0x60, 0x28, 0xc6, 0x64, 0x57, - 0x35, 0x31, 0x13, 0x28, 0xe2, 0xde, 0xed, 0x8b, 0x38, 0xb9, 0x7c, 0x77, 0x85, 0x33, 0xff, 0x49, - 0x42, 0xb8, 0xc9, 0xf4, 0x7e, 0xca, 0xa9, 0x5f, 0xe7, 0x60, 0x3c, 0x0b, 0x16, 0x9a, 0xfb, 0x77, - 0x61, 0x28, 0x98, 0x7b, 0x8f, 0x89, 0xf4, 0x4f, 0x9d, 0xda, 0x36, 0xf9, 0xf6, 0xae, 0x24, 0xfb, - 0x83, 0x66, 0xd8, 0xd6, 0xce, 0xa5, 0xff, 0x43, 0x18, 0x8e, 0xb3, 0xd9, 0x55, 0xfa, 0x03, 0x8d, - 0xdd, 0x9b, 0xda, 0xd8, 0x91, 0xf4, 0x9e, 0x07, 0x21, 0xc2, 0xe4, 0xca, 0x9d, 0xf9, 0x86, 0x35, - 0x67, 0x94, 0x16, 0x2b, 0x2c, 0xad, 0x03, 0xb0, 0x8b, 0x8d, 0xdd, 0x9c, 0x64, 0xff, 0x14, 0xae, - 0xc1, 0x89, 0x54, 0x3d, 0x9a, 0x82, 0x13, 0x3e, 0xfa, 0xa5, 0x6b, 0xd8, 0xa2, 0x34, 0xd0, 0x25, - 0x59, 0x37, 0x34, 0x6c, 0x09, 0x33, 0x94, 0x02, 0x94, 0x74, 0xbd, 0xb4, 0x58, 0x21, 0xdb, 0x38, - 0xab, 0xcc, 0x3c, 0x0f, 0x7d, 0x4c, 0x81, 0x1d, 0x5c, 0xec, 0x59, 0x98, 0xa1, 0xf3, 0x2f, 0x46, - 0x99, 0x62, 0x38, 0x04, 0x7d, 0x36, 0x27, 0xf1, 0x99, 0xdf, 0x2b, 0xb7, 0x31, 0xb1, 0x6c, 0xc0, - 0x10, 0x3d, 0x36, 0xad, 0xa7, 0x41, 0x39, 0x84, 0x36, 0x3c, 0x47, 0xec, 0x2d, 0xb2, 0xbb, 0x05, - 0x7e, 0x3a, 0x8d, 0xf3, 0x15, 0x47, 0x29, 0x9b, 0xdf, 0x30, 0x0d, 0xcf, 0x1c, 0x80, 0x7b, 0xd5, - 0x61, 0xcd, 0x91, 0x8f, 0x75, 0xd3, 0x55, 0x2e, 0xe7, 0xec, 0x19, 0xf8, 0xe5, 0xdf, 0xdf, 0x8c, - 0x73, 0x92, 0x4f, 0x79, 0xe7, 0xba, 0xa2, 0x05, 0x07, 0x83, 0x70, 0xbd, 0x1b, 0x0c, 0x72, 0xed, - 0x85, 0xfa, 0x22, 0x85, 0xd3, 0x0f, 0xb8, 0x3a, 0xe9, 0x53, 0x54, 0x0e, 0xa7, 0xc7, 0x0d, 0xd2, - 0x55, 0xc8, 0xb9, 0x7b, 0xd0, 0x52, 0xe8, 0x22, 0x46, 0x9e, 0xee, 0xd4, 0x5f, 0x07, 0x61, 0x0f, - 0xb1, 0x81, 0x3e, 0xe7, 0x60, 0x30, 0x30, 0xb3, 0x09, 0xb5, 0x8a, 0x2f, 0xb0, 0xe8, 0x35, 0x91, - 0x3f, 0x9e, 0x5a, 0x89, 0xb6, 0x94, 0x70, 0xe1, 0xe3, 0x5f, 0xff, 0x7c, 0xd0, 0x3b, 0x8d, 0xa6, - 0xc4, 0xb8, 0xfb, 0xad, 0x5b, 0xe1, 0x36, 0x25, 0x14, 0x57, 0x03, 0xb7, 0xa4, 0x35, 0xf4, 0x05, - 0x43, 0xe7, 0x6f, 0x70, 0x74, 0x26, 0xd6, 0x68, 0xd2, 0x7d, 0x93, 0x2f, 0x66, 0x15, 0x77, 0xa2, - 0x2c, 0x8c, 0x13, 0xc0, 0x2f, 0x20, 0x21, 0x16, 0xb0, 0x4d, 0x62, 0x4d, 0x17, 0xca, 0xcf, 0x61, - 0xe2, 0x4b, 0x87, 0xe7, 0x15, 0xb3, 0x49, 0xe7, 0x00, 0x7a, 0x29, 0xd9, 0x7c, 0x3c, 0xe1, 0xe4, - 0x27, 0xbb, 0xd0, 0xa0, 0x98, 0xaf, 0x11, 0xcc, 0xb3, 0xa8, 0x9c, 0x1e, 0x64, 0xc6, 0x3d, 0xfc, - 0x81, 0xa6, 0xe5, 0xbb, 0x26, 0xae, 0x92, 0xf2, 0x5b, 0x43, 0x1b, 0x1c, 0x3d, 0x8d, 0x63, 0x68, - 0x9c, 0xcf, 0xaf, 0xe9, 0x6c, 0x28, 0x83, 0x24, 0x93, 0x3f, 0xd7, 0xa5, 0x16, 0xf5, 0xef, 0x3a, - 0xf1, 0xef, 0x32, 0xba, 0x94, 0xc1, 0x3f, 0xdb, 0x9b, 0x54, 0x07, 0x7f, 0xe7, 0xe0, 0xf8, 0xb6, - 0xdc, 0x0d, 0x5d, 0xcc, 0x54, 0x36, 0x49, 0xf4, 0x93, 0x7f, 0xed, 0x71, 0xd5, 0xa9, 0xc7, 0x33, - 0xc4, 0xe3, 0x73, 0xe8, 0xec, 0xb6, 0x55, 0xe8, 0x31, 0x4a, 0xd7, 0xc3, 0x7f, 0x38, 0x7a, 0x74, - 0x85, 0xef, 0xe5, 0x28, 0x43, 0x6d, 0x85, 0x6e, 0xd3, 0xfc, 0x54, 0x37, 0x2a, 0x14, 0x7d, 0x8b, - 0xa0, 0x37, 0xd1, 0x8a, 0x98, 0xf8, 0x7d, 0xce, 0xc3, 0xef, 0x7e, 0x20, 0xf0, 0x67, 0xcd, 0x19, - 0x78, 0xc5, 0xe0, 0x81, 0x10, 0x23, 0xe0, 0xbb, 0xe8, 0xaf, 0xa1, 0x07, 0x1c, 0x0c, 0x84, 0x3f, - 0x0a, 0xa0, 0x89, 0x94, 0x4c, 0x44, 0xbe, 0x1d, 0xf0, 0x42, 0xac, 0xf4, 0xac, 0x5a, 0x23, 0x52, - 0x57, 0x34, 0x55, 0x57, 0x84, 0x33, 0xc4, 0xbb, 0x51, 0xf4, 0x62, 0xac, 0x77, 0x11, 0x00, 0xff, - 0x72, 0xf4, 0x44, 0x8f, 0xdc, 0x6a, 0x51, 0x86, 0xd8, 0x86, 0x3f, 0x45, 0xf0, 0x67, 0xbb, 0xd2, - 0xa1, 0x09, 0x69, 0x13, 0xc8, 0x0d, 0x64, 0x64, 0x49, 0x88, 0x77, 0x49, 0x7f, 0xe2, 0x8c, 0x6c, - 0x71, 0x51, 0x6a, 0x17, 0x25, 0xcb, 0x28, 0x7b, 0xb7, 0xc4, 0x32, 0x7e, 0xfe, 0xf5, 0xc7, 0xd6, - 0xa7, 0xf1, 0x79, 0x95, 0xc4, 0xe7, 0x3c, 0x9a, 0xce, 0xd8, 0x6e, 0x84, 0xc4, 0xbb, 0xfd, 0xf6, - 0x88, 0xf3, 0xc8, 0xa3, 0x3b, 0x50, 0x6e, 0x6a, 0xd6, 0x32, 0xa3, 0xa2, 0xe8, 0xe5, 0x6c, 0x43, - 0x28, 0x42, 0x7a, 0xf9, 0x57, 0xba, 0x57, 0xa4, 0x2e, 0x4d, 0x13, 0x97, 0x8a, 0x68, 0x22, 0xe1, - 0xcc, 0xb4, 0xc4, 0x00, 0x29, 0x16, 0x57, 0xe5, 0x36, 0x5e, 0x43, 0xdf, 0xb1, 0x62, 0x8d, 0x50, - 0xd9, 0xb4, 0x62, 0x4d, 0x22, 0xcd, 0x69, 0xc5, 0x9a, 0xc8, 0x95, 0x33, 0x20, 0x67, 0x54, 0xda, - 0x2b, 0xbf, 0x35, 0xf4, 0x03, 0x07, 0xfb, 0xfc, 0x3c, 0x1a, 0x8d, 0xa5, 0x35, 0x8a, 0x9f, 0x6a, - 0xf3, 0xf9, 0x04, 0x1a, 0x63, 0xa9, 0x0a, 0xe1, 0x30, 0x2a, 0x01, 0x54, 0x45, 0xef, 0x27, 0x01, - 0xda, 0x99, 0x66, 0x79, 0xc8, 0x01, 0x78, 0xdc, 0x18, 0x9d, 0x4e, 0xc6, 0x1f, 0xa1, 0xee, 0xfc, - 0x44, 0x36, 0x61, 0x16, 0xe1, 0xfb, 0x36, 0x25, 0x24, 0x5e, 0x9d, 0x42, 0xa3, 0x62, 0xea, 0x7f, - 0x1e, 0xbc, 0x32, 0xff, 0x9a, 0x83, 0x9c, 0xbb, 0x19, 0x1a, 0xcf, 0x60, 0x91, 0xa1, 0x3b, 0x9d, - 0x49, 0x96, 0x82, 0x7b, 0xc3, 0x03, 0x77, 0x11, 0xcd, 0xa4, 0x83, 0x13, 0x57, 0xa3, 0x4c, 0xdc, - 0x9d, 0xf4, 0xe5, 0x1b, 0x8f, 0x36, 0xf3, 0xdc, 0xfa, 0x66, 0x9e, 0xfb, 0x63, 0x33, 0xcf, 0x7d, - 0xba, 0x95, 0xef, 0x59, 0xdf, 0xca, 0xf7, 0xfc, 0xb6, 0x95, 0xef, 0x79, 0x6f, 0xaa, 0xae, 0x59, - 0xcb, 0xad, 0xa5, 0x62, 0xcd, 0x5c, 0x11, 0x2f, 0x3b, 0x06, 0xde, 0x54, 0xad, 0xbb, 0x66, 0xf3, - 0xb6, 0x6b, 0xef, 0x9e, 0x67, 0xd1, 0xea, 0x34, 0x54, 0xbc, 0xf4, 0x0c, 0xf9, 0x87, 0xc9, 0xd9, - 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x83, 0xae, 0xb1, 0x74, 0x1a, 0x00, 0x00, + // 1732 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcb, 0x6f, 0xdb, 0x46, + 0x1a, 0x37, 0xed, 0x3c, 0xac, 0x71, 0x92, 0xb5, 0xc7, 0x4e, 0xe2, 0x30, 0x89, 0xe4, 0x30, 0xbb, + 0xb1, 0x63, 0xd8, 0xe4, 0xda, 0x71, 0xb2, 0x8b, 0x78, 0xb3, 0x0b, 0x29, 0xce, 0xc3, 0x71, 0xb0, + 0xf6, 0x52, 0x58, 0x67, 0xb7, 0x40, 0x2b, 0xd0, 0xe2, 0x44, 0x62, 0x43, 0x73, 0x14, 0x0e, 0xa5, + 0x44, 0x30, 0x5c, 0x14, 0x3d, 0xb5, 0xb7, 0x22, 0xb9, 0x14, 0x28, 0x5a, 0x14, 0xfd, 0x1b, 0x0a, + 0xb4, 0x45, 0x0f, 0xed, 0x31, 0x87, 0x1e, 0xdc, 0xf6, 0xd2, 0x93, 0x5b, 0xd8, 0xfd, 0x0b, 0x7a, + 0xe8, 0xb9, 0xe0, 0x70, 0x86, 0x14, 0xc5, 0x87, 0x64, 0xc7, 0xcd, 0xcd, 0x24, 0xe7, 0xfb, 0xbe, + 0xdf, 0xf7, 0xfe, 0x8d, 0x0c, 0x72, 0xe8, 0x29, 0x2e, 0x63, 0x1b, 0x29, 0xb8, 0x86, 0x6c, 0xcd, + 0xc1, 0xb6, 0xd2, 0x98, 0x51, 0x1e, 0xd7, 0x91, 0xdd, 0x94, 0x6b, 0x36, 0x76, 0x30, 0x1c, 0x66, + 0x07, 0x64, 0x7e, 0x40, 0x6e, 0xcc, 0x88, 0x93, 0x65, 0x4c, 0xd6, 0x31, 0x51, 0xd6, 0x34, 0x82, + 0xbc, 0xd3, 0x4a, 0x63, 0x66, 0x0d, 0x39, 0xda, 0x8c, 0x52, 0xd3, 0x2a, 0x86, 0xa5, 0x39, 0x06, + 0xb6, 0x3c, 0x05, 0xe2, 0x19, 0xef, 0x6c, 0x89, 0x3e, 0x29, 0xde, 0x03, 0xfb, 0x74, 0x2e, 0xce, + 0xb8, 0xf3, 0x94, 0x7d, 0x1d, 0xa9, 0xe0, 0x0a, 0xf6, 0xa4, 0xdc, 0xbf, 0xb8, 0x4c, 0x05, 0xe3, + 0x8a, 0x89, 0x14, 0xad, 0x66, 0x28, 0x9a, 0x65, 0x61, 0x87, 0xda, 0xf2, 0x35, 0x3a, 0xc8, 0xd2, + 0x91, 0xbd, 0x6e, 0x58, 0x8e, 0x52, 0xb6, 0x9b, 0x35, 0x07, 0x2b, 0x8f, 0x50, 0x93, 0x7d, 0x95, + 0x8a, 0x00, 0xde, 0x41, 0xce, 0x32, 0x33, 0xb6, 0x68, 0x3d, 0xc4, 0x2a, 0x7a, 0x0c, 0x6f, 0x80, + 0xe3, 0xdc, 0x7e, 0x49, 0xd3, 0x75, 0x7b, 0x54, 0x18, 0x13, 0x26, 0x32, 0x85, 0xd1, 0xef, 0x3f, + 0x9b, 0x1e, 0x61, 0x70, 0xf3, 0xba, 0x6e, 0x23, 0x42, 0x8a, 0x8e, 0x6d, 0x58, 0x15, 0xf5, 0x18, + 0x3f, 0xee, 0xbe, 0x96, 0xd6, 0xc0, 0xe8, 0x7f, 0xdc, 0x08, 0xe4, 0x4d, 0x93, 0x6b, 0x26, 0x2a, + 0x7a, 0x5c, 0x47, 0xc4, 0x81, 0xb7, 0x01, 0x08, 0xe2, 0x41, 0xf5, 0x0e, 0xcc, 0x5e, 0x92, 0x99, + 0x52, 0x37, 0x78, 0xb2, 0x17, 0x6a, 0x16, 0x3c, 0x79, 0x45, 0xab, 0x20, 0x26, 0xab, 0xb6, 0x48, + 0x4a, 0xcf, 0x04, 0x70, 0x26, 0xc6, 0x08, 0xa9, 0x61, 0x8b, 0x20, 0x38, 0x05, 0x60, 0xe0, 0x40, + 0xb9, 0x4c, 0x9d, 0x20, 0xa3, 0xc2, 0x58, 0xdf, 0x44, 0x46, 0x1d, 0xf4, 0xb1, 0x96, 0xcb, 0x2e, + 0x5c, 0x02, 0xef, 0x84, 0x30, 0xf5, 0x52, 0x4c, 0xe3, 0x1d, 0x31, 0x79, 0xa6, 0x42, 0xa0, 0x1c, + 0x00, 0x39, 0x96, 0xfc, 0x6a, 0x91, 0x85, 0xe8, 0x25, 0xa3, 0x09, 0x73, 0x60, 0x40, 0x6b, 0x10, + 0x2a, 0x89, 0x08, 0xa1, 0xf0, 0x32, 0x2a, 0xd0, 0x1a, 0x84, 0x09, 0x49, 0x4f, 0xc0, 0x39, 0x1a, + 0x09, 0x6e, 0xfa, 0xbf, 0xc5, 0x85, 0x55, 0xcd, 0xac, 0xf3, 0xb0, 0xc1, 0x07, 0x60, 0x30, 0xb0, + 0x6f, 0xe9, 0x25, 0xad, 0x41, 0x58, 0xe0, 0xc7, 0xe5, 0x98, 0x52, 0x96, 0xa3, 0x2e, 0x14, 0x0e, + 0x6d, 0x6d, 0xe7, 0x04, 0xf5, 0x84, 0x8f, 0xcb, 0xd2, 0xf3, 0x0d, 0x22, 0x35, 0xc1, 0xf9, 0x04, + 0xc3, 0x2c, 0x0d, 0xff, 0x03, 0xa0, 0x4e, 0xf4, 0x52, 0xc3, 0x7d, 0xc9, 0x6d, 0x4e, 0xa6, 0xda, + 0x5c, 0xae, 0x39, 0x48, 0xe7, 0x7a, 0x0a, 0xc7, 0x77, 0xb6, 0x73, 0x19, 0xfe, 0x44, 0xd4, 0x4c, + 0x9d, 0xe8, 0xde, 0x9f, 0xd2, 0x3d, 0x70, 0xda, 0xcb, 0xfe, 0x6a, 0xb1, 0xdd, 0x5d, 0x25, 0x1c, + 0x2f, 0x2f, 0xd8, 0x27, 0x76, 0xb6, 0x73, 0x20, 0x70, 0x28, 0x14, 0xbf, 0x6f, 0x84, 0x36, 0x3f, + 0x8a, 0xa6, 0x46, 0xaa, 0xac, 0x17, 0xfe, 0xd0, 0x08, 0xb6, 0x75, 0x43, 0xef, 0xbe, 0xbb, 0x61, + 0x03, 0x9c, 0x8c, 0x80, 0x2f, 0x34, 0x17, 0x17, 0xe0, 0x25, 0xd0, 0x4f, 0xdc, 0x17, 0x25, 0x43, + 0x67, 0x91, 0x18, 0xd8, 0xd9, 0xce, 0x1d, 0xf5, 0x0e, 0x2d, 0xa8, 0x47, 0xe9, 0xc7, 0x45, 0x1d, + 0x5e, 0x07, 0x87, 0x0c, 0xeb, 0x21, 0xf6, 0x21, 0xa4, 0x79, 0x15, 0x84, 0x87, 0xca, 0x48, 0x5f, + 0x09, 0x20, 0x9b, 0x14, 0x3f, 0x56, 0x08, 0x2b, 0xe0, 0x84, 0x66, 0x9a, 0x25, 0x06, 0xc5, 0x35, + 0xe4, 0xf6, 0x62, 0xa7, 0x62, 0x08, 0xb9, 0xa2, 0x1e, 0xd3, 0x4c, 0xd3, 0x7f, 0x73, 0x70, 0x3d, + 0x5b, 0x02, 0x67, 0x43, 0xe0, 0x6f, 0x62, 0x8b, 0x2c, 0xa1, 0x26, 0x4f, 0xfd, 0x24, 0x18, 0x8a, + 0x4c, 0x12, 0x2f, 0x92, 0xea, 0x9f, 0xda, 0x06, 0x09, 0x1c, 0x01, 0x87, 0xcb, 0x55, 0xcd, 0xb0, + 0x58, 0x8f, 0x7a, 0x0f, 0xd2, 0xdb, 0x42, 0x5b, 0x7f, 0xfa, 0x16, 0x58, 0x70, 0xf2, 0x00, 0xd4, + 0xea, 0x6b, 0xa6, 0x51, 0x2e, 0x3d, 0x42, 0x4d, 0x56, 0x57, 0xe7, 0xe4, 0x60, 0x6c, 0xcb, 0xde, + 0xd8, 0x96, 0x57, 0xe8, 0xa1, 0x25, 0xd4, 0x2c, 0x1c, 0x7a, 0xb1, 0x9d, 0xeb, 0x51, 0x33, 0x35, + 0xfe, 0x02, 0x9e, 0x07, 0x00, 0xd7, 0x1c, 0xc3, 0xaa, 0x94, 0x70, 0xdd, 0xa1, 0xe6, 0xfb, 0xd5, + 0x8c, 0xf7, 0x66, 0xb9, 0xee, 0x48, 0x65, 0x90, 0x8b, 0x20, 0xe0, 0x9d, 0x70, 0x60, 0x7e, 0xbe, + 0x01, 0xc6, 0x92, 0x8d, 0x30, 0x57, 0xcf, 0x82, 0x4c, 0x19, 0x5b, 0xa4, 0x55, 0x7b, 0x7f, 0x99, + 0x9d, 0xeb, 0xe4, 0xc4, 0xbb, 0x02, 0x98, 0x68, 0x9f, 0xf8, 0x2c, 0x94, 0xa4, 0xd0, 0xbc, 0xe9, + 0x62, 0x58, 0x5c, 0xe0, 0xee, 0xf8, 0x10, 0x85, 0x16, 0x88, 0x07, 0xd6, 0x6e, 0xdf, 0x0a, 0xe0, + 0x72, 0x17, 0x50, 0x98, 0xd3, 0xab, 0x2d, 0xcb, 0x88, 0x7a, 0xef, 0xee, 0x5f, 0xd6, 0x00, 0x13, + 0xa9, 0x0d, 0xc0, 0x74, 0xae, 0x68, 0x86, 0x1d, 0xac, 0x2d, 0x6e, 0xe8, 0xe0, 0x5a, 0xe0, 0x23, + 0x01, 0x0c, 0xc7, 0x98, 0xdc, 0x53, 0x4d, 0xcc, 0x87, 0x8a, 0xb8, 0xb7, 0x73, 0x11, 0x27, 0x97, + 0x6f, 0x5f, 0x7b, 0xe6, 0xdf, 0x4b, 0x08, 0x37, 0xdd, 0xde, 0xaf, 0x38, 0xf5, 0x5b, 0x02, 0x98, + 0xec, 0x06, 0x0b, 0xcb, 0xfd, 0xff, 0xc1, 0x70, 0x38, 0xf7, 0x01, 0x13, 0x19, 0x98, 0xbd, 0xdc, + 0x31, 0xf9, 0xae, 0x56, 0x9a, 0xfd, 0x21, 0xdc, 0x6e, 0xeb, 0xe0, 0xd2, 0xff, 0x16, 0x18, 0x89, + 0xb3, 0xb9, 0xa7, 0xf4, 0x87, 0x1a, 0xbb, 0x37, 0xb5, 0xb1, 0x23, 0xe9, 0xbd, 0x06, 0xa4, 0x08, + 0x93, 0x2b, 0x34, 0x97, 0x6b, 0xce, 0xa2, 0x95, 0x5f, 0x2d, 0xf2, 0xb4, 0x0e, 0x82, 0x3e, 0xbe, + 0x76, 0x33, 0xaa, 0xfb, 0xa7, 0x74, 0x0f, 0x5c, 0x4c, 0x95, 0x63, 0x29, 0xb8, 0xd8, 0x42, 0xbf, + 0x4c, 0x83, 0x38, 0x8c, 0x06, 0xfa, 0x24, 0xeb, 0xbe, 0x41, 0x1c, 0x69, 0x9e, 0x51, 0x80, 0xbc, + 0x69, 0xe6, 0x57, 0x8b, 0x54, 0x8d, 0xf7, 0x95, 0x9b, 0x17, 0x41, 0x3f, 0x17, 0xe0, 0x83, 0x8b, + 0x3f, 0x4b, 0xf3, 0x6c, 0xff, 0xc5, 0x08, 0x33, 0x0c, 0x67, 0x40, 0xbf, 0xcb, 0x49, 0x5a, 0xcc, + 0x1f, 0xd5, 0x1a, 0x84, 0x5a, 0xb6, 0xc0, 0x30, 0x1b, 0x9b, 0xce, 0xab, 0xa0, 0x1c, 0xd2, 0x0c, + 0xf3, 0xb4, 0x68, 0x69, 0x35, 0x52, 0xc5, 0x4e, 0xde, 0xd2, 0xef, 0x22, 0xb3, 0x86, 0xec, 0xe4, + 0x40, 0x2f, 0x72, 0x91, 0x1a, 0x2a, 0x1b, 0x0f, 0x0d, 0xa4, 0x73, 0xd9, 0x44, 0x11, 0x78, 0x0a, + 0x1c, 0xa9, 0x22, 0xa3, 0x52, 0xf5, 0xe6, 0x78, 0x9f, 0xca, 0x9e, 0xa4, 0x0f, 0x04, 0x30, 0xb6, + 0x8a, 0xdd, 0xcc, 0xaf, 0xe0, 0x27, 0xc8, 0xe6, 0x8a, 0x1e, 0x18, 0x4e, 0x75, 0x09, 0x35, 0xef, + 0xd2, 0x43, 0x50, 0x06, 0xc3, 0x84, 0x7d, 0x70, 0xa7, 0x49, 0x89, 0x69, 0x12, 0xa8, 0xa6, 0x21, + 0xfe, 0x29, 0x38, 0xbf, 0x00, 0xfa, 0xf9, 0x4b, 0xd6, 0x07, 0xf1, 0x63, 0x35, 0xc6, 0xb0, 0xea, + 0x4b, 0x4a, 0x84, 0x53, 0x4a, 0xd3, 0xec, 0xec, 0xdf, 0x41, 0x8d, 0x93, 0x2f, 0x84, 0xe0, 0xae, + 0x14, 0x58, 0x65, 0x55, 0x53, 0x04, 0x19, 0x8e, 0x8e, 0x8f, 0x8c, 0xab, 0xdd, 0x3a, 0x16, 0x8a, + 0xa8, 0x1a, 0xe8, 0x39, 0xb0, 0xb1, 0x31, 0xfb, 0xec, 0x34, 0x38, 0x4c, 0xa1, 0xc3, 0x0f, 0x05, + 0x30, 0x14, 0x5a, 0xfd, 0x94, 0xa1, 0xc5, 0xd7, 0x69, 0xf4, 0xb6, 0x29, 0x5e, 0x48, 0x2d, 0x68, + 0xf7, 0x94, 0x74, 0xfd, 0x9d, 0x1f, 0x7e, 0x79, 0xde, 0x3b, 0x07, 0x67, 0x95, 0xb8, 0xfb, 0xb1, + 0xdf, 0x28, 0x2e, 0xb3, 0x54, 0x36, 0x42, 0x97, 0xad, 0x4d, 0xf8, 0x31, 0x47, 0xd7, 0x3a, 0x27, + 0xe0, 0x74, 0xac, 0xd1, 0xa4, 0x6b, 0xab, 0x28, 0x77, 0x7b, 0xdc, 0x0b, 0x94, 0x34, 0x49, 0x01, + 0xff, 0x19, 0x4a, 0xb1, 0x80, 0x5d, 0x2e, 0x8c, 0x7d, 0x28, 0xdf, 0xb5, 0xf3, 0x67, 0xb6, 0x83, + 0x6f, 0x63, 0x9b, 0xad, 0x13, 0xf8, 0xd7, 0x64, 0xf3, 0xf1, 0xbc, 0x55, 0x9c, 0xd9, 0x83, 0x04, + 0xc3, 0x7c, 0x8f, 0x62, 0x5e, 0x80, 0x85, 0xf4, 0x20, 0x73, 0x0a, 0xd3, 0x1a, 0x68, 0xb6, 0x1d, + 0x36, 0x95, 0x0d, 0xba, 0x6d, 0x37, 0xe1, 0xb6, 0xc0, 0x86, 0x7a, 0x0c, 0x1b, 0x6c, 0xf1, 0x6b, + 0xae, 0x3b, 0x94, 0x61, 0xae, 0x2a, 0x5e, 0xdd, 0xa3, 0x14, 0xf3, 0x6f, 0x89, 0xfa, 0x77, 0x0b, + 0xde, 0xec, 0xc2, 0x3f, 0xd7, 0x9b, 0x54, 0x07, 0x7f, 0x12, 0xc0, 0x85, 0x8e, 0x14, 0x10, 0xde, + 0xe8, 0xaa, 0x6c, 0x92, 0x58, 0xac, 0xf8, 0xcf, 0xfd, 0x8a, 0x33, 0x8f, 0xe7, 0xa9, 0xc7, 0x57, + 0xe1, 0x95, 0x8e, 0x55, 0x18, 0x10, 0x53, 0xdf, 0xc3, 0x5f, 0x05, 0x70, 0x32, 0xf6, 0x7a, 0x0f, + 0xbb, 0xa8, 0xad, 0xb6, 0x4b, 0xb9, 0x38, 0xbb, 0x17, 0x11, 0x86, 0xde, 0xa6, 0xe8, 0x4d, 0xf8, + 0x66, 0x2c, 0xfa, 0x58, 0xd9, 0xd6, 0x94, 0x79, 0x4b, 0x53, 0x0e, 0x4f, 0x83, 0x98, 0x03, 0x2d, + 0x3f, 0x16, 0x6c, 0xc2, 0xe7, 0x02, 0x18, 0x6c, 0xff, 0x61, 0x01, 0x4e, 0xa5, 0xa4, 0x21, 0xf2, + 0xfb, 0x83, 0x28, 0xc5, 0x9e, 0x5e, 0x40, 0x65, 0x7a, 0xea, 0xb6, 0x81, 0x4c, 0x5d, 0x9a, 0xa6, + 0xae, 0x8d, 0xc3, 0xbf, 0x24, 0xbb, 0xd6, 0x0a, 0xe0, 0x37, 0x01, 0x9c, 0x8a, 0xbf, 0x61, 0xc3, + 0x2e, 0x02, 0xdb, 0xfe, 0x73, 0x86, 0x78, 0x65, 0x4f, 0x32, 0x2c, 0x1b, 0x84, 0x42, 0x5e, 0x87, + 0x8f, 0x3a, 0x67, 0xc3, 0x17, 0x7e, 0xe9, 0x74, 0xec, 0x0a, 0x51, 0x6e, 0x18, 0x65, 0xdb, 0xb0, + 0xfb, 0x3e, 0x89, 0xbd, 0x32, 0x88, 0xff, 0xda, 0xb7, 0x3c, 0x0b, 0xce, 0x3f, 0x68, 0x70, 0xae, + 0xc1, 0xb9, 0x2e, 0x1b, 0x8d, 0xde, 0x02, 0xfc, 0x4e, 0x7b, 0x21, 0x04, 0xec, 0xd3, 0x5f, 0x25, + 0xee, 0x02, 0xe7, 0x5c, 0x16, 0xfe, 0xad, 0xbb, 0xf5, 0x13, 0x61, 0xcd, 0xe2, 0xdf, 0xf7, 0x2e, + 0xc8, 0x5c, 0x9a, 0xa3, 0x2e, 0xc9, 0x70, 0x2a, 0x61, 0x5a, 0x3a, 0x4a, 0x88, 0x55, 0x2b, 0x1b, + 0x5a, 0x83, 0x6c, 0xc2, 0xcf, 0x79, 0xa5, 0x46, 0xb8, 0x70, 0x5a, 0xa5, 0x26, 0xb1, 0xee, 0xb4, + 0x4a, 0x4d, 0x24, 0xdb, 0x5d, 0x20, 0xe7, 0x5c, 0x3c, 0x28, 0xbf, 0x4d, 0xf8, 0xb5, 0x00, 0x8e, + 0xb5, 0x12, 0x71, 0x38, 0x91, 0xd6, 0x25, 0xad, 0x5c, 0x5d, 0xcc, 0x26, 0x10, 0x18, 0x07, 0xe9, + 0x94, 0xbd, 0x20, 0x0a, 0xa8, 0x04, 0x5f, 0x4f, 0x02, 0x14, 0x21, 0x2e, 0xfb, 0x6a, 0x96, 0x4f, + 0x05, 0x76, 0x95, 0xe0, 0x1c, 0xd0, 0xe3, 0xf5, 0x69, 0x81, 0x4f, 0xba, 0x04, 0x88, 0x17, 0x63, + 0x65, 0xc2, 0x8a, 0xa5, 0x59, 0xea, 0xd7, 0x14, 0x9c, 0x8c, 0xf5, 0xcb, 0xa7, 0xf0, 0x55, 0x7a, + 0x9a, 0x15, 0xc8, 0x97, 0xbc, 0x40, 0x22, 0x97, 0x89, 0x54, 0x9c, 0x09, 0x37, 0x0f, 0x71, 0x7f, + 0x7c, 0xb8, 0x43, 0x89, 0x70, 0xe4, 0x1e, 0x64, 0x65, 0xc3, 0xbb, 0x7f, 0x6c, 0xc2, 0x4f, 0xfc, + 0xe5, 0x10, 0x90, 0xf5, 0xd4, 0xe5, 0x10, 0xb9, 0x49, 0x88, 0xd3, 0x5d, 0x9e, 0x66, 0xa5, 0xac, + 0x50, 0x9c, 0x97, 0xe1, 0x78, 0xe2, 0x5c, 0x09, 0x63, 0x2d, 0xdc, 0x7f, 0xb1, 0x93, 0x15, 0xb6, + 0x76, 0xb2, 0xc2, 0xcf, 0x3b, 0x59, 0xe1, 0xfd, 0xdd, 0x6c, 0xcf, 0xd6, 0x6e, 0xb6, 0xe7, 0xc7, + 0xdd, 0x6c, 0xcf, 0x6b, 0xb3, 0x15, 0xc3, 0xa9, 0xd6, 0xd7, 0xe4, 0x32, 0x5e, 0x57, 0x6e, 0x79, + 0xca, 0xfe, 0x8d, 0x9c, 0x27, 0xd8, 0x0e, 0x06, 0xfa, 0xd3, 0x40, 0xbb, 0xd3, 0xac, 0x21, 0xb2, + 0x76, 0x84, 0xfe, 0x93, 0xe8, 0xca, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x71, 0x2b, 0x92, + 0x13, 0x1b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1750,12 +1816,12 @@ type QueryClient interface { QueryAllAVSsByOperator(ctx context.Context, in *QueryAllAVSsByOperatorRequest, opts ...grpc.CallOption) (*QueryAllAVSsByOperatorResponse, error) // QueryOptInfo queries specified opted information. QueryOptInfo(ctx context.Context, in *QueryOptInfoRequest, opts ...grpc.CallOption) (*OptedInfo, error) - // Validators queries all validators that match the given status. - // When called from another module, this query might consume a high amount of - // gas if the pagination field is incorrectly set. - Validators(ctx context.Context, in *QueryValidatorsRequest, opts ...grpc.CallOption) (*QueryValidatorsResponse, error) - // Validator queries validator info for given validator address. - Validator(ctx context.Context, in *QueryValidatorRequest, opts ...grpc.CallOption) (*QueryValidatorResponse, error) + // QuerySnapshotHelper queries the snapshot helper of the AVS + QuerySnapshotHelper(ctx context.Context, in *QuerySnapshotAndHelperRequest, opts ...grpc.CallOption) (*SnapshotHelper, error) + // QuerySnapshotHelper queries the snapshot helper of the AVS + QuerySpecifiedSnapshot(ctx context.Context, in *QuerySpecifiedSnapshotRequest, opts ...grpc.CallOption) (*VotingPowerSnapshotWithKeyHeight, error) + // QueryAllSnapshot queries all voting power snapshot for the specified AVS + QueryAllSnapshot(ctx context.Context, in *QueryAllSnapshotRequest, opts ...grpc.CallOption) (*QueryAllSnapshotResponse, error) } type queryClient struct { @@ -1874,18 +1940,27 @@ func (c *queryClient) QueryOptInfo(ctx context.Context, in *QueryOptInfoRequest, return out, nil } -func (c *queryClient) Validators(ctx context.Context, in *QueryValidatorsRequest, opts ...grpc.CallOption) (*QueryValidatorsResponse, error) { - out := new(QueryValidatorsResponse) - err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/Validators", in, out, opts...) +func (c *queryClient) QuerySnapshotHelper(ctx context.Context, in *QuerySnapshotAndHelperRequest, opts ...grpc.CallOption) (*SnapshotHelper, error) { + out := new(SnapshotHelper) + err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/QuerySnapshotHelper", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) QuerySpecifiedSnapshot(ctx context.Context, in *QuerySpecifiedSnapshotRequest, opts ...grpc.CallOption) (*VotingPowerSnapshotWithKeyHeight, error) { + out := new(VotingPowerSnapshotWithKeyHeight) + err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/QuerySpecifiedSnapshot", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) Validator(ctx context.Context, in *QueryValidatorRequest, opts ...grpc.CallOption) (*QueryValidatorResponse, error) { - out := new(QueryValidatorResponse) - err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/Validator", in, out, opts...) +func (c *queryClient) QueryAllSnapshot(ctx context.Context, in *QueryAllSnapshotRequest, opts ...grpc.CallOption) (*QueryAllSnapshotResponse, error) { + out := new(QueryAllSnapshotResponse) + err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/QueryAllSnapshot", in, out, opts...) if err != nil { return nil, err } @@ -1920,12 +1995,12 @@ type QueryServer interface { QueryAllAVSsByOperator(context.Context, *QueryAllAVSsByOperatorRequest) (*QueryAllAVSsByOperatorResponse, error) // QueryOptInfo queries specified opted information. QueryOptInfo(context.Context, *QueryOptInfoRequest) (*OptedInfo, error) - // Validators queries all validators that match the given status. - // When called from another module, this query might consume a high amount of - // gas if the pagination field is incorrectly set. - Validators(context.Context, *QueryValidatorsRequest) (*QueryValidatorsResponse, error) - // Validator queries validator info for given validator address. - Validator(context.Context, *QueryValidatorRequest) (*QueryValidatorResponse, error) + // QuerySnapshotHelper queries the snapshot helper of the AVS + QuerySnapshotHelper(context.Context, *QuerySnapshotAndHelperRequest) (*SnapshotHelper, error) + // QuerySnapshotHelper queries the snapshot helper of the AVS + QuerySpecifiedSnapshot(context.Context, *QuerySpecifiedSnapshotRequest) (*VotingPowerSnapshotWithKeyHeight, error) + // QueryAllSnapshot queries all voting power snapshot for the specified AVS + QueryAllSnapshot(context.Context, *QueryAllSnapshotRequest) (*QueryAllSnapshotResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -1968,11 +2043,14 @@ func (*UnimplementedQueryServer) QueryAllAVSsByOperator(ctx context.Context, req func (*UnimplementedQueryServer) QueryOptInfo(ctx context.Context, req *QueryOptInfoRequest) (*OptedInfo, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryOptInfo not implemented") } -func (*UnimplementedQueryServer) Validators(ctx context.Context, req *QueryValidatorsRequest) (*QueryValidatorsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Validators not implemented") +func (*UnimplementedQueryServer) QuerySnapshotHelper(ctx context.Context, req *QuerySnapshotAndHelperRequest) (*SnapshotHelper, error) { + return nil, status.Errorf(codes.Unimplemented, "method QuerySnapshotHelper not implemented") } -func (*UnimplementedQueryServer) Validator(ctx context.Context, req *QueryValidatorRequest) (*QueryValidatorResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Validator not implemented") +func (*UnimplementedQueryServer) QuerySpecifiedSnapshot(ctx context.Context, req *QuerySpecifiedSnapshotRequest) (*VotingPowerSnapshotWithKeyHeight, error) { + return nil, status.Errorf(codes.Unimplemented, "method QuerySpecifiedSnapshot not implemented") +} +func (*UnimplementedQueryServer) QueryAllSnapshot(ctx context.Context, req *QueryAllSnapshotRequest) (*QueryAllSnapshotResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryAllSnapshot not implemented") } func RegisterQueryServer(s grpc1.Server, srv QueryServer) { @@ -2195,38 +2273,56 @@ func _Query_QueryOptInfo_Handler(srv interface{}, ctx context.Context, dec func( return interceptor(ctx, in, info, handler) } -func _Query_Validators_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryValidatorsRequest) +func _Query_QuerySnapshotHelper_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySnapshotAndHelperRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).QuerySnapshotHelper(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/exocore.operator.v1.Query/QuerySnapshotHelper", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).QuerySnapshotHelper(ctx, req.(*QuerySnapshotAndHelperRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_QuerySpecifiedSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySpecifiedSnapshotRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Validators(ctx, in) + return srv.(QueryServer).QuerySpecifiedSnapshot(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/exocore.operator.v1.Query/Validators", + FullMethod: "/exocore.operator.v1.Query/QuerySpecifiedSnapshot", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Validators(ctx, req.(*QueryValidatorsRequest)) + return srv.(QueryServer).QuerySpecifiedSnapshot(ctx, req.(*QuerySpecifiedSnapshotRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_Validator_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryValidatorRequest) +func _Query_QueryAllSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllSnapshotRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Validator(ctx, in) + return srv.(QueryServer).QueryAllSnapshot(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/exocore.operator.v1.Query/Validator", + FullMethod: "/exocore.operator.v1.Query/QueryAllSnapshot", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Validator(ctx, req.(*QueryValidatorRequest)) + return srv.(QueryServer).QueryAllSnapshot(ctx, req.(*QueryAllSnapshotRequest)) } return interceptor(ctx, in, info, handler) } @@ -2284,12 +2380,16 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_QueryOptInfo_Handler, }, { - MethodName: "Validators", - Handler: _Query_Validators_Handler, + MethodName: "QuerySnapshotHelper", + Handler: _Query_QuerySnapshotHelper_Handler, + }, + { + MethodName: "QuerySpecifiedSnapshot", + Handler: _Query_QuerySpecifiedSnapshot_Handler, }, { - MethodName: "Validator", - Handler: _Query_Validator_Handler, + MethodName: "QueryAllSnapshot", + Handler: _Query_QueryAllSnapshot_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -3277,7 +3377,7 @@ func (m *QueryOptInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryValidatorsRequest) Marshal() (dAtA []byte, err error) { +func (m *QuerySnapshotAndHelperRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3287,39 +3387,62 @@ func (m *QueryValidatorsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryValidatorsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QuerySnapshotAndHelperRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryValidatorsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QuerySnapshotAndHelperRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } + if len(m.Avs) > 0 { + i -= len(m.Avs) + copy(dAtA[i:], m.Avs) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Avs))) i-- - dAtA[i] = 0x12 + dAtA[i] = 0xa } - if len(m.Chain) > 0 { - i -= len(m.Chain) - copy(dAtA[i:], m.Chain) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Chain))) + return len(dAtA) - i, nil +} + +func (m *QuerySpecifiedSnapshotRequest) 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 *QuerySpecifiedSnapshotRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySpecifiedSnapshotRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Height != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x10 + } + if len(m.Avs) > 0 { + i -= len(m.Avs) + copy(dAtA[i:], m.Avs) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Avs))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryValidatorsResponse) Marshal() (dAtA []byte, err error) { +func (m *VotingPowerSnapshotWithKeyHeight) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3329,19 +3452,19 @@ func (m *QueryValidatorsResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryValidatorsResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *VotingPowerSnapshotWithKeyHeight) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryValidatorsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *VotingPowerSnapshotWithKeyHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { + if m.Snapshot != nil { { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Snapshot.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3351,24 +3474,15 @@ func (m *QueryValidatorsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x12 } - if len(m.Validators) > 0 { - for iNdEx := len(m.Validators) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Validators[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } + if m.SnapshotKeyHeight != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.SnapshotKeyHeight)) + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } -func (m *QueryValidatorRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllSnapshotRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3378,34 +3492,39 @@ func (m *QueryValidatorRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryValidatorRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllSnapshotRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryValidatorRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllSnapshotRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Chain) > 0 { - i -= len(m.Chain) - copy(dAtA[i:], m.Chain) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Chain))) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x12 } - if len(m.ValidatorAccAddr) > 0 { - i -= len(m.ValidatorAccAddr) - copy(dAtA[i:], m.ValidatorAccAddr) - i = encodeVarintQuery(dAtA, i, uint64(len(m.ValidatorAccAddr))) + if len(m.Avs) > 0 { + i -= len(m.Avs) + copy(dAtA[i:], m.Avs) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Avs))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryValidatorResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllSnapshotResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3415,26 +3534,42 @@ func (m *QueryValidatorResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryValidatorResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllSnapshotResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryValidatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllSnapshotResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - { - size, err := m.Validator.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.Snapshots) > 0 { + for iNdEx := len(m.Snapshots) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Snapshots[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -3848,67 +3983,84 @@ func (m *QueryOptInfoRequest) Size() (n int) { return n } -func (m *QueryValidatorsRequest) Size() (n int) { +func (m *QuerySnapshotAndHelperRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Chain) + l = len(m.Avs) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Pagination != nil { - l = m.Pagination.Size() + return n +} + +func (m *QuerySpecifiedSnapshotRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Avs) + if l > 0 { n += 1 + l + sovQuery(uint64(l)) } + if m.Height != 0 { + n += 1 + sovQuery(uint64(m.Height)) + } return n } -func (m *QueryValidatorsResponse) Size() (n int) { +func (m *VotingPowerSnapshotWithKeyHeight) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.Validators) > 0 { - for _, e := range m.Validators { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } + if m.SnapshotKeyHeight != 0 { + n += 1 + sovQuery(uint64(m.SnapshotKeyHeight)) } - if m.Pagination != nil { - l = m.Pagination.Size() + if m.Snapshot != nil { + l = m.Snapshot.Size() n += 1 + l + sovQuery(uint64(l)) } return n } -func (m *QueryValidatorRequest) Size() (n int) { +func (m *QueryAllSnapshotRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.ValidatorAccAddr) + l = len(m.Avs) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - l = len(m.Chain) - if l > 0 { + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n } -func (m *QueryValidatorResponse) Size() (n int) { +func (m *QueryAllSnapshotResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.Validator.Size() - n += 1 + l + sovQuery(uint64(l)) + if len(m.Snapshots) > 0 { + for _, e := range m.Snapshots { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } return n } @@ -6527,7 +6679,7 @@ func (m *QueryOptInfoRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryValidatorsRequest) Unmarshal(dAtA []byte) error { +func (m *QuerySnapshotAndHelperRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6550,15 +6702,15 @@ func (m *QueryValidatorsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryValidatorsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySnapshotAndHelperRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryValidatorsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySnapshotAndHelperRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Chain", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Avs", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6586,13 +6738,63 @@ func (m *QueryValidatorsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Chain = string(dAtA[iNdEx:postIndex]) + m.Avs = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QuerySpecifiedSnapshotRequest) 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 ErrIntOverflowQuery + } + 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: QuerySpecifiedSnapshotRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QuerySpecifiedSnapshotRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Avs", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6602,28 +6804,43 @@ func (m *QueryValidatorsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} + m.Avs = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= int64(b&0x7F) << shift + if b < 0x80 { + break + } } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -6645,7 +6862,7 @@ func (m *QueryValidatorsRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryValidatorsResponse) Unmarshal(dAtA []byte) error { +func (m *VotingPowerSnapshotWithKeyHeight) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6668,17 +6885,17 @@ func (m *QueryValidatorsResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryValidatorsResponse: wiretype end group for non-group") + return fmt.Errorf("proto: VotingPowerSnapshotWithKeyHeight: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryValidatorsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: VotingPowerSnapshotWithKeyHeight: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Validators", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SnapshotKeyHeight", wireType) } - var msglen int + m.SnapshotKeyHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6688,29 +6905,14 @@ func (m *QueryValidatorsResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.SnapshotKeyHeight |= int64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Validators = append(m.Validators, Validator{}) - if err := m.Validators[len(m.Validators)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Snapshot", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6737,10 +6939,10 @@ func (m *QueryValidatorsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} + if m.Snapshot == nil { + m.Snapshot = &VotingPowerSnapshot{} } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Snapshot.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -6765,7 +6967,7 @@ func (m *QueryValidatorsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryValidatorRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllSnapshotRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6788,15 +6990,15 @@ func (m *QueryValidatorRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryValidatorRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllSnapshotRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryValidatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllSnapshotRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ValidatorAccAddr", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Avs", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6824,13 +7026,13 @@ func (m *QueryValidatorRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ValidatorAccAddr = string(dAtA[iNdEx:postIndex]) + m.Avs = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Chain", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6840,23 +7042,27 @@ func (m *QueryValidatorRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.Chain = string(dAtA[iNdEx:postIndex]) + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -6879,7 +7085,7 @@ func (m *QueryValidatorRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryValidatorResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllSnapshotResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6902,15 +7108,49 @@ func (m *QueryValidatorResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryValidatorResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllSnapshotResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryValidatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllSnapshotResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Validator", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Snapshots", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Snapshots = append(m.Snapshots, &VotingPowerSnapshotWithKeyHeight{}) + if err := m.Snapshots[len(m.Snapshots)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6937,7 +7177,10 @@ func (m *QueryValidatorResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Validator.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/operator/types/query.pb.gw.go b/x/operator/types/query.pb.gw.go index b32be73fe..a0ca9f51f 100644 --- a/x/operator/types/query.pb.gw.go +++ b/x/operator/types/query.pb.gw.go @@ -845,12 +845,8 @@ func local_request_Query_QueryOptInfo_0(ctx context.Context, marshaler runtime.M } -var ( - filter_Query_Validators_0 = &utilities.DoubleArray{Encoding: map[string]int{"chain": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} -) - -func request_Query_Validators_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryValidatorsRequest +func request_Query_QuerySnapshotHelper_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySnapshotAndHelperRequest var metadata runtime.ServerMetadata var ( @@ -860,31 +856,51 @@ func request_Query_Validators_0(ctx context.Context, marshaler runtime.Marshaler _ = err ) - val, ok = pathParams["chain"] + val, ok = pathParams["avs"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "avs") } - protoReq.Chain, err = runtime.String(val) + protoReq.Avs, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "avs", err) } - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + msg, err := client.QuerySnapshotHelper(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_QuerySnapshotHelper_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySnapshotAndHelperRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["avs"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "avs") } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Validators_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + + protoReq.Avs, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "avs", err) } - msg, err := client.Validators(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := server.QuerySnapshotHelper(ctx, &protoReq) return msg, metadata, err } -func local_request_Query_Validators_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryValidatorsRequest +func request_Query_QuerySpecifiedSnapshot_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySpecifiedSnapshotRequest var metadata runtime.ServerMetadata var ( @@ -894,31 +910,35 @@ func local_request_Query_Validators_0(ctx context.Context, marshaler runtime.Mar _ = err ) - val, ok = pathParams["chain"] + val, ok = pathParams["avs"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "avs") } - protoReq.Chain, err = runtime.String(val) + protoReq.Avs, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "avs", err) } - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + val, ok = pathParams["height"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "height") } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Validators_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + + protoReq.Height, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "height", err) } - msg, err := server.Validators(ctx, &protoReq) + msg, err := client.QuerySpecifiedSnapshot(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func request_Query_Validator_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryValidatorRequest +func local_request_Query_QuerySpecifiedSnapshot_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySpecifiedSnapshotRequest var metadata runtime.ServerMetadata var ( @@ -928,35 +948,39 @@ func request_Query_Validator_0(ctx context.Context, marshaler runtime.Marshaler, _ = err ) - val, ok = pathParams["validator_acc_addr"] + val, ok = pathParams["avs"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "validator_acc_addr") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "avs") } - protoReq.ValidatorAccAddr, err = runtime.String(val) + protoReq.Avs, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_acc_addr", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "avs", err) } - val, ok = pathParams["chain"] + val, ok = pathParams["height"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "height") } - protoReq.Chain, err = runtime.String(val) + protoReq.Height, err = runtime.Int64(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "height", err) } - msg, err := client.Validator(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := server.QuerySpecifiedSnapshot(ctx, &protoReq) return msg, metadata, err } -func local_request_Query_Validator_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryValidatorRequest +var ( + filter_Query_QueryAllSnapshot_0 = &utilities.DoubleArray{Encoding: map[string]int{"avs": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_Query_QueryAllSnapshot_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllSnapshotRequest var metadata runtime.ServerMetadata var ( @@ -966,29 +990,59 @@ func local_request_Query_Validator_0(ctx context.Context, marshaler runtime.Mars _ = err ) - val, ok = pathParams["validator_acc_addr"] + val, ok = pathParams["avs"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "validator_acc_addr") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "avs") } - protoReq.ValidatorAccAddr, err = runtime.String(val) + protoReq.Avs, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_acc_addr", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "avs", err) } - val, ok = pathParams["chain"] + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_QueryAllSnapshot_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.QueryAllSnapshot(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_QueryAllSnapshot_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllSnapshotRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["avs"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "avs") } - protoReq.Chain, err = runtime.String(val) + protoReq.Avs, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "avs", err) } - msg, err := server.Validator(ctx, &protoReq) + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_QueryAllSnapshot_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.QueryAllSnapshot(ctx, &protoReq) return msg, metadata, err } @@ -1275,7 +1329,30 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_Validators_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_QuerySnapshotHelper_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_QuerySnapshotHelper_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QuerySnapshotHelper_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_QuerySpecifiedSnapshot_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1286,7 +1363,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Validators_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_QuerySpecifiedSnapshot_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1294,11 +1371,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Validators_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_QuerySpecifiedSnapshot_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Validator_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_QueryAllSnapshot_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1309,7 +1386,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Validator_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_QueryAllSnapshot_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1317,7 +1394,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Validator_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_QueryAllSnapshot_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1602,7 +1679,27 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_Validators_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_QuerySnapshotHelper_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_QuerySnapshotHelper_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QuerySnapshotHelper_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_QuerySpecifiedSnapshot_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1611,18 +1708,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Validators_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_QuerySpecifiedSnapshot_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Validators_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_QuerySpecifiedSnapshot_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Validator_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_QueryAllSnapshot_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1631,14 +1728,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Validator_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_QueryAllSnapshot_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Validator_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_QueryAllSnapshot_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1656,11 +1753,11 @@ var ( pattern_Query_QueryAllOperatorConsKeysByChainID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"exocore", "operator", "v1", "all_operator_cons_keys", "chain"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_QueryOperatorUSDValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "query_operator_usd_value", "operator_and_avs.operator_addr", "operator_and_avs.avs_address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QueryOperatorUSDValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "QueryOperatorUSDValue", "operator_and_avs.operator_addr", "operator_and_avs.avs_address"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_QueryAVSUSDValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"exocore", "operator", "v1", "QueryAVSUSDValue"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_QueryOperatorSlashInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "query_operator_slash_info", "operator_and_avs.operator_addr", "operator_and_avs.avs_address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QueryOperatorSlashInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "QueryOperatorSlashInfo", "operator_and_avs.operator_addr", "operator_and_avs.avs_address"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_QueryAllOperatorConsAddrsByChainID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"exocore", "operator", "v1", "all_operator_cons_addrs", "chain"}, "", runtime.AssumeColonVerbOpt(false))) @@ -1670,9 +1767,11 @@ var ( pattern_Query_QueryOptInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "opt_info", "operator_and_avs.operator_addr", "operator_and_avs.avs_address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Validators_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"exocore", "operator", "v1", "validators", "chain"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QuerySnapshotHelper_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"exocore", "operator", "v1", "snapshot_helper", "avs"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Validator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "validator", "validator_acc_addr", "chain"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QuerySpecifiedSnapshot_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "snapshot", "avs", "height"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_QueryAllSnapshot_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"exocore", "operator", "v1", "all_snapshot", "avs"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -1700,7 +1799,9 @@ var ( forward_Query_QueryOptInfo_0 = runtime.ForwardResponseMessage - forward_Query_Validators_0 = runtime.ForwardResponseMessage + forward_Query_QuerySnapshotHelper_0 = runtime.ForwardResponseMessage + + forward_Query_QuerySpecifiedSnapshot_0 = runtime.ForwardResponseMessage - forward_Query_Validator_0 = runtime.ForwardResponseMessage + forward_Query_QueryAllSnapshot_0 = runtime.ForwardResponseMessage ) diff --git a/x/operator/types/tx.pb.go b/x/operator/types/tx.pb.go index 3305a20e7..3094a603a 100644 --- a/x/operator/types/tx.pb.go +++ b/x/operator/types/tx.pb.go @@ -14,7 +14,6 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -23,14 +22,12 @@ import ( io "io" math "math" math_bits "math/bits" - time "time" ) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf -var _ = time.Kitchen // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -218,10 +215,6 @@ type VotingPowerSnapshot struct { EpochIdentifier string `protobuf:"bytes,4,opt,name=epoch_identifier,json=epochIdentifier,proto3" json:"epoch_identifier,omitempty"` // epoch_number indicates which epoch this snapshot serve for EpochNumber int64 `protobuf:"varint,5,opt,name=epoch_number,json=epochNumber,proto3" json:"epoch_number,omitempty"` - // block_time records the block time when it is stored, and it is used for snapshot pruning - // The epoch_number would be sufficient for pruning if we don't support AVSs changing their - // epoch configuration. - BlockTime time.Time `protobuf:"bytes,6,opt,name=block_time,json=blockTime,proto3,stdtime" json:"block_time"` } func (m *VotingPowerSnapshot) Reset() { *m = VotingPowerSnapshot{} } @@ -285,13 +278,6 @@ func (m *VotingPowerSnapshot) GetEpochNumber() int64 { return 0 } -func (m *VotingPowerSnapshot) GetBlockTime() time.Time { - if m != nil { - return m.BlockTime - } - return time.Time{} -} - // SnapshotHelper is used to record the helper information for voting power snapshot update type SnapshotHelper struct { // last_changed_height indicates the height of the most recent change. @@ -308,9 +294,6 @@ type SnapshotHelper struct { // similar to the MaxValidatorNumber in Dogfood, this may need to be changed to an operator list // to track all operators that have opted out, thereby assisting with the correct snapshot update. HasOptOut bool `protobuf:"varint,2,opt,name=has_opt_out,json=hasOptOut,proto3" json:"has_opt_out,omitempty"` - // has_slash is used to indicate whether there is a slash event has been executed before the epoch expires. - // When a slash is executed, Dogfood can immediately update the voting power based on this flag. - HasSlash bool `protobuf:"varint,3,opt,name=has_slash,json=hasSlash,proto3" json:"has_slash,omitempty"` } func (m *SnapshotHelper) Reset() { *m = SnapshotHelper{} } @@ -360,13 +343,6 @@ func (m *SnapshotHelper) GetHasOptOut() bool { return false } -func (m *SnapshotHelper) GetHasSlash() bool { - if m != nil { - return m.HasSlash - } - return false -} - // ClientChainEarningAddrList is the list of client chain earning addresses. // Because the reward token provide by the AVS might be located at different client chain, the operator need to // provide the different client chain address to receive the token rewards. @@ -1275,121 +1251,118 @@ func init() { func init() { proto.RegisterFile("exocore/operator/v1/tx.proto", fileDescriptor_b229d5663e4df167) } var fileDescriptor_b229d5663e4df167 = []byte{ - // 1820 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdd, 0x6f, 0x1b, 0x59, - 0x15, 0xcf, 0x38, 0x6e, 0x6b, 0x1f, 0xdb, 0xb1, 0x73, 0xd3, 0x0f, 0xd7, 0x5b, 0xe2, 0x76, 0x96, - 0xb6, 0x69, 0x20, 0xb6, 0x9a, 0x65, 0x91, 0xb6, 0x80, 0x44, 0xbe, 0xaa, 0x9a, 0x4d, 0xed, 0x68, - 0x9c, 0x54, 0x62, 0x11, 0x8c, 0x26, 0xe3, 0x1b, 0x7b, 0x9a, 0xf1, 0xdc, 0x61, 0xee, 0xb5, 0x37, - 0x59, 0x09, 0x09, 0xed, 0xd3, 0x0a, 0xf1, 0xb0, 0xd2, 0x3e, 0x21, 0x78, 0xe8, 0x03, 0x42, 0x3c, - 0xf6, 0x61, 0x79, 0x44, 0xc0, 0xdb, 0x3e, 0xae, 0x0a, 0x0f, 0x88, 0x87, 0x2c, 0x4a, 0x91, 0xca, - 0x1f, 0x01, 0x12, 0xba, 0x67, 0xee, 0x38, 0xe3, 0xd6, 0x4e, 0x1b, 0x35, 0xe5, 0x25, 0xc9, 0x3d, - 0xe7, 0xdc, 0x73, 0x7e, 0xe7, 0xfb, 0x4e, 0xe0, 0x0a, 0xdd, 0x63, 0x36, 0x0b, 0x68, 0x95, 0xf9, - 0x34, 0xb0, 0x04, 0x0b, 0xaa, 0xfd, 0xdb, 0x55, 0xb1, 0x57, 0xf1, 0x03, 0x26, 0x18, 0x99, 0x51, - 0xdc, 0x4a, 0xc4, 0xad, 0xf4, 0x6f, 0x97, 0xa6, 0xad, 0xae, 0xe3, 0xb1, 0x2a, 0xfe, 0x0c, 0xe5, - 0x4a, 0x97, 0x6c, 0xc6, 0xbb, 0x8c, 0x57, 0xbb, 0xbc, 0x2d, 0xef, 0x77, 0x79, 0x5b, 0x31, 0xbe, - 0xae, 0x18, 0x5c, 0x58, 0xbb, 0x8e, 0x27, 0x99, 0xdb, 0x54, 0x58, 0xb7, 0xa3, 0xb3, 0x92, 0xba, - 0x1c, 0x4a, 0x99, 0x78, 0xaa, 0x86, 0x07, 0xc5, 0x3a, 0xdf, 0x66, 0x6d, 0x16, 0xd2, 0xe5, 0x5f, - 0x8a, 0x7a, 0xa5, 0xcd, 0x58, 0xdb, 0xa5, 0x55, 0xcb, 0x77, 0xaa, 0x96, 0xe7, 0x31, 0x61, 0x09, - 0x87, 0x79, 0xd1, 0x9d, 0xb2, 0xe2, 0xe2, 0x69, 0xbb, 0xb7, 0x53, 0x15, 0x4e, 0x97, 0x72, 0x61, - 0x75, 0xfd, 0x50, 0x40, 0xa7, 0x90, 0x5b, 0xa5, 0xf6, 0x03, 0xcb, 0xed, 0xd1, 0xbb, 0x0e, 0x75, - 0x5b, 0x64, 0x13, 0xce, 0x5a, 0x5d, 0xd6, 0xf3, 0x44, 0x51, 0xbb, 0xaa, 0xcd, 0xa5, 0x97, 0xbf, - 0xfb, 0xc5, 0x41, 0x79, 0xe2, 0x1f, 0x07, 0xe5, 0x1b, 0x6d, 0x47, 0x74, 0x7a, 0xdb, 0x15, 0x9b, - 0x75, 0x15, 0x2c, 0xf5, 0x6b, 0x81, 0xb7, 0x76, 0xab, 0x62, 0xdf, 0xa7, 0xbc, 0xb2, 0x4a, 0xed, - 0x27, 0x9f, 0x2f, 0x80, 0x42, 0xbd, 0x4a, 0x6d, 0x43, 0xe9, 0xd2, 0xff, 0x93, 0x80, 0x0b, 0x0d, - 0x15, 0xb8, 0x86, 0x2f, 0x68, 0x6b, 0xab, 0xb9, 0x8a, 0x46, 0x49, 0x00, 0x53, 0x9c, 0xba, 0x3b, - 0x66, 0x8f, 0xb7, 0xcc, 0xbe, 0xa4, 0x28, 0xbb, 0xeb, 0x27, 0xb3, 0x7b, 0x78, 0x50, 0xce, 0x36, - 0xa9, 0xbb, 0x13, 0xe9, 0x7d, 0x0e, 0x47, 0x56, 0xda, 0xd8, 0xe2, 0xad, 0xd0, 0x66, 0x0f, 0xf2, - 0x82, 0x09, 0xcb, 0x8d, 0x19, 0x4d, 0xa0, 0xd1, 0xfb, 0x27, 0x36, 0x9a, 0xdb, 0x94, 0x8a, 0xc6, - 0x58, 0xcd, 0xa1, 0x95, 0x81, 0xd9, 0x3d, 0x28, 0x58, 0xb6, 0x70, 0xfa, 0x34, 0x66, 0x77, 0x12, - 0xed, 0xd6, 0x4f, 0x6c, 0x77, 0x6a, 0x09, 0x35, 0x8d, 0x31, 0x3c, 0x15, 0xda, 0x89, 0x2c, 0xeb, - 0x7f, 0xd0, 0x60, 0x26, 0x0a, 0xff, 0x03, 0x26, 0x1c, 0xaf, 0xbd, 0xc1, 0x3e, 0xa4, 0x01, 0xf9, - 0x1e, 0xe4, 0xa2, 0x72, 0x36, 0xad, 0x56, 0x2b, 0x50, 0xb1, 0x2f, 0x3e, 0xf9, 0x7c, 0xe1, 0xbc, - 0x52, 0xb7, 0xd4, 0x6a, 0x05, 0x94, 0xf3, 0xa6, 0x08, 0x1c, 0xaf, 0x6d, 0x64, 0x23, 0x71, 0x49, - 0x26, 0x26, 0x64, 0xfb, 0xa8, 0xcd, 0xf4, 0xa5, 0x3a, 0x15, 0xc4, 0xd7, 0xab, 0x98, 0x4c, 0xff, - 0x08, 0x9f, 0xfe, 0xdb, 0x49, 0x98, 0x89, 0xe1, 0x6d, 0x7a, 0x96, 0xcf, 0x3b, 0x4c, 0x90, 0x87, - 0x40, 0xc2, 0x04, 0x0e, 0x99, 0x3f, 0x8d, 0x82, 0x2d, 0xa0, 0xde, 0x78, 0x8c, 0x7e, 0x02, 0x17, - 0x07, 0x31, 0x8a, 0x9b, 0xe3, 0xc5, 0xc4, 0xd5, 0xc9, 0xb9, 0xcc, 0xe2, 0x5c, 0x65, 0xc4, 0x64, - 0xa8, 0x8c, 0x88, 0xb6, 0x71, 0x9e, 0xbd, 0x48, 0xe4, 0xa4, 0x02, 0x33, 0xae, 0xc5, 0x85, 0x69, - 0x77, 0x2c, 0xaf, 0x4d, 0x5b, 0x66, 0x87, 0x3a, 0xed, 0x8e, 0xc0, 0xc2, 0x98, 0x34, 0xa6, 0x25, - 0x6b, 0x25, 0xe4, 0xdc, 0x43, 0x06, 0xb9, 0x05, 0x05, 0xea, 0x33, 0xbb, 0x63, 0x3a, 0x2d, 0xea, - 0x09, 0x67, 0xc7, 0xa1, 0x41, 0x31, 0x29, 0x3d, 0x37, 0xf2, 0x48, 0xaf, 0x0d, 0xc8, 0xe4, 0x1a, - 0x64, 0x43, 0x51, 0xaf, 0xd7, 0xdd, 0xa6, 0x41, 0xf1, 0x0c, 0xea, 0xcc, 0x20, 0xad, 0x8e, 0x24, - 0xb2, 0x02, 0xb0, 0xed, 0x32, 0x7b, 0xd7, 0x94, 0x83, 0xa1, 0x78, 0xf6, 0xaa, 0x36, 0x97, 0x59, - 0x2c, 0x55, 0xc2, 0xa9, 0x51, 0x89, 0xa6, 0x46, 0x65, 0x33, 0x9a, 0x1a, 0xcb, 0x29, 0x19, 0xdd, - 0x4f, 0xbf, 0x2a, 0x6b, 0x46, 0x1a, 0xef, 0x49, 0x8e, 0xfe, 0x33, 0x98, 0x8a, 0x52, 0x73, 0x8f, - 0xba, 0x3e, 0x0d, 0xc6, 0x39, 0xa5, 0x8d, 0x73, 0x6a, 0x16, 0x32, 0x1d, 0x8b, 0x9b, 0xcc, 0x17, - 0x26, 0xeb, 0x09, 0x2c, 0xa4, 0x94, 0x91, 0xee, 0x58, 0xbc, 0xe1, 0x8b, 0x46, 0x4f, 0x90, 0xb7, - 0x40, 0x1e, 0x4c, 0xee, 0x5a, 0xbc, 0x83, 0xa1, 0x49, 0x19, 0xa9, 0x8e, 0xc5, 0x9b, 0xf2, 0xac, - 0xef, 0x43, 0x69, 0xc5, 0x75, 0xa8, 0x27, 0x75, 0x3a, 0xde, 0x9a, 0x15, 0x78, 0x8e, 0xd7, 0x96, - 0x05, 0xba, 0xee, 0x70, 0x41, 0x7e, 0x04, 0xd3, 0x34, 0x24, 0x99, 0x8e, 0xb7, 0xc3, 0x4c, 0xd7, - 0xe1, 0x12, 0x88, 0x4c, 0x5d, 0x75, 0x64, 0xea, 0x46, 0xeb, 0xaa, 0x79, 0x3b, 0xcc, 0xc8, 0x2b, - 0x4d, 0xf2, 0x20, 0x95, 0xeb, 0xbf, 0xd2, 0xc6, 0xd9, 0x96, 0x22, 0xe4, 0xfb, 0x40, 0xdc, 0x8f, - 0x4c, 0x1b, 0x05, 0x64, 0x2c, 0x1c, 0xcf, 0x74, 0x5a, 0x18, 0x85, 0xe4, 0xf2, 0xcc, 0xe1, 0x41, - 0x39, 0xbf, 0xfe, 0x51, 0xec, 0x76, 0x6d, 0xd5, 0xc8, 0xbb, 0x43, 0x84, 0x16, 0x79, 0x0f, 0x2e, - 0x0f, 0x5d, 0x8f, 0x5c, 0xc1, 0x6e, 0xc5, 0x7e, 0x33, 0x2e, 0xda, 0x23, 0x01, 0xe8, 0x7f, 0x49, - 0x40, 0x36, 0x2a, 0x43, 0x44, 0xf3, 0x36, 0xe4, 0xd4, 0x75, 0x1e, 0xeb, 0x76, 0x23, 0x1b, 0x11, - 0xb1, 0xa7, 0xaf, 0x41, 0xd6, 0xf2, 0xfd, 0x80, 0xf5, 0x69, 0xdc, 0x46, 0x46, 0xd1, 0x50, 0xe4, - 0x9b, 0x40, 0x06, 0x1d, 0xd1, 0xa5, 0xc2, 0xc2, 0xb8, 0x86, 0x93, 0xcc, 0x28, 0x44, 0x9c, 0xfb, - 0x54, 0x58, 0x68, 0xd5, 0x85, 0xd2, 0x28, 0x0f, 0x14, 0x84, 0x24, 0x56, 0xdc, 0x49, 0x12, 0x21, - 0xe3, 0x6e, 0x5c, 0x7a, 0xd1, 0xe7, 0x10, 0xfe, 0x7d, 0x00, 0x9b, 0x75, 0xbb, 0x0e, 0xe7, 0x0e, - 0xf3, 0xb0, 0xe0, 0x33, 0x8b, 0x7a, 0x45, 0x35, 0x78, 0xb4, 0x6a, 0xd5, 0xea, 0xad, 0xac, 0x0c, - 0x24, 0x97, 0xd3, 0xb2, 0xae, 0x7f, 0xff, 0xec, 0xf1, 0xbc, 0x66, 0xc4, 0x14, 0xe8, 0xbf, 0xd1, - 0x20, 0x8d, 0xfb, 0x0a, 0x5d, 0xb9, 0x0e, 0x53, 0x58, 0x81, 0xa6, 0xcd, 0x3c, 0x11, 0x58, 0xb6, - 0xda, 0x91, 0x46, 0x0e, 0xa9, 0x2b, 0x8a, 0x48, 0x6e, 0x40, 0x9e, 0xc9, 0x3b, 0xa6, 0xe3, 0x45, - 0x85, 0x2f, 0xa3, 0x98, 0x34, 0x72, 0x2c, 0x54, 0xa5, 0x8a, 0x7e, 0x0e, 0x0a, 0xa1, 0x1c, 0xeb, - 0x89, 0x78, 0xdb, 0x27, 0x8d, 0x29, 0xa4, 0x37, 0x7a, 0x42, 0x49, 0x5e, 0x84, 0xb3, 0x0f, 0x2d, - 0xc7, 0xa5, 0x2d, 0x8c, 0x57, 0xca, 0x50, 0x27, 0xfd, 0x8f, 0x1a, 0x4c, 0x2b, 0x78, 0x4b, 0x9c, - 0x53, 0xd1, 0x14, 0x96, 0xa0, 0xaf, 0xb5, 0xc2, 0x6b, 0x9e, 0x88, 0x4d, 0xc4, 0x9a, 0x27, 0xa2, - 0x15, 0x4e, 0x0c, 0x38, 0x13, 0x5f, 0x95, 0xaf, 0x37, 0x66, 0x43, 0x55, 0xfa, 0x9f, 0x35, 0xb8, - 0x80, 0x3d, 0x7c, 0x37, 0x60, 0xdd, 0x2d, 0xaf, 0x45, 0x5d, 0xda, 0xc6, 0xf7, 0x0b, 0xb9, 0x05, - 0x69, 0x99, 0x2d, 0x1a, 0x44, 0x0d, 0x93, 0x5e, 0xce, 0x1e, 0x1e, 0x94, 0x53, 0x4d, 0x24, 0xd6, - 0x56, 0x8d, 0x54, 0xc8, 0xae, 0xb5, 0xc8, 0x0d, 0x48, 0x59, 0xd2, 0x79, 0x29, 0x19, 0x62, 0xcb, - 0x1c, 0x1e, 0x94, 0xcf, 0x61, 0x40, 0x6a, 0xab, 0xc6, 0x39, 0x64, 0xd6, 0xe2, 0x2f, 0x9b, 0xc9, - 0xd3, 0x0b, 0x8b, 0xfe, 0x99, 0x06, 0x33, 0x03, 0x17, 0xd0, 0x26, 0xdf, 0x60, 0xcc, 0x1d, 0x42, - 0xa5, 0xbd, 0x12, 0xaa, 0xc4, 0x29, 0xa2, 0xfa, 0xf5, 0x24, 0x10, 0x44, 0xb5, 0xb6, 0x47, 0xed, - 0x9e, 0x8c, 0x28, 0x16, 0x70, 0x1b, 0x0a, 0x61, 0x01, 0xfb, 0x01, 0xf3, 0x59, 0x20, 0xe9, 0xa7, - 0xb2, 0x35, 0xf3, 0xa8, 0x75, 0x63, 0xa0, 0x94, 0xfc, 0x18, 0x32, 0xa1, 0xa1, 0xd3, 0x2b, 0x19, - 0x40, 0x85, 0xe1, 0x4b, 0xca, 0x82, 0x99, 0x50, 0x7d, 0x2f, 0x56, 0x33, 0xbc, 0x38, 0x89, 0x53, - 0x7d, 0x7e, 0xe4, 0x30, 0x19, 0x59, 0x66, 0xcb, 0x49, 0x09, 0xc9, 0x20, 0xa8, 0x2c, 0xce, 0xe0, - 0xe4, 0x03, 0x98, 0x0e, 0x4d, 0x60, 0xa2, 0xb8, 0xe9, 0x33, 0xe6, 0x16, 0x93, 0xc7, 0x6c, 0xfc, - 0x11, 0x45, 0xa0, 0xd4, 0x87, 0xd1, 0x39, 0x22, 0xeb, 0xff, 0x4d, 0xc8, 0xb6, 0x0d, 0xaf, 0xe2, - 0xb5, 0x93, 0x4c, 0x97, 0x5b, 0x50, 0xe0, 0xbd, 0xed, 0xae, 0x23, 0xc4, 0xd1, 0x5e, 0x4d, 0xe0, - 0x5e, 0xcd, 0x0f, 0xe8, 0x6a, 0x6c, 0xc8, 0xfd, 0xdf, 0x97, 0x93, 0x77, 0xe8, 0x4d, 0x91, 0x41, - 0x9a, 0x12, 0x79, 0x0b, 0xd2, 0x0e, 0x37, 0xfb, 0x54, 0xb0, 0xc1, 0x70, 0x49, 0x39, 0xfc, 0x01, - 0x9e, 0x47, 0x96, 0xcb, 0x99, 0x37, 0x51, 0x2e, 0x5f, 0x83, 0x30, 0xbb, 0xa6, 0xbc, 0x81, 0xaf, - 0x90, 0x9c, 0x91, 0x46, 0xca, 0xe6, 0xbe, 0x4f, 0x49, 0x1d, 0xa6, 0x68, 0x54, 0xc7, 0xe1, 0xb2, - 0x39, 0x87, 0x83, 0xfd, 0xe6, 0xf8, 0x44, 0x0c, 0xd5, 0xbd, 0x91, 0xa3, 0xf1, 0xa3, 0xfe, 0x27, - 0x0d, 0x66, 0x0c, 0xda, 0x76, 0xb8, 0xa0, 0x41, 0x94, 0x07, 0x83, 0xfe, 0x94, 0x7c, 0x07, 0xb2, - 0x3b, 0x01, 0xeb, 0xe2, 0x66, 0xa2, 0x9c, 0xbf, 0xf4, 0x35, 0x9c, 0x91, 0xd2, 0x8a, 0x44, 0xde, - 0x85, 0x24, 0x42, 0x4b, 0x20, 0xb4, 0x6b, 0xc7, 0xbe, 0x0a, 0x11, 0x14, 0x8a, 0xdf, 0xf9, 0xd6, - 0x27, 0x8f, 0xca, 0x13, 0xff, 0x7e, 0x54, 0x9e, 0xf8, 0xf8, 0xd9, 0xe3, 0xf9, 0xcc, 0xdd, 0x23, - 0x85, 0xbf, 0x78, 0xf6, 0x78, 0xfe, 0x52, 0x2c, 0x98, 0xf1, 0xbb, 0x7a, 0x09, 0x8a, 0x2f, 0x3a, - 0xc0, 0x7d, 0xe6, 0x71, 0xaa, 0x7f, 0xa5, 0x41, 0xae, 0xe1, 0x8b, 0x9a, 0x27, 0xd8, 0xd2, 0x83, - 0xe6, 0x6b, 0xfb, 0x55, 0x86, 0x8c, 0xd5, 0xe7, 0x83, 0xbb, 0xe1, 0x7b, 0x00, 0xac, 0x3e, 0x8f, - 0x04, 0xde, 0x83, 0xbc, 0xdf, 0xdb, 0x76, 0x1d, 0xdb, 0xdc, 0xa5, 0xfb, 0xe6, 0x43, 0xce, 0x3c, - 0x35, 0x60, 0xa7, 0xe5, 0xf7, 0xd1, 0x06, 0xb2, 0xde, 0xa7, 0xfb, 0x3f, 0x68, 0x36, 0xea, 0x46, - 0xce, 0x1f, 0x1c, 0x39, 0xf3, 0xee, 0xbc, 0x7b, 0x9c, 0xf3, 0xc5, 0x21, 0xe7, 0x63, 0xfe, 0xe8, - 0xe7, 0x81, 0xc4, 0x09, 0xca, 0xef, 0xdf, 0x69, 0x30, 0x15, 0x3e, 0x17, 0x1b, 0x3b, 0xff, 0x0f, - 0xc7, 0xef, 0x7c, 0xfb, 0x38, 0xf4, 0x97, 0x87, 0xd1, 0xc7, 0x50, 0xe9, 0x17, 0xe4, 0xc7, 0x58, - 0x8c, 0xa2, 0xf0, 0x3f, 0xd1, 0x20, 0xd7, 0xa4, 0x62, 0x85, 0x79, 0xfc, 0x7d, 0xba, 0x2f, 0xe1, - 0x2f, 0xc2, 0xb9, 0x57, 0x45, 0x1e, 0x09, 0xbe, 0xd1, 0x74, 0xdd, 0x8e, 0x3b, 0x1c, 0x59, 0x7c, - 0x3e, 0x55, 0x43, 0x2e, 0xc8, 0x54, 0xc5, 0x09, 0xa1, 0xab, 0xf3, 0x2e, 0xa4, 0x9b, 0x83, 0xee, - 0x2e, 0xc1, 0xc5, 0xe6, 0xfa, 0x52, 0xf3, 0x9e, 0xb9, 0xf9, 0xc3, 0x8d, 0x35, 0x73, 0xab, 0xde, - 0xdc, 0x58, 0x5b, 0xa9, 0xdd, 0xad, 0xad, 0xad, 0x16, 0x26, 0xc8, 0x15, 0x28, 0xc6, 0x78, 0xb5, - 0x7a, 0x73, 0x73, 0xa9, 0xbe, 0x69, 0x22, 0xa9, 0xa0, 0x91, 0xeb, 0x70, 0x2d, 0xc6, 0xad, 0x37, - 0x22, 0x81, 0xa5, 0xfa, 0x5a, 0x63, 0xab, 0xa9, 0xc4, 0x12, 0x8b, 0x7f, 0x4b, 0xc2, 0xe4, 0x7d, - 0xde, 0x26, 0x8f, 0x34, 0x28, 0x3c, 0xdf, 0x35, 0x64, 0xf4, 0x30, 0x1f, 0x31, 0x1d, 0x4a, 0x0b, - 0xaf, 0x28, 0xa9, 0xd2, 0xf9, 0xce, 0xc7, 0x7f, 0xfd, 0xd7, 0x67, 0x89, 0x05, 0xfd, 0x1b, 0xd5, - 0xd1, 0xff, 0x57, 0xaa, 0x8e, 0x9a, 0x40, 0x9f, 0x68, 0x00, 0x47, 0xf1, 0x22, 0xfa, 0xe8, 0x01, - 0x17, 0x8f, 0x70, 0xe9, 0xe6, 0x4b, 0x65, 0x14, 0xa0, 0x05, 0x04, 0x74, 0x53, 0xbf, 0x3e, 0x0e, - 0xd0, 0x70, 0xf1, 0x49, 0x28, 0x47, 0x5d, 0x36, 0x06, 0xca, 0x50, 0x5f, 0x8e, 0x81, 0x32, 0xa2, - 0x55, 0x5f, 0x0a, 0x65, 0x78, 0x7e, 0xfd, 0x52, 0x83, 0x4c, 0xac, 0x63, 0xc8, 0xdb, 0xe3, 0xec, - 0xc4, 0xba, 0xac, 0x34, 0xf7, 0x72, 0x21, 0x85, 0xa6, 0x82, 0x68, 0xe6, 0xf4, 0x1b, 0xc7, 0xa0, - 0x89, 0x6b, 0x3e, 0xf3, 0x73, 0xf9, 0x9d, 0xb0, 0xbc, 0xfe, 0xc5, 0xe1, 0xac, 0xf6, 0xe5, 0xe1, - 0xac, 0xf6, 0xcf, 0xc3, 0x59, 0xed, 0xd3, 0xa7, 0xb3, 0x13, 0x5f, 0x3e, 0x9d, 0x9d, 0xf8, 0xfb, - 0xd3, 0xd9, 0x89, 0x0f, 0x16, 0x63, 0x5b, 0x71, 0x2d, 0x54, 0x59, 0xa7, 0xe2, 0x43, 0x16, 0xec, - 0x0e, 0x2c, 0xec, 0x1d, 0xd9, 0xc0, 0x2d, 0xb9, 0x7d, 0x16, 0x3f, 0xb6, 0xdf, 0xf9, 0x5f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xd4, 0xc5, 0x1a, 0x3d, 0x86, 0x14, 0x00, 0x00, + // 1765 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1b, 0xc7, + 0x15, 0xd7, 0x52, 0xb2, 0x2d, 0x3e, 0x92, 0x22, 0x35, 0xf4, 0x07, 0xcd, 0xba, 0xa2, 0xbd, 0xa9, + 0x6d, 0x59, 0xad, 0x48, 0x58, 0x69, 0x0a, 0xc4, 0x6d, 0x81, 0x4a, 0xa2, 0x0c, 0xb3, 0x91, 0x49, + 0x61, 0x57, 0x32, 0xd0, 0x14, 0xed, 0x76, 0xb5, 0x3b, 0x5c, 0xae, 0xbd, 0xdc, 0xd9, 0xee, 0x0c, + 0x19, 0x29, 0xa7, 0x22, 0xa7, 0xa0, 0xe8, 0xa1, 0x40, 0x4e, 0x45, 0x7b, 0xf0, 0xa9, 0xe8, 0xd1, + 0x87, 0xf4, 0x58, 0xb4, 0xbd, 0xe5, 0x18, 0xb8, 0x3d, 0x14, 0x3d, 0x28, 0x85, 0x5c, 0xc0, 0xfd, + 0x23, 0x5a, 0xa0, 0x98, 0xd9, 0x59, 0x6a, 0x69, 0x2f, 0x65, 0x0b, 0x56, 0x72, 0x49, 0x3c, 0xef, + 0xbd, 0x79, 0xbf, 0xdf, 0x7b, 0xf3, 0x3e, 0x96, 0x82, 0x2b, 0x78, 0x8f, 0x58, 0x24, 0xc4, 0x0d, + 0x12, 0xe0, 0xd0, 0x64, 0x24, 0x6c, 0x0c, 0x6f, 0x37, 0xd8, 0x5e, 0x3d, 0x08, 0x09, 0x23, 0xa8, + 0x2c, 0xb5, 0xf5, 0x58, 0x5b, 0x1f, 0xde, 0xae, 0xce, 0x9b, 0x7d, 0xd7, 0x27, 0x0d, 0xf1, 0xdf, + 0xc8, 0xae, 0x7a, 0xc9, 0x22, 0xb4, 0x4f, 0x68, 0xa3, 0x4f, 0x1d, 0x7e, 0xbf, 0x4f, 0x1d, 0xa9, + 0xf8, 0x86, 0x54, 0x50, 0x66, 0x3e, 0x72, 0x7d, 0xae, 0xdc, 0xc5, 0xcc, 0xbc, 0x1d, 0x9f, 0xa5, + 0xd5, 0xe5, 0xc8, 0xca, 0x10, 0xa7, 0x46, 0x74, 0x90, 0xaa, 0xf3, 0x0e, 0x71, 0x48, 0x24, 0xe7, + 0xff, 0x92, 0xd2, 0x2b, 0x0e, 0x21, 0x8e, 0x87, 0x1b, 0x66, 0xe0, 0x36, 0x4c, 0xdf, 0x27, 0xcc, + 0x64, 0x2e, 0xf1, 0xe3, 0x3b, 0x35, 0xa9, 0x15, 0xa7, 0xdd, 0x41, 0xb7, 0xc1, 0xdc, 0x3e, 0xa6, + 0xcc, 0xec, 0x07, 0x91, 0x81, 0x8a, 0xa1, 0xd0, 0xc4, 0xd6, 0x03, 0xd3, 0x1b, 0xe0, 0xbb, 0x2e, + 0xf6, 0x6c, 0xb4, 0x0d, 0x67, 0xcd, 0x3e, 0x19, 0xf8, 0xac, 0xa2, 0x5c, 0x55, 0x16, 0xb3, 0x6b, + 0xdf, 0xfb, 0xec, 0xa0, 0x36, 0xf5, 0xcf, 0x83, 0xda, 0x0d, 0xc7, 0x65, 0xbd, 0xc1, 0x6e, 0xdd, + 0x22, 0x7d, 0x49, 0x4b, 0xfe, 0x6f, 0x99, 0xda, 0x8f, 0x1a, 0x6c, 0x3f, 0xc0, 0xb4, 0xde, 0xc4, + 0xd6, 0xd3, 0x4f, 0x97, 0x41, 0xb2, 0x6e, 0x62, 0x4b, 0x93, 0xbe, 0xd4, 0xff, 0x66, 0xe0, 0x42, + 0x47, 0x26, 0xae, 0x13, 0x30, 0x6c, 0xef, 0xe8, 0x4d, 0x01, 0x8a, 0x42, 0x98, 0xa3, 0xd8, 0xeb, + 0x1a, 0x03, 0x6a, 0x1b, 0x43, 0x2e, 0x91, 0xb8, 0x9b, 0x27, 0xc3, 0x3d, 0x3c, 0xa8, 0xe5, 0x75, + 0xec, 0x75, 0x63, 0xbf, 0x2f, 0xf0, 0xc8, 0x73, 0x8c, 0x1d, 0x6a, 0x47, 0x98, 0x03, 0x28, 0x32, + 0xc2, 0x4c, 0x2f, 0x01, 0x9a, 0x11, 0xa0, 0xf7, 0x4f, 0x0c, 0x5a, 0xd8, 0xe6, 0x8e, 0x26, 0xa0, + 0x16, 0x04, 0xca, 0x08, 0x76, 0x0f, 0x4a, 0xa6, 0xc5, 0xdc, 0x21, 0x4e, 0xe0, 0x4e, 0x0b, 0xdc, + 0xf6, 0x89, 0x71, 0xe7, 0x56, 0x85, 0xa7, 0x09, 0xc0, 0x73, 0x11, 0x4e, 0x8c, 0xac, 0xfe, 0x51, + 0x81, 0x72, 0x9c, 0xfe, 0x07, 0x84, 0xb9, 0xbe, 0xb3, 0x45, 0x3e, 0xc0, 0x21, 0xfa, 0x3e, 0x14, + 0xe2, 0x72, 0x36, 0x4c, 0xdb, 0x0e, 0x65, 0xee, 0x2b, 0x4f, 0x3f, 0x5d, 0x3e, 0x2f, 0xdd, 0xad, + 0xda, 0x76, 0x88, 0x29, 0xd5, 0x59, 0xe8, 0xfa, 0x8e, 0x96, 0x8f, 0xcd, 0xb9, 0x18, 0x19, 0x90, + 0x1f, 0x0a, 0x6f, 0x46, 0xc0, 0xdd, 0xc9, 0x24, 0xbe, 0x59, 0xc5, 0xe4, 0x86, 0x47, 0xfc, 0xd4, + 0x2f, 0x32, 0x50, 0x4e, 0xf0, 0xd5, 0x7d, 0x33, 0xa0, 0x3d, 0xc2, 0xd0, 0x43, 0x40, 0xd1, 0x03, + 0x8e, 0xc1, 0x9f, 0x46, 0xc1, 0x96, 0x84, 0xdf, 0x64, 0x8e, 0x7e, 0x0a, 0x17, 0x47, 0x39, 0x4a, + 0xc2, 0xd1, 0x4a, 0xe6, 0xea, 0xf4, 0x62, 0x6e, 0x65, 0xb1, 0x9e, 0x32, 0x19, 0xea, 0x29, 0xd9, + 0xd6, 0xce, 0x93, 0x97, 0x85, 0x14, 0xd5, 0xa1, 0xec, 0x99, 0x94, 0x19, 0x56, 0xcf, 0xf4, 0x1d, + 0x6c, 0x1b, 0x3d, 0xec, 0x3a, 0x3d, 0x26, 0x0a, 0x63, 0x5a, 0x9b, 0xe7, 0xaa, 0xf5, 0x48, 0x73, + 0x4f, 0x28, 0xd0, 0x2d, 0x28, 0xe1, 0x80, 0x58, 0x3d, 0xc3, 0xb5, 0xb1, 0xcf, 0xdc, 0xae, 0x8b, + 0xc3, 0xca, 0x0c, 0x8f, 0x5c, 0x2b, 0x0a, 0x79, 0x6b, 0x24, 0x46, 0xd7, 0x20, 0x1f, 0x99, 0xfa, + 0x83, 0xfe, 0x2e, 0x0e, 0x2b, 0x67, 0x84, 0xcf, 0x9c, 0x90, 0xb5, 0x85, 0x48, 0xfd, 0x19, 0xcc, + 0xc5, 0x59, 0xbd, 0x87, 0xbd, 0x00, 0x87, 0x93, 0xf8, 0x28, 0x93, 0xf8, 0x2c, 0x40, 0xae, 0x67, + 0x52, 0x83, 0x04, 0xcc, 0x20, 0x03, 0x26, 0x6a, 0x60, 0x56, 0xcb, 0xf6, 0x4c, 0xda, 0x09, 0x58, + 0x67, 0xc0, 0xd4, 0x7d, 0xa8, 0xae, 0x7b, 0x2e, 0xf6, 0xf9, 0x35, 0xd7, 0xdf, 0x30, 0x43, 0xdf, + 0xf5, 0x1d, 0x5e, 0x3e, 0x9b, 0x2e, 0x65, 0xe8, 0xc7, 0x30, 0x8f, 0x23, 0x91, 0xe1, 0xfa, 0x5d, + 0x62, 0x78, 0x2e, 0xe5, 0x58, 0x3c, 0xb1, 0x8d, 0xd4, 0xc4, 0xa6, 0xfb, 0x6a, 0xf9, 0x5d, 0xa2, + 0x15, 0xa5, 0x27, 0x7e, 0xe0, 0xce, 0xd5, 0xdf, 0x28, 0x93, 0xb0, 0xb9, 0x09, 0xfa, 0x01, 0x20, + 0xef, 0x43, 0xc3, 0x12, 0x06, 0x3c, 0x5c, 0xd7, 0x37, 0x5c, 0x5b, 0x04, 0x3a, 0xb3, 0x56, 0x3e, + 0x3c, 0xa8, 0x15, 0x37, 0x3f, 0x4c, 0xdc, 0x6e, 0x35, 0xb5, 0xa2, 0x37, 0x26, 0xb0, 0xd1, 0xbb, + 0x70, 0x79, 0xec, 0x7a, 0x1c, 0x8a, 0xe8, 0x25, 0xd1, 0x0d, 0xda, 0x45, 0x2b, 0x95, 0x80, 0xfa, + 0xd7, 0x0c, 0xe4, 0xe3, 0x22, 0x11, 0x6c, 0xde, 0x82, 0x82, 0xbc, 0x4e, 0x13, 0xbd, 0xa8, 0xe5, + 0x63, 0xa1, 0xe8, 0xb8, 0x6b, 0x90, 0x37, 0x83, 0x20, 0x24, 0x43, 0x9c, 0xc4, 0xc8, 0x49, 0x99, + 0x30, 0xf9, 0x16, 0xa0, 0x51, 0xbd, 0xf6, 0x31, 0x33, 0x45, 0x5e, 0xa3, 0x39, 0xa3, 0x95, 0x62, + 0xcd, 0x7d, 0xcc, 0x4c, 0x81, 0xea, 0x41, 0x35, 0x2d, 0x02, 0x49, 0x81, 0xd7, 0xd5, 0xc9, 0x1e, + 0x82, 0xe7, 0x5d, 0xbb, 0xf4, 0x72, 0xcc, 0x11, 0xfd, 0xfb, 0x00, 0x16, 0xe9, 0xf7, 0x5d, 0x4a, + 0x5d, 0xe2, 0x8b, 0x72, 0xcc, 0xad, 0xa8, 0x75, 0xd9, 0x7e, 0xf1, 0x22, 0x94, 0x8b, 0xb1, 0xbe, + 0x3e, 0xb2, 0x5c, 0xcb, 0xf2, 0x9e, 0xfe, 0xc3, 0xf3, 0x27, 0x4b, 0x8a, 0x96, 0x70, 0xa0, 0xfe, + 0x4e, 0x81, 0xac, 0xd8, 0x26, 0x22, 0x94, 0xeb, 0x30, 0x47, 0x3d, 0x93, 0xf6, 0x0c, 0x8b, 0xf8, + 0x2c, 0x34, 0x2d, 0xb9, 0xc1, 0xb4, 0x82, 0x90, 0xae, 0x4b, 0x21, 0xba, 0x01, 0x45, 0xc2, 0xef, + 0x18, 0xae, 0x1f, 0xd7, 0x36, 0xcf, 0xe2, 0x8c, 0x56, 0x20, 0x91, 0x2b, 0x59, 0xd7, 0x8b, 0x50, + 0x8a, 0xec, 0xc8, 0x80, 0x25, 0x9b, 0x72, 0x46, 0x9b, 0x13, 0xf2, 0xce, 0x80, 0x49, 0xcb, 0x8b, + 0x70, 0xf6, 0xa1, 0xe9, 0x7a, 0xd8, 0x16, 0xf9, 0x9a, 0xd5, 0xe4, 0x49, 0xfd, 0x93, 0x02, 0xf3, + 0x92, 0xde, 0x2a, 0xa5, 0x98, 0xe9, 0xcc, 0x64, 0xf8, 0x8d, 0x16, 0x6c, 0xcb, 0x67, 0x89, 0x79, + 0xd5, 0xf2, 0x59, 0xbc, 0x60, 0x91, 0x06, 0x67, 0x92, 0x8b, 0xec, 0xcd, 0x86, 0x60, 0xe4, 0x4a, + 0xfd, 0x8b, 0x02, 0x17, 0x74, 0x9e, 0xbb, 0xbb, 0x21, 0xe9, 0xef, 0xf8, 0x36, 0xf6, 0xb0, 0x23, + 0xbe, 0x2e, 0xd0, 0x2d, 0xc8, 0xf2, 0xd7, 0xc2, 0x61, 0xdc, 0x30, 0xd9, 0xb5, 0xfc, 0xe1, 0x41, + 0x6d, 0x56, 0x17, 0xc2, 0x56, 0x53, 0x9b, 0x8d, 0xd4, 0x2d, 0x1b, 0xdd, 0x80, 0x59, 0x93, 0x07, + 0xcf, 0x2d, 0x23, 0x6e, 0xb9, 0xc3, 0x83, 0xda, 0x39, 0x91, 0x90, 0x56, 0x53, 0x3b, 0x27, 0x94, + 0xad, 0xe4, 0x77, 0xc7, 0xf4, 0xe9, 0xa5, 0x45, 0xfd, 0x44, 0x81, 0xf2, 0x28, 0x04, 0x81, 0x49, + 0xb7, 0x08, 0xf1, 0xc6, 0x58, 0x29, 0xaf, 0xc5, 0x2a, 0x73, 0x8a, 0xac, 0x7e, 0x3b, 0x0d, 0x48, + 0xb0, 0xda, 0xd8, 0xc3, 0xd6, 0x80, 0x67, 0x54, 0x14, 0xb0, 0x03, 0xa5, 0xa8, 0x80, 0x83, 0x90, + 0x04, 0x24, 0xe4, 0xf2, 0x53, 0xd9, 0x69, 0x45, 0xe1, 0x75, 0x6b, 0xe4, 0x14, 0xfd, 0x04, 0x72, + 0x11, 0xd0, 0xe9, 0x95, 0x0c, 0x08, 0x87, 0xd1, 0x77, 0x8e, 0x09, 0xe5, 0xc8, 0xfd, 0x20, 0x51, + 0x33, 0xb4, 0x32, 0x2d, 0xa6, 0xfa, 0x52, 0xea, 0x30, 0x49, 0x2d, 0xb3, 0xb5, 0x19, 0x4e, 0x49, + 0x43, 0xc2, 0x59, 0x52, 0x41, 0xd1, 0xfb, 0x30, 0x1f, 0x41, 0x88, 0x87, 0xa2, 0x46, 0x40, 0x88, + 0x57, 0x99, 0x39, 0x66, 0x1f, 0xa7, 0x14, 0x81, 0x74, 0x1f, 0x65, 0xe7, 0x48, 0xac, 0xfe, 0x2f, + 0xc3, 0xdb, 0x36, 0xba, 0x2a, 0xae, 0x9d, 0x64, 0xba, 0xdc, 0x82, 0x12, 0x1d, 0xec, 0xf6, 0x5d, + 0xc6, 0x8e, 0x56, 0x67, 0x46, 0xac, 0xce, 0xe2, 0x48, 0x2e, 0xc7, 0x06, 0xdf, 0xce, 0x43, 0x3e, + 0x79, 0xc7, 0x36, 0x7e, 0x4e, 0xc8, 0xa4, 0xc9, 0xd7, 0x20, 0xeb, 0x52, 0x63, 0x88, 0x19, 0x19, + 0x0d, 0x97, 0x59, 0x97, 0x3e, 0x10, 0xe7, 0xd4, 0x72, 0x39, 0xf3, 0x65, 0x94, 0xcb, 0xd7, 0x21, + 0x7a, 0x5d, 0x83, 0xdf, 0xa8, 0x9c, 0xbd, 0xaa, 0x2c, 0x16, 0xb4, 0xac, 0x90, 0x6c, 0xef, 0x07, + 0x18, 0xb5, 0x61, 0x0e, 0xc7, 0x75, 0x1c, 0x2d, 0x9b, 0x73, 0x62, 0xb0, 0xdf, 0x9c, 0xfc, 0x10, + 0x63, 0x75, 0xaf, 0x15, 0x70, 0xf2, 0xa8, 0xfe, 0x59, 0x81, 0xb2, 0x86, 0x1d, 0x97, 0x32, 0x1c, + 0xc6, 0xef, 0xa0, 0xe1, 0x9f, 0xa3, 0xef, 0x42, 0xbe, 0x1b, 0x92, 0xbe, 0xd8, 0x4c, 0x98, 0xd2, + 0x57, 0x7e, 0xab, 0xe6, 0xb8, 0xb5, 0x14, 0xa1, 0x77, 0x60, 0x46, 0x50, 0xcb, 0x08, 0x6a, 0xd7, + 0x8e, 0xfd, 0x66, 0x13, 0xa4, 0x84, 0xf9, 0x9d, 0x6f, 0x7f, 0xfc, 0xb8, 0x36, 0xf5, 0x9f, 0xc7, + 0xb5, 0xa9, 0x8f, 0x9e, 0x3f, 0x59, 0xca, 0xdd, 0x3d, 0x72, 0xf8, 0xcb, 0xe7, 0x4f, 0x96, 0x2e, + 0x25, 0x92, 0x99, 0xbc, 0xab, 0x56, 0xa1, 0xf2, 0x72, 0x00, 0x34, 0x20, 0x3e, 0xc5, 0xea, 0x17, + 0x0a, 0x14, 0x3a, 0x01, 0x6b, 0xf9, 0x8c, 0xac, 0x3e, 0xd0, 0xdf, 0x38, 0xae, 0x1a, 0xe4, 0xcc, + 0x21, 0x1d, 0xdd, 0x8d, 0xbe, 0x07, 0xc0, 0x1c, 0xd2, 0xd8, 0xe0, 0x5d, 0x28, 0x06, 0x83, 0x5d, + 0xcf, 0xb5, 0x8c, 0x47, 0x78, 0xdf, 0x78, 0x48, 0x89, 0x2f, 0x07, 0xec, 0x3c, 0xff, 0xf5, 0xb2, + 0x25, 0x54, 0xef, 0xe1, 0xfd, 0x1f, 0xea, 0x9d, 0xb6, 0x56, 0x08, 0x46, 0x47, 0x4a, 0xfc, 0x3b, + 0xef, 0x1c, 0x17, 0x7c, 0x65, 0x2c, 0xf8, 0x44, 0x3c, 0xea, 0x79, 0x40, 0x49, 0x81, 0x8c, 0xfb, + 0xf7, 0x0a, 0xcc, 0x45, 0x5f, 0x84, 0x9d, 0xee, 0x57, 0x11, 0xf8, 0x9d, 0xef, 0x1c, 0xc7, 0xfe, + 0xf2, 0x38, 0xfb, 0x04, 0x2b, 0xf5, 0x02, 0xff, 0xa9, 0x94, 0x90, 0x48, 0xfe, 0x4f, 0x15, 0x28, + 0xe8, 0x98, 0xad, 0x13, 0x9f, 0xbe, 0x87, 0xf7, 0x39, 0xfd, 0x15, 0x38, 0xf7, 0xba, 0xcc, 0x63, + 0xc3, 0x2f, 0xf5, 0xb9, 0x6e, 0x27, 0x03, 0x8e, 0x11, 0x5f, 0x7c, 0xaa, 0xb1, 0x10, 0xf8, 0x53, + 0x25, 0x05, 0x51, 0xa8, 0x4b, 0x1e, 0x64, 0xf5, 0x51, 0x77, 0x57, 0xe1, 0xa2, 0xbe, 0xb9, 0xaa, + 0xdf, 0x33, 0xb6, 0x7f, 0xb4, 0xb5, 0x61, 0xec, 0xb4, 0xf5, 0xad, 0x8d, 0xf5, 0xd6, 0xdd, 0xd6, + 0x46, 0xb3, 0x34, 0x85, 0xae, 0x40, 0x25, 0xa1, 0x6b, 0xb5, 0xf5, 0xed, 0xd5, 0xf6, 0xb6, 0x21, + 0x44, 0x25, 0x05, 0x5d, 0x87, 0x6b, 0x09, 0x6d, 0xbb, 0x13, 0x1b, 0xac, 0xb6, 0x37, 0x3a, 0x3b, + 0xba, 0x34, 0xcb, 0xac, 0xfc, 0x7d, 0x06, 0xa6, 0xef, 0x53, 0x07, 0x3d, 0x56, 0xa0, 0xf4, 0x62, + 0xd7, 0xa0, 0xf4, 0x61, 0x9e, 0x32, 0x1d, 0xaa, 0xcb, 0xaf, 0x69, 0x29, 0x9f, 0xf3, 0xed, 0x8f, + 0xfe, 0xf6, 0xef, 0x4f, 0x32, 0xcb, 0xea, 0x37, 0x1b, 0xe9, 0x7f, 0xf5, 0x69, 0xa4, 0x4d, 0xa0, + 0x8f, 0x15, 0x80, 0xa3, 0x7c, 0x21, 0x35, 0x7d, 0xc0, 0x25, 0x33, 0x5c, 0xbd, 0xf9, 0x4a, 0x1b, + 0x49, 0x68, 0x59, 0x10, 0xba, 0xa9, 0x5e, 0x9f, 0x44, 0x68, 0xbc, 0xf8, 0x38, 0x95, 0xa3, 0x2e, + 0x9b, 0x40, 0x65, 0xac, 0x2f, 0x27, 0x50, 0x49, 0x69, 0xd5, 0x57, 0x52, 0x19, 0x9f, 0x5f, 0xbf, + 0x52, 0x20, 0x97, 0xe8, 0x18, 0xf4, 0xd6, 0x24, 0x9c, 0x44, 0x97, 0x55, 0x17, 0x5f, 0x6d, 0x24, + 0xd9, 0xd4, 0x05, 0x9b, 0x45, 0xf5, 0xc6, 0x31, 0x6c, 0x92, 0x9e, 0xcf, 0xfc, 0x82, 0xff, 0x4e, + 0x58, 0xdb, 0xfc, 0xec, 0x70, 0x41, 0xf9, 0xfc, 0x70, 0x41, 0xf9, 0xd7, 0xe1, 0x82, 0xf2, 0xeb, + 0x67, 0x0b, 0x53, 0x9f, 0x3f, 0x5b, 0x98, 0xfa, 0xc7, 0xb3, 0x85, 0xa9, 0xf7, 0x57, 0x12, 0x5b, + 0x71, 0x23, 0x72, 0xd9, 0xc6, 0xec, 0x03, 0x12, 0x3e, 0x1a, 0x21, 0xec, 0x1d, 0x61, 0x88, 0x2d, + 0xb9, 0x7b, 0x56, 0xfc, 0xb5, 0xec, 0xed, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x5a, 0xd6, 0x15, + 0xcf, 0x24, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1736,14 +1709,6 @@ func (m *VotingPowerSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.BlockTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.BlockTime):]) - if err1 != nil { - return 0, err1 - } - i -= n1 - i = encodeVarintTx(dAtA, i, uint64(n1)) - i-- - dAtA[i] = 0x32 if m.EpochNumber != 0 { i = encodeVarintTx(dAtA, i, uint64(m.EpochNumber)) i-- @@ -1808,16 +1773,6 @@ func (m *SnapshotHelper) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.HasSlash { - i-- - if m.HasSlash { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x18 - } if m.HasOptOut { i-- if m.HasOptOut { @@ -2637,8 +2592,6 @@ func (m *VotingPowerSnapshot) Size() (n int) { if m.EpochNumber != 0 { n += 1 + sovTx(uint64(m.EpochNumber)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.BlockTime) - n += 1 + l + sovTx(uint64(l)) return n } @@ -2654,9 +2607,6 @@ func (m *SnapshotHelper) Size() (n int) { if m.HasOptOut { n += 2 } - if m.HasSlash { - n += 2 - } return n } @@ -3480,39 +3430,6 @@ func (m *VotingPowerSnapshot) Unmarshal(dAtA []byte) error { break } } - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockTime", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.BlockTime, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -3602,26 +3519,6 @@ func (m *SnapshotHelper) Unmarshal(dAtA []byte) error { } } m.HasOptOut = bool(v != 0) - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field HasSlash", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.HasSlash = bool(v != 0) default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) From 98427900ac847e96c85bb7a4c9e3070e7ed465cf Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Fri, 1 Nov 2024 14:49:19 +0800 Subject: [PATCH 09/12] fix the issues regarding code comments fix the lint error --- proto/exocore/operator/v1/query.proto | 39 +- proto/exocore/operator/v1/tx.proto | 3 +- testutil/utils.go | 2 +- x/operator/client/cli/query.go | 9 +- x/operator/keeper/abci.go | 2 +- x/operator/keeper/grpc_query.go | 21 +- x/operator/keeper/slash.go | 9 +- x/operator/keeper/slash_test.go | 15 +- x/operator/keeper/voting_power_snapshot.go | 25 +- .../keeper/voting_power_snapshot_test.go | 30 +- x/operator/types/query.pb.go | 351 +++++++++--------- x/operator/types/query.pb.gw.go | 10 +- x/operator/types/tx.pb.go | 259 +++++++------ x/operator/types/utils.go | 7 +- 14 files changed, 443 insertions(+), 339 deletions(-) diff --git a/proto/exocore/operator/v1/query.proto b/proto/exocore/operator/v1/query.proto index d6289385f..9a2064d85 100644 --- a/proto/exocore/operator/v1/query.proto +++ b/proto/exocore/operator/v1/query.proto @@ -226,9 +226,9 @@ message QueryOptInfoRequest { OperatorAVSAddress operator_and_avs = 1 [(gogoproto.embed) = true]; } -// QuerySnapshotAndHelperRequest is the request to obtain the voting power snapshot -// and helper information. -message QuerySnapshotAndHelperRequest { +// QuerySnapshotHelperRequest is the request to obtain the voting power snapshot +// helper information. +message QuerySnapshotHelperRequest { // avs address string avs = 1; } @@ -242,9 +242,9 @@ message QuerySpecifiedSnapshotRequest { int64 height = 2; } -// VotingPowerSnapshotWithKeyHeight is used in the response of QuerySpecifiedSnapshot +// VotingPowerSnapshotKeyHeight is used in the response of QuerySpecifiedSnapshot // and QueryAllSnapshot -message VotingPowerSnapshotWithKeyHeight { +message VotingPowerSnapshotKeyHeight { // snapshot_key_height when it is used in QuerySpecifiedSnapshot, it's the latest // height with a snapshot key found based on the input height; this height is typically // the start height of the epoch in which the input height is located. @@ -270,7 +270,7 @@ message QueryAllSnapshotRequest { // for the specified AVS message QueryAllSnapshotResponse { // snapshots is a list of all snapshots for the specified AVS. - repeated VotingPowerSnapshotWithKeyHeight snapshots = 1; + repeated VotingPowerSnapshotKeyHeight snapshots = 1; // pagination related response. cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -313,20 +313,22 @@ service Query { } // QueryOperatorUSDValue queries the opted-in USD value for the operator - rpc QueryOperatorUSDValue(QueryOperatorUSDValueRequest) returns (QueryOperatorUSDValueResponse) { - option (google.api.http).get = "/exocore/operator/v1/query_operator_usd_value/{operator_and_avs.operator_addr}/" - "{operator_and_avs.avs_address}"; + rpc QueryOperatorUSDValue(QueryOperatorUSDValueRequest) returns(QueryOperatorUSDValueResponse){ + option (google.api.http).get = + "/exocore/operator/v1/operator_usd_value/{operator_and_avs.operator_addr}/" + "{operator_and_avs.avs_address}"; } // QueryAVSUSDValue queries the USD value for the AVS - rpc QueryAVSUSDValue(QueryAVSUSDValueRequest) returns (DecValueField) { - option (google.api.http).get = "/exocore/operator/v1/QueryAVSUSDValue"; + rpc QueryAVSUSDValue(QueryAVSUSDValueRequest) returns(DecValueField){ + option (google.api.http).get = "/exocore/operator/v1/avs_usd_value"; } // QueryOperatorSlashInfo queries the slash information for the specified operator and AVS - rpc QueryOperatorSlashInfo(QueryOperatorSlashInfoRequest) returns (QueryOperatorSlashInfoResponse) { - option (google.api.http).get = "/exocore/operator/v1/query_operator_slash_info/{operator_and_avs.operator_addr}/" - "{operator_and_avs.avs_address}"; + rpc QueryOperatorSlashInfo(QueryOperatorSlashInfoRequest) returns(QueryOperatorSlashInfoResponse){ + option (google.api.http).get = + "/exocore/operator/v1/operator_slash_info/{operator_and_avs.operator_addr}/" + "{operator_and_avs.avs_address}"; } // QueryAllOperatorConsAddrsByChainID queries all operators and their consensus addresses @@ -339,7 +341,8 @@ service Query { } // QueryAllOperatorsWithOptInAVS queries operator list by avs. - rpc QueryAllOperatorsWithOptInAVS(QueryAllOperatorsByOptInAVSRequest) returns (QueryAllOperatorsByOptInAVSResponse) { + rpc QueryAllOperatorsWithOptInAVS(QueryAllOperatorsByOptInAVSRequest) returns ( + QueryAllOperatorsByOptInAVSResponse) { option (google.api.http) = { get: "/exocore/operator/v1/opt/operator_list/{avs}" }; @@ -360,12 +363,12 @@ service Query { } // QuerySnapshotHelper queries the snapshot helper of the AVS - rpc QuerySnapshotHelper(QuerySnapshotAndHelperRequest) returns (SnapshotHelper) { + rpc QuerySnapshotHelper(QuerySnapshotHelperRequest) returns (SnapshotHelper) { option (google.api.http).get = "/exocore/operator/v1/snapshot_helper/{avs}"; } - // QuerySnapshotHelper queries the snapshot helper of the AVS - rpc QuerySpecifiedSnapshot(QuerySpecifiedSnapshotRequest) returns (VotingPowerSnapshotWithKeyHeight) { + // QuerySpecifiedSnapshot queries the voting power snapshot of specified AVS and height + rpc QuerySpecifiedSnapshot(QuerySpecifiedSnapshotRequest) returns (VotingPowerSnapshotKeyHeight) { option (google.api.http).get = "/exocore/operator/v1/snapshot/{avs}/{height}"; } diff --git a/proto/exocore/operator/v1/tx.proto b/proto/exocore/operator/v1/tx.proto index a920a94d9..cbb2b9fa1 100644 --- a/proto/exocore/operator/v1/tx.proto +++ b/proto/exocore/operator/v1/tx.proto @@ -7,7 +7,6 @@ import "cosmos/staking/v1beta1/staking.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "google/protobuf/timestamp.proto"; option go_package = "github.com/ExocoreNetwork/exocore/x/operator/types"; @@ -216,6 +215,8 @@ message SlashExecutionInfo { repeated SlashFromUndelegation slash_undelegations = 3 [(gogoproto.nullable) = false]; // SlashFromAssetsPool records all slash info related to the assets pool repeated SlashFromAssetsPool slash_assets_pool = 4 [(gogoproto.nullable) = false]; + // undelegation_filter_height records the height before which undelegations are not slashed + int64 undelegation_filter_height = 5; } // OperatorSlashInfo is the slash info of operator diff --git a/testutil/utils.go b/testutil/utils.go index 4a21f3690..563eed3b9 100644 --- a/testutil/utils.go +++ b/testutil/utils.go @@ -81,7 +81,7 @@ func (suite *BaseTestSuite) SetupTest() { // that also act as delegators. func (suite *BaseTestSuite) SetupWithGenesisValSet(genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) { pruneOpts := pruningtypes.NewPruningOptionsFromString(pruningtypes.PruningOptionDefault) - appI, genesisState := exocoreapp.SetupTestingApp(utils.DefaultChainID, &pruneOpts, true)() + appI, genesisState := exocoreapp.SetupTestingApp(utils.DefaultChainID, &pruneOpts, false)() app, ok := appI.(*exocoreapp.ExocoreApp) suite.Require().True(ok) diff --git a/x/operator/client/cli/query.go b/x/operator/client/cli/query.go index 40e33ed0f..d5c956fc1 100644 --- a/x/operator/client/cli/query.go +++ b/x/operator/client/cli/query.go @@ -476,7 +476,7 @@ func QuerySnapshotHelper() *cobra.Command { return err } queryClient := operatortypes.NewQueryClient(clientCtx) - req := &operatortypes.QuerySnapshotAndHelperRequest{ + req := &operatortypes.QuerySnapshotHelperRequest{ Avs: strings.ToLower(args[0]), } res, err := queryClient.QuerySnapshotHelper(context.Background(), req) @@ -536,10 +536,13 @@ func QuerySpecifiedSnapshot() *cobra.Command { if !common.IsHexAddress(args[0]) { return xerrors.Errorf("invalid avs address,err:%s", types.ErrInvalidAddr) } - height, err := strconv.ParseUint(args[1], 10, 64) + height, err := strconv.ParseInt(args[1], 10, 64) if err != nil { return err } + if height < 0 { + return xerrors.Errorf("negative height,height:%s", args[1]) + } clientCtx, err := client.GetClientQueryContext(cmd) if err != nil { return err @@ -547,7 +550,7 @@ func QuerySpecifiedSnapshot() *cobra.Command { queryClient := operatortypes.NewQueryClient(clientCtx) req := &operatortypes.QuerySpecifiedSnapshotRequest{ Avs: strings.ToLower(args[0]), - Height: int64(height), // #nosec G115 + Height: height, } res, err := queryClient.QuerySpecifiedSnapshot(context.Background(), req) if err != nil { diff --git a/x/operator/keeper/abci.go b/x/operator/keeper/abci.go index 8368d1c96..83aa50a59 100644 --- a/x/operator/keeper/abci.go +++ b/x/operator/keeper/abci.go @@ -161,7 +161,7 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str } votingPowerSnapshot.LastChangedHeight = snapshotHelper.LastChangedHeight - err = k.SetSnapshotHelper(cc, avsAddr, &snapshotHelper) + err = k.SetSnapshotHelper(cc, avsAddr, snapshotHelper) if err != nil { return err } diff --git a/x/operator/keeper/grpc_query.go b/x/operator/keeper/grpc_query.go index b39f930c7..ec0855378 100644 --- a/x/operator/keeper/grpc_query.go +++ b/x/operator/keeper/grpc_query.go @@ -4,6 +4,8 @@ import ( "context" "encoding/binary" "errors" + "fmt" + "math" "strings" "github.com/ethereum/go-ethereum/common" @@ -342,7 +344,7 @@ func (k *Keeper) Validator(c context.Context, req *types.QueryValidatorRequest) return &types.QueryValidatorResponse{Validator: val}, nil } -func (k *Keeper) QuerySnapshotHelper(goCtx context.Context, req *types.QuerySnapshotAndHelperRequest) (*types.SnapshotHelper, error) { +func (k *Keeper) QuerySnapshotHelper(goCtx context.Context, req *types.QuerySnapshotHelperRequest) (*types.SnapshotHelper, error) { ctx := sdk.UnwrapSDKContext(goCtx) snapshotHelper, err := k.GetSnapshotHelper(ctx, strings.ToLower(req.Avs)) if err != nil { @@ -351,21 +353,24 @@ func (k *Keeper) QuerySnapshotHelper(goCtx context.Context, req *types.QuerySnap return &snapshotHelper, nil } -func (k *Keeper) QuerySpecifiedSnapshot(goCtx context.Context, req *types.QuerySpecifiedSnapshotRequest) (*types.VotingPowerSnapshotWithKeyHeight, error) { +func (k *Keeper) QuerySpecifiedSnapshot(goCtx context.Context, req *types.QuerySpecifiedSnapshotRequest) (*types.VotingPowerSnapshotKeyHeight, error) { ctx := sdk.UnwrapSDKContext(goCtx) findHeight, snapshot, err := k.LoadVotingPowerSnapshot(ctx, strings.ToLower(req.Avs), req.Height) if err != nil { return nil, err } - return &types.VotingPowerSnapshotWithKeyHeight{ + return &types.VotingPowerSnapshotKeyHeight{ SnapshotKeyHeight: findHeight, Snapshot: snapshot, }, nil } func (k *Keeper) QueryAllSnapshot(goCtx context.Context, req *types.QueryAllSnapshotRequest) (*types.QueryAllSnapshotResponse, error) { + if !common.IsHexAddress(req.Avs) { + return nil, fmt.Errorf("invalid AVS address format: %s", req.Avs) + } ctx := sdk.UnwrapSDKContext(goCtx) - res := make([]*types.VotingPowerSnapshotWithKeyHeight, 0) + res := make([]*types.VotingPowerSnapshotKeyHeight, 0) snapshotPrefix := types.AppendMany(types.KeyPrefixVotingPowerSnapshot, common.HexToAddress(req.Avs).Bytes()) store := prefix.NewStore(ctx.KVStore(k.storeKey), snapshotPrefix) @@ -375,8 +380,12 @@ func (k *Keeper) QueryAllSnapshot(goCtx context.Context, req *types.QueryAllSnap if err := ret.Unmarshal(value); err != nil { return err } - res = append(res, &types.VotingPowerSnapshotWithKeyHeight{ - SnapshotKeyHeight: int64(binary.BigEndian.Uint64(key)), // #nosec G115 + height := binary.BigEndian.Uint64(key) + if height > math.MaxInt64 { + return fmt.Errorf("height exceeds int64 max value: %d", height) + } + res = append(res, &types.VotingPowerSnapshotKeyHeight{ + SnapshotKeyHeight: int64(height), Snapshot: ret, }) return nil diff --git a/x/operator/keeper/slash.go b/x/operator/keeper/slash.go index 70e8c48d2..850d173b2 100644 --- a/x/operator/keeper/slash.go +++ b/x/operator/keeper/slash.go @@ -82,10 +82,11 @@ func (k *Keeper) SlashAssets(ctx sdk.Context, snapshotHeight int64, parameter *t newSlashProportion = sdkmath.LegacyMinDec(sdkmath.LegacyNewDec(1), newSlashProportion) executionInfo := &types.SlashExecutionInfo{ - SlashProportion: newSlashProportion, - SlashValue: slashUSDValue, - SlashUndelegations: make([]types.SlashFromUndelegation, 0), - SlashAssetsPool: make([]types.SlashFromAssetsPool, 0), + SlashProportion: newSlashProportion, + SlashValue: slashUSDValue, + SlashUndelegations: make([]types.SlashFromUndelegation, 0), + SlashAssetsPool: make([]types.SlashFromAssetsPool, 0), + UndelegationFilterHeight: snapshotHeight, } // slash from the unbonding stakers if parameter.SlashEventHeight < ctx.BlockHeight() { diff --git a/x/operator/keeper/slash_test.go b/x/operator/keeper/slash_test.go index 4a2bd05f9..1eebc9ea5 100644 --- a/x/operator/keeper/slash_test.go +++ b/x/operator/keeper/slash_test.go @@ -12,6 +12,7 @@ import ( ) func (suite *OperatorTestSuite) TestSlashWithInfractionReason() { + // current height: 1 epoch: 1 // prepare the deposit and delegation suite.prepareOperator() depositAmount := sdkmath.NewIntWithDecimal(200, assetDecimal) @@ -25,21 +26,29 @@ func (suite *OperatorTestSuite) TestSlashWithInfractionReason() { avsAddr := avstypes.GenerateAVSAddr(avstypes.ChainIDWithoutRevision(suite.Ctx.ChainID())) err = suite.App.OperatorKeeper.OptIn(suite.Ctx, suite.operatorAddr, avsAddr) suite.NoError(err) + // call the EndBlock to update the voting power suite.CommitAfter(time.Hour*24 + time.Nanosecond) - infractionHeight := suite.Ctx.BlockHeight() + 1 + + // current height: 2 epoch: 2 optedUSDValues, err := suite.App.OperatorKeeper.GetOperatorOptedUSDValue(suite.Ctx, avsAddr, suite.operatorAddr.String()) suite.NoError(err) // get the historical voting power power := optedUSDValues.TotalUSDValue.TruncateInt64() // run to next block suite.NextBlock() + // current height: 3 epoch: 2 + infractionHeight := suite.Ctx.BlockHeight() + // undelegationFilterHeight should be the first height of this epoch, it should be 2 + undelegationFilterHeight := infractionHeight - 1 + suite.Equal(int64(3), infractionHeight) // delegates new amount to the operator newDelegateAmount := sdkmath.NewIntWithDecimal(20, assetDecimal) suite.prepareDelegation(true, suite.Address, suite.assetAddr, suite.operatorAddr, newDelegateAmount) // updating the voting power suite.CommitAfter(time.Hour*24 + time.Nanosecond) + // current height: 4 epoch: 3 newOptedUSDValues, err := suite.App.OperatorKeeper.GetOperatorOptedUSDValue(suite.Ctx, avsAddr, suite.operatorAddr.String()) suite.NoError(err) // submits an undelegation to test the slashFromUndelegation @@ -50,6 +59,9 @@ func (suite *OperatorTestSuite) TestSlashWithInfractionReason() { completedHeight := suite.App.OperatorKeeper.GetUnbondingExpirationBlockNumber(suite.Ctx, suite.operatorAddr, startHeight) // trigger the slash with a downtime event + // run to next block + suite.CommitAfter(time.Hour + time.Nanosecond) + // current height: 5 epoch: 3 slashFactor := suite.App.SlashingKeeper.SlashFractionDowntime(suite.Ctx) slashType := stakingtypes.Infraction_INFRACTION_DOWNTIME exoSlashValue := suite.App.OperatorKeeper.SlashWithInfractionReason(suite.Ctx, suite.operatorAddr, infractionHeight, power, slashFactor, slashType) @@ -76,6 +88,7 @@ func (suite *OperatorTestSuite) TestSlashWithInfractionReason() { AssetID: suite.assetID, Amount: newSlashProportion.MulInt(delegationRemaining).TruncateInt(), }, slashInfo.ExecutionInfo.SlashAssetsPool[0]) + suite.Equal(undelegationFilterHeight, slashInfo.ExecutionInfo.UndelegationFilterHeight) // check the assets state of undelegation and assets pool assetsInfo, err := suite.App.AssetsKeeper.GetOperatorSpecifiedAssetInfo(suite.Ctx, suite.operatorAddr, suite.assetID) diff --git a/x/operator/keeper/voting_power_snapshot.go b/x/operator/keeper/voting_power_snapshot.go index c43af63b4..bd7f5f9c0 100644 --- a/x/operator/keeper/voting_power_snapshot.go +++ b/x/operator/keeper/voting_power_snapshot.go @@ -7,6 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" ) +const InitialEpochNumber int64 = 1 + func (k *Keeper) SetVotingPowerSnapshot(ctx sdk.Context, key []byte, snapshot *types.VotingPowerSnapshot) error { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) bz := k.cdc.MustMarshal(snapshot) @@ -54,6 +56,12 @@ func (k *Keeper) IterateVotingPowerSnapshot(ctx sdk.Context, avsAddr string, isU } func (k *Keeper) GetSnapshotHeightAndKey(ctx sdk.Context, avsAddr string, height int64) (int64, []byte, error) { + if !common.IsHexAddress(avsAddr) { + return 0, nil, types.ErrParameterInvalid.Wrapf("invalid AVS address format: %s", avsAddr) + } + if height < 0 { + return 0, nil, types.ErrParameterInvalid.Wrapf("the input height is negative, height:%v", height) + } store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) // If there is no snapshot for the input height, we need to find the correct key. // The snapshot closest to the input height is the one used for its voting @@ -82,6 +90,9 @@ func (k *Keeper) GetSnapshotHeightAndKey(ctx sdk.Context, avsAddr string, height } func (k *Keeper) GetEpochNumberByOptOutHeight(ctx sdk.Context, avsAddr string, optOutHeight int64) (int64, error) { + if optOutHeight < 0 { + return 0, types.ErrParameterInvalid.Wrapf("the opt out height is negative, optOutHeight:%v", optOutHeight) + } findHeight, findKey, err := k.GetSnapshotHeightAndKey(ctx, avsAddr, optOutHeight) if err != nil { return 0, err @@ -126,6 +137,9 @@ func (k *Keeper) LoadVotingPowerSnapshot(ctx sdk.Context, avsAddr string, height // RemoveVotingPowerSnapshot remove all snapshots older than the input epoch number. func (k *Keeper) RemoveVotingPowerSnapshot(ctx sdk.Context, avsAddr string, epochNumber int64) error { + if epochNumber < 0 { + return types.ErrParameterInvalid.Wrapf("the input epoch number is negative, epochNumber:%v", epochNumber) + } store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixVotingPowerSnapshot) iterator := sdk.KVStorePrefixIterator(store, common.HexToAddress(avsAddr).Bytes()) defer iterator.Close() @@ -192,16 +206,19 @@ func (k *Keeper) SetLastChangedHeight(ctx sdk.Context, avsAddr string, lastChang return k.UpdateSnapshotHelper(ctx, avsAddr, opFunc) } -func (k *Keeper) SetSnapshotHelper(ctx sdk.Context, avsAddr string, snapshotHelper *types.SnapshotHelper) error { +func (k *Keeper) SetSnapshotHelper(ctx sdk.Context, avsAddr string, snapshotHelper types.SnapshotHelper) error { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSnapshotHelper) - bz := k.cdc.MustMarshal(snapshotHelper) + bz := k.cdc.MustMarshal(&snapshotHelper) store.Set([]byte(avsAddr), bz) return nil } func (k *Keeper) GetSnapshotHelper(ctx sdk.Context, avsAddr string) (types.SnapshotHelper, error) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSnapshotHelper) var ret types.SnapshotHelper + if !common.IsHexAddress(avsAddr) { + return ret, types.ErrParameterInvalid.Wrapf("invalid AVS address format: %s", avsAddr) + } + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSnapshotHelper) value := store.Get([]byte(avsAddr)) if value == nil { return ret, types.ErrNoKeyInTheStore.Wrapf("GetSnapshotHelper: the key is %s", avsAddr) @@ -241,7 +258,7 @@ func (k *Keeper) InitGenesisVPSnapshot(ctx sdk.Context) error { epochNumber := epochInfo.CurrentEpoch // set the epoch number to 1 when epoch start for the first time. if !epochInfo.EpochCountingStarted { - epochNumber = 1 + epochNumber = InitialEpochNumber } bz := k.cdc.MustMarshal(&types.VotingPowerSnapshot{ TotalVotingPower: avsUSDValue.Amount, diff --git a/x/operator/keeper/voting_power_snapshot_test.go b/x/operator/keeper/voting_power_snapshot_test.go index e7aed870a..10d2fcfcd 100644 --- a/x/operator/keeper/voting_power_snapshot_test.go +++ b/x/operator/keeper/voting_power_snapshot_test.go @@ -91,7 +91,7 @@ func (suite *OperatorTestSuite) runToEpochEnd() { } } -func (suite *OperatorTestSuite) printAllSnapshot() { +func (suite *OperatorTestSuite) printAllSnapshot(avs string) { epochInfo, found := suite.App.EpochsKeeper.GetEpochInfo(suite.Ctx, epochstypes.DayEpochID) suite.True(found) fmt.Println("epoch", epochInfo.CurrentEpoch, "startHeight", epochInfo.CurrentEpochStartHeight) @@ -102,7 +102,7 @@ func (suite *OperatorTestSuite) printAllSnapshot() { fmt.Println(string(bytes)) return nil } - err := suite.App.OperatorKeeper.IterateVotingPowerSnapshot(suite.Ctx, suite.avsAddr, false, opFunc) + err := suite.App.OperatorKeeper.IterateVotingPowerSnapshot(suite.Ctx, avs, false, opFunc) suite.NoError(err) } @@ -296,7 +296,6 @@ func (suite *OperatorTestSuite) TestGenesisSnapshot() { suite.NoError(err) suite.Equal(firstBlockHeight, snapshotHelper.LastChangedHeight) } - suite.printAllSnapshot() } func (suite *OperatorTestSuite) TestSnapshotPruning() { @@ -327,4 +326,29 @@ func (suite *OperatorTestSuite) TestSnapshotPruning() { key = types.KeyForVotingPowerSnapshot(common.HexToAddress(suite.avsAddr), firstSnapshotHeight) _, err = suite.App.OperatorKeeper.GetVotingPowerSnapshot(suite.Ctx, key) suite.Error(err) + + // Test pruning of slash-created snapshots + slashParam := &types.SlashInputInfo{ + IsDogFood: false, + Power: 0, + SlashType: 0, + Operator: testHelper.operators[index], + AVSAddr: suite.avsAddr, + SlashID: "testSlashID", + SlashEventHeight: suite.Ctx.BlockHeight(), + SlashProportion: sdkmath.LegacyMustNewDecFromStr("0.1"), + } + err = suite.App.OperatorKeeper.Slash(suite.Ctx, slashParam) + suite.NoError(err) + _, snapshotAfterSlash, err := suite.App.OperatorKeeper.LoadVotingPowerSnapshot(suite.Ctx, suite.avsAddr, suite.Ctx.BlockHeight()) + suite.NoError(err) + suite.Equal(suite.Ctx.BlockHeight(), snapshotAfterSlash.LastChangedHeight) + suite.runToEpochEnd() + suite.prepareDelegation(true, testHelper.stakers[index], usdtAddr, testHelper.operators[index], testHelper.delegateAmount) + for i := uint64(0); i < runEpochNumber; i++ { + suite.runToEpochEnd() + } + key = types.KeyForVotingPowerSnapshot(common.HexToAddress(suite.avsAddr), snapshotAfterSlash.LastChangedHeight) + _, err = suite.App.OperatorKeeper.GetVotingPowerSnapshot(suite.Ctx, key) + suite.Error(err) } diff --git a/x/operator/types/query.pb.go b/x/operator/types/query.pb.go index 52e2bbed4..06f6760eb 100644 --- a/x/operator/types/query.pb.go +++ b/x/operator/types/query.pb.go @@ -1353,25 +1353,25 @@ func (m *QueryOptInfoRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryOptInfoRequest proto.InternalMessageInfo -// QuerySnapshotAndHelperRequest is the request to obtain the voting power snapshot -// and helper information. -type QuerySnapshotAndHelperRequest struct { +// QuerySnapshotHelperRequest is the request to obtain the voting power snapshot +// helper information. +type QuerySnapshotHelperRequest struct { // avs address Avs string `protobuf:"bytes,1,opt,name=avs,proto3" json:"avs,omitempty"` } -func (m *QuerySnapshotAndHelperRequest) Reset() { *m = QuerySnapshotAndHelperRequest{} } -func (m *QuerySnapshotAndHelperRequest) String() string { return proto.CompactTextString(m) } -func (*QuerySnapshotAndHelperRequest) ProtoMessage() {} -func (*QuerySnapshotAndHelperRequest) Descriptor() ([]byte, []int) { +func (m *QuerySnapshotHelperRequest) Reset() { *m = QuerySnapshotHelperRequest{} } +func (m *QuerySnapshotHelperRequest) String() string { return proto.CompactTextString(m) } +func (*QuerySnapshotHelperRequest) ProtoMessage() {} +func (*QuerySnapshotHelperRequest) Descriptor() ([]byte, []int) { return fileDescriptor_f91e795a3cecbdbf, []int{25} } -func (m *QuerySnapshotAndHelperRequest) XXX_Unmarshal(b []byte) error { +func (m *QuerySnapshotHelperRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QuerySnapshotAndHelperRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QuerySnapshotHelperRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QuerySnapshotAndHelperRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QuerySnapshotHelperRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1381,19 +1381,19 @@ func (m *QuerySnapshotAndHelperRequest) XXX_Marshal(b []byte, deterministic bool return b[:n], nil } } -func (m *QuerySnapshotAndHelperRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QuerySnapshotAndHelperRequest.Merge(m, src) +func (m *QuerySnapshotHelperRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySnapshotHelperRequest.Merge(m, src) } -func (m *QuerySnapshotAndHelperRequest) XXX_Size() int { +func (m *QuerySnapshotHelperRequest) XXX_Size() int { return m.Size() } -func (m *QuerySnapshotAndHelperRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QuerySnapshotAndHelperRequest.DiscardUnknown(m) +func (m *QuerySnapshotHelperRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySnapshotHelperRequest.DiscardUnknown(m) } -var xxx_messageInfo_QuerySnapshotAndHelperRequest proto.InternalMessageInfo +var xxx_messageInfo_QuerySnapshotHelperRequest proto.InternalMessageInfo -func (m *QuerySnapshotAndHelperRequest) GetAvs() string { +func (m *QuerySnapshotHelperRequest) GetAvs() string { if m != nil { return m.Avs } @@ -1456,9 +1456,9 @@ func (m *QuerySpecifiedSnapshotRequest) GetHeight() int64 { return 0 } -// VotingPowerSnapshotWithKeyHeight is used in the response of QuerySpecifiedSnapshot +// VotingPowerSnapshotKeyHeight is used in the response of QuerySpecifiedSnapshot // and QueryAllSnapshot -type VotingPowerSnapshotWithKeyHeight struct { +type VotingPowerSnapshotKeyHeight struct { // snapshot_key_height when it is used in QuerySpecifiedSnapshot, it's the latest // height with a snapshot key found based on the input height; this height is typically // the start height of the epoch in which the input height is located. @@ -1471,18 +1471,18 @@ type VotingPowerSnapshotWithKeyHeight struct { Snapshot *VotingPowerSnapshot `protobuf:"bytes,2,opt,name=snapshot,proto3" json:"snapshot,omitempty"` } -func (m *VotingPowerSnapshotWithKeyHeight) Reset() { *m = VotingPowerSnapshotWithKeyHeight{} } -func (m *VotingPowerSnapshotWithKeyHeight) String() string { return proto.CompactTextString(m) } -func (*VotingPowerSnapshotWithKeyHeight) ProtoMessage() {} -func (*VotingPowerSnapshotWithKeyHeight) Descriptor() ([]byte, []int) { +func (m *VotingPowerSnapshotKeyHeight) Reset() { *m = VotingPowerSnapshotKeyHeight{} } +func (m *VotingPowerSnapshotKeyHeight) String() string { return proto.CompactTextString(m) } +func (*VotingPowerSnapshotKeyHeight) ProtoMessage() {} +func (*VotingPowerSnapshotKeyHeight) Descriptor() ([]byte, []int) { return fileDescriptor_f91e795a3cecbdbf, []int{27} } -func (m *VotingPowerSnapshotWithKeyHeight) XXX_Unmarshal(b []byte) error { +func (m *VotingPowerSnapshotKeyHeight) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *VotingPowerSnapshotWithKeyHeight) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *VotingPowerSnapshotKeyHeight) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_VotingPowerSnapshotWithKeyHeight.Marshal(b, m, deterministic) + return xxx_messageInfo_VotingPowerSnapshotKeyHeight.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1492,26 +1492,26 @@ func (m *VotingPowerSnapshotWithKeyHeight) XXX_Marshal(b []byte, deterministic b return b[:n], nil } } -func (m *VotingPowerSnapshotWithKeyHeight) XXX_Merge(src proto.Message) { - xxx_messageInfo_VotingPowerSnapshotWithKeyHeight.Merge(m, src) +func (m *VotingPowerSnapshotKeyHeight) XXX_Merge(src proto.Message) { + xxx_messageInfo_VotingPowerSnapshotKeyHeight.Merge(m, src) } -func (m *VotingPowerSnapshotWithKeyHeight) XXX_Size() int { +func (m *VotingPowerSnapshotKeyHeight) XXX_Size() int { return m.Size() } -func (m *VotingPowerSnapshotWithKeyHeight) XXX_DiscardUnknown() { - xxx_messageInfo_VotingPowerSnapshotWithKeyHeight.DiscardUnknown(m) +func (m *VotingPowerSnapshotKeyHeight) XXX_DiscardUnknown() { + xxx_messageInfo_VotingPowerSnapshotKeyHeight.DiscardUnknown(m) } -var xxx_messageInfo_VotingPowerSnapshotWithKeyHeight proto.InternalMessageInfo +var xxx_messageInfo_VotingPowerSnapshotKeyHeight proto.InternalMessageInfo -func (m *VotingPowerSnapshotWithKeyHeight) GetSnapshotKeyHeight() int64 { +func (m *VotingPowerSnapshotKeyHeight) GetSnapshotKeyHeight() int64 { if m != nil { return m.SnapshotKeyHeight } return 0 } -func (m *VotingPowerSnapshotWithKeyHeight) GetSnapshot() *VotingPowerSnapshot { +func (m *VotingPowerSnapshotKeyHeight) GetSnapshot() *VotingPowerSnapshot { if m != nil { return m.Snapshot } @@ -1578,7 +1578,7 @@ func (m *QueryAllSnapshotRequest) GetPagination() *query.PageRequest { // for the specified AVS type QueryAllSnapshotResponse struct { // snapshots is a list of all snapshots for the specified AVS. - Snapshots []*VotingPowerSnapshotWithKeyHeight `protobuf:"bytes,1,rep,name=snapshots,proto3" json:"snapshots,omitempty"` + Snapshots []*VotingPowerSnapshotKeyHeight `protobuf:"bytes,1,rep,name=snapshots,proto3" json:"snapshots,omitempty"` // pagination related response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -1616,7 +1616,7 @@ func (m *QueryAllSnapshotResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllSnapshotResponse proto.InternalMessageInfo -func (m *QueryAllSnapshotResponse) GetSnapshots() []*VotingPowerSnapshotWithKeyHeight { +func (m *QueryAllSnapshotResponse) GetSnapshots() []*VotingPowerSnapshotKeyHeight { if m != nil { return m.Snapshots } @@ -1656,9 +1656,9 @@ func init() { proto.RegisterType((*QueryAllAVSsByOperatorRequest)(nil), "exocore.operator.v1.QueryAllAVSsByOperatorRequest") proto.RegisterType((*QueryAllAVSsByOperatorResponse)(nil), "exocore.operator.v1.QueryAllAVSsByOperatorResponse") proto.RegisterType((*QueryOptInfoRequest)(nil), "exocore.operator.v1.QueryOptInfoRequest") - proto.RegisterType((*QuerySnapshotAndHelperRequest)(nil), "exocore.operator.v1.QuerySnapshotAndHelperRequest") + proto.RegisterType((*QuerySnapshotHelperRequest)(nil), "exocore.operator.v1.QuerySnapshotHelperRequest") proto.RegisterType((*QuerySpecifiedSnapshotRequest)(nil), "exocore.operator.v1.QuerySpecifiedSnapshotRequest") - proto.RegisterType((*VotingPowerSnapshotWithKeyHeight)(nil), "exocore.operator.v1.VotingPowerSnapshotWithKeyHeight") + proto.RegisterType((*VotingPowerSnapshotKeyHeight)(nil), "exocore.operator.v1.VotingPowerSnapshotKeyHeight") proto.RegisterType((*QueryAllSnapshotRequest)(nil), "exocore.operator.v1.QueryAllSnapshotRequest") proto.RegisterType((*QueryAllSnapshotResponse)(nil), "exocore.operator.v1.QueryAllSnapshotResponse") } @@ -1666,116 +1666,115 @@ func init() { func init() { proto.RegisterFile("exocore/operator/v1/query.proto", fileDescriptor_f91e795a3cecbdbf) } var fileDescriptor_f91e795a3cecbdbf = []byte{ - // 1732 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcb, 0x6f, 0xdb, 0x46, - 0x1a, 0x37, 0xed, 0x3c, 0xac, 0x71, 0x92, 0xb5, 0xc7, 0x4e, 0xe2, 0x30, 0x89, 0xe4, 0x30, 0xbb, - 0xb1, 0x63, 0xd8, 0xe4, 0xda, 0x71, 0xb2, 0x8b, 0x78, 0xb3, 0x0b, 0x29, 0xce, 0xc3, 0x71, 0xb0, - 0xf6, 0x52, 0x58, 0x67, 0xb7, 0x40, 0x2b, 0xd0, 0xe2, 0x44, 0x62, 0x43, 0x73, 0x14, 0x0e, 0xa5, - 0x44, 0x30, 0x5c, 0x14, 0x3d, 0xb5, 0xb7, 0x22, 0xb9, 0x14, 0x28, 0x5a, 0x14, 0xfd, 0x1b, 0x0a, - 0xb4, 0x45, 0x0f, 0xed, 0x31, 0x87, 0x1e, 0xdc, 0xf6, 0xd2, 0x93, 0x5b, 0xd8, 0xfd, 0x0b, 0x7a, - 0xe8, 0xb9, 0xe0, 0x70, 0x86, 0x14, 0xc5, 0x87, 0x64, 0xc7, 0xcd, 0xcd, 0x24, 0xe7, 0xfb, 0xbe, - 0xdf, 0xf7, 0xfe, 0x8d, 0x0c, 0x72, 0xe8, 0x29, 0x2e, 0x63, 0x1b, 0x29, 0xb8, 0x86, 0x6c, 0xcd, - 0xc1, 0xb6, 0xd2, 0x98, 0x51, 0x1e, 0xd7, 0x91, 0xdd, 0x94, 0x6b, 0x36, 0x76, 0x30, 0x1c, 0x66, - 0x07, 0x64, 0x7e, 0x40, 0x6e, 0xcc, 0x88, 0x93, 0x65, 0x4c, 0xd6, 0x31, 0x51, 0xd6, 0x34, 0x82, - 0xbc, 0xd3, 0x4a, 0x63, 0x66, 0x0d, 0x39, 0xda, 0x8c, 0x52, 0xd3, 0x2a, 0x86, 0xa5, 0x39, 0x06, - 0xb6, 0x3c, 0x05, 0xe2, 0x19, 0xef, 0x6c, 0x89, 0x3e, 0x29, 0xde, 0x03, 0xfb, 0x74, 0x2e, 0xce, - 0xb8, 0xf3, 0x94, 0x7d, 0x1d, 0xa9, 0xe0, 0x0a, 0xf6, 0xa4, 0xdc, 0xbf, 0xb8, 0x4c, 0x05, 0xe3, - 0x8a, 0x89, 0x14, 0xad, 0x66, 0x28, 0x9a, 0x65, 0x61, 0x87, 0xda, 0xf2, 0x35, 0x3a, 0xc8, 0xd2, - 0x91, 0xbd, 0x6e, 0x58, 0x8e, 0x52, 0xb6, 0x9b, 0x35, 0x07, 0x2b, 0x8f, 0x50, 0x93, 0x7d, 0x95, - 0x8a, 0x00, 0xde, 0x41, 0xce, 0x32, 0x33, 0xb6, 0x68, 0x3d, 0xc4, 0x2a, 0x7a, 0x0c, 0x6f, 0x80, - 0xe3, 0xdc, 0x7e, 0x49, 0xd3, 0x75, 0x7b, 0x54, 0x18, 0x13, 0x26, 0x32, 0x85, 0xd1, 0xef, 0x3f, - 0x9b, 0x1e, 0x61, 0x70, 0xf3, 0xba, 0x6e, 0x23, 0x42, 0x8a, 0x8e, 0x6d, 0x58, 0x15, 0xf5, 0x18, - 0x3f, 0xee, 0xbe, 0x96, 0xd6, 0xc0, 0xe8, 0x7f, 0xdc, 0x08, 0xe4, 0x4d, 0x93, 0x6b, 0x26, 0x2a, - 0x7a, 0x5c, 0x47, 0xc4, 0x81, 0xb7, 0x01, 0x08, 0xe2, 0x41, 0xf5, 0x0e, 0xcc, 0x5e, 0x92, 0x99, - 0x52, 0x37, 0x78, 0xb2, 0x17, 0x6a, 0x16, 0x3c, 0x79, 0x45, 0xab, 0x20, 0x26, 0xab, 0xb6, 0x48, - 0x4a, 0xcf, 0x04, 0x70, 0x26, 0xc6, 0x08, 0xa9, 0x61, 0x8b, 0x20, 0x38, 0x05, 0x60, 0xe0, 0x40, - 0xb9, 0x4c, 0x9d, 0x20, 0xa3, 0xc2, 0x58, 0xdf, 0x44, 0x46, 0x1d, 0xf4, 0xb1, 0x96, 0xcb, 0x2e, - 0x5c, 0x02, 0xef, 0x84, 0x30, 0xf5, 0x52, 0x4c, 0xe3, 0x1d, 0x31, 0x79, 0xa6, 0x42, 0xa0, 0x1c, - 0x00, 0x39, 0x96, 0xfc, 0x6a, 0x91, 0x85, 0xe8, 0x25, 0xa3, 0x09, 0x73, 0x60, 0x40, 0x6b, 0x10, - 0x2a, 0x89, 0x08, 0xa1, 0xf0, 0x32, 0x2a, 0xd0, 0x1a, 0x84, 0x09, 0x49, 0x4f, 0xc0, 0x39, 0x1a, - 0x09, 0x6e, 0xfa, 0xbf, 0xc5, 0x85, 0x55, 0xcd, 0xac, 0xf3, 0xb0, 0xc1, 0x07, 0x60, 0x30, 0xb0, - 0x6f, 0xe9, 0x25, 0xad, 0x41, 0x58, 0xe0, 0xc7, 0xe5, 0x98, 0x52, 0x96, 0xa3, 0x2e, 0x14, 0x0e, - 0x6d, 0x6d, 0xe7, 0x04, 0xf5, 0x84, 0x8f, 0xcb, 0xd2, 0xf3, 0x0d, 0x22, 0x35, 0xc1, 0xf9, 0x04, - 0xc3, 0x2c, 0x0d, 0xff, 0x03, 0xa0, 0x4e, 0xf4, 0x52, 0xc3, 0x7d, 0xc9, 0x6d, 0x4e, 0xa6, 0xda, - 0x5c, 0xae, 0x39, 0x48, 0xe7, 0x7a, 0x0a, 0xc7, 0x77, 0xb6, 0x73, 0x19, 0xfe, 0x44, 0xd4, 0x4c, - 0x9d, 0xe8, 0xde, 0x9f, 0xd2, 0x3d, 0x70, 0xda, 0xcb, 0xfe, 0x6a, 0xb1, 0xdd, 0x5d, 0x25, 0x1c, - 0x2f, 0x2f, 0xd8, 0x27, 0x76, 0xb6, 0x73, 0x20, 0x70, 0x28, 0x14, 0xbf, 0x6f, 0x84, 0x36, 0x3f, - 0x8a, 0xa6, 0x46, 0xaa, 0xac, 0x17, 0xfe, 0xd0, 0x08, 0xb6, 0x75, 0x43, 0xef, 0xbe, 0xbb, 0x61, - 0x03, 0x9c, 0x8c, 0x80, 0x2f, 0x34, 0x17, 0x17, 0xe0, 0x25, 0xd0, 0x4f, 0xdc, 0x17, 0x25, 0x43, - 0x67, 0x91, 0x18, 0xd8, 0xd9, 0xce, 0x1d, 0xf5, 0x0e, 0x2d, 0xa8, 0x47, 0xe9, 0xc7, 0x45, 0x1d, - 0x5e, 0x07, 0x87, 0x0c, 0xeb, 0x21, 0xf6, 0x21, 0xa4, 0x79, 0x15, 0x84, 0x87, 0xca, 0x48, 0x5f, - 0x09, 0x20, 0x9b, 0x14, 0x3f, 0x56, 0x08, 0x2b, 0xe0, 0x84, 0x66, 0x9a, 0x25, 0x06, 0xc5, 0x35, - 0xe4, 0xf6, 0x62, 0xa7, 0x62, 0x08, 0xb9, 0xa2, 0x1e, 0xd3, 0x4c, 0xd3, 0x7f, 0x73, 0x70, 0x3d, - 0x5b, 0x02, 0x67, 0x43, 0xe0, 0x6f, 0x62, 0x8b, 0x2c, 0xa1, 0x26, 0x4f, 0xfd, 0x24, 0x18, 0x8a, - 0x4c, 0x12, 0x2f, 0x92, 0xea, 0x9f, 0xda, 0x06, 0x09, 0x1c, 0x01, 0x87, 0xcb, 0x55, 0xcd, 0xb0, - 0x58, 0x8f, 0x7a, 0x0f, 0xd2, 0xdb, 0x42, 0x5b, 0x7f, 0xfa, 0x16, 0x58, 0x70, 0xf2, 0x00, 0xd4, - 0xea, 0x6b, 0xa6, 0x51, 0x2e, 0x3d, 0x42, 0x4d, 0x56, 0x57, 0xe7, 0xe4, 0x60, 0x6c, 0xcb, 0xde, - 0xd8, 0x96, 0x57, 0xe8, 0xa1, 0x25, 0xd4, 0x2c, 0x1c, 0x7a, 0xb1, 0x9d, 0xeb, 0x51, 0x33, 0x35, - 0xfe, 0x02, 0x9e, 0x07, 0x00, 0xd7, 0x1c, 0xc3, 0xaa, 0x94, 0x70, 0xdd, 0xa1, 0xe6, 0xfb, 0xd5, - 0x8c, 0xf7, 0x66, 0xb9, 0xee, 0x48, 0x65, 0x90, 0x8b, 0x20, 0xe0, 0x9d, 0x70, 0x60, 0x7e, 0xbe, - 0x01, 0xc6, 0x92, 0x8d, 0x30, 0x57, 0xcf, 0x82, 0x4c, 0x19, 0x5b, 0xa4, 0x55, 0x7b, 0x7f, 0x99, - 0x9d, 0xeb, 0xe4, 0xc4, 0xbb, 0x02, 0x98, 0x68, 0x9f, 0xf8, 0x2c, 0x94, 0xa4, 0xd0, 0xbc, 0xe9, - 0x62, 0x58, 0x5c, 0xe0, 0xee, 0xf8, 0x10, 0x85, 0x16, 0x88, 0x07, 0xd6, 0x6e, 0xdf, 0x0a, 0xe0, - 0x72, 0x17, 0x50, 0x98, 0xd3, 0xab, 0x2d, 0xcb, 0x88, 0x7a, 0xef, 0xee, 0x5f, 0xd6, 0x00, 0x13, - 0xa9, 0x0d, 0xc0, 0x74, 0xae, 0x68, 0x86, 0x1d, 0xac, 0x2d, 0x6e, 0xe8, 0xe0, 0x5a, 0xe0, 0x23, - 0x01, 0x0c, 0xc7, 0x98, 0xdc, 0x53, 0x4d, 0xcc, 0x87, 0x8a, 0xb8, 0xb7, 0x73, 0x11, 0x27, 0x97, - 0x6f, 0x5f, 0x7b, 0xe6, 0xdf, 0x4b, 0x08, 0x37, 0xdd, 0xde, 0xaf, 0x38, 0xf5, 0x5b, 0x02, 0x98, - 0xec, 0x06, 0x0b, 0xcb, 0xfd, 0xff, 0xc1, 0x70, 0x38, 0xf7, 0x01, 0x13, 0x19, 0x98, 0xbd, 0xdc, - 0x31, 0xf9, 0xae, 0x56, 0x9a, 0xfd, 0x21, 0xdc, 0x6e, 0xeb, 0xe0, 0xd2, 0xff, 0x16, 0x18, 0x89, - 0xb3, 0xb9, 0xa7, 0xf4, 0x87, 0x1a, 0xbb, 0x37, 0xb5, 0xb1, 0x23, 0xe9, 0xbd, 0x06, 0xa4, 0x08, - 0x93, 0x2b, 0x34, 0x97, 0x6b, 0xce, 0xa2, 0x95, 0x5f, 0x2d, 0xf2, 0xb4, 0x0e, 0x82, 0x3e, 0xbe, - 0x76, 0x33, 0xaa, 0xfb, 0xa7, 0x74, 0x0f, 0x5c, 0x4c, 0x95, 0x63, 0x29, 0xb8, 0xd8, 0x42, 0xbf, - 0x4c, 0x83, 0x38, 0x8c, 0x06, 0xfa, 0x24, 0xeb, 0xbe, 0x41, 0x1c, 0x69, 0x9e, 0x51, 0x80, 0xbc, - 0x69, 0xe6, 0x57, 0x8b, 0x54, 0x8d, 0xf7, 0x95, 0x9b, 0x17, 0x41, 0x3f, 0x17, 0xe0, 0x83, 0x8b, - 0x3f, 0x4b, 0xf3, 0x6c, 0xff, 0xc5, 0x08, 0x33, 0x0c, 0x67, 0x40, 0xbf, 0xcb, 0x49, 0x5a, 0xcc, - 0x1f, 0xd5, 0x1a, 0x84, 0x5a, 0xb6, 0xc0, 0x30, 0x1b, 0x9b, 0xce, 0xab, 0xa0, 0x1c, 0xd2, 0x0c, - 0xf3, 0xb4, 0x68, 0x69, 0x35, 0x52, 0xc5, 0x4e, 0xde, 0xd2, 0xef, 0x22, 0xb3, 0x86, 0xec, 0xe4, - 0x40, 0x2f, 0x72, 0x91, 0x1a, 0x2a, 0x1b, 0x0f, 0x0d, 0xa4, 0x73, 0xd9, 0x44, 0x11, 0x78, 0x0a, - 0x1c, 0xa9, 0x22, 0xa3, 0x52, 0xf5, 0xe6, 0x78, 0x9f, 0xca, 0x9e, 0xa4, 0x0f, 0x04, 0x30, 0xb6, - 0x8a, 0xdd, 0xcc, 0xaf, 0xe0, 0x27, 0xc8, 0xe6, 0x8a, 0x1e, 0x18, 0x4e, 0x75, 0x09, 0x35, 0xef, - 0xd2, 0x43, 0x50, 0x06, 0xc3, 0x84, 0x7d, 0x70, 0xa7, 0x49, 0x89, 0x69, 0x12, 0xa8, 0xa6, 0x21, - 0xfe, 0x29, 0x38, 0xbf, 0x00, 0xfa, 0xf9, 0x4b, 0xd6, 0x07, 0xf1, 0x63, 0x35, 0xc6, 0xb0, 0xea, - 0x4b, 0x4a, 0x84, 0x53, 0x4a, 0xd3, 0xec, 0xec, 0xdf, 0x41, 0x8d, 0x93, 0x2f, 0x84, 0xe0, 0xae, - 0x14, 0x58, 0x65, 0x55, 0x53, 0x04, 0x19, 0x8e, 0x8e, 0x8f, 0x8c, 0xab, 0xdd, 0x3a, 0x16, 0x8a, - 0xa8, 0x1a, 0xe8, 0x39, 0xb0, 0xb1, 0x31, 0xfb, 0xec, 0x34, 0x38, 0x4c, 0xa1, 0xc3, 0x0f, 0x05, - 0x30, 0x14, 0x5a, 0xfd, 0x94, 0xa1, 0xc5, 0xd7, 0x69, 0xf4, 0xb6, 0x29, 0x5e, 0x48, 0x2d, 0x68, - 0xf7, 0x94, 0x74, 0xfd, 0x9d, 0x1f, 0x7e, 0x79, 0xde, 0x3b, 0x07, 0x67, 0x95, 0xb8, 0xfb, 0xb1, - 0xdf, 0x28, 0x2e, 0xb3, 0x54, 0x36, 0x42, 0x97, 0xad, 0x4d, 0xf8, 0x31, 0x47, 0xd7, 0x3a, 0x27, - 0xe0, 0x74, 0xac, 0xd1, 0xa4, 0x6b, 0xab, 0x28, 0x77, 0x7b, 0xdc, 0x0b, 0x94, 0x34, 0x49, 0x01, - 0xff, 0x19, 0x4a, 0xb1, 0x80, 0x5d, 0x2e, 0x8c, 0x7d, 0x28, 0xdf, 0xb5, 0xf3, 0x67, 0xb6, 0x83, - 0x6f, 0x63, 0x9b, 0xad, 0x13, 0xf8, 0xd7, 0x64, 0xf3, 0xf1, 0xbc, 0x55, 0x9c, 0xd9, 0x83, 0x04, - 0xc3, 0x7c, 0x8f, 0x62, 0x5e, 0x80, 0x85, 0xf4, 0x20, 0x73, 0x0a, 0xd3, 0x1a, 0x68, 0xb6, 0x1d, - 0x36, 0x95, 0x0d, 0xba, 0x6d, 0x37, 0xe1, 0xb6, 0xc0, 0x86, 0x7a, 0x0c, 0x1b, 0x6c, 0xf1, 0x6b, - 0xae, 0x3b, 0x94, 0x61, 0xae, 0x2a, 0x5e, 0xdd, 0xa3, 0x14, 0xf3, 0x6f, 0x89, 0xfa, 0x77, 0x0b, - 0xde, 0xec, 0xc2, 0x3f, 0xd7, 0x9b, 0x54, 0x07, 0x7f, 0x12, 0xc0, 0x85, 0x8e, 0x14, 0x10, 0xde, - 0xe8, 0xaa, 0x6c, 0x92, 0x58, 0xac, 0xf8, 0xcf, 0xfd, 0x8a, 0x33, 0x8f, 0xe7, 0xa9, 0xc7, 0x57, - 0xe1, 0x95, 0x8e, 0x55, 0x18, 0x10, 0x53, 0xdf, 0xc3, 0x5f, 0x05, 0x70, 0x32, 0xf6, 0x7a, 0x0f, - 0xbb, 0xa8, 0xad, 0xb6, 0x4b, 0xb9, 0x38, 0xbb, 0x17, 0x11, 0x86, 0xde, 0xa6, 0xe8, 0x4d, 0xf8, - 0x66, 0x2c, 0xfa, 0x58, 0xd9, 0xd6, 0x94, 0x79, 0x4b, 0x53, 0x0e, 0x4f, 0x83, 0x98, 0x03, 0x2d, - 0x3f, 0x16, 0x6c, 0xc2, 0xe7, 0x02, 0x18, 0x6c, 0xff, 0x61, 0x01, 0x4e, 0xa5, 0xa4, 0x21, 0xf2, - 0xfb, 0x83, 0x28, 0xc5, 0x9e, 0x5e, 0x40, 0x65, 0x7a, 0xea, 0xb6, 0x81, 0x4c, 0x5d, 0x9a, 0xa6, - 0xae, 0x8d, 0xc3, 0xbf, 0x24, 0xbb, 0xd6, 0x0a, 0xe0, 0x37, 0x01, 0x9c, 0x8a, 0xbf, 0x61, 0xc3, - 0x2e, 0x02, 0xdb, 0xfe, 0x73, 0x86, 0x78, 0x65, 0x4f, 0x32, 0x2c, 0x1b, 0x84, 0x42, 0x5e, 0x87, - 0x8f, 0x3a, 0x67, 0xc3, 0x17, 0x7e, 0xe9, 0x74, 0xec, 0x0a, 0x51, 0x6e, 0x18, 0x65, 0xdb, 0xb0, - 0xfb, 0x3e, 0x89, 0xbd, 0x32, 0x88, 0xff, 0xda, 0xb7, 0x3c, 0x0b, 0xce, 0x3f, 0x68, 0x70, 0xae, - 0xc1, 0xb9, 0x2e, 0x1b, 0x8d, 0xde, 0x02, 0xfc, 0x4e, 0x7b, 0x21, 0x04, 0xec, 0xd3, 0x5f, 0x25, - 0xee, 0x02, 0xe7, 0x5c, 0x16, 0xfe, 0xad, 0xbb, 0xf5, 0x13, 0x61, 0xcd, 0xe2, 0xdf, 0xf7, 0x2e, - 0xc8, 0x5c, 0x9a, 0xa3, 0x2e, 0xc9, 0x70, 0x2a, 0x61, 0x5a, 0x3a, 0x4a, 0x88, 0x55, 0x2b, 0x1b, - 0x5a, 0x83, 0x6c, 0xc2, 0xcf, 0x79, 0xa5, 0x46, 0xb8, 0x70, 0x5a, 0xa5, 0x26, 0xb1, 0xee, 0xb4, - 0x4a, 0x4d, 0x24, 0xdb, 0x5d, 0x20, 0xe7, 0x5c, 0x3c, 0x28, 0xbf, 0x4d, 0xf8, 0xb5, 0x00, 0x8e, - 0xb5, 0x12, 0x71, 0x38, 0x91, 0xd6, 0x25, 0xad, 0x5c, 0x5d, 0xcc, 0x26, 0x10, 0x18, 0x07, 0xe9, - 0x94, 0xbd, 0x20, 0x0a, 0xa8, 0x04, 0x5f, 0x4f, 0x02, 0x14, 0x21, 0x2e, 0xfb, 0x6a, 0x96, 0x4f, - 0x05, 0x76, 0x95, 0xe0, 0x1c, 0xd0, 0xe3, 0xf5, 0x69, 0x81, 0x4f, 0xba, 0x04, 0x88, 0x17, 0x63, - 0x65, 0xc2, 0x8a, 0xa5, 0x59, 0xea, 0xd7, 0x14, 0x9c, 0x8c, 0xf5, 0xcb, 0xa7, 0xf0, 0x55, 0x7a, - 0x9a, 0x15, 0xc8, 0x97, 0xbc, 0x40, 0x22, 0x97, 0x89, 0x54, 0x9c, 0x09, 0x37, 0x0f, 0x71, 0x7f, - 0x7c, 0xb8, 0x43, 0x89, 0x70, 0xe4, 0x1e, 0x64, 0x65, 0xc3, 0xbb, 0x7f, 0x6c, 0xc2, 0x4f, 0xfc, - 0xe5, 0x10, 0x90, 0xf5, 0xd4, 0xe5, 0x10, 0xb9, 0x49, 0x88, 0xd3, 0x5d, 0x9e, 0x66, 0xa5, 0xac, - 0x50, 0x9c, 0x97, 0xe1, 0x78, 0xe2, 0x5c, 0x09, 0x63, 0x2d, 0xdc, 0x7f, 0xb1, 0x93, 0x15, 0xb6, - 0x76, 0xb2, 0xc2, 0xcf, 0x3b, 0x59, 0xe1, 0xfd, 0xdd, 0x6c, 0xcf, 0xd6, 0x6e, 0xb6, 0xe7, 0xc7, - 0xdd, 0x6c, 0xcf, 0x6b, 0xb3, 0x15, 0xc3, 0xa9, 0xd6, 0xd7, 0xe4, 0x32, 0x5e, 0x57, 0x6e, 0x79, - 0xca, 0xfe, 0x8d, 0x9c, 0x27, 0xd8, 0x0e, 0x06, 0xfa, 0xd3, 0x40, 0xbb, 0xd3, 0xac, 0x21, 0xb2, - 0x76, 0x84, 0xfe, 0x93, 0xe8, 0xca, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x71, 0x2b, 0x92, - 0x13, 0x1b, 0x00, 0x00, + // 1719 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4b, 0x73, 0xd4, 0x46, + 0x1e, 0xb7, 0x6c, 0x1e, 0x9e, 0x36, 0xb0, 0x76, 0xdb, 0x80, 0x11, 0x66, 0x06, 0xc4, 0x16, 0x18, + 0x97, 0x91, 0xd6, 0xc6, 0xb0, 0x5b, 0x78, 0xd9, 0xad, 0x19, 0xcc, 0xc3, 0x98, 0x5a, 0x7b, 0x35, + 0xb5, 0x66, 0x93, 0xaa, 0x64, 0x4a, 0x9e, 0x69, 0x66, 0x14, 0x84, 0x5a, 0xa8, 0x35, 0x03, 0x53, + 0x2e, 0xa7, 0x52, 0x9c, 0x92, 0x1b, 0x95, 0xe4, 0x96, 0xca, 0xe3, 0x43, 0x90, 0xca, 0x21, 0x87, + 0xe4, 0xc8, 0x21, 0x07, 0x27, 0xb9, 0xe4, 0xe4, 0xa4, 0xec, 0xdc, 0x73, 0xc8, 0x17, 0x48, 0xa9, + 0xd5, 0x2d, 0x8d, 0x46, 0x8f, 0x99, 0x81, 0x09, 0x37, 0x4b, 0xf3, 0x7f, 0xfc, 0xfe, 0xcf, 0xfe, + 0xb5, 0x0c, 0x72, 0xe8, 0x09, 0x2e, 0x63, 0x1b, 0x29, 0xd8, 0x42, 0xb6, 0xe6, 0x60, 0x5b, 0x69, + 0xcc, 0x29, 0x8f, 0xea, 0xc8, 0x6e, 0xca, 0x96, 0x8d, 0x1d, 0x0c, 0xc7, 0x99, 0x80, 0xcc, 0x05, + 0xe4, 0xc6, 0x9c, 0x38, 0x53, 0xc6, 0xe4, 0x21, 0x26, 0xca, 0x86, 0x46, 0x90, 0x27, 0xad, 0x34, + 0xe6, 0x36, 0x90, 0xa3, 0xcd, 0x29, 0x96, 0x56, 0xd5, 0x4d, 0xcd, 0xd1, 0xb1, 0xe9, 0x19, 0x10, + 0x4f, 0x78, 0xb2, 0x25, 0xfa, 0xa4, 0x78, 0x0f, 0xec, 0xa7, 0xa9, 0x38, 0xe7, 0xce, 0x13, 0xf6, + 0xeb, 0x44, 0x15, 0x57, 0xb1, 0xa7, 0xe5, 0xfe, 0xc5, 0x75, 0xaa, 0x18, 0x57, 0x0d, 0xa4, 0x68, + 0x96, 0xae, 0x68, 0xa6, 0x89, 0x1d, 0xea, 0xcb, 0xb7, 0xe8, 0x20, 0xb3, 0x82, 0xec, 0x87, 0xba, + 0xe9, 0x28, 0x65, 0xbb, 0x69, 0x39, 0x58, 0x79, 0x80, 0x9a, 0xec, 0x57, 0xa9, 0x08, 0xe0, 0x2d, + 0xe4, 0xac, 0x32, 0x67, 0xcb, 0xe6, 0x7d, 0xac, 0xa2, 0x47, 0xf0, 0x1a, 0x38, 0xcc, 0xfd, 0x97, + 0xb4, 0x4a, 0xc5, 0x9e, 0x14, 0x4e, 0x0b, 0xd3, 0x99, 0xc2, 0xe4, 0x0f, 0xcf, 0x2f, 0x4e, 0x30, + 0xb8, 0xf9, 0x4a, 0xc5, 0x46, 0x84, 0x14, 0x1d, 0x5b, 0x37, 0xab, 0xea, 0x21, 0x2e, 0xee, 0xbe, + 0x96, 0x36, 0xc0, 0xe4, 0x7f, 0xdd, 0x0c, 0xe4, 0x0d, 0x83, 0x5b, 0x26, 0x2a, 0x7a, 0x54, 0x47, + 0xc4, 0x81, 0x37, 0x01, 0x08, 0xf2, 0x41, 0xed, 0x8e, 0xcc, 0x9f, 0x93, 0x99, 0x51, 0x37, 0x79, + 0xb2, 0x97, 0x6a, 0x96, 0x3c, 0x79, 0x4d, 0xab, 0x22, 0xa6, 0xab, 0xb6, 0x68, 0x4a, 0x1f, 0x0a, + 0xe0, 0x44, 0x8c, 0x13, 0x62, 0x61, 0x93, 0x20, 0x38, 0x0b, 0x60, 0x10, 0x40, 0xb9, 0x4c, 0x83, + 0x20, 0x93, 0xc2, 0xe9, 0xa1, 0xe9, 0x8c, 0x3a, 0xea, 0x63, 0x2d, 0x97, 0x5d, 0xb8, 0x04, 0xde, + 0x0a, 0x61, 0x1a, 0xa4, 0x98, 0xce, 0x77, 0xc4, 0xe4, 0xb9, 0x0a, 0x81, 0x72, 0x00, 0xe4, 0x58, + 0xf2, 0xeb, 0x45, 0x96, 0xa2, 0x57, 0xcc, 0x26, 0xcc, 0x81, 0x11, 0xad, 0x41, 0xa8, 0x26, 0x22, + 0x84, 0xc2, 0xcb, 0xa8, 0x40, 0x6b, 0x10, 0xa6, 0x24, 0x3d, 0x06, 0x53, 0x34, 0x13, 0xdc, 0xf5, + 0xff, 0x8a, 0x4b, 0xeb, 0x9a, 0x51, 0xe7, 0x69, 0x83, 0xf7, 0xc0, 0x68, 0xe0, 0xdf, 0xac, 0x94, + 0xb4, 0x06, 0x61, 0x89, 0x3f, 0x2f, 0xc7, 0xb4, 0xb2, 0x1c, 0x0d, 0xa1, 0xb0, 0x6f, 0x7b, 0x27, + 0x27, 0xa8, 0x47, 0x7c, 0x5c, 0x66, 0x25, 0xdf, 0x20, 0x52, 0x13, 0x9c, 0x4a, 0x70, 0xcc, 0xca, + 0xf0, 0x7f, 0x00, 0xea, 0xa4, 0x52, 0x6a, 0xb8, 0x2f, 0xb9, 0xcf, 0x99, 0x54, 0x9f, 0xab, 0x96, + 0x83, 0x2a, 0xdc, 0x4e, 0xe1, 0xf0, 0xee, 0x4e, 0x2e, 0xc3, 0x9f, 0x88, 0x9a, 0xa9, 0x93, 0x8a, + 0xf7, 0xa7, 0x74, 0x07, 0x1c, 0xf7, 0xaa, 0xbf, 0x5e, 0x6c, 0x0f, 0x57, 0x09, 0xe7, 0xcb, 0x4b, + 0xf6, 0x91, 0xdd, 0x9d, 0x1c, 0x08, 0x02, 0x0a, 0xe5, 0xef, 0x5b, 0xa1, 0x2d, 0x8e, 0xa2, 0xa1, + 0x91, 0x1a, 0x9b, 0x85, 0x3f, 0x35, 0x83, 0x6d, 0xd3, 0x30, 0xf8, 0xd2, 0xd3, 0xb0, 0x09, 0x8e, + 0x46, 0xc0, 0x17, 0x9a, 0xcb, 0x4b, 0xf0, 0x1c, 0x18, 0x26, 0xee, 0x8b, 0x92, 0x5e, 0x61, 0x99, + 0x18, 0xd9, 0xdd, 0xc9, 0x1d, 0xf4, 0x84, 0x96, 0xd4, 0x83, 0xf4, 0xc7, 0xe5, 0x0a, 0xbc, 0x0a, + 0xf6, 0xe9, 0xe6, 0x7d, 0xec, 0x43, 0x48, 0x8b, 0x2a, 0x48, 0x0f, 0xd5, 0x91, 0xbe, 0x16, 0x40, + 0x36, 0x29, 0x7f, 0xac, 0x11, 0xd6, 0xc0, 0x11, 0xcd, 0x30, 0x4a, 0x0c, 0x8a, 0xeb, 0xc8, 0x9d, + 0xc5, 0x4e, 0xcd, 0x10, 0x0a, 0x45, 0x3d, 0xa4, 0x19, 0x86, 0xff, 0xa6, 0x7f, 0x33, 0x5b, 0x02, + 0x27, 0x43, 0xe0, 0xaf, 0x63, 0x93, 0xac, 0xa0, 0x26, 0x2f, 0xfd, 0x0c, 0x18, 0x8b, 0x6c, 0x12, + 0x2f, 0x93, 0xea, 0x5f, 0xda, 0x16, 0x09, 0x9c, 0x00, 0xfb, 0xcb, 0x35, 0x4d, 0x37, 0xd9, 0x8c, + 0x7a, 0x0f, 0xd2, 0x7b, 0x42, 0xdb, 0x7c, 0xfa, 0x1e, 0x58, 0x72, 0xf2, 0x00, 0x58, 0xf5, 0x0d, + 0x43, 0x2f, 0x97, 0x1e, 0xa0, 0x26, 0xeb, 0xab, 0x29, 0x39, 0x58, 0xdb, 0xb2, 0xb7, 0xb6, 0xe5, + 0x35, 0x2a, 0xb4, 0x82, 0x9a, 0x85, 0x7d, 0x2f, 0x76, 0x72, 0x03, 0x6a, 0xc6, 0xe2, 0x2f, 0xe0, + 0x29, 0x00, 0xb0, 0xe5, 0xe8, 0x66, 0xb5, 0x84, 0xeb, 0x0e, 0x75, 0x3f, 0xac, 0x66, 0xbc, 0x37, + 0xab, 0x75, 0x47, 0x2a, 0x83, 0x5c, 0x04, 0x01, 0x9f, 0x84, 0xbe, 0xc5, 0xf9, 0x36, 0x38, 0x9d, + 0xec, 0x84, 0x85, 0x7a, 0x12, 0x64, 0xca, 0xd8, 0x24, 0xad, 0xd6, 0x87, 0xcb, 0x4c, 0xae, 0x53, + 0x10, 0xef, 0x0b, 0x60, 0xba, 0x7d, 0xe3, 0xb3, 0x54, 0x92, 0x42, 0xf3, 0xba, 0x8b, 0x61, 0x79, + 0x89, 0x87, 0xe3, 0x43, 0x14, 0x5a, 0x20, 0xf6, 0x6d, 0xdc, 0xbe, 0x13, 0xc0, 0x85, 0x2e, 0xa0, + 0xb0, 0xa0, 0xd7, 0x5b, 0x0e, 0x23, 0x1a, 0xbd, 0x7b, 0xfe, 0xb2, 0x01, 0x98, 0x4e, 0x1d, 0x00, + 0x66, 0x73, 0x4d, 0xd3, 0xed, 0xe0, 0xd8, 0xe2, 0x8e, 0xfa, 0x37, 0x02, 0x9f, 0x0a, 0x60, 0x3c, + 0xc6, 0x65, 0x4f, 0x3d, 0xb1, 0x18, 0x6a, 0xe2, 0xc1, 0xce, 0x4d, 0x9c, 0xdc, 0xbe, 0x43, 0xed, + 0x95, 0xff, 0x20, 0x21, 0xdd, 0xf4, 0xf4, 0x7e, 0xcd, 0xa5, 0xdf, 0x16, 0xc0, 0x4c, 0x37, 0x58, + 0x58, 0xed, 0xdf, 0x00, 0xe3, 0xe1, 0xda, 0x07, 0x4c, 0x64, 0x64, 0xfe, 0x42, 0xc7, 0xe2, 0xbb, + 0x56, 0x69, 0xf5, 0xc7, 0x70, 0xbb, 0xaf, 0xfe, 0x95, 0xff, 0x5d, 0x30, 0x11, 0xe7, 0xb3, 0xa7, + 0xf2, 0x87, 0x06, 0x7b, 0x30, 0x75, 0xb0, 0x23, 0xe5, 0xbd, 0x02, 0xa4, 0x08, 0x93, 0x2b, 0x34, + 0x57, 0x2d, 0x67, 0xd9, 0xcc, 0xaf, 0x17, 0x79, 0x59, 0x47, 0xc1, 0x10, 0x3f, 0x76, 0x33, 0xaa, + 0xfb, 0xa7, 0x74, 0x07, 0x9c, 0x4d, 0xd5, 0x63, 0x25, 0x38, 0xdb, 0x42, 0xbf, 0x0c, 0x9d, 0x38, + 0x8c, 0x06, 0xfa, 0x24, 0xeb, 0xae, 0x4e, 0x1c, 0x69, 0x91, 0x51, 0x80, 0xbc, 0x61, 0xe4, 0xd7, + 0x8b, 0xd4, 0x8c, 0xf7, 0x2b, 0x77, 0x2f, 0x82, 0x61, 0xae, 0xc0, 0x17, 0x17, 0x7f, 0x96, 0x16, + 0xd9, 0xf9, 0x17, 0xa3, 0xcc, 0x30, 0x9c, 0x00, 0xc3, 0x2e, 0x27, 0x69, 0x71, 0x7f, 0x50, 0x6b, + 0x10, 0xea, 0xd9, 0x04, 0xe3, 0x6c, 0x6d, 0x3a, 0xaf, 0x83, 0x72, 0x48, 0x32, 0x10, 0xa9, 0xbf, + 0xa2, 0xa9, 0x59, 0xa4, 0x86, 0x9d, 0xdb, 0xc8, 0xb0, 0x90, 0x9d, 0x9c, 0xe5, 0x65, 0x96, 0x99, + 0xa2, 0x85, 0xca, 0xfa, 0x7d, 0x1d, 0x55, 0xb8, 0x62, 0xa2, 0x0a, 0x3c, 0x06, 0x0e, 0xd4, 0x90, + 0x5e, 0xad, 0x79, 0x4b, 0x7c, 0x48, 0x65, 0x4f, 0xd2, 0xc7, 0x02, 0x98, 0x5a, 0xc7, 0x6e, 0xd9, + 0xd7, 0xf0, 0x63, 0x64, 0x73, 0x43, 0x2b, 0xa8, 0x79, 0x9b, 0x0a, 0x40, 0x19, 0x8c, 0x13, 0xf6, + 0xd2, 0x5d, 0x23, 0x25, 0x66, 0x45, 0xa0, 0x56, 0xc6, 0x48, 0x44, 0x7e, 0x09, 0x0c, 0xf3, 0x97, + 0x6c, 0x00, 0xe2, 0xf7, 0x69, 0x8c, 0x53, 0xd5, 0xd7, 0x94, 0x08, 0xe7, 0x92, 0x86, 0xd1, 0x39, + 0xb6, 0x7e, 0xed, 0x91, 0xe7, 0x42, 0x70, 0x49, 0x0a, 0xbc, 0xb2, 0x76, 0x59, 0x05, 0x19, 0x8e, + 0x8e, 0xef, 0x8a, 0xb9, 0x6e, 0x03, 0xf3, 0xb3, 0xa3, 0x06, 0x36, 0xfa, 0xb6, 0x2b, 0xe6, 0x9f, + 0x1e, 0x07, 0xfb, 0x29, 0x6c, 0xf8, 0x89, 0x00, 0xc6, 0x42, 0xe7, 0x3d, 0xa5, 0x65, 0xf1, 0xcd, + 0x19, 0xbd, 0x62, 0x8a, 0x67, 0x52, 0xbb, 0xd8, 0x95, 0x92, 0xae, 0x3e, 0xfd, 0xf1, 0xd7, 0x8f, + 0x06, 0x17, 0xe0, 0xbc, 0x12, 0x77, 0x29, 0xf6, 0xa7, 0xc3, 0xa5, 0x93, 0xca, 0x66, 0xe8, 0x86, + 0xb5, 0x05, 0x3f, 0xe3, 0xe8, 0x5a, 0x97, 0x03, 0xbc, 0x18, 0xeb, 0x34, 0xe9, 0xae, 0x2a, 0xca, + 0xdd, 0x8a, 0x7b, 0x89, 0x92, 0x66, 0x28, 0xe0, 0xbf, 0x42, 0x29, 0x16, 0xb0, 0x4b, 0x80, 0xb1, + 0x0f, 0xe5, 0xfb, 0x76, 0xd2, 0xcc, 0x0e, 0xde, 0x9b, 0xd8, 0x66, 0x67, 0x08, 0xfc, 0x5b, 0xb2, + 0xfb, 0x78, 0xb2, 0x2a, 0xce, 0xf5, 0xa0, 0xc1, 0x30, 0xdf, 0xa1, 0x98, 0x97, 0x60, 0x21, 0x3d, + 0xc9, 0x9c, 0xb7, 0xb4, 0x26, 0x9a, 0x1d, 0x09, 0x5b, 0xca, 0x26, 0x3d, 0x62, 0xb7, 0xe0, 0x8e, + 0xc0, 0x36, 0x79, 0x0c, 0x05, 0x6c, 0x89, 0x6b, 0xa1, 0x3b, 0x94, 0x61, 0x82, 0x2a, 0x5e, 0xee, + 0x51, 0x8b, 0xc5, 0xb7, 0x42, 0xe3, 0xbb, 0x01, 0xaf, 0x77, 0x11, 0x9f, 0x1b, 0x4d, 0x6a, 0x80, + 0x3f, 0x0b, 0xe0, 0x4c, 0x47, 0xde, 0x07, 0xaf, 0x75, 0xd5, 0x36, 0x49, 0xd4, 0x55, 0xfc, 0xd7, + 0xcb, 0xaa, 0xb3, 0x88, 0x17, 0x69, 0xc4, 0x97, 0xe1, 0xa5, 0x8e, 0x5d, 0x18, 0xb0, 0x51, 0x3f, + 0xc2, 0xdf, 0x04, 0x70, 0x34, 0xf6, 0x4e, 0x0f, 0xbb, 0xe8, 0xad, 0xb6, 0x9b, 0xb8, 0x38, 0xdf, + 0x8b, 0x0a, 0x43, 0x8f, 0x29, 0x7a, 0x1d, 0x56, 0xd3, 0xeb, 0xe5, 0x7f, 0x56, 0x68, 0xad, 0x97, + 0x77, 0x4c, 0xca, 0xe1, 0x55, 0x10, 0x23, 0xd0, 0xf2, 0x79, 0x60, 0x0b, 0x3e, 0x13, 0xc0, 0x68, + 0xfb, 0xa7, 0x04, 0x38, 0x9b, 0x52, 0x83, 0xc8, 0x17, 0x07, 0x51, 0x8a, 0x95, 0x5e, 0x42, 0x65, + 0x2a, 0x75, 0x53, 0x47, 0x46, 0xa5, 0xd3, 0x6e, 0x68, 0x90, 0x20, 0x24, 0xf8, 0xbb, 0x00, 0x8e, + 0xc5, 0x5f, 0xa8, 0x61, 0x17, 0x29, 0x6d, 0xff, 0x7a, 0x21, 0x5e, 0xea, 0x49, 0x87, 0xd5, 0xc1, + 0xa2, 0x78, 0xdf, 0x81, 0xb5, 0xf4, 0x3a, 0x04, 0x37, 0xfa, 0x57, 0x2e, 0xc4, 0x9e, 0x10, 0xe5, + 0x81, 0x51, 0x66, 0x0d, 0xbb, 0x1f, 0x8f, 0xd8, 0xeb, 0x81, 0xf8, 0xef, 0x97, 0xd6, 0x67, 0x99, + 0xf9, 0x27, 0xcd, 0xcc, 0x15, 0xb8, 0xd0, 0xe5, 0x7c, 0x51, 0xc6, 0xef, 0x0f, 0xd8, 0x0b, 0x21, + 0x60, 0x9a, 0xfe, 0x09, 0x72, 0x4f, 0x77, 0x6a, 0x9c, 0xb7, 0xc2, 0xbf, 0x77, 0x77, 0xea, 0x44, + 0x18, 0xb2, 0xf8, 0x8f, 0xde, 0x15, 0x59, 0x48, 0x0b, 0x34, 0x24, 0x19, 0xce, 0x26, 0x14, 0xdb, + 0x51, 0x42, 0x0c, 0x5a, 0xd9, 0xd4, 0x1a, 0x64, 0x0b, 0x7e, 0xc5, 0xdb, 0x34, 0xc2, 0x7b, 0xd3, + 0xda, 0x34, 0x89, 0x61, 0xa7, 0xb5, 0x69, 0x22, 0xb1, 0xee, 0x02, 0x39, 0xe7, 0xdd, 0x41, 0xfb, + 0x6d, 0xc1, 0x6f, 0x04, 0x70, 0xa8, 0x95, 0x74, 0xc3, 0xe9, 0xb4, 0x11, 0x69, 0xe5, 0xe5, 0x62, + 0x36, 0x81, 0xb7, 0x38, 0xa8, 0x42, 0x49, 0x0b, 0xa2, 0x80, 0x4a, 0xf0, 0xad, 0x24, 0x40, 0xfd, + 0x19, 0x96, 0xcf, 0x05, 0x76, 0x6d, 0x08, 0xd3, 0x78, 0xa8, 0x24, 0x07, 0x12, 0x4b, 0xf8, 0xc5, + 0xb3, 0xb1, 0x0a, 0x61, 0x59, 0x69, 0x9e, 0x06, 0x35, 0x0b, 0x67, 0x62, 0x83, 0xf2, 0x29, 0x7b, + 0x8d, 0x4a, 0xb3, 0xee, 0xf8, 0x92, 0x77, 0x47, 0xe4, 0xe2, 0x90, 0xd6, 0x1d, 0x49, 0xb7, 0x0c, + 0xb1, 0x77, 0xfe, 0xdb, 0xa1, 0x37, 0x38, 0x6a, 0x0f, 0xae, 0xb2, 0xe9, 0xdd, 0x35, 0xb6, 0xe0, + 0x17, 0xfe, 0x79, 0x10, 0x10, 0xf3, 0xd4, 0xf3, 0x20, 0x72, 0x6b, 0x10, 0x2f, 0x76, 0x29, 0xcd, + 0x7a, 0x58, 0xa1, 0x38, 0x2f, 0xc0, 0xf3, 0x89, 0x0b, 0x25, 0x8c, 0xb5, 0x70, 0xf7, 0xc5, 0x6e, + 0x56, 0xd8, 0xde, 0xcd, 0x0a, 0xbf, 0xec, 0x66, 0x85, 0x67, 0x7b, 0xd9, 0x81, 0xed, 0xbd, 0xec, + 0xc0, 0x4f, 0x7b, 0xd9, 0x81, 0x37, 0xe7, 0xab, 0xba, 0x53, 0xab, 0x6f, 0xc8, 0x65, 0xfc, 0x50, + 0xb9, 0xe1, 0x19, 0xfb, 0x0f, 0x72, 0x1e, 0x63, 0xfb, 0x81, 0x6f, 0xfb, 0x49, 0x60, 0xdd, 0x69, + 0x5a, 0x88, 0x6c, 0x1c, 0xa0, 0xff, 0x09, 0xba, 0xf4, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xef, + 0x24, 0x0f, 0x59, 0xf8, 0x1a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1817,9 +1816,9 @@ type QueryClient interface { // QueryOptInfo queries specified opted information. QueryOptInfo(ctx context.Context, in *QueryOptInfoRequest, opts ...grpc.CallOption) (*OptedInfo, error) // QuerySnapshotHelper queries the snapshot helper of the AVS - QuerySnapshotHelper(ctx context.Context, in *QuerySnapshotAndHelperRequest, opts ...grpc.CallOption) (*SnapshotHelper, error) - // QuerySnapshotHelper queries the snapshot helper of the AVS - QuerySpecifiedSnapshot(ctx context.Context, in *QuerySpecifiedSnapshotRequest, opts ...grpc.CallOption) (*VotingPowerSnapshotWithKeyHeight, error) + QuerySnapshotHelper(ctx context.Context, in *QuerySnapshotHelperRequest, opts ...grpc.CallOption) (*SnapshotHelper, error) + // QuerySpecifiedSnapshot queries the voting power snapshot of specified AVS and height + QuerySpecifiedSnapshot(ctx context.Context, in *QuerySpecifiedSnapshotRequest, opts ...grpc.CallOption) (*VotingPowerSnapshotKeyHeight, error) // QueryAllSnapshot queries all voting power snapshot for the specified AVS QueryAllSnapshot(ctx context.Context, in *QueryAllSnapshotRequest, opts ...grpc.CallOption) (*QueryAllSnapshotResponse, error) } @@ -1940,7 +1939,7 @@ func (c *queryClient) QueryOptInfo(ctx context.Context, in *QueryOptInfoRequest, return out, nil } -func (c *queryClient) QuerySnapshotHelper(ctx context.Context, in *QuerySnapshotAndHelperRequest, opts ...grpc.CallOption) (*SnapshotHelper, error) { +func (c *queryClient) QuerySnapshotHelper(ctx context.Context, in *QuerySnapshotHelperRequest, opts ...grpc.CallOption) (*SnapshotHelper, error) { out := new(SnapshotHelper) err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/QuerySnapshotHelper", in, out, opts...) if err != nil { @@ -1949,8 +1948,8 @@ func (c *queryClient) QuerySnapshotHelper(ctx context.Context, in *QuerySnapshot return out, nil } -func (c *queryClient) QuerySpecifiedSnapshot(ctx context.Context, in *QuerySpecifiedSnapshotRequest, opts ...grpc.CallOption) (*VotingPowerSnapshotWithKeyHeight, error) { - out := new(VotingPowerSnapshotWithKeyHeight) +func (c *queryClient) QuerySpecifiedSnapshot(ctx context.Context, in *QuerySpecifiedSnapshotRequest, opts ...grpc.CallOption) (*VotingPowerSnapshotKeyHeight, error) { + out := new(VotingPowerSnapshotKeyHeight) err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/QuerySpecifiedSnapshot", in, out, opts...) if err != nil { return nil, err @@ -1996,9 +1995,9 @@ type QueryServer interface { // QueryOptInfo queries specified opted information. QueryOptInfo(context.Context, *QueryOptInfoRequest) (*OptedInfo, error) // QuerySnapshotHelper queries the snapshot helper of the AVS - QuerySnapshotHelper(context.Context, *QuerySnapshotAndHelperRequest) (*SnapshotHelper, error) - // QuerySnapshotHelper queries the snapshot helper of the AVS - QuerySpecifiedSnapshot(context.Context, *QuerySpecifiedSnapshotRequest) (*VotingPowerSnapshotWithKeyHeight, error) + QuerySnapshotHelper(context.Context, *QuerySnapshotHelperRequest) (*SnapshotHelper, error) + // QuerySpecifiedSnapshot queries the voting power snapshot of specified AVS and height + QuerySpecifiedSnapshot(context.Context, *QuerySpecifiedSnapshotRequest) (*VotingPowerSnapshotKeyHeight, error) // QueryAllSnapshot queries all voting power snapshot for the specified AVS QueryAllSnapshot(context.Context, *QueryAllSnapshotRequest) (*QueryAllSnapshotResponse, error) } @@ -2043,10 +2042,10 @@ func (*UnimplementedQueryServer) QueryAllAVSsByOperator(ctx context.Context, req func (*UnimplementedQueryServer) QueryOptInfo(ctx context.Context, req *QueryOptInfoRequest) (*OptedInfo, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryOptInfo not implemented") } -func (*UnimplementedQueryServer) QuerySnapshotHelper(ctx context.Context, req *QuerySnapshotAndHelperRequest) (*SnapshotHelper, error) { +func (*UnimplementedQueryServer) QuerySnapshotHelper(ctx context.Context, req *QuerySnapshotHelperRequest) (*SnapshotHelper, error) { return nil, status.Errorf(codes.Unimplemented, "method QuerySnapshotHelper not implemented") } -func (*UnimplementedQueryServer) QuerySpecifiedSnapshot(ctx context.Context, req *QuerySpecifiedSnapshotRequest) (*VotingPowerSnapshotWithKeyHeight, error) { +func (*UnimplementedQueryServer) QuerySpecifiedSnapshot(ctx context.Context, req *QuerySpecifiedSnapshotRequest) (*VotingPowerSnapshotKeyHeight, error) { return nil, status.Errorf(codes.Unimplemented, "method QuerySpecifiedSnapshot not implemented") } func (*UnimplementedQueryServer) QueryAllSnapshot(ctx context.Context, req *QueryAllSnapshotRequest) (*QueryAllSnapshotResponse, error) { @@ -2274,7 +2273,7 @@ func _Query_QueryOptInfo_Handler(srv interface{}, ctx context.Context, dec func( } func _Query_QuerySnapshotHelper_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QuerySnapshotAndHelperRequest) + in := new(QuerySnapshotHelperRequest) if err := dec(in); err != nil { return nil, err } @@ -2286,7 +2285,7 @@ func _Query_QuerySnapshotHelper_Handler(srv interface{}, ctx context.Context, de FullMethod: "/exocore.operator.v1.Query/QuerySnapshotHelper", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QuerySnapshotHelper(ctx, req.(*QuerySnapshotAndHelperRequest)) + return srv.(QueryServer).QuerySnapshotHelper(ctx, req.(*QuerySnapshotHelperRequest)) } return interceptor(ctx, in, info, handler) } @@ -3377,7 +3376,7 @@ func (m *QueryOptInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QuerySnapshotAndHelperRequest) Marshal() (dAtA []byte, err error) { +func (m *QuerySnapshotHelperRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3387,12 +3386,12 @@ func (m *QuerySnapshotAndHelperRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QuerySnapshotAndHelperRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QuerySnapshotHelperRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QuerySnapshotAndHelperRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QuerySnapshotHelperRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3442,7 +3441,7 @@ func (m *QuerySpecifiedSnapshotRequest) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } -func (m *VotingPowerSnapshotWithKeyHeight) Marshal() (dAtA []byte, err error) { +func (m *VotingPowerSnapshotKeyHeight) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3452,12 +3451,12 @@ func (m *VotingPowerSnapshotWithKeyHeight) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *VotingPowerSnapshotWithKeyHeight) MarshalTo(dAtA []byte) (int, error) { +func (m *VotingPowerSnapshotKeyHeight) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *VotingPowerSnapshotWithKeyHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *VotingPowerSnapshotKeyHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3983,7 +3982,7 @@ func (m *QueryOptInfoRequest) Size() (n int) { return n } -func (m *QuerySnapshotAndHelperRequest) Size() (n int) { +func (m *QuerySnapshotHelperRequest) Size() (n int) { if m == nil { return 0 } @@ -4012,7 +4011,7 @@ func (m *QuerySpecifiedSnapshotRequest) Size() (n int) { return n } -func (m *VotingPowerSnapshotWithKeyHeight) Size() (n int) { +func (m *VotingPowerSnapshotKeyHeight) Size() (n int) { if m == nil { return 0 } @@ -6679,7 +6678,7 @@ func (m *QueryOptInfoRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QuerySnapshotAndHelperRequest) Unmarshal(dAtA []byte) error { +func (m *QuerySnapshotHelperRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6702,10 +6701,10 @@ func (m *QuerySnapshotAndHelperRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QuerySnapshotAndHelperRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySnapshotHelperRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QuerySnapshotAndHelperRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySnapshotHelperRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6862,7 +6861,7 @@ func (m *QuerySpecifiedSnapshotRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *VotingPowerSnapshotWithKeyHeight) Unmarshal(dAtA []byte) error { +func (m *VotingPowerSnapshotKeyHeight) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6885,10 +6884,10 @@ func (m *VotingPowerSnapshotWithKeyHeight) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: VotingPowerSnapshotWithKeyHeight: wiretype end group for non-group") + return fmt.Errorf("proto: VotingPowerSnapshotKeyHeight: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: VotingPowerSnapshotWithKeyHeight: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: VotingPowerSnapshotKeyHeight: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7143,7 +7142,7 @@ func (m *QueryAllSnapshotResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Snapshots = append(m.Snapshots, &VotingPowerSnapshotWithKeyHeight{}) + m.Snapshots = append(m.Snapshots, &VotingPowerSnapshotKeyHeight{}) if err := m.Snapshots[len(m.Snapshots)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/operator/types/query.pb.gw.go b/x/operator/types/query.pb.gw.go index a0ca9f51f..4e514f08e 100644 --- a/x/operator/types/query.pb.gw.go +++ b/x/operator/types/query.pb.gw.go @@ -846,7 +846,7 @@ func local_request_Query_QueryOptInfo_0(ctx context.Context, marshaler runtime.M } func request_Query_QuerySnapshotHelper_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QuerySnapshotAndHelperRequest + var protoReq QuerySnapshotHelperRequest var metadata runtime.ServerMetadata var ( @@ -873,7 +873,7 @@ func request_Query_QuerySnapshotHelper_0(ctx context.Context, marshaler runtime. } func local_request_Query_QuerySnapshotHelper_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QuerySnapshotAndHelperRequest + var protoReq QuerySnapshotHelperRequest var metadata runtime.ServerMetadata var ( @@ -1753,11 +1753,11 @@ var ( pattern_Query_QueryAllOperatorConsKeysByChainID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"exocore", "operator", "v1", "all_operator_cons_keys", "chain"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_QueryOperatorUSDValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "QueryOperatorUSDValue", "operator_and_avs.operator_addr", "operator_and_avs.avs_address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QueryOperatorUSDValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "operator_usd_value", "operator_and_avs.operator_addr", "operator_and_avs.avs_address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_QueryAVSUSDValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"exocore", "operator", "v1", "QueryAVSUSDValue"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QueryAVSUSDValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"exocore", "operator", "v1", "avs_usd_value"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_QueryOperatorSlashInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "QueryOperatorSlashInfo", "operator_and_avs.operator_addr", "operator_and_avs.avs_address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QueryOperatorSlashInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "operator_slash_info", "operator_and_avs.operator_addr", "operator_and_avs.avs_address"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_QueryAllOperatorConsAddrsByChainID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"exocore", "operator", "v1", "all_operator_cons_addrs", "chain"}, "", runtime.AssumeColonVerbOpt(false))) diff --git a/x/operator/types/tx.pb.go b/x/operator/types/tx.pb.go index 3094a603a..bffbc6f75 100644 --- a/x/operator/types/tx.pb.go +++ b/x/operator/types/tx.pb.go @@ -18,7 +18,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" @@ -758,6 +757,8 @@ type SlashExecutionInfo struct { SlashUndelegations []SlashFromUndelegation `protobuf:"bytes,3,rep,name=slash_undelegations,json=slashUndelegations,proto3" json:"slash_undelegations"` // SlashFromAssetsPool records all slash info related to the assets pool SlashAssetsPool []SlashFromAssetsPool `protobuf:"bytes,4,rep,name=slash_assets_pool,json=slashAssetsPool,proto3" json:"slash_assets_pool"` + // undelegation_filter_height records the height before which undelegations are not slashed + UndelegationFilterHeight int64 `protobuf:"varint,5,opt,name=undelegation_filter_height,json=undelegationFilterHeight,proto3" json:"undelegation_filter_height,omitempty"` } func (m *SlashExecutionInfo) Reset() { *m = SlashExecutionInfo{} } @@ -807,6 +808,13 @@ func (m *SlashExecutionInfo) GetSlashAssetsPool() []SlashFromAssetsPool { return nil } +func (m *SlashExecutionInfo) GetUndelegationFilterHeight() int64 { + if m != nil { + return m.UndelegationFilterHeight + } + return 0 +} + // OperatorSlashInfo is the slash info of operator type OperatorSlashInfo struct { // slash_contract is the address of slash contract @@ -1251,118 +1259,118 @@ func init() { func init() { proto.RegisterFile("exocore/operator/v1/tx.proto", fileDescriptor_b229d5663e4df167) } var fileDescriptor_b229d5663e4df167 = []byte{ - // 1765 bytes of a gzipped FileDescriptorProto + // 1769 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x52, 0xb2, 0x2d, 0x3e, 0x92, 0x22, 0x35, 0xf4, 0x07, 0xcd, 0xba, 0xa2, 0xbd, 0xa9, - 0x6d, 0x59, 0xad, 0x48, 0x58, 0x69, 0x0a, 0xc4, 0x6d, 0x81, 0x4a, 0xa2, 0x0c, 0xb3, 0x91, 0x49, - 0x61, 0x57, 0x32, 0xd0, 0x14, 0xed, 0x76, 0xb5, 0x3b, 0x5c, 0xae, 0xbd, 0xdc, 0xd9, 0xee, 0x0c, - 0x19, 0x29, 0xa7, 0x22, 0xa7, 0xa0, 0xe8, 0xa1, 0x40, 0x4e, 0x45, 0x7b, 0xf0, 0xa9, 0xe8, 0xd1, - 0x87, 0xf4, 0x58, 0xb4, 0xbd, 0xe5, 0x18, 0xb8, 0x3d, 0x14, 0x3d, 0x28, 0x85, 0x5c, 0xc0, 0xfd, - 0x23, 0x5a, 0xa0, 0x98, 0xd9, 0x59, 0x6a, 0x69, 0x2f, 0x65, 0x0b, 0x56, 0x72, 0x49, 0x3c, 0xef, - 0xbd, 0x79, 0xbf, 0xdf, 0x7b, 0xf3, 0x3e, 0x96, 0x82, 0x2b, 0x78, 0x8f, 0x58, 0x24, 0xc4, 0x0d, - 0x12, 0xe0, 0xd0, 0x64, 0x24, 0x6c, 0x0c, 0x6f, 0x37, 0xd8, 0x5e, 0x3d, 0x08, 0x09, 0x23, 0xa8, - 0x2c, 0xb5, 0xf5, 0x58, 0x5b, 0x1f, 0xde, 0xae, 0xce, 0x9b, 0x7d, 0xd7, 0x27, 0x0d, 0xf1, 0xdf, - 0xc8, 0xae, 0x7a, 0xc9, 0x22, 0xb4, 0x4f, 0x68, 0xa3, 0x4f, 0x1d, 0x7e, 0xbf, 0x4f, 0x1d, 0xa9, - 0xf8, 0x86, 0x54, 0x50, 0x66, 0x3e, 0x72, 0x7d, 0xae, 0xdc, 0xc5, 0xcc, 0xbc, 0x1d, 0x9f, 0xa5, - 0xd5, 0xe5, 0xc8, 0xca, 0x10, 0xa7, 0x46, 0x74, 0x90, 0xaa, 0xf3, 0x0e, 0x71, 0x48, 0x24, 0xe7, - 0xff, 0x92, 0xd2, 0x2b, 0x0e, 0x21, 0x8e, 0x87, 0x1b, 0x66, 0xe0, 0x36, 0x4c, 0xdf, 0x27, 0xcc, - 0x64, 0x2e, 0xf1, 0xe3, 0x3b, 0x35, 0xa9, 0x15, 0xa7, 0xdd, 0x41, 0xb7, 0xc1, 0xdc, 0x3e, 0xa6, - 0xcc, 0xec, 0x07, 0x91, 0x81, 0x8a, 0xa1, 0xd0, 0xc4, 0xd6, 0x03, 0xd3, 0x1b, 0xe0, 0xbb, 0x2e, - 0xf6, 0x6c, 0xb4, 0x0d, 0x67, 0xcd, 0x3e, 0x19, 0xf8, 0xac, 0xa2, 0x5c, 0x55, 0x16, 0xb3, 0x6b, - 0xdf, 0xfb, 0xec, 0xa0, 0x36, 0xf5, 0xcf, 0x83, 0xda, 0x0d, 0xc7, 0x65, 0xbd, 0xc1, 0x6e, 0xdd, - 0x22, 0x7d, 0x49, 0x4b, 0xfe, 0x6f, 0x99, 0xda, 0x8f, 0x1a, 0x6c, 0x3f, 0xc0, 0xb4, 0xde, 0xc4, - 0xd6, 0xd3, 0x4f, 0x97, 0x41, 0xb2, 0x6e, 0x62, 0x4b, 0x93, 0xbe, 0xd4, 0xff, 0x66, 0xe0, 0x42, - 0x47, 0x26, 0xae, 0x13, 0x30, 0x6c, 0xef, 0xe8, 0x4d, 0x01, 0x8a, 0x42, 0x98, 0xa3, 0xd8, 0xeb, - 0x1a, 0x03, 0x6a, 0x1b, 0x43, 0x2e, 0x91, 0xb8, 0x9b, 0x27, 0xc3, 0x3d, 0x3c, 0xa8, 0xe5, 0x75, - 0xec, 0x75, 0x63, 0xbf, 0x2f, 0xf0, 0xc8, 0x73, 0x8c, 0x1d, 0x6a, 0x47, 0x98, 0x03, 0x28, 0x32, - 0xc2, 0x4c, 0x2f, 0x01, 0x9a, 0x11, 0xa0, 0xf7, 0x4f, 0x0c, 0x5a, 0xd8, 0xe6, 0x8e, 0x26, 0xa0, - 0x16, 0x04, 0xca, 0x08, 0x76, 0x0f, 0x4a, 0xa6, 0xc5, 0xdc, 0x21, 0x4e, 0xe0, 0x4e, 0x0b, 0xdc, - 0xf6, 0x89, 0x71, 0xe7, 0x56, 0x85, 0xa7, 0x09, 0xc0, 0x73, 0x11, 0x4e, 0x8c, 0xac, 0xfe, 0x51, - 0x81, 0x72, 0x9c, 0xfe, 0x07, 0x84, 0xb9, 0xbe, 0xb3, 0x45, 0x3e, 0xc0, 0x21, 0xfa, 0x3e, 0x14, - 0xe2, 0x72, 0x36, 0x4c, 0xdb, 0x0e, 0x65, 0xee, 0x2b, 0x4f, 0x3f, 0x5d, 0x3e, 0x2f, 0xdd, 0xad, - 0xda, 0x76, 0x88, 0x29, 0xd5, 0x59, 0xe8, 0xfa, 0x8e, 0x96, 0x8f, 0xcd, 0xb9, 0x18, 0x19, 0x90, - 0x1f, 0x0a, 0x6f, 0x46, 0xc0, 0xdd, 0xc9, 0x24, 0xbe, 0x59, 0xc5, 0xe4, 0x86, 0x47, 0xfc, 0xd4, - 0x2f, 0x32, 0x50, 0x4e, 0xf0, 0xd5, 0x7d, 0x33, 0xa0, 0x3d, 0xc2, 0xd0, 0x43, 0x40, 0xd1, 0x03, - 0x8e, 0xc1, 0x9f, 0x46, 0xc1, 0x96, 0x84, 0xdf, 0x64, 0x8e, 0x7e, 0x0a, 0x17, 0x47, 0x39, 0x4a, - 0xc2, 0xd1, 0x4a, 0xe6, 0xea, 0xf4, 0x62, 0x6e, 0x65, 0xb1, 0x9e, 0x32, 0x19, 0xea, 0x29, 0xd9, - 0xd6, 0xce, 0x93, 0x97, 0x85, 0x14, 0xd5, 0xa1, 0xec, 0x99, 0x94, 0x19, 0x56, 0xcf, 0xf4, 0x1d, - 0x6c, 0x1b, 0x3d, 0xec, 0x3a, 0x3d, 0x26, 0x0a, 0x63, 0x5a, 0x9b, 0xe7, 0xaa, 0xf5, 0x48, 0x73, - 0x4f, 0x28, 0xd0, 0x2d, 0x28, 0xe1, 0x80, 0x58, 0x3d, 0xc3, 0xb5, 0xb1, 0xcf, 0xdc, 0xae, 0x8b, - 0xc3, 0xca, 0x0c, 0x8f, 0x5c, 0x2b, 0x0a, 0x79, 0x6b, 0x24, 0x46, 0xd7, 0x20, 0x1f, 0x99, 0xfa, - 0x83, 0xfe, 0x2e, 0x0e, 0x2b, 0x67, 0x84, 0xcf, 0x9c, 0x90, 0xb5, 0x85, 0x48, 0xfd, 0x19, 0xcc, - 0xc5, 0x59, 0xbd, 0x87, 0xbd, 0x00, 0x87, 0x93, 0xf8, 0x28, 0x93, 0xf8, 0x2c, 0x40, 0xae, 0x67, - 0x52, 0x83, 0x04, 0xcc, 0x20, 0x03, 0x26, 0x6a, 0x60, 0x56, 0xcb, 0xf6, 0x4c, 0xda, 0x09, 0x58, - 0x67, 0xc0, 0xd4, 0x7d, 0xa8, 0xae, 0x7b, 0x2e, 0xf6, 0xf9, 0x35, 0xd7, 0xdf, 0x30, 0x43, 0xdf, - 0xf5, 0x1d, 0x5e, 0x3e, 0x9b, 0x2e, 0x65, 0xe8, 0xc7, 0x30, 0x8f, 0x23, 0x91, 0xe1, 0xfa, 0x5d, - 0x62, 0x78, 0x2e, 0xe5, 0x58, 0x3c, 0xb1, 0x8d, 0xd4, 0xc4, 0xa6, 0xfb, 0x6a, 0xf9, 0x5d, 0xa2, - 0x15, 0xa5, 0x27, 0x7e, 0xe0, 0xce, 0xd5, 0xdf, 0x28, 0x93, 0xb0, 0xb9, 0x09, 0xfa, 0x01, 0x20, - 0xef, 0x43, 0xc3, 0x12, 0x06, 0x3c, 0x5c, 0xd7, 0x37, 0x5c, 0x5b, 0x04, 0x3a, 0xb3, 0x56, 0x3e, - 0x3c, 0xa8, 0x15, 0x37, 0x3f, 0x4c, 0xdc, 0x6e, 0x35, 0xb5, 0xa2, 0x37, 0x26, 0xb0, 0xd1, 0xbb, - 0x70, 0x79, 0xec, 0x7a, 0x1c, 0x8a, 0xe8, 0x25, 0xd1, 0x0d, 0xda, 0x45, 0x2b, 0x95, 0x80, 0xfa, - 0xd7, 0x0c, 0xe4, 0xe3, 0x22, 0x11, 0x6c, 0xde, 0x82, 0x82, 0xbc, 0x4e, 0x13, 0xbd, 0xa8, 0xe5, - 0x63, 0xa1, 0xe8, 0xb8, 0x6b, 0x90, 0x37, 0x83, 0x20, 0x24, 0x43, 0x9c, 0xc4, 0xc8, 0x49, 0x99, - 0x30, 0xf9, 0x16, 0xa0, 0x51, 0xbd, 0xf6, 0x31, 0x33, 0x45, 0x5e, 0xa3, 0x39, 0xa3, 0x95, 0x62, - 0xcd, 0x7d, 0xcc, 0x4c, 0x81, 0xea, 0x41, 0x35, 0x2d, 0x02, 0x49, 0x81, 0xd7, 0xd5, 0xc9, 0x1e, - 0x82, 0xe7, 0x5d, 0xbb, 0xf4, 0x72, 0xcc, 0x11, 0xfd, 0xfb, 0x00, 0x16, 0xe9, 0xf7, 0x5d, 0x4a, - 0x5d, 0xe2, 0x8b, 0x72, 0xcc, 0xad, 0xa8, 0x75, 0xd9, 0x7e, 0xf1, 0x22, 0x94, 0x8b, 0xb1, 0xbe, - 0x3e, 0xb2, 0x5c, 0xcb, 0xf2, 0x9e, 0xfe, 0xc3, 0xf3, 0x27, 0x4b, 0x8a, 0x96, 0x70, 0xa0, 0xfe, - 0x4e, 0x81, 0xac, 0xd8, 0x26, 0x22, 0x94, 0xeb, 0x30, 0x47, 0x3d, 0x93, 0xf6, 0x0c, 0x8b, 0xf8, - 0x2c, 0x34, 0x2d, 0xb9, 0xc1, 0xb4, 0x82, 0x90, 0xae, 0x4b, 0x21, 0xba, 0x01, 0x45, 0xc2, 0xef, - 0x18, 0xae, 0x1f, 0xd7, 0x36, 0xcf, 0xe2, 0x8c, 0x56, 0x20, 0x91, 0x2b, 0x59, 0xd7, 0x8b, 0x50, - 0x8a, 0xec, 0xc8, 0x80, 0x25, 0x9b, 0x72, 0x46, 0x9b, 0x13, 0xf2, 0xce, 0x80, 0x49, 0xcb, 0x8b, - 0x70, 0xf6, 0xa1, 0xe9, 0x7a, 0xd8, 0x16, 0xf9, 0x9a, 0xd5, 0xe4, 0x49, 0xfd, 0x93, 0x02, 0xf3, - 0x92, 0xde, 0x2a, 0xa5, 0x98, 0xe9, 0xcc, 0x64, 0xf8, 0x8d, 0x16, 0x6c, 0xcb, 0x67, 0x89, 0x79, - 0xd5, 0xf2, 0x59, 0xbc, 0x60, 0x91, 0x06, 0x67, 0x92, 0x8b, 0xec, 0xcd, 0x86, 0x60, 0xe4, 0x4a, - 0xfd, 0x8b, 0x02, 0x17, 0x74, 0x9e, 0xbb, 0xbb, 0x21, 0xe9, 0xef, 0xf8, 0x36, 0xf6, 0xb0, 0x23, - 0xbe, 0x2e, 0xd0, 0x2d, 0xc8, 0xf2, 0xd7, 0xc2, 0x61, 0xdc, 0x30, 0xd9, 0xb5, 0xfc, 0xe1, 0x41, - 0x6d, 0x56, 0x17, 0xc2, 0x56, 0x53, 0x9b, 0x8d, 0xd4, 0x2d, 0x1b, 0xdd, 0x80, 0x59, 0x93, 0x07, - 0xcf, 0x2d, 0x23, 0x6e, 0xb9, 0xc3, 0x83, 0xda, 0x39, 0x91, 0x90, 0x56, 0x53, 0x3b, 0x27, 0x94, - 0xad, 0xe4, 0x77, 0xc7, 0xf4, 0xe9, 0xa5, 0x45, 0xfd, 0x44, 0x81, 0xf2, 0x28, 0x04, 0x81, 0x49, - 0xb7, 0x08, 0xf1, 0xc6, 0x58, 0x29, 0xaf, 0xc5, 0x2a, 0x73, 0x8a, 0xac, 0x7e, 0x3b, 0x0d, 0x48, - 0xb0, 0xda, 0xd8, 0xc3, 0xd6, 0x80, 0x67, 0x54, 0x14, 0xb0, 0x03, 0xa5, 0xa8, 0x80, 0x83, 0x90, - 0x04, 0x24, 0xe4, 0xf2, 0x53, 0xd9, 0x69, 0x45, 0xe1, 0x75, 0x6b, 0xe4, 0x14, 0xfd, 0x04, 0x72, - 0x11, 0xd0, 0xe9, 0x95, 0x0c, 0x08, 0x87, 0xd1, 0x77, 0x8e, 0x09, 0xe5, 0xc8, 0xfd, 0x20, 0x51, - 0x33, 0xb4, 0x32, 0x2d, 0xa6, 0xfa, 0x52, 0xea, 0x30, 0x49, 0x2d, 0xb3, 0xb5, 0x19, 0x4e, 0x49, - 0x43, 0xc2, 0x59, 0x52, 0x41, 0xd1, 0xfb, 0x30, 0x1f, 0x41, 0x88, 0x87, 0xa2, 0x46, 0x40, 0x88, - 0x57, 0x99, 0x39, 0x66, 0x1f, 0xa7, 0x14, 0x81, 0x74, 0x1f, 0x65, 0xe7, 0x48, 0xac, 0xfe, 0x2f, - 0xc3, 0xdb, 0x36, 0xba, 0x2a, 0xae, 0x9d, 0x64, 0xba, 0xdc, 0x82, 0x12, 0x1d, 0xec, 0xf6, 0x5d, - 0xc6, 0x8e, 0x56, 0x67, 0x46, 0xac, 0xce, 0xe2, 0x48, 0x2e, 0xc7, 0x06, 0xdf, 0xce, 0x43, 0x3e, - 0x79, 0xc7, 0x36, 0x7e, 0x4e, 0xc8, 0xa4, 0xc9, 0xd7, 0x20, 0xeb, 0x52, 0x63, 0x88, 0x19, 0x19, - 0x0d, 0x97, 0x59, 0x97, 0x3e, 0x10, 0xe7, 0xd4, 0x72, 0x39, 0xf3, 0x65, 0x94, 0xcb, 0xd7, 0x21, - 0x7a, 0x5d, 0x83, 0xdf, 0xa8, 0x9c, 0xbd, 0xaa, 0x2c, 0x16, 0xb4, 0xac, 0x90, 0x6c, 0xef, 0x07, - 0x18, 0xb5, 0x61, 0x0e, 0xc7, 0x75, 0x1c, 0x2d, 0x9b, 0x73, 0x62, 0xb0, 0xdf, 0x9c, 0xfc, 0x10, - 0x63, 0x75, 0xaf, 0x15, 0x70, 0xf2, 0xa8, 0xfe, 0x59, 0x81, 0xb2, 0x86, 0x1d, 0x97, 0x32, 0x1c, - 0xc6, 0xef, 0xa0, 0xe1, 0x9f, 0xa3, 0xef, 0x42, 0xbe, 0x1b, 0x92, 0xbe, 0xd8, 0x4c, 0x98, 0xd2, - 0x57, 0x7e, 0xab, 0xe6, 0xb8, 0xb5, 0x14, 0xa1, 0x77, 0x60, 0x46, 0x50, 0xcb, 0x08, 0x6a, 0xd7, - 0x8e, 0xfd, 0x66, 0x13, 0xa4, 0x84, 0xf9, 0x9d, 0x6f, 0x7f, 0xfc, 0xb8, 0x36, 0xf5, 0x9f, 0xc7, - 0xb5, 0xa9, 0x8f, 0x9e, 0x3f, 0x59, 0xca, 0xdd, 0x3d, 0x72, 0xf8, 0xcb, 0xe7, 0x4f, 0x96, 0x2e, - 0x25, 0x92, 0x99, 0xbc, 0xab, 0x56, 0xa1, 0xf2, 0x72, 0x00, 0x34, 0x20, 0x3e, 0xc5, 0xea, 0x17, - 0x0a, 0x14, 0x3a, 0x01, 0x6b, 0xf9, 0x8c, 0xac, 0x3e, 0xd0, 0xdf, 0x38, 0xae, 0x1a, 0xe4, 0xcc, - 0x21, 0x1d, 0xdd, 0x8d, 0xbe, 0x07, 0xc0, 0x1c, 0xd2, 0xd8, 0xe0, 0x5d, 0x28, 0x06, 0x83, 0x5d, - 0xcf, 0xb5, 0x8c, 0x47, 0x78, 0xdf, 0x78, 0x48, 0x89, 0x2f, 0x07, 0xec, 0x3c, 0xff, 0xf5, 0xb2, - 0x25, 0x54, 0xef, 0xe1, 0xfd, 0x1f, 0xea, 0x9d, 0xb6, 0x56, 0x08, 0x46, 0x47, 0x4a, 0xfc, 0x3b, - 0xef, 0x1c, 0x17, 0x7c, 0x65, 0x2c, 0xf8, 0x44, 0x3c, 0xea, 0x79, 0x40, 0x49, 0x81, 0x8c, 0xfb, - 0xf7, 0x0a, 0xcc, 0x45, 0x5f, 0x84, 0x9d, 0xee, 0x57, 0x11, 0xf8, 0x9d, 0xef, 0x1c, 0xc7, 0xfe, - 0xf2, 0x38, 0xfb, 0x04, 0x2b, 0xf5, 0x02, 0xff, 0xa9, 0x94, 0x90, 0x48, 0xfe, 0x4f, 0x15, 0x28, - 0xe8, 0x98, 0xad, 0x13, 0x9f, 0xbe, 0x87, 0xf7, 0x39, 0xfd, 0x15, 0x38, 0xf7, 0xba, 0xcc, 0x63, - 0xc3, 0x2f, 0xf5, 0xb9, 0x6e, 0x27, 0x03, 0x8e, 0x11, 0x5f, 0x7c, 0xaa, 0xb1, 0x10, 0xf8, 0x53, - 0x25, 0x05, 0x51, 0xa8, 0x4b, 0x1e, 0x64, 0xf5, 0x51, 0x77, 0x57, 0xe1, 0xa2, 0xbe, 0xb9, 0xaa, - 0xdf, 0x33, 0xb6, 0x7f, 0xb4, 0xb5, 0x61, 0xec, 0xb4, 0xf5, 0xad, 0x8d, 0xf5, 0xd6, 0xdd, 0xd6, - 0x46, 0xb3, 0x34, 0x85, 0xae, 0x40, 0x25, 0xa1, 0x6b, 0xb5, 0xf5, 0xed, 0xd5, 0xf6, 0xb6, 0x21, - 0x44, 0x25, 0x05, 0x5d, 0x87, 0x6b, 0x09, 0x6d, 0xbb, 0x13, 0x1b, 0xac, 0xb6, 0x37, 0x3a, 0x3b, - 0xba, 0x34, 0xcb, 0xac, 0xfc, 0x7d, 0x06, 0xa6, 0xef, 0x53, 0x07, 0x3d, 0x56, 0xa0, 0xf4, 0x62, - 0xd7, 0xa0, 0xf4, 0x61, 0x9e, 0x32, 0x1d, 0xaa, 0xcb, 0xaf, 0x69, 0x29, 0x9f, 0xf3, 0xed, 0x8f, - 0xfe, 0xf6, 0xef, 0x4f, 0x32, 0xcb, 0xea, 0x37, 0x1b, 0xe9, 0x7f, 0xf5, 0x69, 0xa4, 0x4d, 0xa0, - 0x8f, 0x15, 0x80, 0xa3, 0x7c, 0x21, 0x35, 0x7d, 0xc0, 0x25, 0x33, 0x5c, 0xbd, 0xf9, 0x4a, 0x1b, - 0x49, 0x68, 0x59, 0x10, 0xba, 0xa9, 0x5e, 0x9f, 0x44, 0x68, 0xbc, 0xf8, 0x38, 0x95, 0xa3, 0x2e, - 0x9b, 0x40, 0x65, 0xac, 0x2f, 0x27, 0x50, 0x49, 0x69, 0xd5, 0x57, 0x52, 0x19, 0x9f, 0x5f, 0xbf, - 0x52, 0x20, 0x97, 0xe8, 0x18, 0xf4, 0xd6, 0x24, 0x9c, 0x44, 0x97, 0x55, 0x17, 0x5f, 0x6d, 0x24, - 0xd9, 0xd4, 0x05, 0x9b, 0x45, 0xf5, 0xc6, 0x31, 0x6c, 0x92, 0x9e, 0xcf, 0xfc, 0x82, 0xff, 0x4e, - 0x58, 0xdb, 0xfc, 0xec, 0x70, 0x41, 0xf9, 0xfc, 0x70, 0x41, 0xf9, 0xd7, 0xe1, 0x82, 0xf2, 0xeb, - 0x67, 0x0b, 0x53, 0x9f, 0x3f, 0x5b, 0x98, 0xfa, 0xc7, 0xb3, 0x85, 0xa9, 0xf7, 0x57, 0x12, 0x5b, - 0x71, 0x23, 0x72, 0xd9, 0xc6, 0xec, 0x03, 0x12, 0x3e, 0x1a, 0x21, 0xec, 0x1d, 0x61, 0x88, 0x2d, - 0xb9, 0x7b, 0x56, 0xfc, 0xb5, 0xec, 0xed, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x5a, 0xd6, 0x15, - 0xcf, 0x24, 0x14, 0x00, 0x00, + 0x15, 0xd7, 0x52, 0xb2, 0x2d, 0x3e, 0x92, 0x22, 0x35, 0xf2, 0x07, 0xcd, 0xba, 0xa2, 0xbd, 0xa9, + 0x6d, 0x59, 0xad, 0x48, 0x58, 0x69, 0x0a, 0xc4, 0x4d, 0x81, 0xea, 0x13, 0x66, 0x23, 0x93, 0xc2, + 0x52, 0x32, 0xd0, 0x14, 0xed, 0x76, 0x45, 0x8e, 0x96, 0x6b, 0x2f, 0x77, 0xb6, 0x3b, 0x43, 0x46, + 0xca, 0xa9, 0xc8, 0x29, 0x28, 0x7a, 0x28, 0x90, 0x53, 0x81, 0x1e, 0x7c, 0x2a, 0x7a, 0xf4, 0x21, + 0x3d, 0x16, 0x6d, 0x6f, 0x39, 0x06, 0x6e, 0x0f, 0x6d, 0x0f, 0x4a, 0x21, 0x17, 0x70, 0xff, 0x88, + 0x16, 0x28, 0xe6, 0x63, 0xa9, 0xa1, 0xbd, 0x94, 0x2d, 0x48, 0xe9, 0x25, 0xf1, 0xbe, 0xf7, 0xe6, + 0xfd, 0x7e, 0xef, 0xcd, 0xfb, 0x18, 0x0a, 0xae, 0xe1, 0x3d, 0xd2, 0x22, 0x11, 0xae, 0x92, 0x10, + 0x47, 0x0e, 0x23, 0x51, 0xb5, 0x7f, 0xb7, 0xca, 0xf6, 0x2a, 0x61, 0x44, 0x18, 0x41, 0x33, 0x4a, + 0x5b, 0x89, 0xb5, 0x95, 0xfe, 0xdd, 0xd2, 0xb4, 0xd3, 0xf5, 0x02, 0x52, 0x15, 0xff, 0x95, 0x76, + 0xa5, 0x2b, 0x2d, 0x42, 0xbb, 0x84, 0x56, 0xbb, 0xd4, 0xe5, 0xe7, 0xbb, 0xd4, 0x55, 0x8a, 0x6f, + 0x28, 0x05, 0x65, 0xce, 0x63, 0x2f, 0xe0, 0xca, 0x1d, 0xcc, 0x9c, 0xbb, 0xf1, 0xb7, 0xb2, 0xba, + 0x2a, 0xad, 0x6c, 0xf1, 0x55, 0x95, 0x1f, 0x4a, 0x75, 0xd1, 0x25, 0x2e, 0x91, 0x72, 0xfe, 0x2f, + 0x25, 0xbd, 0xe6, 0x12, 0xe2, 0xfa, 0xb8, 0xea, 0x84, 0x5e, 0xd5, 0x09, 0x02, 0xc2, 0x1c, 0xe6, + 0x91, 0x40, 0x9d, 0x31, 0x31, 0xe4, 0x56, 0x71, 0xeb, 0xa1, 0xe3, 0xf7, 0xf0, 0xba, 0x87, 0xfd, + 0x36, 0xda, 0x82, 0xf3, 0x4e, 0x97, 0xf4, 0x02, 0x56, 0x34, 0xae, 0x1b, 0x73, 0xe9, 0xe5, 0xf7, + 0x3e, 0x3f, 0x28, 0x8f, 0xfd, 0xe3, 0xa0, 0x7c, 0xcb, 0xf5, 0x58, 0xa7, 0xb7, 0x53, 0x69, 0x91, + 0xae, 0x42, 0x55, 0xff, 0x5b, 0xa0, 0xed, 0xc7, 0x55, 0xb6, 0x1f, 0x62, 0x5a, 0x59, 0xc5, 0xad, + 0x67, 0x9f, 0x2d, 0x80, 0x22, 0xb5, 0x8a, 0x5b, 0x96, 0xf2, 0x65, 0xfe, 0x27, 0x05, 0x97, 0x1a, + 0x2a, 0x2f, 0x8d, 0x90, 0xe1, 0xf6, 0x76, 0x73, 0x55, 0x80, 0xa2, 0x08, 0xa6, 0x28, 0xf6, 0x77, + 0xed, 0x1e, 0x6d, 0xdb, 0x7d, 0x2e, 0x51, 0xb8, 0x1b, 0x27, 0xc3, 0x3d, 0x3c, 0x28, 0x67, 0x9b, + 0xd8, 0xdf, 0x8d, 0xfd, 0xbe, 0xc4, 0x23, 0xcb, 0x31, 0xb6, 0x69, 0x5b, 0x62, 0xf6, 0x20, 0xcf, + 0x08, 0x73, 0x7c, 0x0d, 0x34, 0x25, 0x40, 0x1f, 0x9c, 0x18, 0x34, 0xb7, 0xc5, 0x1d, 0x8d, 0x40, + 0xcd, 0x09, 0x94, 0x01, 0xec, 0x1e, 0x14, 0x9c, 0x16, 0xf3, 0xfa, 0x58, 0xc3, 0x1d, 0x17, 0xb8, + 0xf5, 0x13, 0xe3, 0x4e, 0x2d, 0x09, 0x4f, 0x23, 0x80, 0xa7, 0x24, 0x4e, 0x8c, 0x6c, 0xfe, 0xde, + 0x80, 0x99, 0x38, 0xfd, 0x0f, 0x09, 0xf3, 0x02, 0x77, 0x93, 0x7c, 0x88, 0x23, 0xf4, 0x3d, 0xc8, + 0xc5, 0xd5, 0x6a, 0x3b, 0xed, 0x76, 0xa4, 0x72, 0x5f, 0x7c, 0xf6, 0xd9, 0xc2, 0x45, 0xe5, 0x6e, + 0xa9, 0xdd, 0x8e, 0x30, 0xa5, 0x4d, 0x16, 0x79, 0x81, 0x6b, 0x65, 0x63, 0x73, 0x2e, 0x46, 0x36, + 0x64, 0xfb, 0xc2, 0x9b, 0x1d, 0x72, 0x77, 0x2a, 0x89, 0xa7, 0xab, 0x98, 0x4c, 0xff, 0x88, 0x9f, + 0xf9, 0x65, 0x0a, 0x66, 0x34, 0xbe, 0xcd, 0xc0, 0x09, 0x69, 0x87, 0x30, 0xf4, 0x08, 0x90, 0xbc, + 0xc0, 0x21, 0xf8, 0xb3, 0x28, 0xd8, 0x82, 0xf0, 0xab, 0xe7, 0xe8, 0x27, 0x70, 0x79, 0x90, 0x23, + 0x1d, 0x8e, 0x16, 0x53, 0xd7, 0xc7, 0xe7, 0x32, 0x8b, 0x73, 0x95, 0x84, 0xc6, 0xaf, 0x24, 0x64, + 0xdb, 0xba, 0x48, 0x5e, 0x15, 0x52, 0x54, 0x81, 0x19, 0xdf, 0xa1, 0xcc, 0x6e, 0x75, 0x9c, 0xc0, + 0xc5, 0x6d, 0xbb, 0x83, 0x3d, 0xb7, 0xc3, 0x44, 0x61, 0x8c, 0x5b, 0xd3, 0x5c, 0xb5, 0x22, 0x35, + 0xf7, 0x85, 0x02, 0xdd, 0x81, 0x02, 0x0e, 0x49, 0xab, 0x63, 0x7b, 0x6d, 0x1c, 0x30, 0x6f, 0xd7, + 0xc3, 0x51, 0x71, 0x82, 0x47, 0x6e, 0xe5, 0x85, 0xbc, 0x36, 0x10, 0xa3, 0x1b, 0x90, 0x95, 0xa6, + 0x41, 0xaf, 0xbb, 0x83, 0xa3, 0xe2, 0x39, 0xe1, 0x33, 0x23, 0x64, 0x75, 0x21, 0x32, 0x7f, 0x0a, + 0x53, 0x71, 0x56, 0xef, 0x63, 0x3f, 0xc4, 0xd1, 0x28, 0x3e, 0xc6, 0x28, 0x3e, 0xb3, 0x90, 0xe9, + 0x38, 0xd4, 0x26, 0x21, 0xb3, 0x49, 0x8f, 0x89, 0x1a, 0x98, 0xb4, 0xd2, 0x1d, 0x87, 0x36, 0x42, + 0xd6, 0xe8, 0x31, 0x73, 0x1f, 0x4a, 0x2b, 0xbe, 0x87, 0x03, 0x7e, 0xcc, 0x0b, 0xd6, 0x9c, 0x28, + 0xf0, 0x02, 0x97, 0x97, 0xcf, 0x86, 0x47, 0x19, 0xfa, 0x11, 0x4c, 0x63, 0x29, 0xb2, 0xbd, 0x60, + 0x97, 0xd8, 0xbe, 0x47, 0x39, 0x16, 0x4f, 0x6c, 0x35, 0x31, 0xb1, 0xc9, 0xbe, 0x6a, 0xc1, 0x2e, + 0xb1, 0xf2, 0xca, 0x13, 0xff, 0xe0, 0xce, 0xcd, 0x5f, 0x1b, 0xa3, 0xb0, 0xb9, 0x09, 0xfa, 0x3e, + 0x20, 0xff, 0x23, 0xbb, 0x25, 0x0c, 0x78, 0xb8, 0x5e, 0x60, 0x7b, 0x6d, 0x11, 0xe8, 0xc4, 0xf2, + 0xcc, 0xe1, 0x41, 0x39, 0xbf, 0xf1, 0x91, 0x76, 0xba, 0xb6, 0x6a, 0xe5, 0xfd, 0x21, 0x41, 0x1b, + 0xbd, 0x0b, 0x57, 0x87, 0x8e, 0xc7, 0xa1, 0x88, 0x5e, 0x12, 0xdd, 0x60, 0x5d, 0x6e, 0x25, 0x12, + 0x30, 0xff, 0x9c, 0x82, 0x6c, 0x5c, 0x24, 0x82, 0xcd, 0x5b, 0x90, 0x53, 0xc7, 0xa9, 0xd6, 0x8b, + 0x56, 0x36, 0x16, 0x8a, 0x8e, 0xbb, 0x01, 0x59, 0x27, 0x0c, 0x23, 0xd2, 0xc7, 0x3a, 0x46, 0x46, + 0xc9, 0x84, 0xc9, 0xb7, 0x00, 0x0d, 0xea, 0xb5, 0x8b, 0x99, 0x23, 0xf2, 0x2a, 0xe7, 0x8c, 0x55, + 0x88, 0x35, 0x0f, 0x30, 0x73, 0x04, 0xaa, 0x0f, 0xa5, 0xa4, 0x08, 0x14, 0x05, 0x5e, 0x57, 0x27, + 0xbb, 0x08, 0x9e, 0x77, 0xeb, 0xca, 0xab, 0x31, 0x4b, 0xfa, 0x0f, 0x00, 0x5a, 0xa4, 0xdb, 0xf5, + 0x28, 0xf5, 0x48, 0x20, 0xca, 0x31, 0xb3, 0x68, 0x56, 0x54, 0xfb, 0xc5, 0x7b, 0x4e, 0xed, 0xbd, + 0xca, 0xca, 0xc0, 0x72, 0x39, 0xcd, 0x7b, 0xfa, 0x77, 0x2f, 0x9e, 0xce, 0x1b, 0x96, 0xe6, 0xc0, + 0xfc, 0x8d, 0x01, 0x69, 0xb1, 0x4d, 0x44, 0x28, 0x37, 0x61, 0x8a, 0xfa, 0x0e, 0xed, 0xd8, 0x2d, + 0x12, 0xb0, 0xc8, 0x69, 0xa9, 0x0d, 0x66, 0xe5, 0x84, 0x74, 0x45, 0x09, 0xd1, 0x2d, 0xc8, 0x13, + 0x7e, 0xc6, 0xf6, 0x82, 0xb8, 0xb6, 0x79, 0x16, 0x27, 0xac, 0x1c, 0x91, 0xae, 0x54, 0x5d, 0xcf, + 0x41, 0x41, 0xda, 0x91, 0x1e, 0xd3, 0x9b, 0x72, 0xc2, 0x9a, 0x12, 0xf2, 0x46, 0x8f, 0x29, 0xcb, + 0xcb, 0x70, 0xfe, 0x91, 0xe3, 0xf9, 0xb8, 0x2d, 0xf2, 0x35, 0x69, 0xa9, 0x2f, 0xf3, 0x0f, 0x06, + 0x4c, 0x2b, 0x7a, 0x4b, 0x94, 0x62, 0xd6, 0x64, 0x0e, 0xc3, 0xa7, 0x5a, 0xb0, 0xb5, 0x80, 0x69, + 0xf3, 0xaa, 0x16, 0xb0, 0x78, 0xc1, 0x22, 0x0b, 0xce, 0xe9, 0x8b, 0xec, 0x74, 0x43, 0x50, 0xba, + 0x32, 0xff, 0x64, 0xc0, 0xa5, 0x26, 0xcf, 0xdd, 0x7a, 0x44, 0xba, 0xdb, 0x41, 0x1b, 0xfb, 0xd8, + 0x15, 0x8f, 0x07, 0x74, 0x07, 0xd2, 0xfc, 0xb6, 0x70, 0x14, 0x37, 0x4c, 0x7a, 0x39, 0x7b, 0x78, + 0x50, 0x9e, 0x6c, 0x0a, 0x61, 0x6d, 0xd5, 0x9a, 0x94, 0xea, 0x5a, 0x1b, 0xdd, 0x82, 0x49, 0x87, + 0x07, 0xcf, 0x2d, 0x25, 0xb7, 0xcc, 0xe1, 0x41, 0xf9, 0x82, 0x48, 0x48, 0x6d, 0xd5, 0xba, 0x20, + 0x94, 0x35, 0xfd, 0xdd, 0x31, 0x7e, 0x76, 0x69, 0x31, 0x3f, 0x35, 0x60, 0x66, 0x10, 0x82, 0xc0, + 0xa4, 0x9b, 0x84, 0xf8, 0x43, 0xac, 0x8c, 0x37, 0x62, 0x95, 0x3a, 0x43, 0x56, 0x7f, 0x1f, 0x07, + 0x24, 0x58, 0xad, 0xed, 0xe1, 0x56, 0x8f, 0x67, 0x54, 0x14, 0xb0, 0x0b, 0x05, 0x59, 0xc0, 0x61, + 0x44, 0x42, 0x12, 0x71, 0xf9, 0x99, 0xec, 0xb4, 0xbc, 0xf0, 0xba, 0x39, 0x70, 0x8a, 0x7e, 0x0c, + 0x19, 0x09, 0x74, 0x76, 0x25, 0x03, 0xc2, 0xa1, 0x7c, 0xe7, 0x38, 0x30, 0x23, 0xdd, 0xf7, 0xb4, + 0x9a, 0xa1, 0xc5, 0x71, 0x31, 0xd5, 0xe7, 0x13, 0x87, 0x49, 0x62, 0x99, 0x2d, 0x4f, 0x70, 0x4a, + 0x16, 0x12, 0xce, 0x74, 0x05, 0x45, 0x1f, 0xc0, 0xb4, 0x84, 0x10, 0x17, 0x45, 0xed, 0x90, 0x10, + 0xbf, 0x38, 0x71, 0xcc, 0x3e, 0x4e, 0x28, 0x02, 0xe5, 0x5e, 0x66, 0x47, 0xab, 0x8d, 0xf7, 0xa0, + 0xa4, 0x13, 0xb7, 0x77, 0x3d, 0x9f, 0xe1, 0x28, 0x1e, 0x01, 0x72, 0x87, 0x16, 0x75, 0x8b, 0x75, + 0x61, 0x20, 0x87, 0x81, 0xf9, 0xdf, 0x14, 0x6f, 0x7a, 0x09, 0x2c, 0x40, 0x4f, 0x32, 0x9b, 0xee, + 0x40, 0x81, 0xf6, 0x76, 0xba, 0x1e, 0x63, 0x47, 0x8b, 0x37, 0x25, 0x00, 0xf3, 0x03, 0xb9, 0x1a, + 0x3a, 0x7c, 0xb7, 0xf7, 0xf9, 0xdc, 0x1e, 0x7a, 0x2f, 0x64, 0x84, 0x4c, 0x99, 0x7c, 0x0d, 0xd2, + 0x1e, 0xb5, 0xfb, 0x98, 0x91, 0xc1, 0x68, 0x9a, 0xf4, 0xe8, 0x43, 0xf1, 0x9d, 0x58, 0x6c, 0xe7, + 0xbe, 0x8a, 0x62, 0xfb, 0x3a, 0xc8, 0xda, 0xb0, 0xf9, 0x89, 0xe2, 0xf9, 0xeb, 0xc6, 0x5c, 0xce, + 0x4a, 0x0b, 0xc9, 0xd6, 0x7e, 0x88, 0x51, 0x1d, 0xa6, 0x70, 0xdc, 0x05, 0x72, 0x55, 0x5d, 0x10, + 0x6b, 0xe1, 0xf6, 0xe8, 0x6b, 0x1c, 0xea, 0x1a, 0x2b, 0x87, 0xf5, 0x4f, 0xf3, 0x8f, 0x06, 0xcc, + 0x58, 0xd8, 0xf5, 0x28, 0xc3, 0x51, 0x7c, 0x0f, 0x16, 0xfe, 0x19, 0xfa, 0x2e, 0x64, 0x77, 0x23, + 0xd2, 0x15, 0x7b, 0x0d, 0x53, 0xfa, 0xda, 0x97, 0x6e, 0x86, 0x5b, 0x2b, 0x11, 0x7a, 0x07, 0x26, + 0x04, 0xb5, 0x94, 0xa0, 0x76, 0xe3, 0xd8, 0x17, 0x9f, 0x20, 0x25, 0xcc, 0xef, 0x7d, 0xfb, 0x93, + 0x27, 0xe5, 0xb1, 0x7f, 0x3f, 0x29, 0x8f, 0x7d, 0xfc, 0xe2, 0xe9, 0x7c, 0x66, 0xfd, 0xc8, 0xe1, + 0x2f, 0x5e, 0x3c, 0x9d, 0xbf, 0xa2, 0x25, 0x53, 0x3f, 0x6b, 0x96, 0xa0, 0xf8, 0x6a, 0x00, 0x34, + 0x24, 0x01, 0xc5, 0xe6, 0x97, 0x06, 0xe4, 0x1a, 0x21, 0xab, 0x05, 0x8c, 0x2c, 0x3d, 0x6c, 0x9e, + 0x3a, 0xae, 0x32, 0x64, 0x9c, 0x3e, 0x1d, 0x9c, 0x95, 0xaf, 0x09, 0x70, 0xfa, 0x34, 0x36, 0x78, + 0x17, 0xf2, 0x61, 0x6f, 0xc7, 0xf7, 0x5a, 0xf6, 0x63, 0xbc, 0x6f, 0x3f, 0xa2, 0x24, 0x50, 0xe3, + 0x79, 0x9a, 0xff, 0xf6, 0xd9, 0x14, 0xaa, 0xf7, 0xf1, 0xfe, 0x0f, 0x9a, 0x8d, 0xba, 0x95, 0x0b, + 0x07, 0x9f, 0x94, 0x04, 0xf7, 0xde, 0x39, 0x2e, 0xf8, 0xe2, 0x50, 0xf0, 0x5a, 0x3c, 0xe6, 0x45, + 0x40, 0xba, 0x40, 0xc5, 0xfd, 0x5b, 0x03, 0xa6, 0xe4, 0x7b, 0xb2, 0xb1, 0xfb, 0xff, 0x08, 0xfc, + 0xde, 0x77, 0x8e, 0x63, 0x7f, 0x75, 0x98, 0xbd, 0xc6, 0xca, 0xbc, 0xc4, 0x7f, 0x68, 0x69, 0x12, + 0xc5, 0xff, 0x99, 0x01, 0xb9, 0x26, 0x66, 0x2b, 0x24, 0xa0, 0xef, 0xe3, 0x7d, 0x4e, 0x7f, 0x11, + 0x2e, 0xbc, 0x29, 0xf3, 0xd8, 0xf0, 0x2b, 0xbd, 0xae, 0xbb, 0x7a, 0xc0, 0x31, 0xe2, 0xcb, 0x57, + 0x35, 0x14, 0x02, 0xbf, 0x2a, 0x5d, 0x20, 0x43, 0x9d, 0xf7, 0x21, 0xdd, 0x1c, 0x74, 0x77, 0x09, + 0x2e, 0x37, 0x37, 0x96, 0x9a, 0xf7, 0xed, 0xad, 0x1f, 0x6e, 0xae, 0xd9, 0xdb, 0xf5, 0xe6, 0xe6, + 0xda, 0x4a, 0x6d, 0xbd, 0xb6, 0xb6, 0x5a, 0x18, 0x43, 0xd7, 0xa0, 0xa8, 0xe9, 0x6a, 0xf5, 0xe6, + 0xd6, 0x52, 0x7d, 0xcb, 0x16, 0xa2, 0x82, 0x81, 0x6e, 0xc2, 0x0d, 0x4d, 0x5b, 0x6f, 0xc4, 0x06, + 0x4b, 0xf5, 0xb5, 0xc6, 0x76, 0x53, 0x99, 0xa5, 0x16, 0xff, 0x3a, 0x01, 0xe3, 0x0f, 0xa8, 0x8b, + 0x9e, 0x18, 0x50, 0x78, 0xb9, 0x6b, 0x50, 0xf2, 0x2a, 0x48, 0x98, 0x0e, 0xa5, 0x85, 0x37, 0xb4, + 0x54, 0xd7, 0xf9, 0xf6, 0xc7, 0x7f, 0xf9, 0xd7, 0xa7, 0xa9, 0x05, 0xf3, 0x9b, 0xd5, 0xe4, 0x3f, + 0x09, 0x55, 0x93, 0x26, 0xd0, 0x27, 0x06, 0xc0, 0x51, 0xbe, 0x90, 0x99, 0x3c, 0xe0, 0xf4, 0x0c, + 0x97, 0x6e, 0xbf, 0xd6, 0x46, 0x11, 0x5a, 0x10, 0x84, 0x6e, 0x9b, 0x37, 0x47, 0x11, 0x1a, 0x2e, + 0x3e, 0x4e, 0xe5, 0xa8, 0xcb, 0x46, 0x50, 0x19, 0xea, 0xcb, 0x11, 0x54, 0x12, 0x5a, 0xf5, 0xb5, + 0x54, 0x86, 0xe7, 0xd7, 0x2f, 0x0d, 0xc8, 0x68, 0x1d, 0x83, 0xde, 0x1a, 0x85, 0xa3, 0x75, 0x59, + 0x69, 0xee, 0xf5, 0x46, 0x8a, 0x4d, 0x45, 0xb0, 0x99, 0x33, 0x6f, 0x1d, 0xc3, 0x46, 0xf7, 0x7c, + 0xee, 0xe7, 0xfc, 0x57, 0xc6, 0xf2, 0xc6, 0xe7, 0x87, 0xb3, 0xc6, 0x17, 0x87, 0xb3, 0xc6, 0x3f, + 0x0f, 0x67, 0x8d, 0x5f, 0x3d, 0x9f, 0x1d, 0xfb, 0xe2, 0xf9, 0xec, 0xd8, 0xdf, 0x9e, 0xcf, 0x8e, + 0x7d, 0xb0, 0xa8, 0x6d, 0xc5, 0x35, 0xe9, 0xb2, 0x8e, 0xd9, 0x87, 0x24, 0x7a, 0x3c, 0x40, 0xd8, + 0x3b, 0xc2, 0x10, 0x5b, 0x72, 0xe7, 0xbc, 0xf8, 0x5b, 0xdb, 0xdb, 0xff, 0x0b, 0x00, 0x00, 0xff, + 0xff, 0x9d, 0x68, 0xf9, 0xb8, 0x41, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2129,6 +2137,11 @@ func (m *SlashExecutionInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.UndelegationFilterHeight != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.UndelegationFilterHeight)) + i-- + dAtA[i] = 0x28 + } if len(m.SlashAssetsPool) > 0 { for iNdEx := len(m.SlashAssetsPool) - 1; iNdEx >= 0; iNdEx-- { { @@ -2759,6 +2772,9 @@ func (m *SlashExecutionInfo) Size() (n int) { n += 1 + l + sovTx(uint64(l)) } } + if m.UndelegationFilterHeight != 0 { + n += 1 + sovTx(uint64(m.UndelegationFilterHeight)) + } return n } @@ -4627,6 +4643,25 @@ func (m *SlashExecutionInfo) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field UndelegationFilterHeight", wireType) + } + m.UndelegationFilterHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.UndelegationFilterHeight |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) diff --git a/x/operator/types/utils.go b/x/operator/types/utils.go index 81408de8b..c940bafec 100644 --- a/x/operator/types/utils.go +++ b/x/operator/types/utils.go @@ -27,10 +27,9 @@ func ChainIDWithLenKey(chainID string) []byte { } func GetSpecifiedVotingPower(operator string, votingPowerSet []*OperatorVotingPower) *OperatorVotingPower { - for idx := range votingPowerSet { - tmpVp := votingPowerSet[idx] - if tmpVp.OperatorAddr == operator { - return tmpVp + for _, vp := range votingPowerSet { + if vp.OperatorAddr == operator { + return vp } } return nil From 0338fe6fbe5ce4e0beba83c8b058039fdc49bcd3 Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Wed, 6 Nov 2024 16:55:42 +0800 Subject: [PATCH 10/12] rebase to develop and fix the conflict --- precompiles/avs/avs_test.go | 8 ++++---- precompiles/avs/query_test.go | 7 +++++-- x/avs/keeper/avs_test.go | 7 ++++--- x/operator/keeper/grpc_query.go | 2 ++ x/operator/keeper/impl_epoch_hook.go | 2 +- x/operator/keeper/opt_test.go | 3 +-- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/precompiles/avs/avs_test.go b/precompiles/avs/avs_test.go index e634f59c3..e3b8cd227 100644 --- a/precompiles/avs/avs_test.go +++ b/precompiles/avs/avs_test.go @@ -1,13 +1,14 @@ package avs_test import ( - "cosmossdk.io/math" - assetstypes "github.com/ExocoreNetwork/exocore/x/assets/types" - "github.com/ExocoreNetwork/exocore/x/avs/types" "math/big" "strconv" "time" + "cosmossdk.io/math" + assetstypes "github.com/ExocoreNetwork/exocore/x/assets/types" + "github.com/ExocoreNetwork/exocore/x/avs/types" + sdkmath "cosmossdk.io/math" operatorKeeper "github.com/ExocoreNetwork/exocore/x/operator/keeper" @@ -650,7 +651,6 @@ func (suite *AVSManagerPrecompileSuite) TestRegisterOperatorToAVS() { } func (suite *AVSManagerPrecompileSuite) TestDeregisterOperatorFromAVS() { - // from := s.Address operatorAddress := sdk.AccAddress(suite.Address.Bytes()) assetID := suite.AssetIDs diff --git a/precompiles/avs/query_test.go b/precompiles/avs/query_test.go index 4cf9206db..8041aef3c 100644 --- a/precompiles/avs/query_test.go +++ b/precompiles/avs/query_test.go @@ -2,11 +2,12 @@ package avs_test import ( "fmt" + "math/big" + "time" + epochstypes "github.com/ExocoreNetwork/exocore/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/prysmaticlabs/prysm/v4/crypto/bls/blst" - "math/big" - "time" utiltx "github.com/ExocoreNetwork/exocore/testutil/tx" @@ -494,6 +495,7 @@ func (suite *AVSManagerPrecompileSuite) TestIsoperator() { }) } } + func (suite *AVSManagerPrecompileSuite) TestGetTaskInfo() { method := suite.precompile.Methods[avsManagerPrecompile.MethodGetTaskInfo] taskAddress := "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48" @@ -553,6 +555,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetTaskInfo() { }) } } + func (suite *AVSManagerPrecompileSuite) TestGetCurrentEpoch() { method := suite.precompile.Methods[avsManagerPrecompile.MethodGetCurrentEpoch] testCases := []avsTestCases{ diff --git a/x/avs/keeper/avs_test.go b/x/avs/keeper/avs_test.go index 3ab1ed807..1b7dddbca 100644 --- a/x/avs/keeper/avs_test.go +++ b/x/avs/keeper/avs_test.go @@ -1,13 +1,14 @@ package keeper_test import ( - "cosmossdk.io/math" - assetstypes "github.com/ExocoreNetwork/exocore/x/assets/types" - "github.com/ethereum/go-ethereum/common" "math/big" "strings" "time" + "cosmossdk.io/math" + assetstypes "github.com/ExocoreNetwork/exocore/x/assets/types" + "github.com/ethereum/go-ethereum/common" + "github.com/ExocoreNetwork/exocore/x/avs/types" avstypes "github.com/ExocoreNetwork/exocore/x/avs/types" delegationtypes "github.com/ExocoreNetwork/exocore/x/delegation/types" diff --git a/x/operator/keeper/grpc_query.go b/x/operator/keeper/grpc_query.go index ec0855378..fcaee14c5 100644 --- a/x/operator/keeper/grpc_query.go +++ b/x/operator/keeper/grpc_query.go @@ -10,6 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" + assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" + keytypes "github.com/ExocoreNetwork/exocore/types/keys" assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" avstypes "github.com/ExocoreNetwork/exocore/x/avs/types" diff --git a/x/operator/keeper/impl_epoch_hook.go b/x/operator/keeper/impl_epoch_hook.go index bce55a5f1..c25279ee4 100644 --- a/x/operator/keeper/impl_epoch_hook.go +++ b/x/operator/keeper/impl_epoch_hook.go @@ -30,7 +30,7 @@ func (wrapper EpochsHooksWrapper) AfterEpochEnd( avsList := wrapper.keeper.avsKeeper.GetEpochEndAVSs(ctx, epochIdentifier, epochNumber) for _, avs := range avsList { // avs address is checksummed hex, we should convert it to lowercase - err := wrapper.keeper.UpdateVotingPower(ctx, avs) + err := wrapper.keeper.UpdateVotingPower(ctx, avs, epochIdentifier, epochNumber, false) if err != nil { ctx.Logger().Error("Failed to update voting power", "avs", avs, "error", err) // Handle the error gracefully, continue to the next AVS diff --git a/x/operator/keeper/opt_test.go b/x/operator/keeper/opt_test.go index 217865094..af37a0c33 100644 --- a/x/operator/keeper/opt_test.go +++ b/x/operator/keeper/opt_test.go @@ -9,7 +9,6 @@ import ( sdkmath "cosmossdk.io/math" assetskeeper "github.com/ExocoreNetwork/exocore/x/assets/keeper" assetstypes "github.com/ExocoreNetwork/exocore/x/assets/types" - avskeeper "github.com/ExocoreNetwork/exocore/x/avs/keeper" avstypes "github.com/ExocoreNetwork/exocore/x/avs/types" delegationtype "github.com/ExocoreNetwork/exocore/x/delegation/types" operatorKeeper "github.com/ExocoreNetwork/exocore/x/operator/keeper" @@ -96,7 +95,7 @@ func (suite *OperatorTestSuite) prepare() { func (suite *OperatorTestSuite) prepareAvs(assetIDs []string, epochIdentifier string) { suite.avsAddr = common.BytesToAddress([]byte("avsTestAddr")).String() err := suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{ - Action: avskeeper.RegisterAction, + Action: avstypes.RegisterAction, EpochIdentifier: epochIdentifier, AvsAddress: common.HexToAddress(suite.avsAddr), AssetID: assetIDs, From 35ad190bfaeef8b36cd5a83014333fa105ffe6fa Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Sun, 10 Nov 2024 22:50:06 +0800 Subject: [PATCH 11/12] 1. use `ZeroInt` and `LegacyZeroDec` to replace `NewInt(0)` and `LegacyNewDec(0)` 2. refine the command format and description of voting power snapshot --- app/ante/cosmos/min_price_test.go | 4 +- app/ante/evm/fees_test.go | 2 +- precompiles/assets/tx.go | 2 +- precompiles/avs/avs_test.go | 2 +- precompiles/avs/query_test.go | 10 +-- precompiles/avs/utils_test.go | 4 +- proto/exocore/operator/v1/tx.proto | 7 +- types/int.go | 2 +- x/avs/keeper/avs.go | 2 +- x/avs/keeper/impl_epoch_hook.go | 2 +- x/avs/keeper/submit_task_test.go | 2 +- x/avs/keeper/task_test.go | 2 +- x/delegation/keeper/delegation_op_test.go | 68 +++++++++---------- x/delegation/keeper/delegation_state.go | 8 +-- x/delegation/keeper/share.go | 6 +- x/delegation/keeper/share_test.go | 56 +++++++-------- .../update_native_restaking_balance_test.go | 4 +- x/delegation/types/expected_keepers.go | 2 +- x/exomint/keeper/impl_epochs_hooks_test.go | 2 +- x/exomint/types/params_test.go | 6 +- x/operator/client/cli/query.go | 25 ++++--- x/operator/keeper/abci.go | 8 +-- x/operator/keeper/operator_slash_state.go | 4 +- x/operator/keeper/opt_test.go | 4 +- x/operator/keeper/slash.go | 12 ++-- x/operator/keeper/slash_test.go | 2 +- x/operator/keeper/usd_value.go | 34 +++++----- x/operator/keeper/usd_value_test.go | 4 +- x/operator/types/genesis.go | 6 +- x/oracle/keeper/native_token.go | 2 +- x/reward/keeper/claim_reward_test.go | 2 +- x/slash/keeper/execute_slash_test.go | 4 +- 32 files changed, 154 insertions(+), 146 deletions(-) diff --git a/app/ante/cosmos/min_price_test.go b/app/ante/cosmos/min_price_test.go index 500596d66..438861f96 100644 --- a/app/ante/cosmos/min_price_test.go +++ b/app/ante/cosmos/min_price_test.go @@ -51,7 +51,7 @@ func (suite *AnteTestSuite) TestMinGasPriceDecorator() { err := suite.app.FeeMarketKeeper.SetParams(suite.ctx, params) suite.Require().NoError(err) - txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.NewInt(0), denom, &testMsg) + txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.ZeroInt(), denom, &testMsg) return txBuilder.GetTx() }, true, @@ -96,7 +96,7 @@ func (suite *AnteTestSuite) TestMinGasPriceDecorator() { err := suite.app.FeeMarketKeeper.SetParams(suite.ctx, params) suite.Require().NoError(err) - txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.NewInt(0), denom, &testMsg) + txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.ZeroInt(), denom, &testMsg) return txBuilder.GetTx() }, false, diff --git a/app/ante/evm/fees_test.go b/app/ante/evm/fees_test.go index 540f9a13c..cf998e47f 100644 --- a/app/ante/evm/fees_test.go +++ b/app/ante/evm/fees_test.go @@ -60,7 +60,7 @@ func (suite *AnteTestSuite) TestEthMinGasPriceDecorator() { ToAddress: "evmos1dx67l23hz9l0k9hcher8xz04uj7wf3yu26l2yn", Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(10), Denom: denom}}, } - txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.NewInt(0), denom, &testMsg) + txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.ZeroInt(), denom, &testMsg) return txBuilder.GetTx() }, false, diff --git a/precompiles/assets/tx.go b/precompiles/assets/tx.go index 622577837..d86075636 100644 --- a/precompiles/assets/tx.go +++ b/precompiles/assets/tx.go @@ -156,7 +156,7 @@ func (p Precompile) RegisterToken( stakingAsset := &assetstypes.StakingAssetInfo{ AssetBasicInfo: asset, - StakingTotalAmount: sdkmath.NewInt(0), + StakingTotalAmount: sdkmath.ZeroInt(), } if err := p.assetsKeeper.RegisterNewTokenAndSetTokenFeeder(ctx, &oInfo); err != nil { diff --git a/precompiles/avs/avs_test.go b/precompiles/avs/avs_test.go index e3b8cd227..939315d19 100644 --- a/precompiles/avs/avs_test.go +++ b/precompiles/avs/avs_test.go @@ -835,7 +835,7 @@ func (suite *AVSManagerPrecompileSuite) TestRunRegTaskInfo() { suite.Ctx, &assetstypes.StakingAssetInfo{ AssetBasicInfo: usdcClientChainAsset, - StakingTotalAmount: sdkmath.NewInt(0), + StakingTotalAmount: sdkmath.ZeroInt(), }, ) suite.NoError(err) diff --git a/precompiles/avs/query_test.go b/precompiles/avs/query_test.go index 8041aef3c..b712b0831 100644 --- a/precompiles/avs/query_test.go +++ b/precompiles/avs/query_test.go @@ -145,7 +145,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetOptedInOperatorAccAddrs() { func (suite *AVSManagerPrecompileSuite) TestAVSUSDValue() { method := s.precompile.Methods[avsManagerPrecompile.MethodGetAVSUSDValue] - expectedUSDvalue := sdkmath.LegacyNewDec(0) + expectedUSDvalue := sdkmath.LegacyZeroDec() setUp := func() { suite.prepare() @@ -163,7 +163,7 @@ func (suite *AVSManagerPrecompileSuite) TestAVSUSDValue() { suite.Ctx, &assetstype.StakingAssetInfo{ AssetBasicInfo: usdcClientChainAsset, - StakingTotalAmount: sdkmath.NewInt(0), + StakingTotalAmount: sdkmath.ZeroInt(), }, ) suite.NoError(err) @@ -233,7 +233,7 @@ func (suite *AVSManagerPrecompileSuite) TestAVSUSDValue() { func (suite *AVSManagerPrecompileSuite) TestGetOperatorOptedUSDValue() { method := s.precompile.Methods[avsManagerPrecompile.MethodGetOperatorOptedUSDValue] - expectedUSDvalue := sdkmath.LegacyNewDec(0) + expectedUSDvalue := sdkmath.LegacyZeroDec() setUp := func() { suite.prepare() @@ -251,7 +251,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetOperatorOptedUSDValue() { suite.Ctx, &assetstype.StakingAssetInfo{ AssetBasicInfo: usdcClientChainAsset, - StakingTotalAmount: sdkmath.NewInt(0), + StakingTotalAmount: sdkmath.ZeroInt(), }, ) suite.NoError(err) @@ -509,7 +509,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetTaskInfo() { TaskResponsePeriod: 10, StartingEpoch: 5, TaskStatisticalPeriod: 60, - TaskTotalPower: sdk.Dec(sdkmath.NewInt(0)), + TaskTotalPower: sdk.Dec(sdkmath.ZeroInt()), } err := suite.App.AVSManagerKeeper.SetTaskInfo(suite.Ctx, info) suite.NoError(err) diff --git a/precompiles/avs/utils_test.go b/precompiles/avs/utils_test.go index 5f52298d8..161316d81 100644 --- a/precompiles/avs/utils_test.go +++ b/precompiles/avs/utils_test.go @@ -202,8 +202,8 @@ func (suite *AVSManagerPrecompileSuite) TestOptOut() { OptedInHeight: uint64(optInHeight), OptedOutHeight: uint64(suite.Ctx.BlockHeight()), }, - AVSTotalShare: sdkmath.LegacyNewDec(0), - AVSOperatorShare: sdkmath.LegacyNewDec(0), + AVSTotalShare: sdkmath.LegacyZeroDec(), + AVSOperatorShare: sdkmath.LegacyZeroDec(), AssetState: nil, OperatorShare: sdkmath.LegacyDec{}, StakerShare: sdkmath.LegacyDec{}, diff --git a/proto/exocore/operator/v1/tx.proto b/proto/exocore/operator/v1/tx.proto index cbb2b9fa1..2d1c7c26a 100644 --- a/proto/exocore/operator/v1/tx.proto +++ b/proto/exocore/operator/v1/tx.proto @@ -61,7 +61,10 @@ message OperatorVotingPower { ]; } -// VotingPowerSnapshot is used to record the historical voting power for AVSs +// VotingPowerSnapshot records historical voting power for AVSs at specific epochs +// or after slashing events.These snapshots are created at the end of each epoch and +// when slashing occurs, enabling historical queries of operator voting power at +// specific points in time. message VotingPowerSnapshot { // total_voting_power is the total voting power of specified AVS string total_voting_power = 1 @@ -74,7 +77,7 @@ message VotingPowerSnapshot { // for the specified AVS repeated OperatorVotingPower operator_voting_powers = 2; // last_changed_height is used to indicate the height of most recent change when - // the voting_power_set is nil, which can help to fall back to the correct epoch height. + // the operator_voting_powers is nil, which can help to fall back to the correct epoch height. int64 last_changed_height = 3; // epoch_identifier record the epoch info string epoch_identifier = 4; diff --git a/types/int.go b/types/int.go index 4a736d3ef..1b1f78b0c 100644 --- a/types/int.go +++ b/types/int.go @@ -24,7 +24,7 @@ func SafeInt64(value uint64) (int64, error) { // SafeNewIntFromBigInt constructs Int from big.Int, return error if more than 256bits func SafeNewIntFromBigInt(i *big.Int) (sdkmath.Int, error) { if !IsValidInt256(i) { - return sdkmath.NewInt(0), fmt.Errorf("big int out of bound: %s", i) + return sdkmath.ZeroInt(), fmt.Errorf("big int out of bound: %s", i) } return sdkmath.NewIntFromBigInt(i), nil } diff --git a/x/avs/keeper/avs.go b/x/avs/keeper/avs.go index 9730521a7..4862b9af3 100644 --- a/x/avs/keeper/avs.go +++ b/x/avs/keeper/avs.go @@ -58,7 +58,7 @@ func (k *Keeper) GetAVSSlashContract(ctx sdk.Context, avsAddr string) (string, e func (k *Keeper) GetAVSMinimumSelfDelegation(ctx sdk.Context, avsAddr string) (sdkmath.LegacyDec, error) { avsInfo, err := k.GetAVSInfo(ctx, avsAddr) if err != nil { - return sdkmath.LegacyNewDec(0), errorsmod.Wrap(err, fmt.Sprintf("GetAVSMinimumSelfDelegation: key is %s", avsAddr)) + return sdkmath.LegacyZeroDec(), errorsmod.Wrap(err, fmt.Sprintf("GetAVSMinimumSelfDelegation: key is %s", avsAddr)) } // #nosec G115 return sdkmath.LegacyNewDec(int64(avsInfo.Info.MinSelfDelegation)), nil diff --git a/x/avs/keeper/impl_epoch_hook.go b/x/avs/keeper/impl_epoch_hook.go index 73d619b86..986d2d4f7 100644 --- a/x/avs/keeper/impl_epoch_hook.go +++ b/x/avs/keeper/impl_epoch_hook.go @@ -41,7 +41,7 @@ func (wrapper EpochsHooksWrapper) AfterEpochEnd( var taskAddr string var avsAddr string var operatorPowers []*types.OperatorActivePowerInfo - operatorPowerTotal := sdkmath.LegacyNewDec(0) + operatorPowerTotal := sdkmath.LegacyZeroDec() for _, res := range value { // Find signed operators if res.BlsSignature != nil { diff --git a/x/avs/keeper/submit_task_test.go b/x/avs/keeper/submit_task_test.go index 7abda46b9..bdcb3550e 100644 --- a/x/avs/keeper/submit_task_test.go +++ b/x/avs/keeper/submit_task_test.go @@ -138,7 +138,7 @@ func (suite *AVSTestSuite) prepareTaskInfo() { StartingEpoch: uint64(epoch.CurrentEpoch + 1), ActualThreshold: 0, OptInOperators: operatorList, - TaskTotalPower: sdk.Dec(sdkmath.NewInt(0)), + TaskTotalPower: sdk.Dec(sdkmath.ZeroInt()), } err = suite.App.AVSManagerKeeper.SetTaskInfo(suite.Ctx, info) suite.NoError(err) diff --git a/x/avs/keeper/task_test.go b/x/avs/keeper/task_test.go index 5d6216a8f..018972648 100644 --- a/x/avs/keeper/task_test.go +++ b/x/avs/keeper/task_test.go @@ -18,7 +18,7 @@ func (suite *AVSTestSuite) TestTaskInfo() { TaskResponsePeriod: 10000, TaskChallengePeriod: 5000, ThresholdPercentage: 60, - TaskTotalPower: sdk.Dec(sdkmath.NewInt(0)), + TaskTotalPower: sdk.Dec(sdkmath.ZeroInt()), } err := suite.App.AVSManagerKeeper.SetTaskInfo(suite.Ctx, info) suite.NoError(err) diff --git a/x/delegation/keeper/delegation_op_test.go b/x/delegation/keeper/delegation_op_test.go index c0f94cc31..c8ab2befd 100644 --- a/x/delegation/keeper/delegation_op_test.go +++ b/x/delegation/keeper/delegation_op_test.go @@ -119,23 +119,23 @@ func (suite *DelegationTestSuite) TestDelegateTo() { suite.Equal(types.StakerAssetInfo{ TotalDepositAmount: suite.depositAmount, WithdrawableAmount: suite.depositAmount.Sub(delegationParams.OpAmount), - PendingUndelegationAmount: sdkmath.NewInt(0), + PendingUndelegationAmount: sdkmath.ZeroInt(), }, *restakerState) operatorState, err := suite.App.AssetsKeeper.GetOperatorSpecifiedAssetInfo(suite.Ctx, opAccAddr, assetID) suite.NoError(err) suite.Equal(types.OperatorAssetInfo{ TotalAmount: delegationParams.OpAmount, - PendingUndelegationAmount: sdkmath.NewInt(0), + PendingUndelegationAmount: sdkmath.ZeroInt(), TotalShare: sdkmath.LegacyNewDecFromBigInt(delegationParams.OpAmount.BigInt()), - OperatorShare: sdkmath.LegacyNewDec(0), + OperatorShare: sdkmath.LegacyZeroDec(), }, *operatorState) specifiedDelegationAmount, err := suite.App.DelegationKeeper.GetSingleDelegationInfo(suite.Ctx, stakerID, assetID, opAccAddr.String()) suite.NoError(err) suite.Equal(delegationtype.DelegationAmounts{ UndelegatableShare: sdkmath.LegacyNewDecFromBigInt(delegationParams.OpAmount.BigInt()), - WaitUndelegationAmount: sdkmath.NewInt(0), + WaitUndelegationAmount: sdkmath.ZeroInt(), }, *specifiedDelegationAmount) totalDelegationAmount, err := suite.App.DelegationKeeper.TotalDelegatedAmountForStakerAsset(suite.Ctx, stakerID, assetID) @@ -163,22 +163,22 @@ func (suite *DelegationTestSuite) TestDelegateTo() { suite.Equal(types.StakerAssetInfo{ TotalDepositAmount: balance.Amount.Add(delegationParams.OpAmount), WithdrawableAmount: balance.Amount, - PendingUndelegationAmount: sdkmath.NewInt(0), + PendingUndelegationAmount: sdkmath.ZeroInt(), }, *restakerState) operatorState, err = suite.App.AssetsKeeper.GetOperatorSpecifiedAssetInfo(suite.Ctx, opAccAddr, assetID) suite.NoError(err) suite.Equal(types.OperatorAssetInfo{ TotalAmount: delegationParams.OpAmount, - PendingUndelegationAmount: sdkmath.NewInt(0), + PendingUndelegationAmount: sdkmath.ZeroInt(), TotalShare: sdkmath.LegacyNewDecFromBigInt(delegationParams.OpAmount.BigInt()), - OperatorShare: sdkmath.LegacyNewDec(0), + OperatorShare: sdkmath.LegacyZeroDec(), }, *operatorState) specifiedDelegationAmount, err = suite.App.DelegationKeeper.GetSingleDelegationInfo(suite.Ctx, stakerID, assetID, opAccAddr.String()) suite.NoError(err) suite.Equal(delegationtype.DelegationAmounts{ UndelegatableShare: sdkmath.LegacyNewDecFromBigInt(delegationParams.OpAmount.BigInt()), - WaitUndelegationAmount: sdkmath.NewInt(0), + WaitUndelegationAmount: sdkmath.ZeroInt(), }, *specifiedDelegationAmount) totalDelegationAmount, err = suite.App.DelegationKeeper.TotalDelegatedAmountForStakerAsset(suite.Ctx, stakerID, assetID) @@ -208,22 +208,22 @@ func (suite *DelegationTestSuite) TestUndelegateFrom() { operatorState, err := suite.App.AssetsKeeper.GetOperatorSpecifiedAssetInfo(suite.Ctx, delegationEvent.OperatorAddress, assetID) suite.NoError(err) suite.Equal(types.OperatorAssetInfo{ - TotalAmount: sdkmath.NewInt(0), + TotalAmount: sdkmath.ZeroInt(), PendingUndelegationAmount: delegationEvent.OpAmount, - TotalShare: sdkmath.LegacyNewDec(0), - OperatorShare: sdkmath.LegacyNewDec(0), + TotalShare: sdkmath.LegacyZeroDec(), + OperatorShare: sdkmath.LegacyZeroDec(), }, *operatorState) specifiedDelegationAmount, err := suite.App.DelegationKeeper.GetSingleDelegationInfo(suite.Ctx, stakerID, assetID, delegationEvent.OperatorAddress.String()) suite.NoError(err) suite.Equal(delegationtype.DelegationAmounts{ WaitUndelegationAmount: delegationEvent.OpAmount, - UndelegatableShare: sdkmath.LegacyNewDec(0), + UndelegatableShare: sdkmath.LegacyZeroDec(), }, *specifiedDelegationAmount) totalDelegationAmount, err := suite.App.DelegationKeeper.TotalDelegatedAmountForStakerAsset(suite.Ctx, stakerID, assetID) suite.NoError(err) - suite.Equal(sdkmath.NewInt(0), totalDelegationAmount) + suite.Equal(sdkmath.ZeroInt(), totalDelegationAmount) records, err := suite.App.DelegationKeeper.GetStakerUndelegationRecords(suite.Ctx, stakerID, assetID) suite.NoError(err) @@ -267,22 +267,22 @@ func (suite *DelegationTestSuite) TestUndelegateFrom() { operatorState, err = suite.App.AssetsKeeper.GetOperatorSpecifiedAssetInfo(suite.Ctx, delegationEvent.OperatorAddress, assetID) suite.NoError(err) suite.Equal(types.OperatorAssetInfo{ - TotalAmount: sdkmath.NewInt(0), + TotalAmount: sdkmath.ZeroInt(), PendingUndelegationAmount: delegationEvent.OpAmount, - TotalShare: sdkmath.LegacyNewDec(0), - OperatorShare: sdkmath.LegacyNewDec(0), + TotalShare: sdkmath.LegacyZeroDec(), + OperatorShare: sdkmath.LegacyZeroDec(), }, *operatorState) specifiedDelegationAmount, err = suite.App.DelegationKeeper.GetSingleDelegationInfo(suite.Ctx, stakerID, assetID, delegationEvent.OperatorAddress.String()) suite.NoError(err) suite.Equal(delegationtype.DelegationAmounts{ WaitUndelegationAmount: delegationEvent.OpAmount, - UndelegatableShare: sdkmath.LegacyNewDec(0), + UndelegatableShare: sdkmath.LegacyZeroDec(), }, *specifiedDelegationAmount) totalDelegationAmount, err = suite.App.DelegationKeeper.TotalDelegatedAmountForStakerAsset(suite.Ctx, stakerID, assetID) suite.NoError(err) - suite.Equal(sdkmath.NewInt(0), totalDelegationAmount) + suite.Equal(sdkmath.ZeroInt(), totalDelegationAmount) records, err = suite.App.DelegationKeeper.GetStakerUndelegationRecords(suite.Ctx, stakerID, assetID) suite.NoError(err) @@ -351,28 +351,28 @@ func (suite *DelegationTestSuite) TestCompleteUndelegation() { suite.Equal(types.StakerAssetInfo{ TotalDepositAmount: suite.depositAmount, WithdrawableAmount: suite.depositAmount, - PendingUndelegationAmount: sdkmath.NewInt(0), + PendingUndelegationAmount: sdkmath.ZeroInt(), }, *restakerState) operatorState, err := suite.App.AssetsKeeper.GetOperatorSpecifiedAssetInfo(suite.Ctx, delegationEvent.OperatorAddress, assetID) suite.NoError(err) suite.Equal(types.OperatorAssetInfo{ - TotalAmount: sdkmath.NewInt(0), - PendingUndelegationAmount: sdkmath.NewInt(0), - TotalShare: sdkmath.LegacyNewDec(0), - OperatorShare: sdkmath.LegacyNewDec(0), + TotalAmount: sdkmath.ZeroInt(), + PendingUndelegationAmount: sdkmath.ZeroInt(), + TotalShare: sdkmath.LegacyZeroDec(), + OperatorShare: sdkmath.LegacyZeroDec(), }, *operatorState) specifiedDelegationAmount, err := suite.App.DelegationKeeper.GetSingleDelegationInfo(suite.Ctx, stakerID, assetID, delegationEvent.OperatorAddress.String()) suite.NoError(err) suite.Equal(delegationtype.DelegationAmounts{ - UndelegatableShare: sdkmath.LegacyNewDec(0), - WaitUndelegationAmount: sdkmath.NewInt(0), + UndelegatableShare: sdkmath.LegacyZeroDec(), + WaitUndelegationAmount: sdkmath.ZeroInt(), }, *specifiedDelegationAmount) totalDelegationAmount, err := suite.App.DelegationKeeper.TotalDelegatedAmountForStakerAsset(suite.Ctx, stakerID, assetID) suite.NoError(err) - suite.Equal(sdkmath.NewInt(0), totalDelegationAmount) + suite.Equal(sdkmath.ZeroInt(), totalDelegationAmount) records, err := suite.App.DelegationKeeper.GetStakerUndelegationRecords(suite.Ctx, stakerID, assetID) suite.NoError(err) @@ -419,28 +419,28 @@ func (suite *DelegationTestSuite) TestCompleteUndelegation() { suite.Equal(types.StakerAssetInfo{ TotalDepositAmount: balance.Amount, WithdrawableAmount: balance.Amount, - PendingUndelegationAmount: sdkmath.NewInt(0), + PendingUndelegationAmount: sdkmath.ZeroInt(), }, *restakerState) operatorState, err = suite.App.AssetsKeeper.GetOperatorSpecifiedAssetInfo(suite.Ctx, delegationEvent.OperatorAddress, assetID) suite.NoError(err) suite.Equal(types.OperatorAssetInfo{ - TotalAmount: sdkmath.NewInt(0), - PendingUndelegationAmount: sdkmath.NewInt(0), - TotalShare: sdkmath.LegacyNewDec(0), - OperatorShare: sdkmath.LegacyNewDec(0), + TotalAmount: sdkmath.ZeroInt(), + PendingUndelegationAmount: sdkmath.ZeroInt(), + TotalShare: sdkmath.LegacyZeroDec(), + OperatorShare: sdkmath.LegacyZeroDec(), }, *operatorState) specifiedDelegationAmount, err = suite.App.DelegationKeeper.GetSingleDelegationInfo(suite.Ctx, stakerID, assetID, delegationEvent.OperatorAddress.String()) suite.NoError(err) suite.Equal(delegationtype.DelegationAmounts{ - UndelegatableShare: sdkmath.LegacyNewDec(0), - WaitUndelegationAmount: sdkmath.NewInt(0), + UndelegatableShare: sdkmath.LegacyZeroDec(), + WaitUndelegationAmount: sdkmath.ZeroInt(), }, *specifiedDelegationAmount) totalDelegationAmount, err = suite.App.DelegationKeeper.TotalDelegatedAmountForStakerAsset(suite.Ctx, stakerID, assetID) suite.NoError(err) - suite.Equal(sdkmath.NewInt(0), totalDelegationAmount) + suite.Equal(sdkmath.ZeroInt(), totalDelegationAmount) records, err = suite.App.DelegationKeeper.GetStakerUndelegationRecords(suite.Ctx, stakerID, assetID) suite.NoError(err) diff --git a/x/delegation/keeper/delegation_state.go b/x/delegation/keeper/delegation_state.go index 340d585dd..ce04b35c9 100644 --- a/x/delegation/keeper/delegation_state.go +++ b/x/delegation/keeper/delegation_state.go @@ -77,7 +77,7 @@ func (k Keeper) IterateDelegationsForStaker(ctx sdk.Context, stakerID string, op // TotalDelegatedAmountForStakerAsset query the total delegation amount of the specified staker and asset. // It needs to be calculated from the share and amount of the asset pool. func (k Keeper) TotalDelegatedAmountForStakerAsset(ctx sdk.Context, stakerID string, assetID string) (amount sdkmath.Int, err error) { - amount = sdkmath.NewInt(0) + amount = sdkmath.ZeroInt() opFunc := func(keys *delegationtype.SingleDelegationInfoReq, amounts *delegationtype.DelegationAmounts) (bool, error) { if amounts.UndelegatableShare.IsZero() { return false, nil @@ -143,8 +143,8 @@ func (k Keeper) UpdateDelegationState(ctx sdk.Context, stakerID, assetID, opAddr } singleStateKey := assetstype.GetJoinedStoreKey(stakerID, assetID, opAddr) delegationState := delegationtype.DelegationAmounts{ - WaitUndelegationAmount: sdkmath.NewInt(0), - UndelegatableShare: sdkmath.LegacyNewDec(0), + WaitUndelegationAmount: sdkmath.ZeroInt(), + UndelegatableShare: sdkmath.LegacyZeroDec(), } value := store.Get(singleStateKey) @@ -305,7 +305,7 @@ func (k *Keeper) SetStakerShareToZero(ctx sdk.Context, operator, assetID string, if value != nil { delegationState := delegationtype.DelegationAmounts{} k.cdc.MustUnmarshal(value, &delegationState) - delegationState.UndelegatableShare = sdkmath.LegacyNewDec(0) + delegationState.UndelegatableShare = sdkmath.LegacyZeroDec() bz := k.cdc.MustMarshal(&delegationState) store.Set(singleStateKey, bz) } diff --git a/x/delegation/keeper/share.go b/x/delegation/keeper/share.go index d0cc7c64a..3e3c64905 100644 --- a/x/delegation/keeper/share.go +++ b/x/delegation/keeper/share.go @@ -18,14 +18,14 @@ import ( // caused by the bankers rounding. func TokensFromShares(stakerShare, totalShare sdkmath.LegacyDec, totalAmount sdkmath.Int) (sdkmath.Int, error) { if stakerShare.GT(totalShare) { - return sdkmath.NewInt(0), errorsmod.Wrapf(delegationtypes.ErrInsufficientShares, "the stakerShare is:%v the totalShare is:%v", stakerShare, totalShare) + return sdkmath.ZeroInt(), errorsmod.Wrapf(delegationtypes.ErrInsufficientShares, "the stakerShare is:%v the totalShare is:%v", stakerShare, totalShare) } if totalShare.IsZero() { if totalAmount.IsZero() { // this can happen if everyone exits. - return sdkmath.NewInt(0), nil + return sdkmath.ZeroInt(), nil } - return sdkmath.NewInt(0), delegationtypes.ErrDivisorIsZero + return sdkmath.ZeroInt(), delegationtypes.ErrDivisorIsZero } return (stakerShare.MulInt(totalAmount)).Quo(totalShare).TruncateInt(), nil } diff --git a/x/delegation/keeper/share_test.go b/x/delegation/keeper/share_test.go index 5f9034d21..2e87a7657 100644 --- a/x/delegation/keeper/share_test.go +++ b/x/delegation/keeper/share_test.go @@ -23,23 +23,23 @@ func (suite *DelegationTestSuite) TestTokensFromShares() { totalAmount: sdkmath.NewInt(50), stakerShare: sdkmath.LegacyNewDec(51), innerError: delegationtypes.ErrInsufficientShares, - stakerAmount: sdkmath.NewInt(0), + stakerAmount: sdkmath.ZeroInt(), }, { - totalShare: sdkmath.LegacyNewDec(0), + totalShare: sdkmath.LegacyZeroDec(), totalAmount: sdkmath.NewInt(50), - stakerShare: sdkmath.LegacyNewDec(0), + stakerShare: sdkmath.LegacyZeroDec(), innerError: delegationtypes.ErrDivisorIsZero, - stakerAmount: sdkmath.NewInt(0), + stakerAmount: sdkmath.ZeroInt(), }, // the share will be equal to the amount if there isn't a slash event { totalShare: sdkmath.LegacyNewDec(50), totalAmount: sdkmath.NewInt(50), - stakerShare: sdkmath.LegacyNewDec(0), + stakerShare: sdkmath.LegacyZeroDec(), innerError: nil, - stakerAmount: sdkmath.NewInt(0), + stakerAmount: sdkmath.ZeroInt(), }, { totalShare: sdkmath.LegacyNewDec(50), @@ -60,9 +60,9 @@ func (suite *DelegationTestSuite) TestTokensFromShares() { { totalShare: sdkmath.LegacyNewDec(70), totalAmount: sdkmath.NewInt(50), - stakerShare: sdkmath.LegacyNewDec(0), + stakerShare: sdkmath.LegacyZeroDec(), innerError: nil, - stakerAmount: sdkmath.NewInt(0), + stakerAmount: sdkmath.ZeroInt(), }, { totalShare: sdkmath.LegacyNewDec(70), @@ -81,10 +81,10 @@ func (suite *DelegationTestSuite) TestTokensFromShares() { // all exit { - totalShare: sdkmath.LegacyNewDec(0), - stakerShare: sdkmath.LegacyNewDec(0), - totalAmount: sdkmath.NewInt(0), - stakerAmount: sdkmath.NewInt(0), + totalShare: sdkmath.LegacyZeroDec(), + stakerShare: sdkmath.LegacyZeroDec(), + totalAmount: sdkmath.ZeroInt(), + stakerAmount: sdkmath.ZeroInt(), innerError: nil, }, } @@ -114,19 +114,19 @@ func (suite *DelegationTestSuite) TestSharesFromTokens() { // error cases { totalShare: sdkmath.LegacyNewDec(50), - totalAmount: sdkmath.NewInt(0), - stakerAmount: sdkmath.NewInt(0), + totalAmount: sdkmath.ZeroInt(), + stakerAmount: sdkmath.ZeroInt(), innerError: delegationtypes.ErrDivisorIsZero, - stakerShare: sdkmath.LegacyNewDec(0), + stakerShare: sdkmath.LegacyZeroDec(), }, // the share will be equal to the amount if there isn't a slash event { totalShare: sdkmath.LegacyNewDec(50), totalAmount: sdkmath.NewInt(50), - stakerAmount: sdkmath.NewInt(0), + stakerAmount: sdkmath.ZeroInt(), innerError: nil, - stakerShare: sdkmath.LegacyNewDec(0), + stakerShare: sdkmath.LegacyZeroDec(), }, { totalShare: sdkmath.LegacyNewDec(50), @@ -154,9 +154,9 @@ func (suite *DelegationTestSuite) TestSharesFromTokens() { { totalShare: sdkmath.LegacyNewDec(70), totalAmount: sdkmath.NewInt(50), - stakerAmount: sdkmath.NewInt(0), + stakerAmount: sdkmath.ZeroInt(), innerError: nil, - stakerShare: sdkmath.LegacyNewDec(0), + stakerShare: sdkmath.LegacyZeroDec(), }, { totalShare: sdkmath.LegacyNewDec(70), @@ -175,11 +175,11 @@ func (suite *DelegationTestSuite) TestSharesFromTokens() { // all exit { - totalShare: sdkmath.LegacyNewDec(0), - totalAmount: sdkmath.NewInt(0), - stakerAmount: sdkmath.NewInt(0), + totalShare: sdkmath.LegacyZeroDec(), + totalAmount: sdkmath.ZeroInt(), + stakerAmount: sdkmath.ZeroInt(), innerError: nil, - stakerShare: sdkmath.LegacyNewDec(0), + stakerShare: sdkmath.LegacyZeroDec(), }, } @@ -204,8 +204,8 @@ func (suite *DelegationTestSuite) TestCalculateShare() { // test the case that the asset amount of operator is zero err = suite.App.AssetsKeeper.UpdateOperatorAssetState(suite.Ctx, suite.opAccAddr, assetID, assetstype.DeltaOperatorSingleAsset{ - TotalAmount: sdkmath.NewInt(0), - TotalShare: sdkmath.LegacyNewDec(0), + TotalAmount: sdkmath.ZeroInt(), + TotalShare: sdkmath.LegacyZeroDec(), }) suite.NoError(err) share, err = suite.App.DelegationKeeper.CalculateShare(suite.Ctx, suite.opAccAddr, assetID, assetAmount) @@ -229,7 +229,7 @@ func (suite *DelegationTestSuite) TestValidateUndelegationAmount() { suite.prepareDelegation(suite.delegationAmount, suite.opAccAddr) stakerID, assetID := assetstype.GetStakerIDAndAssetID(suite.clientChainLzID, suite.Address[:], suite.assetAddr[:]) - undelegationAmount := sdkmath.NewInt(0) + undelegationAmount := sdkmath.ZeroInt() _, err := suite.App.DelegationKeeper.ValidateUndelegationAmount(suite.Ctx, suite.opAccAddr, stakerID, assetID, undelegationAmount) suite.Error(err, delegationtypes.ErrAmountIsNotPositive) @@ -249,7 +249,7 @@ func (suite *DelegationTestSuite) TestCalculateSlashShare() { suite.prepareDeposit(suite.depositAmount) suite.prepareDelegation(suite.delegationAmount, suite.opAccAddr) stakerID, assetID := assetstype.GetStakerIDAndAssetID(suite.clientChainLzID, suite.Address[:], suite.assetAddr[:]) - slashAmount := sdkmath.NewInt(0) + slashAmount := sdkmath.ZeroInt() _, err := suite.App.DelegationKeeper.CalculateSlashShare(suite.Ctx, suite.opAccAddr, stakerID, assetID, slashAmount) suite.Error(err, delegationtypes.ErrAmountIsNotPositive) @@ -327,7 +327,7 @@ func (suite *DelegationTestSuite) TestRemoveShare() { suite.Equal(removeShare.TruncateInt(), removeToken) delegationInfo, err = suite.App.DelegationKeeper.GetSingleDelegationInfo(suite.Ctx, stakerID, assetID, suite.opAccAddr.String()) suite.NoError(err) - suite.Equal(sdkmath.LegacyNewDec(0), delegationInfo.UndelegatableShare) + suite.Equal(sdkmath.LegacyZeroDec(), delegationInfo.UndelegatableShare) suite.Equal(removeShare.TruncateInt(), delegationInfo.WaitUndelegationAmount) stakerAssetInfo, err := suite.App.AssetsKeeper.GetStakerSpecifiedAssetInfo(suite.Ctx, stakerID, assetID) suite.NoError(err) diff --git a/x/delegation/keeper/update_native_restaking_balance_test.go b/x/delegation/keeper/update_native_restaking_balance_test.go index 7a2bf81c9..b646d9527 100644 --- a/x/delegation/keeper/update_native_restaking_balance_test.go +++ b/x/delegation/keeper/update_native_restaking_balance_test.go @@ -43,7 +43,7 @@ func (suite *DelegationTestSuite) TestUpdateNSTBalance() { suite.NoError(err) expectAssetInfo := assettypes.StakerAssetInfo{ TotalDepositAmount: depositAmount.Sub(actualSlashAmount), - WithdrawableAmount: sdkmath.NewInt(0), + WithdrawableAmount: sdkmath.ZeroInt(), // it will be decreased when the undelegation is completed. PendingUndelegationAmount: undelegateAmountFromDefaultOperator, } @@ -52,7 +52,7 @@ func (suite *DelegationTestSuite) TestUpdateNSTBalance() { // check the undelegation state after slashing records, err := suite.App.DelegationKeeper.GetStakerUndelegationRecords(suite.Ctx, stakerID, assetID) suite.NoError(err) - suite.Equal(sdkmath.NewInt(0), records[0].ActualCompletedAmount) + suite.Equal(sdkmath.ZeroInt(), records[0].ActualCompletedAmount) // check the delegated share for two operators delegationForDefaultOperator, err := suite.App.DelegationKeeper.GetSingleDelegationInfo(suite.Ctx, stakerID, assetID, suite.opAccAddr.String()) diff --git a/x/delegation/types/expected_keepers.go b/x/delegation/types/expected_keepers.go index 8fd5fb42b..27dacad0c 100644 --- a/x/delegation/types/expected_keepers.go +++ b/x/delegation/types/expected_keepers.go @@ -23,7 +23,7 @@ func (VirtualSlashKeeper) IsOperatorFrozen(_ sdk.Context, _ sdk.AccAddress) bool } func (VirtualSlashKeeper) OperatorAssetSlashedProportion(_ sdk.Context, _ sdk.AccAddress, _ string, _, _ uint64) sdkmath.LegacyDec { - return sdkmath.LegacyNewDec(0) + return sdkmath.LegacyZeroDec() } // DelegationHooks are event hooks triggered by the delegation module diff --git a/x/exomint/keeper/impl_epochs_hooks_test.go b/x/exomint/keeper/impl_epochs_hooks_test.go index 7a33dbb01..ebff588a1 100644 --- a/x/exomint/keeper/impl_epochs_hooks_test.go +++ b/x/exomint/keeper/impl_epochs_hooks_test.go @@ -23,7 +23,7 @@ func (suite *KeeperTestSuite) TestEpochHooks() { suite.Ctx, feeCollector, params.MintDenom, - ).Amount.Equal(sdkmath.NewInt(0)), + ).Amount.Equal(sdkmath.ZeroInt()), ) // now go to one day diff --git a/x/exomint/types/params_test.go b/x/exomint/types/params_test.go index a875d2861..d1adee2df 100644 --- a/x/exomint/types/params_test.go +++ b/x/exomint/types/params_test.go @@ -59,7 +59,7 @@ func TestValidate(t *testing.T) { name: "zero reward", params: types.Params{ MintDenom: "aevmos", - EpochReward: sdkmath.NewInt(0), + EpochReward: sdkmath.ZeroInt(), EpochIdentifier: "day", }, expResult: true, @@ -150,11 +150,11 @@ func TestOverrideIfRequired(t *testing.T) { next: types.DefaultParams(), over: types.NewParams( types.DefaultMintDenom, - sdkmath.NewInt(0), // 0 is not overridden + sdkmath.ZeroInt(), // 0 is not overridden types.DefaultEpochIdentifier, ), malleate: func(next *types.Params) { - next.EpochReward = sdkmath.NewInt(0) + next.EpochReward = sdkmath.ZeroInt() }, }, { diff --git a/x/operator/client/cli/query.go b/x/operator/client/cli/query.go index d5c956fc1..4cfa3c168 100644 --- a/x/operator/client/cli/query.go +++ b/x/operator/client/cli/query.go @@ -463,10 +463,11 @@ func GetOptInfo() *cobra.Command { func QuerySnapshotHelper() *cobra.Command { cmd := &cobra.Command{ - Use: "QuerySnapshotHelper ", - Short: "Get the voting power snapshot helper for the avs", - Long: "Get the voting power snapshot helper for the avs", - Args: cobra.ExactArgs(1), + Use: "query-snapshot-helper ", + Short: "Get the voting power snapshot helper for the avs", + Long: "Get the voting power snapshot helper for the avs", + Example: "exocored query operator query-snapshot-helper 0xaa089ba103f765fcea44808bd3d4073523254c57", + Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { if !common.IsHexAddress(args[0]) { return xerrors.Errorf("invalid avs address,err:%s", types.ErrInvalidAddr) @@ -493,10 +494,12 @@ func QuerySnapshotHelper() *cobra.Command { func QueryAllSnapshot() *cobra.Command { cmd := &cobra.Command{ - Use: "QueryAllSnapshot ", + Use: "query-all-snapshot ", Short: "Get the all voting power snapshots for the avs", - Long: "Get the all voting power snapshots for the avs", - Args: cobra.ExactArgs(1), + Long: "Get all voting power snapshots for the AVS. " + + "The number of stored snapshots should be the unbonding duration plus one.", + Example: "exocored query operator query-all-snapshot 0xaa089ba103f765fcea44808bd3d4073523254c57", + Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { if !common.IsHexAddress(args[0]) { return xerrors.Errorf("invalid avs address,err:%s", types.ErrInvalidAddr) @@ -528,10 +531,12 @@ func QueryAllSnapshot() *cobra.Command { func QuerySpecifiedSnapshot() *cobra.Command { cmd := &cobra.Command{ - Use: "QuerySpecifiedSnapshot ", + Use: "query-specified-snapshot ", Short: "Get the AVS voting power snapshot at specified height", - Long: "Get the AVS voting power snapshot at specified height", - Args: cobra.ExactArgs(2), + Long: "Get the AVS voting power snapshot at specified height" + + "The number of stored snapshots should be the unbonding duration plus one.", + Example: "exocored query operator query-specified-snapshot 0xaa089ba103f765fcea44808bd3d4073523254c57 3", + Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { if !common.IsHexAddress(args[0]) { return xerrors.Errorf("invalid avs address,err:%s", types.ErrInvalidAddr) diff --git a/x/operator/keeper/abci.go b/x/operator/keeper/abci.go index 83aa50a59..e7aa81108 100644 --- a/x/operator/keeper/abci.go +++ b/x/operator/keeper/abci.go @@ -58,7 +58,7 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str // update the voting power of operators and AVS isSnapshotChanged := false votingPowerSet := make([]*operatortypes.OperatorVotingPower, 0) - avsVotingPower := sdkmath.LegacyNewDec(0) + avsVotingPower := sdkmath.LegacyZeroDec() hasOptedOperator := false opFunc := func(operator string, optedUSDValues *operatortypes.OperatorOptedUSDValue) error { if !hasOptedOperator { @@ -67,9 +67,9 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr, epochIdentifier str // clear the old voting power for the operator lastOptedUSDValue := *optedUSDValues *optedUSDValues = operatortypes.OperatorOptedUSDValue{ - TotalUSDValue: sdkmath.LegacyNewDec(0), - SelfUSDValue: sdkmath.LegacyNewDec(0), - ActiveUSDValue: sdkmath.LegacyNewDec(0), + TotalUSDValue: sdkmath.LegacyZeroDec(), + SelfUSDValue: sdkmath.LegacyZeroDec(), + ActiveUSDValue: sdkmath.LegacyZeroDec(), } stakingInfo, err := k.CalculateUSDValueForOperator(ctx, false, operator, assets, decimals, prices) if err != nil { diff --git a/x/operator/keeper/operator_slash_state.go b/x/operator/keeper/operator_slash_state.go index 72296f7c7..467a1702b 100644 --- a/x/operator/keeper/operator_slash_state.go +++ b/x/operator/keeper/operator_slash_state.go @@ -107,7 +107,7 @@ func (k *Keeper) UpdateSlashAssetsState(ctx sdk.Context, assetID, stakerOrOperat } key = assetstype.GetJoinedStoreKey(hexutil.EncodeUint64(processedHeight), assetID, stakerOrOperator) - slashAmount := assetstype.ValueField{Amount: sdkmath.NewInt(0)} + slashAmount := assetstype.ValueField{Amount: sdkmath.ZeroInt()} value := store.Get(key) if value != nil { k.cdc.MustUnmarshal(value, &slashAmount) @@ -121,7 +121,7 @@ func (k *Keeper) UpdateSlashAssetsState(ctx sdk.Context, assetID, stakerOrOperat store.Set(key, bz) key = assetstype.GetJoinedStoreKey(hexutil.EncodeUint64(processedHeight), assetID) - totalSlashAmount := assetstype.ValueField{Amount: sdkmath.NewInt(0)} + totalSlashAmount := assetstype.ValueField{Amount: sdkmath.ZeroInt()} value = store.Get(key) if value != nil { k.cdc.MustUnmarshal(value, &totalSlashAmount) diff --git a/x/operator/keeper/opt_test.go b/x/operator/keeper/opt_test.go index af37a0c33..ec79e0305 100644 --- a/x/operator/keeper/opt_test.go +++ b/x/operator/keeper/opt_test.go @@ -194,8 +194,8 @@ func (suite *OperatorTestSuite) TestOptOut() { OptedInHeight: uint64(optInHeight), OptedOutHeight: uint64(suite.Ctx.BlockHeight()), }, - AVSTotalShare: sdkmath.LegacyNewDec(0), - AVSOperatorShare: sdkmath.LegacyNewDec(0), + AVSTotalShare: sdkmath.LegacyZeroDec(), + AVSOperatorShare: sdkmath.LegacyZeroDec(), AssetState: nil, OperatorShare: sdkmath.LegacyDec{}, StakerShare: sdkmath.LegacyDec{}, diff --git a/x/operator/keeper/slash.go b/x/operator/keeper/slash.go index 850d173b2..ab6188f06 100644 --- a/x/operator/keeper/slash.go +++ b/x/operator/keeper/slash.go @@ -31,7 +31,7 @@ func SlashFromUndelegation(undelegation *delegationtype.UndelegationRecord, slas // reduce the actual_completed_amount in the record if slashAmount.GTE(undelegation.ActualCompletedAmount) { slashAmount = undelegation.ActualCompletedAmount - undelegation.ActualCompletedAmount = sdkmath.NewInt(0) + undelegation.ActualCompletedAmount = sdkmath.ZeroInt() } else { undelegation.ActualCompletedAmount = undelegation.ActualCompletedAmount.Sub(slashAmount) } @@ -131,8 +131,8 @@ func (k *Keeper) SlashAssets(ctx sdk.Context, snapshotHeight int64, parameter *t if err != nil { return err } - state.TotalShare = sdkmath.LegacyNewDec(0) - state.OperatorShare = sdkmath.LegacyNewDec(0) + state.TotalShare = sdkmath.LegacyZeroDec() + state.OperatorShare = sdkmath.LegacyZeroDec() } state.TotalAmount = remainingAmount executionInfo.SlashAssetsPool = append(executionInfo.SlashAssetsPool, types.SlashFromAssetsPool{ @@ -226,7 +226,7 @@ func (k Keeper) SlashWithInfractionReason( isAvs, avsAddr := k.avsKeeper.IsAVSByChainID(ctx, chainID) if !isAvs { k.Logger(ctx).Error("the chainID is not supported by AVS", "chainID", chainID) - return sdkmath.NewInt(0) + return sdkmath.ZeroInt() } slashID := GetSlashIDForDogfood(infraction, infractionHeight) slashParam := &types.SlashInputInfo{ @@ -242,11 +242,11 @@ func (k Keeper) SlashWithInfractionReason( err := k.Slash(ctx, slashParam) if err != nil { k.Logger(ctx).Error("error when executing slash", "error", err, "avsAddr", avsAddr) - return sdkmath.NewInt(0) + return sdkmath.ZeroInt() } // todo: The returned value should be the amount of burned Exo if we considering a slash from the reward // Now it doesn't slash from the reward, so just return 0 - return sdkmath.NewInt(0) + return sdkmath.ZeroInt() } // IsOperatorJailedForChainID returns whether an operator is jailed for a specific chainID. diff --git a/x/operator/keeper/slash_test.go b/x/operator/keeper/slash_test.go index 1eebc9ea5..cc66f7ee8 100644 --- a/x/operator/keeper/slash_test.go +++ b/x/operator/keeper/slash_test.go @@ -65,7 +65,7 @@ func (suite *OperatorTestSuite) TestSlashWithInfractionReason() { slashFactor := suite.App.SlashingKeeper.SlashFractionDowntime(suite.Ctx) slashType := stakingtypes.Infraction_INFRACTION_DOWNTIME exoSlashValue := suite.App.OperatorKeeper.SlashWithInfractionReason(suite.Ctx, suite.operatorAddr, infractionHeight, power, slashFactor, slashType) - suite.Equal(sdkmath.NewInt(0), exoSlashValue) + suite.Equal(sdkmath.ZeroInt(), exoSlashValue) // verify the state after the slash slashID := keeper.GetSlashIDForDogfood(slashType, infractionHeight) diff --git a/x/operator/keeper/usd_value.go b/x/operator/keeper/usd_value.go index 15dd3c9ea..20c551479 100644 --- a/x/operator/keeper/usd_value.go +++ b/x/operator/keeper/usd_value.go @@ -31,9 +31,9 @@ func (k *Keeper) UpdateOperatorUSDValue(ctx sdk.Context, avsAddr, operatorAddr s key = assetstype.GetJoinedStoreKey(strings.ToLower(avsAddr), operatorAddr) usdInfo := operatortypes.OperatorOptedUSDValue{ - SelfUSDValue: sdkmath.LegacyNewDec(0), - TotalUSDValue: sdkmath.LegacyNewDec(0), - ActiveUSDValue: sdkmath.LegacyNewDec(0), + SelfUSDValue: sdkmath.LegacyZeroDec(), + TotalUSDValue: sdkmath.LegacyZeroDec(), + ActiveUSDValue: sdkmath.LegacyZeroDec(), } value := store.Get(key) if value != nil { @@ -68,9 +68,9 @@ func (k *Keeper) InitOperatorUSDValue(ctx sdk.Context, avsAddr, operatorAddr str return errorsmod.Wrap(operatortypes.ErrKeyAlreadyExist, fmt.Sprintf("avsAddr operatorAddr is: %s, %s", avsAddr, operatorAddr)) } initValue := operatortypes.OperatorOptedUSDValue{ - SelfUSDValue: sdkmath.LegacyNewDec(0), - TotalUSDValue: sdkmath.LegacyNewDec(0), - ActiveUSDValue: sdkmath.LegacyNewDec(0), + SelfUSDValue: sdkmath.LegacyZeroDec(), + TotalUSDValue: sdkmath.LegacyZeroDec(), + ActiveUSDValue: sdkmath.LegacyZeroDec(), } bz := k.cdc.MustMarshal(&initValue) store.Set(key, bz) @@ -115,9 +115,9 @@ func (k *Keeper) GetOperatorOptedUSDValue(ctx sdk.Context, avsAddr, operatorAddr // return zero if the operator has opted-out of the AVS if !k.IsOptedIn(ctx, operatorAddr, avsAddr) { return operatortypes.OperatorOptedUSDValue{ - SelfUSDValue: sdkmath.LegacyNewDec(0), - TotalUSDValue: sdkmath.LegacyNewDec(0), - ActiveUSDValue: sdkmath.LegacyNewDec(0), + SelfUSDValue: sdkmath.LegacyZeroDec(), + TotalUSDValue: sdkmath.LegacyZeroDec(), + ActiveUSDValue: sdkmath.LegacyZeroDec(), }, nil } @@ -149,7 +149,7 @@ func (k *Keeper) UpdateAVSUSDValue(ctx sdk.Context, avsAddr string, opAmount sdk } store := prefix.NewStore(ctx.KVStore(k.storeKey), operatortypes.KeyPrefixUSDValueForAVS) key := []byte(strings.ToLower(avsAddr)) - totalValue := operatortypes.DecValueField{Amount: sdkmath.LegacyNewDec(0)} + totalValue := operatortypes.DecValueField{Amount: sdkmath.LegacyZeroDec()} value := store.Get(key) if value != nil { k.cdc.MustUnmarshal(value, &totalValue) @@ -366,9 +366,9 @@ func (k *Keeper) CalculateUSDValueForOperator( ) (operatortypes.OperatorStakingInfo, error) { var err error ret := operatortypes.OperatorStakingInfo{ - Staking: sdkmath.LegacyNewDec(0), - SelfStaking: sdkmath.LegacyNewDec(0), - StakingAndWaitUnbonding: sdkmath.LegacyNewDec(0), + Staking: sdkmath.LegacyZeroDec(), + SelfStaking: sdkmath.LegacyZeroDec(), + StakingAndWaitUnbonding: sdkmath.LegacyZeroDec(), } // iterate all assets owned by the operator to calculate its voting power opFuncToIterateAssets := func(assetID string, state *assetstype.OperatorAssetInfo) error { @@ -463,14 +463,14 @@ func (k Keeper) GetOrCalculateOperatorUSDValues( func (k *Keeper) CalculateUSDValueForStaker(ctx sdk.Context, stakerID, avsAddr string, operator sdk.AccAddress) (sdkmath.LegacyDec, error) { if !k.IsActive(ctx, operator, avsAddr) { - return sdkmath.LegacyNewDec(0), nil + return sdkmath.LegacyZeroDec(), nil } optedUSDValues, err := k.GetOperatorOptedUSDValue(ctx, avsAddr, operator.String()) if err != nil { return sdkmath.LegacyDec{}, err } if optedUSDValues.ActiveUSDValue.IsZero() { - return sdkmath.LegacyNewDec(0), err + return sdkmath.LegacyZeroDec(), err } // calculate the active voting power for staker @@ -479,7 +479,7 @@ func (k *Keeper) CalculateUSDValueForStaker(ctx sdk.Context, stakerID, avsAddr s return sdkmath.LegacyDec{}, err } if assets == nil { - return sdkmath.LegacyNewDec(0), nil + return sdkmath.LegacyZeroDec(), nil } prices, err := k.oracleKeeper.GetMultipleAssetsPrices(ctx, assets) // we don't ignore the error regarding the price round not found here, because it's used to @@ -490,7 +490,7 @@ func (k *Keeper) CalculateUSDValueForStaker(ctx sdk.Context, stakerID, avsAddr s if prices == nil { return sdkmath.LegacyDec{}, errorsmod.Wrap(operatortypes.ErrValueIsNilOrZero, "CalculateUSDValueForStaker prices map is nil") } - totalUSDValue := sdkmath.LegacyNewDec(0) + totalUSDValue := sdkmath.LegacyZeroDec() opFunc := func(keys *delegationtype.SingleDelegationInfoReq, amounts *delegationtype.DelegationAmounts) (bool, error) { // Return true to stop iteration, false to continue iterating if keys.OperatorAddr == operator.String() { diff --git a/x/operator/keeper/usd_value_test.go b/x/operator/keeper/usd_value_test.go index b3808ca15..9790379f6 100644 --- a/x/operator/keeper/usd_value_test.go +++ b/x/operator/keeper/usd_value_test.go @@ -59,7 +59,7 @@ func (suite *OperatorTestSuite) TestCalculatedUSDValueOverflow() { amount = sdkmath.NewInt(1) assetDecimal = uint32(assetstype.MaxDecimal) usdValue = operatorKeeper.CalculateUSDValue(amount, price, assetDecimal, priceDecimal) - expectedValue = sdkmath.LegacyNewDec(0) + expectedValue = sdkmath.LegacyZeroDec() suite.Equal(expectedValue.String(), usdValue.String()) price = sdkmath.NewInt(1) @@ -89,7 +89,7 @@ func (suite *OperatorTestSuite) TestAVSUSDValue() { suite.Ctx, &assetstype.StakingAssetInfo{ AssetBasicInfo: usdcClientChainAsset, - StakingTotalAmount: sdkmath.NewInt(0), + StakingTotalAmount: sdkmath.ZeroInt(), }, ) suite.NoError(err) diff --git a/x/operator/types/genesis.go b/x/operator/types/genesis.go index 9da5ae127..8a1aa311b 100644 --- a/x/operator/types/genesis.go +++ b/x/operator/types/genesis.go @@ -364,7 +364,7 @@ func (gs GenesisState) ValidateSlashStates(operators, avs map[string]struct{}) e slash, ) } - if slash.Info.SlashProportion.IsNil() || slash.Info.SlashProportion.LTE(sdkmath.LegacyNewDec(0)) { + if slash.Info.SlashProportion.IsNil() || slash.Info.SlashProportion.LTE(sdkmath.LegacyZeroDec()) { return errorsmod.Wrapf( ErrInvalidGenesisData, "invalid slash proportion, it's nil, zero, or negative: %+v", @@ -390,7 +390,7 @@ func (gs GenesisState) ValidateSlashStates(operators, avs map[string]struct{}) e } // validate the slashing record regarding undelegation SlashFromUndelegationVal := func(_ int, slashFromUndelegation SlashFromUndelegation) error { - if slashFromUndelegation.Amount.IsNil() || slashFromUndelegation.Amount.LTE(sdkmath.NewInt(0)) { + if slashFromUndelegation.Amount.IsNil() || slashFromUndelegation.Amount.LTE(sdkmath.ZeroInt()) { return errorsmod.Wrapf( ErrInvalidGenesisData, "invalid slashing amount from the undelegation, it's nil, zero, or negative: %+v", @@ -409,7 +409,7 @@ func (gs GenesisState) ValidateSlashStates(operators, avs map[string]struct{}) e } // validate the slashing record regarding assets pool SlashFromAssetsPoolVal := func(_ int, slashFromAssetsPool SlashFromAssetsPool) error { - if slashFromAssetsPool.Amount.IsNil() || slashFromAssetsPool.Amount.LTE(sdkmath.NewInt(0)) { + if slashFromAssetsPool.Amount.IsNil() || slashFromAssetsPool.Amount.LTE(sdkmath.ZeroInt()) { return errorsmod.Wrapf( ErrInvalidGenesisData, "invalid slashing amount from the assets pool, it's nil, zero, or negative: %+v", diff --git a/x/oracle/keeper/native_token.go b/x/oracle/keeper/native_token.go index a2b5a8151..52e5d3b81 100644 --- a/x/oracle/keeper/native_token.go +++ b/x/oracle/keeper/native_token.go @@ -313,7 +313,7 @@ func (k Keeper) UpdateNSTByBalanceChange(ctx sdk.Context, assetID string, rawDat func (k Keeper) getDecimal(ctx sdk.Context, assetID string) (int, sdkmath.Int, error) { decimalMap, err := k.assetsKeeper.GetAssetsDecimal(ctx, map[string]interface{}{assetID: nil}) if err != nil { - return 0, sdkmath.NewInt(0), err + return 0, sdkmath.ZeroInt(), err } decimal := decimalMap[assetID] return int(decimal), sdkmath.NewIntWithDecimal(1, int(decimal)), nil diff --git a/x/reward/keeper/claim_reward_test.go b/x/reward/keeper/claim_reward_test.go index 04b7a9098..e3efed965 100644 --- a/x/reward/keeper/claim_reward_test.go +++ b/x/reward/keeper/claim_reward_test.go @@ -40,7 +40,7 @@ func (suite *RewardTestSuite) TestClaimWithdrawRequest() { // suite.Equal(types.StakerAssetInfo{ // TotalDepositAmount: sdkmath.NewInt(10), // WithdrawableAmount: sdkmath.NewInt(10), - // PendingUndelegationAmount: sdkmath.NewInt(0), + // PendingUndelegationAmount: sdkmath.ZeroInt(), // }, *info) // assetInfo, err := suite.App.AssetsKeeper.GetStakingAssetInfo(suite.Ctx, assetID) diff --git a/x/slash/keeper/execute_slash_test.go b/x/slash/keeper/execute_slash_test.go index c2f1cb086..d0a76f9fa 100644 --- a/x/slash/keeper/execute_slash_test.go +++ b/x/slash/keeper/execute_slash_test.go @@ -37,7 +37,7 @@ func (suite *SlashTestSuite) TestSlash() { suite.Equal(types.StakerAssetInfo{ TotalDepositAmount: depositEvent.OpAmount, WithdrawableAmount: depositEvent.OpAmount, - PendingUndelegationAmount: sdkmath.NewInt(0), + PendingUndelegationAmount: sdkmath.ZeroInt(), }, *info) // test the normal case @@ -52,7 +52,7 @@ func (suite *SlashTestSuite) TestSlash() { suite.Equal(types.StakerAssetInfo{ TotalDepositAmount: sdkmath.NewInt(10), WithdrawableAmount: sdkmath.NewInt(10), - PendingUndelegationAmount: sdkmath.NewInt(0), + PendingUndelegationAmount: sdkmath.ZeroInt(), }, *info) assetInfo, err := suite.App.AssetsKeeper.GetStakingAssetInfo(suite.Ctx, assetID) From d25846cf116d852ba72b340c3d814fcc5c1fc36a Mon Sep 17 00:00:00 2001 From: TimmyExogenous Date: Mon, 11 Nov 2024 22:09:06 +0800 Subject: [PATCH 12/12] fix the incorrect comparison in GetImpactfulAVSForOperator rebase to develop and fix the issues from code comments --- utils/utils.go | 7 - x/avs/keeper/keeper.go | 7 +- x/avs/keeper/task_test.go | 3 +- x/dogfood/keeper/abci.go | 45 +- x/dogfood/keeper/keeper.go | 4 +- x/operator/keeper/grpc_query.go | 1 - x/operator/keeper/operator.go | 2 +- x/operator/keeper/usd_value.go | 2 +- x/operator/types/keys.go | 4 +- x/operator/types/query.pb.go | 1263 +++++++++++++++++++++++++++---- x/operator/types/query.pb.gw.go | 242 ++++++ x/operator/types/tx.pb.go | 7 +- 12 files changed, 1411 insertions(+), 176 deletions(-) diff --git a/utils/utils.go b/utils/utils.go index cecc57290..176cb0a95 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -2,7 +2,6 @@ package utils import ( "bytes" - "encoding/binary" "sort" "strings" @@ -211,9 +210,3 @@ func SortByPower( } return sortedOperatorAddrs, sortedPubKeys, sortedPowers } - -func EncodeHeightBytes(height uint64) []byte { - buf := make([]byte, 8) - binary.BigEndian.PutUint64(buf, height) - return buf -} diff --git a/x/avs/keeper/keeper.go b/x/avs/keeper/keeper.go index 603440170..4e0e0fce4 100644 --- a/x/avs/keeper/keeper.go +++ b/x/avs/keeper/keeper.go @@ -390,10 +390,9 @@ func (k Keeper) GetAVSEpochInfo(ctx sdk.Context, addr string) (*epochstypes.Epoc return nil, err } avsInfo := avsInfoResp.Info - epochInfo, found := k.epochsKeeper.GetEpochInfo(ctx, avsInfo.EpochIdentifier) - if !found { - return nil, types.ErrEpochNotFound.Wrapf("epoch info not found %s", avsInfo.EpochIdentifier) - } + // Epoch information must be available because it is checked when setting AVS information. + // Therefore, we don’t need to check it here. + epochInfo, _ := k.epochsKeeper.GetEpochInfo(ctx, avsInfo.EpochIdentifier) return &epochInfo, nil } diff --git a/x/avs/keeper/task_test.go b/x/avs/keeper/task_test.go index 018972648..65acd57de 100644 --- a/x/avs/keeper/task_test.go +++ b/x/avs/keeper/task_test.go @@ -3,7 +3,6 @@ package keeper_test import ( "strconv" - sdkmath "cosmossdk.io/math" types "github.com/ExocoreNetwork/exocore/x/avs/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" @@ -18,7 +17,7 @@ func (suite *AVSTestSuite) TestTaskInfo() { TaskResponsePeriod: 10000, TaskChallengePeriod: 5000, ThresholdPercentage: 60, - TaskTotalPower: sdk.Dec(sdkmath.ZeroInt()), + TaskTotalPower: sdk.ZeroDec(), } err := suite.App.AVSManagerKeeper.SetTaskInfo(suite.Ctx, info) suite.NoError(err) diff --git a/x/dogfood/keeper/abci.go b/x/dogfood/keeper/abci.go index ff896e184..aa6ee3d76 100644 --- a/x/dogfood/keeper/abci.go +++ b/x/dogfood/keeper/abci.go @@ -20,6 +20,7 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { return []abci.ValidatorUpdate{} } defer k.ClearValidatorSetUpdateFlag(ctx) + logger := k.Logger(ctx) chainIDWithoutRevision := avstypes.ChainIDWithoutRevision(ctx.ChainID()) // start by clearing the previous consensus keys for the chain. @@ -31,7 +32,7 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { for _, undelegation := range undelegations.GetList() { err := k.delegationKeeper.DecrementUndelegationHoldCount(ctx, undelegation) if err != nil { - k.Logger(ctx).Error("error decrementing undelegation hold count", "error", err) + logger.Error("error decrementing undelegation hold count", "error", err) } k.ClearUndelegationMaturityEpoch(ctx, undelegation) } @@ -43,7 +44,7 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { ctx, addr, chainIDWithoutRevision, ) if err != nil { - k.Logger(ctx).Error("error completing operator key removal", "error", err) + logger.Error("error completing operator key removal", "error", err) } } k.ClearPendingOptOuts(ctx) @@ -74,7 +75,7 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { pubKey, err := validator.ConsPubKey() if err != nil { // indicates an error in deserialization, and should never happen. - k.Logger(ctx).Error("error deserializing consensus public key", "error", err) + logger.Error("error deserializing consensus public key", "error", err) continue } addressString := sdk.GetConsAddress(pubKey).String() @@ -85,23 +86,25 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { ctx, operators, chainIDWithoutRevision, ) if err != nil { - k.Logger(ctx).Error("error getting vote power for chain", "error", err) + logger.Error("error getting vote power for chain", "error", err) return []abci.ValidatorUpdate{} } operators, keys, powers = utils.SortByPower(operators, keys, powers) maxVals := k.GetMaxValidators(ctx) - k.Logger(ctx).Info("max validators", "maxVals", maxVals, "len(operators)", len(operators)) + logger.Info("before loop", "maxVals", maxVals, "len(operators)", len(operators)) // the capacity of this list is twice the maximum number of validators. // this is because we can have a maximum of maxVals validators, and we can also have // a maximum of maxVals validators that are removed. res := make([]keytypes.WrappedConsKeyWithPower, 0, maxVals*2) for i := range operators { + logger.Debug("loop", i) // #nosec G701 // ok on 64-bit systems. if i >= int(maxVals) { // we have reached the maximum number of validators, amongst all the validators. // even if there are intersections with the previous validator set, this will // only be reached if we exceed the threshold. // if there are no intersections, this case is glaringly obvious. + logger.Debug("max validators reached", "i", i) break } power := powers[i] @@ -109,6 +112,7 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { // we have reached the bottom of the rung. // assumption is that negative vote power isn't provided by the module. // the consensus engine will reject it anyway and panic. + logger.Debug("power less than 1", "i", i) break } // find the previous power. @@ -118,10 +122,24 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { if found { // if the power has changed, queue an update. skip, otherwise. if prevPower != power { + logger.Debug( + "power changed", + "i", i, + "operator", operators[i].String(), + "power", power, + "prevPower", prevPower, + ) res = append(res, keytypes.WrappedConsKeyWithPower{ Key: wrappedKey, Power: power, }) + } else { + logger.Debug( + "power not changed", + "i", i, + "operator", operators[i].String(), + "power", power, + ) } // remove the validator from the previous map, so that 0 power // is not queued for it. @@ -132,11 +150,21 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { Key: wrappedKey, Power: power, }) + logger.Debug( + "new validator", + "i", i, + "operator", operators[i].String(), + "power", power, + ) } // all powers, regardless of whether the key exists, are added to the total power. totalPower = totalPower.Add(sdk.NewInt(power)) } - k.Logger(ctx).Info("total power", "totalPower", totalPower, "len(res)", len(res)) + logger.Info( + "before removal", + "totalPower", totalPower, + "len(res)", len(res), + ) // the remaining validators in prevMap have been removed. // we need to queue a change in power to 0 for them. for _, validator := range prevList { // O(N) @@ -153,7 +181,10 @@ func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { // so the previous power of these validators does not need to be subtracted. } } - k.Logger(ctx).Info("total power", "totalPower", totalPower, "len(res)", len(res)) + logger.Info( + "after removal", + "len(res)", len(res), + ) // if there are any updates, set total power on lookup index. if len(res) > 0 { k.SetLastTotalPower(ctx, totalPower) diff --git a/x/dogfood/keeper/keeper.go b/x/dogfood/keeper/keeper.go index c05af7796..42941549c 100644 --- a/x/dogfood/keeper/keeper.go +++ b/x/dogfood/keeper/keeper.go @@ -86,8 +86,8 @@ func (k Keeper) Hooks() types.DogfoodHooks { return types.MultiDogfoodHooks{} } -// MarkUpdateValidatorSetFlag marks the end of the epoch. It is called within the BeginBlocker to inform -// the module to apply the validator updates at the end of this block. +// MarkUpdateValidatorSetFlag marks that the validator set needs to be updated at the end of this block. +// Mostly, these updates occur in response to the epoch ending. In other cases, they are the result of slashing. func (k Keeper) MarkUpdateValidatorSetFlag(ctx sdk.Context) { store := ctx.KVStore(k.storeKey) key := types.ShouldUpdateValidatorSetByteKey() diff --git a/x/operator/keeper/grpc_query.go b/x/operator/keeper/grpc_query.go index fcaee14c5..8cef55b3d 100644 --- a/x/operator/keeper/grpc_query.go +++ b/x/operator/keeper/grpc_query.go @@ -13,7 +13,6 @@ import ( assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" keytypes "github.com/ExocoreNetwork/exocore/types/keys" - assetstype "github.com/ExocoreNetwork/exocore/x/assets/types" avstypes "github.com/ExocoreNetwork/exocore/x/avs/types" "github.com/ExocoreNetwork/exocore/x/operator/types" tmprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" diff --git a/x/operator/keeper/operator.go b/x/operator/keeper/operator.go index c29fb02bf..cefba2219 100644 --- a/x/operator/keeper/operator.go +++ b/x/operator/keeper/operator.go @@ -248,7 +248,7 @@ func (k *Keeper) GetImpactfulAVSForOperator(ctx sdk.Context, operatorAddr string return err } // #nosec G115 - if epochNumber+int64(unbondingDuration) <= epochInfo.CurrentEpoch { + if epochNumber >= epochInfo.CurrentEpoch-int64(unbondingDuration) { avsList = append(avsList, avsAddr) } } diff --git a/x/operator/keeper/usd_value.go b/x/operator/keeper/usd_value.go index 20c551479..b277bec05 100644 --- a/x/operator/keeper/usd_value.go +++ b/x/operator/keeper/usd_value.go @@ -470,7 +470,7 @@ func (k *Keeper) CalculateUSDValueForStaker(ctx sdk.Context, stakerID, avsAddr s return sdkmath.LegacyDec{}, err } if optedUSDValues.ActiveUSDValue.IsZero() { - return sdkmath.LegacyZeroDec(), err + return sdkmath.LegacyZeroDec(), nil } // calculate the active voting power for staker diff --git a/x/operator/types/keys.go b/x/operator/types/keys.go index 005d9e97a..1239ff735 100644 --- a/x/operator/types/keys.go +++ b/x/operator/types/keys.go @@ -4,8 +4,6 @@ import ( "encoding/binary" "math" - "github.com/ExocoreNetwork/exocore/utils" - "golang.org/x/xerrors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -165,7 +163,7 @@ func KeyForVotingPowerSnapshot(avs common.Address, height int64) []byte { return AppendMany( avs.Bytes(), // Append the height - utils.EncodeHeightBytes(uint64(height)), + sdk.Uint64ToBigEndian(uint64(height)), ) } diff --git a/x/operator/types/query.pb.go b/x/operator/types/query.pb.go index 06f6760eb..207da483f 100644 --- a/x/operator/types/query.pb.go +++ b/x/operator/types/query.pb.go @@ -9,6 +9,7 @@ import ( crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/cosmos/cosmos-proto" query "github.com/cosmos/cosmos-sdk/types/query" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -1630,6 +1631,221 @@ func (m *QueryAllSnapshotResponse) GetPagination() *query.PageResponse { return nil } +// QueryValidatorsRequest is request type for Query/Validators RPC method. +type QueryValidatorsRequest struct { + // chain is the id of the chain served by the operator. here chain_id is not used since the + // Linter complains about capitalization, which can be set with a gogoproto.custom_name but + // that is not compatible with google.api.http.get in the Query service below. + Chain string `protobuf:"bytes,1,opt,name=chain,proto3" json:"chain,omitempty"` + // pagination defines an optional pagination for the request. + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryValidatorsRequest) Reset() { *m = QueryValidatorsRequest{} } +func (m *QueryValidatorsRequest) String() string { return proto.CompactTextString(m) } +func (*QueryValidatorsRequest) ProtoMessage() {} +func (*QueryValidatorsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f91e795a3cecbdbf, []int{30} +} +func (m *QueryValidatorsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryValidatorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryValidatorsRequest.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 *QueryValidatorsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryValidatorsRequest.Merge(m, src) +} +func (m *QueryValidatorsRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryValidatorsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryValidatorsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryValidatorsRequest proto.InternalMessageInfo + +func (m *QueryValidatorsRequest) GetChain() string { + if m != nil { + return m.Chain + } + return "" +} + +func (m *QueryValidatorsRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +// QueryValidatorsResponse is response type for the Query/Validators RPC method +type QueryValidatorsResponse struct { + // validators contains all the queried validators. + Validators []Validator `protobuf:"bytes,1,rep,name=validators,proto3" json:"validators"` + // pagination defines the pagination in the response. + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryValidatorsResponse) Reset() { *m = QueryValidatorsResponse{} } +func (m *QueryValidatorsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryValidatorsResponse) ProtoMessage() {} +func (*QueryValidatorsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f91e795a3cecbdbf, []int{31} +} +func (m *QueryValidatorsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryValidatorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryValidatorsResponse.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 *QueryValidatorsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryValidatorsResponse.Merge(m, src) +} +func (m *QueryValidatorsResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryValidatorsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryValidatorsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryValidatorsResponse proto.InternalMessageInfo + +func (m *QueryValidatorsResponse) GetValidators() []Validator { + if m != nil { + return m.Validators + } + return nil +} + +func (m *QueryValidatorsResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +// QueryValidatorRequest is response type for the Query/Validator RPC method +type QueryValidatorRequest struct { + // validator_acc_addr defines the validator address to query for. + ValidatorAccAddr string `protobuf:"bytes,1,opt,name=validator_acc_addr,json=validatorAccAddr,proto3" json:"validator_acc_addr,omitempty"` + // chain is the id of the chain served by the operator. here chain_id is not used since the + // Linter complains about capitalization, which can be set with a gogoproto.custom_name but + // that is not compatible with google.api.http.get in the Query service below. + Chain string `protobuf:"bytes,2,opt,name=chain,proto3" json:"chain,omitempty"` +} + +func (m *QueryValidatorRequest) Reset() { *m = QueryValidatorRequest{} } +func (m *QueryValidatorRequest) String() string { return proto.CompactTextString(m) } +func (*QueryValidatorRequest) ProtoMessage() {} +func (*QueryValidatorRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f91e795a3cecbdbf, []int{32} +} +func (m *QueryValidatorRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryValidatorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryValidatorRequest.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 *QueryValidatorRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryValidatorRequest.Merge(m, src) +} +func (m *QueryValidatorRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryValidatorRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryValidatorRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryValidatorRequest proto.InternalMessageInfo + +func (m *QueryValidatorRequest) GetValidatorAccAddr() string { + if m != nil { + return m.ValidatorAccAddr + } + return "" +} + +func (m *QueryValidatorRequest) GetChain() string { + if m != nil { + return m.Chain + } + return "" +} + +// QueryValidatorResponse is response type for the Query/Validator RPC method +type QueryValidatorResponse struct { + // validator defines the validator info. + Validator Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator"` +} + +func (m *QueryValidatorResponse) Reset() { *m = QueryValidatorResponse{} } +func (m *QueryValidatorResponse) String() string { return proto.CompactTextString(m) } +func (*QueryValidatorResponse) ProtoMessage() {} +func (*QueryValidatorResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f91e795a3cecbdbf, []int{33} +} +func (m *QueryValidatorResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryValidatorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryValidatorResponse.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 *QueryValidatorResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryValidatorResponse.Merge(m, src) +} +func (m *QueryValidatorResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryValidatorResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryValidatorResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryValidatorResponse proto.InternalMessageInfo + +func (m *QueryValidatorResponse) GetValidator() Validator { + if m != nil { + return m.Validator + } + return Validator{} +} + func init() { proto.RegisterType((*GetOperatorInfoReq)(nil), "exocore.operator.v1.GetOperatorInfoReq") proto.RegisterType((*QueryAllOperatorsRequest)(nil), "exocore.operator.v1.QueryAllOperatorsRequest") @@ -1661,120 +1877,135 @@ func init() { proto.RegisterType((*VotingPowerSnapshotKeyHeight)(nil), "exocore.operator.v1.VotingPowerSnapshotKeyHeight") proto.RegisterType((*QueryAllSnapshotRequest)(nil), "exocore.operator.v1.QueryAllSnapshotRequest") proto.RegisterType((*QueryAllSnapshotResponse)(nil), "exocore.operator.v1.QueryAllSnapshotResponse") + proto.RegisterType((*QueryValidatorsRequest)(nil), "exocore.operator.v1.QueryValidatorsRequest") + proto.RegisterType((*QueryValidatorsResponse)(nil), "exocore.operator.v1.QueryValidatorsResponse") + proto.RegisterType((*QueryValidatorRequest)(nil), "exocore.operator.v1.QueryValidatorRequest") + proto.RegisterType((*QueryValidatorResponse)(nil), "exocore.operator.v1.QueryValidatorResponse") } func init() { proto.RegisterFile("exocore/operator/v1/query.proto", fileDescriptor_f91e795a3cecbdbf) } var fileDescriptor_f91e795a3cecbdbf = []byte{ - // 1719 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4b, 0x73, 0xd4, 0x46, - 0x1e, 0xb7, 0x6c, 0x1e, 0x9e, 0x36, 0xb0, 0x76, 0xdb, 0x80, 0x11, 0x66, 0x06, 0xc4, 0x16, 0x18, - 0x97, 0x91, 0xd6, 0xc6, 0xb0, 0x5b, 0x78, 0xd9, 0xad, 0x19, 0xcc, 0xc3, 0x98, 0x5a, 0x7b, 0x35, - 0xb5, 0x66, 0x93, 0xaa, 0x64, 0x4a, 0x9e, 0x69, 0x66, 0x14, 0x84, 0x5a, 0xa8, 0x35, 0x03, 0x53, - 0x2e, 0xa7, 0x52, 0x9c, 0x92, 0x1b, 0x95, 0xe4, 0x96, 0xca, 0xe3, 0x43, 0x90, 0xca, 0x21, 0x87, - 0xe4, 0xc8, 0x21, 0x07, 0x27, 0xb9, 0xe4, 0xe4, 0xa4, 0xec, 0xdc, 0x73, 0xc8, 0x17, 0x48, 0xa9, - 0xd5, 0x2d, 0x8d, 0x46, 0x8f, 0x99, 0x81, 0x09, 0x37, 0x4b, 0xf3, 0x7f, 0xfc, 0xfe, 0xcf, 0xfe, - 0xb5, 0x0c, 0x72, 0xe8, 0x09, 0x2e, 0x63, 0x1b, 0x29, 0xd8, 0x42, 0xb6, 0xe6, 0x60, 0x5b, 0x69, - 0xcc, 0x29, 0x8f, 0xea, 0xc8, 0x6e, 0xca, 0x96, 0x8d, 0x1d, 0x0c, 0xc7, 0x99, 0x80, 0xcc, 0x05, - 0xe4, 0xc6, 0x9c, 0x38, 0x53, 0xc6, 0xe4, 0x21, 0x26, 0xca, 0x86, 0x46, 0x90, 0x27, 0xad, 0x34, - 0xe6, 0x36, 0x90, 0xa3, 0xcd, 0x29, 0x96, 0x56, 0xd5, 0x4d, 0xcd, 0xd1, 0xb1, 0xe9, 0x19, 0x10, - 0x4f, 0x78, 0xb2, 0x25, 0xfa, 0xa4, 0x78, 0x0f, 0xec, 0xa7, 0xa9, 0x38, 0xe7, 0xce, 0x13, 0xf6, - 0xeb, 0x44, 0x15, 0x57, 0xb1, 0xa7, 0xe5, 0xfe, 0xc5, 0x75, 0xaa, 0x18, 0x57, 0x0d, 0xa4, 0x68, - 0x96, 0xae, 0x68, 0xa6, 0x89, 0x1d, 0xea, 0xcb, 0xb7, 0xe8, 0x20, 0xb3, 0x82, 0xec, 0x87, 0xba, - 0xe9, 0x28, 0x65, 0xbb, 0x69, 0x39, 0x58, 0x79, 0x80, 0x9a, 0xec, 0x57, 0xa9, 0x08, 0xe0, 0x2d, - 0xe4, 0xac, 0x32, 0x67, 0xcb, 0xe6, 0x7d, 0xac, 0xa2, 0x47, 0xf0, 0x1a, 0x38, 0xcc, 0xfd, 0x97, - 0xb4, 0x4a, 0xc5, 0x9e, 0x14, 0x4e, 0x0b, 0xd3, 0x99, 0xc2, 0xe4, 0x0f, 0xcf, 0x2f, 0x4e, 0x30, - 0xb8, 0xf9, 0x4a, 0xc5, 0x46, 0x84, 0x14, 0x1d, 0x5b, 0x37, 0xab, 0xea, 0x21, 0x2e, 0xee, 0xbe, - 0x96, 0x36, 0xc0, 0xe4, 0x7f, 0xdd, 0x0c, 0xe4, 0x0d, 0x83, 0x5b, 0x26, 0x2a, 0x7a, 0x54, 0x47, - 0xc4, 0x81, 0x37, 0x01, 0x08, 0xf2, 0x41, 0xed, 0x8e, 0xcc, 0x9f, 0x93, 0x99, 0x51, 0x37, 0x79, - 0xb2, 0x97, 0x6a, 0x96, 0x3c, 0x79, 0x4d, 0xab, 0x22, 0xa6, 0xab, 0xb6, 0x68, 0x4a, 0x1f, 0x0a, - 0xe0, 0x44, 0x8c, 0x13, 0x62, 0x61, 0x93, 0x20, 0x38, 0x0b, 0x60, 0x10, 0x40, 0xb9, 0x4c, 0x83, - 0x20, 0x93, 0xc2, 0xe9, 0xa1, 0xe9, 0x8c, 0x3a, 0xea, 0x63, 0x2d, 0x97, 0x5d, 0xb8, 0x04, 0xde, - 0x0a, 0x61, 0x1a, 0xa4, 0x98, 0xce, 0x77, 0xc4, 0xe4, 0xb9, 0x0a, 0x81, 0x72, 0x00, 0xe4, 0x58, - 0xf2, 0xeb, 0x45, 0x96, 0xa2, 0x57, 0xcc, 0x26, 0xcc, 0x81, 0x11, 0xad, 0x41, 0xa8, 0x26, 0x22, - 0x84, 0xc2, 0xcb, 0xa8, 0x40, 0x6b, 0x10, 0xa6, 0x24, 0x3d, 0x06, 0x53, 0x34, 0x13, 0xdc, 0xf5, - 0xff, 0x8a, 0x4b, 0xeb, 0x9a, 0x51, 0xe7, 0x69, 0x83, 0xf7, 0xc0, 0x68, 0xe0, 0xdf, 0xac, 0x94, - 0xb4, 0x06, 0x61, 0x89, 0x3f, 0x2f, 0xc7, 0xb4, 0xb2, 0x1c, 0x0d, 0xa1, 0xb0, 0x6f, 0x7b, 0x27, - 0x27, 0xa8, 0x47, 0x7c, 0x5c, 0x66, 0x25, 0xdf, 0x20, 0x52, 0x13, 0x9c, 0x4a, 0x70, 0xcc, 0xca, - 0xf0, 0x7f, 0x00, 0xea, 0xa4, 0x52, 0x6a, 0xb8, 0x2f, 0xb9, 0xcf, 0x99, 0x54, 0x9f, 0xab, 0x96, - 0x83, 0x2a, 0xdc, 0x4e, 0xe1, 0xf0, 0xee, 0x4e, 0x2e, 0xc3, 0x9f, 0x88, 0x9a, 0xa9, 0x93, 0x8a, - 0xf7, 0xa7, 0x74, 0x07, 0x1c, 0xf7, 0xaa, 0xbf, 0x5e, 0x6c, 0x0f, 0x57, 0x09, 0xe7, 0xcb, 0x4b, - 0xf6, 0x91, 0xdd, 0x9d, 0x1c, 0x08, 0x02, 0x0a, 0xe5, 0xef, 0x5b, 0xa1, 0x2d, 0x8e, 0xa2, 0xa1, - 0x91, 0x1a, 0x9b, 0x85, 0x3f, 0x35, 0x83, 0x6d, 0xd3, 0x30, 0xf8, 0xd2, 0xd3, 0xb0, 0x09, 0x8e, - 0x46, 0xc0, 0x17, 0x9a, 0xcb, 0x4b, 0xf0, 0x1c, 0x18, 0x26, 0xee, 0x8b, 0x92, 0x5e, 0x61, 0x99, - 0x18, 0xd9, 0xdd, 0xc9, 0x1d, 0xf4, 0x84, 0x96, 0xd4, 0x83, 0xf4, 0xc7, 0xe5, 0x0a, 0xbc, 0x0a, - 0xf6, 0xe9, 0xe6, 0x7d, 0xec, 0x43, 0x48, 0x8b, 0x2a, 0x48, 0x0f, 0xd5, 0x91, 0xbe, 0x16, 0x40, - 0x36, 0x29, 0x7f, 0xac, 0x11, 0xd6, 0xc0, 0x11, 0xcd, 0x30, 0x4a, 0x0c, 0x8a, 0xeb, 0xc8, 0x9d, - 0xc5, 0x4e, 0xcd, 0x10, 0x0a, 0x45, 0x3d, 0xa4, 0x19, 0x86, 0xff, 0xa6, 0x7f, 0x33, 0x5b, 0x02, - 0x27, 0x43, 0xe0, 0xaf, 0x63, 0x93, 0xac, 0xa0, 0x26, 0x2f, 0xfd, 0x0c, 0x18, 0x8b, 0x6c, 0x12, - 0x2f, 0x93, 0xea, 0x5f, 0xda, 0x16, 0x09, 0x9c, 0x00, 0xfb, 0xcb, 0x35, 0x4d, 0x37, 0xd9, 0x8c, - 0x7a, 0x0f, 0xd2, 0x7b, 0x42, 0xdb, 0x7c, 0xfa, 0x1e, 0x58, 0x72, 0xf2, 0x00, 0x58, 0xf5, 0x0d, - 0x43, 0x2f, 0x97, 0x1e, 0xa0, 0x26, 0xeb, 0xab, 0x29, 0x39, 0x58, 0xdb, 0xb2, 0xb7, 0xb6, 0xe5, - 0x35, 0x2a, 0xb4, 0x82, 0x9a, 0x85, 0x7d, 0x2f, 0x76, 0x72, 0x03, 0x6a, 0xc6, 0xe2, 0x2f, 0xe0, - 0x29, 0x00, 0xb0, 0xe5, 0xe8, 0x66, 0xb5, 0x84, 0xeb, 0x0e, 0x75, 0x3f, 0xac, 0x66, 0xbc, 0x37, - 0xab, 0x75, 0x47, 0x2a, 0x83, 0x5c, 0x04, 0x01, 0x9f, 0x84, 0xbe, 0xc5, 0xf9, 0x36, 0x38, 0x9d, - 0xec, 0x84, 0x85, 0x7a, 0x12, 0x64, 0xca, 0xd8, 0x24, 0xad, 0xd6, 0x87, 0xcb, 0x4c, 0xae, 0x53, - 0x10, 0xef, 0x0b, 0x60, 0xba, 0x7d, 0xe3, 0xb3, 0x54, 0x92, 0x42, 0xf3, 0xba, 0x8b, 0x61, 0x79, - 0x89, 0x87, 0xe3, 0x43, 0x14, 0x5a, 0x20, 0xf6, 0x6d, 0xdc, 0xbe, 0x13, 0xc0, 0x85, 0x2e, 0xa0, - 0xb0, 0xa0, 0xd7, 0x5b, 0x0e, 0x23, 0x1a, 0xbd, 0x7b, 0xfe, 0xb2, 0x01, 0x98, 0x4e, 0x1d, 0x00, - 0x66, 0x73, 0x4d, 0xd3, 0xed, 0xe0, 0xd8, 0xe2, 0x8e, 0xfa, 0x37, 0x02, 0x9f, 0x0a, 0x60, 0x3c, - 0xc6, 0x65, 0x4f, 0x3d, 0xb1, 0x18, 0x6a, 0xe2, 0xc1, 0xce, 0x4d, 0x9c, 0xdc, 0xbe, 0x43, 0xed, - 0x95, 0xff, 0x20, 0x21, 0xdd, 0xf4, 0xf4, 0x7e, 0xcd, 0xa5, 0xdf, 0x16, 0xc0, 0x4c, 0x37, 0x58, - 0x58, 0xed, 0xdf, 0x00, 0xe3, 0xe1, 0xda, 0x07, 0x4c, 0x64, 0x64, 0xfe, 0x42, 0xc7, 0xe2, 0xbb, - 0x56, 0x69, 0xf5, 0xc7, 0x70, 0xbb, 0xaf, 0xfe, 0x95, 0xff, 0x5d, 0x30, 0x11, 0xe7, 0xb3, 0xa7, - 0xf2, 0x87, 0x06, 0x7b, 0x30, 0x75, 0xb0, 0x23, 0xe5, 0xbd, 0x02, 0xa4, 0x08, 0x93, 0x2b, 0x34, - 0x57, 0x2d, 0x67, 0xd9, 0xcc, 0xaf, 0x17, 0x79, 0x59, 0x47, 0xc1, 0x10, 0x3f, 0x76, 0x33, 0xaa, - 0xfb, 0xa7, 0x74, 0x07, 0x9c, 0x4d, 0xd5, 0x63, 0x25, 0x38, 0xdb, 0x42, 0xbf, 0x0c, 0x9d, 0x38, - 0x8c, 0x06, 0xfa, 0x24, 0xeb, 0xae, 0x4e, 0x1c, 0x69, 0x91, 0x51, 0x80, 0xbc, 0x61, 0xe4, 0xd7, - 0x8b, 0xd4, 0x8c, 0xf7, 0x2b, 0x77, 0x2f, 0x82, 0x61, 0xae, 0xc0, 0x17, 0x17, 0x7f, 0x96, 0x16, - 0xd9, 0xf9, 0x17, 0xa3, 0xcc, 0x30, 0x9c, 0x00, 0xc3, 0x2e, 0x27, 0x69, 0x71, 0x7f, 0x50, 0x6b, - 0x10, 0xea, 0xd9, 0x04, 0xe3, 0x6c, 0x6d, 0x3a, 0xaf, 0x83, 0x72, 0x48, 0x32, 0x10, 0xa9, 0xbf, - 0xa2, 0xa9, 0x59, 0xa4, 0x86, 0x9d, 0xdb, 0xc8, 0xb0, 0x90, 0x9d, 0x9c, 0xe5, 0x65, 0x96, 0x99, - 0xa2, 0x85, 0xca, 0xfa, 0x7d, 0x1d, 0x55, 0xb8, 0x62, 0xa2, 0x0a, 0x3c, 0x06, 0x0e, 0xd4, 0x90, - 0x5e, 0xad, 0x79, 0x4b, 0x7c, 0x48, 0x65, 0x4f, 0xd2, 0xc7, 0x02, 0x98, 0x5a, 0xc7, 0x6e, 0xd9, - 0xd7, 0xf0, 0x63, 0x64, 0x73, 0x43, 0x2b, 0xa8, 0x79, 0x9b, 0x0a, 0x40, 0x19, 0x8c, 0x13, 0xf6, - 0xd2, 0x5d, 0x23, 0x25, 0x66, 0x45, 0xa0, 0x56, 0xc6, 0x48, 0x44, 0x7e, 0x09, 0x0c, 0xf3, 0x97, - 0x6c, 0x00, 0xe2, 0xf7, 0x69, 0x8c, 0x53, 0xd5, 0xd7, 0x94, 0x08, 0xe7, 0x92, 0x86, 0xd1, 0x39, - 0xb6, 0x7e, 0xed, 0x91, 0xe7, 0x42, 0x70, 0x49, 0x0a, 0xbc, 0xb2, 0x76, 0x59, 0x05, 0x19, 0x8e, - 0x8e, 0xef, 0x8a, 0xb9, 0x6e, 0x03, 0xf3, 0xb3, 0xa3, 0x06, 0x36, 0xfa, 0xb6, 0x2b, 0xe6, 0x9f, - 0x1e, 0x07, 0xfb, 0x29, 0x6c, 0xf8, 0x89, 0x00, 0xc6, 0x42, 0xe7, 0x3d, 0xa5, 0x65, 0xf1, 0xcd, - 0x19, 0xbd, 0x62, 0x8a, 0x67, 0x52, 0xbb, 0xd8, 0x95, 0x92, 0xae, 0x3e, 0xfd, 0xf1, 0xd7, 0x8f, - 0x06, 0x17, 0xe0, 0xbc, 0x12, 0x77, 0x29, 0xf6, 0xa7, 0xc3, 0xa5, 0x93, 0xca, 0x66, 0xe8, 0x86, - 0xb5, 0x05, 0x3f, 0xe3, 0xe8, 0x5a, 0x97, 0x03, 0xbc, 0x18, 0xeb, 0x34, 0xe9, 0xae, 0x2a, 0xca, - 0xdd, 0x8a, 0x7b, 0x89, 0x92, 0x66, 0x28, 0xe0, 0xbf, 0x42, 0x29, 0x16, 0xb0, 0x4b, 0x80, 0xb1, - 0x0f, 0xe5, 0xfb, 0x76, 0xd2, 0xcc, 0x0e, 0xde, 0x9b, 0xd8, 0x66, 0x67, 0x08, 0xfc, 0x5b, 0xb2, - 0xfb, 0x78, 0xb2, 0x2a, 0xce, 0xf5, 0xa0, 0xc1, 0x30, 0xdf, 0xa1, 0x98, 0x97, 0x60, 0x21, 0x3d, - 0xc9, 0x9c, 0xb7, 0xb4, 0x26, 0x9a, 0x1d, 0x09, 0x5b, 0xca, 0x26, 0x3d, 0x62, 0xb7, 0xe0, 0x8e, - 0xc0, 0x36, 0x79, 0x0c, 0x05, 0x6c, 0x89, 0x6b, 0xa1, 0x3b, 0x94, 0x61, 0x82, 0x2a, 0x5e, 0xee, - 0x51, 0x8b, 0xc5, 0xb7, 0x42, 0xe3, 0xbb, 0x01, 0xaf, 0x77, 0x11, 0x9f, 0x1b, 0x4d, 0x6a, 0x80, - 0x3f, 0x0b, 0xe0, 0x4c, 0x47, 0xde, 0x07, 0xaf, 0x75, 0xd5, 0x36, 0x49, 0xd4, 0x55, 0xfc, 0xd7, - 0xcb, 0xaa, 0xb3, 0x88, 0x17, 0x69, 0xc4, 0x97, 0xe1, 0xa5, 0x8e, 0x5d, 0x18, 0xb0, 0x51, 0x3f, - 0xc2, 0xdf, 0x04, 0x70, 0x34, 0xf6, 0x4e, 0x0f, 0xbb, 0xe8, 0xad, 0xb6, 0x9b, 0xb8, 0x38, 0xdf, - 0x8b, 0x0a, 0x43, 0x8f, 0x29, 0x7a, 0x1d, 0x56, 0xd3, 0xeb, 0xe5, 0x7f, 0x56, 0x68, 0xad, 0x97, - 0x77, 0x4c, 0xca, 0xe1, 0x55, 0x10, 0x23, 0xd0, 0xf2, 0x79, 0x60, 0x0b, 0x3e, 0x13, 0xc0, 0x68, - 0xfb, 0xa7, 0x04, 0x38, 0x9b, 0x52, 0x83, 0xc8, 0x17, 0x07, 0x51, 0x8a, 0x95, 0x5e, 0x42, 0x65, - 0x2a, 0x75, 0x53, 0x47, 0x46, 0xa5, 0xd3, 0x6e, 0x68, 0x90, 0x20, 0x24, 0xf8, 0xbb, 0x00, 0x8e, - 0xc5, 0x5f, 0xa8, 0x61, 0x17, 0x29, 0x6d, 0xff, 0x7a, 0x21, 0x5e, 0xea, 0x49, 0x87, 0xd5, 0xc1, - 0xa2, 0x78, 0xdf, 0x81, 0xb5, 0xf4, 0x3a, 0x04, 0x37, 0xfa, 0x57, 0x2e, 0xc4, 0x9e, 0x10, 0xe5, - 0x81, 0x51, 0x66, 0x0d, 0xbb, 0x1f, 0x8f, 0xd8, 0xeb, 0x81, 0xf8, 0xef, 0x97, 0xd6, 0x67, 0x99, - 0xf9, 0x27, 0xcd, 0xcc, 0x15, 0xb8, 0xd0, 0xe5, 0x7c, 0x51, 0xc6, 0xef, 0x0f, 0xd8, 0x0b, 0x21, - 0x60, 0x9a, 0xfe, 0x09, 0x72, 0x4f, 0x77, 0x6a, 0x9c, 0xb7, 0xc2, 0xbf, 0x77, 0x77, 0xea, 0x44, - 0x18, 0xb2, 0xf8, 0x8f, 0xde, 0x15, 0x59, 0x48, 0x0b, 0x34, 0x24, 0x19, 0xce, 0x26, 0x14, 0xdb, - 0x51, 0x42, 0x0c, 0x5a, 0xd9, 0xd4, 0x1a, 0x64, 0x0b, 0x7e, 0xc5, 0xdb, 0x34, 0xc2, 0x7b, 0xd3, - 0xda, 0x34, 0x89, 0x61, 0xa7, 0xb5, 0x69, 0x22, 0xb1, 0xee, 0x02, 0x39, 0xe7, 0xdd, 0x41, 0xfb, - 0x6d, 0xc1, 0x6f, 0x04, 0x70, 0xa8, 0x95, 0x74, 0xc3, 0xe9, 0xb4, 0x11, 0x69, 0xe5, 0xe5, 0x62, - 0x36, 0x81, 0xb7, 0x38, 0xa8, 0x42, 0x49, 0x0b, 0xa2, 0x80, 0x4a, 0xf0, 0xad, 0x24, 0x40, 0xfd, - 0x19, 0x96, 0xcf, 0x05, 0x76, 0x6d, 0x08, 0xd3, 0x78, 0xa8, 0x24, 0x07, 0x12, 0x4b, 0xf8, 0xc5, - 0xb3, 0xb1, 0x0a, 0x61, 0x59, 0x69, 0x9e, 0x06, 0x35, 0x0b, 0x67, 0x62, 0x83, 0xf2, 0x29, 0x7b, - 0x8d, 0x4a, 0xb3, 0xee, 0xf8, 0x92, 0x77, 0x47, 0xe4, 0xe2, 0x90, 0xd6, 0x1d, 0x49, 0xb7, 0x0c, - 0xb1, 0x77, 0xfe, 0xdb, 0xa1, 0x37, 0x38, 0x6a, 0x0f, 0xae, 0xb2, 0xe9, 0xdd, 0x35, 0xb6, 0xe0, - 0x17, 0xfe, 0x79, 0x10, 0x10, 0xf3, 0xd4, 0xf3, 0x20, 0x72, 0x6b, 0x10, 0x2f, 0x76, 0x29, 0xcd, - 0x7a, 0x58, 0xa1, 0x38, 0x2f, 0xc0, 0xf3, 0x89, 0x0b, 0x25, 0x8c, 0xb5, 0x70, 0xf7, 0xc5, 0x6e, - 0x56, 0xd8, 0xde, 0xcd, 0x0a, 0xbf, 0xec, 0x66, 0x85, 0x67, 0x7b, 0xd9, 0x81, 0xed, 0xbd, 0xec, - 0xc0, 0x4f, 0x7b, 0xd9, 0x81, 0x37, 0xe7, 0xab, 0xba, 0x53, 0xab, 0x6f, 0xc8, 0x65, 0xfc, 0x50, - 0xb9, 0xe1, 0x19, 0xfb, 0x0f, 0x72, 0x1e, 0x63, 0xfb, 0x81, 0x6f, 0xfb, 0x49, 0x60, 0xdd, 0x69, - 0x5a, 0x88, 0x6c, 0x1c, 0xa0, 0xff, 0x09, 0xba, 0xf4, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xef, - 0x24, 0x0f, 0x59, 0xf8, 0x1a, 0x00, 0x00, + // 1902 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x73, 0x1c, 0x47, + 0x15, 0x77, 0xcb, 0x4e, 0xac, 0x7d, 0x76, 0x8c, 0xd4, 0x72, 0x82, 0x3d, 0x76, 0x56, 0xce, 0x98, + 0x8a, 0x65, 0x45, 0x9e, 0x41, 0xb2, 0x13, 0xa8, 0x08, 0x43, 0x69, 0xad, 0xd8, 0x96, 0x9d, 0x42, + 0x62, 0xb6, 0xd8, 0x00, 0x55, 0xb0, 0x35, 0xda, 0x6d, 0xef, 0x0e, 0x1e, 0x4f, 0x8f, 0xb7, 0x67, + 0xd7, 0xde, 0x52, 0x89, 0xa2, 0x38, 0x85, 0x5b, 0x0a, 0xb8, 0x51, 0x01, 0x8e, 0x5c, 0xa0, 0x38, + 0x84, 0xe2, 0xc0, 0x01, 0x8e, 0x3e, 0x70, 0x30, 0xe4, 0xc2, 0x49, 0x50, 0x32, 0x55, 0x1c, 0x39, + 0xf0, 0x0f, 0x50, 0xd3, 0xd3, 0x3d, 0x1f, 0x3b, 0x1f, 0x3b, 0xeb, 0x2c, 0xbe, 0xa8, 0x76, 0x66, + 0xde, 0xeb, 0xf7, 0x7b, 0x9f, 0xdd, 0xbf, 0x16, 0x2c, 0x92, 0xc7, 0xb4, 0x45, 0x7b, 0x44, 0xa7, + 0x2e, 0xe9, 0x99, 0x1e, 0xed, 0xe9, 0x83, 0x55, 0xfd, 0x61, 0x9f, 0xf4, 0x86, 0x9a, 0xdb, 0xa3, + 0x1e, 0xc5, 0x0b, 0x42, 0x40, 0x93, 0x02, 0xda, 0x60, 0x55, 0x99, 0x37, 0x1f, 0x58, 0x0e, 0xd5, + 0xf9, 0xdf, 0x40, 0x4e, 0x59, 0x6e, 0x51, 0xf6, 0x80, 0x32, 0x7d, 0xd7, 0x64, 0x24, 0x58, 0x40, + 0x1f, 0xac, 0xee, 0x12, 0xcf, 0x5c, 0xd5, 0x5d, 0xb3, 0x63, 0x39, 0xa6, 0x67, 0x51, 0x47, 0xc8, + 0x9e, 0x13, 0xb2, 0x52, 0x2c, 0x6e, 0x50, 0x39, 0x1b, 0x7c, 0x6c, 0xf2, 0x27, 0x3d, 0x78, 0x10, + 0x9f, 0xce, 0x67, 0x81, 0xf5, 0x1e, 0x8b, 0xaf, 0x17, 0xb3, 0xbe, 0x0e, 0x4c, 0xdb, 0x6a, 0x73, + 0xd8, 0x81, 0xd0, 0xe9, 0x0e, 0xed, 0xd0, 0x60, 0x69, 0xff, 0x97, 0x5c, 0xb8, 0x43, 0x69, 0xc7, + 0x26, 0xba, 0xe9, 0x5a, 0xba, 0xe9, 0x38, 0xd4, 0xe3, 0x68, 0x43, 0xb3, 0x1e, 0x71, 0xda, 0xa4, + 0xf7, 0xc0, 0x72, 0x3c, 0xbd, 0xd5, 0x1b, 0xba, 0x1e, 0xd5, 0xef, 0x93, 0xa1, 0xf8, 0xaa, 0xd6, + 0x01, 0xdf, 0x22, 0xde, 0xb6, 0xb0, 0xb9, 0xe5, 0xdc, 0xa3, 0x06, 0x79, 0x88, 0xaf, 0xc3, 0x2b, + 0x12, 0x46, 0xd3, 0x6c, 0xb7, 0x7b, 0x67, 0xd0, 0x05, 0xb4, 0x54, 0xa9, 0x9d, 0xf9, 0xdb, 0x27, + 0x57, 0x4e, 0x0b, 0x9f, 0x36, 0xda, 0xed, 0x1e, 0x61, 0xac, 0xee, 0xf5, 0x2c, 0xa7, 0x63, 0x9c, + 0x94, 0xe2, 0xfe, 0x6b, 0x75, 0x17, 0xce, 0x7c, 0xc3, 0x8f, 0xc9, 0x86, 0x6d, 0xcb, 0x95, 0x99, + 0x41, 0x1e, 0xf6, 0x09, 0xf3, 0xf0, 0x4d, 0x80, 0x28, 0xa2, 0x7c, 0xdd, 0x13, 0x6b, 0x6f, 0x6a, + 0x62, 0x51, 0x3f, 0xfc, 0x5a, 0x10, 0x4e, 0x11, 0x7e, 0x6d, 0xc7, 0xec, 0x10, 0xa1, 0x6b, 0xc4, + 0x34, 0xd5, 0x9f, 0x20, 0x38, 0x9b, 0x61, 0x84, 0xb9, 0xd4, 0x61, 0x04, 0xaf, 0x00, 0x8e, 0x1c, + 0x68, 0xb5, 0xb8, 0x13, 0xec, 0x0c, 0xba, 0x70, 0x74, 0xa9, 0x62, 0xcc, 0x85, 0x58, 0x5b, 0x2d, + 0x1f, 0x2e, 0xc3, 0xb7, 0x12, 0x98, 0x66, 0x38, 0xa6, 0x4b, 0x63, 0x31, 0x05, 0xa6, 0x12, 0xa0, + 0x3c, 0xc0, 0x12, 0xcb, 0x46, 0xa3, 0x2e, 0x42, 0xf4, 0x19, 0xa3, 0x89, 0x17, 0xe1, 0x84, 0x39, + 0x60, 0x5c, 0x93, 0x30, 0xc6, 0xe1, 0x55, 0x0c, 0x30, 0x07, 0x4c, 0x28, 0xa9, 0x8f, 0xe0, 0x3c, + 0x8f, 0x84, 0x34, 0xfd, 0xcd, 0xfa, 0x66, 0xc3, 0xb4, 0xfb, 0x32, 0x6c, 0xf8, 0x03, 0x98, 0x8b, + 0xec, 0x3b, 0xed, 0xa6, 0x39, 0x60, 0x22, 0xf0, 0x97, 0xb4, 0x8c, 0xfe, 0xd0, 0xd2, 0x2e, 0xd4, + 0x8e, 0x3d, 0x3d, 0x58, 0x44, 0xc6, 0xa9, 0x10, 0x97, 0xd3, 0xde, 0x18, 0x30, 0x75, 0x08, 0xaf, + 0xe7, 0x18, 0x16, 0x69, 0xf8, 0x16, 0x40, 0x9f, 0xb5, 0x9b, 0x03, 0xff, 0xa5, 0xb4, 0xb9, 0x5c, + 0x68, 0x73, 0xdb, 0xf5, 0x48, 0x5b, 0xae, 0x53, 0x7b, 0xe5, 0xf0, 0x60, 0xb1, 0x22, 0x9f, 0x98, + 0x51, 0xe9, 0xb3, 0x76, 0xf0, 0x53, 0xbd, 0x03, 0x9f, 0x0f, 0xb2, 0xdf, 0xa8, 0x8f, 0xba, 0xab, + 0x27, 0xe3, 0x15, 0x04, 0xfb, 0xd4, 0xe1, 0xc1, 0x22, 0x44, 0x0e, 0x25, 0xe2, 0xf7, 0x67, 0x34, + 0xe2, 0x47, 0xdd, 0x36, 0x59, 0x57, 0xf4, 0xc2, 0xff, 0x35, 0x82, 0x23, 0xdd, 0x30, 0xf3, 0xdc, + 0xdd, 0xb0, 0x07, 0xaf, 0xa6, 0xc0, 0xd7, 0x86, 0x5b, 0x9b, 0xf8, 0x4d, 0x98, 0x65, 0xfe, 0x8b, + 0xa6, 0xd5, 0x16, 0x91, 0x38, 0x71, 0x78, 0xb0, 0x78, 0x3c, 0x10, 0xda, 0x34, 0x8e, 0xf3, 0x8f, + 0x5b, 0x6d, 0xfc, 0x2e, 0x1c, 0xb3, 0x9c, 0x7b, 0x34, 0x84, 0x50, 0xe4, 0x55, 0x14, 0x1e, 0xae, + 0xa3, 0xfe, 0x11, 0x41, 0x35, 0x2f, 0x7e, 0xa2, 0x10, 0x76, 0xe0, 0x94, 0x69, 0xdb, 0x4d, 0x01, + 0xc5, 0x37, 0xe4, 0xf7, 0xe2, 0xb8, 0x62, 0x48, 0xb8, 0x62, 0x9c, 0x34, 0x6d, 0x3b, 0x7c, 0x33, + 0xbd, 0x9e, 0x6d, 0xc2, 0xb9, 0x04, 0xf8, 0x1b, 0xd4, 0x61, 0x77, 0xc9, 0x50, 0xa6, 0x7e, 0x19, + 0xe6, 0x53, 0x93, 0x24, 0x88, 0xa4, 0xf1, 0xb9, 0x91, 0x41, 0x82, 0x4f, 0xc3, 0x4b, 0xad, 0xae, + 0x69, 0x39, 0xa2, 0x47, 0x83, 0x07, 0xf5, 0x87, 0x68, 0xa4, 0x3f, 0x43, 0x0b, 0x22, 0x38, 0x1b, + 0x00, 0x6e, 0x7f, 0xd7, 0xb6, 0x5a, 0xcd, 0xfb, 0x64, 0x28, 0xea, 0xea, 0xbc, 0x16, 0x8d, 0x6d, + 0x2d, 0x18, 0xdb, 0xda, 0x0e, 0x17, 0xba, 0x4b, 0x86, 0xb5, 0x63, 0x4f, 0x0e, 0x16, 0x8f, 0x18, + 0x15, 0x57, 0xbe, 0xc0, 0xaf, 0x03, 0x50, 0xd7, 0xb3, 0x9c, 0x4e, 0x93, 0xf6, 0x3d, 0x6e, 0x7e, + 0xd6, 0xa8, 0x04, 0x6f, 0xb6, 0xfb, 0x9e, 0xda, 0x82, 0xc5, 0x14, 0x02, 0xd9, 0x09, 0x53, 0xf3, + 0xf3, 0x7b, 0x70, 0x21, 0xdf, 0x88, 0x70, 0xf5, 0x1c, 0x54, 0x5a, 0xd4, 0x61, 0xf1, 0xd5, 0x67, + 0x5b, 0x42, 0x6e, 0x9c, 0x13, 0x1f, 0x22, 0x58, 0x1a, 0x9d, 0xf8, 0x22, 0x94, 0xac, 0x36, 0xbc, + 0xe1, 0x63, 0xd8, 0xda, 0x94, 0xee, 0x84, 0x10, 0x51, 0x0c, 0xe2, 0xd4, 0xda, 0xed, 0x2f, 0x08, + 0x2e, 0x97, 0x80, 0x22, 0x9c, 0x6e, 0xc4, 0x36, 0x23, 0xee, 0xbd, 0xbf, 0xff, 0x8a, 0x06, 0x58, + 0x2a, 0x6c, 0x00, 0xb1, 0xe6, 0x8e, 0x69, 0xf5, 0xa2, 0x6d, 0x4b, 0x1a, 0x9a, 0x5e, 0x0b, 0x7c, + 0x8c, 0x60, 0x21, 0xc3, 0xe4, 0x44, 0x35, 0xb1, 0x9e, 0x28, 0xe2, 0x99, 0xf1, 0x45, 0x9c, 0x5f, + 0xbe, 0x47, 0x47, 0x33, 0xff, 0xe3, 0x9c, 0x70, 0xf3, 0xdd, 0xfb, 0x05, 0xa7, 0xfe, 0x29, 0x82, + 0xe5, 0x32, 0x58, 0x44, 0xee, 0xbf, 0x0d, 0x0b, 0xc9, 0xdc, 0x47, 0x27, 0x91, 0x13, 0x6b, 0x97, + 0xc7, 0x26, 0xdf, 0x5f, 0x95, 0x67, 0x7f, 0x9e, 0x8e, 0xda, 0x9a, 0x5e, 0xfa, 0x7f, 0x00, 0xa7, + 0xb3, 0x6c, 0x4e, 0x94, 0xfe, 0x44, 0x63, 0xcf, 0x14, 0x36, 0x76, 0x2a, 0xbd, 0xef, 0x80, 0x9a, + 0x3a, 0xc9, 0xd5, 0x86, 0xdb, 0xae, 0xb7, 0xe5, 0x6c, 0x34, 0xea, 0x32, 0xad, 0x73, 0x70, 0x54, + 0x6e, 0xbb, 0x15, 0xc3, 0xff, 0xa9, 0xde, 0x81, 0x8b, 0x85, 0x7a, 0x22, 0x05, 0x17, 0x63, 0xc7, + 0x2f, 0xdb, 0x62, 0x9e, 0x38, 0x06, 0x86, 0x87, 0xac, 0xf7, 0x2d, 0xe6, 0xa9, 0xeb, 0xe2, 0x08, + 0xb0, 0x61, 0xdb, 0x1b, 0x8d, 0x3a, 0x5f, 0x26, 0xf8, 0x2a, 0xcd, 0x2b, 0x30, 0x2b, 0x15, 0xe4, + 0xe0, 0x92, 0xcf, 0xea, 0xba, 0xd8, 0xff, 0x32, 0x94, 0x05, 0x86, 0xb3, 0x30, 0xeb, 0x9f, 0x49, + 0x62, 0xe6, 0x8f, 0x9b, 0x03, 0xc6, 0x2d, 0x3b, 0xb0, 0x20, 0xc6, 0xa6, 0xf7, 0x22, 0x8e, 0x1c, + 0xaa, 0x06, 0x0a, 0xb7, 0x57, 0x77, 0x4c, 0x97, 0x75, 0xa9, 0x77, 0x9b, 0xd8, 0x2e, 0xe9, 0xe5, + 0x47, 0x79, 0x4b, 0x44, 0xa6, 0xee, 0x92, 0x96, 0x75, 0xcf, 0x22, 0x6d, 0xa9, 0x98, 0xab, 0x82, + 0x5f, 0x83, 0x97, 0xbb, 0xc4, 0xea, 0x74, 0x83, 0x21, 0x7e, 0xd4, 0x10, 0x4f, 0xea, 0xcf, 0x10, + 0x9c, 0x6f, 0x50, 0x3f, 0xed, 0x3b, 0xf4, 0x11, 0xe9, 0xc9, 0x85, 0xee, 0x92, 0xe1, 0x6d, 0x2e, + 0x80, 0x35, 0x58, 0x60, 0xe2, 0xa5, 0x3f, 0x46, 0x9a, 0x62, 0x15, 0xc4, 0x57, 0x99, 0x67, 0x29, + 0xf9, 0x4d, 0x98, 0x95, 0x2f, 0x45, 0x03, 0x64, 0xcf, 0xd3, 0x0c, 0xa3, 0x46, 0xa8, 0xa9, 0x32, + 0x79, 0x96, 0xb4, 0xed, 0xf1, 0xbe, 0x4d, 0x6b, 0x8e, 0x7c, 0x82, 0x22, 0x92, 0x14, 0x59, 0x15, + 0xe5, 0xb2, 0x0d, 0x15, 0x89, 0x4e, 0xce, 0x8a, 0xd5, 0xb2, 0x8e, 0x85, 0xd1, 0x31, 0xa2, 0x35, + 0xa6, 0x37, 0x2b, 0x06, 0xf0, 0x1a, 0x47, 0xdd, 0x90, 0xcc, 0x94, 0xbd, 0x98, 0xb1, 0xfb, 0x1b, + 0x24, 0x92, 0x14, 0x37, 0x2c, 0xa2, 0xb5, 0x05, 0x10, 0x12, 0x65, 0x19, 0xae, 0x6a, 0x76, 0xb8, + 0xa4, 0x58, 0xad, 0xe2, 0x9f, 0xa0, 0x7e, 0xfd, 0xef, 0xdf, 0x2d, 0x23, 0x23, 0xa6, 0x3c, 0xbd, + 0x38, 0xf5, 0xe1, 0xd5, 0x24, 0xdc, 0x88, 0xff, 0xe2, 0xd0, 0xde, 0xc8, 0x54, 0x2d, 0x60, 0x84, + 0x73, 0xa1, 0x4e, 0xf1, 0x19, 0xcc, 0x1c, 0x4d, 0x4f, 0x18, 0xa4, 0x5b, 0x50, 0x09, 0xd7, 0x10, + 0x83, 0x64, 0x82, 0x18, 0x45, 0xba, 0x6b, 0x9f, 0x9e, 0x85, 0x97, 0xb8, 0x0d, 0xfc, 0x73, 0x04, + 0xf3, 0x89, 0x13, 0x1f, 0x3f, 0x98, 0x67, 0x8f, 0xa7, 0xf4, 0x25, 0x83, 0xf2, 0x46, 0xe1, 0x1c, + 0xf3, 0xa5, 0xd4, 0x77, 0x7f, 0xf4, 0xe9, 0xbf, 0x7e, 0x3a, 0x73, 0x0d, 0xaf, 0xe9, 0x59, 0xb7, + 0x23, 0xe1, 0x7c, 0xf4, 0x09, 0x85, 0xbe, 0x97, 0xe0, 0xd8, 0xfb, 0xf8, 0x17, 0x12, 0x5d, 0x7c, + 0x7b, 0xc0, 0x57, 0x32, 0x8d, 0xe6, 0xdd, 0x56, 0x28, 0x5a, 0x59, 0xf1, 0x20, 0xca, 0xea, 0x32, + 0x07, 0xfc, 0x05, 0xac, 0x66, 0x02, 0xf6, 0x29, 0x10, 0x0d, 0xa1, 0xfc, 0x75, 0x94, 0x36, 0x89, + 0xa3, 0xd7, 0x4d, 0xda, 0x13, 0xa7, 0x08, 0xfc, 0xc5, 0x7c, 0xf3, 0xd9, 0x74, 0x45, 0x59, 0x9d, + 0x40, 0x43, 0x60, 0xbe, 0xc3, 0x31, 0x6f, 0xe2, 0x5a, 0x71, 0x90, 0xe5, 0xc9, 0x35, 0x1e, 0x68, + 0x51, 0xbe, 0xfb, 0xfa, 0x1e, 0x2f, 0xbf, 0x7d, 0x7c, 0x80, 0xc4, 0x5e, 0x9e, 0x41, 0x02, 0x62, + 0x7e, 0x5d, 0x2b, 0x87, 0x32, 0x49, 0x51, 0x94, 0xb7, 0x27, 0xd4, 0x12, 0xfe, 0xdd, 0xe5, 0xfe, + 0xbd, 0x87, 0x6f, 0x94, 0xf0, 0xcf, 0xf7, 0xa6, 0xd0, 0xc1, 0x7f, 0x20, 0x78, 0x63, 0xec, 0xc9, + 0x1f, 0x5f, 0x2f, 0x55, 0x36, 0x79, 0xe4, 0x45, 0xf9, 0xea, 0xf3, 0xaa, 0x0b, 0x8f, 0xd7, 0xb9, + 0xc7, 0x6f, 0xe3, 0xab, 0x63, 0xab, 0x30, 0xe2, 0x23, 0xa1, 0x87, 0xff, 0x41, 0x62, 0x74, 0x8d, + 0xde, 0xea, 0xe0, 0x12, 0xb5, 0x35, 0x72, 0x17, 0xa3, 0xac, 0x4d, 0xa2, 0x22, 0xd0, 0x53, 0x8e, + 0xde, 0xc2, 0x9d, 0xe2, 0x7c, 0x85, 0x17, 0x4b, 0xf1, 0x7c, 0x05, 0x07, 0x25, 0x2d, 0x39, 0x0a, + 0x32, 0x04, 0x62, 0x17, 0x44, 0xfb, 0xf8, 0x23, 0x04, 0x73, 0xa3, 0x97, 0x49, 0x78, 0xa5, 0x20, + 0x07, 0xa9, 0x3b, 0x27, 0x45, 0xcd, 0x94, 0xde, 0x24, 0x2d, 0x2e, 0x75, 0xd3, 0x22, 0x76, 0x7b, + 0xdc, 0x6c, 0x18, 0xb0, 0xc8, 0x25, 0xfc, 0x5f, 0x24, 0x06, 0x79, 0xea, 0x2a, 0x04, 0x97, 0x08, + 0xe9, 0xe8, 0xfd, 0x95, 0x72, 0x75, 0x22, 0x1d, 0x91, 0x07, 0x97, 0xe3, 0xfd, 0x3e, 0xee, 0x16, + 0xe7, 0x21, 0xba, 0xd3, 0xf9, 0xcc, 0x89, 0x78, 0x86, 0xd2, 0x4c, 0x20, 0xcd, 0xad, 0x70, 0xf9, + 0xf6, 0xc8, 0x24, 0x88, 0xca, 0xd7, 0x9e, 0x5b, 0x5f, 0x44, 0xe6, 0x2b, 0x3c, 0x32, 0xef, 0xe0, + 0x6b, 0x25, 0xfb, 0x8b, 0x73, 0xbe, 0xb0, 0xc1, 0x9e, 0xa0, 0x88, 0x6b, 0x84, 0x3b, 0xc8, 0x07, + 0x96, 0xd7, 0x95, 0xcc, 0x05, 0x7f, 0xa9, 0xdc, 0xae, 0x93, 0xe2, 0x48, 0xca, 0x97, 0x27, 0x57, + 0x14, 0x2e, 0x5d, 0xe3, 0x2e, 0x69, 0x78, 0x25, 0x27, 0xd9, 0x9e, 0x9e, 0xe0, 0x50, 0xfa, 0x9e, + 0x39, 0x60, 0xfb, 0xf8, 0x0f, 0xb2, 0x4c, 0x53, 0xcc, 0xa7, 0xa8, 0x4c, 0xf3, 0x38, 0x56, 0x51, + 0x99, 0xe6, 0x52, 0xab, 0x12, 0xc8, 0x25, 0xf3, 0x8a, 0xca, 0x6f, 0x1f, 0xff, 0x09, 0xc1, 0xc9, + 0x38, 0xed, 0xc2, 0x4b, 0x45, 0x2d, 0x12, 0x67, 0x66, 0x4a, 0x35, 0xe7, 0xdc, 0xe2, 0x91, 0x36, + 0x3f, 0xb4, 0x10, 0x0e, 0xa8, 0x89, 0xbf, 0x9b, 0x07, 0x68, 0x3a, 0xcd, 0xf2, 0x4b, 0x24, 0x88, + 0x63, 0x92, 0xc8, 0x61, 0x3d, 0xdf, 0x91, 0x4c, 0xca, 0xa7, 0x5c, 0xcc, 0x54, 0x48, 0xca, 0xaa, + 0x6b, 0xdc, 0xa9, 0x15, 0xbc, 0x9c, 0xe9, 0x54, 0x48, 0xda, 0xba, 0x5c, 0x5a, 0x54, 0xc7, 0xef, + 0x65, 0x75, 0xa4, 0xa8, 0x63, 0x51, 0x75, 0xe4, 0xf1, 0x4c, 0x65, 0x72, 0x06, 0x34, 0xa6, 0x36, + 0x24, 0xea, 0x00, 0xae, 0xbe, 0x17, 0xb0, 0xcd, 0x7d, 0xfc, 0xab, 0x70, 0x3f, 0x88, 0xa8, 0x59, + 0xe1, 0x7e, 0x90, 0xe2, 0x8d, 0xca, 0x95, 0x92, 0xd2, 0xa2, 0x86, 0x75, 0x8e, 0xf3, 0x32, 0xbe, + 0x94, 0x3b, 0x50, 0x92, 0x58, 0xf1, 0xc7, 0x08, 0x20, 0x62, 0x42, 0xf8, 0xad, 0x7c, 0x73, 0x29, + 0xa2, 0xa6, 0xac, 0x94, 0x13, 0x96, 0xed, 0xf5, 0xa1, 0x4f, 0x00, 0x0a, 0xf1, 0x45, 0xfc, 0x29, + 0x9c, 0x71, 0xbf, 0x45, 0x50, 0x09, 0x17, 0xc3, 0xcb, 0x25, 0x2c, 0x4a, 0x74, 0x6f, 0x95, 0x92, + 0x15, 0xe0, 0x6e, 0x47, 0xe0, 0xae, 0xe3, 0xf5, 0x62, 0x70, 0xfa, 0x5e, 0x9a, 0x77, 0x85, 0xe7, + 0xba, 0xda, 0xfb, 0x4f, 0x0e, 0xab, 0xe8, 0xe9, 0x61, 0x15, 0xfd, 0xf3, 0xb0, 0x8a, 0x3e, 0x7a, + 0x56, 0x3d, 0xf2, 0xf4, 0x59, 0xf5, 0xc8, 0xdf, 0x9f, 0x55, 0x8f, 0x7c, 0x67, 0xad, 0x63, 0x79, + 0xdd, 0xfe, 0xae, 0xd6, 0xa2, 0x0f, 0xf4, 0xf7, 0x02, 0x03, 0x5f, 0x27, 0xde, 0x23, 0xda, 0xbb, + 0x1f, 0xda, 0x7b, 0x1c, 0x59, 0xf4, 0x86, 0x2e, 0x61, 0xbb, 0x2f, 0xf3, 0x7f, 0xae, 0x5e, 0xfd, + 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xbe, 0xb3, 0x4f, 0xa0, 0x1e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1821,6 +2052,12 @@ type QueryClient interface { QuerySpecifiedSnapshot(ctx context.Context, in *QuerySpecifiedSnapshotRequest, opts ...grpc.CallOption) (*VotingPowerSnapshotKeyHeight, error) // QueryAllSnapshot queries all voting power snapshot for the specified AVS QueryAllSnapshot(ctx context.Context, in *QueryAllSnapshotRequest, opts ...grpc.CallOption) (*QueryAllSnapshotResponse, error) + // Validators queries all validators that match the given status. + // When called from another module, this query might consume a high amount of + // gas if the pagination field is incorrectly set. + Validators(ctx context.Context, in *QueryValidatorsRequest, opts ...grpc.CallOption) (*QueryValidatorsResponse, error) + // Validator queries validator info for given validator address. + Validator(ctx context.Context, in *QueryValidatorRequest, opts ...grpc.CallOption) (*QueryValidatorResponse, error) } type queryClient struct { @@ -1966,6 +2203,24 @@ func (c *queryClient) QueryAllSnapshot(ctx context.Context, in *QueryAllSnapshot return out, nil } +func (c *queryClient) Validators(ctx context.Context, in *QueryValidatorsRequest, opts ...grpc.CallOption) (*QueryValidatorsResponse, error) { + out := new(QueryValidatorsResponse) + err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/Validators", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) Validator(ctx context.Context, in *QueryValidatorRequest, opts ...grpc.CallOption) (*QueryValidatorResponse, error) { + out := new(QueryValidatorResponse) + err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/Validator", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { // QueryOperatorInfo queries the operator information. @@ -2000,6 +2255,12 @@ type QueryServer interface { QuerySpecifiedSnapshot(context.Context, *QuerySpecifiedSnapshotRequest) (*VotingPowerSnapshotKeyHeight, error) // QueryAllSnapshot queries all voting power snapshot for the specified AVS QueryAllSnapshot(context.Context, *QueryAllSnapshotRequest) (*QueryAllSnapshotResponse, error) + // Validators queries all validators that match the given status. + // When called from another module, this query might consume a high amount of + // gas if the pagination field is incorrectly set. + Validators(context.Context, *QueryValidatorsRequest) (*QueryValidatorsResponse, error) + // Validator queries validator info for given validator address. + Validator(context.Context, *QueryValidatorRequest) (*QueryValidatorResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -2051,6 +2312,12 @@ func (*UnimplementedQueryServer) QuerySpecifiedSnapshot(ctx context.Context, req func (*UnimplementedQueryServer) QueryAllSnapshot(ctx context.Context, req *QueryAllSnapshotRequest) (*QueryAllSnapshotResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryAllSnapshot not implemented") } +func (*UnimplementedQueryServer) Validators(ctx context.Context, req *QueryValidatorsRequest) (*QueryValidatorsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Validators not implemented") +} +func (*UnimplementedQueryServer) Validator(ctx context.Context, req *QueryValidatorRequest) (*QueryValidatorResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Validator not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -2326,6 +2593,42 @@ func _Query_QueryAllSnapshot_Handler(srv interface{}, ctx context.Context, dec f return interceptor(ctx, in, info, handler) } +func _Query_Validators_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryValidatorsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).Validators(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/exocore.operator.v1.Query/Validators", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).Validators(ctx, req.(*QueryValidatorsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_Validator_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryValidatorRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).Validator(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/exocore.operator.v1.Query/Validator", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).Validator(ctx, req.(*QueryValidatorRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "exocore.operator.v1.Query", HandlerType: (*QueryServer)(nil), @@ -2390,6 +2693,14 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "QueryAllSnapshot", Handler: _Query_QueryAllSnapshot_Handler, }, + { + MethodName: "Validators", + Handler: _Query_Validators_Handler, + }, + { + MethodName: "Validator", + Handler: _Query_Validator_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "exocore/operator/v1/query.proto", @@ -3572,57 +3883,218 @@ func (m *QueryAllSnapshotResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { - offset -= sovQuery(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ +func (m *QueryValidatorsRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - dAtA[offset] = uint8(v) - return base + return dAtA[:n], nil } -func (m *GetOperatorInfoReq) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.OperatorAddr) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n + +func (m *QueryValidatorsRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllOperatorsRequest) Size() (n int) { - if m == nil { - return 0 - } +func (m *QueryValidatorsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - return n + if len(m.Chain) > 0 { + i -= len(m.Chain) + copy(dAtA[i:], m.Chain) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Chain))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } -func (m *QueryAllOperatorsResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QueryValidatorsResponse) 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 *QueryValidatorsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryValidatorsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if len(m.OperatorAccAddrs) > 0 { - for _, s := range m.OperatorAccAddrs { - l = len(s) - n += 1 + l + sovQuery(uint64(l)) - } - } if m.Pagination != nil { - l = m.Pagination.Size() + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.Validators) > 0 { + for iNdEx := len(m.Validators) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Validators[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *QueryValidatorRequest) 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 *QueryValidatorRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryValidatorRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Chain) > 0 { + i -= len(m.Chain) + copy(dAtA[i:], m.Chain) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Chain))) + i-- + dAtA[i] = 0x12 + } + if len(m.ValidatorAccAddr) > 0 { + i -= len(m.ValidatorAccAddr) + copy(dAtA[i:], m.ValidatorAccAddr) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ValidatorAccAddr))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryValidatorResponse) 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 *QueryValidatorResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryValidatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Validator.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { + offset -= sovQuery(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *GetOperatorInfoReq) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.OperatorAddr) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllOperatorsRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllOperatorsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.OperatorAccAddrs) > 0 { + for _, s := range m.OperatorAccAddrs { + l = len(s) + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -4063,6 +4535,70 @@ func (m *QueryAllSnapshotResponse) Size() (n int) { return n } +func (m *QueryValidatorsRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Chain) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryValidatorsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Validators) > 0 { + for _, e := range m.Validators { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryValidatorRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ValidatorAccAddr) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.Chain) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryValidatorResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.Validator.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -7204,6 +7740,441 @@ func (m *QueryAllSnapshotResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryValidatorsRequest) 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 ErrIntOverflowQuery + } + 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: QueryValidatorsRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryValidatorsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Chain", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + 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 ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Chain = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryValidatorsResponse) 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 ErrIntOverflowQuery + } + 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: QueryValidatorsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryValidatorsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Validators", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Validators = append(m.Validators, Validator{}) + if err := m.Validators[len(m.Validators)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryValidatorRequest) 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 ErrIntOverflowQuery + } + 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: QueryValidatorRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryValidatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorAccAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + 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 ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ValidatorAccAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Chain", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + 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 ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Chain = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryValidatorResponse) 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 ErrIntOverflowQuery + } + 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: QueryValidatorResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryValidatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Validator", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Validator.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/operator/types/query.pb.gw.go b/x/operator/types/query.pb.gw.go index 4e514f08e..c291dd23e 100644 --- a/x/operator/types/query.pb.gw.go +++ b/x/operator/types/query.pb.gw.go @@ -1047,6 +1047,154 @@ func local_request_Query_QueryAllSnapshot_0(ctx context.Context, marshaler runti } +var ( + filter_Query_Validators_0 = &utilities.DoubleArray{Encoding: map[string]int{"chain": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_Query_Validators_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryValidatorsRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["chain"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain") + } + + protoReq.Chain, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Validators_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.Validators(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_Validators_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryValidatorsRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["chain"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain") + } + + protoReq.Chain, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Validators_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.Validators(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_Validator_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryValidatorRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["validator_acc_addr"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "validator_acc_addr") + } + + protoReq.ValidatorAccAddr, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_acc_addr", err) + } + + val, ok = pathParams["chain"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain") + } + + protoReq.Chain, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain", err) + } + + msg, err := client.Validator(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_Validator_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryValidatorRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["validator_acc_addr"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "validator_acc_addr") + } + + protoReq.ValidatorAccAddr, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_acc_addr", err) + } + + val, ok = pathParams["chain"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain") + } + + protoReq.Chain, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain", err) + } + + msg, err := server.Validator(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -1398,6 +1546,52 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_Validators_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_Validators_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_Validators_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_Validator_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_Validator_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_Validator_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -1739,6 +1933,46 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_Validators_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_Validators_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_Validators_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_Validator_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_Validator_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_Validator_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -1772,6 +2006,10 @@ var ( pattern_Query_QuerySpecifiedSnapshot_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "snapshot", "avs", "height"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_QueryAllSnapshot_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"exocore", "operator", "v1", "all_snapshot", "avs"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_Validators_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"exocore", "operator", "v1", "validators", "chain"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_Validator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"exocore", "operator", "v1", "validator", "validator_acc_addr", "chain"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -1804,4 +2042,8 @@ var ( forward_Query_QuerySpecifiedSnapshot_0 = runtime.ForwardResponseMessage forward_Query_QueryAllSnapshot_0 = runtime.ForwardResponseMessage + + forward_Query_Validators_0 = runtime.ForwardResponseMessage + + forward_Query_Validator_0 = runtime.ForwardResponseMessage ) diff --git a/x/operator/types/tx.pb.go b/x/operator/types/tx.pb.go index bffbc6f75..9e00f26ea 100644 --- a/x/operator/types/tx.pb.go +++ b/x/operator/types/tx.pb.go @@ -200,7 +200,10 @@ func (m *OperatorVotingPower) GetOperatorAddr() string { return "" } -// VotingPowerSnapshot is used to record the historical voting power for AVSs +// VotingPowerSnapshot records historical voting power for AVSs at specific epochs +// or after slashing events.These snapshots are created at the end of each epoch and +// when slashing occurs, enabling historical queries of operator voting power at +// specific points in time. type VotingPowerSnapshot struct { // total_voting_power is the total voting power of specified AVS TotalVotingPower github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=total_voting_power,json=totalVotingPower,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"total_voting_power"` @@ -208,7 +211,7 @@ type VotingPowerSnapshot struct { // for the specified AVS OperatorVotingPowers []*OperatorVotingPower `protobuf:"bytes,2,rep,name=operator_voting_powers,json=operatorVotingPowers,proto3" json:"operator_voting_powers,omitempty"` // last_changed_height is used to indicate the height of most recent change when - // the voting_power_set is nil, which can help to fall back to the correct epoch height. + // the operator_voting_powers is nil, which can help to fall back to the correct epoch height. LastChangedHeight int64 `protobuf:"varint,3,opt,name=last_changed_height,json=lastChangedHeight,proto3" json:"last_changed_height,omitempty"` // epoch_identifier record the epoch info EpochIdentifier string `protobuf:"bytes,4,opt,name=epoch_identifier,json=epochIdentifier,proto3" json:"epoch_identifier,omitempty"`