From b2ef76bd611313ae68a4f591865f4ebe823549c5 Mon Sep 17 00:00:00 2001 From: Alexxxxxx <118710506+alexgao001@users.noreply.github.com> Date: Thu, 14 Mar 2024 18:33:25 +0800 Subject: [PATCH 01/13] delete after harkfork (#592) --- x/storage/keeper/keeper.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x/storage/keeper/keeper.go b/x/storage/keeper/keeper.go index 0f896175d..542db4474 100644 --- a/x/storage/keeper/keeper.go +++ b/x/storage/keeper/keeper.go @@ -235,8 +235,9 @@ func (k Keeper) doDeleteBucket(ctx sdk.Context, operator sdk.AccAddress, bucketI store.Delete(types.GetQuotaKey(bucketInfo.Id)) store.Delete(types.GetInternalBucketInfoKey(bucketInfo.Id)) store.Delete(types.GetMigrationBucketKey(bucketInfo.Id)) - store.Delete(types.GetLockedObjectCountKey(bucketInfo.Id)) - + if ctx.IsUpgraded(upgradetypes.Pawnee) { + store.Delete(types.GetLockedObjectCountKey(bucketInfo.Id)) + } err := k.appendResourceIdForGarbageCollection(ctx, resource.RESOURCE_TYPE_BUCKET, bucketInfo.Id) if err != nil { return err From 664a6a1121af386f64a80427534f5894f20d0a04 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Fri, 15 Mar 2024 16:20:26 +0800 Subject: [PATCH 02/13] fix: add upgrade check when deleting rate limit status --- x/storage/keeper/keeper.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/x/storage/keeper/keeper.go b/x/storage/keeper/keeper.go index 9fc41affa..b1dd90f79 100644 --- a/x/storage/keeper/keeper.go +++ b/x/storage/keeper/keeper.go @@ -6,6 +6,14 @@ import ( "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" + "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/store/prefix" + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/cosmos/gogoproto/proto" + "github.com/bnb-chain/greenfield/internal/sequence" gnfdtypes "github.com/bnb-chain/greenfield/types" types2 "github.com/bnb-chain/greenfield/types" @@ -18,13 +26,6 @@ import ( sptypes "github.com/bnb-chain/greenfield/x/sp/types" "github.com/bnb-chain/greenfield/x/storage/types" virtualgroupmoduletypes "github.com/bnb-chain/greenfield/x/virtualgroup/types" - "github.com/cometbft/cometbft/libs/log" - "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gogoproto/proto" ) type ( @@ -269,8 +270,10 @@ func (k Keeper) doDeleteBucket(ctx sdk.Context, operator sdk.AccAddress, bucketI } } - // delete bucket flow rate limit status - k.deleteBucketFlowRateLimitStatus(ctx, bucketInfo.BucketName) + if ctx.IsUpgraded(upgradetypes.Serengeti) { + // delete bucket flow rate limit status + k.deleteBucketFlowRateLimitStatus(ctx, bucketInfo.BucketName) + } return nil } From d6842c3fb53e1efab07c79cdcc78ab19e34a250d Mon Sep 17 00:00:00 2001 From: Alexxxxxx <118710506+alexgao001@users.noreply.github.com> Date: Mon, 25 Mar 2024 11:32:28 +0800 Subject: [PATCH 03/13] add event (#596) --- proto/greenfield/storage/events.proto | 13 + x/storage/keeper/msg_server.go | 8 +- x/storage/types/events.pb.go | 519 +++++++++++++++++++------- 3 files changed, 412 insertions(+), 128 deletions(-) diff --git a/proto/greenfield/storage/events.proto b/proto/greenfield/storage/events.proto index e3f5149fa..21d142d0c 100644 --- a/proto/greenfield/storage/events.proto +++ b/proto/greenfield/storage/events.proto @@ -655,3 +655,16 @@ message EventBucketFlowRateLimitStatus { // is_limited define the status of the bucket flow rate limit bool is_limited = 2; } + +message EventToggleSPAsDelegatedAgent { + // bucket_name define the name of the bucket + string bucket_name = 1; + // bucket_id is the unique u256 for bucket. Not global, only unique in buckets. + string bucket_id = 2 [ + (cosmos_proto.scalar) = "cosmos.Uint", + (gogoproto.customtype) = "Uint", + (gogoproto.nullable) = false + ]; + // sp_as_delegated_agent_disabled indicates that whether bucket owner disable SP as the upload agent. + bool sp_as_delegated_agent_disabled = 3; +} diff --git a/x/storage/keeper/msg_server.go b/x/storage/keeper/msg_server.go index 3c2dcf3f3..57dad2b1e 100644 --- a/x/storage/keeper/msg_server.go +++ b/x/storage/keeper/msg_server.go @@ -113,8 +113,14 @@ func (k msgServer) ToggleSPAsDelegatedAgent(goCtx context.Context, msg *storaget } bucketInfo.SpAsDelegatedAgentDisabled = !bucketInfo.SpAsDelegatedAgentDisabled k.SetBucketInfo(ctx, bucketInfo) + if err := ctx.EventManager().EmitTypedEvents(&types.EventToggleSPAsDelegatedAgent{ + BucketName: bucketInfo.BucketName, + BucketId: bucketInfo.Id, + SpAsDelegatedAgentDisabled: bucketInfo.SpAsDelegatedAgentDisabled, + }); err != nil { + return nil, err + } return &types.MsgToggleSPAsDelegatedAgentResponse{}, nil - } func (k msgServer) CreateObject(goCtx context.Context, msg *types.MsgCreateObject) (*types.MsgCreateObjectResponse, error) { diff --git a/x/storage/types/events.pb.go b/x/storage/types/events.pb.go index 06c527247..74c2873fe 100644 --- a/x/storage/types/events.pb.go +++ b/x/storage/types/events.pb.go @@ -2806,6 +2806,62 @@ func (m *EventBucketFlowRateLimitStatus) GetIsLimited() bool { return false } +type EventToggleSPAsDelegatedAgent struct { + // bucket_name define the name of the bucket + BucketName string `protobuf:"bytes,1,opt,name=bucket_name,json=bucketName,proto3" json:"bucket_name,omitempty"` + // bucket_id is the unique u256 for bucket. Not global, only unique in buckets. + BucketId Uint `protobuf:"bytes,2,opt,name=bucket_id,json=bucketId,proto3,customtype=Uint" json:"bucket_id"` + // sp_as_delegated_agent_disabled indicates that whether bucket owner disable SP as the upload agent. + SpAsDelegatedAgentDisabled bool `protobuf:"varint,3,opt,name=sp_as_delegated_agent_disabled,json=spAsDelegatedAgentDisabled,proto3" json:"sp_as_delegated_agent_disabled,omitempty"` +} + +func (m *EventToggleSPAsDelegatedAgent) Reset() { *m = EventToggleSPAsDelegatedAgent{} } +func (m *EventToggleSPAsDelegatedAgent) String() string { return proto.CompactTextString(m) } +func (*EventToggleSPAsDelegatedAgent) ProtoMessage() {} +func (*EventToggleSPAsDelegatedAgent) Descriptor() ([]byte, []int) { + return fileDescriptor_946dcba4f763ddc4, []int{36} +} +func (m *EventToggleSPAsDelegatedAgent) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EventToggleSPAsDelegatedAgent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EventToggleSPAsDelegatedAgent.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 *EventToggleSPAsDelegatedAgent) XXX_Merge(src proto.Message) { + xxx_messageInfo_EventToggleSPAsDelegatedAgent.Merge(m, src) +} +func (m *EventToggleSPAsDelegatedAgent) XXX_Size() int { + return m.Size() +} +func (m *EventToggleSPAsDelegatedAgent) XXX_DiscardUnknown() { + xxx_messageInfo_EventToggleSPAsDelegatedAgent.DiscardUnknown(m) +} + +var xxx_messageInfo_EventToggleSPAsDelegatedAgent proto.InternalMessageInfo + +func (m *EventToggleSPAsDelegatedAgent) GetBucketName() string { + if m != nil { + return m.BucketName + } + return "" +} + +func (m *EventToggleSPAsDelegatedAgent) GetSpAsDelegatedAgentDisabled() bool { + if m != nil { + return m.SpAsDelegatedAgentDisabled + } + return false +} + func init() { proto.RegisterType((*EventCreateBucket)(nil), "greenfield.storage.EventCreateBucket") proto.RegisterType((*EventDeleteBucket)(nil), "greenfield.storage.EventDeleteBucket") @@ -2843,138 +2899,143 @@ func init() { proto.RegisterType((*EventCancelUpdateObjectContent)(nil), "greenfield.storage.EventCancelUpdateObjectContent") proto.RegisterType((*EventSetBucketFlowRateLimit)(nil), "greenfield.storage.EventSetBucketFlowRateLimit") proto.RegisterType((*EventBucketFlowRateLimitStatus)(nil), "greenfield.storage.EventBucketFlowRateLimitStatus") + proto.RegisterType((*EventToggleSPAsDelegatedAgent)(nil), "greenfield.storage.EventToggleSPAsDelegatedAgent") } func init() { proto.RegisterFile("greenfield/storage/events.proto", fileDescriptor_946dcba4f763ddc4) } var fileDescriptor_946dcba4f763ddc4 = []byte{ - // 2015 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcd, 0x8f, 0x1b, 0x49, - 0x15, 0x4f, 0xfb, 0x6b, 0xec, 0xe7, 0xb1, 0x9d, 0x69, 0x86, 0xac, 0x99, 0x6c, 0x3c, 0xde, 0x46, - 0x84, 0xd9, 0x15, 0xf1, 0xa0, 0xec, 0x82, 0x22, 0x81, 0x14, 0xcd, 0x4c, 0x76, 0x91, 0x45, 0x76, - 0x13, 0xda, 0xd9, 0x3d, 0x70, 0x69, 0xca, 0xdd, 0x65, 0xa7, 0x49, 0xbb, 0xcb, 0x74, 0x95, 0x67, - 0xe2, 0xfd, 0x07, 0x38, 0x21, 0xad, 0x84, 0x90, 0xe0, 0xb2, 0x57, 0x90, 0x10, 0x12, 0x87, 0xbd, - 0x72, 0xcf, 0x71, 0x37, 0x5c, 0x60, 0x91, 0x16, 0x94, 0x5c, 0x00, 0x09, 0xc1, 0x99, 0x13, 0xaa, - 0x8f, 0x6e, 0x77, 0xbb, 0x3d, 0xf1, 0xb4, 0xb3, 0xb3, 0x33, 0xe1, 0x34, 0xd3, 0xcf, 0xaf, 0xaa, - 0xdf, 0xc7, 0xef, 0x7d, 0xd4, 0xab, 0x86, 0xed, 0x61, 0x80, 0xb1, 0x3f, 0x70, 0xb1, 0xe7, 0xec, - 0x52, 0x46, 0x02, 0x34, 0xc4, 0xbb, 0xf8, 0x10, 0xfb, 0x8c, 0x76, 0xc6, 0x01, 0x61, 0x44, 0xd7, - 0x67, 0x0c, 0x1d, 0xc5, 0xb0, 0xf5, 0x15, 0x9b, 0xd0, 0x11, 0xa1, 0x96, 0xe0, 0xd8, 0x95, 0x0f, - 0x92, 0x7d, 0x6b, 0x73, 0x48, 0x86, 0x44, 0xd2, 0xf9, 0x7f, 0x8a, 0xba, 0x3d, 0x24, 0x64, 0xe8, - 0xe1, 0x5d, 0xf1, 0xd4, 0x9f, 0x0c, 0x76, 0x99, 0x3b, 0xc2, 0x94, 0xa1, 0xd1, 0x38, 0x62, 0x98, - 0x89, 0x11, 0x60, 0x4a, 0x26, 0x81, 0x8d, 0x77, 0xd9, 0x74, 0x8c, 0xe9, 0x02, 0x86, 0x50, 0x4e, - 0x9b, 0x8c, 0x46, 0xc4, 0x57, 0x0c, 0xad, 0x05, 0x0c, 0xb1, 0x0d, 0x8c, 0x3f, 0x16, 0x60, 0xe3, - 0x4d, 0xae, 0xd8, 0x41, 0x80, 0x11, 0xc3, 0xfb, 0x13, 0xfb, 0x01, 0x66, 0x7a, 0x07, 0x8a, 0xe4, - 0xc8, 0xc7, 0x41, 0x53, 0x6b, 0x6b, 0x3b, 0x95, 0xfd, 0xe6, 0xe3, 0x8f, 0xae, 0x6d, 0x2a, 0x7d, - 0xf6, 0x1c, 0x27, 0xc0, 0x94, 0xf6, 0x58, 0xe0, 0xfa, 0x43, 0x53, 0xb2, 0xe9, 0xdb, 0x50, 0xed, - 0x8b, 0x95, 0x96, 0x8f, 0x46, 0xb8, 0x99, 0xe3, 0xab, 0x4c, 0x90, 0xa4, 0x77, 0xd0, 0x08, 0xeb, - 0xfb, 0x00, 0x87, 0x2e, 0x75, 0xfb, 0xae, 0xe7, 0xb2, 0x69, 0x33, 0xdf, 0xd6, 0x76, 0xea, 0xd7, - 0x8d, 0x4e, 0xda, 0x86, 0x9d, 0xf7, 0x22, 0xae, 0x7b, 0xd3, 0x31, 0x36, 0x63, 0xab, 0xf4, 0xcb, - 0x50, 0xb1, 0x85, 0x90, 0x16, 0x62, 0xcd, 0x42, 0x5b, 0xdb, 0xc9, 0x9b, 0x65, 0x49, 0xd8, 0x63, - 0xfa, 0x0d, 0xa8, 0x28, 0x09, 0x5c, 0xa7, 0x59, 0x14, 0x52, 0x5f, 0x7e, 0xf4, 0xd9, 0xf6, 0x85, - 0x4f, 0x3f, 0xdb, 0x2e, 0xbc, 0xeb, 0xfa, 0xec, 0xf1, 0x47, 0xd7, 0xaa, 0x4a, 0x03, 0xfe, 0x68, - 0x96, 0x25, 0x77, 0xd7, 0xd1, 0x6f, 0x42, 0x55, 0x1a, 0xd6, 0xe2, 0x76, 0x69, 0x96, 0x84, 0x6c, - 0xad, 0x45, 0xb2, 0xf5, 0x04, 0x9b, 0x94, 0x8b, 0x46, 0xff, 0xeb, 0xdf, 0x00, 0xdd, 0xbe, 0x8f, - 0x82, 0x21, 0x76, 0xac, 0x00, 0x23, 0xc7, 0xfa, 0xc9, 0x84, 0x30, 0xd4, 0x5c, 0x6b, 0x6b, 0x3b, - 0x05, 0xf3, 0xa2, 0xfa, 0xc5, 0xc4, 0xc8, 0xf9, 0x01, 0xa7, 0xeb, 0x7b, 0xd0, 0x18, 0xa3, 0xe9, - 0x08, 0xfb, 0xcc, 0x42, 0xd2, 0x94, 0xcd, 0xf2, 0x12, 0x23, 0xd7, 0xd5, 0x02, 0x45, 0xd5, 0x0d, - 0xa8, 0x8d, 0x03, 0x77, 0x84, 0x82, 0xa9, 0x45, 0xc7, 0x5c, 0xdf, 0x4a, 0x5b, 0xdb, 0xa9, 0x99, - 0x55, 0x45, 0xec, 0x8d, 0xbb, 0x8e, 0xbe, 0x0f, 0xad, 0xa1, 0x47, 0xfa, 0xc8, 0xb3, 0x0e, 0xdd, - 0x80, 0x4d, 0x90, 0x67, 0x0d, 0x03, 0x32, 0x19, 0x5b, 0x03, 0x34, 0x72, 0xbd, 0x29, 0x5f, 0x04, - 0x62, 0xd1, 0x96, 0xe4, 0x7a, 0x4f, 0x32, 0x7d, 0x8f, 0xf3, 0xbc, 0x25, 0x58, 0xba, 0x8e, 0x7e, - 0x03, 0x4a, 0x94, 0x21, 0x36, 0xa1, 0xcd, 0xaa, 0x30, 0x4a, 0x7b, 0x91, 0x51, 0x24, 0x62, 0x7a, - 0x82, 0xcf, 0x54, 0xfc, 0xc6, 0x2f, 0x73, 0x0a, 0x55, 0xb7, 0xb0, 0x87, 0x23, 0x54, 0xbd, 0x01, - 0x65, 0x32, 0xc6, 0x01, 0x62, 0x64, 0x39, 0xb0, 0x22, 0xce, 0x19, 0x16, 0x73, 0x2b, 0x61, 0x31, - 0x9f, 0xc2, 0x62, 0x02, 0x2a, 0x85, 0x2c, 0x50, 0x59, 0x6e, 0xd4, 0xe2, 0x32, 0xa3, 0x1a, 0x3f, - 0xcd, 0xc3, 0x97, 0x85, 0x69, 0xde, 0x1d, 0x3b, 0x51, 0xc0, 0x75, 0xfd, 0x01, 0x59, 0xd1, 0x3c, - 0x4b, 0x43, 0x2f, 0xa1, 0x6e, 0x3e, 0x8b, 0xba, 0x8b, 0x81, 0x5d, 0x38, 0x06, 0xd8, 0x5f, 0x4f, - 0x03, 0x5b, 0xc4, 0x61, 0x0a, 0xbe, 0xc9, 0x5c, 0x50, 0x5a, 0x29, 0x17, 0x2c, 0xf7, 0xc4, 0xda, - 0x52, 0x4f, 0xfc, 0x46, 0x83, 0x4b, 0x12, 0xa4, 0x2e, 0xb5, 0x89, 0xcf, 0x5c, 0x7f, 0x12, 0x22, - 0x35, 0x61, 0x33, 0x2d, 0x8b, 0xcd, 0x96, 0xba, 0xe3, 0x12, 0x94, 0x02, 0x8c, 0x28, 0xf1, 0x15, - 0x32, 0xd5, 0x13, 0xcf, 0x6e, 0x8e, 0x08, 0x96, 0x58, 0x76, 0x93, 0x84, 0x3d, 0x66, 0xfc, 0xbc, - 0x94, 0xc8, 0xd2, 0x77, 0xfa, 0x3f, 0xc6, 0x36, 0xd3, 0xaf, 0xc3, 0x9a, 0xc8, 0x7f, 0x27, 0xc0, - 0x4b, 0xc8, 0xf8, 0xf9, 0x47, 0xd3, 0x36, 0x54, 0x89, 0x10, 0x47, 0x32, 0x14, 0x24, 0x83, 0x24, - 0xa5, 0xf1, 0x57, 0xca, 0x62, 0xcb, 0x1b, 0x50, 0x51, 0x5b, 0x2b, 0x7f, 0x2e, 0x5b, 0x29, 0xb9, - 0xbb, 0x4e, 0x3a, 0x43, 0x96, 0xd3, 0x19, 0xf2, 0x15, 0x58, 0x1f, 0xa3, 0xa9, 0x47, 0x90, 0x63, - 0x51, 0xf7, 0x7d, 0x2c, 0x92, 0x68, 0xc1, 0xac, 0x2a, 0x5a, 0xcf, 0x7d, 0x7f, 0xbe, 0x6a, 0xc1, - 0x4a, 0x48, 0x7d, 0x05, 0xd6, 0x39, 0xb8, 0x78, 0x58, 0x88, 0xfa, 0x52, 0x15, 0x06, 0xaa, 0x2a, - 0x9a, 0x28, 0x20, 0x89, 0xc2, 0xb6, 0x9e, 0x2a, 0x6c, 0x61, 0x12, 0xae, 0x1d, 0x9f, 0x84, 0x25, - 0x20, 0x92, 0x49, 0x58, 0xff, 0x3e, 0x34, 0x02, 0xec, 0x4c, 0x7c, 0x07, 0xf9, 0xf6, 0x54, 0xbe, - 0xbc, 0x7e, 0xbc, 0x0a, 0x66, 0xc4, 0x2a, 0x54, 0xa8, 0x07, 0x89, 0xe7, 0xf9, 0x2a, 0xd9, 0xc8, - 0x5c, 0x25, 0x5f, 0x86, 0x8a, 0x7d, 0x1f, 0xdb, 0x0f, 0xe8, 0x64, 0x44, 0x9b, 0x17, 0xdb, 0xf9, - 0x9d, 0x75, 0x73, 0x46, 0xd0, 0x5f, 0x87, 0x4b, 0x1e, 0xb1, 0x53, 0xe1, 0xec, 0x3a, 0xcd, 0x0d, - 0xe1, 0xb9, 0x2f, 0x89, 0x5f, 0xe3, 0x61, 0xdc, 0x75, 0x8c, 0x7f, 0x6b, 0xf0, 0x92, 0x8c, 0x0a, - 0xe4, 0xdb, 0xd8, 0x4b, 0xc4, 0xc6, 0x29, 0x25, 0xd3, 0x39, 0xb4, 0xe7, 0x53, 0x68, 0x4f, 0x21, - 0xaf, 0x90, 0x46, 0x5e, 0x02, 0xd7, 0xa5, 0x0c, 0xb8, 0xe6, 0xc5, 0xa3, 0x21, 0x34, 0xee, 0x61, - 0xe4, 0x9d, 0xb1, 0xa6, 0x09, 0x2d, 0x8a, 0x59, 0xa2, 0x73, 0x06, 0xe9, 0x52, 0x46, 0x48, 0x7f, - 0x0b, 0x5e, 0x5a, 0x98, 0xf6, 0xa3, 0x7c, 0xbf, 0x99, 0xce, 0xf7, 0x5d, 0xe7, 0x19, 0xe8, 0x2a, - 0x1f, 0x8b, 0xae, 0x24, 0x60, 0x2b, 0x73, 0x80, 0x35, 0x3e, 0x0c, 0x3d, 0x71, 0x40, 0xc6, 0xd3, - 0xe7, 0xf2, 0xc4, 0x55, 0x68, 0xd0, 0xc0, 0xb6, 0xd2, 0xde, 0xa8, 0xd1, 0xc0, 0xde, 0x9f, 0x39, - 0x44, 0xf1, 0xa5, 0x9d, 0xc2, 0xf9, 0xee, 0xcc, 0xfc, 0x72, 0x15, 0x1a, 0x0e, 0x65, 0x89, 0xfd, - 0x64, 0x52, 0xae, 0x39, 0x94, 0x25, 0xf7, 0xe3, 0x7c, 0xf1, 0xfd, 0x8a, 0x11, 0x5f, 0x6c, 0xbf, - 0x9b, 0x50, 0x8b, 0xbd, 0xf7, 0x64, 0x88, 0xad, 0x46, 0x22, 0x89, 0x06, 0xbb, 0x16, 0x7b, 0xd1, - 0xc9, 0x52, 0x79, 0x35, 0x92, 0x61, 0x45, 0xf7, 0x19, 0xff, 0xd5, 0x12, 0x2d, 0xe8, 0x79, 0x0a, - 0x96, 0x42, 0x96, 0x60, 0x39, 0x5e, 0xf9, 0xe2, 0xf1, 0xca, 0xff, 0x5d, 0x53, 0x4d, 0xa6, 0x89, - 0x45, 0x14, 0x9d, 0xb3, 0x6c, 0x91, 0xc9, 0x00, 0x57, 0x00, 0x06, 0x24, 0xb0, 0x26, 0xa2, 0x5d, - 0x16, 0x4a, 0x97, 0xcd, 0xca, 0x80, 0x04, 0xb2, 0x7f, 0x5e, 0xd8, 0xc5, 0x29, 0x5d, 0xe7, 0xa4, - 0xd6, 0x16, 0xb5, 0xc6, 0x33, 0xa1, 0x72, 0x59, 0x84, 0x5a, 0xa9, 0x8b, 0xfb, 0x59, 0x2e, 0xd1, - 0xfa, 0x2b, 0x7c, 0x9f, 0x62, 0xeb, 0x7f, 0x8a, 0x5e, 0x49, 0xb6, 0x46, 0xc5, 0x55, 0x5a, 0x23, - 0xe3, 0x3f, 0x1a, 0x5c, 0x8c, 0x75, 0xb5, 0x02, 0xbc, 0x99, 0x47, 0x0f, 0x57, 0x00, 0x64, 0x44, - 0xc4, 0x6c, 0x50, 0x11, 0x14, 0xa1, 0xe1, 0xb7, 0xa1, 0x1c, 0x05, 0xcc, 0x09, 0x0e, 0x3f, 0x6b, - 0x43, 0x95, 0xfd, 0xe7, 0xfa, 0x9d, 0x42, 0xe6, 0x7e, 0x67, 0x13, 0x8a, 0xf8, 0x21, 0x0b, 0x90, - 0x4a, 0xaa, 0xf2, 0xc1, 0xf8, 0x55, 0xa8, 0xb2, 0xcc, 0x4a, 0x73, 0x2a, 0xe7, 0x56, 0x51, 0x39, - 0xff, 0x2c, 0x95, 0x0b, 0x27, 0x57, 0xd9, 0xf8, 0xb3, 0xa6, 0x4a, 0xda, 0x6d, 0x8c, 0x0e, 0x95, - 0x68, 0x37, 0xa1, 0x3e, 0xc2, 0xa3, 0x3e, 0x0e, 0xa2, 0x33, 0xdd, 0x32, 0xb7, 0xd4, 0x24, 0x7f, - 0x78, 0xd8, 0x3b, 0x27, 0xba, 0xfd, 0x2b, 0xa7, 0xb2, 0x84, 0x0c, 0x3d, 0xa1, 0xdc, 0xdb, 0x42, - 0xd0, 0x2f, 0x68, 0x2a, 0x71, 0x3a, 0x7a, 0xe9, 0x77, 0x43, 0xff, 0x50, 0x8b, 0x11, 0xee, 0xa3, - 0x66, 0xb1, 0x9d, 0xdf, 0xa9, 0x5e, 0x7f, 0x6d, 0x11, 0x52, 0x85, 0x01, 0x62, 0xaa, 0xdf, 0xc2, - 0x0c, 0xb9, 0x9e, 0xb9, 0xae, 0x76, 0xb8, 0x47, 0xf6, 0x1c, 0x47, 0xbf, 0x05, 0x1b, 0xb1, 0x1d, - 0x65, 0xee, 0x6a, 0x96, 0xda, 0xf9, 0x67, 0x2a, 0xd9, 0x88, 0xb6, 0x90, 0xb8, 0x36, 0xfe, 0x92, - 0x8b, 0x0a, 0x90, 0x8f, 0x8f, 0xfe, 0x6f, 0xcc, 0x3d, 0x97, 0x15, 0x8a, 0x99, 0xb3, 0xc2, 0x2d, - 0x58, 0x53, 0xa6, 0x12, 0x36, 0xcd, 0xe6, 0xa8, 0x70, 0xa9, 0xf1, 0x8b, 0xb0, 0xe6, 0xa5, 0x78, - 0xf4, 0x6f, 0x42, 0x49, 0x72, 0x2d, 0x35, 0xae, 0xe2, 0xd3, 0xbb, 0xd0, 0xc0, 0x0f, 0xc7, 0x6e, - 0x80, 0x98, 0x4b, 0x7c, 0x8b, 0xb9, 0x2a, 0x8b, 0x56, 0xaf, 0x6f, 0x75, 0xe4, 0x78, 0xba, 0x13, - 0x8e, 0xa7, 0x3b, 0xf7, 0xc2, 0xf1, 0xf4, 0x7e, 0xe1, 0x83, 0xbf, 0x6e, 0x6b, 0x66, 0x7d, 0xb6, - 0x90, 0xff, 0x64, 0xfc, 0x53, 0x4b, 0x14, 0x38, 0x21, 0xdd, 0x9b, 0x3c, 0xef, 0xbd, 0xd8, 0x5e, - 0x5f, 0x9c, 0xca, 0x1f, 0x85, 0x0d, 0xe6, 0xdb, 0x6e, 0x10, 0x90, 0xe0, 0xb9, 0x66, 0x9c, 0xd9, - 0x86, 0x78, 0x99, 0x66, 0x96, 0x06, 0xd4, 0x1c, 0x4c, 0x99, 0x65, 0xdf, 0x47, 0xae, 0x3f, 0x6b, - 0x1b, 0xab, 0x9c, 0x78, 0xc0, 0x69, 0x5d, 0xc7, 0xf8, 0x7d, 0x78, 0x90, 0x8e, 0xab, 0x62, 0x62, - 0x3a, 0xf1, 0x18, 0xef, 0x74, 0xd4, 0x61, 0x4d, 0x13, 0x0b, 0xc3, 0xa3, 0xd8, 0x19, 0x8b, 0xfc, - 0x8f, 0xa4, 0xf5, 0x5f, 0xd8, 0xee, 0xf6, 0x24, 0xba, 0x7e, 0x92, 0x74, 0x8f, 0xd4, 0xf5, 0x79, - 0xdd, 0x73, 0xc6, 0x3a, 0xfd, 0x21, 0x6c, 0x84, 0xa4, 0x4e, 0xe7, 0xaa, 0xf7, 0x4b, 0xc9, 0x5f, - 0x48, 0xcb, 0xff, 0xdb, 0x30, 0x05, 0xc7, 0xe4, 0x5f, 0xe2, 0x92, 0x33, 0x94, 0xf6, 0x50, 0x01, - 0xa8, 0xc7, 0x90, 0x87, 0xef, 0x12, 0xcf, 0xb5, 0xa7, 0x07, 0x1e, 0x46, 0xfe, 0x64, 0xac, 0x6f, - 0x41, 0xb9, 0xef, 0x11, 0xfb, 0xc1, 0x3b, 0x93, 0x91, 0x90, 0x37, 0x6f, 0x46, 0xcf, 0xbc, 0xdc, - 0xa9, 0xd3, 0x8c, 0xeb, 0x0f, 0x88, 0x2a, 0x0b, 0x0b, 0xcb, 0x9d, 0x2c, 0xfb, 0xfc, 0x2c, 0x63, - 0x82, 0x13, 0xfd, 0x6f, 0x3c, 0xd6, 0x60, 0x53, 0x59, 0x69, 0x28, 0xeb, 0xc4, 0x17, 0x98, 0x26, - 0x33, 0xdd, 0x75, 0xbc, 0x0a, 0x1b, 0x0e, 0x65, 0xd6, 0xa2, 0xd9, 0x5d, 0xdd, 0xa1, 0xec, 0xee, - 0x6c, 0x7c, 0x67, 0xfc, 0x4e, 0x83, 0xad, 0xd8, 0xd8, 0xf1, 0xbc, 0xab, 0xc6, 0xa1, 0xda, 0x8c, - 0x0d, 0x03, 0xa4, 0xbc, 0xf8, 0xbc, 0x4a, 0xfb, 0x61, 0x0e, 0x5e, 0x56, 0x83, 0xb5, 0xd1, 0x98, - 0x03, 0xe9, 0xdc, 0x43, 0x67, 0xf9, 0x5d, 0x54, 0x61, 0xe9, 0x55, 0xeb, 0xab, 0xb0, 0x41, 0x03, - 0x7b, 0x0e, 0x7e, 0x32, 0x6d, 0xd6, 0x69, 0x60, 0xc7, 0xe1, 0x67, 0x41, 0x55, 0x8d, 0x80, 0xd9, - 0x3d, 0x34, 0xe4, 0xf1, 0x1b, 0x7e, 0x19, 0xa0, 0x26, 0x1c, 0xd1, 0xb3, 0xfe, 0x06, 0x14, 0x18, - 0x1a, 0x52, 0x15, 0xb8, 0xed, 0xc5, 0x63, 0x7f, 0xd5, 0x9d, 0xa2, 0x21, 0x35, 0x05, 0xb7, 0xf1, - 0xeb, 0x9c, 0xc2, 0x4b, 0x7c, 0x4c, 0x71, 0x20, 0xef, 0x2b, 0x56, 0xb4, 0xfe, 0xea, 0x83, 0x96, - 0xe7, 0xbf, 0x7f, 0x9a, 0xbf, 0xe7, 0x29, 0xa6, 0xef, 0x79, 0x12, 0xa3, 0xde, 0xd2, 0xfc, 0xdd, - 0x44, 0x13, 0xd6, 0x0e, 0x71, 0x40, 0x5d, 0xe2, 0x8b, 0xc9, 0x65, 0xde, 0x0c, 0x1f, 0x8d, 0x4f, - 0xf2, 0xb0, 0x7d, 0x9c, 0xa5, 0x7a, 0x13, 0xdb, 0xe6, 0x07, 0xe0, 0x17, 0xd2, 0x60, 0x89, 0x1b, - 0xab, 0x62, 0xfa, 0xc6, 0xea, 0x35, 0xd8, 0x18, 0x07, 0xf8, 0xd0, 0x4a, 0x18, 0xb6, 0x24, 0x0c, - 0xdb, 0xe0, 0x3f, 0xdc, 0x8d, 0x19, 0x77, 0x07, 0x2e, 0xfa, 0xf8, 0x28, 0xc9, 0x2a, 0x3f, 0x8e, - 0xa8, 0xfb, 0xf8, 0x28, 0xce, 0xf9, 0x35, 0xa8, 0x8b, 0x5d, 0x67, 0xbe, 0x28, 0x0b, 0x5f, 0xd4, - 0x38, 0xf5, 0x20, 0xf2, 0xc7, 0x57, 0xa1, 0xc6, 0x37, 0x9c, 0x1f, 0xce, 0xaf, 0xfb, 0xf8, 0xe8, - 0x60, 0x91, 0xd3, 0x20, 0xe1, 0x34, 0x5e, 0x86, 0xe5, 0x2c, 0xd1, 0xb1, 0x10, 0x13, 0xd7, 0x71, - 0x79, 0xb3, 0xa2, 0x28, 0x7b, 0x8c, 0x97, 0xac, 0x56, 0x2c, 0xbb, 0x7f, 0x7e, 0x31, 0x70, 0x86, - 0x1d, 0x99, 0xf1, 0x69, 0x0e, 0x2e, 0x87, 0x49, 0x43, 0xa6, 0xd1, 0xb7, 0x3c, 0x72, 0x64, 0x22, - 0x86, 0x6f, 0xbb, 0x23, 0xf7, 0xd4, 0x34, 0x5a, 0xf0, 0xad, 0x4b, 0x3e, 0xe3, 0xb7, 0x2e, 0xdf, - 0x81, 0x75, 0xf5, 0x0e, 0xd9, 0x19, 0x16, 0x96, 0xac, 0x57, 0x12, 0xdd, 0x11, 0xfd, 0xa1, 0x03, - 0x8d, 0x81, 0x47, 0x8e, 0x2c, 0x5e, 0xef, 0x2c, 0x8f, 0x6b, 0xaa, 0x2e, 0xaa, 0xbe, 0xab, 0xcc, - 0x76, 0x75, 0xe8, 0xb2, 0xfb, 0x93, 0x7e, 0xc7, 0x26, 0x23, 0xf5, 0xbd, 0x96, 0xfa, 0x73, 0x8d, - 0x3a, 0x0f, 0xd4, 0x77, 0x52, 0x5d, 0x61, 0x58, 0x50, 0x6f, 0xeb, 0xfa, 0xcc, 0xac, 0x0d, 0xe2, - 0xc6, 0x33, 0x7e, 0xa4, 0x00, 0xb3, 0xc0, 0xb0, 0xbd, 0x85, 0xcd, 0x78, 0x7a, 0x10, 0x7d, 0x05, - 0xc0, 0xa5, 0x52, 0x42, 0x2c, 0xe3, 0xbd, 0x6c, 0x56, 0x5c, 0x7a, 0x5b, 0x12, 0xf6, 0xbb, 0x8f, - 0x9e, 0xb4, 0xb4, 0x8f, 0x9f, 0xb4, 0xb4, 0xbf, 0x3d, 0x69, 0x69, 0x1f, 0x3c, 0x6d, 0x5d, 0xf8, - 0xf8, 0x69, 0xeb, 0xc2, 0x9f, 0x9e, 0xb6, 0x2e, 0xfc, 0x70, 0x37, 0xa6, 0x40, 0xdf, 0xef, 0x5f, - 0x13, 0x4d, 0xe0, 0x6e, 0xec, 0x9b, 0xaf, 0x87, 0xc9, 0xaf, 0xbe, 0xfa, 0x25, 0x71, 0x98, 0x7f, - 0xfd, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x66, 0xb1, 0x47, 0xe1, 0x26, 0x00, 0x00, + // 2075 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcb, 0x8f, 0x1c, 0x47, + 0x19, 0x77, 0xcf, 0x6b, 0x67, 0x6a, 0x76, 0x66, 0xbc, 0xcd, 0xe2, 0x0c, 0xeb, 0x78, 0x76, 0xd2, + 0x08, 0xb3, 0x89, 0xf0, 0x2c, 0x72, 0x02, 0xb2, 0x04, 0x92, 0xb5, 0x8f, 0x04, 0x8d, 0x70, 0xe2, + 0xa5, 0x67, 0x93, 0x03, 0x97, 0xa6, 0xa6, 0xbb, 0xa6, 0xdd, 0xb8, 0xa7, 0xab, 0xe9, 0xaa, 0xd9, + 0xf5, 0xe4, 0x1f, 0xe0, 0x84, 0x14, 0x09, 0x21, 0xc1, 0x25, 0x57, 0x90, 0x10, 0x12, 0x87, 0x5c, + 0xe1, 0xec, 0x63, 0x62, 0x2e, 0x10, 0xa4, 0x80, 0xec, 0x0b, 0x20, 0x21, 0x38, 0x73, 0x42, 0xf5, + 0xe8, 0x9e, 0xee, 0xe9, 0x5e, 0xcf, 0xf6, 0x38, 0xeb, 0x5d, 0xe7, 0xb4, 0xdb, 0xdf, 0x7c, 0x55, + 0xfd, 0x3d, 0x7e, 0xdf, 0xa3, 0xbe, 0x6a, 0xb0, 0x69, 0x07, 0x08, 0x79, 0x23, 0x07, 0xb9, 0xd6, + 0x36, 0xa1, 0x38, 0x80, 0x36, 0xda, 0x46, 0x47, 0xc8, 0xa3, 0xa4, 0xe7, 0x07, 0x98, 0x62, 0x55, + 0x9d, 0x31, 0xf4, 0x24, 0xc3, 0xc6, 0x57, 0x4c, 0x4c, 0xc6, 0x98, 0x18, 0x9c, 0x63, 0x5b, 0x3c, + 0x08, 0xf6, 0x8d, 0x75, 0x1b, 0xdb, 0x58, 0xd0, 0xd9, 0x7f, 0x92, 0xba, 0x69, 0x63, 0x6c, 0xbb, + 0x68, 0x9b, 0x3f, 0x0d, 0x27, 0xa3, 0x6d, 0xea, 0x8c, 0x11, 0xa1, 0x70, 0xec, 0x47, 0x0c, 0x33, + 0x31, 0x02, 0x44, 0xf0, 0x24, 0x30, 0xd1, 0x36, 0x9d, 0xfa, 0x88, 0x64, 0x30, 0x84, 0x72, 0x9a, + 0x78, 0x3c, 0xc6, 0x9e, 0x64, 0xe8, 0x64, 0x30, 0xc4, 0x36, 0xd0, 0xfe, 0x54, 0x02, 0x6b, 0x6f, + 0x32, 0xc5, 0xf6, 0x02, 0x04, 0x29, 0xda, 0x9d, 0x98, 0xf7, 0x11, 0x55, 0x7b, 0xa0, 0x8c, 0x8f, + 0x3d, 0x14, 0xb4, 0x95, 0xae, 0xb2, 0x55, 0xdb, 0x6d, 0x3f, 0xfa, 0xe8, 0xc6, 0xba, 0xd4, 0x67, + 0xc7, 0xb2, 0x02, 0x44, 0xc8, 0x80, 0x06, 0x8e, 0x67, 0xeb, 0x82, 0x4d, 0xdd, 0x04, 0xf5, 0x21, + 0x5f, 0x69, 0x78, 0x70, 0x8c, 0xda, 0x05, 0xb6, 0x4a, 0x07, 0x82, 0xf4, 0x0e, 0x1c, 0x23, 0x75, + 0x17, 0x80, 0x23, 0x87, 0x38, 0x43, 0xc7, 0x75, 0xe8, 0xb4, 0x5d, 0xec, 0x2a, 0x5b, 0xcd, 0x9b, + 0x5a, 0x2f, 0x6d, 0xc3, 0xde, 0x7b, 0x11, 0xd7, 0xe1, 0xd4, 0x47, 0x7a, 0x6c, 0x95, 0x7a, 0x15, + 0xd4, 0x4c, 0x2e, 0xa4, 0x01, 0x69, 0xbb, 0xd4, 0x55, 0xb6, 0x8a, 0x7a, 0x55, 0x10, 0x76, 0xa8, + 0x7a, 0x0b, 0xd4, 0xa4, 0x04, 0x8e, 0xd5, 0x2e, 0x73, 0xa9, 0xaf, 0x3e, 0xfc, 0x6c, 0xf3, 0xd2, + 0xa7, 0x9f, 0x6d, 0x96, 0xde, 0x75, 0x3c, 0xfa, 0xe8, 0xa3, 0x1b, 0x75, 0xa9, 0x01, 0x7b, 0xd4, + 0xab, 0x82, 0xbb, 0x6f, 0xa9, 0xb7, 0x41, 0x5d, 0x18, 0xd6, 0x60, 0x76, 0x69, 0x57, 0xb8, 0x6c, + 0x9d, 0x2c, 0xd9, 0x06, 0x9c, 0x4d, 0xc8, 0x45, 0xa2, 0xff, 0xd5, 0x6f, 0x00, 0xd5, 0xbc, 0x07, + 0x03, 0x1b, 0x59, 0x46, 0x80, 0xa0, 0x65, 0xfc, 0x64, 0x82, 0x29, 0x6c, 0xaf, 0x74, 0x95, 0xad, + 0x92, 0x7e, 0x59, 0xfe, 0xa2, 0x23, 0x68, 0xfd, 0x80, 0xd1, 0xd5, 0x1d, 0xd0, 0xf2, 0xe1, 0x74, + 0x8c, 0x3c, 0x6a, 0x40, 0x61, 0xca, 0x76, 0x75, 0x81, 0x91, 0x9b, 0x72, 0x81, 0xa4, 0xaa, 0x1a, + 0x68, 0xf8, 0x81, 0x33, 0x86, 0xc1, 0xd4, 0x20, 0x3e, 0xd3, 0xb7, 0xd6, 0x55, 0xb6, 0x1a, 0x7a, + 0x5d, 0x12, 0x07, 0x7e, 0xdf, 0x52, 0x77, 0x41, 0xc7, 0x76, 0xf1, 0x10, 0xba, 0xc6, 0x91, 0x13, + 0xd0, 0x09, 0x74, 0x0d, 0x3b, 0xc0, 0x13, 0xdf, 0x18, 0xc1, 0xb1, 0xe3, 0x4e, 0xd9, 0x22, 0xc0, + 0x17, 0x6d, 0x08, 0xae, 0xf7, 0x04, 0xd3, 0xf7, 0x18, 0xcf, 0x5b, 0x9c, 0xa5, 0x6f, 0xa9, 0xb7, + 0x40, 0x85, 0x50, 0x48, 0x27, 0xa4, 0x5d, 0xe7, 0x46, 0xe9, 0x66, 0x19, 0x45, 0x20, 0x66, 0xc0, + 0xf9, 0x74, 0xc9, 0xaf, 0xfd, 0xb2, 0x20, 0x51, 0xb5, 0x8f, 0x5c, 0x14, 0xa1, 0xea, 0x0d, 0x50, + 0xc5, 0x3e, 0x0a, 0x20, 0xc5, 0x8b, 0x81, 0x15, 0x71, 0xce, 0xb0, 0x58, 0x58, 0x0a, 0x8b, 0xc5, + 0x14, 0x16, 0x13, 0x50, 0x29, 0xe5, 0x81, 0xca, 0x62, 0xa3, 0x96, 0x17, 0x19, 0x55, 0xfb, 0x69, + 0x11, 0x7c, 0x99, 0x9b, 0xe6, 0x5d, 0xdf, 0x8a, 0x02, 0xae, 0xef, 0x8d, 0xf0, 0x92, 0xe6, 0x59, + 0x18, 0x7a, 0x09, 0x75, 0x8b, 0x79, 0xd4, 0xcd, 0x06, 0x76, 0xe9, 0x04, 0x60, 0x7f, 0x3d, 0x0d, + 0x6c, 0x1e, 0x87, 0x29, 0xf8, 0x26, 0x73, 0x41, 0x65, 0xa9, 0x5c, 0xb0, 0xd8, 0x13, 0x2b, 0x0b, + 0x3d, 0xf1, 0x1b, 0x05, 0x5c, 0x11, 0x20, 0x75, 0x88, 0x89, 0x3d, 0xea, 0x78, 0x93, 0x10, 0xa9, + 0x09, 0x9b, 0x29, 0x79, 0x6c, 0xb6, 0xd0, 0x1d, 0x57, 0x40, 0x25, 0x40, 0x90, 0x60, 0x4f, 0x22, + 0x53, 0x3e, 0xb1, 0xec, 0x66, 0xf1, 0x60, 0x89, 0x65, 0x37, 0x41, 0xd8, 0xa1, 0xda, 0xcf, 0x2b, + 0x89, 0x2c, 0x7d, 0x77, 0xf8, 0x63, 0x64, 0x52, 0xf5, 0x26, 0x58, 0xe1, 0xf9, 0xef, 0x14, 0x78, + 0x09, 0x19, 0x3f, 0xff, 0x68, 0xda, 0x04, 0x75, 0xcc, 0xc5, 0x11, 0x0c, 0x25, 0xc1, 0x20, 0x48, + 0x69, 0xfc, 0x55, 0xf2, 0xd8, 0xf2, 0x16, 0xa8, 0xc9, 0xad, 0xa5, 0x3f, 0x17, 0xad, 0x14, 0xdc, + 0x7d, 0x2b, 0x9d, 0x21, 0xab, 0xe9, 0x0c, 0xf9, 0x0a, 0x58, 0xf5, 0xe1, 0xd4, 0xc5, 0xd0, 0x32, + 0x88, 0xf3, 0x3e, 0xe2, 0x49, 0xb4, 0xa4, 0xd7, 0x25, 0x6d, 0xe0, 0xbc, 0x3f, 0x5f, 0xb5, 0xc0, + 0x52, 0x48, 0x7d, 0x05, 0xac, 0x32, 0x70, 0xb1, 0xb0, 0xe0, 0xf5, 0xa5, 0xce, 0x0d, 0x54, 0x97, + 0x34, 0x5e, 0x40, 0x12, 0x85, 0x6d, 0x35, 0x55, 0xd8, 0xc2, 0x24, 0xdc, 0x38, 0x39, 0x09, 0x0b, + 0x40, 0x24, 0x93, 0xb0, 0xfa, 0x7d, 0xd0, 0x0a, 0x90, 0x35, 0xf1, 0x2c, 0xe8, 0x99, 0x53, 0xf1, + 0xf2, 0xe6, 0xc9, 0x2a, 0xe8, 0x11, 0x2b, 0x57, 0xa1, 0x19, 0x24, 0x9e, 0xe7, 0xab, 0x64, 0x2b, + 0x77, 0x95, 0x7c, 0x19, 0xd4, 0xcc, 0x7b, 0xc8, 0xbc, 0x4f, 0x26, 0x63, 0xd2, 0xbe, 0xdc, 0x2d, + 0x6e, 0xad, 0xea, 0x33, 0x82, 0xfa, 0x3a, 0xb8, 0xe2, 0x62, 0x33, 0x15, 0xce, 0x8e, 0xd5, 0x5e, + 0xe3, 0x9e, 0xfb, 0x12, 0xff, 0x35, 0x1e, 0xc6, 0x7d, 0x4b, 0xfb, 0x8f, 0x02, 0x5e, 0x12, 0x51, + 0x01, 0x3d, 0x13, 0xb9, 0x89, 0xd8, 0x38, 0xa3, 0x64, 0x3a, 0x87, 0xf6, 0x62, 0x0a, 0xed, 0x29, + 0xe4, 0x95, 0xd2, 0xc8, 0x4b, 0xe0, 0xba, 0x92, 0x03, 0xd7, 0xac, 0x78, 0xb4, 0xb8, 0xc6, 0x03, + 0x04, 0xdd, 0x73, 0xd6, 0x34, 0xa1, 0x45, 0x39, 0x4f, 0x74, 0xce, 0x20, 0x5d, 0xc9, 0x09, 0xe9, + 0x6f, 0x81, 0x97, 0x32, 0xd3, 0x7e, 0x94, 0xef, 0xd7, 0xd3, 0xf9, 0xbe, 0x6f, 0x3d, 0x05, 0x5d, + 0xd5, 0x13, 0xd1, 0x95, 0x04, 0x6c, 0x6d, 0x0e, 0xb0, 0xda, 0x87, 0xa1, 0x27, 0xf6, 0xb0, 0x3f, + 0x7d, 0x26, 0x4f, 0x5c, 0x07, 0x2d, 0x12, 0x98, 0x46, 0xda, 0x1b, 0x0d, 0x12, 0x98, 0xbb, 0x33, + 0x87, 0x48, 0xbe, 0xb4, 0x53, 0x18, 0xdf, 0xdd, 0x99, 0x5f, 0xae, 0x83, 0x96, 0x45, 0x68, 0x62, + 0x3f, 0x91, 0x94, 0x1b, 0x16, 0xa1, 0xc9, 0xfd, 0x18, 0x5f, 0x7c, 0xbf, 0x72, 0xc4, 0x17, 0xdb, + 0xef, 0x36, 0x68, 0xc4, 0xde, 0x7b, 0x3a, 0xc4, 0xd6, 0x23, 0x91, 0x78, 0x83, 0xdd, 0x88, 0xbd, + 0xe8, 0x74, 0xa9, 0xbc, 0x1e, 0xc9, 0xb0, 0xa4, 0xfb, 0xb4, 0xff, 0x29, 0x89, 0x16, 0xf4, 0x22, + 0x05, 0x4b, 0x29, 0x4f, 0xb0, 0x9c, 0xac, 0x7c, 0xf9, 0x64, 0xe5, 0xff, 0xa1, 0xc8, 0x26, 0x53, + 0x47, 0x3c, 0x8a, 0x2e, 0x58, 0xb6, 0xc8, 0x65, 0x80, 0x6b, 0x00, 0x8c, 0x70, 0x60, 0x4c, 0x78, + 0xbb, 0xcc, 0x95, 0xae, 0xea, 0xb5, 0x11, 0x0e, 0x44, 0xff, 0x9c, 0xd9, 0xc5, 0x49, 0x5d, 0xe7, + 0xa4, 0x56, 0xb2, 0x5a, 0xe3, 0x99, 0x50, 0x85, 0x3c, 0x42, 0x2d, 0xd5, 0xc5, 0xfd, 0xac, 0x90, + 0x68, 0xfd, 0x25, 0xbe, 0xcf, 0xb0, 0xf5, 0x3f, 0x43, 0xaf, 0x24, 0x5b, 0xa3, 0xf2, 0x32, 0xad, + 0x91, 0xf6, 0x5f, 0x05, 0x5c, 0x8e, 0x75, 0xb5, 0x1c, 0xbc, 0xb9, 0x47, 0x0f, 0xd7, 0x00, 0x10, + 0x11, 0x11, 0xb3, 0x41, 0x8d, 0x53, 0xb8, 0x86, 0xdf, 0x06, 0xd5, 0x28, 0x60, 0x4e, 0x71, 0xf8, + 0x59, 0xb1, 0x65, 0xf6, 0x9f, 0xeb, 0x77, 0x4a, 0xb9, 0xfb, 0x9d, 0x75, 0x50, 0x46, 0x0f, 0x68, + 0x00, 0x65, 0x52, 0x15, 0x0f, 0xda, 0xaf, 0x42, 0x95, 0x45, 0x56, 0x9a, 0x53, 0xb9, 0xb0, 0x8c, + 0xca, 0xc5, 0xa7, 0xa9, 0x5c, 0x3a, 0xbd, 0xca, 0xda, 0x5f, 0x14, 0x59, 0xd2, 0xee, 0x20, 0x78, + 0x24, 0x45, 0xbb, 0x0d, 0x9a, 0x63, 0x34, 0x1e, 0xa2, 0x20, 0x3a, 0xd3, 0x2d, 0x72, 0x4b, 0x43, + 0xf0, 0x87, 0x87, 0xbd, 0x0b, 0xa2, 0xdb, 0xbf, 0x0b, 0x32, 0x4b, 0x88, 0xd0, 0xe3, 0xca, 0xbd, + 0xcd, 0x05, 0x7d, 0x4e, 0x53, 0x89, 0xb3, 0xd1, 0x4b, 0x3d, 0x08, 0xfd, 0x43, 0x0c, 0x8a, 0x99, + 0x8f, 0xda, 0xe5, 0x6e, 0x71, 0xab, 0x7e, 0xf3, 0xb5, 0x2c, 0xa4, 0x72, 0x03, 0xc4, 0x54, 0xdf, + 0x47, 0x14, 0x3a, 0xae, 0xbe, 0x2a, 0x77, 0x38, 0xc4, 0x3b, 0x96, 0xa5, 0xee, 0x83, 0xb5, 0xd8, + 0x8e, 0x22, 0x77, 0xb5, 0x2b, 0xdd, 0xe2, 0x53, 0x95, 0x6c, 0x45, 0x5b, 0x08, 0x5c, 0x6b, 0x7f, + 0x2d, 0x44, 0x05, 0xc8, 0x43, 0xc7, 0x5f, 0x18, 0x73, 0xcf, 0x65, 0x85, 0x72, 0xee, 0xac, 0xb0, + 0x0f, 0x56, 0xa4, 0xa9, 0xb8, 0x4d, 0xf3, 0x39, 0x2a, 0x5c, 0xaa, 0xfd, 0x22, 0xac, 0x79, 0x29, + 0x1e, 0xf5, 0x9b, 0xa0, 0x22, 0xb8, 0x16, 0x1a, 0x57, 0xf2, 0xa9, 0x7d, 0xd0, 0x42, 0x0f, 0x7c, + 0x27, 0x80, 0xd4, 0xc1, 0x9e, 0x41, 0x1d, 0x99, 0x45, 0xeb, 0x37, 0x37, 0x7a, 0x62, 0x3c, 0xdd, + 0x0b, 0xc7, 0xd3, 0xbd, 0xc3, 0x70, 0x3c, 0xbd, 0x5b, 0xfa, 0xe0, 0x6f, 0x9b, 0x8a, 0xde, 0x9c, + 0x2d, 0x64, 0x3f, 0x69, 0xff, 0x52, 0x12, 0x05, 0x8e, 0x4b, 0xf7, 0x26, 0xcb, 0x7b, 0x2f, 0xb6, + 0xd7, 0xb3, 0x53, 0xf9, 0xc3, 0xb0, 0xc1, 0x7c, 0xdb, 0x09, 0x02, 0x1c, 0x3c, 0xd3, 0x8c, 0x33, + 0xdf, 0x10, 0x2f, 0xd7, 0xcc, 0x52, 0x03, 0x0d, 0x0b, 0x11, 0x6a, 0x98, 0xf7, 0xa0, 0xe3, 0xcd, + 0xda, 0xc6, 0x3a, 0x23, 0xee, 0x31, 0x5a, 0xdf, 0xd2, 0x7e, 0x1f, 0x1e, 0xa4, 0xe3, 0xaa, 0xe8, + 0x88, 0x4c, 0x5c, 0xca, 0x3a, 0x1d, 0x79, 0x58, 0x53, 0xf8, 0xc2, 0xf0, 0x28, 0x76, 0xce, 0x22, + 0xff, 0x33, 0x69, 0xfd, 0x17, 0xb6, 0xbb, 0x3d, 0x8d, 0xae, 0x9f, 0x24, 0xdd, 0x23, 0x74, 0x7d, + 0x56, 0xf7, 0x9c, 0xb3, 0x4e, 0x7f, 0x08, 0x1b, 0x21, 0xa1, 0xd3, 0x85, 0xea, 0xfd, 0x52, 0xf2, + 0x97, 0xd2, 0xf2, 0xff, 0x36, 0x4c, 0xc1, 0x31, 0xf9, 0x17, 0xb8, 0xe4, 0x1c, 0xa5, 0x3d, 0x92, + 0x00, 0x1a, 0x50, 0xe8, 0xa2, 0x03, 0xec, 0x3a, 0xe6, 0x74, 0xcf, 0x45, 0xd0, 0x9b, 0xf8, 0xea, + 0x06, 0xa8, 0x0e, 0x5d, 0x6c, 0xde, 0x7f, 0x67, 0x32, 0xe6, 0xf2, 0x16, 0xf5, 0xe8, 0x99, 0x95, + 0x3b, 0x79, 0x9a, 0x71, 0xbc, 0x11, 0x96, 0x65, 0x21, 0xb3, 0xdc, 0x89, 0xb2, 0xcf, 0xce, 0x32, + 0x3a, 0xb0, 0xa2, 0xff, 0xb5, 0x47, 0x0a, 0x58, 0x97, 0x56, 0xb2, 0x45, 0x9d, 0x78, 0x8e, 0x69, + 0x32, 0xd7, 0x5d, 0xc7, 0xab, 0x60, 0xcd, 0x22, 0xd4, 0xc8, 0x9a, 0xdd, 0x35, 0x2d, 0x42, 0x0f, + 0x66, 0xe3, 0x3b, 0xed, 0x77, 0x0a, 0xd8, 0x88, 0x8d, 0x1d, 0x2f, 0xba, 0x6a, 0x0c, 0xaa, 0xed, + 0xd8, 0x30, 0x40, 0xc8, 0x8b, 0x2e, 0xaa, 0xb4, 0x1f, 0x16, 0xc0, 0xcb, 0x72, 0xb0, 0x36, 0xf6, + 0x19, 0x90, 0x2e, 0x3c, 0x74, 0x16, 0xdf, 0x45, 0x95, 0x16, 0x5e, 0xb5, 0xbe, 0x0a, 0xd6, 0x48, + 0x60, 0xce, 0xc1, 0x4f, 0xa4, 0xcd, 0x26, 0x09, 0xcc, 0x38, 0xfc, 0x0c, 0x50, 0x97, 0x23, 0x60, + 0x7a, 0x08, 0x6d, 0x16, 0xbf, 0xe1, 0x97, 0x01, 0x72, 0xc2, 0x11, 0x3d, 0xab, 0x6f, 0x80, 0x12, + 0x85, 0x36, 0x91, 0x81, 0xdb, 0xcd, 0x1e, 0xfb, 0xcb, 0xee, 0x14, 0xda, 0x44, 0xe7, 0xdc, 0xda, + 0xaf, 0x0b, 0x12, 0x2f, 0xf1, 0x31, 0xc5, 0x9e, 0xb8, 0xaf, 0x58, 0xd2, 0xfa, 0xcb, 0x0f, 0x5a, + 0x9e, 0xfd, 0xfe, 0x69, 0xfe, 0x9e, 0xa7, 0x9c, 0xbe, 0xe7, 0x49, 0x8c, 0x7a, 0x2b, 0xf3, 0x77, + 0x13, 0x6d, 0xb0, 0x72, 0x84, 0x02, 0xe2, 0x60, 0x8f, 0x4f, 0x2e, 0x8b, 0x7a, 0xf8, 0xa8, 0x7d, + 0x52, 0x04, 0x9b, 0x27, 0x59, 0x6a, 0x30, 0x31, 0x4d, 0x76, 0x00, 0x7e, 0x21, 0x0d, 0x96, 0xb8, + 0xb1, 0x2a, 0xa7, 0x6f, 0xac, 0x5e, 0x03, 0x6b, 0x7e, 0x80, 0x8e, 0x8c, 0x84, 0x61, 0x2b, 0xdc, + 0xb0, 0x2d, 0xf6, 0xc3, 0x41, 0xcc, 0xb8, 0x5b, 0xe0, 0xb2, 0x87, 0x8e, 0x93, 0xac, 0xe2, 0xe3, + 0x88, 0xa6, 0x87, 0x8e, 0xe3, 0x9c, 0x5f, 0x03, 0x4d, 0xbe, 0xeb, 0xcc, 0x17, 0x55, 0xee, 0x8b, + 0x06, 0xa3, 0xee, 0x45, 0xfe, 0xf8, 0x2a, 0x68, 0xb0, 0x0d, 0xe7, 0x87, 0xf3, 0xab, 0x1e, 0x3a, + 0xde, 0xcb, 0x72, 0x1a, 0x48, 0x38, 0x8d, 0x95, 0x61, 0x31, 0x4b, 0xb4, 0x0c, 0x48, 0xf9, 0x75, + 0x5c, 0x51, 0xaf, 0x49, 0xca, 0x0e, 0x65, 0x25, 0xab, 0x13, 0xcb, 0xee, 0x9f, 0x5f, 0x0c, 0x9c, + 0x63, 0x47, 0xa6, 0x7d, 0x5a, 0x00, 0x57, 0xc3, 0xa4, 0x21, 0xd2, 0xe8, 0x5b, 0x2e, 0x3e, 0xd6, + 0x21, 0x45, 0x77, 0x9c, 0xb1, 0x73, 0x66, 0x1a, 0x65, 0x7c, 0xeb, 0x52, 0xcc, 0xf9, 0xad, 0xcb, + 0x77, 0xc0, 0xaa, 0x7c, 0x87, 0xe8, 0x0c, 0x4b, 0x0b, 0xd6, 0x4b, 0x89, 0xee, 0xf2, 0xfe, 0xd0, + 0x02, 0xad, 0x91, 0x8b, 0x8f, 0x0d, 0x56, 0xef, 0x0c, 0x97, 0x69, 0x2a, 0x2f, 0xaa, 0xbe, 0x2b, + 0xcd, 0x76, 0xdd, 0x76, 0xe8, 0xbd, 0xc9, 0xb0, 0x67, 0xe2, 0xb1, 0xfc, 0x5e, 0x4b, 0xfe, 0xb9, + 0x41, 0xac, 0xfb, 0xf2, 0x3b, 0xa9, 0x3e, 0x37, 0x2c, 0x90, 0x6f, 0xeb, 0x7b, 0x54, 0x6f, 0x8c, + 0xe2, 0xc6, 0xd3, 0x7e, 0x24, 0x01, 0x93, 0x61, 0xd8, 0x41, 0x66, 0x33, 0x9e, 0x1e, 0x44, 0x5f, + 0x03, 0xc0, 0x21, 0x42, 0x42, 0x24, 0xe2, 0xbd, 0xaa, 0xd7, 0x1c, 0x72, 0x47, 0x10, 0xb4, 0x3f, + 0x2a, 0xe0, 0x1a, 0x7f, 0xc5, 0x21, 0xb6, 0x6d, 0x17, 0x0d, 0x0e, 0x76, 0x08, 0x6b, 0xb8, 0x6c, + 0x0e, 0x59, 0x9b, 0x41, 0xf2, 0x34, 0xa3, 0xee, 0x59, 0x79, 0x2b, 0xe4, 0x2c, 0x6f, 0xc4, 0x37, + 0x20, 0xe1, 0xb3, 0x20, 0x5b, 0xc4, 0x0d, 0x7b, 0xa7, 0x61, 0x39, 0x04, 0x0e, 0x5d, 0x24, 0xaa, + 0x65, 0x55, 0xdf, 0x20, 0xfe, 0xbc, 0x58, 0xfb, 0x92, 0x63, 0xb7, 0xff, 0xf0, 0x71, 0x47, 0xf9, + 0xf8, 0x71, 0x47, 0xf9, 0xfb, 0xe3, 0x8e, 0xf2, 0xc1, 0x93, 0xce, 0xa5, 0x8f, 0x9f, 0x74, 0x2e, + 0xfd, 0xf9, 0x49, 0xe7, 0xd2, 0x0f, 0xb7, 0x63, 0x1e, 0x18, 0x7a, 0xc3, 0x1b, 0xbc, 0x8b, 0xdd, + 0x8e, 0x7d, 0xb4, 0xf6, 0x20, 0xf9, 0xd9, 0xda, 0xb0, 0xc2, 0xa7, 0x11, 0xaf, 0xff, 0x3f, 0x00, + 0x00, 0xff, 0xff, 0xd9, 0xa2, 0x70, 0x34, 0xa2, 0x27, 0x00, 0x00, } func (m *EventCreateBucket) Marshal() (dAtA []byte, err error) { @@ -5174,6 +5235,56 @@ func (m *EventBucketFlowRateLimitStatus) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } +func (m *EventToggleSPAsDelegatedAgent) 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 *EventToggleSPAsDelegatedAgent) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EventToggleSPAsDelegatedAgent) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.SpAsDelegatedAgentDisabled { + i-- + if m.SpAsDelegatedAgentDisabled { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x18 + } + { + size := m.BucketId.Size() + i -= size + if _, err := m.BucketId.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintEvents(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.BucketName) > 0 { + i -= len(m.BucketName) + copy(dAtA[i:], m.BucketName) + i = encodeVarintEvents(dAtA, i, uint64(len(m.BucketName))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintEvents(dAtA []byte, offset int, v uint64) int { offset -= sovEvents(v) base := offset @@ -6158,6 +6269,24 @@ func (m *EventBucketFlowRateLimitStatus) Size() (n int) { return n } +func (m *EventToggleSPAsDelegatedAgent) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.BucketName) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + l = m.BucketId.Size() + n += 1 + l + sovEvents(uint64(l)) + if m.SpAsDelegatedAgentDisabled { + n += 2 + } + return n +} + func sovEvents(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -13403,6 +13532,142 @@ func (m *EventBucketFlowRateLimitStatus) Unmarshal(dAtA []byte) error { } return nil } +func (m *EventToggleSPAsDelegatedAgent) 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 ErrIntOverflowEvents + } + 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: EventToggleSPAsDelegatedAgent: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EventToggleSPAsDelegatedAgent: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BucketName", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.BucketName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BucketId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.BucketId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SpAsDelegatedAgentDisabled", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.SpAsDelegatedAgentDisabled = bool(v != 0) + default: + iNdEx = preIndex + skippy, err := skipEvents(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthEvents + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipEvents(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 From c6e48848722fab634a9b1fb6999cab3943b068be Mon Sep 17 00:00:00 2001 From: yutianwu Date: Wed, 27 Mar 2024 14:15:57 +0800 Subject: [PATCH 04/13] feat: add bucketId in BucketFlowRateLimitStatus event --- proto/greenfield/storage/events.proto | 6 + x/storage/keeper/bucket_rate_limit.go | 9 +- x/storage/keeper/keeper.go | 2 +- x/storage/keeper/payment.go | 2 +- x/storage/types/events.pb.go | 310 +++++++++++++++----------- 5 files changed, 192 insertions(+), 137 deletions(-) diff --git a/proto/greenfield/storage/events.proto b/proto/greenfield/storage/events.proto index 21d142d0c..5dec8203f 100644 --- a/proto/greenfield/storage/events.proto +++ b/proto/greenfield/storage/events.proto @@ -654,6 +654,12 @@ message EventBucketFlowRateLimitStatus { string bucket_name = 1; // is_limited define the status of the bucket flow rate limit bool is_limited = 2; + // bucket_id is the unique u256 for bucket. Not global, only unique in buckets. + string bucket_id = 3 [ + (cosmos_proto.scalar) = "cosmos.Uint", + (gogoproto.customtype) = "Uint", + (gogoproto.nullable) = false + ]; } message EventToggleSPAsDelegatedAgent { diff --git a/x/storage/keeper/bucket_rate_limit.go b/x/storage/keeper/bucket_rate_limit.go index 0ba90e3a9..cc792311a 100644 --- a/x/storage/keeper/bucket_rate_limit.go +++ b/x/storage/keeper/bucket_rate_limit.go @@ -81,7 +81,7 @@ func getTotalOutFlowRate(flows []paymenttypes.OutFlow) sdkmath.Int { // unChargeAndLimitBucket uncharges the bucket and limits the bucket func (k Keeper) unChargeAndLimitBucket(ctx sdk.Context, bucketInfo *types.BucketInfo, paymentAccount sdk.AccAddress, bucketName string) error { - k.setBucketFlowRateLimitStatus(ctx, bucketName, &types.BucketFlowRateLimitStatus{ + k.setBucketFlowRateLimitStatus(ctx, bucketName, bucketInfo.Id, &types.BucketFlowRateLimitStatus{ IsBucketLimited: true, PaymentAddress: paymentAccount.String(), }) @@ -120,7 +120,7 @@ func (k Keeper) setFlowRateLimit(ctx sdk.Context, bucketInfo *types.BucketInfo, if err != nil { return fmt.Errorf("charge bucket failed: %s %s", bucketInfo.BucketName, err.Error()) } - k.deleteBucketFlowRateLimitStatus(ctx, bucketName) + k.deleteBucketFlowRateLimitStatus(ctx, bucketName, bucketInfo.Id) return nil } @@ -165,7 +165,7 @@ func (k Keeper) setBucketFlowRateLimit(ctx sdk.Context, paymentAccount, bucketOw } // setBucketFlowRateLimitStatus sets the flow rate limit status of the bucket to the store -func (k Keeper) setBucketFlowRateLimitStatus(ctx sdk.Context, bucketName string, status *types.BucketFlowRateLimitStatus) { +func (k Keeper) setBucketFlowRateLimitStatus(ctx sdk.Context, bucketName string, bucketId sdkmath.Uint, status *types.BucketFlowRateLimitStatus) { store := ctx.KVStore(k.storeKey) bz := k.cdc.MustMarshal(status) @@ -194,13 +194,14 @@ func (k Keeper) getBucketFlowRateLimitStatus(ctx sdk.Context, bucketName string) } // deleteBucketFlowRateLimitStatus deletes the flow rate limit status of the bucket from the store -func (k Keeper) deleteBucketFlowRateLimitStatus(ctx sdk.Context, bucketName string) { +func (k Keeper) deleteBucketFlowRateLimitStatus(ctx sdk.Context, bucketName string, bucketId sdkmath.Uint) { store := ctx.KVStore(k.storeKey) store.Delete(types.GetBucketFlowRateLimitStatusKey(bucketName)) if err := ctx.EventManager().EmitTypedEvents(&types.EventBucketFlowRateLimitStatus{ BucketName: bucketName, IsLimited: false, + BucketId: bucketId, }); err != nil { panic(err) } diff --git a/x/storage/keeper/keeper.go b/x/storage/keeper/keeper.go index b1dd90f79..3225a521c 100644 --- a/x/storage/keeper/keeper.go +++ b/x/storage/keeper/keeper.go @@ -272,7 +272,7 @@ func (k Keeper) doDeleteBucket(ctx sdk.Context, operator sdk.AccAddress, bucketI if ctx.IsUpgraded(upgradetypes.Serengeti) { // delete bucket flow rate limit status - k.deleteBucketFlowRateLimitStatus(ctx, bucketInfo.BucketName) + k.deleteBucketFlowRateLimitStatus(ctx, bucketInfo.BucketName, bucketInfo.Id) } return nil } diff --git a/x/storage/keeper/payment.go b/x/storage/keeper/payment.go index 9fb44c8c2..37c044895 100644 --- a/x/storage/keeper/payment.go +++ b/x/storage/keeper/payment.go @@ -365,7 +365,7 @@ func (k Keeper) ChargeViaBucketChange(ctx sdk.Context, bucketInfo *storagetypes. ctx.Logger().Error("charge via bucket change failed", "bucket", bucketInfo.BucketName, "err", err.Error()) return err } - k.deleteBucketFlowRateLimitStatus(ctx, bucketInfo.BucketName) + k.deleteBucketFlowRateLimitStatus(ctx, bucketInfo.BucketName, bucketInfo.Id) } else { err = k.ApplyBillChanges(ctx, &prevBill, &newBill) if err != nil { diff --git a/x/storage/types/events.pb.go b/x/storage/types/events.pb.go index 74c2873fe..eaa5bd872 100644 --- a/x/storage/types/events.pb.go +++ b/x/storage/types/events.pb.go @@ -2757,6 +2757,8 @@ type EventBucketFlowRateLimitStatus struct { BucketName string `protobuf:"bytes,1,opt,name=bucket_name,json=bucketName,proto3" json:"bucket_name,omitempty"` // is_limited define the status of the bucket flow rate limit IsLimited bool `protobuf:"varint,2,opt,name=is_limited,json=isLimited,proto3" json:"is_limited,omitempty"` + // bucket_id is the unique u256 for bucket. Not global, only unique in buckets. + BucketId Uint `protobuf:"bytes,3,opt,name=bucket_id,json=bucketId,proto3,customtype=Uint" json:"bucket_id"` } func (m *EventBucketFlowRateLimitStatus) Reset() { *m = EventBucketFlowRateLimitStatus{} } @@ -2905,137 +2907,137 @@ func init() { func init() { proto.RegisterFile("greenfield/storage/events.proto", fileDescriptor_946dcba4f763ddc4) } var fileDescriptor_946dcba4f763ddc4 = []byte{ - // 2075 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcb, 0x8f, 0x1c, 0x47, - 0x19, 0x77, 0xcf, 0x6b, 0x67, 0x6a, 0x76, 0x66, 0xbc, 0xcd, 0xe2, 0x0c, 0xeb, 0x78, 0x76, 0xd2, - 0x08, 0xb3, 0x89, 0xf0, 0x2c, 0x72, 0x02, 0xb2, 0x04, 0x92, 0xb5, 0x8f, 0x04, 0x8d, 0x70, 0xe2, - 0xa5, 0x67, 0x93, 0x03, 0x97, 0xa6, 0xa6, 0xbb, 0xa6, 0xdd, 0xb8, 0xa7, 0xab, 0xe9, 0xaa, 0xd9, - 0xf5, 0xe4, 0x1f, 0xe0, 0x84, 0x14, 0x09, 0x21, 0xc1, 0x25, 0x57, 0x90, 0x10, 0x12, 0x87, 0x5c, - 0xe1, 0xec, 0x63, 0x62, 0x2e, 0x10, 0xa4, 0x80, 0xec, 0x0b, 0x20, 0x21, 0x38, 0x73, 0x42, 0xf5, - 0xe8, 0x9e, 0xee, 0xe9, 0x5e, 0xcf, 0xf6, 0x38, 0xeb, 0x5d, 0xe7, 0xb4, 0xdb, 0xdf, 0x7c, 0x55, - 0xfd, 0x3d, 0x7e, 0xdf, 0xa3, 0xbe, 0x6a, 0xb0, 0x69, 0x07, 0x08, 0x79, 0x23, 0x07, 0xb9, 0xd6, - 0x36, 0xa1, 0x38, 0x80, 0x36, 0xda, 0x46, 0x47, 0xc8, 0xa3, 0xa4, 0xe7, 0x07, 0x98, 0x62, 0x55, - 0x9d, 0x31, 0xf4, 0x24, 0xc3, 0xc6, 0x57, 0x4c, 0x4c, 0xc6, 0x98, 0x18, 0x9c, 0x63, 0x5b, 0x3c, - 0x08, 0xf6, 0x8d, 0x75, 0x1b, 0xdb, 0x58, 0xd0, 0xd9, 0x7f, 0x92, 0xba, 0x69, 0x63, 0x6c, 0xbb, - 0x68, 0x9b, 0x3f, 0x0d, 0x27, 0xa3, 0x6d, 0xea, 0x8c, 0x11, 0xa1, 0x70, 0xec, 0x47, 0x0c, 0x33, - 0x31, 0x02, 0x44, 0xf0, 0x24, 0x30, 0xd1, 0x36, 0x9d, 0xfa, 0x88, 0x64, 0x30, 0x84, 0x72, 0x9a, - 0x78, 0x3c, 0xc6, 0x9e, 0x64, 0xe8, 0x64, 0x30, 0xc4, 0x36, 0xd0, 0xfe, 0x54, 0x02, 0x6b, 0x6f, - 0x32, 0xc5, 0xf6, 0x02, 0x04, 0x29, 0xda, 0x9d, 0x98, 0xf7, 0x11, 0x55, 0x7b, 0xa0, 0x8c, 0x8f, - 0x3d, 0x14, 0xb4, 0x95, 0xae, 0xb2, 0x55, 0xdb, 0x6d, 0x3f, 0xfa, 0xe8, 0xc6, 0xba, 0xd4, 0x67, - 0xc7, 0xb2, 0x02, 0x44, 0xc8, 0x80, 0x06, 0x8e, 0x67, 0xeb, 0x82, 0x4d, 0xdd, 0x04, 0xf5, 0x21, - 0x5f, 0x69, 0x78, 0x70, 0x8c, 0xda, 0x05, 0xb6, 0x4a, 0x07, 0x82, 0xf4, 0x0e, 0x1c, 0x23, 0x75, - 0x17, 0x80, 0x23, 0x87, 0x38, 0x43, 0xc7, 0x75, 0xe8, 0xb4, 0x5d, 0xec, 0x2a, 0x5b, 0xcd, 0x9b, - 0x5a, 0x2f, 0x6d, 0xc3, 0xde, 0x7b, 0x11, 0xd7, 0xe1, 0xd4, 0x47, 0x7a, 0x6c, 0x95, 0x7a, 0x15, - 0xd4, 0x4c, 0x2e, 0xa4, 0x01, 0x69, 0xbb, 0xd4, 0x55, 0xb6, 0x8a, 0x7a, 0x55, 0x10, 0x76, 0xa8, - 0x7a, 0x0b, 0xd4, 0xa4, 0x04, 0x8e, 0xd5, 0x2e, 0x73, 0xa9, 0xaf, 0x3e, 0xfc, 0x6c, 0xf3, 0xd2, - 0xa7, 0x9f, 0x6d, 0x96, 0xde, 0x75, 0x3c, 0xfa, 0xe8, 0xa3, 0x1b, 0x75, 0xa9, 0x01, 0x7b, 0xd4, - 0xab, 0x82, 0xbb, 0x6f, 0xa9, 0xb7, 0x41, 0x5d, 0x18, 0xd6, 0x60, 0x76, 0x69, 0x57, 0xb8, 0x6c, - 0x9d, 0x2c, 0xd9, 0x06, 0x9c, 0x4d, 0xc8, 0x45, 0xa2, 0xff, 0xd5, 0x6f, 0x00, 0xd5, 0xbc, 0x07, - 0x03, 0x1b, 0x59, 0x46, 0x80, 0xa0, 0x65, 0xfc, 0x64, 0x82, 0x29, 0x6c, 0xaf, 0x74, 0x95, 0xad, - 0x92, 0x7e, 0x59, 0xfe, 0xa2, 0x23, 0x68, 0xfd, 0x80, 0xd1, 0xd5, 0x1d, 0xd0, 0xf2, 0xe1, 0x74, - 0x8c, 0x3c, 0x6a, 0x40, 0x61, 0xca, 0x76, 0x75, 0x81, 0x91, 0x9b, 0x72, 0x81, 0xa4, 0xaa, 0x1a, - 0x68, 0xf8, 0x81, 0x33, 0x86, 0xc1, 0xd4, 0x20, 0x3e, 0xd3, 0xb7, 0xd6, 0x55, 0xb6, 0x1a, 0x7a, - 0x5d, 0x12, 0x07, 0x7e, 0xdf, 0x52, 0x77, 0x41, 0xc7, 0x76, 0xf1, 0x10, 0xba, 0xc6, 0x91, 0x13, - 0xd0, 0x09, 0x74, 0x0d, 0x3b, 0xc0, 0x13, 0xdf, 0x18, 0xc1, 0xb1, 0xe3, 0x4e, 0xd9, 0x22, 0xc0, - 0x17, 0x6d, 0x08, 0xae, 0xf7, 0x04, 0xd3, 0xf7, 0x18, 0xcf, 0x5b, 0x9c, 0xa5, 0x6f, 0xa9, 0xb7, - 0x40, 0x85, 0x50, 0x48, 0x27, 0xa4, 0x5d, 0xe7, 0x46, 0xe9, 0x66, 0x19, 0x45, 0x20, 0x66, 0xc0, - 0xf9, 0x74, 0xc9, 0xaf, 0xfd, 0xb2, 0x20, 0x51, 0xb5, 0x8f, 0x5c, 0x14, 0xa1, 0xea, 0x0d, 0x50, - 0xc5, 0x3e, 0x0a, 0x20, 0xc5, 0x8b, 0x81, 0x15, 0x71, 0xce, 0xb0, 0x58, 0x58, 0x0a, 0x8b, 0xc5, - 0x14, 0x16, 0x13, 0x50, 0x29, 0xe5, 0x81, 0xca, 0x62, 0xa3, 0x96, 0x17, 0x19, 0x55, 0xfb, 0x69, - 0x11, 0x7c, 0x99, 0x9b, 0xe6, 0x5d, 0xdf, 0x8a, 0x02, 0xae, 0xef, 0x8d, 0xf0, 0x92, 0xe6, 0x59, - 0x18, 0x7a, 0x09, 0x75, 0x8b, 0x79, 0xd4, 0xcd, 0x06, 0x76, 0xe9, 0x04, 0x60, 0x7f, 0x3d, 0x0d, - 0x6c, 0x1e, 0x87, 0x29, 0xf8, 0x26, 0x73, 0x41, 0x65, 0xa9, 0x5c, 0xb0, 0xd8, 0x13, 0x2b, 0x0b, - 0x3d, 0xf1, 0x1b, 0x05, 0x5c, 0x11, 0x20, 0x75, 0x88, 0x89, 0x3d, 0xea, 0x78, 0x93, 0x10, 0xa9, - 0x09, 0x9b, 0x29, 0x79, 0x6c, 0xb6, 0xd0, 0x1d, 0x57, 0x40, 0x25, 0x40, 0x90, 0x60, 0x4f, 0x22, - 0x53, 0x3e, 0xb1, 0xec, 0x66, 0xf1, 0x60, 0x89, 0x65, 0x37, 0x41, 0xd8, 0xa1, 0xda, 0xcf, 0x2b, - 0x89, 0x2c, 0x7d, 0x77, 0xf8, 0x63, 0x64, 0x52, 0xf5, 0x26, 0x58, 0xe1, 0xf9, 0xef, 0x14, 0x78, - 0x09, 0x19, 0x3f, 0xff, 0x68, 0xda, 0x04, 0x75, 0xcc, 0xc5, 0x11, 0x0c, 0x25, 0xc1, 0x20, 0x48, - 0x69, 0xfc, 0x55, 0xf2, 0xd8, 0xf2, 0x16, 0xa8, 0xc9, 0xad, 0xa5, 0x3f, 0x17, 0xad, 0x14, 0xdc, - 0x7d, 0x2b, 0x9d, 0x21, 0xab, 0xe9, 0x0c, 0xf9, 0x0a, 0x58, 0xf5, 0xe1, 0xd4, 0xc5, 0xd0, 0x32, - 0x88, 0xf3, 0x3e, 0xe2, 0x49, 0xb4, 0xa4, 0xd7, 0x25, 0x6d, 0xe0, 0xbc, 0x3f, 0x5f, 0xb5, 0xc0, - 0x52, 0x48, 0x7d, 0x05, 0xac, 0x32, 0x70, 0xb1, 0xb0, 0xe0, 0xf5, 0xa5, 0xce, 0x0d, 0x54, 0x97, - 0x34, 0x5e, 0x40, 0x12, 0x85, 0x6d, 0x35, 0x55, 0xd8, 0xc2, 0x24, 0xdc, 0x38, 0x39, 0x09, 0x0b, - 0x40, 0x24, 0x93, 0xb0, 0xfa, 0x7d, 0xd0, 0x0a, 0x90, 0x35, 0xf1, 0x2c, 0xe8, 0x99, 0x53, 0xf1, - 0xf2, 0xe6, 0xc9, 0x2a, 0xe8, 0x11, 0x2b, 0x57, 0xa1, 0x19, 0x24, 0x9e, 0xe7, 0xab, 0x64, 0x2b, - 0x77, 0x95, 0x7c, 0x19, 0xd4, 0xcc, 0x7b, 0xc8, 0xbc, 0x4f, 0x26, 0x63, 0xd2, 0xbe, 0xdc, 0x2d, - 0x6e, 0xad, 0xea, 0x33, 0x82, 0xfa, 0x3a, 0xb8, 0xe2, 0x62, 0x33, 0x15, 0xce, 0x8e, 0xd5, 0x5e, - 0xe3, 0x9e, 0xfb, 0x12, 0xff, 0x35, 0x1e, 0xc6, 0x7d, 0x4b, 0xfb, 0x8f, 0x02, 0x5e, 0x12, 0x51, - 0x01, 0x3d, 0x13, 0xb9, 0x89, 0xd8, 0x38, 0xa3, 0x64, 0x3a, 0x87, 0xf6, 0x62, 0x0a, 0xed, 0x29, - 0xe4, 0x95, 0xd2, 0xc8, 0x4b, 0xe0, 0xba, 0x92, 0x03, 0xd7, 0xac, 0x78, 0xb4, 0xb8, 0xc6, 0x03, - 0x04, 0xdd, 0x73, 0xd6, 0x34, 0xa1, 0x45, 0x39, 0x4f, 0x74, 0xce, 0x20, 0x5d, 0xc9, 0x09, 0xe9, - 0x6f, 0x81, 0x97, 0x32, 0xd3, 0x7e, 0x94, 0xef, 0xd7, 0xd3, 0xf9, 0xbe, 0x6f, 0x3d, 0x05, 0x5d, - 0xd5, 0x13, 0xd1, 0x95, 0x04, 0x6c, 0x6d, 0x0e, 0xb0, 0xda, 0x87, 0xa1, 0x27, 0xf6, 0xb0, 0x3f, - 0x7d, 0x26, 0x4f, 0x5c, 0x07, 0x2d, 0x12, 0x98, 0x46, 0xda, 0x1b, 0x0d, 0x12, 0x98, 0xbb, 0x33, - 0x87, 0x48, 0xbe, 0xb4, 0x53, 0x18, 0xdf, 0xdd, 0x99, 0x5f, 0xae, 0x83, 0x96, 0x45, 0x68, 0x62, - 0x3f, 0x91, 0x94, 0x1b, 0x16, 0xa1, 0xc9, 0xfd, 0x18, 0x5f, 0x7c, 0xbf, 0x72, 0xc4, 0x17, 0xdb, - 0xef, 0x36, 0x68, 0xc4, 0xde, 0x7b, 0x3a, 0xc4, 0xd6, 0x23, 0x91, 0x78, 0x83, 0xdd, 0x88, 0xbd, - 0xe8, 0x74, 0xa9, 0xbc, 0x1e, 0xc9, 0xb0, 0xa4, 0xfb, 0xb4, 0xff, 0x29, 0x89, 0x16, 0xf4, 0x22, - 0x05, 0x4b, 0x29, 0x4f, 0xb0, 0x9c, 0xac, 0x7c, 0xf9, 0x64, 0xe5, 0xff, 0xa1, 0xc8, 0x26, 0x53, - 0x47, 0x3c, 0x8a, 0x2e, 0x58, 0xb6, 0xc8, 0x65, 0x80, 0x6b, 0x00, 0x8c, 0x70, 0x60, 0x4c, 0x78, - 0xbb, 0xcc, 0x95, 0xae, 0xea, 0xb5, 0x11, 0x0e, 0x44, 0xff, 0x9c, 0xd9, 0xc5, 0x49, 0x5d, 0xe7, - 0xa4, 0x56, 0xb2, 0x5a, 0xe3, 0x99, 0x50, 0x85, 0x3c, 0x42, 0x2d, 0xd5, 0xc5, 0xfd, 0xac, 0x90, - 0x68, 0xfd, 0x25, 0xbe, 0xcf, 0xb0, 0xf5, 0x3f, 0x43, 0xaf, 0x24, 0x5b, 0xa3, 0xf2, 0x32, 0xad, - 0x91, 0xf6, 0x5f, 0x05, 0x5c, 0x8e, 0x75, 0xb5, 0x1c, 0xbc, 0xb9, 0x47, 0x0f, 0xd7, 0x00, 0x10, - 0x11, 0x11, 0xb3, 0x41, 0x8d, 0x53, 0xb8, 0x86, 0xdf, 0x06, 0xd5, 0x28, 0x60, 0x4e, 0x71, 0xf8, - 0x59, 0xb1, 0x65, 0xf6, 0x9f, 0xeb, 0x77, 0x4a, 0xb9, 0xfb, 0x9d, 0x75, 0x50, 0x46, 0x0f, 0x68, - 0x00, 0x65, 0x52, 0x15, 0x0f, 0xda, 0xaf, 0x42, 0x95, 0x45, 0x56, 0x9a, 0x53, 0xb9, 0xb0, 0x8c, - 0xca, 0xc5, 0xa7, 0xa9, 0x5c, 0x3a, 0xbd, 0xca, 0xda, 0x5f, 0x14, 0x59, 0xd2, 0xee, 0x20, 0x78, - 0x24, 0x45, 0xbb, 0x0d, 0x9a, 0x63, 0x34, 0x1e, 0xa2, 0x20, 0x3a, 0xd3, 0x2d, 0x72, 0x4b, 0x43, - 0xf0, 0x87, 0x87, 0xbd, 0x0b, 0xa2, 0xdb, 0xbf, 0x0b, 0x32, 0x4b, 0x88, 0xd0, 0xe3, 0xca, 0xbd, - 0xcd, 0x05, 0x7d, 0x4e, 0x53, 0x89, 0xb3, 0xd1, 0x4b, 0x3d, 0x08, 0xfd, 0x43, 0x0c, 0x8a, 0x99, - 0x8f, 0xda, 0xe5, 0x6e, 0x71, 0xab, 0x7e, 0xf3, 0xb5, 0x2c, 0xa4, 0x72, 0x03, 0xc4, 0x54, 0xdf, - 0x47, 0x14, 0x3a, 0xae, 0xbe, 0x2a, 0x77, 0x38, 0xc4, 0x3b, 0x96, 0xa5, 0xee, 0x83, 0xb5, 0xd8, - 0x8e, 0x22, 0x77, 0xb5, 0x2b, 0xdd, 0xe2, 0x53, 0x95, 0x6c, 0x45, 0x5b, 0x08, 0x5c, 0x6b, 0x7f, - 0x2d, 0x44, 0x05, 0xc8, 0x43, 0xc7, 0x5f, 0x18, 0x73, 0xcf, 0x65, 0x85, 0x72, 0xee, 0xac, 0xb0, - 0x0f, 0x56, 0xa4, 0xa9, 0xb8, 0x4d, 0xf3, 0x39, 0x2a, 0x5c, 0xaa, 0xfd, 0x22, 0xac, 0x79, 0x29, - 0x1e, 0xf5, 0x9b, 0xa0, 0x22, 0xb8, 0x16, 0x1a, 0x57, 0xf2, 0xa9, 0x7d, 0xd0, 0x42, 0x0f, 0x7c, - 0x27, 0x80, 0xd4, 0xc1, 0x9e, 0x41, 0x1d, 0x99, 0x45, 0xeb, 0x37, 0x37, 0x7a, 0x62, 0x3c, 0xdd, - 0x0b, 0xc7, 0xd3, 0xbd, 0xc3, 0x70, 0x3c, 0xbd, 0x5b, 0xfa, 0xe0, 0x6f, 0x9b, 0x8a, 0xde, 0x9c, - 0x2d, 0x64, 0x3f, 0x69, 0xff, 0x52, 0x12, 0x05, 0x8e, 0x4b, 0xf7, 0x26, 0xcb, 0x7b, 0x2f, 0xb6, - 0xd7, 0xb3, 0x53, 0xf9, 0xc3, 0xb0, 0xc1, 0x7c, 0xdb, 0x09, 0x02, 0x1c, 0x3c, 0xd3, 0x8c, 0x33, - 0xdf, 0x10, 0x2f, 0xd7, 0xcc, 0x52, 0x03, 0x0d, 0x0b, 0x11, 0x6a, 0x98, 0xf7, 0xa0, 0xe3, 0xcd, - 0xda, 0xc6, 0x3a, 0x23, 0xee, 0x31, 0x5a, 0xdf, 0xd2, 0x7e, 0x1f, 0x1e, 0xa4, 0xe3, 0xaa, 0xe8, - 0x88, 0x4c, 0x5c, 0xca, 0x3a, 0x1d, 0x79, 0x58, 0x53, 0xf8, 0xc2, 0xf0, 0x28, 0x76, 0xce, 0x22, - 0xff, 0x33, 0x69, 0xfd, 0x17, 0xb6, 0xbb, 0x3d, 0x8d, 0xae, 0x9f, 0x24, 0xdd, 0x23, 0x74, 0x7d, - 0x56, 0xf7, 0x9c, 0xb3, 0x4e, 0x7f, 0x08, 0x1b, 0x21, 0xa1, 0xd3, 0x85, 0xea, 0xfd, 0x52, 0xf2, - 0x97, 0xd2, 0xf2, 0xff, 0x36, 0x4c, 0xc1, 0x31, 0xf9, 0x17, 0xb8, 0xe4, 0x1c, 0xa5, 0x3d, 0x92, - 0x00, 0x1a, 0x50, 0xe8, 0xa2, 0x03, 0xec, 0x3a, 0xe6, 0x74, 0xcf, 0x45, 0xd0, 0x9b, 0xf8, 0xea, - 0x06, 0xa8, 0x0e, 0x5d, 0x6c, 0xde, 0x7f, 0x67, 0x32, 0xe6, 0xf2, 0x16, 0xf5, 0xe8, 0x99, 0x95, - 0x3b, 0x79, 0x9a, 0x71, 0xbc, 0x11, 0x96, 0x65, 0x21, 0xb3, 0xdc, 0x89, 0xb2, 0xcf, 0xce, 0x32, - 0x3a, 0xb0, 0xa2, 0xff, 0xb5, 0x47, 0x0a, 0x58, 0x97, 0x56, 0xb2, 0x45, 0x9d, 0x78, 0x8e, 0x69, - 0x32, 0xd7, 0x5d, 0xc7, 0xab, 0x60, 0xcd, 0x22, 0xd4, 0xc8, 0x9a, 0xdd, 0x35, 0x2d, 0x42, 0x0f, - 0x66, 0xe3, 0x3b, 0xed, 0x77, 0x0a, 0xd8, 0x88, 0x8d, 0x1d, 0x2f, 0xba, 0x6a, 0x0c, 0xaa, 0xed, - 0xd8, 0x30, 0x40, 0xc8, 0x8b, 0x2e, 0xaa, 0xb4, 0x1f, 0x16, 0xc0, 0xcb, 0x72, 0xb0, 0x36, 0xf6, - 0x19, 0x90, 0x2e, 0x3c, 0x74, 0x16, 0xdf, 0x45, 0x95, 0x16, 0x5e, 0xb5, 0xbe, 0x0a, 0xd6, 0x48, - 0x60, 0xce, 0xc1, 0x4f, 0xa4, 0xcd, 0x26, 0x09, 0xcc, 0x38, 0xfc, 0x0c, 0x50, 0x97, 0x23, 0x60, - 0x7a, 0x08, 0x6d, 0x16, 0xbf, 0xe1, 0x97, 0x01, 0x72, 0xc2, 0x11, 0x3d, 0xab, 0x6f, 0x80, 0x12, - 0x85, 0x36, 0x91, 0x81, 0xdb, 0xcd, 0x1e, 0xfb, 0xcb, 0xee, 0x14, 0xda, 0x44, 0xe7, 0xdc, 0xda, - 0xaf, 0x0b, 0x12, 0x2f, 0xf1, 0x31, 0xc5, 0x9e, 0xb8, 0xaf, 0x58, 0xd2, 0xfa, 0xcb, 0x0f, 0x5a, - 0x9e, 0xfd, 0xfe, 0x69, 0xfe, 0x9e, 0xa7, 0x9c, 0xbe, 0xe7, 0x49, 0x8c, 0x7a, 0x2b, 0xf3, 0x77, - 0x13, 0x6d, 0xb0, 0x72, 0x84, 0x02, 0xe2, 0x60, 0x8f, 0x4f, 0x2e, 0x8b, 0x7a, 0xf8, 0xa8, 0x7d, - 0x52, 0x04, 0x9b, 0x27, 0x59, 0x6a, 0x30, 0x31, 0x4d, 0x76, 0x00, 0x7e, 0x21, 0x0d, 0x96, 0xb8, - 0xb1, 0x2a, 0xa7, 0x6f, 0xac, 0x5e, 0x03, 0x6b, 0x7e, 0x80, 0x8e, 0x8c, 0x84, 0x61, 0x2b, 0xdc, - 0xb0, 0x2d, 0xf6, 0xc3, 0x41, 0xcc, 0xb8, 0x5b, 0xe0, 0xb2, 0x87, 0x8e, 0x93, 0xac, 0xe2, 0xe3, - 0x88, 0xa6, 0x87, 0x8e, 0xe3, 0x9c, 0x5f, 0x03, 0x4d, 0xbe, 0xeb, 0xcc, 0x17, 0x55, 0xee, 0x8b, - 0x06, 0xa3, 0xee, 0x45, 0xfe, 0xf8, 0x2a, 0x68, 0xb0, 0x0d, 0xe7, 0x87, 0xf3, 0xab, 0x1e, 0x3a, - 0xde, 0xcb, 0x72, 0x1a, 0x48, 0x38, 0x8d, 0x95, 0x61, 0x31, 0x4b, 0xb4, 0x0c, 0x48, 0xf9, 0x75, - 0x5c, 0x51, 0xaf, 0x49, 0xca, 0x0e, 0x65, 0x25, 0xab, 0x13, 0xcb, 0xee, 0x9f, 0x5f, 0x0c, 0x9c, - 0x63, 0x47, 0xa6, 0x7d, 0x5a, 0x00, 0x57, 0xc3, 0xa4, 0x21, 0xd2, 0xe8, 0x5b, 0x2e, 0x3e, 0xd6, - 0x21, 0x45, 0x77, 0x9c, 0xb1, 0x73, 0x66, 0x1a, 0x65, 0x7c, 0xeb, 0x52, 0xcc, 0xf9, 0xad, 0xcb, - 0x77, 0xc0, 0xaa, 0x7c, 0x87, 0xe8, 0x0c, 0x4b, 0x0b, 0xd6, 0x4b, 0x89, 0xee, 0xf2, 0xfe, 0xd0, - 0x02, 0xad, 0x91, 0x8b, 0x8f, 0x0d, 0x56, 0xef, 0x0c, 0x97, 0x69, 0x2a, 0x2f, 0xaa, 0xbe, 0x2b, - 0xcd, 0x76, 0xdd, 0x76, 0xe8, 0xbd, 0xc9, 0xb0, 0x67, 0xe2, 0xb1, 0xfc, 0x5e, 0x4b, 0xfe, 0xb9, - 0x41, 0xac, 0xfb, 0xf2, 0x3b, 0xa9, 0x3e, 0x37, 0x2c, 0x90, 0x6f, 0xeb, 0x7b, 0x54, 0x6f, 0x8c, - 0xe2, 0xc6, 0xd3, 0x7e, 0x24, 0x01, 0x93, 0x61, 0xd8, 0x41, 0x66, 0x33, 0x9e, 0x1e, 0x44, 0x5f, - 0x03, 0xc0, 0x21, 0x42, 0x42, 0x24, 0xe2, 0xbd, 0xaa, 0xd7, 0x1c, 0x72, 0x47, 0x10, 0xb4, 0x3f, - 0x2a, 0xe0, 0x1a, 0x7f, 0xc5, 0x21, 0xb6, 0x6d, 0x17, 0x0d, 0x0e, 0x76, 0x08, 0x6b, 0xb8, 0x6c, - 0x0e, 0x59, 0x9b, 0x41, 0xf2, 0x34, 0xa3, 0xee, 0x59, 0x79, 0x2b, 0xe4, 0x2c, 0x6f, 0xc4, 0x37, - 0x20, 0xe1, 0xb3, 0x20, 0x5b, 0xc4, 0x0d, 0x7b, 0xa7, 0x61, 0x39, 0x04, 0x0e, 0x5d, 0x24, 0xaa, - 0x65, 0x55, 0xdf, 0x20, 0xfe, 0xbc, 0x58, 0xfb, 0x92, 0x63, 0xb7, 0xff, 0xf0, 0x71, 0x47, 0xf9, - 0xf8, 0x71, 0x47, 0xf9, 0xfb, 0xe3, 0x8e, 0xf2, 0xc1, 0x93, 0xce, 0xa5, 0x8f, 0x9f, 0x74, 0x2e, - 0xfd, 0xf9, 0x49, 0xe7, 0xd2, 0x0f, 0xb7, 0x63, 0x1e, 0x18, 0x7a, 0xc3, 0x1b, 0xbc, 0x8b, 0xdd, - 0x8e, 0x7d, 0xb4, 0xf6, 0x20, 0xf9, 0xd9, 0xda, 0xb0, 0xc2, 0xa7, 0x11, 0xaf, 0xff, 0x3f, 0x00, - 0x00, 0xff, 0xff, 0xd9, 0xa2, 0x70, 0x34, 0xa2, 0x27, 0x00, 0x00, + // 2079 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcd, 0x8f, 0x23, 0x47, + 0xd9, 0xdf, 0xf6, 0xd7, 0xd8, 0xe5, 0xb1, 0xbd, 0xd3, 0xef, 0xbc, 0x1b, 0x33, 0x9b, 0xf5, 0x38, + 0x8d, 0x58, 0x26, 0x11, 0xeb, 0x41, 0x9b, 0x80, 0x56, 0x02, 0x69, 0x35, 0x1f, 0x09, 0xb2, 0xd8, + 0x64, 0x87, 0xf6, 0x24, 0x07, 0x2e, 0xad, 0x72, 0x77, 0xb9, 0xb7, 0xd9, 0x76, 0x57, 0xd3, 0x55, + 0x9e, 0x59, 0xe7, 0x1f, 0xe0, 0x84, 0x14, 0x09, 0x21, 0x01, 0x87, 0x5c, 0x41, 0x42, 0x48, 0x1c, + 0x72, 0x85, 0xf3, 0x1e, 0x93, 0xe5, 0x02, 0x41, 0x0a, 0x68, 0xf7, 0x02, 0x48, 0x08, 0xce, 0x9c, + 0x50, 0x7d, 0x74, 0xbb, 0xdb, 0xdd, 0xb3, 0x9e, 0xf6, 0x64, 0x32, 0xb3, 0x9c, 0x66, 0xfa, 0xf1, + 0x53, 0xd5, 0xcf, 0xc7, 0xef, 0xf9, 0xa8, 0xa7, 0x1a, 0x6c, 0xda, 0x01, 0x42, 0xde, 0xc8, 0x41, + 0xae, 0xb5, 0x4d, 0x28, 0x0e, 0xa0, 0x8d, 0xb6, 0xd1, 0x11, 0xf2, 0x28, 0xe9, 0xf9, 0x01, 0xa6, + 0x58, 0x55, 0x67, 0x0c, 0x3d, 0xc9, 0xb0, 0xf1, 0x25, 0x13, 0x93, 0x31, 0x26, 0x06, 0xe7, 0xd8, + 0x16, 0x0f, 0x82, 0x7d, 0x63, 0xdd, 0xc6, 0x36, 0x16, 0x74, 0xf6, 0x9f, 0xa4, 0x6e, 0xda, 0x18, + 0xdb, 0x2e, 0xda, 0xe6, 0x4f, 0xc3, 0xc9, 0x68, 0x9b, 0x3a, 0x63, 0x44, 0x28, 0x1c, 0xfb, 0x11, + 0xc3, 0x4c, 0x8c, 0x00, 0x11, 0x3c, 0x09, 0x4c, 0xb4, 0x4d, 0xa7, 0x3e, 0x22, 0x19, 0x0c, 0xa1, + 0x9c, 0x26, 0x1e, 0x8f, 0xb1, 0x27, 0x19, 0x3a, 0x19, 0x0c, 0xb1, 0x0d, 0xb4, 0x3f, 0x94, 0xc0, + 0xda, 0x9b, 0x4c, 0xb1, 0xbd, 0x00, 0x41, 0x8a, 0x76, 0x27, 0xe6, 0x43, 0x44, 0xd5, 0x1e, 0x28, + 0xe3, 0x63, 0x0f, 0x05, 0x6d, 0xa5, 0xab, 0x6c, 0xd5, 0x76, 0xdb, 0x4f, 0x3e, 0xba, 0xb5, 0x2e, + 0xf5, 0xd9, 0xb1, 0xac, 0x00, 0x11, 0x32, 0xa0, 0x81, 0xe3, 0xd9, 0xba, 0x60, 0x53, 0x37, 0x41, + 0x7d, 0xc8, 0x57, 0x1a, 0x1e, 0x1c, 0xa3, 0x76, 0x81, 0xad, 0xd2, 0x81, 0x20, 0xbd, 0x03, 0xc7, + 0x48, 0xdd, 0x05, 0xe0, 0xc8, 0x21, 0xce, 0xd0, 0x71, 0x1d, 0x3a, 0x6d, 0x17, 0xbb, 0xca, 0x56, + 0xf3, 0xb6, 0xd6, 0x4b, 0xdb, 0xb0, 0xf7, 0x5e, 0xc4, 0x75, 0x38, 0xf5, 0x91, 0x1e, 0x5b, 0xa5, + 0x5e, 0x07, 0x35, 0x93, 0x0b, 0x69, 0x40, 0xda, 0x2e, 0x75, 0x95, 0xad, 0xa2, 0x5e, 0x15, 0x84, + 0x1d, 0xaa, 0xde, 0x01, 0x35, 0x29, 0x81, 0x63, 0xb5, 0xcb, 0x5c, 0xea, 0xeb, 0x8f, 0x3f, 0xdb, + 0xbc, 0xf2, 0xe9, 0x67, 0x9b, 0xa5, 0x77, 0x1d, 0x8f, 0x3e, 0xf9, 0xe8, 0x56, 0x5d, 0x6a, 0xc0, + 0x1e, 0xf5, 0xaa, 0xe0, 0xee, 0x5b, 0xea, 0x5d, 0x50, 0x17, 0x86, 0x35, 0x98, 0x5d, 0xda, 0x15, + 0x2e, 0x5b, 0x27, 0x4b, 0xb6, 0x01, 0x67, 0x13, 0x72, 0x91, 0xe8, 0x7f, 0xf5, 0x6b, 0x40, 0x35, + 0x1f, 0xc0, 0xc0, 0x46, 0x96, 0x11, 0x20, 0x68, 0x19, 0x3f, 0x9c, 0x60, 0x0a, 0xdb, 0x2b, 0x5d, + 0x65, 0xab, 0xa4, 0x5f, 0x95, 0xbf, 0xe8, 0x08, 0x5a, 0xdf, 0x63, 0x74, 0x75, 0x07, 0xb4, 0x7c, + 0x38, 0x1d, 0x23, 0x8f, 0x1a, 0x50, 0x98, 0xb2, 0x5d, 0x5d, 0x60, 0xe4, 0xa6, 0x5c, 0x20, 0xa9, + 0xaa, 0x06, 0x1a, 0x7e, 0xe0, 0x8c, 0x61, 0x30, 0x35, 0x88, 0xcf, 0xf4, 0xad, 0x75, 0x95, 0xad, + 0x86, 0x5e, 0x97, 0xc4, 0x81, 0xdf, 0xb7, 0xd4, 0x5d, 0xd0, 0xb1, 0x5d, 0x3c, 0x84, 0xae, 0x71, + 0xe4, 0x04, 0x74, 0x02, 0x5d, 0xc3, 0x0e, 0xf0, 0xc4, 0x37, 0x46, 0x70, 0xec, 0xb8, 0x53, 0xb6, + 0x08, 0xf0, 0x45, 0x1b, 0x82, 0xeb, 0x3d, 0xc1, 0xf4, 0x1d, 0xc6, 0xf3, 0x16, 0x67, 0xe9, 0x5b, + 0xea, 0x1d, 0x50, 0x21, 0x14, 0xd2, 0x09, 0x69, 0xd7, 0xb9, 0x51, 0xba, 0x59, 0x46, 0x11, 0x88, + 0x19, 0x70, 0x3e, 0x5d, 0xf2, 0x6b, 0x3f, 0x2b, 0x48, 0x54, 0xed, 0x23, 0x17, 0x45, 0xa8, 0x7a, + 0x03, 0x54, 0xb1, 0x8f, 0x02, 0x48, 0xf1, 0x62, 0x60, 0x45, 0x9c, 0x33, 0x2c, 0x16, 0x96, 0xc2, + 0x62, 0x31, 0x85, 0xc5, 0x04, 0x54, 0x4a, 0x79, 0xa0, 0xb2, 0xd8, 0xa8, 0xe5, 0x45, 0x46, 0xd5, + 0x7e, 0x54, 0x04, 0xff, 0xcf, 0x4d, 0xf3, 0xae, 0x6f, 0x45, 0x01, 0xd7, 0xf7, 0x46, 0x78, 0x49, + 0xf3, 0x2c, 0x0c, 0xbd, 0x84, 0xba, 0xc5, 0x3c, 0xea, 0x66, 0x03, 0xbb, 0x74, 0x02, 0xb0, 0xbf, + 0x9a, 0x06, 0x36, 0x8f, 0xc3, 0x14, 0x7c, 0x93, 0xb9, 0xa0, 0xb2, 0x54, 0x2e, 0x58, 0xec, 0x89, + 0x95, 0x85, 0x9e, 0xf8, 0x95, 0x02, 0xae, 0x09, 0x90, 0x3a, 0xc4, 0xc4, 0x1e, 0x75, 0xbc, 0x49, + 0x88, 0xd4, 0x84, 0xcd, 0x94, 0x3c, 0x36, 0x5b, 0xe8, 0x8e, 0x6b, 0xa0, 0x12, 0x20, 0x48, 0xb0, + 0x27, 0x91, 0x29, 0x9f, 0x58, 0x76, 0xb3, 0x78, 0xb0, 0xc4, 0xb2, 0x9b, 0x20, 0xec, 0x50, 0xed, + 0x27, 0x95, 0x44, 0x96, 0xbe, 0x3f, 0xfc, 0x01, 0x32, 0xa9, 0x7a, 0x1b, 0xac, 0xf0, 0xfc, 0x77, + 0x0a, 0xbc, 0x84, 0x8c, 0x9f, 0x7f, 0x34, 0x6d, 0x82, 0x3a, 0xe6, 0xe2, 0x08, 0x86, 0x92, 0x60, + 0x10, 0xa4, 0x34, 0xfe, 0x2a, 0x79, 0x6c, 0x79, 0x07, 0xd4, 0xe4, 0xd6, 0xd2, 0x9f, 0x8b, 0x56, + 0x0a, 0xee, 0xbe, 0x95, 0xce, 0x90, 0xd5, 0x74, 0x86, 0x7c, 0x05, 0xac, 0xfa, 0x70, 0xea, 0x62, + 0x68, 0x19, 0xc4, 0x79, 0x1f, 0xf1, 0x24, 0x5a, 0xd2, 0xeb, 0x92, 0x36, 0x70, 0xde, 0x9f, 0xaf, + 0x5a, 0x60, 0x29, 0xa4, 0xbe, 0x02, 0x56, 0x19, 0xb8, 0x58, 0x58, 0xf0, 0xfa, 0x52, 0xe7, 0x06, + 0xaa, 0x4b, 0x1a, 0x2f, 0x20, 0x89, 0xc2, 0xb6, 0x9a, 0x2a, 0x6c, 0x61, 0x12, 0x6e, 0x9c, 0x9c, + 0x84, 0x05, 0x20, 0x92, 0x49, 0x58, 0xfd, 0x2e, 0x68, 0x05, 0xc8, 0x9a, 0x78, 0x16, 0xf4, 0xcc, + 0xa9, 0x78, 0x79, 0xf3, 0x64, 0x15, 0xf4, 0x88, 0x95, 0xab, 0xd0, 0x0c, 0x12, 0xcf, 0xf3, 0x55, + 0xb2, 0x95, 0xbb, 0x4a, 0xbe, 0x0c, 0x6a, 0xe6, 0x03, 0x64, 0x3e, 0x24, 0x93, 0x31, 0x69, 0x5f, + 0xed, 0x16, 0xb7, 0x56, 0xf5, 0x19, 0x41, 0x7d, 0x1d, 0x5c, 0x73, 0xb1, 0x99, 0x0a, 0x67, 0xc7, + 0x6a, 0xaf, 0x71, 0xcf, 0xfd, 0x1f, 0xff, 0x35, 0x1e, 0xc6, 0x7d, 0x4b, 0xfb, 0x97, 0x02, 0x5e, + 0x12, 0x51, 0x01, 0x3d, 0x13, 0xb9, 0x89, 0xd8, 0x38, 0xa7, 0x64, 0x3a, 0x87, 0xf6, 0x62, 0x0a, + 0xed, 0x29, 0xe4, 0x95, 0xd2, 0xc8, 0x4b, 0xe0, 0xba, 0x92, 0x03, 0xd7, 0xac, 0x78, 0xb4, 0xb8, + 0xc6, 0x03, 0x04, 0xdd, 0x0b, 0xd6, 0x34, 0xa1, 0x45, 0x39, 0x4f, 0x74, 0xce, 0x20, 0x5d, 0xc9, + 0x09, 0xe9, 0x6f, 0x80, 0x97, 0x32, 0xd3, 0x7e, 0x94, 0xef, 0xd7, 0xd3, 0xf9, 0xbe, 0x6f, 0x3d, + 0x07, 0x5d, 0xd5, 0x13, 0xd1, 0x95, 0x04, 0x6c, 0x6d, 0x0e, 0xb0, 0xda, 0x87, 0xa1, 0x27, 0xf6, + 0xb0, 0x3f, 0x3d, 0x93, 0x27, 0x6e, 0x82, 0x16, 0x09, 0x4c, 0x23, 0xed, 0x8d, 0x06, 0x09, 0xcc, + 0xdd, 0x99, 0x43, 0x24, 0x5f, 0xda, 0x29, 0x8c, 0xef, 0xfe, 0xcc, 0x2f, 0x37, 0x41, 0xcb, 0x22, + 0x34, 0xb1, 0x9f, 0x48, 0xca, 0x0d, 0x8b, 0xd0, 0xe4, 0x7e, 0x8c, 0x2f, 0xbe, 0x5f, 0x39, 0xe2, + 0x8b, 0xed, 0x77, 0x17, 0x34, 0x62, 0xef, 0x3d, 0x1d, 0x62, 0xeb, 0x91, 0x48, 0xbc, 0xc1, 0x6e, + 0xc4, 0x5e, 0x74, 0xba, 0x54, 0x5e, 0x8f, 0x64, 0x58, 0xd2, 0x7d, 0xda, 0x7f, 0x94, 0x44, 0x0b, + 0x7a, 0x99, 0x82, 0xa5, 0x94, 0x27, 0x58, 0x4e, 0x56, 0xbe, 0x7c, 0xb2, 0xf2, 0x7f, 0x53, 0x64, + 0x93, 0xa9, 0x23, 0x1e, 0x45, 0x97, 0x2c, 0x5b, 0xe4, 0x32, 0xc0, 0x0d, 0x00, 0x46, 0x38, 0x30, + 0x26, 0xbc, 0x5d, 0xe6, 0x4a, 0x57, 0xf5, 0xda, 0x08, 0x07, 0xa2, 0x7f, 0xce, 0xec, 0xe2, 0xa4, + 0xae, 0x73, 0x52, 0x2b, 0x59, 0xad, 0xf1, 0x4c, 0xa8, 0x42, 0x1e, 0xa1, 0x96, 0xea, 0xe2, 0x7e, + 0x5c, 0x48, 0xb4, 0xfe, 0x12, 0xdf, 0xe7, 0xd8, 0xfa, 0x9f, 0xa3, 0x57, 0x92, 0xad, 0x51, 0x79, + 0x99, 0xd6, 0x48, 0xfb, 0xb7, 0x02, 0xae, 0xc6, 0xba, 0x5a, 0x0e, 0xde, 0xdc, 0xa3, 0x87, 0x1b, + 0x00, 0x88, 0x88, 0x88, 0xd9, 0xa0, 0xc6, 0x29, 0x5c, 0xc3, 0x6f, 0x82, 0x6a, 0x14, 0x30, 0xa7, + 0x38, 0xfc, 0xac, 0xd8, 0x32, 0xfb, 0xcf, 0xf5, 0x3b, 0xa5, 0xdc, 0xfd, 0xce, 0x3a, 0x28, 0xa3, + 0x47, 0x34, 0x80, 0x32, 0xa9, 0x8a, 0x07, 0xed, 0xe7, 0xa1, 0xca, 0x22, 0x2b, 0xcd, 0xa9, 0x5c, + 0x58, 0x46, 0xe5, 0xe2, 0xf3, 0x54, 0x2e, 0x9d, 0x5e, 0x65, 0xed, 0x4f, 0x8a, 0x2c, 0x69, 0xf7, + 0x10, 0x3c, 0x92, 0xa2, 0xdd, 0x05, 0xcd, 0x31, 0x1a, 0x0f, 0x51, 0x10, 0x9d, 0xe9, 0x16, 0xb9, + 0xa5, 0x21, 0xf8, 0xc3, 0xc3, 0xde, 0x25, 0xd1, 0xed, 0x9f, 0x05, 0x99, 0x25, 0x44, 0xe8, 0x71, + 0xe5, 0xde, 0xe6, 0x82, 0x7e, 0x41, 0x53, 0x89, 0xf3, 0xd1, 0x4b, 0x3d, 0x08, 0xfd, 0x43, 0x0c, + 0x8a, 0x99, 0x8f, 0xda, 0xe5, 0x6e, 0x71, 0xab, 0x7e, 0xfb, 0xb5, 0x2c, 0xa4, 0x72, 0x03, 0xc4, + 0x54, 0xdf, 0x47, 0x14, 0x3a, 0xae, 0xbe, 0x2a, 0x77, 0x38, 0xc4, 0x3b, 0x96, 0xa5, 0xee, 0x83, + 0xb5, 0xd8, 0x8e, 0x22, 0x77, 0xb5, 0x2b, 0xdd, 0xe2, 0x73, 0x95, 0x6c, 0x45, 0x5b, 0x08, 0x5c, + 0x6b, 0x7f, 0x2e, 0x44, 0x05, 0xc8, 0x43, 0xc7, 0xff, 0x33, 0xe6, 0x9e, 0xcb, 0x0a, 0xe5, 0xdc, + 0x59, 0x61, 0x1f, 0xac, 0x48, 0x53, 0x71, 0x9b, 0xe6, 0x73, 0x54, 0xb8, 0x54, 0xfb, 0x69, 0x58, + 0xf3, 0x52, 0x3c, 0xea, 0xd7, 0x41, 0x45, 0x70, 0x2d, 0x34, 0xae, 0xe4, 0x53, 0xfb, 0xa0, 0x85, + 0x1e, 0xf9, 0x4e, 0x00, 0xa9, 0x83, 0x3d, 0x83, 0x3a, 0x32, 0x8b, 0xd6, 0x6f, 0x6f, 0xf4, 0xc4, + 0x78, 0xba, 0x17, 0x8e, 0xa7, 0x7b, 0x87, 0xe1, 0x78, 0x7a, 0xb7, 0xf4, 0xc1, 0x5f, 0x36, 0x15, + 0xbd, 0x39, 0x5b, 0xc8, 0x7e, 0xd2, 0xfe, 0xa1, 0x24, 0x0a, 0x1c, 0x97, 0xee, 0x4d, 0x96, 0xf7, + 0x5e, 0x6c, 0xaf, 0x67, 0xa7, 0xf2, 0xc7, 0x61, 0x83, 0xf9, 0xb6, 0x13, 0x04, 0x38, 0x38, 0xd3, + 0x8c, 0x33, 0xdf, 0x10, 0x2f, 0xd7, 0xcc, 0x52, 0x03, 0x0d, 0x0b, 0x11, 0x6a, 0x98, 0x0f, 0xa0, + 0xe3, 0xcd, 0xda, 0xc6, 0x3a, 0x23, 0xee, 0x31, 0x5a, 0xdf, 0xd2, 0x7e, 0x1b, 0x1e, 0xa4, 0xe3, + 0xaa, 0xe8, 0x88, 0x4c, 0x5c, 0xca, 0x3a, 0x1d, 0x79, 0x58, 0x53, 0xf8, 0xc2, 0xf0, 0x28, 0x76, + 0xc1, 0x22, 0xff, 0x3d, 0x69, 0xfd, 0x17, 0xb6, 0xbb, 0x3d, 0x8d, 0xae, 0x9f, 0x24, 0xdd, 0x23, + 0x74, 0x3d, 0xab, 0x7b, 0x2e, 0x58, 0xa7, 0xdf, 0x85, 0x8d, 0x90, 0xd0, 0xe9, 0x52, 0xf5, 0x7e, + 0x29, 0xf9, 0x4b, 0x69, 0xf9, 0x7f, 0x1d, 0xa6, 0xe0, 0x98, 0xfc, 0x0b, 0x5c, 0x72, 0x81, 0xd2, + 0x1e, 0x49, 0x00, 0x0d, 0x28, 0x74, 0xd1, 0x01, 0x76, 0x1d, 0x73, 0xba, 0xe7, 0x22, 0xe8, 0x4d, + 0x7c, 0x75, 0x03, 0x54, 0x87, 0x2e, 0x36, 0x1f, 0xbe, 0x33, 0x19, 0x73, 0x79, 0x8b, 0x7a, 0xf4, + 0xcc, 0xca, 0x9d, 0x3c, 0xcd, 0x38, 0xde, 0x08, 0xcb, 0xb2, 0x90, 0x59, 0xee, 0x44, 0xd9, 0x67, + 0x67, 0x19, 0x1d, 0x58, 0xd1, 0xff, 0xda, 0x13, 0x05, 0xac, 0x4b, 0x2b, 0xd9, 0xa2, 0x4e, 0x7c, + 0x81, 0x69, 0x32, 0xd7, 0x5d, 0xc7, 0xab, 0x60, 0xcd, 0x22, 0xd4, 0xc8, 0x9a, 0xdd, 0x35, 0x2d, + 0x42, 0x0f, 0x66, 0xe3, 0x3b, 0xed, 0x37, 0x0a, 0xd8, 0x88, 0x8d, 0x1d, 0x2f, 0xbb, 0x6a, 0x0c, + 0xaa, 0xed, 0xd8, 0x30, 0x40, 0xc8, 0x8b, 0x2e, 0xab, 0xb4, 0x1f, 0x16, 0xc0, 0xcb, 0x72, 0xb0, + 0x36, 0xf6, 0x19, 0x90, 0x2e, 0x3d, 0x74, 0x16, 0xdf, 0x45, 0x95, 0x16, 0x5e, 0xb5, 0xbe, 0x0a, + 0xd6, 0x48, 0x60, 0xce, 0xc1, 0x4f, 0xa4, 0xcd, 0x26, 0x09, 0xcc, 0x38, 0xfc, 0x0c, 0x50, 0x97, + 0x23, 0x60, 0x7a, 0x08, 0x6d, 0x16, 0xbf, 0xe1, 0x97, 0x01, 0x72, 0xc2, 0x11, 0x3d, 0xab, 0x6f, + 0x80, 0x12, 0x85, 0x36, 0x91, 0x81, 0xdb, 0xcd, 0x1e, 0xfb, 0xcb, 0xee, 0x14, 0xda, 0x44, 0xe7, + 0xdc, 0xda, 0x2f, 0x0b, 0x12, 0x2f, 0xf1, 0x31, 0xc5, 0x9e, 0xb8, 0xaf, 0x58, 0xd2, 0xfa, 0xcb, + 0x0f, 0x5a, 0xce, 0x7e, 0xff, 0x34, 0x7f, 0xcf, 0x53, 0x4e, 0xdf, 0xf3, 0x24, 0x46, 0xbd, 0x95, + 0xf9, 0xbb, 0x89, 0x36, 0x58, 0x39, 0x42, 0x01, 0x71, 0xb0, 0xc7, 0x27, 0x97, 0x45, 0x3d, 0x7c, + 0xd4, 0x3e, 0x29, 0x82, 0xcd, 0x93, 0x2c, 0x35, 0x98, 0x98, 0x26, 0x3b, 0x00, 0xbf, 0x90, 0x06, + 0x4b, 0xdc, 0x58, 0x95, 0xd3, 0x37, 0x56, 0xaf, 0x81, 0x35, 0x3f, 0x40, 0x47, 0x46, 0xc2, 0xb0, + 0x15, 0x6e, 0xd8, 0x16, 0xfb, 0xe1, 0x20, 0x66, 0xdc, 0x2d, 0x70, 0xd5, 0x43, 0xc7, 0x49, 0x56, + 0xf1, 0x71, 0x44, 0xd3, 0x43, 0xc7, 0x71, 0xce, 0xaf, 0x80, 0x26, 0xdf, 0x75, 0xe6, 0x8b, 0x2a, + 0xf7, 0x45, 0x83, 0x51, 0xf7, 0x22, 0x7f, 0x7c, 0x19, 0x34, 0xd8, 0x86, 0xf3, 0xc3, 0xf9, 0x55, + 0x0f, 0x1d, 0xef, 0x65, 0x39, 0x0d, 0x24, 0x9c, 0xc6, 0xca, 0xb0, 0x98, 0x25, 0x5a, 0x06, 0xa4, + 0xfc, 0x3a, 0xae, 0xa8, 0xd7, 0x24, 0x65, 0x87, 0xb2, 0x92, 0xd5, 0x89, 0x65, 0xf7, 0xcf, 0x2f, + 0x06, 0x2e, 0xb0, 0x23, 0xd3, 0x3e, 0x2d, 0x80, 0xeb, 0x61, 0xd2, 0x10, 0x69, 0xf4, 0x2d, 0x17, + 0x1f, 0xeb, 0x90, 0xa2, 0x7b, 0xce, 0xd8, 0x39, 0x37, 0x8d, 0x32, 0xbe, 0x75, 0x29, 0xe6, 0xfc, + 0xd6, 0xe5, 0x5b, 0x60, 0x55, 0xbe, 0x43, 0x74, 0x86, 0xa5, 0x05, 0xeb, 0xa5, 0x44, 0xf7, 0x79, + 0x7f, 0x68, 0x81, 0xd6, 0xc8, 0xc5, 0xc7, 0x06, 0xab, 0x77, 0x86, 0xcb, 0x34, 0x95, 0x17, 0x55, + 0xdf, 0x96, 0x66, 0xbb, 0x69, 0x3b, 0xf4, 0xc1, 0x64, 0xd8, 0x33, 0xf1, 0x58, 0x7e, 0xaf, 0x25, + 0xff, 0xdc, 0x22, 0xd6, 0x43, 0xf9, 0x9d, 0x54, 0x9f, 0x1b, 0x16, 0xc8, 0xb7, 0xf5, 0x3d, 0xaa, + 0x37, 0x46, 0x71, 0xe3, 0x69, 0xbf, 0x08, 0x11, 0x93, 0x61, 0xd9, 0x41, 0x66, 0x37, 0x9e, 0x9e, + 0x44, 0xdf, 0x00, 0xc0, 0x21, 0x42, 0x44, 0x24, 0x02, 0xbe, 0xaa, 0xd7, 0x1c, 0x72, 0x4f, 0x10, + 0xce, 0x50, 0x4e, 0x7f, 0xaf, 0x80, 0x1b, 0x5c, 0xb8, 0x43, 0x6c, 0xdb, 0x2e, 0x1a, 0x1c, 0xec, + 0x10, 0xd6, 0xab, 0xd9, 0x1c, 0xed, 0x36, 0x43, 0xf3, 0x69, 0xa6, 0xe4, 0xb3, 0x97, 0x17, 0x72, + 0x56, 0x46, 0xe2, 0x1b, 0x90, 0xf0, 0x31, 0x92, 0x2d, 0x42, 0x8e, 0xbd, 0xd3, 0xb0, 0x1c, 0x02, + 0x87, 0x2e, 0x12, 0xba, 0x54, 0xf5, 0x0d, 0xe2, 0xcf, 0x8b, 0xb5, 0x2f, 0x39, 0x76, 0xfb, 0x8f, + 0x9f, 0x76, 0x94, 0x8f, 0x9f, 0x76, 0x94, 0xbf, 0x3e, 0xed, 0x28, 0x1f, 0x3c, 0xeb, 0x5c, 0xf9, + 0xf8, 0x59, 0xe7, 0xca, 0x1f, 0x9f, 0x75, 0xae, 0x7c, 0x7f, 0x3b, 0xe6, 0xbc, 0xa1, 0x37, 0xbc, + 0xc5, 0x1b, 0xe0, 0xed, 0xd8, 0xf7, 0x6e, 0x8f, 0x92, 0x5f, 0xbc, 0x0d, 0x2b, 0x7c, 0x90, 0xf1, + 0xfa, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb1, 0x8a, 0x53, 0xc0, 0xdd, 0x27, 0x00, 0x00, } func (m *EventCreateBucket) Marshal() (dAtA []byte, err error) { @@ -5215,6 +5217,16 @@ func (m *EventBucketFlowRateLimitStatus) MarshalToSizedBuffer(dAtA []byte) (int, _ = i var l int _ = l + { + size := m.BucketId.Size() + i -= size + if _, err := m.BucketId.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintEvents(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a if m.IsLimited { i-- if m.IsLimited { @@ -6266,6 +6278,8 @@ func (m *EventBucketFlowRateLimitStatus) Size() (n int) { if m.IsLimited { n += 2 } + l = m.BucketId.Size() + n += 1 + l + sovEvents(uint64(l)) return n } @@ -13511,6 +13525,40 @@ func (m *EventBucketFlowRateLimitStatus) Unmarshal(dAtA []byte) error { } } m.IsLimited = bool(v != 0) + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BucketId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.BucketId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipEvents(dAtA[iNdEx:]) From 6a9059821518e7840b53f985fa3d90a77168e988 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Mon, 1 Apr 2024 11:47:44 +0800 Subject: [PATCH 05/13] feat: remove set bucket flow rate limit message --- app/upgrade.go | 1 - 1 file changed, 1 deletion(-) diff --git a/app/upgrade.go b/app/upgrade.go index 7d4e34531..cc1dc0bf2 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -227,7 +227,6 @@ func (app *App) registerSerengetiUpgradeHandler() { app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas(sdk.MsgTypeURL(&storagemoduletypes.MsgDelegateCreateObject{}), 1.2e3)) app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas(sdk.MsgTypeURL(&storagemoduletypes.MsgDelegateUpdateObjectContent{}), 1.2e3)) app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas(sdk.MsgTypeURL(&storagemoduletypes.MsgSealObjectV2{}), 1.2e2)) - app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas(sdk.MsgTypeURL(&storagemoduletypes.MsgSetBucketFlowRateLimit{}), 1.2e3)) return app.mm.RunMigrations(ctx, app.configurator, fromVM) }) From c5d5f42df57c26b2b6898e7c58ac92dae6da0077 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Mon, 1 Apr 2024 12:33:42 +0800 Subject: [PATCH 06/13] comment related test cases --- e2e/tests/storage_rate_limit_test.go | 809 ++++++++++++++------------- 1 file changed, 405 insertions(+), 404 deletions(-) diff --git a/e2e/tests/storage_rate_limit_test.go b/e2e/tests/storage_rate_limit_test.go index e2e01bd8d..4e07aabe5 100644 --- a/e2e/tests/storage_rate_limit_test.go +++ b/e2e/tests/storage_rate_limit_test.go @@ -1,406 +1,407 @@ package tests -import ( - "bytes" - "context" - "fmt" - "math" - - sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" - - storageutils "github.com/bnb-chain/greenfield/testutil/storage" - storagetypes "github.com/bnb-chain/greenfield/x/storage/types" -) - -func (s *StorageTestSuite) TestSetBucketRateLimitToZero() { - var err error - sp := s.BaseSuite.PickStorageProvider() - gvg, found := sp.GetFirstGlobalVirtualGroup() - s.Require().True(found) - user := s.User - // CreateBucket - bucketName := storageutils.GenRandomBucketName() - msgCreateBucket := storagetypes.NewMsgCreateBucket( - user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), - nil, math.MaxUint, nil, 10000000) - msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId - msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) - s.Require().NoError(err) - s.SendTxBlock(user, msgCreateBucket) - - // HeadBucket - ctx := context.Background() - queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ - BucketName: bucketName, - } - queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) - s.Require().NoError(err) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, user.GetAddr().String()) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) - - queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ - BucketName: bucketName, - }) - s.Require().NoError(err) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) - - fmt.Printf("User: %s\n", s.User.GetAddr().String()) - fmt.Printf("queryHeadBucketResponse.BucketInfo.Owner: %s\n", queryHeadBucketResponse.BucketInfo.Owner) - fmt.Printf("queryHeadBucketResponse.BucketInfo.PaymentAccount: %s\n", queryHeadBucketResponse.BucketInfo.PaymentAddress) - - // SetBucketRateLimit - msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(s.User.GetAddr(), s.User.GetAddr(), s.User.GetAddr(), bucketName, sdkmath.NewInt(0)) - s.SendTxBlock(s.User, msgSetBucketRateLimit) - - queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ - BucketName: bucketName, - } - queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) - s.Require().NoError(err) - - s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) - s.Require().Equal(queryHeadBucketResponse.ExtraInfo.FlowRateLimit.String(), "0") - - // CreateObject - objectName := storageutils.GenRandomObjectName() - // create test buffer - var buffer bytes.Buffer - // Create 1MiB content where each line contains 1024 characters. - for i := 0; i < 1024; i++ { - buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line)) - } - payloadSize := buffer.Len() - checksum := sdk.Keccak256(buffer.Bytes()) - expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum} - contextType := "text/event-stream" - msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) - msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) - s.Require().NoError(err) - s.SendTxBlockWithExpectErrorString(msgCreateObject, user, "greater than the flow rate limit") -} - -// TestNotOwnerSetBucketRateLimit_Object -// 1. user create a bucket with 0 read quota -// 2. the payment account set the rate limit -// 3. user create an object in the bucket -// 4. the payment account set the rate limit to 0 -// 5. user create an object in the bucket and it should fail -// 6. the payment account set the rate limit to a positive number -// 7. user create an object in the bucket and it should pass -func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Object() { - var err error - sp := s.BaseSuite.PickStorageProvider() - gvg, found := sp.GetFirstGlobalVirtualGroup() - s.Require().True(found) - user := s.User - paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] - - // CreateBucket - bucketName := storageutils.GenRandomBucketName() - - msgCreateBucket := storagetypes.NewMsgCreateBucket( - user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), - paymentAcc.GetAddr(), math.MaxUint, nil, 0) - msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId - msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) - s.Require().NoError(err) - s.SendTxBlock(user, msgCreateBucket) - - // HeadBucket - ctx := context.Background() - queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ - BucketName: bucketName, - } - queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) - s.Require().NoError(err) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, paymentAcc.GetAddr().String()) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) - - queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ - BucketName: bucketName, - }) - s.Require().NoError(err) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) - - // SetBucketRateLimit - msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) - s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) - - // CreateObject - objectName := storageutils.GenRandomObjectName() - // create test buffer - var buffer bytes.Buffer - // Create 1MiB content where each line contains 1024 characters. - for i := 0; i < 1024; i++ { - buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line)) - } - payloadSize := buffer.Len() - checksum := sdk.Keccak256(buffer.Bytes()) - expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum} - contextType := "text/event-stream" - msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) - msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) - s.Require().NoError(err) - s.SendTxBlock(user, msgCreateObject) - - // SetBucketRateLimit - msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) - s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) - - // CreateObject - objectName = storageutils.GenRandomObjectName() - msgCreateObject = storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) - msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) - s.Require().NoError(err) - s.SendTxBlockWithExpectErrorString(msgCreateObject, user, "greater than the flow rate limit") - - // SetBucketRateLimit - msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) - s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) - - // create object - objectName = storageutils.GenRandomObjectName() - msgCreateObject = storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) - msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) - s.Require().NoError(err) - - s.SendTxBlock(user, msgCreateObject) -} - -// TestNotOwnerSetBucketRateLimit_Bucket -// 1. user create a bucket with 0 read quota -// 2. the payment account set the rate limit -// 3. user update the read quota to a positive number -// 4. the payment account set the rate limit to 0 -// 5. user update the read quota to a positive number and it should fail -// 6. the payment account set the rate limit to a positive number -// 7. user update the read quota to a positive number and it should pass -func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Bucket() { - var err error - sp := s.BaseSuite.PickStorageProvider() - gvg, found := sp.GetFirstGlobalVirtualGroup() - s.Require().True(found) - user := s.User - paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] - - // CreateBucket - bucketName := storageutils.GenRandomBucketName() - - msgCreateBucket := storagetypes.NewMsgCreateBucket( - user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), - paymentAcc.GetAddr(), math.MaxUint, nil, 0) - msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId - msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) - s.Require().NoError(err) - s.SendTxBlock(user, msgCreateBucket) - - // HeadBucket - ctx := context.Background() - queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ - BucketName: bucketName, - } - queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) - s.Require().NoError(err) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, paymentAcc.GetAddr().String()) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) - - queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ - BucketName: bucketName, - }) - s.Require().NoError(err) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) - - // SetBucketRateLimit - msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000)) - s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) - - // UpdateBucketInfo - var readQuota uint64 = 100 - msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( - user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.SendTxBlock(user, msgUpdateBucketInfo) - - // SetBucketRateLimit - msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) - s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) - - queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ - BucketName: bucketName, - } - queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) - s.Require().NoError(err) - - s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) - - // update bucket - readQuota = 101 - msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( - user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "payment account is not changed but the bucket is limited") - - // SetBucketRateLimit - msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000)) - s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) - - queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ - BucketName: bucketName, - } - queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) - s.Require().NoError(err) - - s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, false) - - // update bucket - readQuota = 102 - msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( - user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.SendTxBlock(user, msgUpdateBucketInfo) -} - -// TestNotOwnerSetBucketRateLimit_BucketPaymentAccount -// 1. user create a bucket with positive read quota -// 2. user set the rate limit to 0 -// 3. update the payment account to another payment account, it should fail -// 4. the payment account set the rate limit to 0 -// 5. user update the payment account to another payment account, it should fail -// 6. the payment account set the rate limit to a positive number -// 7. user update the payment account to another payment account, it should pass -func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_BucketPaymentAccount() { - var err error - sp := s.BaseSuite.PickStorageProvider() - gvg, found := sp.GetFirstGlobalVirtualGroup() - s.Require().True(found) - user := s.User - paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] - - // CreateBucket - bucketName := storageutils.GenRandomBucketName() - - msgCreateBucket := storagetypes.NewMsgCreateBucket( - user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), - user.GetAddr(), math.MaxUint, nil, 100) - msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId - msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) - s.Require().NoError(err) - s.SendTxBlock(user, msgCreateBucket) - - // HeadBucket - ctx := context.Background() - queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ - BucketName: bucketName, - } - queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) - s.Require().NoError(err) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, s.User.GetAddr().String()) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) - - queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ - BucketName: bucketName, - }) - s.Require().NoError(err) - s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) - - // SetBucketRateLimit - msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(s.User.GetAddr(), s.User.GetAddr(), s.User.GetAddr(), bucketName, sdkmath.NewInt(0)) - s.SendTxBlock(s.User, msgSetBucketRateLimit) - - // SetBucketRateLimit - msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( - user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "the flow rate limit is not set") - - // SetBucketRateLimit - msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) - s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) - - queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ - BucketName: bucketName, - } - queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) - s.Require().NoError(err) - - s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) - - // UpdateBucketInfo - msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( - user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "greater than the flow rate limit") - - // SetBucketRateLimit - msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) - s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) - - // UpdateBucketInfo - msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( - user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.SendTxBlock(user, msgUpdateBucketInfo) - - queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ - BucketName: bucketName, - } - queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) - s.Require().NoError(err) - - s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, false) -} - -func (s *StorageTestSuite) TestQueryBucketRateLimit() { - var err error - sp := s.BaseSuite.PickStorageProvider() - gvg, found := sp.GetFirstGlobalVirtualGroup() - s.Require().True(found) - user := s.User - paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] - - // CreateBucket - bucketName := storageutils.GenRandomBucketName() - - msgCreateBucket := storagetypes.NewMsgCreateBucket( - user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), - paymentAcc.GetAddr(), math.MaxUint, nil, 0) - msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId - msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) - s.Require().NoError(err) - s.SendTxBlock(user, msgCreateBucket) - - // SetBucketRateLimit - msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) - s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) - - // update bucket - var readQuota uint64 = 100 - msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( - user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) - s.SendTxBlock(user, msgUpdateBucketInfo) - - s.Require().NoError(err) - - // QueryBucketRateLimit - ctx := context.Background() - queryBucketRateLimitRequest := storagetypes.QueryPaymentAccountBucketFlowRateLimitRequest{ - PaymentAccount: paymentAcc.GetAddr().String(), - BucketName: bucketName, - BucketOwner: user.GetAddr().String(), - } - queryBucketRateLimitResponse, err := s.Client.QueryPaymentAccountBucketFlowRateLimit(ctx, &queryBucketRateLimitRequest) - s.Require().NoError(err) - s.Require().Equal(queryBucketRateLimitResponse.IsSet, true) - s.Require().Equal(queryBucketRateLimitResponse.FlowRateLimit, sdkmath.NewInt(100000000000000)) -} +// +//import ( +// "bytes" +// "context" +// "fmt" +// "math" +// +// sdkmath "cosmossdk.io/math" +// sdk "github.com/cosmos/cosmos-sdk/types" +// +// storageutils "github.com/bnb-chain/greenfield/testutil/storage" +// storagetypes "github.com/bnb-chain/greenfield/x/storage/types" +//) +// +//func (s *StorageTestSuite) TestSetBucketRateLimitToZero() { +// var err error +// sp := s.BaseSuite.PickStorageProvider() +// gvg, found := sp.GetFirstGlobalVirtualGroup() +// s.Require().True(found) +// user := s.User +// // CreateBucket +// bucketName := storageutils.GenRandomBucketName() +// msgCreateBucket := storagetypes.NewMsgCreateBucket( +// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), +// nil, math.MaxUint, nil, 10000000) +// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId +// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) +// s.Require().NoError(err) +// s.SendTxBlock(user, msgCreateBucket) +// +// // HeadBucket +// ctx := context.Background() +// queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ +// BucketName: bucketName, +// } +// queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) +// s.Require().NoError(err) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, user.GetAddr().String()) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) +// +// queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ +// BucketName: bucketName, +// }) +// s.Require().NoError(err) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) +// +// fmt.Printf("User: %s\n", s.User.GetAddr().String()) +// fmt.Printf("queryHeadBucketResponse.BucketInfo.Owner: %s\n", queryHeadBucketResponse.BucketInfo.Owner) +// fmt.Printf("queryHeadBucketResponse.BucketInfo.PaymentAccount: %s\n", queryHeadBucketResponse.BucketInfo.PaymentAddress) +// +// // SetBucketRateLimit +// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(s.User.GetAddr(), s.User.GetAddr(), s.User.GetAddr(), bucketName, sdkmath.NewInt(0)) +// s.SendTxBlock(s.User, msgSetBucketRateLimit) +// +// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ +// BucketName: bucketName, +// } +// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) +// s.Require().NoError(err) +// +// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) +// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.FlowRateLimit.String(), "0") +// +// // CreateObject +// objectName := storageutils.GenRandomObjectName() +// // create test buffer +// var buffer bytes.Buffer +// // Create 1MiB content where each line contains 1024 characters. +// for i := 0; i < 1024; i++ { +// buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line)) +// } +// payloadSize := buffer.Len() +// checksum := sdk.Keccak256(buffer.Bytes()) +// expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum} +// contextType := "text/event-stream" +// msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) +// msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) +// s.Require().NoError(err) +// s.SendTxBlockWithExpectErrorString(msgCreateObject, user, "greater than the flow rate limit") +//} +// +//// TestNotOwnerSetBucketRateLimit_Object +//// 1. user create a bucket with 0 read quota +//// 2. the payment account set the rate limit +//// 3. user create an object in the bucket +//// 4. the payment account set the rate limit to 0 +//// 5. user create an object in the bucket and it should fail +//// 6. the payment account set the rate limit to a positive number +//// 7. user create an object in the bucket and it should pass +//func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Object() { +// var err error +// sp := s.BaseSuite.PickStorageProvider() +// gvg, found := sp.GetFirstGlobalVirtualGroup() +// s.Require().True(found) +// user := s.User +// paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] +// +// // CreateBucket +// bucketName := storageutils.GenRandomBucketName() +// +// msgCreateBucket := storagetypes.NewMsgCreateBucket( +// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), +// paymentAcc.GetAddr(), math.MaxUint, nil, 0) +// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId +// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) +// s.Require().NoError(err) +// s.SendTxBlock(user, msgCreateBucket) +// +// // HeadBucket +// ctx := context.Background() +// queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ +// BucketName: bucketName, +// } +// queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) +// s.Require().NoError(err) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, paymentAcc.GetAddr().String()) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) +// +// queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ +// BucketName: bucketName, +// }) +// s.Require().NoError(err) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) +// +// // SetBucketRateLimit +// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) +// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) +// +// // CreateObject +// objectName := storageutils.GenRandomObjectName() +// // create test buffer +// var buffer bytes.Buffer +// // Create 1MiB content where each line contains 1024 characters. +// for i := 0; i < 1024; i++ { +// buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line)) +// } +// payloadSize := buffer.Len() +// checksum := sdk.Keccak256(buffer.Bytes()) +// expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum} +// contextType := "text/event-stream" +// msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) +// msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) +// s.Require().NoError(err) +// s.SendTxBlock(user, msgCreateObject) +// +// // SetBucketRateLimit +// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) +// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) +// +// // CreateObject +// objectName = storageutils.GenRandomObjectName() +// msgCreateObject = storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) +// msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) +// s.Require().NoError(err) +// s.SendTxBlockWithExpectErrorString(msgCreateObject, user, "greater than the flow rate limit") +// +// // SetBucketRateLimit +// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) +// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) +// +// // create object +// objectName = storageutils.GenRandomObjectName() +// msgCreateObject = storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) +// msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) +// s.Require().NoError(err) +// +// s.SendTxBlock(user, msgCreateObject) +//} +// +//// TestNotOwnerSetBucketRateLimit_Bucket +//// 1. user create a bucket with 0 read quota +//// 2. the payment account set the rate limit +//// 3. user update the read quota to a positive number +//// 4. the payment account set the rate limit to 0 +//// 5. user update the read quota to a positive number and it should fail +//// 6. the payment account set the rate limit to a positive number +//// 7. user update the read quota to a positive number and it should pass +//func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Bucket() { +// var err error +// sp := s.BaseSuite.PickStorageProvider() +// gvg, found := sp.GetFirstGlobalVirtualGroup() +// s.Require().True(found) +// user := s.User +// paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] +// +// // CreateBucket +// bucketName := storageutils.GenRandomBucketName() +// +// msgCreateBucket := storagetypes.NewMsgCreateBucket( +// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), +// paymentAcc.GetAddr(), math.MaxUint, nil, 0) +// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId +// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) +// s.Require().NoError(err) +// s.SendTxBlock(user, msgCreateBucket) +// +// // HeadBucket +// ctx := context.Background() +// queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ +// BucketName: bucketName, +// } +// queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) +// s.Require().NoError(err) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, paymentAcc.GetAddr().String()) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) +// +// queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ +// BucketName: bucketName, +// }) +// s.Require().NoError(err) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) +// +// // SetBucketRateLimit +// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000)) +// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) +// +// // UpdateBucketInfo +// var readQuota uint64 = 100 +// msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( +// user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.SendTxBlock(user, msgUpdateBucketInfo) +// +// // SetBucketRateLimit +// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) +// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) +// +// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ +// BucketName: bucketName, +// } +// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) +// s.Require().NoError(err) +// +// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) +// +// // update bucket +// readQuota = 101 +// msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( +// user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "payment account is not changed but the bucket is limited") +// +// // SetBucketRateLimit +// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000)) +// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) +// +// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ +// BucketName: bucketName, +// } +// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) +// s.Require().NoError(err) +// +// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, false) +// +// // update bucket +// readQuota = 102 +// msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( +// user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.SendTxBlock(user, msgUpdateBucketInfo) +//} +// +//// TestNotOwnerSetBucketRateLimit_BucketPaymentAccount +//// 1. user create a bucket with positive read quota +//// 2. user set the rate limit to 0 +//// 3. update the payment account to another payment account, it should fail +//// 4. the payment account set the rate limit to 0 +//// 5. user update the payment account to another payment account, it should fail +//// 6. the payment account set the rate limit to a positive number +//// 7. user update the payment account to another payment account, it should pass +//func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_BucketPaymentAccount() { +// var err error +// sp := s.BaseSuite.PickStorageProvider() +// gvg, found := sp.GetFirstGlobalVirtualGroup() +// s.Require().True(found) +// user := s.User +// paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] +// +// // CreateBucket +// bucketName := storageutils.GenRandomBucketName() +// +// msgCreateBucket := storagetypes.NewMsgCreateBucket( +// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), +// user.GetAddr(), math.MaxUint, nil, 100) +// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId +// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) +// s.Require().NoError(err) +// s.SendTxBlock(user, msgCreateBucket) +// +// // HeadBucket +// ctx := context.Background() +// queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ +// BucketName: bucketName, +// } +// queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) +// s.Require().NoError(err) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, s.User.GetAddr().String()) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) +// +// queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ +// BucketName: bucketName, +// }) +// s.Require().NoError(err) +// s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) +// +// // SetBucketRateLimit +// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(s.User.GetAddr(), s.User.GetAddr(), s.User.GetAddr(), bucketName, sdkmath.NewInt(0)) +// s.SendTxBlock(s.User, msgSetBucketRateLimit) +// +// // SetBucketRateLimit +// msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( +// user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "the flow rate limit is not set") +// +// // SetBucketRateLimit +// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) +// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) +// +// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ +// BucketName: bucketName, +// } +// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) +// s.Require().NoError(err) +// +// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) +// +// // UpdateBucketInfo +// msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( +// user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "greater than the flow rate limit") +// +// // SetBucketRateLimit +// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) +// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) +// +// // UpdateBucketInfo +// msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( +// user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.SendTxBlock(user, msgUpdateBucketInfo) +// +// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ +// BucketName: bucketName, +// } +// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) +// s.Require().NoError(err) +// +// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, false) +//} +// +//func (s *StorageTestSuite) TestQueryBucketRateLimit() { +// var err error +// sp := s.BaseSuite.PickStorageProvider() +// gvg, found := sp.GetFirstGlobalVirtualGroup() +// s.Require().True(found) +// user := s.User +// paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] +// +// // CreateBucket +// bucketName := storageutils.GenRandomBucketName() +// +// msgCreateBucket := storagetypes.NewMsgCreateBucket( +// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), +// paymentAcc.GetAddr(), math.MaxUint, nil, 0) +// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId +// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) +// s.Require().NoError(err) +// s.SendTxBlock(user, msgCreateBucket) +// +// // SetBucketRateLimit +// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) +// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) +// +// // update bucket +// var readQuota uint64 = 100 +// msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( +// user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) +// s.SendTxBlock(user, msgUpdateBucketInfo) +// +// s.Require().NoError(err) +// +// // QueryBucketRateLimit +// ctx := context.Background() +// queryBucketRateLimitRequest := storagetypes.QueryPaymentAccountBucketFlowRateLimitRequest{ +// PaymentAccount: paymentAcc.GetAddr().String(), +// BucketName: bucketName, +// BucketOwner: user.GetAddr().String(), +// } +// queryBucketRateLimitResponse, err := s.Client.QueryPaymentAccountBucketFlowRateLimit(ctx, &queryBucketRateLimitRequest) +// s.Require().NoError(err) +// s.Require().Equal(queryBucketRateLimitResponse.IsSet, true) +// s.Require().Equal(queryBucketRateLimitResponse.FlowRateLimit, sdkmath.NewInt(100000000000000)) +//} From 0084869699eec6caf1e51e82af3c4c4944944cf1 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Mon, 1 Apr 2024 15:48:58 +0800 Subject: [PATCH 07/13] fix: fix uncharge issue when force-deleting objects --- e2e/tests/storage_rate_limit_test.go | 887 +++++++++++++++------------ x/storage/keeper/payment.go | 42 +- 2 files changed, 514 insertions(+), 415 deletions(-) diff --git a/e2e/tests/storage_rate_limit_test.go b/e2e/tests/storage_rate_limit_test.go index 4e07aabe5..9dec8bd46 100644 --- a/e2e/tests/storage_rate_limit_test.go +++ b/e2e/tests/storage_rate_limit_test.go @@ -1,407 +1,484 @@ package tests -// -//import ( -// "bytes" -// "context" -// "fmt" -// "math" -// -// sdkmath "cosmossdk.io/math" -// sdk "github.com/cosmos/cosmos-sdk/types" -// -// storageutils "github.com/bnb-chain/greenfield/testutil/storage" -// storagetypes "github.com/bnb-chain/greenfield/x/storage/types" -//) -// -//func (s *StorageTestSuite) TestSetBucketRateLimitToZero() { -// var err error -// sp := s.BaseSuite.PickStorageProvider() -// gvg, found := sp.GetFirstGlobalVirtualGroup() -// s.Require().True(found) -// user := s.User -// // CreateBucket -// bucketName := storageutils.GenRandomBucketName() -// msgCreateBucket := storagetypes.NewMsgCreateBucket( -// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), -// nil, math.MaxUint, nil, 10000000) -// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId -// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) -// s.Require().NoError(err) -// s.SendTxBlock(user, msgCreateBucket) -// -// // HeadBucket -// ctx := context.Background() -// queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ -// BucketName: bucketName, -// } -// queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) -// s.Require().NoError(err) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, user.GetAddr().String()) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) -// -// queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ -// BucketName: bucketName, -// }) -// s.Require().NoError(err) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) -// -// fmt.Printf("User: %s\n", s.User.GetAddr().String()) -// fmt.Printf("queryHeadBucketResponse.BucketInfo.Owner: %s\n", queryHeadBucketResponse.BucketInfo.Owner) -// fmt.Printf("queryHeadBucketResponse.BucketInfo.PaymentAccount: %s\n", queryHeadBucketResponse.BucketInfo.PaymentAddress) -// -// // SetBucketRateLimit -// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(s.User.GetAddr(), s.User.GetAddr(), s.User.GetAddr(), bucketName, sdkmath.NewInt(0)) -// s.SendTxBlock(s.User, msgSetBucketRateLimit) -// -// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ -// BucketName: bucketName, -// } -// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) -// s.Require().NoError(err) -// -// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) -// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.FlowRateLimit.String(), "0") -// -// // CreateObject -// objectName := storageutils.GenRandomObjectName() -// // create test buffer -// var buffer bytes.Buffer -// // Create 1MiB content where each line contains 1024 characters. -// for i := 0; i < 1024; i++ { -// buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line)) -// } -// payloadSize := buffer.Len() -// checksum := sdk.Keccak256(buffer.Bytes()) -// expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum} -// contextType := "text/event-stream" -// msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) -// msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) -// s.Require().NoError(err) -// s.SendTxBlockWithExpectErrorString(msgCreateObject, user, "greater than the flow rate limit") -//} -// -//// TestNotOwnerSetBucketRateLimit_Object -//// 1. user create a bucket with 0 read quota -//// 2. the payment account set the rate limit -//// 3. user create an object in the bucket -//// 4. the payment account set the rate limit to 0 -//// 5. user create an object in the bucket and it should fail -//// 6. the payment account set the rate limit to a positive number -//// 7. user create an object in the bucket and it should pass -//func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Object() { -// var err error -// sp := s.BaseSuite.PickStorageProvider() -// gvg, found := sp.GetFirstGlobalVirtualGroup() -// s.Require().True(found) -// user := s.User -// paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] -// -// // CreateBucket -// bucketName := storageutils.GenRandomBucketName() -// -// msgCreateBucket := storagetypes.NewMsgCreateBucket( -// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), -// paymentAcc.GetAddr(), math.MaxUint, nil, 0) -// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId -// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) -// s.Require().NoError(err) -// s.SendTxBlock(user, msgCreateBucket) -// -// // HeadBucket -// ctx := context.Background() -// queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ -// BucketName: bucketName, -// } -// queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) -// s.Require().NoError(err) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, paymentAcc.GetAddr().String()) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) -// -// queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ -// BucketName: bucketName, -// }) -// s.Require().NoError(err) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) -// -// // SetBucketRateLimit -// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) -// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) -// -// // CreateObject -// objectName := storageutils.GenRandomObjectName() -// // create test buffer -// var buffer bytes.Buffer -// // Create 1MiB content where each line contains 1024 characters. -// for i := 0; i < 1024; i++ { -// buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line)) -// } -// payloadSize := buffer.Len() -// checksum := sdk.Keccak256(buffer.Bytes()) -// expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum} -// contextType := "text/event-stream" -// msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) -// msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) -// s.Require().NoError(err) -// s.SendTxBlock(user, msgCreateObject) -// -// // SetBucketRateLimit -// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) -// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) -// -// // CreateObject -// objectName = storageutils.GenRandomObjectName() -// msgCreateObject = storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) -// msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) -// s.Require().NoError(err) -// s.SendTxBlockWithExpectErrorString(msgCreateObject, user, "greater than the flow rate limit") -// -// // SetBucketRateLimit -// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) -// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) -// -// // create object -// objectName = storageutils.GenRandomObjectName() -// msgCreateObject = storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) -// msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) -// s.Require().NoError(err) -// -// s.SendTxBlock(user, msgCreateObject) -//} -// -//// TestNotOwnerSetBucketRateLimit_Bucket -//// 1. user create a bucket with 0 read quota -//// 2. the payment account set the rate limit -//// 3. user update the read quota to a positive number -//// 4. the payment account set the rate limit to 0 -//// 5. user update the read quota to a positive number and it should fail -//// 6. the payment account set the rate limit to a positive number -//// 7. user update the read quota to a positive number and it should pass -//func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Bucket() { -// var err error -// sp := s.BaseSuite.PickStorageProvider() -// gvg, found := sp.GetFirstGlobalVirtualGroup() -// s.Require().True(found) -// user := s.User -// paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] -// -// // CreateBucket -// bucketName := storageutils.GenRandomBucketName() -// -// msgCreateBucket := storagetypes.NewMsgCreateBucket( -// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), -// paymentAcc.GetAddr(), math.MaxUint, nil, 0) -// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId -// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) -// s.Require().NoError(err) -// s.SendTxBlock(user, msgCreateBucket) -// -// // HeadBucket -// ctx := context.Background() -// queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ -// BucketName: bucketName, -// } -// queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) -// s.Require().NoError(err) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, paymentAcc.GetAddr().String()) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) -// -// queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ -// BucketName: bucketName, -// }) -// s.Require().NoError(err) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) -// -// // SetBucketRateLimit -// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000)) -// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) -// -// // UpdateBucketInfo -// var readQuota uint64 = 100 -// msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( -// user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.SendTxBlock(user, msgUpdateBucketInfo) -// -// // SetBucketRateLimit -// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) -// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) -// -// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ -// BucketName: bucketName, -// } -// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) -// s.Require().NoError(err) -// -// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) -// -// // update bucket -// readQuota = 101 -// msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( -// user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "payment account is not changed but the bucket is limited") -// -// // SetBucketRateLimit -// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000)) -// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) -// -// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ -// BucketName: bucketName, -// } -// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) -// s.Require().NoError(err) -// -// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, false) -// -// // update bucket -// readQuota = 102 -// msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( -// user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.SendTxBlock(user, msgUpdateBucketInfo) -//} -// -//// TestNotOwnerSetBucketRateLimit_BucketPaymentAccount -//// 1. user create a bucket with positive read quota -//// 2. user set the rate limit to 0 -//// 3. update the payment account to another payment account, it should fail -//// 4. the payment account set the rate limit to 0 -//// 5. user update the payment account to another payment account, it should fail -//// 6. the payment account set the rate limit to a positive number -//// 7. user update the payment account to another payment account, it should pass -//func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_BucketPaymentAccount() { -// var err error -// sp := s.BaseSuite.PickStorageProvider() -// gvg, found := sp.GetFirstGlobalVirtualGroup() -// s.Require().True(found) -// user := s.User -// paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] -// -// // CreateBucket -// bucketName := storageutils.GenRandomBucketName() -// -// msgCreateBucket := storagetypes.NewMsgCreateBucket( -// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), -// user.GetAddr(), math.MaxUint, nil, 100) -// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId -// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) -// s.Require().NoError(err) -// s.SendTxBlock(user, msgCreateBucket) -// -// // HeadBucket -// ctx := context.Background() -// queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ -// BucketName: bucketName, -// } -// queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) -// s.Require().NoError(err) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, s.User.GetAddr().String()) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) -// -// queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ -// BucketName: bucketName, -// }) -// s.Require().NoError(err) -// s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) -// -// // SetBucketRateLimit -// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(s.User.GetAddr(), s.User.GetAddr(), s.User.GetAddr(), bucketName, sdkmath.NewInt(0)) -// s.SendTxBlock(s.User, msgSetBucketRateLimit) -// -// // SetBucketRateLimit -// msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( -// user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "the flow rate limit is not set") -// -// // SetBucketRateLimit -// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) -// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) -// -// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ -// BucketName: bucketName, -// } -// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) -// s.Require().NoError(err) -// -// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) -// -// // UpdateBucketInfo -// msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( -// user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "greater than the flow rate limit") -// -// // SetBucketRateLimit -// msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) -// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) -// -// // UpdateBucketInfo -// msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( -// user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.SendTxBlock(user, msgUpdateBucketInfo) -// -// queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ -// BucketName: bucketName, -// } -// queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) -// s.Require().NoError(err) -// -// s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, false) -//} -// -//func (s *StorageTestSuite) TestQueryBucketRateLimit() { -// var err error -// sp := s.BaseSuite.PickStorageProvider() -// gvg, found := sp.GetFirstGlobalVirtualGroup() -// s.Require().True(found) -// user := s.User -// paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] -// -// // CreateBucket -// bucketName := storageutils.GenRandomBucketName() -// -// msgCreateBucket := storagetypes.NewMsgCreateBucket( -// user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), -// paymentAcc.GetAddr(), math.MaxUint, nil, 0) -// msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId -// msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) -// s.Require().NoError(err) -// s.SendTxBlock(user, msgCreateBucket) -// -// // SetBucketRateLimit -// msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) -// s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) -// -// // update bucket -// var readQuota uint64 = 100 -// msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( -// user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) -// s.SendTxBlock(user, msgUpdateBucketInfo) -// -// s.Require().NoError(err) -// -// // QueryBucketRateLimit -// ctx := context.Background() -// queryBucketRateLimitRequest := storagetypes.QueryPaymentAccountBucketFlowRateLimitRequest{ -// PaymentAccount: paymentAcc.GetAddr().String(), -// BucketName: bucketName, -// BucketOwner: user.GetAddr().String(), -// } -// queryBucketRateLimitResponse, err := s.Client.QueryPaymentAccountBucketFlowRateLimit(ctx, &queryBucketRateLimitRequest) -// s.Require().NoError(err) -// s.Require().Equal(queryBucketRateLimitResponse.IsSet, true) -// s.Require().Equal(queryBucketRateLimitResponse.FlowRateLimit, sdkmath.NewInt(100000000000000)) -//} +import ( + "bytes" + "context" + "fmt" + "math" + "strconv" + "time" + + sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + gashubtypes "github.com/cosmos/cosmos-sdk/x/gashub/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + + types2 "github.com/bnb-chain/greenfield/sdk/types" + + storageutils "github.com/bnb-chain/greenfield/testutil/storage" + storagetypes "github.com/bnb-chain/greenfield/x/storage/types" +) + +func (s *StorageTestSuite) enableMessage() { + msgSetBucketFlowRateLimit := sdk.MsgTypeURL(&storagetypes.MsgSetBucketFlowRateLimit{}) + msgMigrateBuketGasParams := gashubtypes.NewMsgGasParamsWithFixedGas(msgSetBucketFlowRateLimit, 1.2e3) + + msgUpdateGasParams := gashubtypes.NewMsgSetMsgGasParams(authtypes.NewModuleAddress(govtypes.ModuleName).String(), []*gashubtypes.MsgGasParams{msgMigrateBuketGasParams}, nil) + + var err error + validator := s.Validator.GetAddr() + + ctx := context.Background() + + msgProposal, err := govtypesv1.NewMsgSubmitProposal( + []sdk.Msg{msgUpdateGasParams}, + sdk.Coins{sdk.NewCoin(s.BaseSuite.Config.Denom, types2.NewIntFromInt64WithDecimal(100, types2.DecimalBNB))}, + validator.String(), + "test", "test", "test", + ) + s.Require().NoError(err) + + txRes := s.SendTxBlock(s.Validator, msgProposal) + s.Require().Equal(txRes.Code, uint32(0)) + + // 3. query proposal and get proposal ID + var proposalId uint64 + for _, event := range txRes.Logs[0].Events { + if event.Type == "submit_proposal" { + for _, attr := range event.Attributes { + if attr.Key == "proposal_id" { + proposalId, err = strconv.ParseUint(attr.Value, 10, 0) + s.Require().NoError(err) + break + } + } + break + } + } + s.Require().True(proposalId != 0) + + queryProposal := &govtypesv1.QueryProposalRequest{ProposalId: proposalId} + _, err = s.Client.GovQueryClientV1.Proposal(ctx, queryProposal) + s.Require().NoError(err) + + // 4. submit MsgVote and wait the proposal exec + msgVote := govtypesv1.NewMsgVote(validator, proposalId, govtypesv1.OptionYes, "test") + txRes = s.SendTxBlock(s.Validator, msgVote) + s.Require().Equal(txRes.Code, uint32(0)) + + queryVoteParamsReq := govtypesv1.QueryParamsRequest{ParamsType: "voting"} + queryVoteParamsResp, err := s.Client.GovQueryClientV1.Params(ctx, &queryVoteParamsReq) + s.Require().NoError(err) + + // 5. wait a voting period and confirm that the proposal success. + s.T().Logf("voting period %s", *queryVoteParamsResp.Params.VotingPeriod) + time.Sleep(*queryVoteParamsResp.Params.VotingPeriod) + time.Sleep(1 * time.Second) + proposalRes, err := s.Client.GovQueryClientV1.Proposal(ctx, queryProposal) + s.Require().NoError(err) + s.Require().Equal(proposalRes.Proposal.Status, govtypesv1.ProposalStatus_PROPOSAL_STATUS_PASSED) +} + +func (s *StorageTestSuite) TestSetBucketRateLimitToZero() { + s.enableMessage() + + var err error + sp := s.BaseSuite.PickStorageProvider() + gvg, found := sp.GetFirstGlobalVirtualGroup() + s.Require().True(found) + user := s.User + // CreateBucket + bucketName := storageutils.GenRandomBucketName() + msgCreateBucket := storagetypes.NewMsgCreateBucket( + user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), + nil, math.MaxUint, nil, 10000000) + msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId + msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlock(user, msgCreateBucket) + + // HeadBucket + ctx := context.Background() + queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, user.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) + + queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ + BucketName: bucketName, + }) + s.Require().NoError(err) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) + + fmt.Printf("User: %s\n", s.User.GetAddr().String()) + fmt.Printf("queryHeadBucketResponse.BucketInfo.Owner: %s\n", queryHeadBucketResponse.BucketInfo.Owner) + fmt.Printf("queryHeadBucketResponse.BucketInfo.PaymentAccount: %s\n", queryHeadBucketResponse.BucketInfo.PaymentAddress) + + // SetBucketRateLimit + msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(s.User.GetAddr(), s.User.GetAddr(), s.User.GetAddr(), bucketName, sdkmath.NewInt(0)) + s.SendTxBlock(s.User, msgSetBucketRateLimit) + + queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + + s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) + s.Require().Equal(queryHeadBucketResponse.ExtraInfo.FlowRateLimit.String(), "0") + + // CreateObject + objectName := storageutils.GenRandomObjectName() + // create test buffer + var buffer bytes.Buffer + // Create 1MiB content where each line contains 1024 characters. + for i := 0; i < 1024; i++ { + buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line)) + } + payloadSize := buffer.Len() + checksum := sdk.Keccak256(buffer.Bytes()) + expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum} + contextType := "text/event-stream" + msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) + msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlockWithExpectErrorString(msgCreateObject, user, "greater than the flow rate limit") +} + +// TestNotOwnerSetBucketRateLimit_Object +// 1. user create a bucket with 0 read quota +// 2. the payment account set the rate limit +// 3. user create an object in the bucket +// 4. the payment account set the rate limit to 0 +// 5. user create an object in the bucket and it should fail +// 6. the payment account set the rate limit to a positive number +// 7. user create an object in the bucket and it should pass +func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Object() { + s.enableMessage() + + var err error + sp := s.BaseSuite.PickStorageProvider() + gvg, found := sp.GetFirstGlobalVirtualGroup() + s.Require().True(found) + user := s.User + paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] + + // CreateBucket + bucketName := storageutils.GenRandomBucketName() + + msgCreateBucket := storagetypes.NewMsgCreateBucket( + user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), + paymentAcc.GetAddr(), math.MaxUint, nil, 0) + msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId + msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlock(user, msgCreateBucket) + + // HeadBucket + ctx := context.Background() + queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, paymentAcc.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) + + queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ + BucketName: bucketName, + }) + s.Require().NoError(err) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) + + // SetBucketRateLimit + msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) + s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) + + // CreateObject + objectName := storageutils.GenRandomObjectName() + // create test buffer + var buffer bytes.Buffer + // Create 1MiB content where each line contains 1024 characters. + for i := 0; i < 1024; i++ { + buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line)) + } + payloadSize := buffer.Len() + checksum := sdk.Keccak256(buffer.Bytes()) + expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum} + contextType := "text/event-stream" + msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) + msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlock(user, msgCreateObject) + + // SetBucketRateLimit + msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) + s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) + + // CreateObject + objectName = storageutils.GenRandomObjectName() + msgCreateObject = storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) + msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlockWithExpectErrorString(msgCreateObject, user, "greater than the flow rate limit") + + // SetBucketRateLimit + msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) + s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) + + // create object + objectName = storageutils.GenRandomObjectName() + msgCreateObject = storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) + msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) + s.Require().NoError(err) + + s.SendTxBlock(user, msgCreateObject) +} + +// TestNotOwnerSetBucketRateLimit_Bucket +// 1. user create a bucket with 0 read quota +// 2. the payment account set the rate limit +// 3. user update the read quota to a positive number +// 4. the payment account set the rate limit to 0 +// 5. user update the read quota to a positive number and it should fail +// 6. the payment account set the rate limit to a positive number +// 7. user update the read quota to a positive number and it should pass +func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Bucket() { + s.enableMessage() + + var err error + sp := s.BaseSuite.PickStorageProvider() + gvg, found := sp.GetFirstGlobalVirtualGroup() + s.Require().True(found) + user := s.User + paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] + + // CreateBucket + bucketName := storageutils.GenRandomBucketName() + + msgCreateBucket := storagetypes.NewMsgCreateBucket( + user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), + paymentAcc.GetAddr(), math.MaxUint, nil, 0) + msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId + msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlock(user, msgCreateBucket) + + // HeadBucket + ctx := context.Background() + queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, paymentAcc.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) + + queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ + BucketName: bucketName, + }) + s.Require().NoError(err) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) + + // SetBucketRateLimit + msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000)) + s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) + + // UpdateBucketInfo + var readQuota uint64 = 100 + msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( + user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.SendTxBlock(user, msgUpdateBucketInfo) + + // SetBucketRateLimit + msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) + s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) + + queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + + s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) + + // update bucket + readQuota = 101 + msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( + user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "payment account is not changed but the bucket is limited") + + // SetBucketRateLimit + msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000)) + s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) + + queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + + s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, false) + + // update bucket + readQuota = 102 + msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( + user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.SendTxBlock(user, msgUpdateBucketInfo) +} + +// TestNotOwnerSetBucketRateLimit_BucketPaymentAccount +// 1. user create a bucket with positive read quota +// 2. user set the rate limit to 0 +// 3. update the payment account to another payment account, it should fail +// 4. the payment account set the rate limit to 0 +// 5. user update the payment account to another payment account, it should fail +// 6. the payment account set the rate limit to a positive number +// 7. user update the payment account to another payment account, it should pass +func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_BucketPaymentAccount() { + s.enableMessage() + + var err error + sp := s.BaseSuite.PickStorageProvider() + gvg, found := sp.GetFirstGlobalVirtualGroup() + s.Require().True(found) + user := s.User + paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] + + // CreateBucket + bucketName := storageutils.GenRandomBucketName() + + msgCreateBucket := storagetypes.NewMsgCreateBucket( + user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), + user.GetAddr(), math.MaxUint, nil, 100) + msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId + msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlock(user, msgCreateBucket) + + // HeadBucket + ctx := context.Background() + queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, s.User.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) + + queryQuotaUpdateTimeResponse, err := s.Client.QueryQuotaUpdateTime(ctx, &storagetypes.QueryQuoteUpdateTimeRequest{ + BucketName: bucketName, + }) + s.Require().NoError(err) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.CreateAt, queryQuotaUpdateTimeResponse.UpdateAt) + + // SetBucketRateLimit + msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(s.User.GetAddr(), s.User.GetAddr(), s.User.GetAddr(), bucketName, sdkmath.NewInt(0)) + s.SendTxBlock(s.User, msgSetBucketRateLimit) + + // SetBucketRateLimit + msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( + user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "the flow rate limit is not set") + + // SetBucketRateLimit + msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(0)) + s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) + + queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + + s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) + + // UpdateBucketInfo + msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( + user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "greater than the flow rate limit") + + // SetBucketRateLimit + msgSetBucketRateLimit = storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) + s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) + + // UpdateBucketInfo + msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo( + user.GetAddr(), bucketName, nil, paymentAcc.GetAddr(), storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.SendTxBlock(user, msgUpdateBucketInfo) + + queryHeadBucketRequest = storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + + s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, false) +} + +func (s *StorageTestSuite) TestQueryBucketRateLimit() { + s.enableMessage() + + var err error + sp := s.BaseSuite.PickStorageProvider() + gvg, found := sp.GetFirstGlobalVirtualGroup() + s.Require().True(found) + user := s.User + paymentAcc := s.GenAndChargeAccounts(1, 1000000)[0] + + // CreateBucket + bucketName := storageutils.GenRandomBucketName() + + msgCreateBucket := storagetypes.NewMsgCreateBucket( + user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(), + paymentAcc.GetAddr(), math.MaxUint, nil, 0) + msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId + msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlock(user, msgCreateBucket) + + // SetBucketRateLimit + msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(paymentAcc.GetAddr(), s.User.GetAddr(), paymentAcc.GetAddr(), bucketName, sdkmath.NewInt(100000000000000)) + s.SendTxBlock(paymentAcc, msgSetBucketRateLimit) + + // update bucket + var readQuota uint64 = 100 + msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo( + user.GetAddr(), bucketName, &readQuota, nil, storagetypes.VISIBILITY_TYPE_PUBLIC_READ) + s.SendTxBlock(user, msgUpdateBucketInfo) + + s.Require().NoError(err) + + // QueryBucketRateLimit + ctx := context.Background() + queryBucketRateLimitRequest := storagetypes.QueryPaymentAccountBucketFlowRateLimitRequest{ + PaymentAccount: paymentAcc.GetAddr().String(), + BucketName: bucketName, + BucketOwner: user.GetAddr().String(), + } + queryBucketRateLimitResponse, err := s.Client.QueryPaymentAccountBucketFlowRateLimit(ctx, &queryBucketRateLimitRequest) + s.Require().NoError(err) + s.Require().Equal(queryBucketRateLimitResponse.IsSet, true) + s.Require().Equal(queryBucketRateLimitResponse.FlowRateLimit, sdkmath.NewInt(100000000000000)) +} diff --git a/x/storage/keeper/payment.go b/x/storage/keeper/payment.go index 37c044895..e4384a9a6 100644 --- a/x/storage/keeper/payment.go +++ b/x/storage/keeper/payment.go @@ -435,23 +435,45 @@ func (k Keeper) ChargeViaObjectChange(ctx sdk.Context, bucketInfo *storagetypes. userFlows.Flows = append(userFlows.Flows, newOutFlows...) if ctx.IsUpgraded(upgradetypes.Serengeti) { - currentBill, err := k.GetBucketReadStoreBill(ctx, bucketInfo, internalBucketInfo) - if err != nil { - return nil, fmt.Errorf("get bucket bill failed: %s %w", bucketInfo.BucketName, err) + var shouldApplyFlowRate = true + forced, _ := ctx.Value(types.ForceUpdateStreamRecordKey).(bool) + if forced { + isRateLimited := k.IsBucketRateLimited(ctx, bucketInfo.BucketName) + if isRateLimited { + // if the bucket is rate limited, no need to apply the flow rate since + // the bucket is already uncharged + shouldApplyFlowRate = false + } + } else { + // we should only check the flow rate limit when is not forced + currentBill, err := k.GetBucketReadStoreBill(ctx, bucketInfo, internalBucketInfo) + if err != nil { + return nil, fmt.Errorf("get bucket bill failed: %s %w", bucketInfo.BucketName, err) + } + + err = k.isBucketFlowRateUnderLimit(ctx, sdk.MustAccAddressFromHex(bucketInfo.PaymentAddress), sdk.MustAccAddressFromHex(bucketInfo.Owner), bucketInfo.BucketName, currentBill) + if err != nil { + return nil, err + } } - err = k.isBucketFlowRateUnderLimit(ctx, sdk.MustAccAddressFromHex(bucketInfo.PaymentAddress), sdk.MustAccAddressFromHex(bucketInfo.Owner), bucketInfo.BucketName, currentBill) + if shouldApplyFlowRate { + err = k.paymentKeeper.ApplyUserFlowsList(ctx, []types.UserFlows{userFlows}) + if err != nil { + ctx.Logger().Error("charge object store fee failed", "bucket", bucketInfo.BucketName, + "object", objectInfo.ObjectName, "err", err.Error()) + return nil, err + } + } + } else { + err = k.paymentKeeper.ApplyUserFlowsList(ctx, []types.UserFlows{userFlows}) if err != nil { + ctx.Logger().Error("charge object store fee failed", "bucket", bucketInfo.BucketName, + "object", objectInfo.ObjectName, "err", err.Error()) return nil, err } } - err = k.paymentKeeper.ApplyUserFlowsList(ctx, []types.UserFlows{userFlows}) - if err != nil { - ctx.Logger().Error("charge object store fee failed", "bucket", bucketInfo.BucketName, - "object", objectInfo.ObjectName, "err", err.Error()) - return nil, err - } // merge outflows for early deletion usage return k.paymentKeeper.MergeOutFlows(userFlows.Flows), nil } From 220ec828b377e7af5eb627536759b631b7b366a9 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Mon, 1 Apr 2024 16:19:00 +0800 Subject: [PATCH 08/13] add test case --- e2e/tests/storage_rate_limit_test.go | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/e2e/tests/storage_rate_limit_test.go b/e2e/tests/storage_rate_limit_test.go index 9dec8bd46..ae18cbed9 100644 --- a/e2e/tests/storage_rate_limit_test.go +++ b/e2e/tests/storage_rate_limit_test.go @@ -482,3 +482,36 @@ func (s *StorageTestSuite) TestQueryBucketRateLimit() { s.Require().Equal(queryBucketRateLimitResponse.IsSet, true) s.Require().Equal(queryBucketRateLimitResponse.FlowRateLimit, sdkmath.NewInt(100000000000000)) } + +func (s *StorageTestSuite) TestSetBucketFlowRateLimit_Discontinue() { + sp, user, bucketName, _, _, _ := s.createObject() + + // SetBucketRateLimit + msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(user.GetAddr(), user.GetAddr(), user.GetAddr(), bucketName, sdkmath.NewInt(0)) + s.SendTxBlock(user, msgSetBucketRateLimit) + + queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err := s.Client.HeadBucket(context.Background(), &queryHeadBucketRequest) + s.Require().NoError(err) + + s.Require().Equal(queryHeadBucketResponse.ExtraInfo.IsRateLimited, true) + + msgDiscontinueBucket := storagetypes.NewMsgDiscontinueBucket(sp.GcKey.GetAddr(), bucketName, "test") + txRes1 := s.SendTxBlock(sp.GcKey, msgDiscontinueBucket) + deleteAt1 := filterDiscontinueBucketEventFromTx(txRes1).DeleteAt + + for { + time.Sleep(200 * time.Millisecond) + statusRes, err := s.TmClient.TmClient.Status(context.Background()) + s.Require().NoError(err) + blockTime := statusRes.SyncInfo.LatestBlockTime.Unix() + + s.T().Logf("current blockTime: %d, delete blockTime: %d", blockTime, deleteAt1) + + if blockTime >= deleteAt1 { + break + } + } +} From 113e610dddf7192f85d4e4cf83b3204a78def790 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Tue, 2 Apr 2024 10:20:25 +0800 Subject: [PATCH 09/13] create object with new gvg --- e2e/tests/storage_rate_limit_test.go | 131 ++++++++++++++++++++++++++- e2e/tests/storage_test.go | 23 +++++ 2 files changed, 153 insertions(+), 1 deletion(-) diff --git a/e2e/tests/storage_rate_limit_test.go b/e2e/tests/storage_rate_limit_test.go index ae18cbed9..caac1fcf7 100644 --- a/e2e/tests/storage_rate_limit_test.go +++ b/e2e/tests/storage_rate_limit_test.go @@ -14,6 +14,11 @@ import ( gashubtypes "github.com/cosmos/cosmos-sdk/x/gashub/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" + + "github.com/bnb-chain/greenfield/e2e/core" + "github.com/bnb-chain/greenfield/sdk/keys" + virtualgrouptypes "github.com/bnb-chain/greenfield/x/virtualgroup/types" types2 "github.com/bnb-chain/greenfield/sdk/types" @@ -484,7 +489,9 @@ func (s *StorageTestSuite) TestQueryBucketRateLimit() { } func (s *StorageTestSuite) TestSetBucketFlowRateLimit_Discontinue() { - sp, user, bucketName, _, _, _ := s.createObject() + s.enableMessage() + + sp, user, bucketName, _, _, _ := s.createObjectWithNewGvg(storagetypes.VISIBILITY_TYPE_PRIVATE) // SetBucketRateLimit msgSetBucketRateLimit := storagetypes.NewMsgSetBucketFlowRateLimit(user.GetAddr(), user.GetAddr(), user.GetAddr(), bucketName, sdkmath.NewInt(0)) @@ -515,3 +522,125 @@ func (s *StorageTestSuite) TestSetBucketFlowRateLimit_Discontinue() { } } } + +func (s *StorageTestSuite) createObjectWithNewGvg(v storagetypes.VisibilityType) (*core.StorageProvider, keys.KeyManager, string, storagetypes.Uint, string, storagetypes.Uint) { + var err error + // CreateBucket + sp := s.BaseSuite.PickStorageProvider() + + _, secondarySps := s.GetSecondarySP(sp) + gvgID, _ := s.BaseSuite.CreateGlobalVirtualGroup(sp, 0, secondarySps, 1) + gvgResp, err := s.Client.VirtualGroupQueryClient.GlobalVirtualGroup(context.Background(), &virtualgrouptypes.QueryGlobalVirtualGroupRequest{ + GlobalVirtualGroupId: gvgID, + }) + s.Require().NoError(err) + gvg := gvgResp.GlobalVirtualGroup + + user := s.GenAndChargeAccounts(1, 1000000)[0] + bucketName := storageutils.GenRandomBucketName() + msgCreateBucket := storagetypes.NewMsgCreateBucket( + user.GetAddr(), bucketName, v, sp.OperatorKey.GetAddr(), + nil, math.MaxUint, nil, 0) + msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId + msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlock(user, msgCreateBucket) + + // HeadBucket + ctx := context.Background() + queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{ + BucketName: bucketName, + } + queryHeadBucketResponse, err := s.Client.HeadBucket(ctx, &queryHeadBucketRequest) + s.Require().NoError(err) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.BucketName, bucketName) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Owner, user.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.GlobalVirtualGroupFamilyId, gvg.FamilyId) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.PaymentAddress, user.GetAddr().String()) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.Visibility, v) + s.Require().Equal(queryHeadBucketResponse.BucketInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) + + // CreateObject + objectName := storageutils.GenRandomObjectName() + // create test buffer + var buffer bytes.Buffer + line := `1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890, + 1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890, + 1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890, + 1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890, + 1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890, + 1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890, + 1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890, + 1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890, + 1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890, + 1234567890,1234567890,1234567890,123` + // Create 1MiB content where each line contains 1024 characters. + for i := 0; i < 1024; i++ { + buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line)) + } + payloadSize := buffer.Len() + checksum := sdk.Keccak256(buffer.Bytes()) + expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum} + contextType := "text/event-stream" + msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize), v, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil) + msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes()) + s.Require().NoError(err) + s.SendTxBlock(user, msgCreateObject) + + // HeadObject + queryHeadObjectRequest := storagetypes.QueryHeadObjectRequest{ + BucketName: bucketName, + ObjectName: objectName, + } + queryHeadObjectResponse, err := s.Client.HeadObject(ctx, &queryHeadObjectRequest) + s.Require().NoError(err) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.ObjectName, objectName) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.BucketName, bucketName) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.PayloadSize, uint64(payloadSize)) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.Visibility, v) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.ObjectStatus, storagetypes.OBJECT_STATUS_CREATED) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.Owner, user.GetAddr().String()) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.Checksums, expectChecksum) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.SourceType, storagetypes.SOURCE_TYPE_ORIGIN) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.RedundancyType, storagetypes.REDUNDANCY_EC_TYPE) + s.Require().Equal(queryHeadObjectResponse.ObjectInfo.ContentType, contextType) + + // SealObject + gvgId := gvg.Id + msgSealObject := storagetypes.NewMsgSealObject(sp.SealKey.GetAddr(), bucketName, objectName, gvgId, nil) + + secondarySigs := make([][]byte, 0) + secondarySPBlsPubKeys := make([]bls.PublicKey, 0) + blsSignHash := storagetypes.NewSecondarySpSealObjectSignDoc(s.GetChainID(), gvgId, queryHeadObjectResponse.ObjectInfo.Id, storagetypes.GenerateHash(queryHeadObjectResponse.ObjectInfo.Checksums[:])).GetBlsSignHash() + // every secondary sp signs the checksums + for _, spID := range gvg.SecondarySpIds { + sig, err := core.BlsSignAndVerify(s.StorageProviders[spID], blsSignHash) + s.Require().NoError(err) + secondarySigs = append(secondarySigs, sig) + pk, err := bls.PublicKeyFromBytes(s.StorageProviders[spID].BlsKey.PubKey().Bytes()) + s.Require().NoError(err) + secondarySPBlsPubKeys = append(secondarySPBlsPubKeys, pk) + } + aggBlsSig, err := core.BlsAggregateAndVerify(secondarySPBlsPubKeys, blsSignHash, secondarySigs) + s.Require().NoError(err) + msgSealObject.SecondarySpBlsAggSignatures = aggBlsSig + + s.T().Logf("msg %s", msgSealObject.String()) + s.SendTxBlock(sp.SealKey, msgSealObject) + + // ListBuckets + queryListBucketsRequest := storagetypes.QueryListBucketsRequest{} + queryListBucketResponse, err := s.Client.ListBuckets(ctx, &queryListBucketsRequest) + s.Require().NoError(err) + s.Require().Greater(len(queryListBucketResponse.BucketInfos), 0) + + // ListObject + queryListObjectsRequest := storagetypes.QueryListObjectsRequest{ + BucketName: bucketName, + } + queryListObjectsResponse, err := s.Client.ListObjects(ctx, &queryListObjectsRequest) + s.Require().NoError(err) + s.Require().Equal(len(queryListObjectsResponse.ObjectInfos), 1) + s.Require().Equal(queryListObjectsResponse.ObjectInfos[0].ObjectName, objectName) + return sp, user, bucketName, queryHeadBucketResponse.BucketInfo.Id, objectName, queryListObjectsResponse.ObjectInfos[0].Id +} diff --git a/e2e/tests/storage_test.go b/e2e/tests/storage_test.go index 63ee84549..edf571650 100644 --- a/e2e/tests/storage_test.go +++ b/e2e/tests/storage_test.go @@ -985,6 +985,29 @@ func (s *StorageTestSuite) TestDiscontinueBucket_UserDeleted() { s.Require().True(statusRes.SyncInfo.LatestBlockHeight > heightAfter) } +func (s *StorageTestSuite) GetSecondarySP(sps ...*core.StorageProvider) ([]*core.StorageProvider, []uint32) { + var secondarySPs []*core.StorageProvider + var secondarySPIDs []uint32 + + for _, ssp := range s.StorageProviders { + isSecondSP := true + for _, sp := range sps { + if ssp.Info.Id == sp.Info.Id { + isSecondSP = false + break + } + } + if isSecondSP { + secondarySPIDs = append(secondarySPIDs, ssp.Info.Id) + secondarySPs = append(secondarySPs, ssp) + } + if len(secondarySPIDs) == 6 { + break + } + } + return secondarySPs, secondarySPIDs +} + // createObject with default VISIBILITY_TYPE_PRIVATE func (s *StorageTestSuite) createObject() (*core.StorageProvider, keys.KeyManager, string, storagetypes.Uint, string, storagetypes.Uint) { return s.createObjectWithVisibility(storagetypes.VISIBILITY_TYPE_PRIVATE) From 8c5e2f567e437fb04a7929de24c858b93d5e1529 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Tue, 2 Apr 2024 11:44:59 +0800 Subject: [PATCH 10/13] introduce erdos upgrade --- app/upgrade.go | 19 +++++++++++++++++++ deployment/localup/localup.sh | 1 + e2e/tests/storage_rate_limit_test.go | 14 +------------- go.mod | 2 +- go.sum | 4 ++-- x/storage/keeper/keeper.go | 2 +- x/storage/keeper/payment.go | 14 +++++++------- x/storage/keeper/verify.go | 2 +- 8 files changed, 33 insertions(+), 25 deletions(-) diff --git a/app/upgrade.go b/app/upgrade.go index cc1dc0bf2..67bc5eef5 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -31,6 +31,7 @@ func (app *App) RegisterUpgradeHandlers(chainID string, serverCfg *serverconfig. app.registerUralUpgradeHandler() app.registerPawneeUpgradeHandler() app.registerSerengetiUpgradeHandler() + app.registerErdosUpgradeHandler() // app.register...() // ... return nil @@ -237,3 +238,21 @@ func (app *App) registerSerengetiUpgradeHandler() { return nil }) } + +func (app *App) registerErdosUpgradeHandler() { + // Register the upgrade handler + app.UpgradeKeeper.SetUpgradeHandler(upgradetypes.Erdos, + func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + app.Logger().Info("upgrade to ", plan.Name) + app.VirtualgroupKeeper.MigrateGlobalVirtualGroupFamiliesForSP(ctx) + app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas(sdk.MsgTypeURL(&storagemoduletypes.MsgSetBucketFlowRateLimit{}), 1.2e2)) + return app.mm.RunMigrations(ctx, app.configurator, fromVM) + }) + + // Register the upgrade initializer + app.UpgradeKeeper.SetUpgradeInitializer(upgradetypes.Erdos, + func() error { + app.Logger().Info("Init Erdos upgrade") + return nil + }) +} diff --git a/deployment/localup/localup.sh b/deployment/localup/localup.sh index 5553b9ea1..bbdc9d9bd 100644 --- a/deployment/localup/localup.sh +++ b/deployment/localup/localup.sh @@ -179,6 +179,7 @@ function generate_genesis() { echo -e '[[upgrade]]\nname = "Ural"\nheight = 22\ninfo = ""' >> ${workspace}/.local/validator${i}/config/app.toml echo -e '[[upgrade]]\nname = "Pawnee"\nheight = 23\ninfo = ""' >> ${workspace}/.local/validator${i}/config/app.toml echo -e '[[upgrade]]\nname = "Serengeti"\nheight = 24\ninfo = ""' >> ${workspace}/.local/validator${i}/config/app.toml + echo -e '[[upgrade]]\nname = "Erdos"\nheight = 25\ninfo = ""' >> ${workspace}/.local/validator${i}/config/app.toml done # enable swagger API for validator0 diff --git a/e2e/tests/storage_rate_limit_test.go b/e2e/tests/storage_rate_limit_test.go index caac1fcf7..b8468ef02 100644 --- a/e2e/tests/storage_rate_limit_test.go +++ b/e2e/tests/storage_rate_limit_test.go @@ -18,12 +18,10 @@ import ( "github.com/bnb-chain/greenfield/e2e/core" "github.com/bnb-chain/greenfield/sdk/keys" - virtualgrouptypes "github.com/bnb-chain/greenfield/x/virtualgroup/types" - types2 "github.com/bnb-chain/greenfield/sdk/types" - storageutils "github.com/bnb-chain/greenfield/testutil/storage" storagetypes "github.com/bnb-chain/greenfield/x/storage/types" + virtualgrouptypes "github.com/bnb-chain/greenfield/x/virtualgroup/types" ) func (s *StorageTestSuite) enableMessage() { @@ -87,8 +85,6 @@ func (s *StorageTestSuite) enableMessage() { } func (s *StorageTestSuite) TestSetBucketRateLimitToZero() { - s.enableMessage() - var err error sp := s.BaseSuite.PickStorageProvider() gvg, found := sp.GetFirstGlobalVirtualGroup() @@ -262,8 +258,6 @@ func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Object() { // 6. the payment account set the rate limit to a positive number // 7. user update the read quota to a positive number and it should pass func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Bucket() { - s.enableMessage() - var err error sp := s.BaseSuite.PickStorageProvider() gvg, found := sp.GetFirstGlobalVirtualGroup() @@ -358,8 +352,6 @@ func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_Bucket() { // 6. the payment account set the rate limit to a positive number // 7. user update the payment account to another payment account, it should pass func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_BucketPaymentAccount() { - s.enableMessage() - var err error sp := s.BaseSuite.PickStorageProvider() gvg, found := sp.GetFirstGlobalVirtualGroup() @@ -443,8 +435,6 @@ func (s *StorageTestSuite) TestNotOwnerSetBucketRateLimit_BucketPaymentAccount() } func (s *StorageTestSuite) TestQueryBucketRateLimit() { - s.enableMessage() - var err error sp := s.BaseSuite.PickStorageProvider() gvg, found := sp.GetFirstGlobalVirtualGroup() @@ -489,8 +479,6 @@ func (s *StorageTestSuite) TestQueryBucketRateLimit() { } func (s *StorageTestSuite) TestSetBucketFlowRateLimit_Discontinue() { - s.enableMessage() - sp, user, bucketName, _, _, _ := s.createObjectWithNewGvg(storagetypes.VISIBILITY_TYPE_PRIVATE) // SetBucketRateLimit diff --git a/go.mod b/go.mod index ffdc5452e..5f01237ad 100644 --- a/go.mod +++ b/go.mod @@ -179,7 +179,7 @@ replace ( github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v1.2.0 github.com/cometbft/cometbft-db => github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 - github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240314024318-a972393c0430 + github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240402031746-d46857cfafc0 github.com/cosmos/iavl => github.com/bnb-chain/greenfield-iavl v0.20.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/wercker/journalhook => github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117 diff --git a/go.sum b/go.sum index 74f8c9031..aceab18b2 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,8 @@ github.com/bnb-chain/greenfield-cometbft v1.2.0 h1:LTStppZS9WkVj0TfEYKkk5OAQDGfY github.com/bnb-chain/greenfield-cometbft v1.2.0/go.mod h1:WVOEZ59UYM2XePQH47/IQfcInspDn8wbRXhFSJrbU1c= github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 h1:XcWulGacHVRiSCx90Q8Y//ajOrLNBQWR/KDB89dy3cU= github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1/go.mod h1:ey1CiK4bYo1RBNJLRiVbYr5CMdSxci9S/AZRINLtppI= -github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240314024318-a972393c0430 h1:Lerm4iJITbmJBOqRj/IPQhS8cvjTKOfuq3XOoDgjAtM= -github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240314024318-a972393c0430/go.mod h1:XF8U3VN1euzLkIR5xiSNyQSnBabvnD86oz6fgdrpteQ= +github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240402031746-d46857cfafc0 h1:Cm9EWuktgeyYotoL6ef0XpqB2ECjIzDwQxqFmgfPjTM= +github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240402031746-d46857cfafc0/go.mod h1:XF8U3VN1euzLkIR5xiSNyQSnBabvnD86oz6fgdrpteQ= github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210 h1:GHPbV2bC+gmuO6/sG0Tm8oGal3KKSRlyE+zPscDjlA8= github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210/go.mod h1:vhsZxXE9tYJeYB5JR4hPhd6Pc/uPf7j1T8IJ7p9FdeM= github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210 h1:FLVOn4+OVbsKi2+YJX5kmD27/4dRu4FW7xCXFhzDO5s= diff --git a/x/storage/keeper/keeper.go b/x/storage/keeper/keeper.go index 3225a521c..3b30ff330 100644 --- a/x/storage/keeper/keeper.go +++ b/x/storage/keeper/keeper.go @@ -270,7 +270,7 @@ func (k Keeper) doDeleteBucket(ctx sdk.Context, operator sdk.AccAddress, bucketI } } - if ctx.IsUpgraded(upgradetypes.Serengeti) { + if ctx.IsUpgraded(upgradetypes.Erdos) { // delete bucket flow rate limit status k.deleteBucketFlowRateLimitStatus(ctx, bucketInfo.BucketName, bucketInfo.Id) } diff --git a/x/storage/keeper/payment.go b/x/storage/keeper/payment.go index e4384a9a6..462359a3f 100644 --- a/x/storage/keeper/payment.go +++ b/x/storage/keeper/payment.go @@ -25,7 +25,7 @@ func (k Keeper) ChargeBucketReadFee(ctx sdk.Context, bucketInfo *storagetypes.Bu return fmt.Errorf("charge bucket read fee failed, get bucket bill failed: %s %s", bucketInfo.BucketName, err.Error()) } - if ctx.IsUpgraded(upgradetypes.Serengeti) { + if ctx.IsUpgraded(upgradetypes.Erdos) { err := k.isBucketFlowRateUnderLimit(ctx, sdk.MustAccAddressFromHex(bucketInfo.PaymentAddress), sdk.MustAccAddressFromHex(bucketInfo.Owner), bucketInfo.BucketName, bill) if err != nil { return err @@ -46,7 +46,7 @@ func (k Keeper) UnChargeBucketReadFee(ctx sdk.Context, bucketInfo *storagetypes. return fmt.Errorf("unexpected total store charge size: %s, %d", bucketInfo.BucketName, internalBucketInfo.TotalChargeSize) } - if ctx.IsUpgraded(upgradetypes.Serengeti) { + if ctx.IsUpgraded(upgradetypes.Erdos) { // if the bucket's flow rate limit is set to zero, no need to uncharge, since the bucket is already uncharged if k.IsBucketRateLimited(ctx, bucketInfo.BucketName) { return nil @@ -145,7 +145,7 @@ func (k Keeper) lockObjectStoreFee(ctx sdk.Context, bucketInfo *storagetypes.Buc }) } - if ctx.IsUpgraded(upgradetypes.Serengeti) && k.shouldCheckRateLimit(ctx, paymentAddr, sdk.MustAccAddressFromHex(bucketInfo.Owner), bucketInfo.BucketName) { + if ctx.IsUpgraded(upgradetypes.Erdos) && k.shouldCheckRateLimit(ctx, paymentAddr, sdk.MustAccAddressFromHex(bucketInfo.Owner), bucketInfo.BucketName) { internalBucketInfo := k.MustGetInternalBucketInfo(ctx, bucketInfo.Id) internalBucketInfo.PriceTime = timestamp nextBill, err := k.GetBucketReadStoreBill(ctx, bucketInfo, internalBucketInfo) @@ -346,7 +346,7 @@ func (k Keeper) ChargeViaBucketChange(ctx sdk.Context, bucketInfo *storagetypes. return fmt.Errorf("get new bucket bill failed: %s %w", bucketInfo.BucketName, err) } - if ctx.IsUpgraded(upgradetypes.Serengeti) { + if ctx.IsUpgraded(upgradetypes.Erdos) { isPreviousBucketLimited := k.IsBucketRateLimited(ctx, bucketInfo.BucketName) if prevPaymentAccount == bucketInfo.PaymentAddress && isPreviousBucketLimited { @@ -434,7 +434,7 @@ func (k Keeper) ChargeViaObjectChange(ctx sdk.Context, bucketInfo *storagetypes. userFlows.Flows = append(userFlows.Flows, getNegFlows(preOutFlows)...) userFlows.Flows = append(userFlows.Flows, newOutFlows...) - if ctx.IsUpgraded(upgradetypes.Serengeti) { + if ctx.IsUpgraded(upgradetypes.Erdos) { var shouldApplyFlowRate = true forced, _ := ctx.Value(types.ForceUpdateStreamRecordKey).(bool) if forced { @@ -570,7 +570,7 @@ func (k Keeper) GetBucketReadStoreBill(ctx sdk.Context, bucketInfo *storagetypes func (k Keeper) UnChargeBucketReadStoreFee(ctx sdk.Context, bucketInfo *storagetypes.BucketInfo, internalBucketInfo *storagetypes.InternalBucketInfo) error { - if ctx.IsUpgraded(upgradetypes.Serengeti) { + if ctx.IsUpgraded(upgradetypes.Erdos) { // if the bucket's flow rate limit is set to zero, no need to uncharge, since the bucket is already uncharged if k.IsBucketRateLimited(ctx, bucketInfo.BucketName) { return nil @@ -597,7 +597,7 @@ func (k Keeper) ChargeBucketReadStoreFee(ctx sdk.Context, bucketInfo *storagetyp return fmt.Errorf("get bucket bill failed: %s %s", bucketInfo.BucketName, err.Error()) } - if ctx.IsUpgraded(upgradetypes.Serengeti) { + if ctx.IsUpgraded(upgradetypes.Erdos) { err := k.isBucketFlowRateUnderLimit(ctx, sdk.MustAccAddressFromHex(bucketInfo.PaymentAddress), sdk.MustAccAddressFromHex(bucketInfo.Owner), bucketInfo.BucketName, bill) if err != nil { return err diff --git a/x/storage/keeper/verify.go b/x/storage/keeper/verify.go index 36f5072ee..2b4dd7001 100644 --- a/x/storage/keeper/verify.go +++ b/x/storage/keeper/verify.go @@ -16,7 +16,7 @@ func (k Keeper) VerifyPaymentAccount(ctx sdk.Context, paymentAddress string, own } // don't check if the payment account is owned by the owner account - if !ctx.IsUpgraded(upgradetypes.Serengeti) { + if !ctx.IsUpgraded(upgradetypes.Erdos) { if !k.paymentKeeper.IsPaymentAccountOwner(ctx, paymentAcc, ownerAcc) { return nil, paymenttypes.ErrNotPaymentAccountOwner } From cd3fe09bb3b336591b052d17707dd895495de744 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Tue, 2 Apr 2024 13:57:14 +0800 Subject: [PATCH 11/13] update gas price --- app/upgrade.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/upgrade.go b/app/upgrade.go index 67bc5eef5..2a20eb54a 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -245,7 +245,7 @@ func (app *App) registerErdosUpgradeHandler() { func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { app.Logger().Info("upgrade to ", plan.Name) app.VirtualgroupKeeper.MigrateGlobalVirtualGroupFamiliesForSP(ctx) - app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas(sdk.MsgTypeURL(&storagemoduletypes.MsgSetBucketFlowRateLimit{}), 1.2e2)) + app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas(sdk.MsgTypeURL(&storagemoduletypes.MsgSetBucketFlowRateLimit{}), 1.2e3)) return app.mm.RunMigrations(ctx, app.configurator, fromVM) }) From bdd78c205ba6379bd441a4e0f0ecb6ee0bd928eb Mon Sep 17 00:00:00 2001 From: yutianwu Date: Tue, 2 Apr 2024 14:31:45 +0800 Subject: [PATCH 12/13] remove unused code --- app/upgrade.go | 1 - 1 file changed, 1 deletion(-) diff --git a/app/upgrade.go b/app/upgrade.go index 2a20eb54a..c83d0ba79 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -244,7 +244,6 @@ func (app *App) registerErdosUpgradeHandler() { app.UpgradeKeeper.SetUpgradeHandler(upgradetypes.Erdos, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { app.Logger().Info("upgrade to ", plan.Name) - app.VirtualgroupKeeper.MigrateGlobalVirtualGroupFamiliesForSP(ctx) app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas(sdk.MsgTypeURL(&storagemoduletypes.MsgSetBucketFlowRateLimit{}), 1.2e3)) return app.mm.RunMigrations(ctx, app.configurator, fromVM) }) From a4b640414f9aa50c96c17508583ddb65ddd401a9 Mon Sep 17 00:00:00 2001 From: Alexgao001 Date: Sun, 7 Apr 2024 12:08:42 +0800 Subject: [PATCH 13/13] update deps for v1.6.0 upgrade --- CHANGELOG.md | 8 ++++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73fa6b346..6ebeb799c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## V1.6.0 +This release introduces the Serengeti upgrade. + +Features: +* [#580](https://github.com/bnb-chain/greenfield/pull/580) feat: remove create object & bucket approval +* [#581](https://github.com/bnb-chain/greenfield/pull/581) feat: allow SP to create/update object for delegator + + ## v1.5.0 This release introduces the Pawnee upgrade to Testnet and Mainnet diff --git a/go.mod b/go.mod index 5f01237ad..d5ae8013b 100644 --- a/go.mod +++ b/go.mod @@ -179,7 +179,7 @@ replace ( github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v1.2.0 github.com/cometbft/cometbft-db => github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 - github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240402031746-d46857cfafc0 + github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.6.0 github.com/cosmos/iavl => github.com/bnb-chain/greenfield-iavl v0.20.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/wercker/journalhook => github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117 diff --git a/go.sum b/go.sum index aceab18b2..af4fe3f45 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,8 @@ github.com/bnb-chain/greenfield-cometbft v1.2.0 h1:LTStppZS9WkVj0TfEYKkk5OAQDGfY github.com/bnb-chain/greenfield-cometbft v1.2.0/go.mod h1:WVOEZ59UYM2XePQH47/IQfcInspDn8wbRXhFSJrbU1c= github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 h1:XcWulGacHVRiSCx90Q8Y//ajOrLNBQWR/KDB89dy3cU= github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1/go.mod h1:ey1CiK4bYo1RBNJLRiVbYr5CMdSxci9S/AZRINLtppI= -github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240402031746-d46857cfafc0 h1:Cm9EWuktgeyYotoL6ef0XpqB2ECjIzDwQxqFmgfPjTM= -github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240402031746-d46857cfafc0/go.mod h1:XF8U3VN1euzLkIR5xiSNyQSnBabvnD86oz6fgdrpteQ= +github.com/bnb-chain/greenfield-cosmos-sdk v1.6.0 h1:La26hQZ+as0vrgbR5ppjz8rDFH4TgYLJd8ctG7z9zNQ= +github.com/bnb-chain/greenfield-cosmos-sdk v1.6.0/go.mod h1:XF8U3VN1euzLkIR5xiSNyQSnBabvnD86oz6fgdrpteQ= github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210 h1:GHPbV2bC+gmuO6/sG0Tm8oGal3KKSRlyE+zPscDjlA8= github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210/go.mod h1:vhsZxXE9tYJeYB5JR4hPhd6Pc/uPf7j1T8IJ7p9FdeM= github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210 h1:FLVOn4+OVbsKi2+YJX5kmD27/4dRu4FW7xCXFhzDO5s=