diff --git a/proto/lavanet/lava/pairing/query.proto b/proto/lavanet/lava/pairing/query.proto index e7d6051aa6..fea4177e09 100644 --- a/proto/lavanet/lava/pairing/query.proto +++ b/proto/lavanet/lava/pairing/query.proto @@ -146,7 +146,6 @@ message QueryVerifyPairingResponse { message QueryGetUniquePaymentStorageClientProviderRequest { string index = 1; - } message QueryGetUniquePaymentStorageClientProviderResponse { @@ -233,6 +232,7 @@ message QueryEffectivePolicyRequest { message QueryEffectivePolicyResponse { lavanet.lava.plans.Policy policy = 1; + lavanet.lava.plans.Policy pending_policy = 2; } // this line is used by starport scaffolding # 3 diff --git a/proto/lavanet/lava/projects/query.proto b/proto/lavanet/lava/projects/query.proto index b371c4374a..7c39de9fbf 100644 --- a/proto/lavanet/lava/projects/query.proto +++ b/proto/lavanet/lava/projects/query.proto @@ -43,6 +43,7 @@ message QueryInfoRequest { message QueryInfoResponse { Project project = 1; + Project pending_project = 2; } message QueryDeveloperRequest { @@ -51,6 +52,7 @@ message QueryDeveloperRequest { message QueryDeveloperResponse { Project project = 1; + Project pending_project = 2; } // this line is used by starport scaffolding # 3 diff --git a/testutil/common/tester.go b/testutil/common/tester.go index 218bec43d9..e78693b8f9 100644 --- a/testutil/common/tester.go +++ b/testutil/common/tester.go @@ -557,7 +557,16 @@ func (ts *Tester) QueryPairingVerifyPairing(chainID, client, provider string, bl return ts.Keepers.Pairing.VerifyPairing(ts.GoCtx, msg) } -// QueryPairingMonthlyPayout implements 'q pairing verfy-pairing' +// QueryPairingEffectivePolicy implements 'q pairing effective-policy' +func (ts *Tester) QueryPairingEffectivePolicy(chainID, consumer string) (*pairingtypes.QueryEffectivePolicyResponse, error) { + msg := &pairingtypes.QueryEffectivePolicyRequest{ + SpecID: chainID, + Consumer: consumer, + } + return ts.Keepers.Pairing.EffectivePolicy(ts.GoCtx, msg) +} + +// QueryPairingMonthlyPayout implements 'q pairing monthly-payout' func (ts *Tester) QueryPairingMonthlyPayout(provider string) (*pairingtypes.QueryMonthlyPayoutResponse, error) { msg := &pairingtypes.QueryMonthlyPayoutRequest{ Provider: provider, diff --git a/x/pairing/keeper/grpc_query_effective_policy.go b/x/pairing/keeper/grpc_query_effective_policy.go index f560c22d7a..ef172a9a90 100644 --- a/x/pairing/keeper/grpc_query_effective_policy.go +++ b/x/pairing/keeper/grpc_query_effective_policy.go @@ -6,6 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/lavanet/lava/x/pairing/types" + projectstypes "github.com/lavanet/lava/x/projects/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -17,15 +18,44 @@ func (k Keeper) EffectivePolicy(goCtx context.Context, req *types.QueryEffective ctx := sdk.UnwrapSDKContext(goCtx) - project, err := k.projectsKeeper.GetProjectForDeveloper(ctx, req.Consumer, uint64(ctx.BlockHeight())) + project, err := k.getProjectByDeveloperOrIndex(ctx, req.Consumer, uint64(ctx.BlockHeight())) + if err != nil { + return nil, err + } + strictestPolicy, _, err := k.GetProjectStrictestPolicy(ctx, project, req.SpecID) + if err != nil { + return nil, err + } + + // try getting pending policy changes (applied in next epoch) + nextEpoch, err := k.epochStorageKeeper.GetNextEpoch(ctx, uint64(ctx.BlockHeight())) + if err != nil { + return nil, fmt.Errorf("cannot get pending project policy. errors: %s", err.Error()) + } + + pendingProject, err := k.getProjectByDeveloperOrIndex(ctx, req.Consumer, nextEpoch) + if err != nil { + return nil, err + } + + if pendingProject.Equal(project) { + return &types.QueryEffectivePolicyResponse{Policy: strictestPolicy}, err + } else { + pendingPolicy, _, err := k.GetProjectStrictestPolicy(ctx, pendingProject, req.SpecID) + return &types.QueryEffectivePolicyResponse{Policy: strictestPolicy, PendingPolicy: pendingPolicy}, err + } +} + +func (k Keeper) getProjectByDeveloperOrIndex(ctx sdk.Context, idOrDeveloper string, block uint64) (projectstypes.Project, error) { + project, err := k.projectsKeeper.GetProjectForDeveloper(ctx, idOrDeveloper, block) if err != nil { origErr := err // support giving a project-id - project, err = k.projectsKeeper.GetProjectForBlock(ctx, req.Consumer, uint64(ctx.BlockHeight())) + project, err = k.projectsKeeper.GetProjectForBlock(ctx, idOrDeveloper, block) if err != nil { - return nil, fmt.Errorf("failed getting project for key %s errors %s, %s", req.Consumer, origErr, err) + return projectstypes.Project{}, fmt.Errorf("failed getting project for key %s errors %s, %s", idOrDeveloper, origErr, err) } } - strictestPolicy, _, err := k.GetProjectStrictestPolicy(ctx, project, req.SpecID) - return &types.QueryEffectivePolicyResponse{Policy: strictestPolicy}, err + + return project, nil } diff --git a/x/pairing/keeper/grpc_query_effective_policy_test.go b/x/pairing/keeper/grpc_query_effective_policy_test.go new file mode 100644 index 0000000000..9ad33ec43a --- /dev/null +++ b/x/pairing/keeper/grpc_query_effective_policy_test.go @@ -0,0 +1,92 @@ +package keeper_test + +import ( + "testing" + + "github.com/lavanet/lava/testutil/common" + planstypes "github.com/lavanet/lava/x/plans/types" + "github.com/stretchr/testify/require" +) + +// Test effective policy query +func TestEffectivePolicy(t *testing.T) { + ts := newTester(t) + ts.setupForPayments(1, 1, 0) // 1 client, 1 provider + + _, clientAddr := ts.GetAccount(common.CONSUMER, 0) + + project, err := ts.GetProjectDeveloperData(clientAddr, ts.BlockHeight()) + require.Nil(t, err) + + // the auto-created project from setupForPayments is subject to the mock plan policy + // the mock policy assumed in this test is (implemented by common.CreateMockPolicy()): + // + // plantypes.Policy{ + // TotalCuLimit: 100000, + // EpochCuLimit: 10000, + // MaxProvidersToPair: 3, + // GeolocationProfile: 1, + // } + // + // when testing the effective policy, this will be the policy in mind + + adminPolicy := planstypes.Policy{ + TotalCuLimit: 99000, + EpochCuLimit: 10000, + MaxProvidersToPair: 3, + GeolocationProfile: 1, + } + _, err = ts.TxProjectSetPolicy(project.ProjectID, clientAddr, adminPolicy) + require.Nil(t, err) + + subPolicy := planstypes.Policy{ + TotalCuLimit: 100000, + EpochCuLimit: 9900, + MaxProvidersToPair: 2, + GeolocationProfile: planstypes.Geolocation_value["GL"], + } + _, err = ts.TxProjectSetSubscriptionPolicy(project.ProjectID, clientAddr, subPolicy) + require.Nil(t, err) + + // the effective policy function calcaulates the effective chain policy within it + // if there is no chain policy in any of the policies, it makes one using this function + chainPolicy, allowed := planstypes.GetStrictestChainPolicyForSpec(ts.spec.Index, []*planstypes.Policy{&adminPolicy, &subPolicy, &ts.plan.PlanPolicy}) + require.True(t, allowed) + + expectedEffectivePolicy := planstypes.Policy{ + ChainPolicies: []planstypes.ChainPolicy{chainPolicy}, + TotalCuLimit: 99000, + EpochCuLimit: 9900, + MaxProvidersToPair: 2, + GeolocationProfile: 1, + } + + // apply the policy changes + ts.AdvanceEpoch() + + res, err := ts.QueryPairingEffectivePolicy(ts.spec.Index, clientAddr) + require.Nil(t, err) + require.True(t, expectedEffectivePolicy.Equal(res.Policy)) + require.Nil(t, res.PendingPolicy) // there should be no pending policy + + // set a new policy without applying it (no advanceEpoch) + _, err = ts.TxProjectSetPolicy(project.ProjectID, clientAddr, planstypes.Policy{ + TotalCuLimit: 80000, + EpochCuLimit: 5000, + MaxProvidersToPair: 3, + GeolocationProfile: 1, + }) + require.Nil(t, err) + res, err = ts.QueryPairingEffectivePolicy(ts.spec.Index, clientAddr) + require.Nil(t, err) + require.True(t, expectedEffectivePolicy.Equal(res.Policy)) // policy should still be the original one + + // there should be a new pending policy + require.True(t, res.PendingPolicy.Equal(planstypes.Policy{ + ChainPolicies: expectedEffectivePolicy.ChainPolicies, + TotalCuLimit: 80000, + EpochCuLimit: 5000, + MaxProvidersToPair: 2, + GeolocationProfile: 1, + })) +} diff --git a/x/pairing/types/query.pb.go b/x/pairing/types/query.pb.go index ed86d8c34d..97e1675304 100644 --- a/x/pairing/types/query.pb.go +++ b/x/pairing/types/query.pb.go @@ -1395,7 +1395,8 @@ func (m *QueryEffectivePolicyRequest) GetSpecID() string { } type QueryEffectivePolicyResponse struct { - Policy *types3.Policy `protobuf:"bytes,1,opt,name=policy,proto3" json:"policy,omitempty"` + Policy *types3.Policy `protobuf:"bytes,1,opt,name=policy,proto3" json:"policy,omitempty"` + PendingPolicy *types3.Policy `protobuf:"bytes,2,opt,name=pending_policy,json=pendingPolicy,proto3" json:"pending_policy,omitempty"` } func (m *QueryEffectivePolicyResponse) Reset() { *m = QueryEffectivePolicyResponse{} } @@ -1438,6 +1439,13 @@ func (m *QueryEffectivePolicyResponse) GetPolicy() *types3.Policy { return nil } +func (m *QueryEffectivePolicyResponse) GetPendingPolicy() *types3.Policy { + if m != nil { + return m.PendingPolicy + } + return nil +} + type QuerySdkPairingResponse struct { Pairing *QueryGetPairingResponse `protobuf:"bytes,1,opt,name=pairing,proto3" json:"pairing,omitempty"` MaxCu uint64 `protobuf:"varint,2,opt,name=max_cu,json=maxCu,proto3" json:"max_cu,omitempty"` @@ -1622,126 +1630,127 @@ func init() { func init() { proto.RegisterFile("lavanet/lava/pairing/query.proto", fileDescriptor_9e149ce9d21da0d8) } var fileDescriptor_9e149ce9d21da0d8 = []byte{ - // 1891 bytes of a gzipped FileDescriptorProto + // 1911 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x6f, 0xdb, 0xd8, - 0x11, 0x0f, 0x25, 0x5b, 0xb1, 0x26, 0x31, 0x36, 0x78, 0xeb, 0x28, 0x0a, 0xeb, 0x55, 0xbc, 0xcc, - 0x26, 0x1b, 0xd7, 0xae, 0xb8, 0x56, 0x1c, 0x27, 0xd8, 0x78, 0x03, 0xd8, 0xf9, 0x70, 0x9d, 0xba, + 0x11, 0x0f, 0x25, 0x5b, 0xb1, 0x26, 0x71, 0x37, 0x78, 0xeb, 0x28, 0x0a, 0xeb, 0x55, 0xbc, 0xcc, + 0x26, 0x1b, 0x37, 0xae, 0xb8, 0x56, 0x1c, 0x27, 0xd8, 0x78, 0x03, 0xd8, 0xf9, 0x70, 0x9d, 0xba, 0x5d, 0x5b, 0xae, 0x7b, 0xe8, 0x85, 0xa0, 0xa9, 0x27, 0x99, 0x6b, 0x8a, 0x64, 0xf8, 0xe1, 0xb5, - 0x2b, 0x08, 0x2d, 0x5a, 0xf4, 0xba, 0x28, 0xd0, 0xbd, 0x14, 0xe8, 0x71, 0xd1, 0xa2, 0x28, 0xda, - 0x7b, 0x81, 0xde, 0x8a, 0x16, 0x7b, 0x69, 0xb1, 0xc0, 0x5e, 0x7a, 0x69, 0x51, 0x24, 0xfd, 0x43, - 0x0a, 0xbe, 0x37, 0xa4, 0x48, 0x99, 0xa2, 0x24, 0xdb, 0xe8, 0x25, 0xd1, 0x23, 0xe7, 0xe3, 0x37, - 0xbf, 0x19, 0x72, 0x66, 0x68, 0x98, 0x33, 0xd4, 0x23, 0xd5, 0xa4, 0x9e, 0x1c, 0xfc, 0x2f, 0xdb, - 0xaa, 0xee, 0xe8, 0x66, 0x4b, 0x7e, 0xe5, 0x53, 0xe7, 0xa4, 0x6a, 0x3b, 0x96, 0x67, 0x91, 0x19, - 0x94, 0xa8, 0x06, 0xff, 0x57, 0x51, 0x42, 0x9c, 0x69, 0x59, 0x2d, 0x8b, 0x09, 0xc8, 0xc1, 0x2f, - 0x2e, 0x2b, 0xce, 0xb6, 0x2c, 0xab, 0x65, 0x50, 0x59, 0xb5, 0x75, 0x59, 0x35, 0x4d, 0xcb, 0x53, - 0x3d, 0xdd, 0x32, 0x5d, 0xbc, 0xfb, 0x4d, 0xcd, 0x72, 0xdb, 0x96, 0x2b, 0xef, 0xab, 0x2e, 0xe5, - 0x2e, 0xe4, 0xa3, 0xa5, 0x7d, 0xea, 0xa9, 0x4b, 0xb2, 0xad, 0xb6, 0x74, 0x93, 0x09, 0xa3, 0xec, - 0xbb, 0xa9, 0xb8, 0x6c, 0xd5, 0x51, 0xdb, 0xa1, 0xb9, 0xf9, 0x54, 0x11, 0x6a, 0x5b, 0xda, 0x81, - 0x62, 0xab, 0x27, 0x6d, 0x6a, 0x7a, 0xa1, 0xe8, 0x6c, 0x42, 0xd4, 0xb5, 0xa9, 0xc6, 0xfe, 0xc1, - 0xbb, 0xb7, 0x92, 0x86, 0x0c, 0xd5, 0x74, 0x65, 0xdb, 0x32, 0x74, 0x0d, 0x29, 0x10, 0xef, 0xa7, - 0x83, 0x71, 0xac, 0x23, 0xbd, 0x41, 0x9d, 0xd0, 0x99, 0xe2, 0x7a, 0x96, 0xa3, 0xb6, 0x28, 0x2a, - 0xad, 0xa5, 0x2a, 0xf9, 0xa6, 0xfe, 0xca, 0xa7, 0xfd, 0x2a, 0x8a, 0x66, 0xe8, 0xc1, 0x31, 0x34, - 0x89, 0x26, 0x16, 0x12, 0x26, 0x58, 0x64, 0xa8, 0x20, 0xbb, 0x9e, 0x7a, 0x48, 0x15, 0x6a, 0x7a, - 0x61, 0x9e, 0xc4, 0xc5, 0x64, 0x8c, 0xfe, 0xbe, 0xab, 0x39, 0xba, 0x1d, 0x50, 0x9a, 0x38, 0xa0, - 0xf4, 0xed, 0x24, 0x3a, 0xc7, 0xfa, 0x84, 0x6a, 0x9e, 0x1b, 0xfe, 0xe0, 0x42, 0xd2, 0x0c, 0x90, - 0x9d, 0x20, 0x4d, 0xdb, 0x8c, 0xf6, 0x3a, 0x7d, 0xe5, 0x53, 0xd7, 0x93, 0x76, 0xe0, 0xed, 0xc4, - 0x55, 0xd7, 0xb6, 0x4c, 0x97, 0x92, 0x0f, 0xa1, 0xc0, 0xd3, 0x53, 0x16, 0xe6, 0x84, 0x7b, 0x57, - 0x6a, 0xb3, 0xd5, 0xb4, 0xc2, 0xa9, 0x72, 0xad, 0xf5, 0x89, 0x2f, 0xff, 0x7d, 0xeb, 0x52, 0x1d, - 0x35, 0xa4, 0x1d, 0xb8, 0xce, 0x4d, 0x62, 0xfc, 0xa1, 0x2f, 0x52, 0x86, 0xcb, 0xda, 0x81, 0xaa, - 0x9b, 0x9b, 0xcf, 0x98, 0xd5, 0x62, 0x3d, 0x3c, 0x92, 0x0a, 0x80, 0x7b, 0x60, 0x7d, 0xfa, 0xc2, - 0xb1, 0x7e, 0x44, 0xcd, 0x72, 0x6e, 0x4e, 0xb8, 0x37, 0x55, 0x8f, 0x5d, 0x91, 0xba, 0x50, 0xea, - 0x37, 0x89, 0x40, 0xbf, 0x03, 0xc0, 0xd8, 0x7b, 0x1e, 0x90, 0x57, 0x16, 0xe6, 0xf2, 0xf7, 0xae, - 0xd4, 0xee, 0x24, 0xc1, 0xc6, 0xa9, 0xae, 0xee, 0x46, 0xc2, 0x88, 0x3a, 0xa6, 0x4e, 0x4a, 0x50, - 0xb0, 0x7c, 0xcf, 0xf6, 0x3d, 0x06, 0xa1, 0x58, 0xc7, 0x93, 0xf4, 0x12, 0xdd, 0x6f, 0x50, 0x6f, - 0x9b, 0x47, 0x3e, 0x3c, 0xa4, 0x12, 0x14, 0x78, 0x1d, 0x84, 0xb6, 0xf8, 0x49, 0xfa, 0x43, 0x0e, - 0x6e, 0x9c, 0x32, 0x86, 0xc1, 0x6c, 0x42, 0x31, 0x2c, 0x1a, 0xf7, 0x2c, 0xb1, 0xf4, 0xb4, 0xc9, - 0x6d, 0x98, 0xd6, 0x7c, 0xc7, 0x09, 0xea, 0x90, 0xe9, 0x30, 0x14, 0x13, 0xf5, 0xab, 0x78, 0xf1, - 0x79, 0x70, 0x8d, 0x3c, 0x82, 0x9b, 0x9e, 0xde, 0xa6, 0x8a, 0x41, 0x9b, 0x9e, 0xe2, 0x59, 0x8a, - 0x49, 0x8f, 0x3d, 0x05, 0x73, 0x5b, 0xce, 0x33, 0x85, 0xeb, 0x81, 0xc0, 0x16, 0x6d, 0x7a, 0xdf, - 0xb7, 0xbe, 0x47, 0x8f, 0x43, 0xc4, 0xe4, 0x01, 0xdc, 0x08, 0x9e, 0x39, 0xc5, 0x50, 0x5d, 0x4f, - 0xf1, 0xed, 0x86, 0xea, 0xd1, 0x86, 0xb2, 0x6f, 0x58, 0xda, 0x61, 0x79, 0x82, 0xe9, 0xcd, 0x04, - 0xb7, 0xb7, 0x54, 0xd7, 0xdb, 0xe3, 0x37, 0xd7, 0x83, 0x7b, 0x64, 0x09, 0xae, 0x33, 0x21, 0xc5, - 0x6a, 0x26, 0x9d, 0x4d, 0x32, 0x25, 0xc2, 0x6e, 0x7e, 0xdc, 0x8c, 0x79, 0x92, 0x7e, 0x0c, 0x37, - 0x19, 0x5d, 0x3f, 0xa0, 0x8e, 0xde, 0x3c, 0x39, 0x2f, 0xfd, 0x44, 0x84, 0xa9, 0x90, 0x24, 0x16, - 0x61, 0xb1, 0x1e, 0x9d, 0xc9, 0x0c, 0x4c, 0xc6, 0x43, 0xe0, 0x07, 0xe9, 0x0b, 0x01, 0xc4, 0x34, - 0x04, 0x98, 0xb3, 0x19, 0x98, 0x3c, 0x52, 0x0d, 0xbd, 0xc1, 0x00, 0x4c, 0xd5, 0xf9, 0x81, 0xcc, - 0xc3, 0xb5, 0x20, 0x34, 0xda, 0x50, 0x7a, 0x09, 0xe5, 0x84, 0xbe, 0xc5, 0xaf, 0x47, 0x95, 0x4c, - 0xe6, 0xe0, 0xaa, 0xe6, 0x2b, 0x36, 0x75, 0x30, 0x51, 0xdc, 0x39, 0x68, 0xfe, 0x36, 0x75, 0x78, - 0x9a, 0xde, 0x01, 0xc0, 0x47, 0x59, 0xd1, 0x1b, 0x8c, 0xaa, 0x22, 0x4b, 0x75, 0x70, 0x65, 0xb3, - 0xf1, 0x72, 0x62, 0x2a, 0x77, 0x2d, 0x2f, 0x6d, 0xc2, 0x52, 0x58, 0x56, 0x7b, 0xec, 0xb5, 0xb4, - 0xcd, 0xdf, 0x4a, 0xbb, 0xbc, 0x58, 0x9e, 0xb2, 0xf0, 0x43, 0xaf, 0x21, 0x7f, 0x33, 0x30, 0xa9, - 0x9b, 0x0d, 0x7a, 0x8c, 0xec, 0xf1, 0x83, 0xf4, 0x57, 0x01, 0x6a, 0xe3, 0xd8, 0x42, 0x26, 0x3e, - 0x13, 0x40, 0xf2, 0x87, 0x8a, 0xe3, 0x0b, 0xe5, 0x51, 0xfa, 0x0b, 0x65, 0xb8, 0x3b, 0x2c, 0xf5, - 0x11, 0x3c, 0x49, 0x1d, 0xa4, 0x64, 0xcd, 0x30, 0x46, 0xa7, 0xe4, 0x05, 0x40, 0xaf, 0x7f, 0x21, - 0xd8, 0xbb, 0x55, 0xde, 0xec, 0xaa, 0x41, 0xb3, 0xab, 0xf2, 0x7e, 0x8a, 0xcd, 0xae, 0xba, 0xad, - 0xb6, 0x28, 0xea, 0xd6, 0x63, 0x9a, 0xd2, 0x67, 0x39, 0x24, 0x71, 0x44, 0xef, 0xe3, 0x92, 0x98, - 0xff, 0xff, 0x90, 0x48, 0x36, 0x12, 0x7c, 0xe4, 0x18, 0x1f, 0xef, 0x0f, 0xe5, 0x83, 0x47, 0x93, - 0x20, 0xe4, 0x23, 0xb8, 0x13, 0xbd, 0xf7, 0xd0, 0x78, 0xd2, 0x71, 0x76, 0x51, 0x7e, 0x2e, 0xc0, - 0xdd, 0x61, 0xfa, 0xc8, 0xe1, 0x27, 0x50, 0xb2, 0x53, 0x25, 0x30, 0x9d, 0x8b, 0x03, 0x9a, 0x59, - 0xaa, 0x0e, 0x52, 0x35, 0xc0, 0xa2, 0x64, 0x61, 0x54, 0x6b, 0x86, 0x91, 0x1d, 0xd5, 0x45, 0xd5, - 0xd5, 0xbf, 0x42, 0x1e, 0x32, 0x3c, 0x8e, 0xc0, 0x43, 0xfe, 0x62, 0x79, 0xb8, 0xb8, 0x32, 0x59, - 0x86, 0xd9, 0x30, 0xcd, 0xec, 0xed, 0x87, 0x7e, 0xdc, 0xec, 0xea, 0xb0, 0xe1, 0x9d, 0x01, 0x5a, - 0xc8, 0xc5, 0xc7, 0x30, 0x4d, 0xe3, 0x37, 0x30, 0x03, 0xb7, 0xd3, 0x29, 0x48, 0xd8, 0xc0, 0xc8, - 0x93, 0xfa, 0x52, 0x13, 0x71, 0xae, 0x19, 0x46, 0x2a, 0xce, 0x8b, 0xca, 0xf7, 0x9f, 0x04, 0x0c, - 0xed, 0xb4, 0xa3, 0xc1, 0xa1, 0xe5, 0xcf, 0x13, 0xda, 0xc5, 0xe5, 0x52, 0xc5, 0x49, 0x70, 0xcf, - 0xa5, 0x0e, 0x9b, 0x53, 0x62, 0x7d, 0x5b, 0x6d, 0x34, 0x1c, 0xea, 0xba, 0x61, 0xdf, 0xc6, 0x63, - 0xbc, 0xa3, 0xe7, 0x92, 0x1d, 0x3d, 0xea, 0xce, 0xf9, 0x78, 0x77, 0xfe, 0x14, 0x47, 0xb3, 0x98, - 0x0b, 0xa4, 0x65, 0x03, 0xa6, 0x34, 0xcb, 0x74, 0xfd, 0x76, 0xd4, 0x73, 0xc6, 0x9a, 0xa5, 0x22, - 0xe5, 0xc0, 0x71, 0x5b, 0x3d, 0x7e, 0xba, 0x87, 0x23, 0x14, 0x3f, 0x48, 0x8f, 0xe1, 0x16, 0x73, - 0xbc, 0x1b, 0xac, 0x45, 0x5a, 0xd4, 0xce, 0xb7, 0x74, 0xd7, 0x1b, 0x3a, 0x9d, 0x48, 0x6d, 0x98, - 0x1b, 0xac, 0x7c, 0xe1, 0xc3, 0xa0, 0xf4, 0xf7, 0x3c, 0x94, 0x79, 0x0d, 0x69, 0x9a, 0xe5, 0x9b, - 0xde, 0xa6, 0xd9, 0xb4, 0xe2, 0x3c, 0xd9, 0xc9, 0xb6, 0x32, 0x1e, 0x4f, 0xd1, 0xf8, 0xf4, 0x14, - 0x0a, 0xcd, 0x70, 0x80, 0x1f, 0xdb, 0x0c, 0xaa, 0x26, 0xb2, 0x96, 0x3f, 0x03, 0x9a, 0x28, 0x6b, - 0x1b, 0x30, 0xe5, 0x9b, 0x6c, 0xb6, 0x6f, 0x94, 0x27, 0xce, 0x60, 0x28, 0x54, 0x26, 0x3b, 0x70, - 0x35, 0xbe, 0x72, 0xb1, 0xf9, 0x2b, 0x78, 0x1e, 0x12, 0xc6, 0x12, 0x4b, 0xd9, 0x6e, 0xec, 0xc0, - 0xcc, 0x09, 0xf5, 0x84, 0x09, 0xf2, 0x04, 0x2e, 0xe3, 0xf8, 0x56, 0x2e, 0x30, 0x6b, 0x95, 0xbe, - 0x67, 0x15, 0x37, 0xb8, 0xe0, 0x55, 0x1c, 0xfc, 0x40, 0x23, 0xa1, 0x92, 0xb4, 0x03, 0xdf, 0x60, - 0xe9, 0x7c, 0xde, 0x6c, 0x52, 0xcd, 0xd3, 0x8f, 0xe8, 0x36, 0x5b, 0x70, 0xc3, 0xba, 0x13, 0xfb, - 0x2a, 0xbf, 0x18, 0xa3, 0xa5, 0x04, 0x85, 0x60, 0x32, 0x8f, 0x1e, 0x2f, 0x3c, 0x49, 0x75, 0x7c, - 0x9d, 0x9d, 0x32, 0x89, 0x55, 0x52, 0x83, 0x02, 0xdf, 0xa2, 0xf1, 0x59, 0x12, 0xfb, 0x10, 0x07, - 0x7b, 0x76, 0x15, 0x75, 0x50, 0x52, 0xfa, 0x8d, 0x80, 0xab, 0xce, 0x6e, 0xe3, 0xb0, 0x7f, 0x6c, - 0xde, 0x80, 0xcb, 0xe1, 0xec, 0xcf, 0x0d, 0x7e, 0x2b, 0xfd, 0x75, 0x35, 0x60, 0x55, 0xaa, 0x87, - 0xda, 0xe4, 0x3a, 0x14, 0xda, 0xea, 0xb1, 0xa2, 0xf9, 0xf1, 0xc7, 0xd3, 0x27, 0x0b, 0x30, 0x11, - 0x44, 0xc6, 0x5e, 0x16, 0x57, 0x6a, 0x37, 0xfa, 0xb2, 0x65, 0x53, 0xad, 0xba, 0x6b, 0x53, 0xad, - 0xce, 0x84, 0xa4, 0x87, 0xb8, 0x63, 0x7c, 0xd7, 0x32, 0xbd, 0x03, 0xe3, 0x64, 0x5b, 0x3d, 0xb1, - 0x7c, 0x2f, 0xc6, 0xa6, 0x1d, 0x9f, 0x5d, 0x63, 0x1b, 0x83, 0xb4, 0x8c, 0xab, 0x41, 0x9f, 0x22, - 0xc6, 0x58, 0x82, 0x82, 0xda, 0x0e, 0x9e, 0x37, 0xa6, 0x37, 0x51, 0xc7, 0x53, 0xed, 0xd7, 0x25, - 0x98, 0x64, 0x6a, 0xe4, 0x67, 0x02, 0x14, 0xf8, 0x0e, 0x4d, 0xee, 0x65, 0xc4, 0x9f, 0x58, 0xd9, - 0xc5, 0xf9, 0x11, 0x24, 0x39, 0x02, 0xe9, 0xbd, 0x9f, 0x7e, 0xfd, 0xdf, 0x5f, 0xe6, 0x2a, 0x64, - 0x56, 0xce, 0xf8, 0x02, 0x43, 0x7e, 0x25, 0x40, 0xb1, 0xb7, 0x8f, 0x2c, 0x64, 0x99, 0xef, 0x5b, - 0xe9, 0xc5, 0xc5, 0xd1, 0x84, 0x11, 0xce, 0x12, 0x83, 0xb3, 0x40, 0xe6, 0xe5, 0xcc, 0x6f, 0x30, - 0xae, 0xdc, 0xc1, 0x17, 0x65, 0x97, 0xfc, 0x56, 0x00, 0xe8, 0xa5, 0x9f, 0x2c, 0x8e, 0x58, 0x25, - 0x1c, 0xdd, 0x78, 0x35, 0x25, 0xad, 0x32, 0x78, 0x2b, 0x64, 0x39, 0x1d, 0x5e, 0x8b, 0x46, 0xfb, - 0x6a, 0x0f, 0xa0, 0xdc, 0xe1, 0x8b, 0x65, 0x97, 0xfc, 0x4d, 0x80, 0xe9, 0xc4, 0x8a, 0x48, 0xe4, - 0x0c, 0xf7, 0x69, 0xeb, 0xac, 0xf8, 0xc1, 0xe8, 0x0a, 0x08, 0xb9, 0xce, 0x20, 0x6f, 0x91, 0x97, - 0xe9, 0x90, 0x8f, 0x98, 0x52, 0x06, 0x6a, 0xb9, 0x13, 0x92, 0xde, 0x95, 0x3b, 0xac, 0xa3, 0x76, - 0xc9, 0xcf, 0x73, 0x20, 0xed, 0x8d, 0xb0, 0x18, 0x64, 0x93, 0x3b, 0xf2, 0xc6, 0x25, 0x7e, 0xfb, - 0xfc, 0x86, 0x90, 0x8d, 0x2d, 0xc6, 0xc6, 0x0b, 0xf2, 0x4c, 0x3e, 0xc7, 0xe7, 0x3a, 0xb9, 0xc3, - 0x46, 0xca, 0x2e, 0xf9, 0x49, 0x0e, 0xee, 0x0c, 0x77, 0xbe, 0x66, 0x18, 0x99, 0x54, 0x8c, 0xb3, - 0x7c, 0x66, 0x52, 0x31, 0xd6, 0x1e, 0x29, 0x3d, 0x63, 0x54, 0x3c, 0x21, 0xab, 0xe7, 0xa1, 0x82, - 0x7c, 0x2d, 0x40, 0x29, 0x7d, 0x1d, 0x20, 0x8f, 0x87, 0x3c, 0x5b, 0x59, 0xcb, 0x90, 0xb8, 0x7a, - 0x36, 0x65, 0x8c, 0xed, 0x09, 0x8b, 0xed, 0x11, 0x59, 0x91, 0xc7, 0xfa, 0x94, 0x1b, 0x25, 0xf6, - 0x1f, 0x02, 0xdc, 0x4c, 0x77, 0x11, 0x24, 0xf3, 0x71, 0x76, 0x0e, 0xce, 0x1e, 0xd8, 0xd0, 0x85, - 0x4d, 0x5a, 0x61, 0x81, 0x7d, 0x40, 0xaa, 0xe3, 0x05, 0x46, 0xfe, 0x28, 0xc0, 0x74, 0x62, 0xae, - 0x27, 0xb5, 0x6c, 0x82, 0xd3, 0x36, 0x16, 0xf1, 0xfe, 0x58, 0x3a, 0x08, 0x79, 0x99, 0x41, 0xae, - 0x92, 0x45, 0x79, 0x84, 0x0f, 0xf8, 0x51, 0x06, 0x7e, 0x27, 0xc0, 0xb5, 0x84, 0xbd, 0x80, 0xf8, - 0x5a, 0x36, 0x77, 0x63, 0x63, 0x1e, 0xb4, 0x30, 0x49, 0x8b, 0x0c, 0xf3, 0x5d, 0xf2, 0xde, 0x28, - 0x98, 0xc9, 0x17, 0x02, 0x14, 0xa3, 0xed, 0x22, 0xb3, 0x3b, 0xf6, 0xaf, 0x39, 0x99, 0xdd, 0xf1, - 0xd4, 0xc2, 0x32, 0xac, 0xfd, 0xf8, 0x2e, 0x75, 0xf8, 0xdf, 0x08, 0xe4, 0x0e, 0x6e, 0x4b, 0xdd, - 0x58, 0xa3, 0xfc, 0x8b, 0x00, 0x6f, 0xa7, 0xac, 0x13, 0xe4, 0x41, 0x06, 0x86, 0xc1, 0xbb, 0x8b, - 0xb8, 0x32, 0xae, 0x1a, 0x06, 0xf1, 0x11, 0x0b, 0xe2, 0x21, 0x79, 0x90, 0x1e, 0x84, 0xcb, 0x54, - 0x7b, 0x1f, 0x45, 0x15, 0x43, 0x77, 0xbd, 0x58, 0x14, 0x7f, 0x16, 0xe0, 0xad, 0xbe, 0x11, 0x94, - 0x2c, 0x65, 0x40, 0x49, 0x9f, 0x80, 0xc5, 0xda, 0x38, 0x2a, 0x88, 0x7c, 0x9d, 0x21, 0x5f, 0x25, - 0x1f, 0x0e, 0xa8, 0x8a, 0x50, 0x4d, 0xe1, 0xd3, 0xad, 0xdc, 0x09, 0x67, 0xea, 0xae, 0xdc, 0xe1, - 0x43, 0x74, 0x97, 0xfc, 0x5e, 0x80, 0xe9, 0xc4, 0x2c, 0x98, 0x39, 0x03, 0xa4, 0x8d, 0x9b, 0x99, - 0x33, 0x40, 0xea, 0x98, 0x29, 0x3d, 0x64, 0xc0, 0x97, 0x88, 0x9c, 0x0e, 0xbc, 0xcd, 0x95, 0x82, - 0x82, 0xb6, 0x7c, 0x2f, 0xd6, 0xf0, 0xc9, 0xe7, 0x02, 0x40, 0x6f, 0x34, 0xbf, 0xc0, 0xd9, 0xea, - 0xf4, 0xbc, 0x2f, 0xcd, 0x33, 0x90, 0xb7, 0xc9, 0xbb, 0x03, 0xea, 0xa2, 0x71, 0x18, 0x4e, 0x29, - 0xeb, 0x6b, 0x5f, 0xbe, 0xae, 0x08, 0x5f, 0xbd, 0xae, 0x08, 0xff, 0x79, 0x5d, 0x11, 0x7e, 0xf1, - 0xa6, 0x72, 0xe9, 0xab, 0x37, 0x95, 0x4b, 0xff, 0x7c, 0x53, 0xb9, 0xf4, 0xc3, 0xf7, 0x5b, 0xba, - 0x77, 0xe0, 0xef, 0x57, 0x35, 0xab, 0x9d, 0x34, 0x73, 0x1c, 0x19, 0xf2, 0x4e, 0x6c, 0xea, 0xee, - 0x17, 0xd8, 0x9f, 0xbc, 0xee, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x4d, 0xa3, 0xd1, 0x11, - 0x1d, 0x00, 0x00, + 0x2b, 0x08, 0x2d, 0x5a, 0xf4, 0xba, 0x28, 0xd0, 0xed, 0xa1, 0x40, 0x8f, 0x8b, 0x16, 0x45, 0xd1, + 0xde, 0x0b, 0xf4, 0x56, 0xb4, 0xd8, 0x4b, 0x8b, 0x05, 0x72, 0xe9, 0xa5, 0x45, 0x91, 0xf4, 0x0f, + 0x29, 0xf8, 0xde, 0x90, 0x22, 0x65, 0x8a, 0x92, 0x6c, 0xa3, 0x97, 0xc4, 0x8f, 0x9c, 0x8f, 0xdf, + 0xfc, 0x66, 0xc8, 0x99, 0xa1, 0x60, 0xce, 0x50, 0x0f, 0x55, 0x93, 0x7a, 0x72, 0xf0, 0xbf, 0x6c, + 0xab, 0xba, 0xa3, 0x9b, 0x2d, 0xf9, 0xa5, 0x4f, 0x9d, 0xe3, 0xaa, 0xed, 0x58, 0x9e, 0x45, 0x66, + 0x50, 0xa2, 0x1a, 0xfc, 0x5f, 0x45, 0x09, 0x71, 0xa6, 0x65, 0xb5, 0x2c, 0x26, 0x20, 0x07, 0x7f, + 0x71, 0x59, 0x71, 0xb6, 0x65, 0x59, 0x2d, 0x83, 0xca, 0xaa, 0xad, 0xcb, 0xaa, 0x69, 0x5a, 0x9e, + 0xea, 0xe9, 0x96, 0xe9, 0xe2, 0xdd, 0x6f, 0x68, 0x96, 0xdb, 0xb6, 0x5c, 0x79, 0x4f, 0x75, 0x29, + 0x77, 0x21, 0x1f, 0x2e, 0xee, 0x51, 0x4f, 0x5d, 0x94, 0x6d, 0xb5, 0xa5, 0x9b, 0x4c, 0x18, 0x65, + 0xdf, 0x4d, 0xc5, 0x65, 0xab, 0x8e, 0xda, 0x0e, 0xcd, 0xcd, 0xa7, 0x8a, 0x50, 0xdb, 0xd2, 0xf6, + 0x15, 0x5b, 0x3d, 0x6e, 0x53, 0xd3, 0x0b, 0x45, 0x67, 0x13, 0xa2, 0xae, 0x4d, 0x35, 0xf6, 0x0f, + 0xde, 0xbd, 0x91, 0x34, 0x64, 0xa8, 0xa6, 0x2b, 0xdb, 0x96, 0xa1, 0x6b, 0x48, 0x81, 0x78, 0x2f, + 0x1d, 0x8c, 0x63, 0x1d, 0xea, 0x0d, 0xea, 0x84, 0xce, 0x14, 0xd7, 0xb3, 0x1c, 0xb5, 0x45, 0x51, + 0x69, 0x35, 0x55, 0xc9, 0x37, 0xf5, 0x97, 0x3e, 0xed, 0x57, 0x51, 0x34, 0x43, 0x0f, 0x8e, 0xa1, + 0x49, 0x34, 0x71, 0x37, 0x61, 0x82, 0x45, 0x86, 0x0a, 0xb2, 0xeb, 0xa9, 0x07, 0x54, 0xa1, 0xa6, + 0x17, 0xe6, 0x49, 0x5c, 0x48, 0xc6, 0xe8, 0xef, 0xb9, 0x9a, 0xa3, 0xdb, 0x01, 0xa5, 0x89, 0x03, + 0x4a, 0xdf, 0x4c, 0xa2, 0x73, 0xac, 0x4f, 0xa8, 0xe6, 0xb9, 0xe1, 0x1f, 0x5c, 0x48, 0x9a, 0x01, + 0xb2, 0x1d, 0xa4, 0x69, 0x8b, 0xd1, 0x5e, 0xa7, 0x2f, 0x7d, 0xea, 0x7a, 0xd2, 0x36, 0xbc, 0x9d, + 0xb8, 0xea, 0xda, 0x96, 0xe9, 0x52, 0xf2, 0x21, 0x14, 0x78, 0x7a, 0xca, 0xc2, 0x9c, 0x70, 0xe7, + 0x52, 0x6d, 0xb6, 0x9a, 0x56, 0x38, 0x55, 0xae, 0xb5, 0x36, 0xf1, 0xe5, 0xbf, 0x6f, 0x5c, 0xa8, + 0xa3, 0x86, 0xb4, 0x0d, 0x57, 0xb9, 0x49, 0x8c, 0x3f, 0xf4, 0x45, 0xca, 0x70, 0x51, 0xdb, 0x57, + 0x75, 0x73, 0xe3, 0x29, 0xb3, 0x5a, 0xac, 0x87, 0x47, 0x52, 0x01, 0x70, 0xf7, 0xad, 0x4f, 0x9f, + 0x3b, 0xd6, 0x0f, 0xa9, 0x59, 0xce, 0xcd, 0x09, 0x77, 0xa6, 0xea, 0xb1, 0x2b, 0x52, 0x17, 0x4a, + 0xfd, 0x26, 0x11, 0xe8, 0xb7, 0x01, 0x18, 0x7b, 0xcf, 0x02, 0xf2, 0xca, 0xc2, 0x5c, 0xfe, 0xce, + 0xa5, 0xda, 0xad, 0x24, 0xd8, 0x38, 0xd5, 0xd5, 0x9d, 0x48, 0x18, 0x51, 0xc7, 0xd4, 0x49, 0x09, + 0x0a, 0x96, 0xef, 0xd9, 0xbe, 0xc7, 0x20, 0x14, 0xeb, 0x78, 0x92, 0x5e, 0xa0, 0xfb, 0x75, 0xea, + 0x6d, 0xf1, 0xc8, 0x87, 0x87, 0x54, 0x82, 0x02, 0xaf, 0x83, 0xd0, 0x16, 0x3f, 0x49, 0x7f, 0xc8, + 0xc1, 0xb5, 0x13, 0xc6, 0x30, 0x98, 0x0d, 0x28, 0x86, 0x45, 0xe3, 0x9e, 0x26, 0x96, 0x9e, 0x36, + 0xb9, 0x09, 0xd3, 0x9a, 0xef, 0x38, 0x41, 0x1d, 0x32, 0x1d, 0x86, 0x62, 0xa2, 0x7e, 0x19, 0x2f, + 0x3e, 0x0b, 0xae, 0x91, 0x87, 0x70, 0xdd, 0xd3, 0xdb, 0x54, 0x31, 0x68, 0xd3, 0x53, 0x3c, 0x4b, + 0x31, 0xe9, 0x91, 0xa7, 0x60, 0x6e, 0xcb, 0x79, 0xa6, 0x70, 0x35, 0x10, 0xd8, 0xa4, 0x4d, 0xef, + 0x7b, 0xd6, 0x77, 0xe9, 0x51, 0x88, 0x98, 0xdc, 0x87, 0x6b, 0xc1, 0x33, 0xa7, 0x18, 0xaa, 0xeb, + 0x29, 0xbe, 0xdd, 0x50, 0x3d, 0xda, 0x50, 0xf6, 0x0c, 0x4b, 0x3b, 0x28, 0x4f, 0x30, 0xbd, 0x99, + 0xe0, 0xf6, 0xa6, 0xea, 0x7a, 0xbb, 0xfc, 0xe6, 0x5a, 0x70, 0x8f, 0x2c, 0xc2, 0x55, 0x26, 0xa4, + 0x58, 0xcd, 0xa4, 0xb3, 0x49, 0xa6, 0x44, 0xd8, 0xcd, 0x8f, 0x9b, 0x31, 0x4f, 0xd2, 0x8f, 0xe0, + 0x3a, 0xa3, 0xeb, 0xfb, 0xd4, 0xd1, 0x9b, 0xc7, 0x67, 0xa5, 0x9f, 0x88, 0x30, 0x15, 0x92, 0xc4, + 0x22, 0x2c, 0xd6, 0xa3, 0x33, 0x99, 0x81, 0xc9, 0x78, 0x08, 0xfc, 0x20, 0x7d, 0x21, 0x80, 0x98, + 0x86, 0x00, 0x73, 0x36, 0x03, 0x93, 0x87, 0xaa, 0xa1, 0x37, 0x18, 0x80, 0xa9, 0x3a, 0x3f, 0x90, + 0x79, 0xb8, 0x12, 0x84, 0x46, 0x1b, 0x4a, 0x2f, 0xa1, 0x9c, 0xd0, 0xb7, 0xf8, 0xf5, 0xa8, 0x92, + 0xc9, 0x1c, 0x5c, 0xd6, 0x7c, 0xc5, 0xa6, 0x0e, 0x26, 0x8a, 0x3b, 0x07, 0xcd, 0xdf, 0xa2, 0x0e, + 0x4f, 0xd3, 0x3b, 0x00, 0xf8, 0x28, 0x2b, 0x7a, 0x83, 0x51, 0x55, 0x64, 0xa9, 0x0e, 0xae, 0x6c, + 0x34, 0x5e, 0x4c, 0x4c, 0xe5, 0xae, 0xe4, 0xa5, 0x0d, 0x58, 0x0c, 0xcb, 0x6a, 0x97, 0xbd, 0x96, + 0xb6, 0xf8, 0x5b, 0x69, 0x87, 0x17, 0xcb, 0x13, 0x16, 0x7e, 0xe8, 0x35, 0xe4, 0x6f, 0x06, 0x26, + 0x75, 0xb3, 0x41, 0x8f, 0x90, 0x3d, 0x7e, 0x90, 0xfe, 0x2a, 0x40, 0x6d, 0x1c, 0x5b, 0xc8, 0xc4, + 0x67, 0x02, 0x48, 0xfe, 0x50, 0x71, 0x7c, 0xa1, 0x3c, 0x4c, 0x7f, 0xa1, 0x0c, 0x77, 0x87, 0xa5, + 0x3e, 0x82, 0x27, 0xa9, 0x83, 0x94, 0xac, 0x1a, 0xc6, 0xe8, 0x94, 0x3c, 0x07, 0xe8, 0xf5, 0x2f, + 0x04, 0x7b, 0xbb, 0xca, 0x9b, 0x5d, 0x35, 0x68, 0x76, 0x55, 0xde, 0x4f, 0xb1, 0xd9, 0x55, 0xb7, + 0xd4, 0x16, 0x45, 0xdd, 0x7a, 0x4c, 0x53, 0xfa, 0x2c, 0x87, 0x24, 0x8e, 0xe8, 0x7d, 0x5c, 0x12, + 0xf3, 0xff, 0x1f, 0x12, 0xc9, 0x7a, 0x82, 0x8f, 0x1c, 0xe3, 0xe3, 0xfd, 0xa1, 0x7c, 0xf0, 0x68, + 0x12, 0x84, 0x7c, 0x04, 0xb7, 0xa2, 0xf7, 0x1e, 0x1a, 0x4f, 0x3a, 0xce, 0x2e, 0xca, 0xcf, 0x05, + 0xb8, 0x3d, 0x4c, 0x1f, 0x39, 0xfc, 0x04, 0x4a, 0x76, 0xaa, 0x04, 0xa6, 0x73, 0x61, 0x40, 0x33, + 0x4b, 0xd5, 0x41, 0xaa, 0x06, 0x58, 0x94, 0x2c, 0x8c, 0x6a, 0xd5, 0x30, 0xb2, 0xa3, 0x3a, 0xaf, + 0xba, 0xfa, 0x57, 0xc8, 0x43, 0x86, 0xc7, 0x11, 0x78, 0xc8, 0x9f, 0x2f, 0x0f, 0xe7, 0x57, 0x26, + 0x4b, 0x30, 0x1b, 0xa6, 0x99, 0xbd, 0xfd, 0xd0, 0x8f, 0x9b, 0x5d, 0x1d, 0x36, 0xbc, 0x33, 0x40, + 0x0b, 0xb9, 0xf8, 0x18, 0xa6, 0x69, 0xfc, 0x06, 0x66, 0xe0, 0x66, 0x3a, 0x05, 0x09, 0x1b, 0x18, + 0x79, 0x52, 0x5f, 0x6a, 0x22, 0xce, 0x55, 0xc3, 0x48, 0xc5, 0x79, 0x5e, 0xf9, 0xfe, 0x93, 0x80, + 0xa1, 0x9d, 0x74, 0x34, 0x38, 0xb4, 0xfc, 0x59, 0x42, 0x3b, 0xbf, 0x5c, 0xaa, 0x38, 0x09, 0xee, + 0xba, 0xd4, 0x61, 0x73, 0x4a, 0xac, 0x6f, 0xab, 0x8d, 0x86, 0x43, 0x5d, 0x37, 0xec, 0xdb, 0x78, + 0x8c, 0x77, 0xf4, 0x5c, 0xb2, 0xa3, 0x47, 0xdd, 0x39, 0x1f, 0xef, 0xce, 0x9f, 0xe2, 0x68, 0x16, + 0x73, 0x81, 0xb4, 0xac, 0xc3, 0x94, 0x66, 0x99, 0xae, 0xdf, 0x8e, 0x7a, 0xce, 0x58, 0xb3, 0x54, + 0xa4, 0x1c, 0x38, 0x6e, 0xab, 0x47, 0x4f, 0x76, 0x71, 0x84, 0xe2, 0x07, 0xe9, 0x11, 0xdc, 0x60, + 0x8e, 0x77, 0x82, 0xb5, 0x48, 0x8b, 0xda, 0xf9, 0xa6, 0xee, 0x7a, 0x43, 0xa7, 0x13, 0xa9, 0x0d, + 0x73, 0x83, 0x95, 0xcf, 0x7d, 0x18, 0x94, 0xfe, 0x9e, 0x87, 0x32, 0xaf, 0x21, 0x4d, 0xb3, 0x7c, + 0xd3, 0xdb, 0x30, 0x9b, 0x56, 0x9c, 0x27, 0x3b, 0xd9, 0x56, 0xc6, 0xe3, 0x29, 0x1a, 0x9f, 0x9e, + 0x40, 0xa1, 0x19, 0x0e, 0xf0, 0x63, 0x9b, 0x41, 0xd5, 0x44, 0xd6, 0xf2, 0xa7, 0x40, 0x13, 0x65, + 0x6d, 0x1d, 0xa6, 0x7c, 0x93, 0xcd, 0xf6, 0x8d, 0xf2, 0xc4, 0x29, 0x0c, 0x85, 0xca, 0x64, 0x1b, + 0x2e, 0xc7, 0x57, 0x2e, 0x36, 0x7f, 0x05, 0xcf, 0x43, 0xc2, 0x58, 0x62, 0x29, 0xdb, 0x89, 0x1d, + 0x98, 0x39, 0xa1, 0x9e, 0x30, 0x41, 0x1e, 0xc3, 0x45, 0x1c, 0xdf, 0xca, 0x05, 0x66, 0xad, 0xd2, + 0xf7, 0xac, 0xe2, 0x06, 0x17, 0xbc, 0x8a, 0x83, 0x3f, 0xd0, 0x48, 0xa8, 0x24, 0x6d, 0xc3, 0xd7, + 0x59, 0x3a, 0x9f, 0x35, 0x9b, 0x54, 0xf3, 0xf4, 0x43, 0xba, 0xc5, 0x16, 0xdc, 0xb0, 0xee, 0xc4, + 0xbe, 0xca, 0x2f, 0xc6, 0x68, 0x29, 0x41, 0x21, 0x98, 0xcc, 0xa3, 0xc7, 0x0b, 0x4f, 0xd2, 0x2f, + 0x05, 0x7c, 0x9f, 0x9d, 0xb0, 0x89, 0x65, 0x52, 0x83, 0x02, 0x5f, 0xa3, 0xf1, 0x61, 0x12, 0xfb, + 0x20, 0x07, 0x8b, 0x76, 0x15, 0x75, 0x50, 0x92, 0xac, 0xc2, 0xd7, 0x6c, 0x6a, 0x36, 0x74, 0xb3, + 0xa5, 0xa0, 0x6e, 0x6e, 0xa8, 0xee, 0x34, 0x6a, 0xf0, 0xa3, 0xf4, 0x1b, 0x01, 0xd7, 0xa5, 0x9d, + 0xc6, 0x41, 0xff, 0xe8, 0xbd, 0x0e, 0x17, 0xc3, 0xfd, 0x81, 0x63, 0xfa, 0x66, 0xfa, 0x2b, 0x6f, + 0xc0, 0xba, 0x55, 0x0f, 0xb5, 0xc9, 0x55, 0x28, 0xb4, 0xd5, 0x23, 0x45, 0xf3, 0xe3, 0x8f, 0xb8, + 0x4f, 0xee, 0xc2, 0x44, 0xc0, 0x0e, 0x7b, 0xe1, 0x5c, 0xaa, 0x5d, 0xeb, 0xcb, 0xb8, 0x4d, 0xb5, + 0xea, 0x8e, 0x4d, 0xb5, 0x3a, 0x13, 0x92, 0x1e, 0xe0, 0x9e, 0xf2, 0x1d, 0xcb, 0xf4, 0xf6, 0x8d, + 0xe3, 0x2d, 0xf5, 0xd8, 0xf2, 0xbd, 0x58, 0x46, 0xec, 0xf8, 0xfc, 0x1b, 0xdb, 0x3a, 0xa4, 0x25, + 0x5c, 0x2f, 0xfa, 0x14, 0x31, 0xc6, 0x12, 0x14, 0xd4, 0x76, 0xf0, 0xcc, 0x32, 0xbd, 0x89, 0x3a, + 0x9e, 0x6a, 0xbf, 0x2e, 0xc1, 0x24, 0x53, 0x23, 0x3f, 0x15, 0xa0, 0xc0, 0xf7, 0x70, 0x72, 0x27, + 0x23, 0xfe, 0xc4, 0xda, 0x2f, 0xce, 0x8f, 0x20, 0xc9, 0x11, 0x48, 0xef, 0xfd, 0xe4, 0xd5, 0x7f, + 0x7f, 0x91, 0xab, 0x90, 0x59, 0x39, 0xe3, 0x2b, 0x0e, 0xf9, 0x95, 0x00, 0xc5, 0xde, 0x4e, 0x73, + 0x37, 0xcb, 0x7c, 0xdf, 0x67, 0x01, 0x71, 0x61, 0x34, 0x61, 0x84, 0xb3, 0xc8, 0xe0, 0xdc, 0x25, + 0xf3, 0x72, 0xe6, 0x77, 0x1c, 0x57, 0xee, 0xe0, 0xcb, 0xb6, 0x4b, 0x7e, 0x2b, 0x00, 0xf4, 0xd2, + 0x4f, 0x16, 0x46, 0xac, 0x12, 0x8e, 0x6e, 0xbc, 0x9a, 0x92, 0x56, 0x18, 0xbc, 0x65, 0xb2, 0x94, + 0x0e, 0xaf, 0x45, 0xa3, 0x9d, 0xb7, 0x07, 0x50, 0xee, 0xf0, 0xe5, 0xb4, 0x4b, 0xfe, 0x26, 0xc0, + 0x74, 0x62, 0xcd, 0x24, 0x72, 0x86, 0xfb, 0xb4, 0x95, 0x58, 0xfc, 0x60, 0x74, 0x05, 0x84, 0x5c, + 0x67, 0x90, 0x37, 0xc9, 0x8b, 0x74, 0xc8, 0x87, 0x4c, 0x29, 0x03, 0xb5, 0xdc, 0x09, 0x49, 0xef, + 0xca, 0x1d, 0xd6, 0x95, 0xbb, 0xe4, 0x67, 0x39, 0x90, 0x76, 0x47, 0x58, 0x2e, 0xb2, 0xc9, 0x1d, + 0x79, 0x6b, 0x13, 0xbf, 0x75, 0x76, 0x43, 0xc8, 0xc6, 0x26, 0x63, 0xe3, 0x39, 0x79, 0x2a, 0x9f, + 0xe1, 0x93, 0x9f, 0xdc, 0x61, 0x63, 0x69, 0x97, 0xfc, 0x38, 0x07, 0xb7, 0x86, 0x3b, 0x5f, 0x35, + 0x8c, 0x4c, 0x2a, 0xc6, 0x59, 0x60, 0x33, 0xa9, 0x18, 0x6b, 0x17, 0x95, 0x9e, 0x32, 0x2a, 0x1e, + 0x93, 0x95, 0xb3, 0x50, 0x41, 0x5e, 0x09, 0x50, 0x4a, 0x5f, 0x29, 0xc8, 0xa3, 0x21, 0xcf, 0x56, + 0xd6, 0x42, 0x25, 0xae, 0x9c, 0x4e, 0x19, 0x63, 0x7b, 0xcc, 0x62, 0x7b, 0x48, 0x96, 0xe5, 0xb1, + 0x3e, 0x07, 0x47, 0x89, 0xfd, 0x87, 0x00, 0xd7, 0xd3, 0x5d, 0x04, 0xc9, 0x7c, 0x94, 0x9d, 0x83, + 0xd3, 0x07, 0x36, 0x74, 0xe9, 0x93, 0x96, 0x59, 0x60, 0x1f, 0x90, 0xea, 0x78, 0x81, 0x91, 0x3f, + 0x0a, 0x30, 0x9d, 0xd8, 0x0d, 0x48, 0x2d, 0x9b, 0xe0, 0xb4, 0xad, 0x47, 0xbc, 0x37, 0x96, 0x0e, + 0x42, 0x5e, 0x62, 0x90, 0xab, 0x64, 0x41, 0x1e, 0xe1, 0x47, 0x80, 0x28, 0x03, 0xbf, 0x13, 0xe0, + 0x4a, 0xc2, 0x5e, 0x40, 0x7c, 0x2d, 0x9b, 0xbb, 0xb1, 0x31, 0x0f, 0x5a, 0xba, 0xa4, 0x05, 0x86, + 0xf9, 0x36, 0x79, 0x6f, 0x14, 0xcc, 0xe4, 0x0b, 0x01, 0x8a, 0xd1, 0x86, 0x92, 0xd9, 0x1d, 0xfb, + 0x57, 0xa5, 0xcc, 0xee, 0x78, 0x62, 0xe9, 0x19, 0xd6, 0x7e, 0x7c, 0x97, 0x3a, 0xfc, 0x77, 0x06, + 0xb9, 0x83, 0x1b, 0x57, 0x37, 0xd6, 0x28, 0xff, 0x22, 0xc0, 0xdb, 0x29, 0x2b, 0x09, 0xb9, 0x9f, + 0x81, 0x61, 0xf0, 0xfe, 0x23, 0x2e, 0x8f, 0xab, 0x86, 0x41, 0x7c, 0xc4, 0x82, 0x78, 0x40, 0xee, + 0xa7, 0x07, 0xe1, 0x32, 0xd5, 0xde, 0x87, 0x55, 0xc5, 0xd0, 0x5d, 0x2f, 0x16, 0xc5, 0x9f, 0x05, + 0x78, 0xab, 0x6f, 0x8a, 0x25, 0x8b, 0x19, 0x50, 0xd2, 0xa7, 0x68, 0xb1, 0x36, 0x8e, 0x0a, 0x22, + 0x5f, 0x63, 0xc8, 0x57, 0xc8, 0x87, 0x03, 0xaa, 0x22, 0x54, 0xc3, 0x71, 0x58, 0xee, 0x84, 0x73, + 0x79, 0x57, 0xee, 0xf0, 0x41, 0xbc, 0x4b, 0x7e, 0x2f, 0xc0, 0x74, 0x62, 0x16, 0xcc, 0x9c, 0x01, + 0xd2, 0xc6, 0xcd, 0xcc, 0x19, 0x20, 0x75, 0xcc, 0x94, 0x1e, 0x30, 0xe0, 0x8b, 0x44, 0x4e, 0x07, + 0xde, 0xe6, 0x4a, 0x41, 0x41, 0x5b, 0xbe, 0x17, 0x6b, 0xf8, 0xe4, 0x73, 0x01, 0xa0, 0x37, 0x9a, + 0x9f, 0xe3, 0x6c, 0x75, 0x72, 0xde, 0x97, 0xe6, 0x19, 0xc8, 0x9b, 0xe4, 0xdd, 0x01, 0x75, 0xd1, + 0x38, 0x08, 0xa7, 0x94, 0xb5, 0xd5, 0x2f, 0x5f, 0x57, 0x84, 0xaf, 0x5e, 0x57, 0x84, 0xff, 0xbc, + 0xae, 0x08, 0x3f, 0x7f, 0x53, 0xb9, 0xf0, 0xd5, 0x9b, 0xca, 0x85, 0x7f, 0xbe, 0xa9, 0x5c, 0xf8, + 0xc1, 0xfb, 0x2d, 0xdd, 0xdb, 0xf7, 0xf7, 0xaa, 0x9a, 0xd5, 0x4e, 0x9a, 0x39, 0x8a, 0x0c, 0x79, + 0xc7, 0x36, 0x75, 0xf7, 0x0a, 0xec, 0x67, 0xb3, 0x7b, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xc8, + 0x4b, 0xb5, 0x3d, 0x55, 0x1d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3441,6 +3450,18 @@ func (m *QueryEffectivePolicyResponse) MarshalToSizedBuffer(dAtA []byte) (int, e _ = i var l int _ = l + if m.PendingPolicy != nil { + { + size, err := m.PendingPolicy.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } if m.Policy != nil { { size, err := m.Policy.MarshalToSizedBuffer(dAtA[:i]) @@ -4020,6 +4041,10 @@ func (m *QueryEffectivePolicyResponse) Size() (n int) { l = m.Policy.Size() n += 1 + l + sovQuery(uint64(l)) } + if m.PendingPolicy != nil { + l = m.PendingPolicy.Size() + n += 1 + l + sovQuery(uint64(l)) + } return n } @@ -6955,6 +6980,42 @@ func (m *QueryEffectivePolicyResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PendingPolicy", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PendingPolicy == nil { + m.PendingPolicy = &types3.Policy{} + } + if err := m.PendingPolicy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) diff --git a/x/projects/keeper/grpc_query_developer.go b/x/projects/keeper/grpc_query_developer.go index b27097c3aa..21cdeb2e3b 100644 --- a/x/projects/keeper/grpc_query_developer.go +++ b/x/projects/keeper/grpc_query_developer.go @@ -21,5 +21,15 @@ func (k Keeper) Developer(goCtx context.Context, req *types.QueryDeveloperReques return nil, err } - return &types.QueryDeveloperResponse{Project: &project}, nil + nextEpoch, err := k.epochstorageKeeper.GetNextEpoch(ctx, uint64(ctx.BlockHeight())) + if err != nil { + return nil, err + } + + pendingProject, err := k.GetProjectForDeveloper(ctx, req.Developer, nextEpoch) + if err != nil || project.Equal(pendingProject) { + return &types.QueryDeveloperResponse{Project: &project}, nil + } else { + return &types.QueryDeveloperResponse{Project: &project, PendingProject: &pendingProject}, nil + } } diff --git a/x/projects/keeper/grpc_query_info.go b/x/projects/keeper/grpc_query_info.go index 8ef570a78b..f0b6c8d8b8 100644 --- a/x/projects/keeper/grpc_query_info.go +++ b/x/projects/keeper/grpc_query_info.go @@ -21,5 +21,15 @@ func (k Keeper) Info(goCtx context.Context, req *types.QueryInfoRequest) (*types return nil, err } - return &types.QueryInfoResponse{Project: &project}, nil + nextEpoch, err := k.epochstorageKeeper.GetNextEpoch(ctx, uint64(ctx.BlockHeight())) + if err != nil { + return nil, err + } + + pendingProject, err := k.GetProjectForBlock(ctx, req.Project, nextEpoch) + if err != nil || project.Equal(pendingProject) { + return &types.QueryInfoResponse{Project: &project}, nil + } else { + return &types.QueryInfoResponse{Project: &project, PendingProject: &pendingProject}, nil + } } diff --git a/x/projects/keeper/project_test.go b/x/projects/keeper/project_test.go index 2ae6c041e2..664c8e6862 100644 --- a/x/projects/keeper/project_test.go +++ b/x/projects/keeper/project_test.go @@ -1218,3 +1218,44 @@ func TestSetPolicyByGeolocation(t *testing.T) { }) } } + +func TestPendingProject(t *testing.T) { + ts := newTester(t) + ts.SetupAccounts(1, 0, 0) + + _, sub := ts.Account("sub1") + + _, err := ts.TxSubscriptionBuy(sub, sub, "free", 1) + require.Nil(t, err) + + res, err := ts.QuerySubscriptionListProjects(sub) + require.Nil(t, err) + projectID := res.Projects[0] + + adminPolicy := ts.Plan("free").PlanPolicy + _, err = ts.TxProjectSetPolicy(projectID, sub, adminPolicy) + require.Nil(t, err) + + // we didn't advance an epoch yet so querying for the project should have a pending project + infRes, err := ts.QueryProjectInfo(projectID) + require.Nil(t, err) + require.NotNil(t, infRes.PendingProject) + pendingProjAdminPolicy := infRes.PendingProject.AdminPolicy + require.True(t, adminPolicy.Equal(pendingProjAdminPolicy)) + + devRes, err := ts.QueryProjectDeveloper(sub) + require.Nil(t, err) + require.NotNil(t, infRes.PendingProject) + pendingProjAdminPolicy = devRes.PendingProject.AdminPolicy + require.True(t, adminPolicy.Equal(pendingProjAdminPolicy)) + + // advance an epoch to apply the new project settings, there should be no pending projects + ts.AdvanceEpoch() + infRes, err = ts.QueryProjectInfo(projectID) + require.Nil(t, err) + require.Nil(t, infRes.PendingProject) + + devRes, err = ts.QueryProjectDeveloper(sub) + require.Nil(t, err) + require.Nil(t, devRes.PendingProject) +} diff --git a/x/projects/types/query.pb.go b/x/projects/types/query.pb.go index d5408804bb..bf8b379c4c 100644 --- a/x/projects/types/query.pb.go +++ b/x/projects/types/query.pb.go @@ -157,7 +157,8 @@ func (m *QueryInfoRequest) GetProject() string { } type QueryInfoResponse struct { - Project *Project `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"` + Project *Project `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"` + PendingProject *Project `protobuf:"bytes,2,opt,name=pending_project,json=pendingProject,proto3" json:"pending_project,omitempty"` } func (m *QueryInfoResponse) Reset() { *m = QueryInfoResponse{} } @@ -200,6 +201,13 @@ func (m *QueryInfoResponse) GetProject() *Project { return nil } +func (m *QueryInfoResponse) GetPendingProject() *Project { + if m != nil { + return m.PendingProject + } + return nil +} + type QueryDeveloperRequest struct { Developer string `protobuf:"bytes,1,opt,name=developer,proto3" json:"developer,omitempty"` } @@ -245,7 +253,8 @@ func (m *QueryDeveloperRequest) GetDeveloper() string { } type QueryDeveloperResponse struct { - Project *Project `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"` + Project *Project `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"` + PendingProject *Project `protobuf:"bytes,2,opt,name=pending_project,json=pendingProject,proto3" json:"pending_project,omitempty"` } func (m *QueryDeveloperResponse) Reset() { *m = QueryDeveloperResponse{} } @@ -288,6 +297,13 @@ func (m *QueryDeveloperResponse) GetProject() *Project { return nil } +func (m *QueryDeveloperResponse) GetPendingProject() *Project { + if m != nil { + return m.PendingProject + } + return nil +} + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "lavanet.lava.projects.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "lavanet.lava.projects.QueryParamsResponse") @@ -300,7 +316,7 @@ func init() { func init() { proto.RegisterFile("lavanet/lava/projects/query.proto", fileDescriptor_e0c4357eb0c2f6e6) } var fileDescriptor_e0c4357eb0c2f6e6 = []byte{ - // 434 bytes of a gzipped FileDescriptorProto + // 461 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcc, 0x49, 0x2c, 0x4b, 0xcc, 0x4b, 0x2d, 0xd1, 0x07, 0xd1, 0xfa, 0x05, 0x45, 0xf9, 0x59, 0xa9, 0xc9, 0x25, 0xc5, 0xfa, 0x85, 0xa5, 0xa9, 0x45, 0x95, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xa2, 0x50, 0x25, 0x7a, @@ -313,22 +329,23 @@ var fileDescriptor_e0c4357eb0c2f6e6 = []byte{ 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0xb2, 0x7a, 0x58, 0x7d, 0xa4, 0x07, 0xd1, 0xe6, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, 0x43, 0x10, 0x54, 0x8b, 0x92, 0x0e, 0x97, 0x00, 0xd8, 0x4c, 0xcf, 0xbc, 0xb4, 0x7c, 0xa8, 0x3d, 0x42, 0x12, 0x5c, 0xec, 0x50, 0x4d, 0x60, 0x13, 0x39, 0x83, 0x60, 0x5c, - 0x25, 0x5f, 0x2e, 0x41, 0x24, 0xd5, 0x50, 0xfb, 0x2d, 0x50, 0x95, 0x73, 0x1b, 0xc9, 0xe1, 0x72, - 0x00, 0x84, 0x81, 0x30, 0xce, 0x94, 0x4b, 0x14, 0x6c, 0x9c, 0x4b, 0x6a, 0x59, 0x6a, 0x4e, 0x7e, - 0x41, 0x6a, 0x11, 0xcc, 0x05, 0x32, 0x5c, 0x9c, 0x29, 0x30, 0x31, 0xa8, 0x1b, 0x10, 0x02, 0x4a, - 0x41, 0x5c, 0x62, 0xe8, 0xda, 0x28, 0x75, 0x8a, 0xd1, 0x1e, 0x66, 0x2e, 0x56, 0xb0, 0xa1, 0x42, - 0x6d, 0x8c, 0x5c, 0x6c, 0x90, 0xa0, 0x12, 0xd2, 0xc4, 0xa1, 0x1b, 0x33, 0x6e, 0xa4, 0xb4, 0x88, - 0x51, 0x0a, 0x71, 0xa5, 0x92, 0x6a, 0xd3, 0xe5, 0x27, 0x93, 0x99, 0xe4, 0x85, 0x64, 0xf5, 0xf1, - 0xa5, 0x17, 0xa1, 0x0e, 0x46, 0x2e, 0x16, 0x50, 0x40, 0x0b, 0xa9, 0xe3, 0x33, 0x1b, 0x29, 0xe2, - 0xa4, 0x34, 0x08, 0x2b, 0x84, 0x3a, 0x41, 0x17, 0xec, 0x04, 0x75, 0x21, 0x55, 0x1c, 0x4e, 0xc8, - 0xcc, 0x4b, 0xcb, 0xd7, 0xaf, 0x86, 0x72, 0x6b, 0x85, 0xe6, 0x31, 0x72, 0x71, 0xc2, 0x43, 0x5b, - 0x48, 0x07, 0x9f, 0x35, 0xe8, 0x71, 0x29, 0xa5, 0x4b, 0xa4, 0x6a, 0xa8, 0xcb, 0x4c, 0xc0, 0x2e, - 0xd3, 0x13, 0xd2, 0xc1, 0xe1, 0x32, 0x78, 0x32, 0xd0, 0xaf, 0x86, 0x33, 0x6b, 0x9d, 0x9c, 0x4e, - 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, - 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x23, 0x3d, 0xb3, 0x24, 0xa3, 0x34, - 0x49, 0x2f, 0x39, 0x3f, 0x17, 0xd5, 0xc4, 0x0a, 0x84, 0x99, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, - 0x6c, 0xe0, 0xbc, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x00, 0x4f, 0x08, 0x34, 0x04, - 0x00, 0x00, + 0xa5, 0x69, 0x8c, 0x5c, 0x82, 0x48, 0xca, 0xa1, 0x0e, 0xb0, 0x40, 0x55, 0xcf, 0x6d, 0x24, 0x87, + 0xcb, 0x05, 0x10, 0x06, 0xdc, 0x3c, 0x21, 0x77, 0x2e, 0xfe, 0x82, 0xd4, 0xbc, 0x94, 0xcc, 0xbc, + 0xf4, 0x78, 0x98, 0x09, 0x4c, 0x44, 0x99, 0xc0, 0x07, 0xd5, 0x06, 0xe5, 0x2b, 0x99, 0x72, 0x89, + 0x82, 0xdd, 0xe5, 0x92, 0x5a, 0x96, 0x9a, 0x93, 0x5f, 0x90, 0x5a, 0x04, 0xf3, 0x8b, 0x0c, 0x17, + 0x67, 0x0a, 0x4c, 0x0c, 0xea, 0x1b, 0x84, 0x80, 0xd2, 0x6c, 0x46, 0x2e, 0x31, 0x74, 0x7d, 0x83, + 0xc6, 0x53, 0x46, 0x7b, 0x98, 0xb9, 0x58, 0xc1, 0xae, 0x13, 0x6a, 0x63, 0xe4, 0x62, 0x83, 0x44, + 0x9f, 0x90, 0x26, 0x0e, 0x43, 0x30, 0xd3, 0x8b, 0x94, 0x16, 0x31, 0x4a, 0x21, 0xde, 0x55, 0x52, + 0x6d, 0xba, 0xfc, 0x64, 0x32, 0x93, 0xbc, 0x90, 0xac, 0x3e, 0xbe, 0x34, 0x2c, 0xd4, 0xc1, 0xc8, + 0xc5, 0x02, 0x8a, 0x7b, 0x21, 0x75, 0x7c, 0x66, 0x23, 0x25, 0x26, 0x29, 0x0d, 0xc2, 0x0a, 0xa1, + 0x4e, 0xd0, 0x05, 0x3b, 0x41, 0x5d, 0x48, 0x15, 0x87, 0x13, 0x32, 0xf3, 0xd2, 0xf2, 0xf5, 0xab, + 0xa1, 0xdc, 0x5a, 0xa1, 0x79, 0x8c, 0x5c, 0x9c, 0xf0, 0x68, 0x13, 0xd2, 0xc1, 0x67, 0x0d, 0x7a, + 0xaa, 0x90, 0xd2, 0x25, 0x52, 0x35, 0xd4, 0x65, 0x26, 0x60, 0x97, 0xe9, 0x09, 0xe9, 0xe0, 0x70, + 0x19, 0x3c, 0x41, 0xe9, 0x57, 0xc3, 0x99, 0xb5, 0x4e, 0x4e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, + 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, + 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x91, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x8b, + 0x6a, 0x62, 0x05, 0xc2, 0xcc, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x79, 0x60, 0x0c, + 0x08, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x72, 0x77, 0x86, 0xc8, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -595,6 +612,18 @@ func (m *QueryInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.PendingProject != nil { + { + size, err := m.PendingProject.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } if m.Project != nil { { size, err := m.Project.MarshalToSizedBuffer(dAtA[:i]) @@ -660,6 +689,18 @@ func (m *QueryDeveloperResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if m.PendingProject != nil { + { + size, err := m.PendingProject.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } if m.Project != nil { { size, err := m.Project.MarshalToSizedBuffer(dAtA[:i]) @@ -729,6 +770,10 @@ func (m *QueryInfoResponse) Size() (n int) { l = m.Project.Size() n += 1 + l + sovQuery(uint64(l)) } + if m.PendingProject != nil { + l = m.PendingProject.Size() + n += 1 + l + sovQuery(uint64(l)) + } return n } @@ -755,6 +800,10 @@ func (m *QueryDeveloperResponse) Size() (n int) { l = m.Project.Size() n += 1 + l + sovQuery(uint64(l)) } + if m.PendingProject != nil { + l = m.PendingProject.Size() + n += 1 + l + sovQuery(uint64(l)) + } return n } @@ -1044,6 +1093,42 @@ func (m *QueryInfoResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PendingProject", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PendingProject == nil { + m.PendingProject = &Project{} + } + if err := m.PendingProject.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -1212,6 +1297,42 @@ func (m *QueryDeveloperResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PendingProject", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PendingProject == nil { + m.PendingProject = &Project{} + } + if err := m.PendingProject.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:])