diff --git a/e2e/tests/permission_test.go b/e2e/tests/permission_test.go index 7d9aa0d77..73d922596 100644 --- a/e2e/tests/permission_test.go +++ b/e2e/tests/permission_test.go @@ -653,7 +653,7 @@ func (s *StorageTestSuite) TestGrantsPermissionToGroup() { // Create Group testGroupName := "testGroup" - msgCreateGroup := storagetypes.NewMsgCreateGroup(user[0].GetAddr(), testGroupName, []sdk.AccAddress{user[1].GetAddr()}) + msgCreateGroup := storagetypes.NewMsgCreateGroup(user[0].GetAddr(), testGroupName, []sdk.AccAddress{user[1].GetAddr()}, "") s.SendTxBlock(user[0], msgCreateGroup) // Head Group @@ -1092,7 +1092,7 @@ func (s *StorageTestSuite) TestStalePermissionForGroupGC() { // Create Group testGroupName := "testGroup" - msgCreateGroup := storagetypes.NewMsgCreateGroup(owner.GetAddr(), testGroupName, []sdk.AccAddress{user[0].GetAddr(), user[1].GetAddr(), user[2].GetAddr()}) + msgCreateGroup := storagetypes.NewMsgCreateGroup(owner.GetAddr(), testGroupName, []sdk.AccAddress{user[0].GetAddr(), user[1].GetAddr(), user[2].GetAddr()}, "") s.SendTxBlock(owner, msgCreateGroup) // Head Group @@ -1190,7 +1190,8 @@ func (s *StorageTestSuite) TestGroupMembersAndPolicyGC() { // Create Group testGroupName := "testGroup" msgCreateGroup := storagetypes.NewMsgCreateGroup(owner.GetAddr(), testGroupName, - []sdk.AccAddress{user[1].GetAddr(), user[2].GetAddr(), user[3].GetAddr()}) + []sdk.AccAddress{user[1].GetAddr(), user[2].GetAddr(), user[3].GetAddr()}, + "") s.SendTxBlock(owner, msgCreateGroup) // Head Group @@ -1348,3 +1349,56 @@ func (s *StorageTestSuite) TestExceedEachBlockLimitGC() { s.Require().ErrorContains(err, "No such Policy") } } + +func (s *StorageTestSuite) TestUpdateGroupExtraWithPermission() { + var err error + ctx := context.Background() + + user := s.GenAndChargeAccounts(4, 1000000) + owner := user[0] + + // Create Group + testGroupName := "testGroup" + msgCreateGroup := storagetypes.NewMsgCreateGroup(owner.GetAddr(), testGroupName, + []sdk.AccAddress{user[1].GetAddr(), user[2].GetAddr(), user[3].GetAddr()}, + "") + s.SendTxBlock(owner, msgCreateGroup) + + // Head Group + headGroupRequest := storagetypes.QueryHeadGroupRequest{GroupOwner: owner.GetAddr().String(), GroupName: testGroupName} + headGroupResponse, err := s.Client.HeadGroup(ctx, &headGroupRequest) + s.Require().NoError(err) + s.Require().Equal(headGroupResponse.GroupInfo.GroupName, testGroupName) + s.Require().True(owner.GetAddr().Equals(sdk.MustAccAddressFromHex(headGroupResponse.GroupInfo.Owner))) + s.T().Logf("GroupInfo: %s", headGroupResponse.GetGroupInfo().String()) + + // Put policy + groupStatement := &types.Statement{ + Actions: []types.ActionType{types.ACTION_UPDATE_GROUP_EXTRA}, + Effect: types.EFFECT_ALLOW, + } + msgPutGroupPolicy := storagetypes.NewMsgPutPolicy(owner.GetAddr(), types2.NewGroupGRN(owner.GetAddr(), testGroupName).String(), + types.NewPrincipalWithAccount(user[1].GetAddr()), []*types.Statement{groupStatement}, nil) + s.SendTxBlock(owner, msgPutGroupPolicy) + + // user1 update the extra of group is allowed + newExtra := "newExtra" + msgUpdateGroup := storagetypes.NewMsgUpdateGroupExtra(user[1].GetAddr(), owner.GetAddr(), testGroupName, newExtra) + s.SendTxBlock(user[1], msgUpdateGroup) + + // Head Group + headGroupRequest = storagetypes.QueryHeadGroupRequest{GroupOwner: owner.GetAddr().String(), GroupName: testGroupName} + headGroupResponse, err = s.Client.HeadGroup(ctx, &headGroupRequest) + s.Require().NoError(err) + s.Require().Equal(headGroupResponse.GroupInfo.GroupName, testGroupName) + s.Require().True(owner.GetAddr().Equals(sdk.MustAccAddressFromHex(headGroupResponse.GroupInfo.Owner))) + s.Require().Equal(newExtra, headGroupResponse.GroupInfo.Extra) + s.T().Logf("GroupInfo: %s", headGroupResponse.GetGroupInfo().String()) + + // user2 update the extra of group is not allowed + newExtra = "newExtra2" + msgUpdateGroup2 := storagetypes.NewMsgUpdateGroupExtra(user[2].GetAddr(), owner.GetAddr(), testGroupName, newExtra) + _, err = s.SendTxBlockWithoutCheck(msgUpdateGroup2, user[2]) + s.Require().Error(err) + +} diff --git a/e2e/tests/storage_test.go b/e2e/tests/storage_test.go index 8683ef6b8..fd2f0e504 100644 --- a/e2e/tests/storage_test.go +++ b/e2e/tests/storage_test.go @@ -234,7 +234,7 @@ func (s *StorageTestSuite) TestCreateGroup() { groupName := storageutils.GenRandomGroupName() // 1. CreateGroup - msgCreateGroup := storagetypes.NewMsgCreateGroup(owner.GetAddr(), groupName, []sdk.AccAddress{member.GetAddr()}) + msgCreateGroup := storagetypes.NewMsgCreateGroup(owner.GetAddr(), groupName, []sdk.AccAddress{member.GetAddr()}, "") s.SendTxBlock(owner, msgCreateGroup) s.T().Logf("CerateGroup success, owner: %s, group name: %s", owner.GetAddr().String(), groupName) @@ -287,7 +287,7 @@ func (s *StorageTestSuite) TestCreateGroup() { s.Require().Equal(queryHeadGroupMemberRespAdd.GroupMember.GroupId, queryHeadGroupResp.GroupInfo.Id) // 6. Create a group with the same name - msgCreateGroup = storagetypes.NewMsgCreateGroup(owner.GetAddr(), groupName, []sdk.AccAddress{member.GetAddr()}) + msgCreateGroup = storagetypes.NewMsgCreateGroup(owner.GetAddr(), groupName, []sdk.AccAddress{member.GetAddr()}, "") s.SendTxBlockWithExpectErrorString(msgCreateGroup, owner, "exists") } @@ -1010,7 +1010,7 @@ func (s *StorageTestSuite) TestMirrorGroup() { groupName := storageutils.GenRandomGroupName() // 1. CreateGroup - msgCreateGroup := storagetypes.NewMsgCreateGroup(owner.GetAddr(), groupName, []sdk.AccAddress{member.GetAddr()}) + msgCreateGroup := storagetypes.NewMsgCreateGroup(owner.GetAddr(), groupName, []sdk.AccAddress{member.GetAddr()}, "") s.SendTxBlock(owner, msgCreateGroup) s.T().Logf("CerateGroup success, owner: %s, group name: %s", owner.GetAddr().String(), groupName) @@ -1027,7 +1027,7 @@ func (s *StorageTestSuite) TestMirrorGroup() { // CreateGroup groupName = storageutils.GenRandomGroupName() - msgCreateGroup = storagetypes.NewMsgCreateGroup(owner.GetAddr(), groupName, []sdk.AccAddress{member.GetAddr()}) + msgCreateGroup = storagetypes.NewMsgCreateGroup(owner.GetAddr(), groupName, []sdk.AccAddress{member.GetAddr()}, "") s.SendTxBlock(owner, msgCreateGroup) // MirrorGroup using name @@ -1709,3 +1709,52 @@ func (s *StorageTestSuite) TestUpdateParams() { s.Require().NoError(err) require.EqualValues(s.T(), queryVersionedParamsResponse.GetParams().VersionedParams.MaxSegmentSize, 2048) } + +func (s *StorageTestSuite) TestCreateAndUpdateGroupExtraField() { + var err error + ctx := context.Background() + owner := s.GenAndChargeAccounts(1, 1000000)[0] + + // Create a group without members + testGroupName := "appName/bucketName" + extra := "{\"description\":\"no description\",\"imageUrl\":\"www.images.com/image1\"}" + msgCreateGroup := storagetypes.NewMsgCreateGroup(owner.GetAddr(), testGroupName, nil, extra) + s.SendTxBlock(owner, msgCreateGroup) + + // Head Group + headGroupRequest := storagetypes.QueryHeadGroupRequest{GroupOwner: owner.GetAddr().String(), GroupName: testGroupName} + headGroupResponse, err := s.Client.HeadGroup(ctx, &headGroupRequest) + s.Require().NoError(err) + s.Require().Equal(headGroupResponse.GroupInfo.GroupName, testGroupName) + s.Require().True(owner.GetAddr().Equals(sdk.MustAccAddressFromHex(headGroupResponse.GroupInfo.Owner))) + s.Require().Equal(headGroupResponse.GroupInfo.Extra, extra) + s.T().Logf("GroupInfo: %s", headGroupResponse.GetGroupInfo().String()) + + // Update the extra to empty + newExtra := "" + msgUpdateGroup := storagetypes.NewMsgUpdateGroupExtra(owner.GetAddr(), owner.GetAddr(), testGroupName, newExtra) + s.SendTxBlock(owner, msgUpdateGroup) + + // Head Group + headGroupRequest = storagetypes.QueryHeadGroupRequest{GroupOwner: owner.GetAddr().String(), GroupName: testGroupName} + headGroupResponse, err = s.Client.HeadGroup(ctx, &headGroupRequest) + s.Require().NoError(err) + s.Require().Equal(headGroupResponse.GroupInfo.GroupName, testGroupName) + s.Require().True(owner.GetAddr().Equals(sdk.MustAccAddressFromHex(headGroupResponse.GroupInfo.Owner))) + s.Require().Equal(newExtra, headGroupResponse.GroupInfo.Extra) + s.T().Logf("GroupInfo: %s", headGroupResponse.GetGroupInfo().String()) + + // Update the extra + newExtra = "something" + msgUpdateGroup = storagetypes.NewMsgUpdateGroupExtra(owner.GetAddr(), owner.GetAddr(), testGroupName, newExtra) + s.SendTxBlock(owner, msgUpdateGroup) + + // Head Group + headGroupRequest = storagetypes.QueryHeadGroupRequest{GroupOwner: owner.GetAddr().String(), GroupName: testGroupName} + headGroupResponse, err = s.Client.HeadGroup(ctx, &headGroupRequest) + s.Require().NoError(err) + s.Require().Equal(headGroupResponse.GroupInfo.GroupName, testGroupName) + s.Require().True(owner.GetAddr().Equals(sdk.MustAccAddressFromHex(headGroupResponse.GroupInfo.Owner))) + s.Require().Equal(newExtra, headGroupResponse.GroupInfo.Extra) + s.T().Logf("GroupInfo: %s", headGroupResponse.GetGroupInfo().String()) +} diff --git a/go.mod b/go.mod index 968f81baa..2a4335427 100644 --- a/go.mod +++ b/go.mod @@ -176,6 +176,6 @@ replace ( github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.23.0 github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v0.0.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 v0.2.1-alpha.1 + github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v0.2.2-0.20230525031023-c994c5643ef3 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/go.sum b/go.sum index e95e1c0f0..3b3b6a157 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edY github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/bnb-chain/greenfield-cometbft v0.0.1 h1:pX8S9oZKjWJCrxH07l6rbU3zee9txZ11+UwO9stsNMQ= github.com/bnb-chain/greenfield-cometbft v0.0.1/go.mod h1:9q11eHNRY9FDwFH+4pompzPNGv//Z3VcfvkELaHJPMs= -github.com/bnb-chain/greenfield-cosmos-sdk v0.2.1-alpha.1 h1:jlXZVYSPnq5pkmHAqIqekfmyksebQBK5OQJW3NeU4BE= -github.com/bnb-chain/greenfield-cosmos-sdk v0.2.1-alpha.1/go.mod h1:6pVENKv7drpk0k46nuyvAeD1SMnQUuXD9WY0tyc060A= +github.com/bnb-chain/greenfield-cosmos-sdk v0.2.2-0.20230525031023-c994c5643ef3 h1:f7Q5pT0O4NCoG4En4bweS8EnRjnMUb2rjWVNSi4w8U4= +github.com/bnb-chain/greenfield-cosmos-sdk v0.2.2-0.20230525031023-c994c5643ef3/go.mod h1:6pVENKv7drpk0k46nuyvAeD1SMnQUuXD9WY0tyc060A= github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230425074444-eb5869b05fe9 h1:6fLpmmI0EZvDTfPvI0zy5dBaaTUboHnEkoC5/p/w8TQ= github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230425074444-eb5869b05fe9/go.mod h1:rbc4o84RSEvhf09o2+4Qiazsv0snRJLiEZdk17HeIDw= github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230425074444-eb5869b05fe9 h1:1ZdK+iR1Up02bOa2YTZCml7PBpP//kcdamOcK6aWO/s= diff --git a/proto/greenfield/permission/common.proto b/proto/greenfield/permission/common.proto index 0002ebcaf..2b6551f00 100644 --- a/proto/greenfield/permission/common.proto +++ b/proto/greenfield/permission/common.proto @@ -28,6 +28,8 @@ enum ActionType { ACTION_UPDATE_OBJECT_INFO = 11; + ACTION_UPDATE_GROUP_EXTRA = 12; + ACTION_TYPE_ALL = 99; } diff --git a/proto/greenfield/storage/events.proto b/proto/greenfield/storage/events.proto index 9e6c367b4..3e1f40f52 100644 --- a/proto/greenfield/storage/events.proto +++ b/proto/greenfield/storage/events.proto @@ -286,6 +286,8 @@ message EventCreateGroup { SourceType source_type = 4; // members define the all the address of the members. repeated string members = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // extra defines extra info for the group + string extra = 6; } // EventDeleteGroup is emitted on MsgDeleteGroup @@ -338,6 +340,24 @@ message EventUpdateGroupMember { repeated string members_to_delete = 6 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } +// EventUpdateGroupExtra is emitted on MsgUpdateGroupExtra +message EventUpdateGroupExtra { + // operator define the account address of operator who update the group member + string operator = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // owner define the account address of group owner + string owner = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // group_name define the name of the group + string group_name = 3; + // id define an u256 id for group + string group_id = 4 [ + (cosmos_proto.scalar) = "cosmos.Uint", + (gogoproto.customtype) = "Uint", + (gogoproto.nullable) = false + ]; + // extra defines extra info for the group to update + string extra = 5; +} + // EventMirrorBucket is emitted on MirrorBucket message EventMirrorBucket { // operator define the account address of operator who mirror the bucket diff --git a/proto/greenfield/storage/tx.proto b/proto/greenfield/storage/tx.proto index bb07fe95e..fa092a7cc 100644 --- a/proto/greenfield/storage/tx.proto +++ b/proto/greenfield/storage/tx.proto @@ -38,6 +38,7 @@ service Msg { rpc CreateGroup(MsgCreateGroup) returns (MsgCreateGroupResponse); rpc DeleteGroup(MsgDeleteGroup) returns (MsgDeleteGroupResponse); rpc UpdateGroupMember(MsgUpdateGroupMember) returns (MsgUpdateGroupMemberResponse); + rpc UpdateGroupExtra(MsgUpdateGroupExtra) returns (MsgUpdateGroupExtraResponse); rpc LeaveGroup(MsgLeaveGroup) returns (MsgLeaveGroupResponse); rpc MirrorGroup(MsgMirrorGroup) returns (MsgMirrorGroupResponse); // basic operation of policy @@ -236,6 +237,8 @@ message MsgCreateGroup { string group_name = 2; // member_request defines a list of member which to be add or remove repeated string members = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // extra defines extra info for the group + string extra = 4; } message MsgCreateGroupResponse { @@ -274,6 +277,21 @@ message MsgUpdateGroupMember { message MsgUpdateGroupMemberResponse {} +message MsgUpdateGroupExtra { + option (cosmos.msg.v1.signer) = "operator"; + + // operator defines the account address of the operator who has the UpdateGroupMember permission of the group. + string operator = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // group_owner defines the account address of the group owner + string group_owner = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // group_name defines the name of the group which to be updated + string group_name = 3; + // extra defines extra info for the group to update + string Extra = 4; +} + +message MsgUpdateGroupExtraResponse {} + message MsgLeaveGroup { option (cosmos.msg.v1.signer) = "member"; diff --git a/proto/greenfield/storage/types.proto b/proto/greenfield/storage/types.proto index a543371ca..660ab4e0f 100644 --- a/proto/greenfield/storage/types.proto +++ b/proto/greenfield/storage/types.proto @@ -104,6 +104,8 @@ message GroupInfo { (gogoproto.customtype) = "Uint", (gogoproto.nullable) = false ]; + // extra is used to store extra info for the group + string extra = 5; } message Trait { diff --git a/swagger/static/swagger.yaml b/swagger/static/swagger.yaml index 28abd49a2..02ba5fb51 100644 --- a/swagger/static/swagger.yaml +++ b/swagger/static/swagger.yaml @@ -2005,6 +2005,9 @@ paths: id: type: string title: id is the unique identifier of group + extra: + type: string + title: extra is used to store extra info for the group default: description: An unexpected error response. schema: @@ -2775,6 +2778,9 @@ paths: id: type: string title: id is the unique identifier of group + extra: + type: string + title: extra is used to store extra info for the group default: description: An unexpected error response. schema: @@ -3661,6 +3667,7 @@ paths: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL default: ACTION_UNSPECIFIED title: >- @@ -3678,17 +3685,27 @@ paths: type: string description: >- CAN ONLY USED IN bucket level. Support fuzzy match - and limit to 5 - - If no sub-resource is specified in a statement, then - all objects in the bucket are accessible by the - principal. - - However, if the sub-resource is defined as - 'bucket/test_*,' in the statement, then only objects - with a 'test_' - - prefix can be accessed by the principal. + and limit to 5. + + The sub-resource name must comply with the standard + specified in the greenfield/types/grn.go file for + Greenfield resource names. + + If the sub-resources include 'grn:o:{bucket_name}/*' + in the statement, it indicates that specific + permissions is granted to all objects within the + specified bucket. + + If the sub-resources include + 'grn:o:{bucket_name}/test_*' in the statement, it + indicates that specific permissions is granted to + all objects with the `test_` prefix within the + specified bucket. + + If the sub-resources is empty, when you need to + operate(excluding CreateObject) a specified + subresource, it will be denied because it cannot + match any subresource. expiration_time: type: string format: date-time @@ -3844,6 +3861,7 @@ paths: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL default: ACTION_UNSPECIFIED title: >- @@ -3861,17 +3879,27 @@ paths: type: string description: >- CAN ONLY USED IN bucket level. Support fuzzy match - and limit to 5 - - If no sub-resource is specified in a statement, then - all objects in the bucket are accessible by the - principal. - - However, if the sub-resource is defined as - 'bucket/test_*,' in the statement, then only objects - with a 'test_' - - prefix can be accessed by the principal. + and limit to 5. + + The sub-resource name must comply with the standard + specified in the greenfield/types/grn.go file for + Greenfield resource names. + + If the sub-resources include 'grn:o:{bucket_name}/*' + in the statement, it indicates that specific + permissions is granted to all objects within the + specified bucket. + + If the sub-resources include + 'grn:o:{bucket_name}/test_*' in the statement, it + indicates that specific permissions is granted to + all objects with the `test_` prefix within the + specified bucket. + + If the sub-resources is empty, when you need to + operate(excluding CreateObject) a specified + subresource, it will be denied because it cannot + match any subresource. expiration_time: type: string format: date-time @@ -4031,6 +4059,7 @@ paths: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL default: ACTION_UNSPECIFIED title: >- @@ -4048,17 +4077,27 @@ paths: type: string description: >- CAN ONLY USED IN bucket level. Support fuzzy match - and limit to 5 - - If no sub-resource is specified in a statement, then - all objects in the bucket are accessible by the - principal. - - However, if the sub-resource is defined as - 'bucket/test_*,' in the statement, then only objects - with a 'test_' - - prefix can be accessed by the principal. + and limit to 5. + + The sub-resource name must comply with the standard + specified in the greenfield/types/grn.go file for + Greenfield resource names. + + If the sub-resources include 'grn:o:{bucket_name}/*' + in the statement, it indicates that specific + permissions is granted to all objects within the + specified bucket. + + If the sub-resources include + 'grn:o:{bucket_name}/test_*' in the statement, it + indicates that specific permissions is granted to + all objects with the `test_` prefix within the + specified bucket. + + If the sub-resources is empty, when you need to + operate(excluding CreateObject) a specified + subresource, it will be denied because it cannot + match any subresource. expiration_time: type: string format: date-time @@ -4190,6 +4229,7 @@ paths: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL - name: object_name in: query @@ -30618,6 +30658,7 @@ definitions: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL default: ACTION_UNSPECIFIED title: >- @@ -30725,6 +30766,7 @@ definitions: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL default: ACTION_UNSPECIFIED title: >- @@ -30742,15 +30784,22 @@ definitions: type: string description: >- CAN ONLY USED IN bucket level. Support fuzzy match and limit to - 5 + 5. + + The sub-resource name must comply with the standard specified in + the greenfield/types/grn.go file for Greenfield resource names. - If no sub-resource is specified in a statement, then all objects - in the bucket are accessible by the principal. + If the sub-resources include 'grn:o:{bucket_name}/*' in the + statement, it indicates that specific permissions is granted to + all objects within the specified bucket. - However, if the sub-resource is defined as 'bucket/test_*,' in - the statement, then only objects with a 'test_' + If the sub-resources include 'grn:o:{bucket_name}/test_*' in the + statement, it indicates that specific permissions is granted to + all objects with the `test_` prefix within the specified bucket. - prefix can be accessed by the principal. + If the sub-resources is empty, when you need to + operate(excluding CreateObject) a specified subresource, it will + be denied because it cannot match any subresource. expiration_time: type: string format: date-time @@ -30839,6 +30888,7 @@ definitions: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL default: ACTION_UNSPECIFIED title: >- @@ -30855,15 +30905,22 @@ definitions: items: type: string description: >- - CAN ONLY USED IN bucket level. Support fuzzy match and limit to 5 + CAN ONLY USED IN bucket level. Support fuzzy match and limit to 5. + + The sub-resource name must comply with the standard specified in the + greenfield/types/grn.go file for Greenfield resource names. - If no sub-resource is specified in a statement, then all objects in - the bucket are accessible by the principal. + If the sub-resources include 'grn:o:{bucket_name}/*' in the statement, + it indicates that specific permissions is granted to all objects + within the specified bucket. - However, if the sub-resource is defined as 'bucket/test_*,' in the - statement, then only objects with a 'test_' + If the sub-resources include 'grn:o:{bucket_name}/test_*' in the + statement, it indicates that specific permissions is granted to all + objects with the `test_` prefix within the specified bucket. - prefix can be accessed by the principal. + If the sub-resources is empty, when you need to operate(excluding + CreateObject) a specified subresource, it will be denied because it + cannot match any subresource. expiration_time: type: string format: date-time @@ -31074,6 +31131,9 @@ definitions: id: type: string title: id is the unique identifier of group + extra: + type: string + title: extra is used to store extra info for the group greenfield.storage.GroupMetaData: type: object properties: @@ -31506,6 +31566,9 @@ definitions: id: type: string title: id is the unique identifier of group + extra: + type: string + title: extra is used to store extra info for the group greenfield.storage.QueryHeadObjectResponse: type: object properties: @@ -31773,6 +31836,9 @@ definitions: id: type: string title: id is the unique identifier of group + extra: + type: string + title: extra is used to store extra info for the group greenfield.storage.QueryListObjectsResponse: type: object properties: @@ -32190,6 +32256,7 @@ definitions: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL default: ACTION_UNSPECIFIED title: >- @@ -32207,15 +32274,24 @@ definitions: type: string description: >- CAN ONLY USED IN bucket level. Support fuzzy match and limit - to 5 + to 5. + + The sub-resource name must comply with the standard + specified in the greenfield/types/grn.go file for Greenfield + resource names. - If no sub-resource is specified in a statement, then all - objects in the bucket are accessible by the principal. + If the sub-resources include 'grn:o:{bucket_name}/*' in the + statement, it indicates that specific permissions is granted + to all objects within the specified bucket. - However, if the sub-resource is defined as 'bucket/test_*,' - in the statement, then only objects with a 'test_' + If the sub-resources include 'grn:o:{bucket_name}/test_*' in + the statement, it indicates that specific permissions is + granted to all objects with the `test_` prefix within the + specified bucket. - prefix can be accessed by the principal. + If the sub-resources is empty, when you need to + operate(excluding CreateObject) a specified subresource, it + will be denied because it cannot match any subresource. expiration_time: type: string format: date-time @@ -32332,6 +32408,7 @@ definitions: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL default: ACTION_UNSPECIFIED title: >- @@ -32349,15 +32426,24 @@ definitions: type: string description: >- CAN ONLY USED IN bucket level. Support fuzzy match and limit - to 5 + to 5. - If no sub-resource is specified in a statement, then all - objects in the bucket are accessible by the principal. + The sub-resource name must comply with the standard + specified in the greenfield/types/grn.go file for Greenfield + resource names. - However, if the sub-resource is defined as 'bucket/test_*,' - in the statement, then only objects with a 'test_' + If the sub-resources include 'grn:o:{bucket_name}/*' in the + statement, it indicates that specific permissions is granted + to all objects within the specified bucket. - prefix can be accessed by the principal. + If the sub-resources include 'grn:o:{bucket_name}/test_*' in + the statement, it indicates that specific permissions is + granted to all objects with the `test_` prefix within the + specified bucket. + + If the sub-resources is empty, when you need to + operate(excluding CreateObject) a specified subresource, it + will be denied because it cannot match any subresource. expiration_time: type: string format: date-time @@ -32474,6 +32560,7 @@ definitions: - ACTION_UPDATE_GROUP_MEMBER - ACTION_DELETE_GROUP - ACTION_UPDATE_OBJECT_INFO + - ACTION_UPDATE_GROUP_EXTRA - ACTION_TYPE_ALL default: ACTION_UNSPECIFIED title: >- @@ -32491,15 +32578,24 @@ definitions: type: string description: >- CAN ONLY USED IN bucket level. Support fuzzy match and limit - to 5 + to 5. + + The sub-resource name must comply with the standard + specified in the greenfield/types/grn.go file for Greenfield + resource names. - If no sub-resource is specified in a statement, then all - objects in the bucket are accessible by the principal. + If the sub-resources include 'grn:o:{bucket_name}/*' in the + statement, it indicates that specific permissions is granted + to all objects within the specified bucket. - However, if the sub-resource is defined as 'bucket/test_*,' - in the statement, then only objects with a 'test_' + If the sub-resources include 'grn:o:{bucket_name}/test_*' in + the statement, it indicates that specific permissions is + granted to all objects with the `test_` prefix within the + specified bucket. - prefix can be accessed by the principal. + If the sub-resources is empty, when you need to + operate(excluding CreateObject) a specified subresource, it + will be denied because it cannot match any subresource. expiration_time: type: string format: date-time diff --git a/x/permission/types/common.pb.go b/x/permission/types/common.pb.go index a4862bc53..77c5e9dfc 100644 --- a/x/permission/types/common.pb.go +++ b/x/permission/types/common.pb.go @@ -45,6 +45,7 @@ const ( ACTION_UPDATE_GROUP_MEMBER ActionType = 9 ACTION_DELETE_GROUP ActionType = 10 ACTION_UPDATE_OBJECT_INFO ActionType = 11 + ACTION_UPDATE_GROUP_EXTRA ActionType = 12 ACTION_TYPE_ALL ActionType = 99 ) @@ -61,6 +62,7 @@ var ActionType_name = map[int32]string{ 9: "ACTION_UPDATE_GROUP_MEMBER", 10: "ACTION_DELETE_GROUP", 11: "ACTION_UPDATE_OBJECT_INFO", + 12: "ACTION_UPDATE_GROUP_EXTRA", 99: "ACTION_TYPE_ALL", } @@ -77,6 +79,7 @@ var ActionType_value = map[string]int32{ "ACTION_UPDATE_GROUP_MEMBER": 9, "ACTION_DELETE_GROUP": 10, "ACTION_UPDATE_OBJECT_INFO": 11, + "ACTION_UPDATE_GROUP_EXTRA": 12, "ACTION_TYPE_ALL": 99, } @@ -301,50 +304,51 @@ func init() { } var fileDescriptor_33a4d646aee30990 = []byte{ - // 680 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0x4b, 0x6e, 0xd3, 0x40, - 0x18, 0x8e, 0x93, 0x34, 0x6d, 0xa6, 0xd0, 0x9a, 0x69, 0x0b, 0x6e, 0xa0, 0x4e, 0xa8, 0x58, 0x44, - 0x95, 0xb0, 0xa5, 0xf0, 0x10, 0x12, 0x2b, 0xc7, 0x99, 0x54, 0x06, 0xd7, 0xb6, 0x1c, 0x07, 0x28, - 0x2c, 0x2c, 0xc7, 0x4c, 0xd2, 0x91, 0xe2, 0x87, 0x6c, 0x07, 0xda, 0x9e, 0x80, 0x65, 0xef, 0xc0, - 0x09, 0xb8, 0x45, 0x97, 0x5d, 0xb2, 0x02, 0xd4, 0x4a, 0x9c, 0x03, 0xf9, 0x91, 0x38, 0xa1, 0xed, - 0xce, 0xf3, 0x3d, 0xfe, 0xf9, 0xbf, 0x7f, 0xc6, 0x03, 0x76, 0x47, 0x01, 0xc6, 0xee, 0x90, 0xe0, - 0xf1, 0x67, 0xde, 0xc7, 0x81, 0x43, 0xc2, 0x90, 0x78, 0x2e, 0x6f, 0x7b, 0x8e, 0xe3, 0xb9, 0x9c, - 0x1f, 0x78, 0x91, 0x07, 0xb7, 0x72, 0x0d, 0x97, 0x6b, 0x6a, 0xdb, 0xb6, 0x17, 0x3a, 0x5e, 0x68, - 0x26, 0x22, 0x3e, 0x5d, 0xa4, 0x8e, 0xda, 0xe6, 0xc8, 0x1b, 0x79, 0x29, 0x1e, 0x7f, 0x65, 0x68, - 0x7d, 0xe4, 0x79, 0xa3, 0x31, 0xe6, 0x93, 0xd5, 0x60, 0x32, 0xe4, 0x23, 0xe2, 0xe0, 0x30, 0xb2, - 0x1c, 0x7f, 0x26, 0xc8, 0x9b, 0x49, 0x3b, 0xe0, 0xbf, 0x06, 0x96, 0xef, 0xe3, 0x20, 0x15, 0xec, - 0xfe, 0x28, 0x82, 0x6a, 0x2f, 0xb2, 0x22, 0xec, 0x60, 0x37, 0x82, 0x2f, 0x40, 0x05, 0x0f, 0x87, - 0xd8, 0x8e, 0x18, 0xaa, 0x41, 0x35, 0xd7, 0x5a, 0x3b, 0xdc, 0x8d, 0x8d, 0x72, 0x28, 0x11, 0xe9, - 0x99, 0x18, 0xbe, 0x06, 0xcb, 0x96, 0x1d, 0x11, 0xcf, 0x0d, 0x99, 0x62, 0xa3, 0xd4, 0x5c, 0x6b, - 0x3d, 0xbe, 0xc5, 0x27, 0x24, 0x2a, 0xe3, 0xc4, 0xc7, 0xfa, 0xd4, 0x01, 0x1f, 0x81, 0x6a, 0x80, - 0x43, 0x6f, 0x12, 0xd8, 0x38, 0x64, 0x4a, 0x8d, 0x52, 0xb3, 0xaa, 0xe7, 0x00, 0x3c, 0x00, 0xeb, - 0xf8, 0xd8, 0x27, 0x81, 0x15, 0x8b, 0xcd, 0x38, 0x1e, 0x53, 0x6e, 0x50, 0xcd, 0xd5, 0x56, 0x8d, - 0x4b, 0xb3, 0x73, 0xd3, 0xec, 0x9c, 0x31, 0xcd, 0xde, 0x5e, 0x39, 0xff, 0x55, 0xa7, 0xce, 0x7e, - 0xd7, 0x29, 0x7d, 0x2d, 0x37, 0xc7, 0x34, 0x14, 0x01, 0x18, 0x13, 0x87, 0x44, 0x66, 0x48, 0x4e, - 0x31, 0xb3, 0x94, 0x54, 0x62, 0xe7, 0x9b, 0xcd, 0x8e, 0xa9, 0x2f, 0xb9, 0xd1, 0xcb, 0xe7, 0xef, - 0xac, 0xf1, 0x04, 0xb7, 0xcb, 0x71, 0x35, 0xbd, 0x9a, 0xf8, 0x7a, 0xe4, 0x14, 0xef, 0x7e, 0x02, - 0x55, 0x2d, 0x20, 0xae, 0x4d, 0x7c, 0x6b, 0x0c, 0x5f, 0x81, 0x72, 0x74, 0xe2, 0xe3, 0x6c, 0x60, - 0x4f, 0x6e, 0x09, 0x3e, 0xd3, 0x27, 0xd9, 0x13, 0x07, 0xdc, 0x04, 0x4b, 0x5f, 0xe2, 0x0d, 0x98, - 0x62, 0x83, 0x6a, 0x56, 0xf5, 0x74, 0xb1, 0xf7, 0xb7, 0x08, 0x40, 0x3e, 0x26, 0x78, 0x1f, 0x40, - 0x41, 0x34, 0x24, 0x55, 0x31, 0xfb, 0x4a, 0x4f, 0x43, 0xa2, 0xd4, 0x95, 0x50, 0x87, 0x2e, 0xc0, - 0x1d, 0xb0, 0x3d, 0xc5, 0xb5, 0x8e, 0x60, 0x20, 0xb3, 0xdd, 0x17, 0xdf, 0x22, 0xc3, 0x94, 0x94, - 0xae, 0x4a, 0x53, 0x90, 0x01, 0x9b, 0x19, 0xdd, 0x41, 0x32, 0x9a, 0xd1, 0x74, 0x71, 0x8e, 0x11, - 0x75, 0x14, 0x1b, 0xd5, 0xf6, 0x1b, 0x24, 0x1a, 0x74, 0xe9, 0xba, 0x27, 0x63, 0xca, 0x73, 0x4d, - 0x88, 0xaa, 0x76, 0x38, 0xc5, 0x97, 0xe0, 0x16, 0xb8, 0x97, 0xe1, 0xfb, 0xc8, 0x98, 0xc2, 0x15, - 0xb8, 0x0d, 0xb6, 0x32, 0x18, 0x7d, 0x40, 0x62, 0x3f, 0xaf, 0xb4, 0x3c, 0x57, 0x49, 0x96, 0x7a, - 0x33, 0xcb, 0x0a, 0x64, 0x41, 0x6d, 0x31, 0xce, 0xbe, 0xae, 0xf6, 0x35, 0xf3, 0x00, 0x1d, 0xb4, - 0x91, 0x4e, 0x57, 0xe1, 0x03, 0xb0, 0xb1, 0xd8, 0x5b, 0xc2, 0xd3, 0xe0, 0xfa, 0x1c, 0xd2, 0x92, - 0xe9, 0x1c, 0x56, 0xe1, 0x06, 0x58, 0xcf, 0x68, 0xe3, 0x50, 0x43, 0xa6, 0x20, 0xcb, 0xb4, 0x5d, - 0x2b, 0x7f, 0xfb, 0xce, 0x16, 0xf6, 0x24, 0x50, 0x49, 0xaf, 0x71, 0xdc, 0x14, 0xea, 0x76, 0x63, - 0xd7, 0xe2, 0x8c, 0x69, 0x70, 0x27, 0xc3, 0x05, 0x59, 0x56, 0xdf, 0xd3, 0x14, 0x5c, 0x07, 0xab, - 0x19, 0xd2, 0x41, 0xca, 0x21, 0x5d, 0xcc, 0x4a, 0x4d, 0xc0, 0xdd, 0x85, 0x03, 0x8e, 0xe3, 0x68, - 0xba, 0xa4, 0x88, 0x92, 0x26, 0xc8, 0xe9, 0xce, 0x8b, 0x95, 0xeb, 0xe0, 0xe1, 0x7f, 0xfc, 0xbe, - 0xd2, 0xed, 0x98, 0x82, 0x28, 0xaa, 0x7d, 0xc5, 0xa0, 0xa9, 0x38, 0xd6, 0x4d, 0x82, 0x34, 0x75, - 0xb6, 0x6d, 0x5b, 0x3e, 0xbf, 0x64, 0xa9, 0x8b, 0x4b, 0x96, 0xfa, 0x73, 0xc9, 0x52, 0x67, 0x57, - 0x6c, 0xe1, 0xe2, 0x8a, 0x2d, 0xfc, 0xbc, 0x62, 0x0b, 0x1f, 0x5b, 0x23, 0x12, 0x1d, 0x4d, 0x06, - 0xf1, 0x6d, 0xe6, 0x07, 0xee, 0xe0, 0xa9, 0x7d, 0x64, 0x11, 0x97, 0x9f, 0x7b, 0x0b, 0x8e, 0xe7, - 0x9f, 0xa6, 0xf8, 0x36, 0x86, 0x83, 0x4a, 0xf2, 0x23, 0x3d, 0xfb, 0x17, 0x00, 0x00, 0xff, 0xff, - 0x22, 0x24, 0xea, 0x95, 0xc0, 0x04, 0x00, 0x00, + // 691 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xcb, 0x4e, 0xdb, 0x4a, + 0x18, 0x8e, 0x93, 0x10, 0xc8, 0xc0, 0x01, 0x9f, 0x01, 0xce, 0x31, 0x69, 0x71, 0x52, 0xd4, 0x45, + 0x84, 0x54, 0x5b, 0x4a, 0x2f, 0xaa, 0xd4, 0x95, 0xe3, 0x4c, 0x90, 0x5b, 0x63, 0x5b, 0x8e, 0xd3, + 0x42, 0xbb, 0xb0, 0x1c, 0x77, 0x12, 0x46, 0x8a, 0x2f, 0xb2, 0x9d, 0x16, 0xd8, 0x57, 0xea, 0x92, + 0x77, 0xe8, 0x13, 0xf4, 0x2d, 0x58, 0xb2, 0xec, 0xaa, 0xad, 0xe0, 0x45, 0x2a, 0x5f, 0x12, 0x27, + 0x05, 0x76, 0x99, 0xef, 0x36, 0xff, 0x37, 0x33, 0x31, 0xd8, 0x1b, 0x05, 0x18, 0xbb, 0x43, 0x82, + 0xc7, 0x1f, 0x79, 0x1f, 0x07, 0x0e, 0x09, 0x43, 0xe2, 0xb9, 0xbc, 0xed, 0x39, 0x8e, 0xe7, 0x72, + 0x7e, 0xe0, 0x45, 0x1e, 0xdc, 0xce, 0x35, 0x5c, 0xae, 0xa9, 0xed, 0xd8, 0x5e, 0xe8, 0x78, 0xa1, + 0x99, 0x88, 0xf8, 0x74, 0x91, 0x3a, 0x6a, 0x5b, 0x23, 0x6f, 0xe4, 0xa5, 0x78, 0xfc, 0x2b, 0x43, + 0xeb, 0x23, 0xcf, 0x1b, 0x8d, 0x31, 0x9f, 0xac, 0x06, 0x93, 0x21, 0x1f, 0x11, 0x07, 0x87, 0x91, + 0xe5, 0xf8, 0x33, 0x41, 0x3e, 0x4c, 0x3a, 0x01, 0xff, 0x39, 0xb0, 0x7c, 0x1f, 0x07, 0xa9, 0x60, + 0xef, 0x7b, 0x11, 0x54, 0x7b, 0x91, 0x15, 0x61, 0x07, 0xbb, 0x11, 0x7c, 0x0e, 0x2a, 0x78, 0x38, + 0xc4, 0x76, 0xc4, 0x50, 0x0d, 0xaa, 0xb9, 0xde, 0xda, 0xe5, 0xee, 0x1c, 0x94, 0x43, 0x89, 0x48, + 0xcf, 0xc4, 0xf0, 0x15, 0x58, 0xb6, 0xec, 0x88, 0x78, 0x6e, 0xc8, 0x14, 0x1b, 0xa5, 0xe6, 0x7a, + 0xeb, 0xd1, 0x3d, 0x3e, 0x21, 0x51, 0x19, 0x67, 0x3e, 0xd6, 0xa7, 0x0e, 0xf8, 0x10, 0x54, 0x03, + 0x1c, 0x7a, 0x93, 0xc0, 0xc6, 0x21, 0x53, 0x6a, 0x94, 0x9a, 0x55, 0x3d, 0x07, 0xe0, 0x21, 0xd8, + 0xc0, 0xa7, 0x3e, 0x09, 0xac, 0x58, 0x6c, 0xc6, 0xf5, 0x98, 0x72, 0x83, 0x6a, 0xae, 0xb6, 0x6a, + 0x5c, 0xda, 0x9d, 0x9b, 0x76, 0xe7, 0x8c, 0x69, 0xf7, 0xf6, 0xca, 0xe5, 0xcf, 0x3a, 0x75, 0xf1, + 0xab, 0x4e, 0xe9, 0xeb, 0xb9, 0x39, 0xa6, 0xa1, 0x08, 0xc0, 0x98, 0x38, 0x24, 0x32, 0x43, 0x72, + 0x8e, 0x99, 0xa5, 0x24, 0x89, 0x9d, 0x1f, 0x36, 0xbb, 0xa6, 0xbe, 0xe4, 0x46, 0x2f, 0x9e, 0xbd, + 0xb5, 0xc6, 0x13, 0xdc, 0x2e, 0xc7, 0x69, 0x7a, 0x35, 0xf1, 0xf5, 0xc8, 0x39, 0xde, 0xfb, 0x00, + 0xaa, 0x5a, 0x40, 0x5c, 0x9b, 0xf8, 0xd6, 0x18, 0xbe, 0x04, 0xe5, 0xe8, 0xcc, 0xc7, 0xd9, 0x81, + 0x3d, 0xbe, 0xa7, 0xf8, 0x4c, 0x9f, 0x74, 0x4f, 0x1c, 0x70, 0x0b, 0x2c, 0x7d, 0x8a, 0x37, 0x60, + 0x8a, 0x0d, 0xaa, 0x59, 0xd5, 0xd3, 0xc5, 0xfe, 0x97, 0x12, 0x00, 0xf9, 0x31, 0xc1, 0xff, 0x00, + 0x14, 0x44, 0x43, 0x52, 0x15, 0xb3, 0xaf, 0xf4, 0x34, 0x24, 0x4a, 0x5d, 0x09, 0x75, 0xe8, 0x02, + 0xdc, 0x05, 0x3b, 0x53, 0x5c, 0xeb, 0x08, 0x06, 0x32, 0xdb, 0x7d, 0xf1, 0x0d, 0x32, 0x4c, 0x49, + 0xe9, 0xaa, 0x34, 0x05, 0x19, 0xb0, 0x95, 0xd1, 0x1d, 0x24, 0xa3, 0x19, 0x4d, 0x17, 0xe7, 0x18, + 0x51, 0x47, 0xb1, 0x51, 0x6d, 0xbf, 0x46, 0xa2, 0x41, 0x97, 0x6e, 0x7b, 0x32, 0xa6, 0x3c, 0x37, + 0x84, 0xa8, 0x6a, 0xc7, 0x53, 0x7c, 0x09, 0x6e, 0x83, 0x7f, 0x33, 0xfc, 0x00, 0x19, 0x53, 0xb8, + 0x02, 0x77, 0xc0, 0x76, 0x06, 0xa3, 0x23, 0x24, 0xf6, 0xf3, 0xa4, 0xe5, 0xb9, 0x24, 0x59, 0xea, + 0xcd, 0x2c, 0x2b, 0x90, 0x05, 0xb5, 0xc5, 0x3a, 0x07, 0xba, 0xda, 0xd7, 0xcc, 0x43, 0x74, 0xd8, + 0x46, 0x3a, 0x5d, 0x85, 0xff, 0x83, 0xcd, 0xc5, 0xd9, 0x12, 0x9e, 0x06, 0xb7, 0xcf, 0x21, 0x8d, + 0x4c, 0xcf, 0x61, 0xf5, 0x36, 0x9d, 0xe6, 0xa2, 0x23, 0x43, 0x17, 0xe8, 0x35, 0xb8, 0x09, 0x36, + 0x32, 0xda, 0x38, 0xd6, 0x90, 0x29, 0xc8, 0x32, 0x6d, 0xd7, 0xca, 0x5f, 0xbf, 0xb1, 0x85, 0x7d, + 0x09, 0x54, 0xd2, 0x57, 0x1e, 0xcf, 0x8c, 0xba, 0xdd, 0x38, 0x74, 0xf1, 0x0a, 0x68, 0xb0, 0x96, + 0xe1, 0x82, 0x2c, 0xab, 0xef, 0x68, 0x0a, 0x6e, 0x80, 0xd5, 0x0c, 0xe9, 0x20, 0xe5, 0x98, 0x2e, + 0x66, 0x51, 0x13, 0xf0, 0xcf, 0xc2, 0xfd, 0xc7, 0x6d, 0x35, 0x5d, 0x52, 0x44, 0x49, 0x13, 0xe4, + 0x74, 0xe7, 0xc5, 0xe4, 0x3a, 0x78, 0xf0, 0x17, 0x7f, 0xa0, 0x74, 0x3b, 0xa6, 0x20, 0x8a, 0x6a, + 0x5f, 0x31, 0x68, 0x2a, 0xae, 0x75, 0x97, 0x20, 0x3d, 0x94, 0x6c, 0xdb, 0xb6, 0x7c, 0x79, 0xcd, + 0x52, 0x57, 0xd7, 0x2c, 0xf5, 0xfb, 0x9a, 0xa5, 0x2e, 0x6e, 0xd8, 0xc2, 0xd5, 0x0d, 0x5b, 0xf8, + 0x71, 0xc3, 0x16, 0xde, 0xb7, 0x46, 0x24, 0x3a, 0x99, 0x0c, 0xe2, 0xc7, 0xce, 0x0f, 0xdc, 0xc1, + 0x13, 0xfb, 0xc4, 0x22, 0x2e, 0x3f, 0xf7, 0xa9, 0x38, 0x9d, 0xff, 0x72, 0xc5, 0x8f, 0x35, 0x1c, + 0x54, 0x92, 0xff, 0xd9, 0xd3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x10, 0xd3, 0x81, 0xdf, + 0x04, 0x00, 0x00, } func (m *Statement) Marshal() (dAtA []byte, err error) { diff --git a/x/permission/types/types.go b/x/permission/types/types.go index f43628fa2..0aa36bf05 100644 --- a/x/permission/types/types.go +++ b/x/permission/types/types.go @@ -47,6 +47,7 @@ var ( } GroupAllowedActions = map[ActionType]bool{ ACTION_UPDATE_GROUP_MEMBER: true, + ACTION_UPDATE_GROUP_EXTRA: true, ACTION_DELETE_GROUP: true, ACTION_TYPE_ALL: true, diff --git a/x/storage/client/cli/flags.go b/x/storage/client/cli/flags.go index f58c026f8..6597fee89 100644 --- a/x/storage/client/cli/flags.go +++ b/x/storage/client/cli/flags.go @@ -27,6 +27,8 @@ const ( FlagObjectName = "object-name" FlagGroupId = "group-id" FlagGroupName = "group-name" + FlagMemberList = "members" + FlagExtra = "extra" ) func GetVisibilityType(str string) (storagetypes.VisibilityType, error) { diff --git a/x/storage/client/cli/tx.go b/x/storage/client/cli/tx.go index 9d9cd0987..20dfa9e28 100644 --- a/x/storage/client/cli/tx.go +++ b/x/storage/client/cli/tx.go @@ -51,6 +51,7 @@ func GetTxCmd() *cobra.Command { CmdCreateGroup(), CmdDeleteGroup(), CmdUpdateGroupMember(), + CmdUpdateGroupExtra(), CmdLeaveGroup(), CmdMirrorGroup(), ) @@ -516,12 +517,13 @@ func CmdDiscontinueObject() *cobra.Command { func CmdCreateGroup() *cobra.Command { cmd := &cobra.Command{ - Use: "create-group [group-name] [member-list]", - Short: "Create a new group with several initial members, split member addresses by ','", - Args: cobra.ExactArgs(2), + Use: "create-group [group-name]", + Short: "Create a new group with optional members, split member addresses by ','", + Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) (err error) { argGroupName := args[0] - argMemberList := args[1] + argMemberList, _ := cmd.Flags().GetString(FlagMemberList) + extra, _ := cmd.Flags().GetString(FlagExtra) clientCtx, err := client.GetClientTxContext(cmd) if err != nil { @@ -529,18 +531,21 @@ func CmdCreateGroup() *cobra.Command { } var memberAddrs []sdk.AccAddress - members := strings.Split(argMemberList, ",") - for _, member := range members { - memberAddr, err := sdk.AccAddressFromHexUnsafe(member) - if err != nil { - return err + if argMemberList != "" { + members := strings.Split(argMemberList, ",") + for _, member := range members { + memberAddr, err := sdk.AccAddressFromHexUnsafe(member) + if err != nil { + return err + } + memberAddrs = append(memberAddrs, memberAddr) } - memberAddrs = append(memberAddrs, memberAddr) } msg := types.NewMsgCreateGroup( clientCtx.GetFromAddress(), argGroupName, memberAddrs, + extra, ) if err := msg.ValidateBasic(); err != nil { return err @@ -549,6 +554,8 @@ func CmdCreateGroup() *cobra.Command { }, } + cmd.Flags().String(FlagExtra, "", "extra info for the group") + cmd.Flags().String(FlagMemberList, "", "init members of the group") flags.AddTxFlagsToCmd(cmd) return cmd @@ -670,6 +677,37 @@ func CmdUpdateGroupMember() *cobra.Command { return cmd } +func CmdUpdateGroupExtra() *cobra.Command { + cmd := &cobra.Command{ + Use: "update-group-extra [group-name] [extra]", + Short: "Update the extra info of the group", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) (err error) { + argGroupName := args[0] + argExtra := args[1] + + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + msg := types.NewMsgUpdateGroupExtra( + clientCtx.GetFromAddress(), + clientCtx.GetFromAddress(), + argGroupName, + argExtra, + ) + if err := msg.ValidateBasic(); err != nil { + return err + } + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + + return cmd +} + func CmdPutPolicy() *cobra.Command { cmd := &cobra.Command{ Use: "put-policy [principle-value] [resource]", diff --git a/x/storage/keeper/keeper.go b/x/storage/keeper/keeper.go index 169f6c52c..0677e3c17 100644 --- a/x/storage/keeper/keeper.go +++ b/x/storage/keeper/keeper.go @@ -1067,6 +1067,7 @@ func (k Keeper) CreateGroup( SourceType: opts.SourceType, Id: k.GenNextGroupId(ctx), GroupName: groupName, + Extra: opts.Extra, } // Can not create a group with the same name. @@ -1249,6 +1250,34 @@ func (k Keeper) UpdateGroupMember(ctx sdk.Context, operator sdk.AccAddress, grou return nil } +func (k Keeper) UpdateGroupExtra(ctx sdk.Context, operator sdk.AccAddress, groupInfo *types.GroupInfo, extra string) error { + + // check permission + effect := k.VerifyGroupPermission(ctx, groupInfo, operator, permtypes.ACTION_UPDATE_GROUP_EXTRA) + if effect != permtypes.EFFECT_ALLOW { + return types.ErrAccessDenied.Wrapf( + "The operator(%s) has no UpdateGroupExtra permission of the group(%s), operator(%s)", + operator.String(), groupInfo.GroupName, groupInfo.Owner) + } + + if extra != groupInfo.Extra { + groupInfo.Extra = extra + obz := k.cdc.MustMarshal(groupInfo) + ctx.KVStore(k.storeKey).Set(types.GetGroupByIDKey(groupInfo.Id), obz) + } + + if err := ctx.EventManager().EmitTypedEvents(&types.EventUpdateGroupExtra{ + Operator: operator.String(), + Owner: groupInfo.Owner, + GroupName: groupInfo.GroupName, + GroupId: groupInfo.Id, + Extra: extra, + }); err != nil { + return err + } + return nil +} + func (k Keeper) VerifySPAndSignature(ctx sdk.Context, spAcc sdk.AccAddress, sigData []byte, signature []byte) error { sp, found := k.spKeeper.GetStorageProvider(ctx, spAcc) if !found { diff --git a/x/storage/keeper/msg_server.go b/x/storage/keeper/msg_server.go index bd1fda40d..e89df2045 100644 --- a/x/storage/keeper/msg_server.go +++ b/x/storage/keeper/msg_server.go @@ -243,7 +243,7 @@ func (k msgServer) CreateGroup(goCtx context.Context, msg *types.MsgCreateGroup) ownerAcc := sdk.MustAccAddressFromHex(msg.Creator) - id, err := k.Keeper.CreateGroup(ctx, ownerAcc, msg.GroupName, CreateGroupOptions{Members: msg.Members}) + id, err := k.Keeper.CreateGroup(ctx, ownerAcc, msg.GroupName, CreateGroupOptions{Members: msg.Members, Extra: msg.Extra}) if err != nil { return nil, err } @@ -303,6 +303,25 @@ func (k msgServer) UpdateGroupMember(goCtx context.Context, msg *types.MsgUpdate return &types.MsgUpdateGroupMemberResponse{}, nil } +func (k msgServer) UpdateGroupExtra(goCtx context.Context, msg *types.MsgUpdateGroupExtra) (*types.MsgUpdateGroupExtraResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + operator := sdk.MustAccAddressFromHex(msg.Operator) + + groupOwner := sdk.MustAccAddressFromHex(msg.GroupOwner) + + groupInfo, found := k.GetGroupInfo(ctx, groupOwner, msg.GroupName) + if !found { + return nil, types.ErrNoSuchGroup + } + err := k.Keeper.UpdateGroupExtra(ctx, operator, groupInfo, msg.Extra) + if err != nil { + return nil, err + } + + return &types.MsgUpdateGroupExtraResponse{}, nil +} + func (k msgServer) PutPolicy(goCtx context.Context, msg *types.MsgPutPolicy) (*types.MsgPutPolicyResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) diff --git a/x/storage/keeper/options.go b/x/storage/keeper/options.go index 736319f66..d16052bc8 100644 --- a/x/storage/keeper/options.go +++ b/x/storage/keeper/options.go @@ -52,6 +52,7 @@ type CopyObjectOptions struct { type CreateGroupOptions struct { Members []string SourceType types.SourceType + Extra string } type LeaveGroupOptions struct { SourceType types.SourceType diff --git a/x/storage/types/codec.go b/x/storage/types/codec.go index 1eb50bf02..44536ca2f 100644 --- a/x/storage/types/codec.go +++ b/x/storage/types/codec.go @@ -17,6 +17,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgCreateGroup{}, "storage/CreateGroup", nil) cdc.RegisterConcrete(&MsgDeleteGroup{}, "storage/DeleteGroup", nil) cdc.RegisterConcrete(&MsgUpdateGroupMember{}, "storage/UpdateGroupMember", nil) + cdc.RegisterConcrete(&MsgUpdateGroupExtra{}, "storage/UpdateGroupExtra", nil) cdc.RegisterConcrete(&MsgLeaveGroup{}, "storage/LeaveGroup", nil) cdc.RegisterConcrete(&MsgCopyObject{}, "storage/CopyObject", nil) cdc.RegisterConcrete(&MsgUpdateBucketInfo{}, "storage/UpdateBucketInfo", nil) @@ -53,6 +54,9 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { registry.RegisterImplementations((*sdk.Msg)(nil), &MsgUpdateGroupMember{}, ) + registry.RegisterImplementations((*sdk.Msg)(nil), + &MsgUpdateGroupExtra{}, + ) registry.RegisterImplementations((*sdk.Msg)(nil), &MsgLeaveGroup{}, ) diff --git a/x/storage/types/events.pb.go b/x/storage/types/events.pb.go index 21c94deaa..b9d2fc917 100644 --- a/x/storage/types/events.pb.go +++ b/x/storage/types/events.pb.go @@ -1093,6 +1093,8 @@ type EventCreateGroup struct { SourceType SourceType `protobuf:"varint,4,opt,name=source_type,json=sourceType,proto3,enum=greenfield.storage.SourceType" json:"source_type,omitempty"` // members define the all the address of the members. Members []string `protobuf:"bytes,5,rep,name=members,proto3" json:"members,omitempty"` + // extra defines extra info for the group + Extra string `protobuf:"bytes,6,opt,name=extra,proto3" json:"extra,omitempty"` } func (m *EventCreateGroup) Reset() { *m = EventCreateGroup{} } @@ -1156,6 +1158,13 @@ func (m *EventCreateGroup) GetMembers() []string { return nil } +func (m *EventCreateGroup) GetExtra() string { + if m != nil { + return m.Extra + } + return "" +} + // EventDeleteGroup is emitted on MsgDeleteGroup type EventDeleteGroup struct { // owner define the account address of group owner @@ -1363,6 +1372,81 @@ func (m *EventUpdateGroupMember) GetMembersToDelete() []string { return nil } +// EventUpdateGroupExtra is emitted on MsgUpdateGroupExtra +type EventUpdateGroupExtra struct { + // operator define the account address of operator who update the group member + Operator string `protobuf:"bytes,1,opt,name=operator,proto3" json:"operator,omitempty"` + // owner define the account address of group owner + Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"` + // group_name define the name of the group + GroupName string `protobuf:"bytes,3,opt,name=group_name,json=groupName,proto3" json:"group_name,omitempty"` + // id define an u256 id for group + GroupId Uint `protobuf:"bytes,4,opt,name=group_id,json=groupId,proto3,customtype=Uint" json:"group_id"` + // extra defines extra info for the group to update + Extra string `protobuf:"bytes,5,opt,name=extra,proto3" json:"extra,omitempty"` +} + +func (m *EventUpdateGroupExtra) Reset() { *m = EventUpdateGroupExtra{} } +func (m *EventUpdateGroupExtra) String() string { return proto.CompactTextString(m) } +func (*EventUpdateGroupExtra) ProtoMessage() {} +func (*EventUpdateGroupExtra) Descriptor() ([]byte, []int) { + return fileDescriptor_946dcba4f763ddc4, []int{16} +} +func (m *EventUpdateGroupExtra) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EventUpdateGroupExtra) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EventUpdateGroupExtra.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 *EventUpdateGroupExtra) XXX_Merge(src proto.Message) { + xxx_messageInfo_EventUpdateGroupExtra.Merge(m, src) +} +func (m *EventUpdateGroupExtra) XXX_Size() int { + return m.Size() +} +func (m *EventUpdateGroupExtra) XXX_DiscardUnknown() { + xxx_messageInfo_EventUpdateGroupExtra.DiscardUnknown(m) +} + +var xxx_messageInfo_EventUpdateGroupExtra proto.InternalMessageInfo + +func (m *EventUpdateGroupExtra) GetOperator() string { + if m != nil { + return m.Operator + } + return "" +} + +func (m *EventUpdateGroupExtra) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + +func (m *EventUpdateGroupExtra) GetGroupName() string { + if m != nil { + return m.GroupName + } + return "" +} + +func (m *EventUpdateGroupExtra) GetExtra() string { + if m != nil { + return m.Extra + } + return "" +} + // EventMirrorBucket is emitted on MirrorBucket type EventMirrorBucket struct { // operator define the account address of operator who mirror the bucket @@ -1377,7 +1461,7 @@ func (m *EventMirrorBucket) Reset() { *m = EventMirrorBucket{} } func (m *EventMirrorBucket) String() string { return proto.CompactTextString(m) } func (*EventMirrorBucket) ProtoMessage() {} func (*EventMirrorBucket) Descriptor() ([]byte, []int) { - return fileDescriptor_946dcba4f763ddc4, []int{16} + return fileDescriptor_946dcba4f763ddc4, []int{17} } func (m *EventMirrorBucket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1434,7 +1518,7 @@ func (m *EventMirrorBucketResult) Reset() { *m = EventMirrorBucketResult func (m *EventMirrorBucketResult) String() string { return proto.CompactTextString(m) } func (*EventMirrorBucketResult) ProtoMessage() {} func (*EventMirrorBucketResult) Descriptor() ([]byte, []int) { - return fileDescriptor_946dcba4f763ddc4, []int{17} + return fileDescriptor_946dcba4f763ddc4, []int{18} } func (m *EventMirrorBucketResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1493,7 +1577,7 @@ func (m *EventMirrorObject) Reset() { *m = EventMirrorObject{} } func (m *EventMirrorObject) String() string { return proto.CompactTextString(m) } func (*EventMirrorObject) ProtoMessage() {} func (*EventMirrorObject) Descriptor() ([]byte, []int) { - return fileDescriptor_946dcba4f763ddc4, []int{18} + return fileDescriptor_946dcba4f763ddc4, []int{19} } func (m *EventMirrorObject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1559,7 +1643,7 @@ func (m *EventMirrorObjectResult) Reset() { *m = EventMirrorObjectResult func (m *EventMirrorObjectResult) String() string { return proto.CompactTextString(m) } func (*EventMirrorObjectResult) ProtoMessage() {} func (*EventMirrorObjectResult) Descriptor() ([]byte, []int) { - return fileDescriptor_946dcba4f763ddc4, []int{19} + return fileDescriptor_946dcba4f763ddc4, []int{20} } func (m *EventMirrorObjectResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1623,7 +1707,7 @@ func (m *EventMirrorGroup) Reset() { *m = EventMirrorGroup{} } func (m *EventMirrorGroup) String() string { return proto.CompactTextString(m) } func (*EventMirrorGroup) ProtoMessage() {} func (*EventMirrorGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_946dcba4f763ddc4, []int{20} + return fileDescriptor_946dcba4f763ddc4, []int{21} } func (m *EventMirrorGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1680,7 +1764,7 @@ func (m *EventMirrorGroupResult) Reset() { *m = EventMirrorGroupResult{} func (m *EventMirrorGroupResult) String() string { return proto.CompactTextString(m) } func (*EventMirrorGroupResult) ProtoMessage() {} func (*EventMirrorGroupResult) Descriptor() ([]byte, []int) { - return fileDescriptor_946dcba4f763ddc4, []int{21} + return fileDescriptor_946dcba4f763ddc4, []int{22} } func (m *EventMirrorGroupResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1733,7 +1817,7 @@ func (m *EventStalePolicyCleanup) Reset() { *m = EventStalePolicyCleanup func (m *EventStalePolicyCleanup) String() string { return proto.CompactTextString(m) } func (*EventStalePolicyCleanup) ProtoMessage() {} func (*EventStalePolicyCleanup) Descriptor() ([]byte, []int) { - return fileDescriptor_946dcba4f763ddc4, []int{22} + return fileDescriptor_946dcba4f763ddc4, []int{23} } func (m *EventStalePolicyCleanup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1793,6 +1877,7 @@ func init() { proto.RegisterType((*EventDeleteGroup)(nil), "greenfield.storage.EventDeleteGroup") proto.RegisterType((*EventLeaveGroup)(nil), "greenfield.storage.EventLeaveGroup") proto.RegisterType((*EventUpdateGroupMember)(nil), "greenfield.storage.EventUpdateGroupMember") + proto.RegisterType((*EventUpdateGroupExtra)(nil), "greenfield.storage.EventUpdateGroupExtra") proto.RegisterType((*EventMirrorBucket)(nil), "greenfield.storage.EventMirrorBucket") proto.RegisterType((*EventMirrorBucketResult)(nil), "greenfield.storage.EventMirrorBucketResult") proto.RegisterType((*EventMirrorObject)(nil), "greenfield.storage.EventMirrorObject") @@ -1805,94 +1890,96 @@ func init() { func init() { proto.RegisterFile("greenfield/storage/events.proto", fileDescriptor_946dcba4f763ddc4) } var fileDescriptor_946dcba4f763ddc4 = []byte{ - // 1392 bytes of a gzipped FileDescriptorProto + // 1423 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcf, 0x8f, 0xdb, 0x44, - 0x14, 0x5e, 0x27, 0xde, 0x6c, 0x32, 0xd9, 0x6c, 0xb6, 0x66, 0xbb, 0xb8, 0x2d, 0x64, 0x53, 0x1f, - 0xaa, 0x3d, 0xd0, 0x44, 0x5a, 0x2a, 0x28, 0x17, 0xaa, 0xa4, 0x05, 0xb4, 0x82, 0xb6, 0xe0, 0xb4, - 0x1c, 0xb8, 0x58, 0x13, 0x7b, 0x36, 0x6b, 0x1a, 0x7b, 0xcc, 0xcc, 0x78, 0x21, 0x3d, 0x72, 0xe1, - 0x02, 0x08, 0x89, 0x13, 0x12, 0x47, 0x0e, 0x5c, 0x38, 0xd1, 0x7f, 0x01, 0xa9, 0x20, 0x21, 0x55, - 0x3d, 0xf1, 0x43, 0x54, 0xa8, 0x3d, 0xf1, 0x5f, 0x20, 0xcf, 0x4c, 0x1c, 0x3b, 0x49, 0x37, 0xeb, - 0x2c, 0x81, 0xe5, 0x16, 0x4f, 0xbe, 0x37, 0xf3, 0xde, 0x37, 0xdf, 0xfb, 0x11, 0x07, 0x6c, 0xf5, - 0x08, 0x42, 0xfe, 0x9e, 0x8b, 0xfa, 0x4e, 0x93, 0x32, 0x4c, 0x60, 0x0f, 0x35, 0xd1, 0x01, 0xf2, - 0x19, 0x6d, 0x04, 0x04, 0x33, 0xac, 0x69, 0x23, 0x40, 0x43, 0x02, 0xce, 0x9e, 0xb1, 0x31, 0xf5, - 0x30, 0xb5, 0x38, 0xa2, 0x29, 0x1e, 0x04, 0xfc, 0xec, 0x46, 0x0f, 0xf7, 0xb0, 0x58, 0x8f, 0x3e, - 0xc9, 0xd5, 0x69, 0xa7, 0xd8, 0xd8, 0xf3, 0xb0, 0x2f, 0x01, 0xb5, 0x29, 0x00, 0x36, 0x08, 0x90, - 0xdc, 0xd6, 0xf8, 0x5e, 0x05, 0xa7, 0x5e, 0x8b, 0xdc, 0xba, 0x4a, 0x10, 0x64, 0xa8, 0x1d, 0xda, - 0x77, 0x10, 0xd3, 0x1a, 0x60, 0x19, 0x7f, 0xe8, 0x23, 0xa2, 0x2b, 0x75, 0x65, 0xbb, 0xd4, 0xd6, - 0x1f, 0xde, 0xbb, 0xb8, 0x21, 0xbd, 0x69, 0x39, 0x0e, 0x41, 0x94, 0x76, 0x18, 0x71, 0xfd, 0x9e, - 0x29, 0x60, 0xda, 0x16, 0x28, 0x77, 0xb9, 0xa5, 0xe5, 0x43, 0x0f, 0xe9, 0xb9, 0xc8, 0xca, 0x04, - 0x62, 0xe9, 0x06, 0xf4, 0x90, 0xd6, 0x06, 0xe0, 0xc0, 0xa5, 0x6e, 0xd7, 0xed, 0xbb, 0x6c, 0xa0, - 0xe7, 0xeb, 0xca, 0xf6, 0xda, 0x8e, 0xd1, 0x98, 0x64, 0xa0, 0xf1, 0x6e, 0x8c, 0xba, 0x35, 0x08, - 0x90, 0x99, 0xb0, 0xd2, 0xce, 0x81, 0x92, 0xcd, 0x9d, 0xb4, 0x20, 0xd3, 0xd5, 0xba, 0xb2, 0x9d, - 0x37, 0x8b, 0x62, 0xa1, 0xc5, 0xb4, 0xcb, 0xa0, 0x24, 0x3d, 0x70, 0x1d, 0x7d, 0x99, 0x7b, 0x7d, - 0xee, 0xfe, 0xa3, 0xad, 0xa5, 0xdf, 0x1e, 0x6d, 0xa9, 0xb7, 0x5d, 0x9f, 0x3d, 0xbc, 0x77, 0xb1, - 0x2c, 0x23, 0x88, 0x1e, 0xcd, 0xa2, 0x40, 0xef, 0x3a, 0xda, 0x15, 0x50, 0xa6, 0x38, 0x24, 0x36, - 0xb2, 0x22, 0x5e, 0xf4, 0x02, 0xf7, 0xad, 0x36, 0xcd, 0xb7, 0x0e, 0x87, 0x09, 0xbf, 0x68, 0xfc, - 0x59, 0x7b, 0x01, 0x68, 0xf6, 0x3e, 0x24, 0x3d, 0xe4, 0x58, 0x04, 0x41, 0xc7, 0xfa, 0x20, 0xc4, - 0x0c, 0xea, 0x2b, 0x75, 0x65, 0x5b, 0x35, 0xd7, 0xe5, 0x37, 0x26, 0x82, 0xce, 0x3b, 0xd1, 0xba, - 0xd6, 0x02, 0xd5, 0x00, 0x0e, 0x3c, 0xe4, 0x33, 0x0b, 0x0a, 0x2a, 0xf5, 0xe2, 0x0c, 0x92, 0xd7, - 0xa4, 0x81, 0x5c, 0xd5, 0x5e, 0x07, 0x5a, 0x40, 0x5c, 0x0f, 0x92, 0x81, 0x45, 0x83, 0x78, 0x97, - 0xd2, 0x8c, 0x5d, 0xd6, 0xa5, 0x4d, 0x27, 0x18, 0xee, 0x73, 0x19, 0x14, 0x28, 0x83, 0x2c, 0xa4, - 0x3a, 0xe0, 0x41, 0xd7, 0xa7, 0x05, 0x2d, 0x14, 0xd1, 0xe1, 0x38, 0x53, 0xe2, 0x8d, 0xaf, 0x73, - 0x52, 0x35, 0xd7, 0x50, 0x1f, 0xc5, 0xaa, 0xb9, 0x04, 0x8a, 0x38, 0x40, 0x04, 0x32, 0x3c, 0x5b, - 0x38, 0x31, 0x72, 0xa4, 0xb5, 0xdc, 0x5c, 0x5a, 0xcb, 0x4f, 0x68, 0x2d, 0x25, 0x05, 0x35, 0x8b, - 0x14, 0xa6, 0x13, 0xbb, 0x9c, 0x95, 0x58, 0xe3, 0xa7, 0x3c, 0x38, 0xcd, 0xe9, 0xb9, 0x1d, 0x38, - 0x71, 0x52, 0xed, 0xfa, 0x7b, 0x78, 0x4e, 0x8a, 0x66, 0xa6, 0x57, 0x2a, 0xe4, 0x7c, 0x96, 0x90, - 0x5f, 0x01, 0x67, 0x26, 0xc5, 0x6b, 0x75, 0xd1, 0x1e, 0x26, 0x88, 0x93, 0xa7, 0x9a, 0x9b, 0xe3, - 0x1a, 0x6e, 0xf3, 0x6f, 0xb5, 0x97, 0x81, 0x3e, 0xc5, 0x14, 0xee, 0x31, 0x44, 0x38, 0x67, 0xaa, - 0x79, 0x7a, 0xdc, 0xb2, 0x15, 0x7d, 0xa9, 0x5d, 0x02, 0x9b, 0x63, 0x29, 0x30, 0x3c, 0xb0, 0xc0, - 0x23, 0xdb, 0x48, 0xeb, 0x5d, 0x1e, 0xb7, 0x03, 0x4e, 0x8f, 0x5b, 0x89, 0xb3, 0x56, 0xb8, 0xd1, - 0x33, 0x69, 0x23, 0x71, 0x52, 0xba, 0xec, 0x14, 0xe7, 0x29, 0x3b, 0xc6, 0xb7, 0x0a, 0xd8, 0x14, - 0x5a, 0x77, 0xa9, 0x8d, 0x7d, 0xe6, 0xfa, 0xe1, 0x50, 0xf0, 0x29, 0xda, 0x95, 0x2c, 0xb4, 0xcf, - 0xbc, 0xd1, 0x4d, 0x50, 0x20, 0x08, 0x52, 0xec, 0x4b, 0x81, 0xcb, 0xa7, 0xa8, 0x08, 0x3a, 0x3c, - 0xe7, 0x12, 0x45, 0x50, 0x2c, 0xb4, 0x98, 0xf1, 0x71, 0x21, 0x55, 0xcc, 0x6f, 0x76, 0xdf, 0x47, - 0x36, 0xd3, 0x76, 0xc0, 0x0a, 0x2f, 0x93, 0x47, 0x90, 0xdc, 0x10, 0xf8, 0xcf, 0x27, 0xe5, 0x16, - 0x28, 0x63, 0xee, 0x8e, 0x00, 0xa8, 0x02, 0x20, 0x96, 0x26, 0x25, 0x5c, 0xc8, 0xc2, 0xe5, 0x65, - 0x50, 0x92, 0x5b, 0xbb, 0x8e, 0x10, 0xc3, 0x0c, 0x4b, 0x81, 0x7e, 0x6a, 0xbe, 0x17, 0x33, 0x17, - 0xd2, 0xf3, 0x60, 0x35, 0x80, 0x83, 0x3e, 0x86, 0x8e, 0x45, 0xdd, 0xbb, 0x88, 0x97, 0x62, 0xd5, - 0x2c, 0xcb, 0xb5, 0x8e, 0x7b, 0x77, 0xbc, 0x01, 0x82, 0xb9, 0x1a, 0xe0, 0x79, 0xb0, 0x1a, 0x09, - 0x30, 0xca, 0x00, 0xde, 0xaa, 0xca, 0x9c, 0xc4, 0xb2, 0x5c, 0xe3, 0xbd, 0x28, 0xd5, 0x23, 0x57, - 0x27, 0x7a, 0xe4, 0xb0, 0xde, 0x57, 0x9e, 0x5e, 0xef, 0x85, 0x68, 0xd2, 0xf5, 0x5e, 0x7b, 0x13, - 0x54, 0x09, 0x72, 0x42, 0xdf, 0x81, 0xbe, 0x3d, 0x10, 0x87, 0xaf, 0x3d, 0x3d, 0x04, 0x33, 0x86, - 0xf2, 0x10, 0xd6, 0x48, 0xea, 0x79, 0xbc, 0xe1, 0x56, 0x33, 0x37, 0xdc, 0xe7, 0x40, 0xc9, 0xde, - 0x47, 0xf6, 0x1d, 0x1a, 0x7a, 0x54, 0x5f, 0xaf, 0xe7, 0xb7, 0x57, 0xcd, 0xd1, 0x82, 0xf1, 0x65, - 0x0e, 0x3c, 0x2b, 0x92, 0x00, 0xfa, 0x36, 0xea, 0xa7, 0x52, 0x61, 0x41, 0xe5, 0x77, 0x4c, 0xdc, - 0xf9, 0x09, 0x71, 0x4f, 0x17, 0x9a, 0x3a, 0x47, 0xc7, 0x4e, 0x48, 0xbd, 0x90, 0x41, 0xea, 0xc6, - 0xcf, 0x39, 0x50, 0xe5, 0xac, 0x74, 0x10, 0xec, 0xff, 0xc7, 0x6c, 0xa4, 0xa2, 0x58, 0xce, 0x92, - 0xb0, 0x23, 0x05, 0x17, 0x32, 0x2a, 0xf8, 0x06, 0xd8, 0xa4, 0xc8, 0xc6, 0xbe, 0x93, 0xbe, 0x03, - 0x44, 0xf5, 0x95, 0x7a, 0xfe, 0xd0, 0xc8, 0x37, 0x62, 0xbb, 0xf8, 0x1e, 0x10, 0x35, 0xfe, 0x1a, - 0xf2, 0x79, 0x15, 0x07, 0x83, 0x63, 0xf1, 0x79, 0x01, 0x54, 0x29, 0xb1, 0xad, 0x49, 0x4e, 0x2b, - 0x94, 0xd8, 0xed, 0x11, 0xad, 0x12, 0x37, 0x49, 0x6d, 0x84, 0xbb, 0x39, 0x62, 0xf7, 0x02, 0xa8, - 0x3a, 0x94, 0xa5, 0xf6, 0x13, 0xd5, 0xb6, 0xe2, 0x50, 0x96, 0xde, 0x2f, 0xc2, 0x25, 0xf7, 0x5b, - 0x8e, 0x71, 0x89, 0xfd, 0xae, 0x80, 0x4a, 0xe2, 0xdc, 0xa3, 0xe9, 0xae, 0x1c, 0xbb, 0xc4, 0x07, - 0xec, 0x4a, 0xe2, 0xa0, 0xa3, 0xd5, 0xe8, 0x72, 0xec, 0xc3, 0xae, 0x63, 0xfc, 0x91, 0x9e, 0x36, - 0x4f, 0x92, 0x7a, 0xd5, 0xe3, 0xb7, 0x9b, 0xcc, 0xe3, 0xe5, 0x21, 0x5a, 0x2e, 0xcc, 0xa5, 0xe5, - 0x1f, 0x15, 0x39, 0xae, 0x9a, 0x88, 0x67, 0xce, 0x09, 0xab, 0x10, 0x59, 0x38, 0x9e, 0x3a, 0xad, - 0xc9, 0x60, 0xc6, 0xdc, 0x52, 0xa6, 0x4d, 0xd1, 0xa3, 0x53, 0x73, 0x59, 0x6e, 0x76, 0xae, 0x69, - 0xed, 0xb3, 0x5c, 0xea, 0x57, 0x82, 0x94, 0xfb, 0x02, 0x7f, 0x25, 0x2c, 0x50, 0xda, 0xe9, 0xf1, - 0x66, 0x79, 0xae, 0x41, 0xfb, 0xf3, 0x1c, 0x58, 0x4f, 0x4c, 0xaf, 0x6f, 0x10, 0x1c, 0x06, 0x99, - 0xdf, 0x44, 0x3c, 0x0f, 0x40, 0x2f, 0x32, 0x4c, 0x72, 0x50, 0xe2, 0x2b, 0x3c, 0xc2, 0x97, 0x40, - 0x51, 0x7c, 0x7d, 0xb4, 0xdf, 0x49, 0x2b, 0x1c, 0x3c, 0xf9, 0x92, 0x40, 0xcd, 0x3c, 0xb3, 0xec, - 0x80, 0x15, 0x0f, 0x79, 0x5d, 0x44, 0xa2, 0x84, 0x3f, 0x3c, 0x49, 0x87, 0x40, 0xe3, 0x2b, 0x45, - 0x12, 0x22, 0xea, 0xde, 0x18, 0x21, 0xb9, 0x79, 0x08, 0xc9, 0x1f, 0x46, 0x88, 0x7a, 0x74, 0x42, - 0x8c, 0x5f, 0x15, 0xd9, 0xff, 0xde, 0x42, 0xf0, 0x40, 0xba, 0x76, 0x05, 0xac, 0x09, 0xd7, 0xe3, - 0xda, 0x36, 0xeb, 0xd2, 0x2a, 0x02, 0x3f, 0x2c, 0x6c, 0x27, 0x24, 0xb6, 0xdf, 0x73, 0xb2, 0x86, - 0x88, 0xc4, 0xe4, 0xc1, 0x5d, 0xe7, 0x8e, 0xfe, 0x4b, 0xaf, 0x38, 0x16, 0x13, 0x97, 0xf6, 0xea, - 0xf0, 0x7e, 0xa8, 0xc5, 0x70, 0x74, 0x47, 0x33, 0xa5, 0xb8, 0x2a, 0xf1, 0xb7, 0x70, 0xcb, 0x71, - 0xb4, 0x6b, 0xe0, 0x54, 0xc2, 0x5e, 0xd4, 0xb1, 0x99, 0x2d, 0xa7, 0x1a, 0x6f, 0x21, 0x54, 0x6c, - 0x7c, 0xa3, 0xc8, 0x6e, 0x7e, 0xdd, 0x25, 0x04, 0x93, 0x63, 0xbd, 0x3b, 0xca, 0xf6, 0x62, 0x24, - 0xcb, 0xbb, 0x20, 0xe3, 0x53, 0x45, 0xfe, 0x8c, 0x48, 0xba, 0x69, 0x22, 0x1a, 0xf6, 0x59, 0x54, - 0xee, 0xe5, 0x18, 0x1a, 0xb9, 0x5a, 0x89, 0x87, 0xcc, 0x05, 0xba, 0xf3, 0x43, 0x9a, 0xb5, 0xff, - 0x6d, 0x7f, 0xfe, 0x2e, 0x4d, 0xab, 0x88, 0xe3, 0xb8, 0xb4, 0x2e, 0xd0, 0xdf, 0xb8, 0x06, 0x0b, - 0x7f, 0x4f, 0x52, 0x53, 0x32, 0x3e, 0x19, 0xce, 0x3a, 0x09, 0xdf, 0x66, 0x50, 0xb9, 0x20, 0x4f, - 0x0e, 0xe4, 0xa5, 0x76, 0x18, 0xec, 0xa3, 0xb7, 0x71, 0xdf, 0xb5, 0x07, 0x57, 0xfb, 0x08, 0xfa, - 0x61, 0xa0, 0x9d, 0x05, 0xc5, 0x6e, 0x1f, 0xdb, 0x77, 0x6e, 0x84, 0x1e, 0xf7, 0x25, 0x6f, 0xc6, - 0xcf, 0x51, 0x57, 0x95, 0xe3, 0x91, 0xeb, 0xef, 0x61, 0xee, 0x4e, 0x79, 0x7a, 0x57, 0x15, 0xb5, - 0x23, 0x1a, 0x8e, 0x4c, 0xe0, 0xc4, 0x9f, 0xdb, 0xbb, 0xf7, 0x1f, 0xd7, 0x94, 0x07, 0x8f, 0x6b, - 0xca, 0x9f, 0x8f, 0x6b, 0xca, 0x17, 0x4f, 0x6a, 0x4b, 0x0f, 0x9e, 0xd4, 0x96, 0x7e, 0x79, 0x52, - 0x5b, 0x7a, 0xaf, 0xd9, 0x73, 0xd9, 0x7e, 0xd8, 0x6d, 0xd8, 0xd8, 0x6b, 0x76, 0xfd, 0xee, 0x45, - 0x7b, 0x1f, 0xba, 0x7e, 0x33, 0xf1, 0x67, 0xc8, 0x47, 0xe9, 0xbf, 0x43, 0xba, 0x05, 0xfe, 0x7f, - 0xc8, 0x8b, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x56, 0x17, 0xe7, 0xb8, 0x19, 0x00, 0x00, + 0x14, 0x5e, 0x27, 0x4e, 0x36, 0x99, 0x6c, 0x36, 0x5b, 0xb3, 0x5d, 0xdc, 0x16, 0xb2, 0xa9, 0x0f, + 0xd5, 0x1e, 0xe8, 0xae, 0xb4, 0x54, 0x50, 0x2e, 0x54, 0x49, 0x5b, 0xd0, 0x0a, 0xda, 0x82, 0xd3, + 0x72, 0xe0, 0x62, 0x4d, 0xec, 0xd9, 0xac, 0x69, 0xec, 0x31, 0x33, 0xe3, 0xa5, 0xe9, 0x91, 0x0b, + 0x17, 0x90, 0x90, 0x38, 0x21, 0x71, 0xec, 0x81, 0x0b, 0x27, 0xfa, 0x2f, 0x20, 0x15, 0x24, 0xa4, + 0xaa, 0x27, 0x7e, 0x88, 0x0a, 0xb5, 0x27, 0xf8, 0x2b, 0x90, 0x67, 0x26, 0x8e, 0x9d, 0xa4, 0x9b, + 0x75, 0x96, 0xc0, 0xf6, 0x16, 0x8f, 0xbf, 0x37, 0xf3, 0xde, 0xe7, 0xef, 0xfd, 0xb0, 0x03, 0xd6, + 0xbb, 0x04, 0x21, 0x7f, 0xd7, 0x45, 0x3d, 0x67, 0x8b, 0x32, 0x4c, 0x60, 0x17, 0x6d, 0xa1, 0x7d, + 0xe4, 0x33, 0xba, 0x19, 0x10, 0xcc, 0xb0, 0xa6, 0x0d, 0x01, 0x9b, 0x12, 0x70, 0xfa, 0x94, 0x8d, + 0xa9, 0x87, 0xa9, 0xc5, 0x11, 0x5b, 0xe2, 0x42, 0xc0, 0x4f, 0xaf, 0x76, 0x71, 0x17, 0x8b, 0xf5, + 0xe8, 0x97, 0x5c, 0x9d, 0x74, 0x8a, 0x8d, 0x3d, 0x0f, 0xfb, 0x12, 0x50, 0x9f, 0x00, 0x60, 0xfd, + 0x00, 0xc9, 0x6d, 0x8d, 0xef, 0x55, 0x70, 0xe2, 0x6a, 0xe4, 0xd6, 0x65, 0x82, 0x20, 0x43, 0xad, + 0xd0, 0xbe, 0x8d, 0x98, 0xb6, 0x09, 0x0a, 0xf8, 0x13, 0x1f, 0x11, 0x5d, 0x69, 0x28, 0x1b, 0xe5, + 0x96, 0xfe, 0xe8, 0xfe, 0xf9, 0x55, 0xe9, 0x4d, 0xd3, 0x71, 0x08, 0xa2, 0xb4, 0xcd, 0x88, 0xeb, + 0x77, 0x4d, 0x01, 0xd3, 0xd6, 0x41, 0xa5, 0xc3, 0x2d, 0x2d, 0x1f, 0x7a, 0x48, 0xcf, 0x45, 0x56, + 0x26, 0x10, 0x4b, 0xd7, 0xa1, 0x87, 0xb4, 0x16, 0x00, 0xfb, 0x2e, 0x75, 0x3b, 0x6e, 0xcf, 0x65, + 0x7d, 0x3d, 0xdf, 0x50, 0x36, 0x96, 0xb7, 0x8d, 0xcd, 0x71, 0x06, 0x36, 0x3f, 0x88, 0x51, 0x37, + 0xfb, 0x01, 0x32, 0x13, 0x56, 0xda, 0x19, 0x50, 0xb6, 0xb9, 0x93, 0x16, 0x64, 0xba, 0xda, 0x50, + 0x36, 0xf2, 0x66, 0x49, 0x2c, 0x34, 0x99, 0x76, 0x11, 0x94, 0xa5, 0x07, 0xae, 0xa3, 0x17, 0xb8, + 0xd7, 0x67, 0x1e, 0x3c, 0x5e, 0x5f, 0xf8, 0xed, 0xf1, 0xba, 0x7a, 0xcb, 0xf5, 0xd9, 0xa3, 0xfb, + 0xe7, 0x2b, 0x32, 0x82, 0xe8, 0xd2, 0x2c, 0x09, 0xf4, 0x8e, 0xa3, 0x5d, 0x02, 0x15, 0x8a, 0x43, + 0x62, 0x23, 0x2b, 0xe2, 0x45, 0x2f, 0x72, 0xdf, 0xea, 0x93, 0x7c, 0x6b, 0x73, 0x98, 0xf0, 0x8b, + 0xc6, 0xbf, 0xb5, 0x57, 0x80, 0x66, 0xef, 0x41, 0xd2, 0x45, 0x8e, 0x45, 0x10, 0x74, 0xac, 0x8f, + 0x43, 0xcc, 0xa0, 0xbe, 0xd8, 0x50, 0x36, 0x54, 0x73, 0x45, 0xde, 0x31, 0x11, 0x74, 0xde, 0x8f, + 0xd6, 0xb5, 0x26, 0xa8, 0x05, 0xb0, 0xef, 0x21, 0x9f, 0x59, 0x50, 0x50, 0xa9, 0x97, 0xa6, 0x90, + 0xbc, 0x2c, 0x0d, 0xe4, 0xaa, 0xf6, 0x16, 0xd0, 0x02, 0xe2, 0x7a, 0x90, 0xf4, 0x2d, 0x1a, 0xc4, + 0xbb, 0x94, 0xa7, 0xec, 0xb2, 0x22, 0x6d, 0xda, 0xc1, 0x60, 0x9f, 0x8b, 0xa0, 0x48, 0x19, 0x64, + 0x21, 0xd5, 0x01, 0x0f, 0xba, 0x31, 0x29, 0x68, 0xa1, 0x88, 0x36, 0xc7, 0x99, 0x12, 0x6f, 0x7c, + 0x93, 0x93, 0xaa, 0xb9, 0x82, 0x7a, 0x28, 0x56, 0xcd, 0x05, 0x50, 0xc2, 0x01, 0x22, 0x90, 0xe1, + 0xe9, 0xc2, 0x89, 0x91, 0x43, 0xad, 0xe5, 0x66, 0xd2, 0x5a, 0x7e, 0x4c, 0x6b, 0x29, 0x29, 0xa8, + 0x59, 0xa4, 0x30, 0x99, 0xd8, 0x42, 0x56, 0x62, 0x8d, 0x9f, 0xf2, 0xe0, 0x24, 0xa7, 0xe7, 0x56, + 0xe0, 0xc4, 0x49, 0xb5, 0xe3, 0xef, 0xe2, 0x19, 0x29, 0x9a, 0x9a, 0x5e, 0xa9, 0x90, 0xf3, 0x59, + 0x42, 0x7e, 0x03, 0x9c, 0x1a, 0x17, 0xaf, 0xd5, 0x41, 0xbb, 0x98, 0x20, 0x4e, 0x9e, 0x6a, 0xae, + 0x8d, 0x6a, 0xb8, 0xc5, 0xef, 0x6a, 0xaf, 0x03, 0x7d, 0x82, 0x29, 0xdc, 0x65, 0x88, 0x70, 0xce, + 0x54, 0xf3, 0xe4, 0xa8, 0x65, 0x33, 0xba, 0xa9, 0x5d, 0x00, 0x6b, 0x23, 0x29, 0x30, 0x38, 0xb0, + 0xc8, 0x23, 0x5b, 0x4d, 0xeb, 0x5d, 0x1e, 0xb7, 0x0d, 0x4e, 0x8e, 0x5a, 0x89, 0xb3, 0x16, 0xb9, + 0xd1, 0x0b, 0x69, 0x23, 0x71, 0x52, 0xba, 0xec, 0x94, 0x66, 0x29, 0x3b, 0xc6, 0xb7, 0x0a, 0x58, + 0x13, 0x5a, 0x77, 0xa9, 0x8d, 0x7d, 0xe6, 0xfa, 0xe1, 0x40, 0xf0, 0x29, 0xda, 0x95, 0x2c, 0xb4, + 0x4f, 0x7d, 0xa2, 0x6b, 0xa0, 0x48, 0x10, 0xa4, 0xd8, 0x97, 0x02, 0x97, 0x57, 0x51, 0x11, 0x74, + 0x78, 0xce, 0x25, 0x8a, 0xa0, 0x58, 0x68, 0x32, 0xe3, 0xd3, 0x62, 0xaa, 0x98, 0xdf, 0xe8, 0x7c, + 0x84, 0x6c, 0xa6, 0x6d, 0x83, 0x45, 0x5e, 0x26, 0x0f, 0x21, 0xb9, 0x01, 0xf0, 0xdf, 0x4f, 0xca, + 0x75, 0x50, 0xc1, 0xdc, 0x1d, 0x01, 0x50, 0x05, 0x40, 0x2c, 0x8d, 0x4b, 0xb8, 0x98, 0x85, 0xcb, + 0x8b, 0xa0, 0x2c, 0xb7, 0x76, 0x1d, 0x21, 0x86, 0x29, 0x96, 0x02, 0xfd, 0xcc, 0x7c, 0x2f, 0x65, + 0x2e, 0xa4, 0x67, 0xc1, 0x52, 0x00, 0xfb, 0x3d, 0x0c, 0x1d, 0x8b, 0xba, 0x77, 0x11, 0x2f, 0xc5, + 0xaa, 0x59, 0x91, 0x6b, 0x6d, 0xf7, 0xee, 0x68, 0x03, 0x04, 0x33, 0x35, 0xc0, 0xb3, 0x60, 0x29, + 0x12, 0x60, 0x94, 0x01, 0xbc, 0x55, 0x55, 0x38, 0x89, 0x15, 0xb9, 0xc6, 0x7b, 0x51, 0xaa, 0x47, + 0x2e, 0x8d, 0xf5, 0xc8, 0x41, 0xbd, 0xaf, 0x3e, 0xbb, 0xde, 0x0b, 0xd1, 0xa4, 0xeb, 0xbd, 0xf6, + 0x0e, 0xa8, 0x11, 0xe4, 0x84, 0xbe, 0x03, 0x7d, 0xbb, 0x2f, 0x0e, 0x5f, 0x7e, 0x76, 0x08, 0x66, + 0x0c, 0xe5, 0x21, 0x2c, 0x93, 0xd4, 0xf5, 0x68, 0xc3, 0xad, 0x65, 0x6e, 0xb8, 0x2f, 0x81, 0xb2, + 0xbd, 0x87, 0xec, 0xdb, 0x34, 0xf4, 0xa8, 0xbe, 0xd2, 0xc8, 0x6f, 0x2c, 0x99, 0xc3, 0x05, 0xe3, + 0xab, 0x1c, 0x78, 0x51, 0x24, 0x01, 0xf4, 0x6d, 0xd4, 0x4b, 0xa5, 0xc2, 0x9c, 0xca, 0xef, 0x88, + 0xb8, 0xf3, 0x63, 0xe2, 0x9e, 0x2c, 0x34, 0x75, 0x86, 0x8e, 0x9d, 0x90, 0x7a, 0x31, 0x83, 0xd4, + 0x8d, 0x9f, 0x73, 0xa0, 0xc6, 0x59, 0x69, 0x23, 0xd8, 0xfb, 0x9f, 0xd9, 0x48, 0x45, 0x51, 0xc8, + 0x92, 0xb0, 0x43, 0x05, 0x17, 0x33, 0x2a, 0xf8, 0x3a, 0x58, 0xa3, 0xc8, 0xc6, 0xbe, 0x93, 0x7e, + 0x06, 0x88, 0xea, 0x8b, 0x8d, 0xfc, 0x81, 0x91, 0xaf, 0xc6, 0x76, 0xf1, 0x73, 0x40, 0xd4, 0xf8, + 0x6b, 0xc0, 0xe7, 0x65, 0x1c, 0xf4, 0x8f, 0xc4, 0xe7, 0x39, 0x50, 0xa3, 0xc4, 0xb6, 0xc6, 0x39, + 0xad, 0x52, 0x62, 0xb7, 0x86, 0xb4, 0x4a, 0xdc, 0x38, 0xb5, 0x11, 0xee, 0xc6, 0x90, 0xdd, 0x73, + 0xa0, 0xe6, 0x50, 0x96, 0xda, 0x4f, 0x54, 0xdb, 0xaa, 0x43, 0x59, 0x7a, 0xbf, 0x08, 0x97, 0xdc, + 0xaf, 0x10, 0xe3, 0x12, 0xfb, 0x5d, 0x02, 0xd5, 0xc4, 0xb9, 0x87, 0xd3, 0x5d, 0x25, 0x76, 0x89, + 0x0f, 0xd8, 0xd5, 0xc4, 0x41, 0x87, 0xab, 0xd1, 0x95, 0xd8, 0x87, 0x1d, 0xc7, 0xf8, 0x23, 0x3d, + 0x6d, 0x1e, 0x27, 0xf5, 0xaa, 0x47, 0x6f, 0x37, 0x99, 0xc7, 0xcb, 0x03, 0xb4, 0x5c, 0x9c, 0x49, + 0xcb, 0x3f, 0x2a, 0x72, 0x5c, 0x35, 0x11, 0xcf, 0x9c, 0x63, 0x56, 0x21, 0xb2, 0x70, 0x3c, 0x71, + 0x5a, 0x93, 0xc1, 0x8c, 0xb8, 0xa5, 0x4c, 0x9a, 0xa2, 0x87, 0xa7, 0xe6, 0xb2, 0x3c, 0xd9, 0x99, + 0xa6, 0xb5, 0x2f, 0x72, 0xa9, 0xb7, 0x04, 0x29, 0xf7, 0x39, 0xbe, 0x25, 0xcc, 0x51, 0xda, 0xe9, + 0xf1, 0xa6, 0x30, 0xd3, 0xa0, 0x7d, 0x2f, 0x07, 0x56, 0x12, 0xd3, 0xeb, 0xdb, 0x04, 0x87, 0x41, + 0xe6, 0x2f, 0x11, 0x2f, 0x03, 0xd0, 0x8d, 0x0c, 0x93, 0x1c, 0x94, 0xf9, 0x0a, 0x8f, 0xf0, 0x35, + 0x50, 0x12, 0xb7, 0x0f, 0xf7, 0x9e, 0xb4, 0xc8, 0xc1, 0xe3, 0x1f, 0x09, 0xd4, 0xcc, 0x33, 0xcb, + 0x36, 0x58, 0xf4, 0x90, 0xd7, 0x41, 0x24, 0x4a, 0xf8, 0x83, 0x93, 0x74, 0x00, 0xd4, 0x56, 0x41, + 0x01, 0xdd, 0x61, 0x04, 0xca, 0xd7, 0x22, 0x71, 0x61, 0x7c, 0xad, 0x48, 0x9a, 0x44, 0x35, 0x1c, + 0xa1, 0x29, 0x37, 0x0b, 0x4d, 0xf9, 0x83, 0x68, 0x52, 0x0f, 0x4f, 0x93, 0xf1, 0xab, 0x22, 0xbb, + 0xe2, 0xbb, 0x08, 0xee, 0x4b, 0xd7, 0x2e, 0x81, 0x65, 0x11, 0x50, 0x5c, 0xf1, 0xa6, 0x3d, 0xca, + 0xaa, 0xc0, 0x0f, 0xca, 0xdd, 0x31, 0x89, 0xed, 0xf7, 0x9c, 0xac, 0x2c, 0x22, 0x5d, 0x79, 0x70, + 0xd7, 0xb8, 0xa3, 0xff, 0xd1, 0x87, 0x8f, 0xf9, 0xc4, 0xa5, 0xbd, 0x39, 0x78, 0x3e, 0xd4, 0x62, + 0x38, 0x7a, 0x46, 0x53, 0x05, 0xba, 0x24, 0xf1, 0x37, 0x71, 0xd3, 0x71, 0xb4, 0x2b, 0xe0, 0x44, + 0xc2, 0x5e, 0x54, 0xb7, 0xa9, 0x8d, 0xa8, 0x16, 0x6f, 0x21, 0x54, 0x6c, 0xfc, 0xad, 0xa4, 0x8a, + 0x21, 0x67, 0xf7, 0x6a, 0xa4, 0xf7, 0xe7, 0x9b, 0xdc, 0x38, 0x85, 0x0b, 0xc9, 0x14, 0xbe, 0xa7, + 0xc8, 0x81, 0xe6, 0x9a, 0x4b, 0x08, 0x26, 0x47, 0xfa, 0x7c, 0x96, 0xed, 0xdb, 0x50, 0x96, 0xcf, + 0x61, 0xc6, 0xe7, 0x8a, 0x7c, 0x93, 0x4a, 0xba, 0x69, 0x22, 0x1a, 0xf6, 0x58, 0xd4, 0xf1, 0xe4, + 0x24, 0x1e, 0xb9, 0x5a, 0x8d, 0xe7, 0xec, 0x39, 0xba, 0xf3, 0x43, 0x9a, 0xb5, 0xe7, 0x76, 0x44, + 0xf9, 0x2e, 0x4d, 0xab, 0x88, 0xe3, 0xa8, 0xb4, 0xce, 0xd1, 0xdf, 0xb8, 0xe1, 0x08, 0x7f, 0x8f, + 0x53, 0x5f, 0x36, 0x3e, 0x1b, 0x8c, 0x7b, 0x09, 0xdf, 0xa6, 0x50, 0x39, 0x27, 0x4f, 0xf6, 0xe5, + 0x43, 0x6d, 0x33, 0xd8, 0x43, 0xef, 0xe1, 0x9e, 0x6b, 0xf7, 0x2f, 0xf7, 0x10, 0xf4, 0xc3, 0x40, + 0x3b, 0x0d, 0x4a, 0x9d, 0x1e, 0xb6, 0x6f, 0x5f, 0x0f, 0x3d, 0xee, 0x4b, 0xde, 0x8c, 0xaf, 0xa3, + 0xc1, 0x42, 0x4e, 0x88, 0xae, 0xbf, 0x8b, 0xb9, 0x3b, 0x95, 0xc9, 0x83, 0x85, 0x28, 0x94, 0xd1, + 0x7c, 0x68, 0x02, 0x27, 0xfe, 0xdd, 0xda, 0x79, 0xf0, 0xa4, 0xae, 0x3c, 0x7c, 0x52, 0x57, 0xfe, + 0x7c, 0x52, 0x57, 0xbe, 0x7c, 0x5a, 0x5f, 0x78, 0xf8, 0xb4, 0xbe, 0xf0, 0xcb, 0xd3, 0xfa, 0xc2, + 0x87, 0x5b, 0x5d, 0x97, 0xed, 0x85, 0x9d, 0x4d, 0x1b, 0x7b, 0x5b, 0x1d, 0xbf, 0x73, 0xde, 0xde, + 0x83, 0xae, 0xbf, 0x95, 0xf8, 0x3f, 0xe8, 0x4e, 0xfa, 0x1f, 0xa1, 0x4e, 0x91, 0xff, 0x25, 0xf4, + 0xea, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x09, 0x03, 0xbd, 0x44, 0xbb, 0x1a, 0x00, 0x00, } func (m *EventCreateBucket) Marshal() (dAtA []byte, err error) { @@ -2758,6 +2845,13 @@ func (m *EventCreateGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Extra) > 0 { + i -= len(m.Extra) + copy(dAtA[i:], m.Extra) + i = encodeVarintEvents(dAtA, i, uint64(len(m.Extra))) + i-- + dAtA[i] = 0x32 + } if len(m.Members) > 0 { for iNdEx := len(m.Members) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Members[iNdEx]) @@ -2972,6 +3066,67 @@ func (m *EventUpdateGroupMember) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +func (m *EventUpdateGroupExtra) 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 *EventUpdateGroupExtra) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EventUpdateGroupExtra) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Extra) > 0 { + i -= len(m.Extra) + copy(dAtA[i:], m.Extra) + i = encodeVarintEvents(dAtA, i, uint64(len(m.Extra))) + i-- + dAtA[i] = 0x2a + } + { + size := m.GroupId.Size() + i -= size + if _, err := m.GroupId.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintEvents(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + if len(m.GroupName) > 0 { + i -= len(m.GroupName) + copy(dAtA[i:], m.GroupName) + i = encodeVarintEvents(dAtA, i, uint64(len(m.GroupName))) + i-- + dAtA[i] = 0x1a + } + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintEvents(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0x12 + } + if len(m.Operator) > 0 { + i -= len(m.Operator) + copy(dAtA[i:], m.Operator) + i = encodeVarintEvents(dAtA, i, uint64(len(m.Operator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *EventMirrorBucket) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3722,6 +3877,10 @@ func (m *EventCreateGroup) Size() (n int) { n += 1 + l + sovEvents(uint64(l)) } } + l = len(m.Extra) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } return n } @@ -3802,6 +3961,33 @@ func (m *EventUpdateGroupMember) Size() (n int) { return n } +func (m *EventUpdateGroupExtra) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Operator) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + l = len(m.GroupName) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + l = m.GroupId.Size() + n += 1 + l + sovEvents(uint64(l)) + l = len(m.Extra) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + return n +} + func (m *EventMirrorBucket) Size() (n int) { if m == nil { return 0 @@ -7043,6 +7229,38 @@ func (m *EventCreateGroup) Unmarshal(dAtA []byte) error { } m.Members = append(m.Members, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Extra", 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.Extra = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipEvents(dAtA[iNdEx:]) @@ -7636,6 +7854,218 @@ func (m *EventUpdateGroupMember) Unmarshal(dAtA []byte) error { } return nil } +func (m *EventUpdateGroupExtra) 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: EventUpdateGroupExtra: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EventUpdateGroupExtra: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Operator", 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.Operator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GroupName", 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.GroupName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GroupId", 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.GroupId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Extra", 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.Extra = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + 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 (m *EventMirrorBucket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/x/storage/types/message.go b/x/storage/types/message.go index f8d792a4a..c096e1ce5 100644 --- a/x/storage/types/message.go +++ b/x/storage/types/message.go @@ -42,8 +42,11 @@ const ( TypeMsgDeleteGroup = "delete_group" TypeMsgLeaveGroup = "leave_group" TypeMsgUpdateGroupMember = "update_group_member" + TypeMsgUpdateGroupExtra = "update_group_extra" TypeMsgMirrorGroup = "mirror_group" + MaxGroupExtraInfoLimit = 512 + // For permission policy TypeMsgPutPolicy = "put_policy" TypeMsgDeletePolicy = "delete_policy" @@ -76,6 +79,7 @@ var ( _ sdk.Msg = &MsgDeleteGroup{} _ sdk.Msg = &MsgLeaveGroup{} _ sdk.Msg = &MsgUpdateGroupMember{} + _ sdk.Msg = &MsgUpdateGroupExtra{} _ sdk.Msg = &MsgMirrorGroup{} // For permission policy @@ -846,7 +850,7 @@ func (msg *MsgUpdateObjectInfo) ValidateBasic() error { return nil } -func NewMsgCreateGroup(creator sdk.AccAddress, groupName string, membersAcc []sdk.AccAddress) *MsgCreateGroup { +func NewMsgCreateGroup(creator sdk.AccAddress, groupName string, membersAcc []sdk.AccAddress, extra string) *MsgCreateGroup { var members []string for _, member := range membersAcc { members = append(members, member.String()) @@ -855,6 +859,7 @@ func NewMsgCreateGroup(creator sdk.AccAddress, groupName string, membersAcc []sd Creator: creator.String(), GroupName: groupName, Members: members, + Extra: extra, } } @@ -1072,6 +1077,63 @@ func (msg *MsgUpdateGroupMember) ValidateBasic() error { return nil } +func NewMsgUpdateGroupExtra(operator sdk.AccAddress, groupOwner sdk.AccAddress, groupName, extra string) *MsgUpdateGroupExtra { + return &MsgUpdateGroupExtra{ + Operator: operator.String(), + GroupOwner: groupOwner.String(), + GroupName: groupName, + Extra: extra, + } +} + +// Route implements the sdk.Msg interface. +func (msg *MsgUpdateGroupExtra) Route() string { + return RouterKey +} + +// Type implements the sdk.Msg interface. +func (msg *MsgUpdateGroupExtra) Type() string { + return TypeMsgUpdateGroupExtra +} + +// GetSigners implements the sdk.Msg interface. +func (msg *MsgUpdateGroupExtra) GetSigners() []sdk.AccAddress { + creator, err := sdk.AccAddressFromHexUnsafe(msg.Operator) + if err != nil { + panic(err) + } + return []sdk.AccAddress{creator} +} + +// GetSignBytes returns the message bytes to sign over. +func (msg *MsgUpdateGroupExtra) GetSignBytes() []byte { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +// ValidateBasic implements the sdk.Msg interface. +func (msg *MsgUpdateGroupExtra) ValidateBasic() error { + _, err := sdk.AccAddressFromHexUnsafe(msg.Operator) + if err != nil { + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid operator address (%s)", err) + } + + _, err = sdk.AccAddressFromHexUnsafe(msg.GroupOwner) + if err != nil { + return errors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid group owner address (%s)", err) + } + + err = s3util.CheckValidGroupName(msg.GroupName) + if err != nil { + return err + } + if len(msg.Extra) > MaxGroupExtraInfoLimit { + return errors.Wrapf(ErrInvalidParameter, "extra is too long with length %d", len(msg.Extra)) + } + + return nil +} + func NewMsgPutPolicy(operator sdk.AccAddress, resource string, principal *permtypes.Principal, statements []*permtypes.Statement, expirationTime *time.Time) *MsgPutPolicy { return &MsgPutPolicy{ diff --git a/x/storage/types/message_test.go b/x/storage/types/message_test.go index 5d064aa34..80530bc0c 100644 --- a/x/storage/types/message_test.go +++ b/x/storage/types/message_test.go @@ -1,6 +1,7 @@ package types import ( + "strings" "testing" "cosmossdk.io/math" @@ -522,6 +523,45 @@ func TestMsgUpdateGroupMember_ValidateBasic(t *testing.T) { } } +func TestMsgUpdateGroupExtra_ValidateBasic(t *testing.T) { + + tests := []struct { + name string + msg MsgUpdateGroupExtra + err error + }{ + { + name: "normal", + msg: MsgUpdateGroupExtra{ + Operator: sample.AccAddress(), + GroupOwner: sample.AccAddress(), + GroupName: testGroupName, + Extra: "testExtra", + }, + }, + { + name: "extra field is too long", + msg: MsgUpdateGroupExtra{ + Operator: sample.AccAddress(), + GroupOwner: sample.AccAddress(), + GroupName: testGroupName, + Extra: strings.Repeat("abcdefg", 80), + }, + err: ErrInvalidParameter, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + err := tt.msg.ValidateBasic() + if tt.err != nil { + require.ErrorIs(t, err, tt.err) + return + } + require.NoError(t, err) + }) + } +} + func TestMsgPutPolicy_ValidateBasic(t *testing.T) { tests := []struct { name string diff --git a/x/storage/types/tx.pb.go b/x/storage/types/tx.pb.go index ee695c6d6..f486dc476 100644 --- a/x/storage/types/tx.pb.go +++ b/x/storage/types/tx.pb.go @@ -1079,6 +1079,8 @@ type MsgCreateGroup struct { GroupName string `protobuf:"bytes,2,opt,name=group_name,json=groupName,proto3" json:"group_name,omitempty"` // member_request defines a list of member which to be add or remove Members []string `protobuf:"bytes,3,rep,name=members,proto3" json:"members,omitempty"` + // extra defines extra info for the group + Extra string `protobuf:"bytes,4,opt,name=extra,proto3" json:"extra,omitempty"` } func (m *MsgCreateGroup) Reset() { *m = MsgCreateGroup{} } @@ -1135,6 +1137,13 @@ func (m *MsgCreateGroup) GetMembers() []string { return nil } +func (m *MsgCreateGroup) GetExtra() string { + if m != nil { + return m.Extra + } + return "" +} + type MsgCreateGroupResponse struct { GroupId Uint `protobuf:"bytes,1,opt,name=group_id,json=groupId,proto3,customtype=Uint" json:"group_id"` } @@ -1379,6 +1388,114 @@ func (m *MsgUpdateGroupMemberResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateGroupMemberResponse proto.InternalMessageInfo +type MsgUpdateGroupExtra struct { + // operator defines the account address of the operator who has the UpdateGroupMember permission of the group. + Operator string `protobuf:"bytes,1,opt,name=operator,proto3" json:"operator,omitempty"` + // group_owner defines the account address of the group owner + GroupOwner string `protobuf:"bytes,2,opt,name=group_owner,json=groupOwner,proto3" json:"group_owner,omitempty"` + // group_name defines the name of the group which to be updated + GroupName string `protobuf:"bytes,3,opt,name=group_name,json=groupName,proto3" json:"group_name,omitempty"` + // extra defines extra info for the group to update + Extra string `protobuf:"bytes,4,opt,name=Extra,proto3" json:"Extra,omitempty"` +} + +func (m *MsgUpdateGroupExtra) Reset() { *m = MsgUpdateGroupExtra{} } +func (m *MsgUpdateGroupExtra) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateGroupExtra) ProtoMessage() {} +func (*MsgUpdateGroupExtra) Descriptor() ([]byte, []int) { + return fileDescriptor_ddb71b028305a3cc, []int{24} +} +func (m *MsgUpdateGroupExtra) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUpdateGroupExtra) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUpdateGroupExtra.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 *MsgUpdateGroupExtra) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateGroupExtra.Merge(m, src) +} +func (m *MsgUpdateGroupExtra) XXX_Size() int { + return m.Size() +} +func (m *MsgUpdateGroupExtra) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateGroupExtra.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUpdateGroupExtra proto.InternalMessageInfo + +func (m *MsgUpdateGroupExtra) GetOperator() string { + if m != nil { + return m.Operator + } + return "" +} + +func (m *MsgUpdateGroupExtra) GetGroupOwner() string { + if m != nil { + return m.GroupOwner + } + return "" +} + +func (m *MsgUpdateGroupExtra) GetGroupName() string { + if m != nil { + return m.GroupName + } + return "" +} + +func (m *MsgUpdateGroupExtra) GetExtra() string { + if m != nil { + return m.Extra + } + return "" +} + +type MsgUpdateGroupExtraResponse struct { +} + +func (m *MsgUpdateGroupExtraResponse) Reset() { *m = MsgUpdateGroupExtraResponse{} } +func (m *MsgUpdateGroupExtraResponse) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateGroupExtraResponse) ProtoMessage() {} +func (*MsgUpdateGroupExtraResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_ddb71b028305a3cc, []int{25} +} +func (m *MsgUpdateGroupExtraResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUpdateGroupExtraResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUpdateGroupExtraResponse.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 *MsgUpdateGroupExtraResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateGroupExtraResponse.Merge(m, src) +} +func (m *MsgUpdateGroupExtraResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgUpdateGroupExtraResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateGroupExtraResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUpdateGroupExtraResponse proto.InternalMessageInfo + type MsgLeaveGroup struct { // member defines the account address of the member who want to leave the group Member string `protobuf:"bytes,1,opt,name=member,proto3" json:"member,omitempty"` @@ -1392,7 +1509,7 @@ func (m *MsgLeaveGroup) Reset() { *m = MsgLeaveGroup{} } func (m *MsgLeaveGroup) String() string { return proto.CompactTextString(m) } func (*MsgLeaveGroup) ProtoMessage() {} func (*MsgLeaveGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{24} + return fileDescriptor_ddb71b028305a3cc, []int{26} } func (m *MsgLeaveGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1449,7 +1566,7 @@ func (m *MsgLeaveGroupResponse) Reset() { *m = MsgLeaveGroupResponse{} } func (m *MsgLeaveGroupResponse) String() string { return proto.CompactTextString(m) } func (*MsgLeaveGroupResponse) ProtoMessage() {} func (*MsgLeaveGroupResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{25} + return fileDescriptor_ddb71b028305a3cc, []int{27} } func (m *MsgLeaveGroupResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1498,7 +1615,7 @@ func (m *MsgUpdateBucketInfo) Reset() { *m = MsgUpdateBucketInfo{} } func (m *MsgUpdateBucketInfo) String() string { return proto.CompactTextString(m) } func (*MsgUpdateBucketInfo) ProtoMessage() {} func (*MsgUpdateBucketInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{26} + return fileDescriptor_ddb71b028305a3cc, []int{28} } func (m *MsgUpdateBucketInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1569,7 +1686,7 @@ func (m *MsgUpdateBucketInfoResponse) Reset() { *m = MsgUpdateBucketInfo func (m *MsgUpdateBucketInfoResponse) String() string { return proto.CompactTextString(m) } func (*MsgUpdateBucketInfoResponse) ProtoMessage() {} func (*MsgUpdateBucketInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{27} + return fileDescriptor_ddb71b028305a3cc, []int{29} } func (m *MsgUpdateBucketInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1611,7 +1728,7 @@ func (m *MsgCancelCreateObject) Reset() { *m = MsgCancelCreateObject{} } func (m *MsgCancelCreateObject) String() string { return proto.CompactTextString(m) } func (*MsgCancelCreateObject) ProtoMessage() {} func (*MsgCancelCreateObject) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{28} + return fileDescriptor_ddb71b028305a3cc, []int{30} } func (m *MsgCancelCreateObject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1668,7 +1785,7 @@ func (m *MsgCancelCreateObjectResponse) Reset() { *m = MsgCancelCreateOb func (m *MsgCancelCreateObjectResponse) String() string { return proto.CompactTextString(m) } func (*MsgCancelCreateObjectResponse) ProtoMessage() {} func (*MsgCancelCreateObjectResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{29} + return fileDescriptor_ddb71b028305a3cc, []int{31} } func (m *MsgCancelCreateObjectResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1715,7 +1832,7 @@ func (m *MsgPutPolicy) Reset() { *m = MsgPutPolicy{} } func (m *MsgPutPolicy) String() string { return proto.CompactTextString(m) } func (*MsgPutPolicy) ProtoMessage() {} func (*MsgPutPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{30} + return fileDescriptor_ddb71b028305a3cc, []int{32} } func (m *MsgPutPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1787,7 +1904,7 @@ func (m *MsgPutPolicyResponse) Reset() { *m = MsgPutPolicyResponse{} } func (m *MsgPutPolicyResponse) String() string { return proto.CompactTextString(m) } func (*MsgPutPolicyResponse) ProtoMessage() {} func (*MsgPutPolicyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{31} + return fileDescriptor_ddb71b028305a3cc, []int{33} } func (m *MsgPutPolicyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1829,7 +1946,7 @@ func (m *MsgDeletePolicy) Reset() { *m = MsgDeletePolicy{} } func (m *MsgDeletePolicy) String() string { return proto.CompactTextString(m) } func (*MsgDeletePolicy) ProtoMessage() {} func (*MsgDeletePolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{32} + return fileDescriptor_ddb71b028305a3cc, []int{34} } func (m *MsgDeletePolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1887,7 +2004,7 @@ func (m *MsgDeletePolicyResponse) Reset() { *m = MsgDeletePolicyResponse func (m *MsgDeletePolicyResponse) String() string { return proto.CompactTextString(m) } func (*MsgDeletePolicyResponse) ProtoMessage() {} func (*MsgDeletePolicyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{33} + return fileDescriptor_ddb71b028305a3cc, []int{35} } func (m *MsgDeletePolicyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1931,7 +2048,7 @@ func (m *MsgMirrorObject) Reset() { *m = MsgMirrorObject{} } func (m *MsgMirrorObject) String() string { return proto.CompactTextString(m) } func (*MsgMirrorObject) ProtoMessage() {} func (*MsgMirrorObject) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{34} + return fileDescriptor_ddb71b028305a3cc, []int{36} } func (m *MsgMirrorObject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1988,7 +2105,7 @@ func (m *MsgMirrorObjectResponse) Reset() { *m = MsgMirrorObjectResponse func (m *MsgMirrorObjectResponse) String() string { return proto.CompactTextString(m) } func (*MsgMirrorObjectResponse) ProtoMessage() {} func (*MsgMirrorObjectResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{35} + return fileDescriptor_ddb71b028305a3cc, []int{37} } func (m *MsgMirrorObjectResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2030,7 +2147,7 @@ func (m *MsgMirrorBucket) Reset() { *m = MsgMirrorBucket{} } func (m *MsgMirrorBucket) String() string { return proto.CompactTextString(m) } func (*MsgMirrorBucket) ProtoMessage() {} func (*MsgMirrorBucket) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{36} + return fileDescriptor_ddb71b028305a3cc, []int{38} } func (m *MsgMirrorBucket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2080,7 +2197,7 @@ func (m *MsgUpdateObjectInfoResponse) Reset() { *m = MsgUpdateObjectInfo func (m *MsgUpdateObjectInfoResponse) String() string { return proto.CompactTextString(m) } func (*MsgUpdateObjectInfoResponse) ProtoMessage() {} func (*MsgUpdateObjectInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{37} + return fileDescriptor_ddb71b028305a3cc, []int{39} } func (m *MsgUpdateObjectInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2125,7 +2242,7 @@ func (m *MsgUpdateObjectInfo) Reset() { *m = MsgUpdateObjectInfo{} } func (m *MsgUpdateObjectInfo) String() string { return proto.CompactTextString(m) } func (*MsgUpdateObjectInfo) ProtoMessage() {} func (*MsgUpdateObjectInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{38} + return fileDescriptor_ddb71b028305a3cc, []int{40} } func (m *MsgUpdateObjectInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2189,7 +2306,7 @@ func (m *MsgMirrorBucketResponse) Reset() { *m = MsgMirrorBucketResponse func (m *MsgMirrorBucketResponse) String() string { return proto.CompactTextString(m) } func (*MsgMirrorBucketResponse) ProtoMessage() {} func (*MsgMirrorBucketResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{39} + return fileDescriptor_ddb71b028305a3cc, []int{41} } func (m *MsgMirrorBucketResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2231,7 +2348,7 @@ func (m *MsgMirrorGroup) Reset() { *m = MsgMirrorGroup{} } func (m *MsgMirrorGroup) String() string { return proto.CompactTextString(m) } func (*MsgMirrorGroup) ProtoMessage() {} func (*MsgMirrorGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{40} + return fileDescriptor_ddb71b028305a3cc, []int{42} } func (m *MsgMirrorGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2281,7 +2398,7 @@ func (m *MsgMirrorGroupResponse) Reset() { *m = MsgMirrorGroupResponse{} func (m *MsgMirrorGroupResponse) String() string { return proto.CompactTextString(m) } func (*MsgMirrorGroupResponse) ProtoMessage() {} func (*MsgMirrorGroupResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{41} + return fileDescriptor_ddb71b028305a3cc, []int{43} } func (m *MsgMirrorGroupResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2324,7 +2441,7 @@ func (m *MsgUpdateParams) Reset() { *m = MsgUpdateParams{} } func (m *MsgUpdateParams) String() string { return proto.CompactTextString(m) } func (*MsgUpdateParams) ProtoMessage() {} func (*MsgUpdateParams) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{42} + return fileDescriptor_ddb71b028305a3cc, []int{44} } func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2376,7 +2493,7 @@ func (m *MsgUpdateParamsResponse) Reset() { *m = MsgUpdateParamsResponse func (m *MsgUpdateParamsResponse) String() string { return proto.CompactTextString(m) } func (*MsgUpdateParamsResponse) ProtoMessage() {} func (*MsgUpdateParamsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ddb71b028305a3cc, []int{43} + return fileDescriptor_ddb71b028305a3cc, []int{45} } func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2430,6 +2547,8 @@ func init() { proto.RegisterType((*MsgDeleteGroupResponse)(nil), "greenfield.storage.MsgDeleteGroupResponse") proto.RegisterType((*MsgUpdateGroupMember)(nil), "greenfield.storage.MsgUpdateGroupMember") proto.RegisterType((*MsgUpdateGroupMemberResponse)(nil), "greenfield.storage.MsgUpdateGroupMemberResponse") + proto.RegisterType((*MsgUpdateGroupExtra)(nil), "greenfield.storage.MsgUpdateGroupExtra") + proto.RegisterType((*MsgUpdateGroupExtraResponse)(nil), "greenfield.storage.MsgUpdateGroupExtraResponse") proto.RegisterType((*MsgLeaveGroup)(nil), "greenfield.storage.MsgLeaveGroup") proto.RegisterType((*MsgLeaveGroupResponse)(nil), "greenfield.storage.MsgLeaveGroupResponse") proto.RegisterType((*MsgUpdateBucketInfo)(nil), "greenfield.storage.MsgUpdateBucketInfo") @@ -2455,126 +2574,130 @@ func init() { func init() { proto.RegisterFile("greenfield/storage/tx.proto", fileDescriptor_ddb71b028305a3cc) } var fileDescriptor_ddb71b028305a3cc = []byte{ - // 1904 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4f, 0x8f, 0xdb, 0xc6, - 0x15, 0x37, 0x57, 0xf2, 0x7a, 0xf5, 0xb4, 0xde, 0xb5, 0x99, 0x8d, 0x57, 0x91, 0x63, 0x49, 0x56, - 0x80, 0x54, 0x89, 0x6b, 0xc9, 0xd9, 0x06, 0x46, 0xba, 0x87, 0xa0, 0x5e, 0x07, 0x2d, 0x16, 0xb5, - 0xe2, 0x0d, 0x65, 0xa7, 0x40, 0x8a, 0x42, 0xa1, 0xc8, 0x31, 0x97, 0x89, 0xc8, 0x61, 0x67, 0x28, - 0xdb, 0xca, 0xb1, 0x9f, 0x20, 0x40, 0x7b, 0xe8, 0xa1, 0x08, 0x50, 0xa0, 0x05, 0x7a, 0x6b, 0x50, - 0xe4, 0xd6, 0x43, 0x8b, 0x02, 0x05, 0x7c, 0x34, 0x72, 0x2a, 0x7a, 0x70, 0x03, 0xfb, 0xd0, 0xaf, - 0x11, 0x70, 0x66, 0x48, 0x0e, 0x29, 0xfe, 0x51, 0xd6, 0xbb, 0x88, 0x4f, 0xbb, 0x9c, 0xf9, 0xcd, - 0x9b, 0xf7, 0xff, 0xbd, 0x79, 0x10, 0x5c, 0xb4, 0x08, 0x42, 0xee, 0x3d, 0x1b, 0x4d, 0xcd, 0x01, - 0xf5, 0x31, 0xd1, 0x2d, 0x34, 0xf0, 0x1f, 0xf6, 0x3d, 0x82, 0x7d, 0xac, 0xaa, 0xf1, 0x66, 0x5f, - 0x6c, 0x36, 0xb7, 0x0d, 0x4c, 0x1d, 0x4c, 0x07, 0x0e, 0xb5, 0x06, 0xf7, 0xdf, 0x0a, 0xfe, 0x70, - 0x70, 0xf3, 0x15, 0xbe, 0x31, 0x66, 0x5f, 0x03, 0xfe, 0x21, 0xb6, 0xb6, 0x2c, 0x6c, 0x61, 0xbe, - 0x1e, 0xfc, 0x27, 0x56, 0xdb, 0x16, 0xc6, 0xd6, 0x14, 0x0d, 0xd8, 0xd7, 0x64, 0x76, 0x6f, 0xe0, - 0xdb, 0x0e, 0xa2, 0xbe, 0xee, 0x78, 0x11, 0x20, 0xe6, 0xcd, 0xc0, 0x8e, 0x83, 0xdd, 0xc1, 0x03, - 0xa2, 0x7b, 0x1e, 0x22, 0x02, 0xd0, 0x95, 0x00, 0x1e, 0x22, 0x8e, 0x4d, 0xa9, 0x8d, 0x5d, 0x81, - 0xcd, 0x20, 0x12, 0x0a, 0x58, 0x0a, 0xf0, 0x74, 0xa2, 0x3b, 0x82, 0xfb, 0xee, 0x3f, 0x2a, 0xb0, - 0x39, 0xa4, 0xd6, 0x4d, 0x82, 0x74, 0x1f, 0xed, 0xcd, 0x8c, 0x4f, 0x91, 0xaf, 0xee, 0xc0, 0x19, - 0x23, 0xf8, 0xc6, 0xa4, 0xa1, 0x74, 0x94, 0x5e, 0x6d, 0xaf, 0xf1, 0xf5, 0x57, 0x57, 0xb7, 0x84, - 0xd0, 0x37, 0x4c, 0x93, 0x20, 0x4a, 0x47, 0x3e, 0xb1, 0x5d, 0x4b, 0x0b, 0x81, 0x6a, 0x1b, 0xea, - 0x13, 0x76, 0x7a, 0xec, 0xea, 0x0e, 0x6a, 0xac, 0x04, 0xe7, 0x34, 0xe0, 0x4b, 0xef, 0xeb, 0x0e, - 0x52, 0xf7, 0x00, 0xee, 0xdb, 0xd4, 0x9e, 0xd8, 0x53, 0xdb, 0x9f, 0x37, 0x2a, 0x1d, 0xa5, 0xb7, - 0xb1, 0xd3, 0xed, 0x2f, 0xda, 0xa0, 0xff, 0x61, 0x84, 0xba, 0x33, 0xf7, 0x90, 0x26, 0x9d, 0x52, - 0x6f, 0xc0, 0xa6, 0xa7, 0xcf, 0x1d, 0xe4, 0xfa, 0x63, 0x9d, 0xb3, 0xd1, 0xa8, 0x96, 0x30, 0xb8, - 0x21, 0x0e, 0x88, 0x55, 0xf5, 0xa7, 0xa0, 0x7a, 0xc4, 0x76, 0x74, 0x32, 0x1f, 0x53, 0x2f, 0xa2, - 0xb2, 0x5a, 0x42, 0xe5, 0x9c, 0x38, 0x33, 0xf2, 0x42, 0x3a, 0xb7, 0xe0, 0x25, 0x99, 0x8e, 0xe7, - 0x11, 0x7c, 0x5f, 0x9f, 0x36, 0xce, 0x74, 0x94, 0x5e, 0x7d, 0xe7, 0xd5, 0x2c, 0xb9, 0x6e, 0x08, - 0x8c, 0x76, 0x3e, 0x26, 0x26, 0x96, 0xd4, 0x1f, 0x82, 0x6a, 0x1c, 0xea, 0xc4, 0x42, 0xe6, 0x98, - 0x20, 0xdd, 0x1c, 0xff, 0x7a, 0x86, 0x7d, 0xbd, 0xb1, 0xd6, 0x51, 0x7a, 0x55, 0xed, 0x9c, 0xd8, - 0xd1, 0x90, 0x6e, 0x7e, 0x10, 0xac, 0xef, 0xae, 0xff, 0xe6, 0xff, 0x5f, 0xbe, 0x19, 0x6a, 0xbe, - 0x3b, 0x82, 0xed, 0x94, 0x01, 0x35, 0x44, 0x3d, 0xec, 0x52, 0xa4, 0xbe, 0x03, 0x35, 0x61, 0x14, - 0xdb, 0x14, 0xa6, 0xbc, 0xf8, 0xe8, 0x49, 0xfb, 0xd4, 0x7f, 0x9f, 0xb4, 0xab, 0x77, 0x6d, 0xd7, - 0xff, 0xfa, 0xab, 0xab, 0x75, 0x21, 0x6f, 0xf0, 0xa9, 0xad, 0x71, 0xf4, 0xbe, 0xd9, 0x7d, 0xc0, - 0xbc, 0xe2, 0x3d, 0x34, 0x45, 0x91, 0x57, 0xbc, 0x0d, 0x6b, 0xd8, 0x43, 0x64, 0x29, 0xb7, 0x88, - 0x90, 0xa5, 0x7e, 0xb1, 0x7b, 0x36, 0x10, 0x26, 0xc2, 0x77, 0x5f, 0x61, 0xd2, 0xc8, 0x17, 0x87, - 0xd2, 0x74, 0x7f, 0xa7, 0xc0, 0x56, 0xb0, 0x67, 0x53, 0x03, 0xbb, 0xbe, 0xed, 0xce, 0x4e, 0x96, - 0x33, 0xf5, 0x02, 0xac, 0x12, 0xa4, 0x53, 0xec, 0x32, 0x6f, 0xad, 0x69, 0xe2, 0x2b, 0xcd, 0x71, - 0x0b, 0x5e, 0xcd, 0xe2, 0x2a, 0x62, 0xfb, 0x5f, 0x55, 0x29, 0xc2, 0x6e, 0x4f, 0x3e, 0x41, 0xc6, - 0x09, 0x45, 0x58, 0x1b, 0xea, 0x98, 0x91, 0xe7, 0x00, 0xce, 0x34, 0xf0, 0x25, 0x06, 0xb8, 0x0c, - 0xeb, 0x9e, 0x3e, 0x9f, 0x62, 0xdd, 0x1c, 0x53, 0xfb, 0x33, 0xc4, 0x62, 0xa7, 0xaa, 0xd5, 0xc5, - 0xda, 0xc8, 0xfe, 0x2c, 0x1d, 0xa5, 0xa7, 0x8f, 0x14, 0xa5, 0x97, 0x61, 0x3d, 0x50, 0x45, 0x10, - 0xa5, 0xfe, 0xdc, 0x43, 0x3c, 0xb8, 0xb4, 0xba, 0x58, 0x0b, 0xe0, 0xc7, 0x1c, 0x3d, 0x6f, 0xc0, - 0x39, 0xf4, 0xd0, 0x0b, 0x04, 0x37, 0x0e, 0x91, 0xf1, 0x29, 0x9d, 0x39, 0xb4, 0xb1, 0xd6, 0xa9, - 0xf4, 0xd6, 0xb5, 0x4d, 0xbe, 0x7e, 0x33, 0x5c, 0x56, 0x7f, 0x0e, 0x9b, 0x04, 0x99, 0x33, 0xd7, - 0xd4, 0x5d, 0x63, 0xce, 0xd9, 0xab, 0xe5, 0x0b, 0xa9, 0x45, 0x50, 0x26, 0xe4, 0x06, 0x49, 0x7c, - 0xab, 0xbf, 0x84, 0x4b, 0xe2, 0x5e, 0x8a, 0x0c, 0xec, 0x9a, 0xc9, 0xa4, 0x82, 0x68, 0x03, 0x3a, - 0x95, 0x42, 0xdb, 0x36, 0xf9, 0xf1, 0x51, 0x78, 0x3a, 0x4a, 0x2f, 0x88, 0x16, 0x04, 0x39, 0xf7, - 0x21, 0x39, 0xc8, 0x85, 0xd9, 0x97, 0x0c, 0x72, 0x8e, 0xde, 0x37, 0xbb, 0x5f, 0xac, 0xc0, 0xd9, - 0x21, 0xb5, 0x46, 0x48, 0x9f, 0x0a, 0xbf, 0x3c, 0xa1, 0x48, 0x2a, 0xf5, 0xcc, 0xf7, 0xe1, 0x42, - 0x8e, 0x0a, 0xab, 0x25, 0x2a, 0xdc, 0xa2, 0x19, 0xca, 0x53, 0xaf, 0xc3, 0x76, 0x82, 0x1e, 0xb5, - 0x2d, 0x57, 0xf7, 0x67, 0x04, 0xd1, 0xc6, 0x69, 0xe6, 0x18, 0x2f, 0x4b, 0xc7, 0x46, 0xd1, 0x66, - 0x3a, 0xb4, 0xb7, 0xe1, 0xe5, 0x84, 0x7e, 0xa2, 0x98, 0xfe, 0x83, 0x02, 0x2f, 0x0d, 0xa9, 0xa5, - 0xa1, 0x4f, 0x98, 0xf9, 0xbe, 0x6f, 0xfd, 0xa5, 0xf9, 0xbe, 0x04, 0x17, 0x33, 0xb8, 0x8b, 0xb8, - 0xff, 0x2b, 0xb7, 0xfb, 0x4d, 0xec, 0xcd, 0x05, 0xdf, 0xcd, 0x34, 0xdf, 0x12, 0x77, 0xaf, 0xc3, - 0x26, 0x25, 0xc6, 0x78, 0x91, 0xc3, 0xb3, 0x94, 0x18, 0x7b, 0x31, 0x93, 0xaf, 0xc3, 0xa6, 0x49, - 0xfd, 0x04, 0x8e, 0x33, 0x7a, 0xd6, 0xa4, 0x7e, 0x12, 0x17, 0xd0, 0x93, 0x05, 0xaa, 0x46, 0xf4, - 0x6e, 0xc7, 0x3e, 0x21, 0xe8, 0xc9, 0xb8, 0xd3, 0x11, 0x3d, 0x09, 0x37, 0x82, 0xed, 0x00, 0x97, - 0x95, 0x4f, 0x56, 0x97, 0xc8, 0x27, 0x5b, 0x26, 0xf5, 0x0f, 0xd2, 0x29, 0x25, 0xad, 0xd0, 0x0f, - 0x98, 0x23, 0xc4, 0x0a, 0x3b, 0x86, 0xe0, 0xfb, 0xbd, 0x22, 0x95, 0xd8, 0x17, 0xcb, 0x7d, 0xe4, - 0x1a, 0x9c, 0x72, 0x9d, 0xc7, 0x0b, 0x35, 0xf8, 0x64, 0x59, 0xdf, 0x05, 0x88, 0xf4, 0x4b, 0x1b, - 0x15, 0x96, 0x0c, 0x0a, 0x15, 0x5c, 0x0b, 0x15, 0x4c, 0xa5, 0xfa, 0x5d, 0xfd, 0x4e, 0xf5, 0x3b, - 0x25, 0xf2, 0x9f, 0x15, 0xd8, 0x88, 0x72, 0xef, 0xcf, 0x08, 0x9e, 0x79, 0x47, 0x2a, 0xdf, 0x97, - 0x00, 0xac, 0xe0, 0xb0, 0x2c, 0x69, 0x8d, 0xad, 0x30, 0x41, 0x77, 0xe0, 0x8c, 0x83, 0x9c, 0x09, - 0x22, 0xa1, 0x94, 0x05, 0x24, 0x05, 0x30, 0x55, 0x22, 0x0e, 0xe0, 0x42, 0x92, 0xcd, 0xc8, 0x49, - 0xaf, 0xc3, 0x1a, 0xbf, 0x7a, 0x39, 0x1f, 0x3d, 0xc3, 0xc0, 0xfb, 0x66, 0xd7, 0x67, 0x82, 0x73, - 0x3f, 0xe0, 0x82, 0x1f, 0xcd, 0xca, 0xc5, 0xa2, 0xa7, 0xed, 0xd1, 0x60, 0x72, 0x48, 0xb7, 0x46, - 0x96, 0xf8, 0xfb, 0x0a, 0x73, 0xbe, 0xbb, 0x9e, 0x19, 0x8a, 0x38, 0x64, 0x9a, 0x38, 0x22, 0x5b, - 0x3f, 0x86, 0x3a, 0x67, 0x0b, 0x3f, 0x70, 0x11, 0xe1, 0x7c, 0x15, 0x1c, 0xe4, 0x32, 0xdc, 0x0e, - 0xb0, 0x29, 0x89, 0x2a, 0x69, 0x63, 0xbe, 0x0b, 0x1b, 0xc2, 0x46, 0x63, 0x1f, 0x07, 0xc5, 0xac, - 0xb4, 0x8c, 0xad, 0x0b, 0xfc, 0x1d, 0x7c, 0xc3, 0x34, 0xd5, 0xf7, 0xe0, 0xbc, 0x74, 0xde, 0x64, - 0xaa, 0x60, 0x85, 0xab, 0x88, 0xc4, 0x66, 0x44, 0x82, 0xeb, 0x2e, 0xdb, 0xcf, 0x17, 0x94, 0x17, - 0x69, 0xf7, 0x2f, 0x0a, 0xab, 0x0a, 0xb7, 0x90, 0x7e, 0x5f, 0x58, 0xfb, 0x1a, 0xac, 0x72, 0x9a, - 0xa5, 0x4a, 0x15, 0xb8, 0x93, 0x53, 0xe9, 0x6e, 0x3d, 0x10, 0x46, 0x5c, 0x23, 0xea, 0x72, 0xcc, - 0x69, 0x9c, 0x9e, 0x56, 0x58, 0x5d, 0xe6, 0x42, 0xf2, 0x9a, 0xb3, 0xef, 0xde, 0xc3, 0x27, 0x95, - 0x9d, 0x6e, 0x65, 0x3e, 0xdb, 0x2a, 0xac, 0xea, 0xb4, 0xe4, 0xaa, 0x23, 0xde, 0xe4, 0x77, 0xf7, - 0x5d, 0xff, 0xfa, 0xdb, 0x1f, 0xea, 0xd3, 0x19, 0x5a, 0x7c, 0xd6, 0x1d, 0xc7, 0xeb, 0xf6, 0x18, - 0xda, 0xf7, 0xec, 0x5e, 0x22, 0xad, 0xd1, 0x48, 0xe3, 0x5f, 0x28, 0xbc, 0x34, 0xea, 0xae, 0x81, - 0xa6, 0x89, 0x37, 0xce, 0x0b, 0x52, 0xcc, 0xda, 0x70, 0x29, 0x93, 0xbf, 0x48, 0x82, 0x7f, 0xae, - 0xc0, 0xfa, 0x90, 0x5a, 0x07, 0x33, 0xff, 0x00, 0x4f, 0x6d, 0x63, 0x7e, 0x44, 0xc6, 0xdf, 0x85, - 0x9a, 0x47, 0x6c, 0xd7, 0xb0, 0x3d, 0x7d, 0xca, 0xd8, 0xae, 0xef, 0x74, 0x64, 0xcd, 0xc7, 0x23, - 0x9c, 0xfe, 0x41, 0x88, 0xd3, 0xe2, 0x23, 0x41, 0x0b, 0x46, 0x10, 0xc5, 0x33, 0x62, 0x84, 0x42, - 0x45, 0xdf, 0xea, 0x4f, 0x00, 0xa8, 0xaf, 0xfb, 0x28, 0x30, 0x35, 0x6f, 0x89, 0xf3, 0x89, 0x8f, - 0x42, 0xa0, 0x26, 0x9d, 0x51, 0x87, 0x10, 0x3c, 0x85, 0x6c, 0xa2, 0xfb, 0x36, 0x76, 0xc7, 0xbe, - 0xed, 0x20, 0xf1, 0xd8, 0x6a, 0xf6, 0xf9, 0xa0, 0xaa, 0x1f, 0x0e, 0xaa, 0xfa, 0x77, 0xc2, 0x41, - 0xd5, 0xde, 0xda, 0xa3, 0x27, 0x6d, 0xe5, 0xf3, 0xff, 0xb5, 0x15, 0x6d, 0x23, 0x3e, 0x1c, 0x6c, - 0xa7, 0x75, 0x7c, 0xc0, 0xf2, 0x72, 0xa4, 0x41, 0xb9, 0x3b, 0xf2, 0xd8, 0x4a, 0x50, 0x79, 0xaa, - 0x4b, 0x74, 0x47, 0x1c, 0xbd, 0x6f, 0x76, 0xff, 0x26, 0x77, 0x47, 0x2f, 0xaa, 0x5d, 0xd2, 0x6a, - 0x18, 0x49, 0x7d, 0xd3, 0xb1, 0x69, 0xe2, 0xdf, 0x5c, 0x13, 0x43, 0x9b, 0x10, 0x4c, 0x9e, 0x2b, - 0xb4, 0xae, 0xc0, 0x8a, 0x6d, 0x8a, 0x9c, 0x5c, 0x78, 0xf9, 0x8a, 0x6d, 0xa6, 0xe3, 0xb0, 0x52, - 0x16, 0x87, 0xd5, 0xe5, 0x9a, 0x4a, 0x59, 0x8c, 0x28, 0x02, 0xff, 0x24, 0x8b, 0xf8, 0x5c, 0x33, - 0x9d, 0x63, 0x15, 0xb1, 0x28, 0x13, 0x72, 0x09, 0x12, 0x99, 0xf0, 0x1b, 0x45, 0xaa, 0x3d, 0xf1, - 0xfe, 0xf7, 0xf6, 0xa6, 0x4e, 0xd6, 0x82, 0xea, 0x71, 0xd4, 0x02, 0xd9, 0x86, 0xa9, 0x29, 0xd7, - 0x1f, 0x79, 0x97, 0xcc, 0xf7, 0x9e, 0xa7, 0x59, 0xfc, 0x4e, 0x26, 0x2c, 0x69, 0x1a, 0x32, 0x3b, - 0x4b, 0x89, 0xc5, 0x88, 0xfb, 0xdf, 0x72, 0x0f, 0xe4, 0xb6, 0x3b, 0x60, 0xf3, 0x71, 0xf5, 0x3a, - 0xd4, 0xf4, 0x99, 0x7f, 0x88, 0x49, 0xa0, 0xbe, 0x32, 0xfe, 0x63, 0xa8, 0xfa, 0x0e, 0xac, 0xf2, - 0x09, 0xbb, 0xc8, 0x36, 0xcd, 0x2c, 0x9d, 0xf3, 0x3b, 0xf6, 0xaa, 0x81, 0x80, 0x9a, 0xc0, 0xef, - 0x6e, 0x04, 0xec, 0xc6, 0x94, 0x84, 0xba, 0x65, 0xa6, 0x42, 0x86, 0x77, 0xbe, 0x3c, 0x0f, 0x95, - 0x21, 0xb5, 0xd4, 0x8f, 0x61, 0x3d, 0x31, 0xba, 0x7f, 0x2d, 0xeb, 0xb2, 0xd4, 0x78, 0xb8, 0x79, - 0x65, 0x09, 0x50, 0x94, 0xb9, 0x3e, 0x86, 0xf5, 0xc4, 0x18, 0x38, 0xef, 0x06, 0x19, 0x94, 0x7b, - 0x43, 0xd6, 0x5c, 0x57, 0x9d, 0xc2, 0xb9, 0x85, 0x86, 0xed, 0x07, 0x39, 0x04, 0xd2, 0xc0, 0xe6, - 0x60, 0x49, 0xa0, 0x2c, 0x4f, 0x22, 0xd1, 0xe4, 0xc9, 0x23, 0x83, 0x72, 0xe5, 0xc9, 0x0a, 0x05, - 0x15, 0xc3, 0xf9, 0xc5, 0x19, 0x75, 0x2f, 0x4f, 0x23, 0x69, 0x64, 0xf3, 0xda, 0xb2, 0x48, 0x59, - 0xa4, 0x44, 0xe7, 0x55, 0xec, 0x04, 0x1c, 0x54, 0xe2, 0x04, 0xa9, 0x31, 0xc7, 0x47, 0x00, 0xd2, - 0x94, 0xeb, 0x72, 0xce, 0xd1, 0x18, 0xd2, 0x7c, 0xa3, 0x14, 0x22, 0x9b, 0x7f, 0x61, 0x8e, 0x96, - 0x67, 0xfe, 0x34, 0x30, 0xd7, 0xfc, 0x79, 0xb3, 0xaf, 0x40, 0x12, 0x69, 0xee, 0x95, 0x27, 0x49, - 0x0c, 0xc9, 0x95, 0x24, 0x63, 0x18, 0x14, 0x85, 0x4a, 0x89, 0x1d, 0x64, 0x50, 0x49, 0xa8, 0xa4, - 0x6e, 0x20, 0xa0, 0x66, 0x74, 0xda, 0xb9, 0x2c, 0x2e, 0x40, 0x9b, 0x6f, 0x2d, 0x0d, 0x5d, 0x0c, - 0x98, 0x12, 0xa9, 0x64, 0x50, 0x49, 0xc0, 0xa4, 0x6e, 0x48, 0x06, 0x8c, 0xb8, 0x66, 0x89, 0x80, - 0x11, 0x77, 0x5d, 0x5b, 0x16, 0xb9, 0x98, 0x71, 0xa4, 0x32, 0x5d, 0x9c, 0x71, 0x62, 0x60, 0x49, - 0xc6, 0x59, 0x6c, 0x0c, 0xd4, 0x5f, 0x41, 0x5d, 0x1e, 0x1e, 0x75, 0x0b, 0x03, 0x8f, 0x61, 0x9a, - 0x6f, 0x96, 0x63, 0x64, 0xf2, 0xf2, 0x88, 0xa6, 0x5b, 0xe8, 0x4f, 0xc5, 0xe4, 0x33, 0x86, 0x2e, - 0x81, 0x71, 0x16, 0x07, 0x2e, 0xbd, 0x42, 0x1d, 0x48, 0xc8, 0x5c, 0xe3, 0xe4, 0xce, 0x21, 0x82, - 0x08, 0x95, 0x66, 0x10, 0x79, 0x11, 0x1a, 0x43, 0x72, 0x23, 0x74, 0x71, 0x3e, 0x10, 0xe8, 0x4a, - 0xee, 0x50, 0xba, 0x85, 0x5e, 0x5a, 0xac, 0xab, 0x8c, 0x36, 0x42, 0xfd, 0x05, 0xd4, 0xe2, 0x67, - 0x64, 0x27, 0xe7, 0x60, 0x84, 0x68, 0xf6, 0xca, 0x10, 0x8b, 0x99, 0x45, 0xd0, 0x2e, 0xce, 0x2c, - 0x82, 0xfc, 0x95, 0x25, 0x40, 0xf2, 0x0d, 0x89, 0xee, 0xe7, 0xb5, 0x42, 0xbb, 0x71, 0x50, 0xee, - 0x0d, 0x59, 0x2d, 0xcb, 0xde, 0xfe, 0xa3, 0xa7, 0x2d, 0xe5, 0xf1, 0xd3, 0x96, 0xf2, 0xcd, 0xd3, - 0x96, 0xf2, 0xf9, 0xb3, 0xd6, 0xa9, 0xc7, 0xcf, 0x5a, 0xa7, 0xfe, 0xf3, 0xac, 0x75, 0xea, 0xa3, - 0x81, 0x65, 0xfb, 0x87, 0xb3, 0x49, 0xdf, 0xc0, 0xce, 0x60, 0xe2, 0x4e, 0xae, 0x1a, 0x87, 0xba, - 0xed, 0x0e, 0xa4, 0x5f, 0x2e, 0x3c, 0x8c, 0x7f, 0xbd, 0x31, 0xf7, 0x10, 0x9d, 0xac, 0xb2, 0xc7, - 0xea, 0x8f, 0xbe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x46, 0xe2, 0xa6, 0xe0, 0x21, 0x00, 0x00, + // 1954 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4f, 0x6f, 0x1b, 0xc7, + 0x15, 0xf7, 0x8a, 0x94, 0x2c, 0x3e, 0xca, 0x92, 0xbd, 0x51, 0x2c, 0x86, 0x8e, 0x25, 0x99, 0x01, + 0x12, 0x26, 0xae, 0x49, 0x47, 0x0d, 0x8c, 0x54, 0x87, 0xa0, 0x96, 0x93, 0x16, 0x42, 0xcd, 0x58, + 0x59, 0xda, 0x29, 0x90, 0xa2, 0x60, 0x96, 0xbb, 0xe3, 0xd5, 0x26, 0xdc, 0x9d, 0xed, 0xcc, 0xd2, + 0x36, 0x73, 0xec, 0x27, 0x08, 0xd0, 0x1e, 0x7a, 0x28, 0x0c, 0x14, 0xe8, 0xa1, 0xb7, 0x16, 0x45, + 0x6e, 0x3d, 0xb4, 0x28, 0x50, 0xc0, 0xe8, 0xc9, 0xc8, 0xa9, 0xe8, 0xc1, 0x0d, 0xec, 0x43, 0xbf, + 0x46, 0xb0, 0x33, 0xb3, 0xbb, 0xb3, 0xff, 0x19, 0x59, 0x42, 0x7c, 0xb2, 0x77, 0xe6, 0x37, 0x6f, + 0xde, 0xff, 0xf7, 0xe6, 0x51, 0x70, 0xc1, 0x22, 0x08, 0xb9, 0x77, 0x6d, 0x34, 0x31, 0xfb, 0xd4, + 0xc7, 0x44, 0xb7, 0x50, 0xdf, 0x7f, 0xd0, 0xf3, 0x08, 0xf6, 0xb1, 0xaa, 0xc6, 0x9b, 0x3d, 0xb1, + 0xd9, 0xde, 0x30, 0x30, 0x75, 0x30, 0xed, 0x3b, 0xd4, 0xea, 0xdf, 0x7b, 0x3b, 0xf8, 0x87, 0x83, + 0xdb, 0xaf, 0xf0, 0x8d, 0x11, 0xfb, 0xea, 0xf3, 0x0f, 0xb1, 0xb5, 0x6e, 0x61, 0x0b, 0xf3, 0xf5, + 0xe0, 0x7f, 0x62, 0x75, 0xcb, 0xc2, 0xd8, 0x9a, 0xa0, 0x3e, 0xfb, 0x1a, 0x4f, 0xef, 0xf6, 0x7d, + 0xdb, 0x41, 0xd4, 0xd7, 0x1d, 0x2f, 0x02, 0xc4, 0xbc, 0x19, 0xd8, 0x71, 0xb0, 0xdb, 0xbf, 0x4f, + 0x74, 0xcf, 0x43, 0x44, 0x00, 0x3a, 0x12, 0xc0, 0x43, 0xc4, 0xb1, 0x29, 0xb5, 0xb1, 0x2b, 0xb0, + 0x39, 0x44, 0x42, 0x01, 0x2b, 0x01, 0x9e, 0x4e, 0x74, 0x47, 0x70, 0xdf, 0xf9, 0x7b, 0x0d, 0xd6, + 0x06, 0xd4, 0xba, 0x41, 0x90, 0xee, 0xa3, 0xbd, 0xa9, 0xf1, 0x39, 0xf2, 0xd5, 0x1d, 0x38, 0x6d, + 0x04, 0xdf, 0x98, 0xb4, 0x94, 0x6d, 0xa5, 0xdb, 0xd8, 0x6b, 0x7d, 0xfd, 0xd5, 0x95, 0x75, 0x21, + 0xf4, 0x75, 0xd3, 0x24, 0x88, 0xd2, 0xa1, 0x4f, 0x6c, 0xd7, 0xd2, 0x42, 0xa0, 0xba, 0x05, 0xcd, + 0x31, 0x3b, 0x3d, 0x72, 0x75, 0x07, 0xb5, 0x16, 0x82, 0x73, 0x1a, 0xf0, 0xa5, 0x0f, 0x75, 0x07, + 0xa9, 0x7b, 0x00, 0xf7, 0x6c, 0x6a, 0x8f, 0xed, 0x89, 0xed, 0xcf, 0x5a, 0xb5, 0x6d, 0xa5, 0xbb, + 0xba, 0xd3, 0xe9, 0x65, 0x6d, 0xd0, 0xfb, 0x38, 0x42, 0xdd, 0x9e, 0x79, 0x48, 0x93, 0x4e, 0xa9, + 0xd7, 0x61, 0xcd, 0xd3, 0x67, 0x0e, 0x72, 0xfd, 0x91, 0xce, 0xd9, 0x68, 0xd5, 0x2b, 0x18, 0x5c, + 0x15, 0x07, 0xc4, 0xaa, 0xfa, 0x13, 0x50, 0x3d, 0x62, 0x3b, 0x3a, 0x99, 0x8d, 0xa8, 0x17, 0x51, + 0x59, 0xaa, 0xa0, 0x72, 0x56, 0x9c, 0x19, 0x7a, 0x21, 0x9d, 0x9b, 0xf0, 0x92, 0x4c, 0xc7, 0xf3, + 0x08, 0xbe, 0xa7, 0x4f, 0x5a, 0xa7, 0xb7, 0x95, 0x6e, 0x73, 0xe7, 0xd5, 0x3c, 0xb9, 0xae, 0x0b, + 0x8c, 0x76, 0x2e, 0x26, 0x26, 0x96, 0xd4, 0x1f, 0x80, 0x6a, 0x1c, 0xea, 0xc4, 0x42, 0xe6, 0x88, + 0x20, 0xdd, 0x1c, 0xfd, 0x6a, 0x8a, 0x7d, 0xbd, 0xb5, 0xbc, 0xad, 0x74, 0xeb, 0xda, 0x59, 0xb1, + 0xa3, 0x21, 0xdd, 0xfc, 0x28, 0x58, 0xdf, 0x5d, 0xf9, 0xf5, 0xff, 0xff, 0xf2, 0x56, 0xa8, 0xf9, + 0xce, 0x10, 0x36, 0x52, 0x06, 0xd4, 0x10, 0xf5, 0xb0, 0x4b, 0x91, 0xfa, 0x2e, 0x34, 0x84, 0x51, + 0x6c, 0x53, 0x98, 0xf2, 0xc2, 0xa3, 0x27, 0x5b, 0xa7, 0xfe, 0xfb, 0x64, 0xab, 0x7e, 0xc7, 0x76, + 0xfd, 0xaf, 0xbf, 0xba, 0xd2, 0x14, 0xf2, 0x06, 0x9f, 0xda, 0x32, 0x47, 0xef, 0x9b, 0x9d, 0xfb, + 0xcc, 0x2b, 0xde, 0x47, 0x13, 0x14, 0x79, 0xc5, 0x3b, 0xb0, 0x8c, 0x3d, 0x44, 0xe6, 0x72, 0x8b, + 0x08, 0x59, 0xe9, 0x17, 0xbb, 0x67, 0x02, 0x61, 0x22, 0x7c, 0xe7, 0x15, 0x26, 0x8d, 0x7c, 0x71, + 0x28, 0x4d, 0xe7, 0xb7, 0x0a, 0xac, 0x07, 0x7b, 0x36, 0x35, 0xb0, 0xeb, 0xdb, 0xee, 0xf4, 0x64, + 0x39, 0x53, 0xcf, 0xc3, 0x12, 0x41, 0x3a, 0xc5, 0x2e, 0xf3, 0xd6, 0x86, 0x26, 0xbe, 0xd2, 0x1c, + 0x6f, 0xc2, 0xab, 0x79, 0x5c, 0x45, 0x6c, 0xff, 0xb3, 0x2e, 0x45, 0xd8, 0xad, 0xf1, 0x67, 0xc8, + 0x38, 0xa1, 0x08, 0xdb, 0x82, 0x26, 0x66, 0xe4, 0x39, 0x80, 0x33, 0x0d, 0x7c, 0x89, 0x01, 0x2e, + 0xc1, 0x8a, 0xa7, 0xcf, 0x26, 0x58, 0x37, 0x47, 0xd4, 0xfe, 0x02, 0xb1, 0xd8, 0xa9, 0x6b, 0x4d, + 0xb1, 0x36, 0xb4, 0xbf, 0x48, 0x47, 0xe9, 0xe2, 0x91, 0xa2, 0xf4, 0x12, 0xac, 0x04, 0xaa, 0x08, + 0xa2, 0xd4, 0x9f, 0x79, 0x88, 0x07, 0x97, 0xd6, 0x14, 0x6b, 0x01, 0xfc, 0x98, 0xa3, 0xe7, 0x4d, + 0x38, 0x8b, 0x1e, 0x78, 0x81, 0xe0, 0xc6, 0x21, 0x32, 0x3e, 0xa7, 0x53, 0x87, 0xb6, 0x96, 0xb7, + 0x6b, 0xdd, 0x15, 0x6d, 0x8d, 0xaf, 0xdf, 0x08, 0x97, 0xd5, 0x9f, 0xc1, 0x1a, 0x41, 0xe6, 0xd4, + 0x35, 0x75, 0xd7, 0x98, 0x71, 0xf6, 0x1a, 0xc5, 0x42, 0x6a, 0x11, 0x94, 0x09, 0xb9, 0x4a, 0x12, + 0xdf, 0xea, 0x2f, 0xe0, 0xa2, 0xb8, 0x97, 0x22, 0x03, 0xbb, 0x66, 0x32, 0xa9, 0x20, 0xda, 0x82, + 0xed, 0x5a, 0xa9, 0x6d, 0xdb, 0xfc, 0xf8, 0x30, 0x3c, 0x1d, 0xa5, 0x17, 0x44, 0x4b, 0x82, 0x9c, + 0xfb, 0x90, 0x1c, 0xe4, 0xc2, 0xec, 0x73, 0x06, 0x39, 0x47, 0xef, 0x9b, 0x9d, 0x87, 0x0b, 0x70, + 0x66, 0x40, 0xad, 0x21, 0xd2, 0x27, 0xc2, 0x2f, 0x4f, 0x28, 0x92, 0x2a, 0x3d, 0xf3, 0x43, 0x38, + 0x5f, 0xa0, 0xc2, 0x7a, 0x85, 0x0a, 0xd7, 0x69, 0x8e, 0xf2, 0xd4, 0x6b, 0xb0, 0x91, 0xa0, 0x47, + 0x6d, 0xcb, 0xd5, 0xfd, 0x29, 0x41, 0xb4, 0xb5, 0xc8, 0x1c, 0xe3, 0x65, 0xe9, 0xd8, 0x30, 0xda, + 0x4c, 0x87, 0xf6, 0x06, 0xbc, 0x9c, 0xd0, 0x4f, 0x14, 0xd3, 0xbf, 0x57, 0xe0, 0xa5, 0x01, 0xb5, + 0x34, 0xf4, 0x19, 0x33, 0xdf, 0xf7, 0xad, 0xbf, 0x34, 0xdf, 0x17, 0xe1, 0x42, 0x0e, 0x77, 0x11, + 0xf7, 0x7f, 0xe6, 0x76, 0xbf, 0x81, 0xbd, 0x99, 0xe0, 0xbb, 0x9d, 0xe6, 0x5b, 0xe2, 0xee, 0x75, + 0x58, 0xa3, 0xc4, 0x18, 0x65, 0x39, 0x3c, 0x43, 0x89, 0xb1, 0x17, 0x33, 0xf9, 0x3a, 0xac, 0x99, + 0xd4, 0x4f, 0xe0, 0x38, 0xa3, 0x67, 0x4c, 0xea, 0x27, 0x71, 0x01, 0x3d, 0x59, 0xa0, 0x7a, 0x44, + 0xef, 0x56, 0xec, 0x13, 0x82, 0x9e, 0x8c, 0x5b, 0x8c, 0xe8, 0x49, 0xb8, 0x21, 0x6c, 0x04, 0xb8, + 0xbc, 0x7c, 0xb2, 0x34, 0x47, 0x3e, 0x59, 0x37, 0xa9, 0x7f, 0x90, 0x4e, 0x29, 0x69, 0x85, 0x7e, + 0xc4, 0x1c, 0x21, 0x56, 0xd8, 0x31, 0x04, 0xdf, 0xef, 0x14, 0xa9, 0xc4, 0xbe, 0x58, 0xee, 0x23, + 0xd7, 0xe0, 0x94, 0xeb, 0x3c, 0xce, 0xd4, 0xe0, 0x93, 0x65, 0x7d, 0x17, 0x20, 0xd2, 0x2f, 0x6d, + 0xd5, 0x58, 0x32, 0x28, 0x55, 0x70, 0x23, 0x54, 0x30, 0x95, 0xea, 0x77, 0xfd, 0x3b, 0xd5, 0xef, + 0x94, 0xc8, 0x7f, 0x53, 0x60, 0x35, 0xca, 0xbd, 0x3f, 0x25, 0x78, 0xea, 0x1d, 0xa9, 0x7c, 0x5f, + 0x04, 0xb0, 0x82, 0xc3, 0xb2, 0xa4, 0x0d, 0xb6, 0xc2, 0x04, 0xdd, 0x81, 0xd3, 0x0e, 0x72, 0xc6, + 0x88, 0x84, 0x52, 0x96, 0x90, 0x14, 0x40, 0x75, 0x1d, 0x16, 0xd1, 0x03, 0x9f, 0xe8, 0x42, 0x3e, + 0xfe, 0x91, 0x2a, 0x1c, 0x07, 0x70, 0x3e, 0xc9, 0x7c, 0xe4, 0xba, 0xd7, 0x60, 0x99, 0x33, 0x34, + 0x9f, 0xe7, 0x9e, 0x66, 0xe0, 0x7d, 0xb3, 0xe3, 0x33, 0x75, 0x70, 0xef, 0xe0, 0xea, 0x38, 0x9a, + 0xed, 0xcb, 0x15, 0x92, 0xb6, 0x52, 0x8b, 0xc9, 0x21, 0xdd, 0x1a, 0xdb, 0x67, 0x81, 0xb9, 0xe4, + 0x1d, 0xcf, 0x0c, 0x45, 0x1c, 0x30, 0xfd, 0x1c, 0x91, 0xad, 0x1f, 0x41, 0x93, 0xb3, 0x85, 0xef, + 0xbb, 0x88, 0x70, 0xbe, 0x4a, 0x0e, 0x72, 0x19, 0x6e, 0x05, 0xd8, 0x94, 0x44, 0xb5, 0xb4, 0x89, + 0xdf, 0x83, 0x55, 0x61, 0xb9, 0x91, 0x8f, 0x83, 0x12, 0x57, 0x59, 0xdc, 0x56, 0x04, 0xfe, 0x36, + 0xbe, 0x6e, 0x9a, 0xea, 0xfb, 0x70, 0x4e, 0x3a, 0x6f, 0x32, 0x55, 0xb0, 0x72, 0x56, 0x46, 0x62, + 0x2d, 0x22, 0xc1, 0x75, 0x97, 0xef, 0xfd, 0x19, 0xe5, 0x45, 0xda, 0xfd, 0x37, 0xaf, 0x74, 0x12, + 0xe0, 0x83, 0xc0, 0xcb, 0x5e, 0x38, 0xe5, 0xae, 0xc3, 0xe2, 0x07, 0x72, 0x2c, 0xb0, 0x8f, 0xfc, + 0xba, 0x98, 0x96, 0x25, 0x92, 0xf5, 0x4f, 0x0a, 0xab, 0x8b, 0x37, 0x91, 0x7e, 0x4f, 0x78, 0xf6, + 0x55, 0x58, 0xe2, 0xfa, 0xab, 0x94, 0x51, 0xe0, 0x4e, 0x4e, 0xc2, 0xdd, 0x66, 0x20, 0x8b, 0xb8, + 0x46, 0x74, 0x26, 0x31, 0xa7, 0x71, 0x82, 0x5e, 0x90, 0xec, 0xc5, 0xab, 0xee, 0xbe, 0x7b, 0x17, + 0x9f, 0x54, 0x7e, 0xbe, 0x99, 0xfb, 0x70, 0xad, 0xb1, 0xba, 0xbb, 0x29, 0xd7, 0x5d, 0x31, 0x95, + 0xb8, 0xb3, 0xef, 0xfa, 0xd7, 0xde, 0xf9, 0x58, 0x9f, 0x4c, 0x51, 0xf6, 0x61, 0x7b, 0x1c, 0xef, + 0xfb, 0x63, 0x78, 0xc0, 0x94, 0x79, 0x4d, 0xac, 0xd1, 0x48, 0xe3, 0x0f, 0x15, 0xde, 0x1c, 0xe8, + 0xae, 0x81, 0x26, 0x89, 0x57, 0xde, 0x0b, 0x52, 0xce, 0xb7, 0xe0, 0x62, 0x2e, 0x7f, 0x91, 0x04, + 0xff, 0x58, 0x80, 0x95, 0x01, 0xb5, 0x0e, 0xa6, 0xfe, 0x01, 0x9e, 0xd8, 0xc6, 0xec, 0x88, 0x8c, + 0xbf, 0x07, 0x0d, 0x8f, 0xd8, 0xae, 0x61, 0x7b, 0xfa, 0x84, 0xb1, 0xdd, 0xdc, 0xd9, 0x96, 0x35, + 0x1f, 0x0f, 0xb1, 0x7a, 0x07, 0x21, 0x4e, 0x8b, 0x8f, 0x04, 0x4d, 0x28, 0x41, 0x14, 0x4f, 0x89, + 0x11, 0x0a, 0x15, 0x7d, 0xab, 0x3f, 0x06, 0xa0, 0xbe, 0xee, 0xa3, 0xc0, 0xd4, 0xfc, 0x51, 0x50, + 0x4c, 0x7c, 0x18, 0x02, 0x35, 0xe9, 0x8c, 0x3a, 0x80, 0xe0, 0x31, 0x68, 0x13, 0xdd, 0xb7, 0xb1, + 0x3b, 0xf2, 0x6d, 0x07, 0x89, 0xe7, 0x66, 0xbb, 0xc7, 0x47, 0x75, 0xbd, 0x70, 0x54, 0xd7, 0xbb, + 0x1d, 0x8e, 0xea, 0xf6, 0x96, 0x1f, 0x3d, 0xd9, 0x52, 0xbe, 0xfc, 0xdf, 0x96, 0xa2, 0xad, 0xc6, + 0x87, 0x83, 0xed, 0xb4, 0x8e, 0x0f, 0x58, 0x0d, 0x8a, 0x34, 0x28, 0xf7, 0x87, 0x1e, 0x5b, 0x09, + 0xaa, 0x6c, 0x7d, 0x8e, 0xfe, 0x90, 0xa3, 0xf7, 0xcd, 0xce, 0x5f, 0xe5, 0xfe, 0xf0, 0x45, 0xb5, + 0x4b, 0x5a, 0x0d, 0x43, 0xa9, 0x73, 0x3c, 0x36, 0x4d, 0xfc, 0x8b, 0x6b, 0x62, 0x60, 0x13, 0x82, + 0xc9, 0x73, 0x85, 0xd6, 0x65, 0x58, 0xb0, 0x4d, 0x91, 0x93, 0x4b, 0x2f, 0x5f, 0xb0, 0xcd, 0x74, + 0x1c, 0xd6, 0xaa, 0xe2, 0xb0, 0x3e, 0x5f, 0x5b, 0x2d, 0x8b, 0x11, 0x45, 0xe0, 0x1f, 0x65, 0x11, + 0x9f, 0x6b, 0xaa, 0x75, 0xac, 0x22, 0x96, 0x65, 0x42, 0x2e, 0x41, 0x22, 0x13, 0x7e, 0x23, 0xf7, + 0x0a, 0xf1, 0xfe, 0xf7, 0x36, 0x55, 0x48, 0xd6, 0x82, 0xfa, 0x71, 0xd4, 0x02, 0xd9, 0x86, 0xa9, + 0x39, 0xdf, 0x1f, 0xf8, 0x3b, 0x81, 0xef, 0x3d, 0x4f, 0x63, 0xfc, 0x9d, 0x4c, 0x58, 0xd1, 0x34, + 0xe4, 0x76, 0xd1, 0x12, 0x8b, 0x11, 0xf7, 0xbf, 0xe1, 0x1e, 0xc8, 0x6d, 0x77, 0xc0, 0x7e, 0x21, + 0x50, 0xaf, 0x41, 0x43, 0x9f, 0xfa, 0x87, 0x98, 0x04, 0xea, 0xab, 0xe2, 0x3f, 0x86, 0xaa, 0xef, + 0xc2, 0x12, 0xff, 0x8d, 0x41, 0x64, 0x9b, 0x76, 0x9e, 0xce, 0xf9, 0x1d, 0x7b, 0xf5, 0x40, 0x40, + 0x4d, 0xe0, 0x77, 0x57, 0x03, 0x76, 0x63, 0x4a, 0x42, 0xdd, 0x32, 0x53, 0x21, 0xc3, 0x3b, 0x0f, + 0x55, 0xa8, 0x0d, 0xa8, 0xa5, 0x7e, 0x0a, 0x2b, 0x89, 0x1f, 0x2f, 0x5e, 0xcb, 0xbb, 0x2c, 0x35, + 0x20, 0x6f, 0x5f, 0x9e, 0x03, 0x14, 0x65, 0xae, 0x4f, 0x61, 0x25, 0x31, 0x08, 0x2f, 0xba, 0x41, + 0x06, 0x15, 0xde, 0x90, 0x37, 0xd9, 0x56, 0x27, 0x70, 0x36, 0xd3, 0xb0, 0xbd, 0x51, 0x40, 0x20, + 0x0d, 0x6c, 0xf7, 0xe7, 0x04, 0xca, 0xf2, 0x24, 0x12, 0x4d, 0x91, 0x3c, 0x32, 0xa8, 0x50, 0x9e, + 0xbc, 0x50, 0x50, 0x31, 0x9c, 0xcb, 0x4e, 0xe9, 0xbb, 0x45, 0x1a, 0x49, 0x23, 0xdb, 0x57, 0xe7, + 0x45, 0xca, 0x22, 0x25, 0x3a, 0xaf, 0x72, 0x27, 0xe0, 0xa0, 0x0a, 0x27, 0x48, 0x0d, 0x7a, 0x3e, + 0x01, 0x90, 0xe6, 0x7c, 0x97, 0x0a, 0x8e, 0xc6, 0x90, 0xf6, 0x9b, 0x95, 0x10, 0xd9, 0xfc, 0x99, + 0x49, 0x62, 0x91, 0xf9, 0xd3, 0xc0, 0x42, 0xf3, 0x17, 0x4d, 0xff, 0x02, 0x49, 0xa4, 0xc9, 0x5f, + 0x91, 0x24, 0x31, 0xa4, 0x50, 0x92, 0x9c, 0x71, 0x58, 0x14, 0x2a, 0x15, 0x76, 0x90, 0x41, 0x15, + 0xa1, 0x92, 0xba, 0x81, 0x80, 0x9a, 0xd3, 0x69, 0x17, 0xb2, 0x98, 0x81, 0xb6, 0xdf, 0x9e, 0x1b, + 0x9a, 0x0d, 0x98, 0x0a, 0xa9, 0x64, 0x50, 0x45, 0xc0, 0xa4, 0x6e, 0x48, 0x06, 0x8c, 0xb8, 0x66, + 0x8e, 0x80, 0x11, 0x77, 0x5d, 0x9d, 0x17, 0x99, 0xcd, 0x38, 0x52, 0x99, 0x2e, 0xcf, 0x38, 0x31, + 0xb0, 0x22, 0xe3, 0x64, 0x1b, 0x03, 0xf5, 0x97, 0xd0, 0x94, 0xc7, 0x67, 0x9d, 0xd2, 0xc0, 0x63, + 0x98, 0xf6, 0x5b, 0xd5, 0x18, 0x99, 0xbc, 0x3c, 0x8e, 0xea, 0x94, 0xfa, 0x53, 0x39, 0xf9, 0x9c, + 0x01, 0x53, 0x60, 0x9c, 0xec, 0x70, 0xa9, 0x5b, 0xaa, 0x03, 0x09, 0x59, 0x68, 0x9c, 0xc2, 0x99, + 0x4b, 0x6c, 0x1c, 0x69, 0xde, 0xf2, 0x46, 0x35, 0x15, 0x06, 0xac, 0x30, 0x4e, 0x76, 0xea, 0x11, + 0xe4, 0x03, 0x69, 0xe2, 0x51, 0x94, 0x0f, 0x62, 0x48, 0x61, 0x3e, 0xc8, 0x4e, 0x23, 0x02, 0xcb, + 0xc8, 0xfd, 0x50, 0xa7, 0x34, 0x26, 0xca, 0x2d, 0x93, 0xd3, 0xb4, 0xa8, 0x3f, 0x87, 0x46, 0xfc, + 0x68, 0xdd, 0x2e, 0x38, 0x18, 0x21, 0xda, 0xdd, 0x2a, 0x44, 0x36, 0x8f, 0x09, 0xda, 0xe5, 0x79, + 0x4c, 0x90, 0xbf, 0x3c, 0x07, 0x48, 0xbe, 0x21, 0xd1, 0x6b, 0xbd, 0x56, 0x6a, 0x36, 0x0e, 0x2a, + 0xbc, 0x21, 0xaf, 0x41, 0xda, 0xdb, 0x7f, 0xf4, 0x74, 0x53, 0x79, 0xfc, 0x74, 0x53, 0xf9, 0xe6, + 0xe9, 0xa6, 0xf2, 0xe5, 0xb3, 0xcd, 0x53, 0x8f, 0x9f, 0x6d, 0x9e, 0xfa, 0xcf, 0xb3, 0xcd, 0x53, + 0x9f, 0xf4, 0x2d, 0xdb, 0x3f, 0x9c, 0x8e, 0x7b, 0x06, 0x76, 0xfa, 0x63, 0x77, 0x7c, 0xc5, 0x38, + 0xd4, 0x6d, 0xb7, 0x2f, 0xfd, 0xa5, 0xc8, 0x83, 0xf8, 0xaf, 0x65, 0x66, 0x1e, 0xa2, 0xe3, 0x25, + 0xf6, 0x34, 0xfe, 0xe1, 0xb7, 0x01, 0x00, 0x00, 0xff, 0xff, 0x11, 0x57, 0x79, 0xde, 0x50, 0x23, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2609,6 +2732,7 @@ type MsgClient interface { CreateGroup(ctx context.Context, in *MsgCreateGroup, opts ...grpc.CallOption) (*MsgCreateGroupResponse, error) DeleteGroup(ctx context.Context, in *MsgDeleteGroup, opts ...grpc.CallOption) (*MsgDeleteGroupResponse, error) UpdateGroupMember(ctx context.Context, in *MsgUpdateGroupMember, opts ...grpc.CallOption) (*MsgUpdateGroupMemberResponse, error) + UpdateGroupExtra(ctx context.Context, in *MsgUpdateGroupExtra, opts ...grpc.CallOption) (*MsgUpdateGroupExtraResponse, error) LeaveGroup(ctx context.Context, in *MsgLeaveGroup, opts ...grpc.CallOption) (*MsgLeaveGroupResponse, error) MirrorGroup(ctx context.Context, in *MsgMirrorGroup, opts ...grpc.CallOption) (*MsgMirrorGroupResponse, error) // basic operation of policy @@ -2782,6 +2906,15 @@ func (c *msgClient) UpdateGroupMember(ctx context.Context, in *MsgUpdateGroupMem return out, nil } +func (c *msgClient) UpdateGroupExtra(ctx context.Context, in *MsgUpdateGroupExtra, opts ...grpc.CallOption) (*MsgUpdateGroupExtraResponse, error) { + out := new(MsgUpdateGroupExtraResponse) + err := c.cc.Invoke(ctx, "/greenfield.storage.Msg/UpdateGroupExtra", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *msgClient) LeaveGroup(ctx context.Context, in *MsgLeaveGroup, opts ...grpc.CallOption) (*MsgLeaveGroupResponse, error) { out := new(MsgLeaveGroupResponse) err := c.cc.Invoke(ctx, "/greenfield.storage.Msg/LeaveGroup", in, out, opts...) @@ -2849,6 +2982,7 @@ type MsgServer interface { CreateGroup(context.Context, *MsgCreateGroup) (*MsgCreateGroupResponse, error) DeleteGroup(context.Context, *MsgDeleteGroup) (*MsgDeleteGroupResponse, error) UpdateGroupMember(context.Context, *MsgUpdateGroupMember) (*MsgUpdateGroupMemberResponse, error) + UpdateGroupExtra(context.Context, *MsgUpdateGroupExtra) (*MsgUpdateGroupExtraResponse, error) LeaveGroup(context.Context, *MsgLeaveGroup) (*MsgLeaveGroupResponse, error) MirrorGroup(context.Context, *MsgMirrorGroup) (*MsgMirrorGroupResponse, error) // basic operation of policy @@ -2916,6 +3050,9 @@ func (*UnimplementedMsgServer) DeleteGroup(ctx context.Context, req *MsgDeleteGr func (*UnimplementedMsgServer) UpdateGroupMember(ctx context.Context, req *MsgUpdateGroupMember) (*MsgUpdateGroupMemberResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateGroupMember not implemented") } +func (*UnimplementedMsgServer) UpdateGroupExtra(ctx context.Context, req *MsgUpdateGroupExtra) (*MsgUpdateGroupExtraResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateGroupExtra not implemented") +} func (*UnimplementedMsgServer) LeaveGroup(ctx context.Context, req *MsgLeaveGroup) (*MsgLeaveGroupResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method LeaveGroup not implemented") } @@ -3242,6 +3379,24 @@ func _Msg_UpdateGroupMember_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } +func _Msg_UpdateGroupExtra_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgUpdateGroupExtra) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).UpdateGroupExtra(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/greenfield.storage.Msg/UpdateGroupExtra", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).UpdateGroupExtra(ctx, req.(*MsgUpdateGroupExtra)) + } + return interceptor(ctx, in, info, handler) +} + func _Msg_LeaveGroup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(MsgLeaveGroup) if err := dec(in); err != nil { @@ -3404,6 +3559,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "UpdateGroupMember", Handler: _Msg_UpdateGroupMember_Handler, }, + { + MethodName: "UpdateGroupExtra", + Handler: _Msg_UpdateGroupExtra_Handler, + }, { MethodName: "LeaveGroup", Handler: _Msg_LeaveGroup_Handler, @@ -4214,6 +4373,13 @@ func (m *MsgCreateGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Extra) > 0 { + i -= len(m.Extra) + copy(dAtA[i:], m.Extra) + i = encodeVarintTx(dAtA, i, uint64(len(m.Extra))) + i-- + dAtA[i] = 0x22 + } if len(m.Members) > 0 { for iNdEx := len(m.Members) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Members[iNdEx]) @@ -4418,6 +4584,80 @@ func (m *MsgUpdateGroupMemberResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } +func (m *MsgUpdateGroupExtra) 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 *MsgUpdateGroupExtra) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUpdateGroupExtra) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Extra) > 0 { + i -= len(m.Extra) + copy(dAtA[i:], m.Extra) + i = encodeVarintTx(dAtA, i, uint64(len(m.Extra))) + i-- + dAtA[i] = 0x22 + } + if len(m.GroupName) > 0 { + i -= len(m.GroupName) + copy(dAtA[i:], m.GroupName) + i = encodeVarintTx(dAtA, i, uint64(len(m.GroupName))) + i-- + dAtA[i] = 0x1a + } + if len(m.GroupOwner) > 0 { + i -= len(m.GroupOwner) + copy(dAtA[i:], m.GroupOwner) + i = encodeVarintTx(dAtA, i, uint64(len(m.GroupOwner))) + i-- + dAtA[i] = 0x12 + } + if len(m.Operator) > 0 { + i -= len(m.Operator) + copy(dAtA[i:], m.Operator) + i = encodeVarintTx(dAtA, i, uint64(len(m.Operator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgUpdateGroupExtraResponse) 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 *MsgUpdateGroupExtraResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUpdateGroupExtraResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + func (m *MsgLeaveGroup) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5552,6 +5792,10 @@ func (m *MsgCreateGroup) Size() (n int) { n += 1 + l + sovTx(uint64(l)) } } + l = len(m.Extra) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } return n } @@ -5634,6 +5878,40 @@ func (m *MsgUpdateGroupMemberResponse) Size() (n int) { return n } +func (m *MsgUpdateGroupExtra) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Operator) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.GroupOwner) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.GroupName) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.Extra) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func (m *MsgUpdateGroupExtraResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + func (m *MsgLeaveGroup) Size() (n int) { if m == nil { return 0 @@ -8410,6 +8688,38 @@ func (m *MsgCreateGroup) Unmarshal(dAtA []byte) error { } m.Members = append(m.Members, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Extra", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Extra = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -8939,6 +9249,234 @@ func (m *MsgUpdateGroupMemberResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *MsgUpdateGroupExtra) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgUpdateGroupExtra: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUpdateGroupExtra: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Operator", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Operator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GroupOwner", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.GroupOwner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GroupName", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.GroupName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Extra", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Extra = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MsgUpdateGroupExtraResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgUpdateGroupExtraResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUpdateGroupExtraResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *MsgLeaveGroup) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/x/storage/types/types.pb.go b/x/storage/types/types.pb.go index 4b4a32b19..3d9e15645 100644 --- a/x/storage/types/types.pb.go +++ b/x/storage/types/types.pb.go @@ -430,6 +430,8 @@ type GroupInfo struct { SourceType SourceType `protobuf:"varint,3,opt,name=source_type,json=sourceType,proto3,enum=greenfield.storage.SourceType" json:"source_type,omitempty"` // id is the unique identifier of group Id Uint `protobuf:"bytes,4,opt,name=id,proto3,customtype=Uint" json:"id"` + // extra is used to store extra info for the group + Extra string `protobuf:"bytes,5,opt,name=extra,proto3" json:"extra,omitempty"` } func (m *GroupInfo) Reset() { *m = GroupInfo{} } @@ -486,6 +488,13 @@ func (m *GroupInfo) GetSourceType() SourceType { return SOURCE_TYPE_ORIGIN } +func (m *GroupInfo) GetExtra() string { + if m != nil { + return m.Extra + } + return "" +} + type Trait struct { TraitType string `protobuf:"bytes,1,opt,name=trait_type,json=traitType,proto3" json:"trait_type,omitempty"` Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` @@ -896,73 +905,74 @@ func init() { func init() { proto.RegisterFile("greenfield/storage/types.proto", fileDescriptor_bf95fa2efdc74d97) } var fileDescriptor_bf95fa2efdc74d97 = []byte{ - // 1048 bytes of a gzipped FileDescriptorProto + // 1060 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xd1, 0x6a, 0x1b, 0x47, - 0x17, 0xf6, 0x7a, 0x25, 0xff, 0xd6, 0x59, 0xd9, 0x4e, 0x06, 0xe3, 0x7f, 0x9d, 0x60, 0x49, 0xd1, - 0x95, 0x48, 0x6b, 0x09, 0xdc, 0x92, 0x42, 0x29, 0x04, 0xab, 0x49, 0x5b, 0x53, 0x9a, 0xd2, 0x95, - 0xd3, 0x8b, 0xde, 0x2c, 0xb3, 0xbb, 0xe3, 0xf5, 0xd4, 0xbb, 0x3b, 0xdb, 0x99, 0xd9, 0x34, 0x0a, - 0xf4, 0x1d, 0xfa, 0x18, 0xbd, 0x2e, 0x79, 0x85, 0x82, 0x29, 0x14, 0x42, 0xae, 0x4a, 0x2f, 0x4c, - 0xb1, 0xdf, 0xa0, 0x17, 0xbd, 0x2e, 0x3b, 0x33, 0xb2, 0xd7, 0xb6, 0x62, 0xa3, 0x10, 0xdf, 0x69, - 0xce, 0x7c, 0xdf, 0xcc, 0x39, 0xdf, 0x7c, 0xe7, 0x68, 0xa1, 0x15, 0x73, 0x42, 0xb2, 0x3d, 0x4a, - 0x92, 0x68, 0x20, 0x24, 0xe3, 0x38, 0x26, 0x03, 0x39, 0xce, 0x89, 0xe8, 0xe7, 0x9c, 0x49, 0x86, - 0xd0, 0xd9, 0x7e, 0xdf, 0xec, 0xdf, 0x59, 0x0f, 0x99, 0x48, 0x99, 0xf0, 0x15, 0x62, 0xa0, 0x17, - 0x1a, 0x7e, 0x67, 0x35, 0x66, 0x31, 0xd3, 0xf1, 0xf2, 0x97, 0x89, 0x6e, 0x54, 0x2e, 0xc9, 0xf1, - 0x38, 0x25, 0x99, 0x1c, 0x04, 0x58, 0x10, 0xb3, 0xdd, 0x9e, 0x92, 0x43, 0xc8, 0xd2, 0x94, 0x65, - 0x1a, 0xd0, 0xfd, 0xb7, 0x06, 0x30, 0x2c, 0xc2, 0x03, 0x22, 0x77, 0xb2, 0x3d, 0x86, 0xfa, 0x50, - 0x67, 0x3f, 0x66, 0x84, 0xbb, 0x56, 0xc7, 0xea, 0x35, 0x86, 0xee, 0xeb, 0x97, 0x9b, 0xab, 0x26, - 0x8b, 0xed, 0x28, 0xe2, 0x44, 0x88, 0x91, 0xe4, 0x34, 0x8b, 0x3d, 0x0d, 0x43, 0x6d, 0x70, 0x02, - 0xc5, 0xf6, 0x33, 0x9c, 0x12, 0x77, 0xbe, 0x64, 0x79, 0xa0, 0x43, 0x4f, 0x70, 0x4a, 0xd0, 0x10, - 0xe0, 0x19, 0x15, 0x34, 0xa0, 0x09, 0x95, 0x63, 0xd7, 0xee, 0x58, 0xbd, 0xe5, 0xad, 0x6e, 0xff, - 0x72, 0xe5, 0xfd, 0x6f, 0x4f, 0x51, 0xbb, 0xe3, 0x9c, 0x78, 0x15, 0x16, 0x7a, 0x0f, 0xe6, 0x69, - 0xe4, 0xd6, 0x54, 0x46, 0x77, 0x0f, 0x8f, 0xda, 0x73, 0x7f, 0x1d, 0xb5, 0x6b, 0x4f, 0x69, 0x26, - 0x5f, 0xbf, 0xdc, 0x74, 0x4c, 0x76, 0xe5, 0xd2, 0x9b, 0xa7, 0x11, 0x7a, 0x08, 0x8e, 0x60, 0x05, - 0x0f, 0x89, 0x5f, 0x6a, 0xed, 0xd6, 0xd5, 0x8d, 0xad, 0x69, 0x37, 0x8e, 0x14, 0x4c, 0xdf, 0x26, - 0x4e, 0x7f, 0xa3, 0xbb, 0xd0, 0x08, 0x39, 0xc1, 0x92, 0xf8, 0x58, 0xba, 0x0b, 0x1d, 0xab, 0x67, - 0x7b, 0x8b, 0x3a, 0xb0, 0x2d, 0xd1, 0x36, 0xac, 0x18, 0x95, 0x7d, 0xac, 0xf5, 0x70, 0xff, 0x77, - 0x8d, 0x52, 0xcb, 0x86, 0x60, 0xa2, 0xe8, 0x33, 0x40, 0x39, 0xa7, 0x29, 0xe6, 0x63, 0x5f, 0xe4, - 0xa7, 0xa7, 0x2c, 0x5e, 0x73, 0xca, 0x2d, 0xc3, 0x19, 0xe5, 0x93, 0x73, 0xde, 0x07, 0x14, 0xee, - 0x63, 0x1e, 0x93, 0xc8, 0xe7, 0x04, 0x47, 0xfe, 0x0f, 0x05, 0x93, 0xd8, 0x6d, 0x74, 0xac, 0x5e, - 0xcd, 0xbb, 0x65, 0x76, 0x3c, 0x82, 0xa3, 0x6f, 0xca, 0x38, 0xfa, 0x02, 0x9a, 0x01, 0x4d, 0x12, - 0x9a, 0xc5, 0x3e, 0xcd, 0xf6, 0x98, 0x0b, 0x1d, 0xab, 0xe7, 0x6c, 0xb5, 0xa7, 0xe9, 0x32, 0xd4, - 0xb8, 0xd2, 0x0f, 0xc3, 0x5a, 0x29, 0xb7, 0xe7, 0x04, 0x67, 0x21, 0xf4, 0x18, 0x96, 0xcc, 0x93, - 0x0b, 0x89, 0x65, 0x21, 0x5c, 0x47, 0x49, 0xdc, 0x99, 0x7a, 0x94, 0x02, 0x8e, 0x14, 0xce, 0x6b, - 0x06, 0x95, 0x55, 0xf7, 0x37, 0x0b, 0x9c, 0xca, 0x4d, 0x68, 0x03, 0x20, 0xe7, 0xb4, 0x7c, 0x36, - 0x9a, 0x12, 0x65, 0x3f, 0xdb, 0x6b, 0xa8, 0xc8, 0x2e, 0x4d, 0x09, 0xba, 0x0f, 0xb7, 0x25, 0x93, - 0x38, 0xf1, 0x75, 0x65, 0xbe, 0xa0, 0x2f, 0xb4, 0xdd, 0x6a, 0xde, 0x8a, 0xda, 0xf8, 0x54, 0xc5, - 0x47, 0xf4, 0x05, 0x41, 0x07, 0xb0, 0x2e, 0x48, 0xc8, 0xb2, 0xc8, 0x68, 0xcc, 0x82, 0xef, 0x49, - 0x28, 0x85, 0xe6, 0xd8, 0x1d, 0xbb, 0xe7, 0x6c, 0xdd, 0x9f, 0x6a, 0x88, 0x09, 0x69, 0x94, 0x7f, - 0xad, 0x29, 0xe5, 0x71, 0x46, 0x83, 0x35, 0x31, 0x75, 0xb7, 0xfb, 0x13, 0xac, 0x4d, 0xe7, 0xa1, - 0x8f, 0x00, 0x2a, 0x0f, 0x7c, 0x5d, 0x43, 0x35, 0xc4, 0xe9, 0xcb, 0xce, 0x50, 0x6b, 0xf7, 0x97, - 0x3a, 0x80, 0xbe, 0xf4, 0x66, 0xfa, 0xb7, 0x0d, 0x8e, 0x96, 0x4f, 0x03, 0x6c, 0x0d, 0xd0, 0x21, - 0x05, 0x98, 0xa9, 0x39, 0xef, 0x41, 0x33, 0xc7, 0xe3, 0x84, 0xe1, 0x48, 0x17, 0x55, 0x57, 0x45, - 0x39, 0x26, 0xa6, 0x54, 0x3b, 0x3f, 0x30, 0x16, 0xde, 0x6a, 0x60, 0xdc, 0x83, 0x66, 0xc8, 0x32, - 0x59, 0x76, 0xa9, 0x1a, 0x02, 0xaa, 0x45, 0x3d, 0xc7, 0xc4, 0x2e, 0x77, 0xf9, 0xe2, 0x85, 0x2e, - 0x7f, 0x0c, 0x4b, 0xa6, 0x68, 0x63, 0xf1, 0xc6, 0x9b, 0x2d, 0xae, 0xc5, 0x9f, 0x58, 0x9c, 0x55, - 0x56, 0xe8, 0x4b, 0x58, 0xe1, 0x24, 0x2a, 0xb2, 0x08, 0x67, 0xe1, 0x58, 0x67, 0x02, 0x6f, 0xae, - 0xc7, 0x3b, 0x85, 0xaa, 0x7a, 0x96, 0xf9, 0xb9, 0xf5, 0xc5, 0xb9, 0xe6, 0xcc, 0x3c, 0xd7, 0x06, - 0xd0, 0x08, 0xf7, 0x49, 0x78, 0x20, 0x8a, 0x54, 0xb8, 0xcd, 0x8e, 0xdd, 0x6b, 0x0e, 0x6f, 0xff, - 0x73, 0xd4, 0x5e, 0x92, 0x1c, 0x53, 0x29, 0x3e, 0xee, 0xb2, 0x94, 0xca, 0xae, 0x77, 0x86, 0x41, - 0x4f, 0x60, 0xed, 0x5c, 0x1b, 0x19, 0x27, 0x13, 0xe1, 0x2e, 0x75, 0xec, 0x2b, 0xcd, 0xb5, 0x5a, - 0xe9, 0x95, 0xed, 0x09, 0xab, 0x7b, 0x68, 0x41, 0xe3, 0x73, 0xce, 0x8a, 0xfc, 0xad, 0x9c, 0xba, - 0x01, 0x10, 0x97, 0xe4, 0xaa, 0x51, 0x1b, 0x2a, 0xa2, 0x6c, 0x78, 0x41, 0x1e, 0x7b, 0x66, 0x79, - 0x66, 0xf1, 0x71, 0xf7, 0x13, 0xa8, 0xef, 0x96, 0xb2, 0x95, 0x59, 0x29, 0xfd, 0xf4, 0xad, 0x96, - 0xce, 0x4a, 0x45, 0xd4, 0xa1, 0xab, 0x50, 0x7f, 0x86, 0x93, 0x62, 0x92, 0xaf, 0x5e, 0x74, 0xff, - 0xb0, 0x60, 0x59, 0x4f, 0xc6, 0xaf, 0x88, 0xc4, 0x8f, 0xb0, 0xc4, 0xa8, 0x03, 0x4e, 0x44, 0x44, - 0xc8, 0x69, 0x2e, 0x29, 0xcb, 0xcc, 0x41, 0xd5, 0x50, 0xe9, 0x69, 0xf2, 0x5c, 0x12, 0x9e, 0xe1, - 0xc4, 0x2f, 0x78, 0x62, 0x4e, 0x74, 0x26, 0xb1, 0xa7, 0x3c, 0xb9, 0xd8, 0xcc, 0xf6, 0xa5, 0x66, - 0x5e, 0x85, 0x3a, 0x4d, 0x71, 0x4c, 0x74, 0x99, 0x9e, 0x5e, 0xa0, 0x87, 0x00, 0x58, 0x4a, 0x4e, - 0x83, 0x42, 0x12, 0xe1, 0xd6, 0xd5, 0x7c, 0x5c, 0x9f, 0xa6, 0x9c, 0x2a, 0xd9, 0x8c, 0xc3, 0x0a, - 0x45, 0xd5, 0xa3, 0xdb, 0xe0, 0x9d, 0xd7, 0x73, 0xf5, 0xec, 0xb9, 0xa1, 0x7a, 0x7e, 0xb7, 0x60, - 0x49, 0x19, 0xf5, 0xdd, 0x96, 0x73, 0xde, 0xc1, 0xf6, 0x45, 0x07, 0xdf, 0x50, 0x31, 0x5b, 0x60, - 0xef, 0x44, 0xc2, 0xd8, 0xdb, 0x52, 0x8d, 0x7b, 0xad, 0xbd, 0x7f, 0xb5, 0x00, 0x1e, 0x91, 0x84, - 0x48, 0xa2, 0x5a, 0xf5, 0x01, 0x18, 0x13, 0xf9, 0x34, 0xd2, 0x7f, 0x64, 0xce, 0xd6, 0xff, 0xa7, - 0xe5, 0xb0, 0x13, 0x09, 0xaf, 0xa1, 0xa1, 0xe5, 0x9d, 0x0f, 0xc0, 0x3c, 0x96, 0xe2, 0xcd, 0x5f, - 0xc3, 0xd3, 0xd0, 0x92, 0xf7, 0x21, 0x68, 0x59, 0x14, 0xcd, 0xbe, 0x9a, 0xb6, 0xa8, 0x90, 0x3b, - 0x91, 0x18, 0xee, 0x1c, 0x1e, 0xb7, 0xac, 0x57, 0xc7, 0x2d, 0xeb, 0xef, 0xe3, 0x96, 0xf5, 0xf3, - 0x49, 0x6b, 0xee, 0xd5, 0x49, 0x6b, 0xee, 0xcf, 0x93, 0xd6, 0xdc, 0x77, 0x83, 0x98, 0xca, 0xfd, - 0x22, 0xe8, 0x87, 0x2c, 0x1d, 0x04, 0x59, 0xb0, 0x19, 0xee, 0x63, 0x9a, 0x0d, 0x2a, 0x5f, 0xc6, - 0xcf, 0xcf, 0x7f, 0x9f, 0x07, 0x0b, 0xea, 0xdb, 0xf8, 0x83, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, - 0x65, 0x75, 0xfd, 0x02, 0xc2, 0x0b, 0x00, 0x00, + 0x17, 0xf6, 0x7a, 0x25, 0xff, 0xd6, 0x59, 0xd9, 0x4e, 0x06, 0xe1, 0x7f, 0x9d, 0x60, 0x49, 0xd9, + 0x2b, 0x91, 0xd6, 0x12, 0xb8, 0x25, 0x85, 0x52, 0x08, 0x56, 0x93, 0xb6, 0xa6, 0x34, 0xa5, 0x2b, + 0xa7, 0x17, 0xbd, 0x59, 0x66, 0x77, 0xc7, 0xf2, 0xd4, 0xbb, 0x3b, 0xdb, 0x99, 0xd9, 0xd4, 0x0a, + 0xf4, 0x1d, 0xfa, 0x18, 0xbd, 0x2e, 0x79, 0x85, 0x42, 0x28, 0x14, 0x42, 0xae, 0x4a, 0x2f, 0x4c, + 0xb1, 0xdf, 0xa0, 0x17, 0xbd, 0x2e, 0x3b, 0x33, 0xb2, 0xd7, 0xb6, 0x62, 0xe3, 0x10, 0xdf, 0x69, + 0xce, 0x7c, 0xdf, 0xcc, 0x39, 0xdf, 0x7c, 0xe7, 0x68, 0xa1, 0x3d, 0xe6, 0x84, 0x64, 0xbb, 0x94, + 0x24, 0xf1, 0x40, 0x48, 0xc6, 0xf1, 0x98, 0x0c, 0xe4, 0x24, 0x27, 0xa2, 0x9f, 0x73, 0x26, 0x19, + 0x42, 0xa7, 0xfb, 0x7d, 0xb3, 0x7f, 0x67, 0x2d, 0x62, 0x22, 0x65, 0x22, 0x50, 0x88, 0x81, 0x5e, + 0x68, 0xf8, 0x9d, 0xd6, 0x98, 0x8d, 0x99, 0x8e, 0x97, 0xbf, 0x4c, 0x74, 0xbd, 0x72, 0x49, 0x8e, + 0x27, 0x29, 0xc9, 0xe4, 0x20, 0xc4, 0x82, 0x98, 0xed, 0xce, 0x8c, 0x1c, 0x22, 0x96, 0xa6, 0x2c, + 0xd3, 0x00, 0xef, 0xdf, 0x1a, 0xc0, 0xb0, 0x88, 0xf6, 0x89, 0xdc, 0xce, 0x76, 0x19, 0xea, 0x43, + 0x9d, 0xfd, 0x98, 0x11, 0xee, 0x5a, 0x5d, 0xab, 0xd7, 0x18, 0xba, 0xaf, 0x5f, 0x6c, 0xb4, 0x4c, + 0x16, 0x5b, 0x71, 0xcc, 0x89, 0x10, 0x23, 0xc9, 0x69, 0x36, 0xf6, 0x35, 0x0c, 0x75, 0xc0, 0x09, + 0x15, 0x3b, 0xc8, 0x70, 0x4a, 0xdc, 0xf9, 0x92, 0xe5, 0x83, 0x0e, 0x3d, 0xc1, 0x29, 0x41, 0x43, + 0x80, 0x67, 0x54, 0xd0, 0x90, 0x26, 0x54, 0x4e, 0x5c, 0xbb, 0x6b, 0xf5, 0x96, 0x37, 0xbd, 0xfe, + 0xc5, 0xca, 0xfb, 0xdf, 0x9e, 0xa0, 0x76, 0x26, 0x39, 0xf1, 0x2b, 0x2c, 0xf4, 0x1e, 0xcc, 0xd3, + 0xd8, 0xad, 0xa9, 0x8c, 0xee, 0xbe, 0x3c, 0xec, 0xcc, 0xfd, 0x75, 0xd8, 0xa9, 0x3d, 0xa5, 0x99, + 0x7c, 0xfd, 0x62, 0xc3, 0x31, 0xd9, 0x95, 0x4b, 0x7f, 0x9e, 0xc6, 0xe8, 0x21, 0x38, 0x82, 0x15, + 0x3c, 0x22, 0x41, 0xa9, 0xb5, 0x5b, 0x57, 0x37, 0xb6, 0x67, 0xdd, 0x38, 0x52, 0x30, 0x7d, 0x9b, + 0x38, 0xf9, 0x8d, 0xee, 0x42, 0x23, 0xe2, 0x04, 0x4b, 0x12, 0x60, 0xe9, 0x2e, 0x74, 0xad, 0x9e, + 0xed, 0x2f, 0xea, 0xc0, 0x96, 0x44, 0x5b, 0xb0, 0x62, 0x54, 0x0e, 0xb0, 0xd6, 0xc3, 0xfd, 0xdf, + 0x15, 0x4a, 0x2d, 0x1b, 0x82, 0x89, 0xa2, 0xcf, 0x00, 0xe5, 0x9c, 0xa6, 0x98, 0x4f, 0x02, 0x91, + 0x9f, 0x9c, 0xb2, 0x78, 0xc5, 0x29, 0xb7, 0x0c, 0x67, 0x94, 0x4f, 0xcf, 0x79, 0x1f, 0x50, 0xb4, + 0x87, 0xf9, 0x98, 0xc4, 0x01, 0x27, 0x38, 0x0e, 0x7e, 0x28, 0x98, 0xc4, 0x6e, 0xa3, 0x6b, 0xf5, + 0x6a, 0xfe, 0x2d, 0xb3, 0xe3, 0x13, 0x1c, 0x7f, 0x53, 0xc6, 0xd1, 0x17, 0xd0, 0x0c, 0x69, 0x92, + 0xd0, 0x6c, 0x1c, 0xd0, 0x6c, 0x97, 0xb9, 0xd0, 0xb5, 0x7a, 0xce, 0x66, 0x67, 0x96, 0x2e, 0x43, + 0x8d, 0x2b, 0xfd, 0x30, 0xac, 0x95, 0x72, 0xfb, 0x4e, 0x78, 0x1a, 0x42, 0x8f, 0x61, 0xc9, 0x3c, + 0xb9, 0x90, 0x58, 0x16, 0xc2, 0x75, 0x94, 0xc4, 0xdd, 0x99, 0x47, 0x29, 0xe0, 0x48, 0xe1, 0xfc, + 0x66, 0x58, 0x59, 0x79, 0xbf, 0x59, 0xe0, 0x54, 0x6e, 0x42, 0xeb, 0x00, 0x39, 0xa7, 0xe5, 0xb3, + 0xd1, 0x94, 0x28, 0xfb, 0xd9, 0x7e, 0x43, 0x45, 0x76, 0x68, 0x4a, 0xd0, 0x7d, 0xb8, 0x2d, 0x99, + 0xc4, 0x49, 0xa0, 0x2b, 0x0b, 0x04, 0x7d, 0xae, 0xed, 0x56, 0xf3, 0x57, 0xd4, 0xc6, 0xa7, 0x2a, + 0x3e, 0xa2, 0xcf, 0x09, 0xda, 0x87, 0x35, 0x41, 0x22, 0x96, 0xc5, 0x46, 0x63, 0x16, 0x7e, 0x4f, + 0x22, 0x29, 0x34, 0xc7, 0xee, 0xda, 0x3d, 0x67, 0xf3, 0xfe, 0x4c, 0x43, 0x4c, 0x49, 0xa3, 0xfc, + 0x6b, 0x4d, 0x29, 0x8f, 0x33, 0x1a, 0xac, 0x8a, 0x99, 0xbb, 0xde, 0x4f, 0xb0, 0x3a, 0x9b, 0x87, + 0x3e, 0x02, 0xa8, 0x3c, 0xf0, 0x55, 0x0d, 0xd5, 0x10, 0x27, 0x2f, 0x7b, 0x8d, 0x5a, 0xbd, 0x5f, + 0xea, 0x00, 0xfa, 0xd2, 0x9b, 0xe9, 0xdf, 0x0e, 0x38, 0x5a, 0x3e, 0x0d, 0xb0, 0x35, 0x40, 0x87, + 0x14, 0xe0, 0x5a, 0xcd, 0x79, 0x0f, 0x9a, 0x39, 0x9e, 0x24, 0x0c, 0xc7, 0xba, 0xa8, 0xba, 0x2a, + 0xca, 0x31, 0x31, 0xa5, 0xda, 0xd9, 0x81, 0xb1, 0xf0, 0x56, 0x03, 0xe3, 0x1e, 0x34, 0x23, 0x96, + 0xc9, 0xb2, 0x4b, 0xd5, 0x10, 0x50, 0x2d, 0xea, 0x3b, 0x26, 0x76, 0xb1, 0xcb, 0x17, 0xcf, 0x75, + 0xf9, 0x63, 0x58, 0x32, 0x45, 0x1b, 0x8b, 0x37, 0xde, 0x6c, 0x71, 0x2d, 0xfe, 0xd4, 0xe2, 0xac, + 0xb2, 0x42, 0x5f, 0xc2, 0x0a, 0x27, 0x71, 0x91, 0xc5, 0x38, 0x8b, 0x26, 0x3a, 0x13, 0x78, 0x73, + 0x3d, 0xfe, 0x09, 0x54, 0xd5, 0xb3, 0xcc, 0xcf, 0xac, 0xcf, 0xcf, 0x35, 0xe7, 0xda, 0x73, 0x6d, + 0x00, 0x8d, 0x68, 0x8f, 0x44, 0xfb, 0xa2, 0x48, 0x85, 0xdb, 0xec, 0xda, 0xbd, 0xe6, 0xf0, 0xf6, + 0x3f, 0x87, 0x9d, 0x25, 0xc9, 0x31, 0x95, 0xe2, 0x63, 0x8f, 0xa5, 0x54, 0x7a, 0xfe, 0x29, 0x06, + 0x3d, 0x81, 0xd5, 0x33, 0x6d, 0x64, 0x9c, 0x4c, 0x84, 0xbb, 0xd4, 0xb5, 0x2f, 0x35, 0x57, 0xab, + 0xd2, 0x2b, 0x5b, 0x53, 0x96, 0x77, 0x68, 0x41, 0xe3, 0x73, 0xce, 0x8a, 0xfc, 0xad, 0x9c, 0xba, + 0x0e, 0x30, 0x2e, 0xc9, 0x55, 0xa3, 0x36, 0x54, 0x44, 0xd9, 0xf0, 0x9c, 0x3c, 0xf6, 0xb5, 0xe5, + 0xb9, 0x96, 0x8f, 0x5b, 0x50, 0x27, 0x07, 0x92, 0x63, 0x65, 0xe0, 0x86, 0xaf, 0x17, 0xde, 0x27, + 0x50, 0xdf, 0x29, 0xc5, 0x2c, 0x73, 0x55, 0xaa, 0xea, 0x5c, 0x2c, 0x9d, 0xab, 0x8a, 0xa8, 0xab, + 0x5a, 0x50, 0x7f, 0x86, 0x93, 0x62, 0x5a, 0x85, 0x5e, 0x78, 0x7f, 0x58, 0xb0, 0xac, 0xe7, 0xe5, + 0x57, 0x44, 0xe2, 0x47, 0x58, 0x62, 0xd4, 0x05, 0x27, 0x26, 0x22, 0xe2, 0x34, 0x97, 0x94, 0x65, + 0xe6, 0xa0, 0x6a, 0xa8, 0x74, 0x3a, 0x39, 0x90, 0x84, 0x67, 0x38, 0x09, 0x0a, 0x9e, 0x98, 0x13, + 0x9d, 0x69, 0xec, 0x29, 0x4f, 0xce, 0xb7, 0xb8, 0x7d, 0xa1, 0xc5, 0x5b, 0x50, 0xa7, 0x29, 0x1e, + 0x13, 0x5d, 0xbc, 0xaf, 0x17, 0xe8, 0x21, 0x00, 0x96, 0x92, 0xd3, 0xb0, 0x90, 0x44, 0xb8, 0x75, + 0x35, 0x35, 0xd7, 0x66, 0xe9, 0xa9, 0x4a, 0x36, 0x43, 0xb2, 0x42, 0x51, 0xf5, 0xe8, 0xe6, 0x78, + 0xe7, 0xf5, 0x5c, 0x3e, 0x91, 0x6e, 0xa8, 0x9e, 0xdf, 0x2d, 0x58, 0x52, 0xf6, 0x7d, 0xb7, 0xe5, + 0x9c, 0xf5, 0xb5, 0x7d, 0xde, 0xd7, 0x37, 0x54, 0xcc, 0x26, 0xd8, 0xdb, 0xb1, 0x30, 0xa6, 0xb7, + 0x54, 0x3b, 0x5f, 0x65, 0x7a, 0xef, 0x57, 0x0b, 0xe0, 0x11, 0x49, 0x88, 0x24, 0xaa, 0x81, 0x1f, + 0x80, 0x31, 0x51, 0x40, 0x63, 0xfd, 0xf7, 0xe6, 0x6c, 0xfe, 0x7f, 0x56, 0x0e, 0xdb, 0xb1, 0xf0, + 0x1b, 0x1a, 0x5a, 0xde, 0xf9, 0x00, 0xcc, 0x63, 0x29, 0xde, 0xfc, 0x15, 0x3c, 0x0d, 0x2d, 0x79, + 0x1f, 0x82, 0x96, 0x45, 0xd1, 0xec, 0xcb, 0x69, 0x8b, 0x0a, 0xb9, 0x1d, 0x8b, 0xe1, 0xf6, 0xcb, + 0xa3, 0xb6, 0xf5, 0xea, 0xa8, 0x6d, 0xfd, 0x7d, 0xd4, 0xb6, 0x7e, 0x3e, 0x6e, 0xcf, 0xbd, 0x3a, + 0x6e, 0xcf, 0xfd, 0x79, 0xdc, 0x9e, 0xfb, 0x6e, 0x30, 0xa6, 0x72, 0xaf, 0x08, 0xfb, 0x11, 0x4b, + 0x07, 0x61, 0x16, 0x6e, 0x44, 0x7b, 0x98, 0x66, 0x83, 0xca, 0xf7, 0xf2, 0xc1, 0xd9, 0xaf, 0xf6, + 0x70, 0x41, 0x7d, 0x31, 0x7f, 0xf0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb9, 0xd9, 0x4b, 0xae, + 0xd8, 0x0b, 0x00, 0x00, } func (m *BucketInfo) Marshal() (dAtA []byte, err error) { @@ -1272,6 +1282,13 @@ func (m *GroupInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Extra) > 0 { + i -= len(m.Extra) + copy(dAtA[i:], m.Extra) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Extra))) + i-- + dAtA[i] = 0x2a + } { size := m.Id.Size() i -= size @@ -1800,6 +1817,10 @@ func (m *GroupInfo) Size() (n int) { } l = m.Id.Size() n += 1 + l + sovTypes(uint64(l)) + l = len(m.Extra) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -3054,6 +3075,38 @@ func (m *GroupInfo) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Extra", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Extra = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:])