From 832d48a45ae9ed4270d71a91eab223f609dacfb0 Mon Sep 17 00:00:00 2001 From: Pratik Date: Wed, 1 Jun 2022 18:24:03 +0530 Subject: [PATCH 1/2] minor refactor --- .../comdex/collector/v1beta1/collector.proto | 4 +- .../liquidation/v1beta1/locked_vault.proto | 2 +- x/auction/keeper/auction.go | 4 +- x/collector/client/cli/tx.go | 4 +- x/collector/keeper/collector.go | 6 +- x/collector/types/collector.pb.go | 209 ++++++++---------- x/liquidation/keeper/liquidate_vaults.go | 4 +- x/liquidation/types/keys.go | 2 +- x/liquidation/types/locked_vault.pb.go | 86 ++++--- x/rewards/keeper/iter.go | 70 +++--- 10 files changed, 187 insertions(+), 204 deletions(-) diff --git a/proto/comdex/collector/v1beta1/collector.proto b/proto/comdex/collector/v1beta1/collector.proto index b17380eb3..0acf6b72d 100644 --- a/proto/comdex/collector/v1beta1/collector.proto +++ b/proto/comdex/collector/v1beta1/collector.proto @@ -71,11 +71,13 @@ message CollectorLookupTable { uint64 debt_threshold = 5 [ (gogoproto.moretags) = "yaml:\"debt_threshold\""]; string locker_saving_rate = 6 [ - (gogoproto.moretags) = "yaml:\"locker_saving_rate\"", + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"locker_saving_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; uint64 lot_size = 7 [ (gogoproto.moretags) = "yaml:\"lot_size\""]; string bid_factor = 8 [ + (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.moretags) = "yaml:\"bid_factor\"" ]; diff --git a/proto/comdex/liquidation/v1beta1/locked_vault.proto b/proto/comdex/liquidation/v1beta1/locked_vault.proto index 06c6d0fbc..3ff0c0be2 100644 --- a/proto/comdex/liquidation/v1beta1/locked_vault.proto +++ b/proto/comdex/liquidation/v1beta1/locked_vault.proto @@ -76,9 +76,9 @@ message LockedVault { (gogoproto.moretags) = "yaml:\"current_collateralisation_ratio\""]; string collateral_to_be_auctioned = 15 [ + (gogoproto.nullable) = false, (gogoproto.customname) = "CollateralToBeAuctioned", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = true, (gogoproto.moretags) = "yaml:\"collateral_to_be_auctioned\""]; google.protobuf.Timestamp liquidation_timestamp = 16 [ diff --git a/x/auction/keeper/auction.go b/x/auction/keeper/auction.go index 8d0611853..7d7a6eb2b 100644 --- a/x/auction/keeper/auction.go +++ b/x/auction/keeper/auction.go @@ -60,7 +60,7 @@ func (k Keeper) checkStatusOfNetFeesCollectedAndStartAuction(ctx sdk.Context, ap return auctiontypes.NoAuction, nil } //Mint the tokens when collector module sends tokens to user - err := k.StartDebtAuction(ctx, outflowToken, inflowToken, *collector.BidFactor, appId, assetId, assetInId, assetOutId) + err := k.StartDebtAuction(ctx, outflowToken, inflowToken, collector.BidFactor, appId, assetId, assetInId, assetOutId) if err != nil { break } @@ -80,7 +80,7 @@ func (k Keeper) checkStatusOfNetFeesCollectedAndStartAuction(ctx sdk.Context, ap if err != nil { return status, err } - err = k.StartSurplusAuction(ctx, outflowToken, inflowToken, *collector.BidFactor, appId, assetId, assetInId, assetOutId) + err = k.StartSurplusAuction(ctx, outflowToken, inflowToken, collector.BidFactor, appId, assetId, assetInId, assetOutId) if err != nil { return status, err } diff --git a/x/collector/client/cli/tx.go b/x/collector/client/cli/tx.go index 8e447eecb..875e923a8 100644 --- a/x/collector/client/cli/tx.go +++ b/x/collector/client/cli/tx.go @@ -102,9 +102,9 @@ func NewCmdLookupTableParams() *cobra.Command { SecondaryAssetId: secondary_asset_id[i], SurplusThreshold: surplusThreshold[i], DebtThreshold: debtThreshold[i], - LockerSavingRate: &newlockerSavingRate, + LockerSavingRate: newlockerSavingRate, LotSize: lot_size[i], - BidFactor: &newbid_factor, + BidFactor: newbid_factor, }) } diff --git a/x/collector/keeper/collector.go b/x/collector/keeper/collector.go index 60bb320ff..f906cbe84 100644 --- a/x/collector/keeper/collector.go +++ b/x/collector/keeper/collector.go @@ -475,9 +475,9 @@ func (k *Keeper) WasmSetCollectorLookupTable(ctx sdk.Context, AppId, CollectorAs SecondaryAssetId: SecondaryAssetId, SurplusThreshold: SurplusThreshold, DebtThreshold: DebtThreshold, - LockerSavingRate: &LockerSavingRate, + LockerSavingRate: LockerSavingRate, LotSize: LotSize, - BidFactor: &BidFactor, + BidFactor: BidFactor, } accmLookup, _ := k.GetCollectorLookupTable(ctx, AppId) accmLookup.AppId = AppId @@ -559,7 +559,7 @@ func (k *Keeper) WasmUpdateLsrInCollectorLookupTable(ctx sdk.Context, appId, ass if !found { return types.ErrorDataDoesNotExists } - collectorLookup.LockerSavingRate = &lsr + collectorLookup.LockerSavingRate = lsr var ( store = ctx.KVStore(k.storeKey) diff --git a/x/collector/types/collector.pb.go b/x/collector/types/collector.pb.go index e456bcb26..44e6904f3 100644 --- a/x/collector/types/collector.pb.go +++ b/x/collector/types/collector.pb.go @@ -266,14 +266,14 @@ func (m *AssetIdCollectorMappping) GetCollector() CollectorData { } type CollectorLookupTable struct { - AppId uint64 `protobuf:"varint,1,opt,name=app_id,json=appId,proto3" json:"app_id,omitempty" yaml:"app_id"` - CollectorAssetId uint64 `protobuf:"varint,2,opt,name=collector_asset_id,json=collectorAssetId,proto3" json:"collector_asset_id,omitempty" yaml:"collector_asset_id"` - SecondaryAssetId uint64 `protobuf:"varint,3,opt,name=secondary_asset_id,json=secondaryAssetId,proto3" json:"secondary_asset_id,omitempty" yaml:"secondary_asset_id"` - SurplusThreshold uint64 `protobuf:"varint,4,opt,name=surplus_threshold,json=surplusThreshold,proto3" json:"surplus_threshold,omitempty" yaml:"surplus_threshold"` - DebtThreshold uint64 `protobuf:"varint,5,opt,name=debt_threshold,json=debtThreshold,proto3" json:"debt_threshold,omitempty" yaml:"debt_threshold"` - LockerSavingRate *github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=locker_saving_rate,json=lockerSavingRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"locker_saving_rate,omitempty" yaml:"locker_saving_rate"` - LotSize uint64 `protobuf:"varint,7,opt,name=lot_size,json=lotSize,proto3" json:"lot_size,omitempty" yaml:"lot_size"` - BidFactor *github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,8,opt,name=bid_factor,json=bidFactor,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"bid_factor,omitempty" yaml:"bid_factor"` + AppId uint64 `protobuf:"varint,1,opt,name=app_id,json=appId,proto3" json:"app_id,omitempty" yaml:"app_id"` + CollectorAssetId uint64 `protobuf:"varint,2,opt,name=collector_asset_id,json=collectorAssetId,proto3" json:"collector_asset_id,omitempty" yaml:"collector_asset_id"` + SecondaryAssetId uint64 `protobuf:"varint,3,opt,name=secondary_asset_id,json=secondaryAssetId,proto3" json:"secondary_asset_id,omitempty" yaml:"secondary_asset_id"` + SurplusThreshold uint64 `protobuf:"varint,4,opt,name=surplus_threshold,json=surplusThreshold,proto3" json:"surplus_threshold,omitempty" yaml:"surplus_threshold"` + DebtThreshold uint64 `protobuf:"varint,5,opt,name=debt_threshold,json=debtThreshold,proto3" json:"debt_threshold,omitempty" yaml:"debt_threshold"` + LockerSavingRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=locker_saving_rate,json=lockerSavingRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"locker_saving_rate" yaml:"locker_saving_rate"` + LotSize uint64 `protobuf:"varint,7,opt,name=lot_size,json=lotSize,proto3" json:"lot_size,omitempty" yaml:"lot_size"` + BidFactor github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,8,opt,name=bid_factor,json=bidFactor,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"bid_factor" yaml:"bid_factor"` } func (m *CollectorLookupTable) Reset() { *m = CollectorLookupTable{} } @@ -699,77 +699,76 @@ func init() { } var fileDescriptor_f18765a8dff2a43b = []byte{ - // 1107 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x3f, 0x4f, 0x1c, 0x47, - 0x14, 0x67, 0x01, 0x03, 0x37, 0x04, 0x73, 0x2c, 0x60, 0xce, 0x06, 0xee, 0xac, 0x91, 0x93, 0x5c, - 0xe3, 0x3b, 0x81, 0x95, 0xc6, 0x4d, 0xc2, 0x82, 0x88, 0x4f, 0xc4, 0x4e, 0x34, 0x9c, 0x52, 0xa4, - 0xc8, 0x6a, 0x6e, 0x77, 0x80, 0x11, 0xcb, 0xcd, 0x7a, 0x67, 0x0e, 0x07, 0x97, 0x69, 0x12, 0x29, - 0x4d, 0x8a, 0x54, 0xf9, 0x04, 0x91, 0x52, 0xa5, 0xc8, 0x07, 0x70, 0x2a, 0x37, 0x91, 0x5c, 0x46, - 0x29, 0x56, 0x11, 0xf4, 0x29, 0xee, 0x13, 0x44, 0x3b, 0xb3, 0x3b, 0x3b, 0x77, 0xc7, 0x39, 0x6c, - 0x94, 0x0a, 0xf6, 0xf7, 0xde, 0xfc, 0xde, 0x6f, 0xde, 0xbf, 0xd1, 0x81, 0xba, 0xc7, 0xce, 0x7c, - 0xf2, 0x55, 0xd3, 0x63, 0x41, 0x40, 0x3c, 0xc1, 0xa2, 0xe6, 0xf9, 0x56, 0x87, 0x08, 0xbc, 0x95, - 0x23, 0x8d, 0x30, 0x62, 0x82, 0xd9, 0x15, 0xe5, 0xd9, 0xc8, 0xf1, 0xd4, 0xf3, 0xde, 0xca, 0x31, - 0x3b, 0x66, 0xd2, 0xa9, 0x99, 0xfc, 0xa7, 0xfc, 0xe1, 0xab, 0x69, 0xb0, 0xb0, 0x9b, 0xf9, 0xee, - 0x61, 0x81, 0xed, 0x6f, 0x2d, 0xb0, 0x96, 0x9e, 0x26, 0xbe, 0xcb, 0x05, 0xee, 0xd0, 0x80, 0x8a, - 0x0b, 0xf7, 0x88, 0x90, 0x8a, 0x75, 0xdf, 0xaa, 0x97, 0x9c, 0xcf, 0x5e, 0xc7, 0xb5, 0x89, 0x3f, - 0xe3, 0xda, 0x7b, 0xc7, 0x54, 0x9c, 0xf4, 0x3a, 0x0d, 0x8f, 0x9d, 0x35, 0x3d, 0xc6, 0xcf, 0x18, - 0x4f, 0xff, 0x3c, 0xe4, 0xfe, 0x69, 0x53, 0x5c, 0x84, 0x84, 0x37, 0x5a, 0x5d, 0xd1, 0x8f, 0x6b, - 0xd5, 0x0b, 0x7c, 0x16, 0x3c, 0x86, 0x63, 0x68, 0x21, 0x5a, 0xd5, 0x96, 0xc3, 0xcc, 0xb0, 0x4f, - 0x88, 0xfd, 0xb5, 0x05, 0x72, 0x8b, 0xeb, 0x05, 0x8c, 0xd3, 0xee, 0xb1, 0x14, 0x32, 0x29, 0x85, - 0x3c, 0x2b, 0x2c, 0x64, 0x63, 0x58, 0x88, 0x41, 0x0a, 0xd1, 0xb2, 0xc6, 0x77, 0x15, 0x3c, 0x2a, - 0x82, 0x85, 0xa4, 0x9b, 0x89, 0x98, 0xfa, 0xbf, 0x44, 0x18, 0xa4, 0xa6, 0x88, 0x4f, 0x15, 0x9c, - 0x88, 0xf8, 0xd1, 0x02, 0x9b, 0x01, 0x7d, 0xde, 0xa3, 0x3e, 0x16, 0x94, 0x75, 0xdd, 0x88, 0xbc, - 0xc0, 0x91, 0xcf, 0x5d, 0xed, 0x5b, 0xb9, 0x25, 0xc5, 0x7c, 0x5e, 0x58, 0xcc, 0x03, 0x25, 0xe6, - 0xad, 0xe4, 0x10, 0xad, 0x1b, 0x76, 0xa4, 0xcc, 0xbb, 0xda, 0xfa, 0xbb, 0x05, 0x96, 0x9f, 0x11, - 0xb1, 0x4f, 0x88, 0xc6, 0x64, 0x27, 0xd5, 0xc1, 0x0c, 0x0e, 0x43, 0x97, 0xfa, 0xb2, 0x6f, 0xa6, - 0x9d, 0xa5, 0x7e, 0x5c, 0x5b, 0x50, 0xe1, 0x14, 0x0e, 0xd1, 0x2d, 0x1c, 0x86, 0x2d, 0xdf, 0xfe, - 0xce, 0x02, 0xab, 0x98, 0x73, 0x22, 0x5a, 0x7e, 0x9b, 0x99, 0x3c, 0x95, 0xc9, 0xfb, 0x53, 0xf5, - 0xf9, 0xed, 0x66, 0x63, 0x5c, 0x5b, 0x37, 0x76, 0xae, 0x3b, 0xe6, 0x3c, 0x48, 0xf2, 0x90, 0xa7, - 0xfa, 0x5a, 0x6e, 0x88, 0xae, 0x8f, 0x09, 0x7f, 0xb3, 0xc0, 0xea, 0xb5, 0xb4, 0x76, 0x03, 0xcc, - 0xc9, 0x23, 0xf9, 0x9d, 0x96, 0xfb, 0x71, 0x6d, 0xd1, 0x08, 0x22, 0x6f, 0x35, 0x9b, 0xf2, 0xda, - 0x17, 0xc0, 0xee, 0x12, 0x91, 0xd4, 0xd5, 0x2c, 0x95, 0x6a, 0xde, 0x83, 0xc2, 0xa5, 0xba, 0xab, - 0xe2, 0x8c, 0x32, 0x42, 0x54, 0xee, 0xca, 0xfc, 0x1b, 0x45, 0x79, 0x65, 0x81, 0x8d, 0x9d, 0x24, - 0xb9, 0x6d, 0x26, 0xef, 0xa2, 0x87, 0xfc, 0x29, 0x0e, 0x43, 0xda, 0x3d, 0x2e, 0x50, 0x9d, 0x17, - 0x60, 0x51, 0xdd, 0x4d, 0x67, 0x3f, 0x2d, 0xcb, 0xf6, 0xbf, 0x96, 0x65, 0x20, 0x6a, 0x12, 0xd6, - 0xb9, 0xd7, 0x8f, 0x6b, 0x77, 0xcc, 0x84, 0xe9, 0xb3, 0x10, 0xdd, 0xc6, 0x03, 0x4a, 0xe1, 0xcf, - 0x16, 0xa8, 0x8c, 0x23, 0x2a, 0x5c, 0x0b, 0x17, 0x94, 0x4c, 0xfd, 0x56, 0x7d, 0x7e, 0xfb, 0xfd, - 0xf1, 0xfa, 0x07, 0x76, 0xa2, 0x53, 0x49, 0xdb, 0xa9, 0x3c, 0x30, 0xb9, 0x89, 0xe4, 0x9c, 0x13, - 0xfe, 0x3d, 0x0d, 0x56, 0xf4, 0xb1, 0x4f, 0x18, 0x3b, 0xed, 0x85, 0x6d, 0xdc, 0x09, 0x48, 0x81, - 0x4c, 0x1f, 0x00, 0x5b, 0xf3, 0xb9, 0xfa, 0x76, 0x93, 0xf2, 0xd4, 0x66, 0xde, 0x01, 0xa3, 0x3e, - 0x10, 0x95, 0x35, 0x98, 0x66, 0x2c, 0x21, 0xe3, 0xc4, 0x63, 0x5d, 0x1f, 0x47, 0x17, 0x39, 0xd9, - 0xd4, 0x30, 0xd9, 0xa8, 0x0f, 0x44, 0x65, 0x0d, 0x66, 0x64, 0x2d, 0xb0, 0xc4, 0x7b, 0x51, 0x18, - 0xf4, 0xb8, 0x2b, 0x4e, 0x22, 0xc2, 0x4f, 0x58, 0xe0, 0x57, 0xa6, 0x25, 0xd7, 0x46, 0x3f, 0xae, - 0x55, 0x52, 0xae, 0x61, 0x97, 0x84, 0x4a, 0x61, 0xed, 0x0c, 0xb2, 0x3f, 0x02, 0xb7, 0x7d, 0xd2, - 0x11, 0x06, 0xcf, 0x2d, 0xc9, 0x73, 0xb7, 0x1f, 0xd7, 0x56, 0x15, 0xcf, 0xa0, 0x1d, 0xa2, 0x85, - 0x04, 0xc8, 0x19, 0x7a, 0xc0, 0x0e, 0x98, 0x77, 0x4a, 0x22, 0x97, 0xe3, 0xf3, 0x64, 0x71, 0x46, - 0x58, 0x90, 0xca, 0x8c, 0x1c, 0xab, 0x8f, 0x6f, 0x38, 0x52, 0x7b, 0xc4, 0xcb, 0x73, 0x30, 0xca, - 0x06, 0x51, 0x59, 0x81, 0x87, 0x12, 0x43, 0x58, 0x90, 0xa4, 0xe3, 0x02, 0x26, 0x5c, 0x4e, 0x5f, - 0x92, 0xca, 0xec, 0x70, 0xc7, 0x65, 0x16, 0x88, 0x66, 0x03, 0x26, 0x0e, 0xe9, 0x4b, 0x62, 0x7f, - 0x09, 0x40, 0x87, 0xfa, 0xee, 0x11, 0x96, 0x2d, 0x37, 0x27, 0xe5, 0x7d, 0x58, 0x48, 0xde, 0x92, - 0xe2, 0xce, 0x59, 0x20, 0x2a, 0x75, 0xa8, 0xbf, 0xaf, 0xfe, 0xff, 0xc5, 0x02, 0x8b, 0x43, 0x0d, - 0x57, 0xa0, 0xd7, 0x04, 0x50, 0xe3, 0x96, 0xdc, 0xd6, 0xa5, 0xdd, 0x23, 0x96, 0x0e, 0x75, 0xe3, - 0x06, 0x43, 0x61, 0x74, 0xb7, 0xb3, 0x99, 0xce, 0xc6, 0xaa, 0x31, 0x79, 0x9a, 0x13, 0xa2, 0x05, - 0x0d, 0xb4, 0x92, 0xef, 0xe7, 0xc0, 0xde, 0x09, 0xc3, 0x36, 0xdb, 0x23, 0x5d, 0x76, 0xc6, 0x8b, - 0xef, 0xa2, 0x2d, 0x50, 0xca, 0xda, 0x94, 0x4b, 0xc1, 0xd3, 0xce, 0x4a, 0x3e, 0x98, 0xda, 0x04, - 0xd1, 0x5c, 0x3a, 0xf7, 0x1c, 0xfe, 0x6a, 0x81, 0xa5, 0x27, 0x94, 0x0b, 0x16, 0x51, 0x0f, 0x07, - 0x3b, 0x3d, 0x2f, 0x79, 0xc4, 0x0a, 0x84, 0x3c, 0x07, 0x65, 0xc5, 0x2b, 0x98, 0x8b, 0xd5, 0xe9, - 0x1b, 0x3e, 0x4b, 0x6d, 0x96, 0x46, 0x4b, 0xef, 0xe9, 0xac, 0xf7, 0xe3, 0xda, 0x9a, 0x29, 0x35, - 0xa7, 0xcc, 0xb6, 0x9f, 0x3e, 0x03, 0xbf, 0xc9, 0x9e, 0xa1, 0x61, 0x1a, 0x7b, 0x1b, 0x94, 0xd2, - 0x53, 0xad, 0x4c, 0xbe, 0x99, 0x84, 0xcc, 0x04, 0x51, 0xee, 0x66, 0x3f, 0x06, 0xef, 0xa8, 0x90, - 0xbe, 0xcc, 0xbc, 0xbc, 0x41, 0xc9, 0x59, 0xeb, 0xc7, 0xb5, 0x65, 0x53, 0x90, 0xb2, 0x42, 0x34, - 0x2f, 0x3f, 0x55, 0x95, 0x60, 0x6c, 0x81, 0x75, 0x5d, 0xfb, 0x54, 0xcb, 0x7f, 0x5b, 0x70, 0x3f, - 0x58, 0xe0, 0x8e, 0x7e, 0x74, 0x07, 0x98, 0xd2, 0x94, 0x7e, 0x70, 0x83, 0x97, 0x7e, 0x54, 0x81, - 0xf3, 0x6e, 0xda, 0x84, 0x9b, 0x43, 0xef, 0xfd, 0x80, 0x2b, 0x44, 0x63, 0x62, 0xc3, 0x9f, 0x26, - 0xc1, 0xfa, 0x5b, 0xe8, 0x0b, 0xbf, 0x35, 0x07, 0xc0, 0xa6, 0xdc, 0xcd, 0xb6, 0x61, 0xde, 0x34, - 0x56, 0x7d, 0xce, 0x5c, 0xbd, 0xa3, 0x3e, 0x10, 0x95, 0x29, 0x3f, 0x54, 0x58, 0xd6, 0xa9, 0x0e, - 0x58, 0xa4, 0xdc, 0x95, 0x2b, 0x31, 0x63, 0x9a, 0x92, 0x4c, 0xc6, 0x53, 0x3a, 0xe4, 0x00, 0xd1, - 0x02, 0xe5, 0x7b, 0xa4, 0x23, 0x32, 0x8e, 0x27, 0x60, 0x89, 0xea, 0x20, 0x2e, 0xf6, 0x04, 0x3d, - 0x27, 0x72, 0x7d, 0xcf, 0x99, 0xeb, 0x7b, 0xc4, 0x05, 0xa2, 0x45, 0x9a, 0xe9, 0xd8, 0x91, 0x88, - 0xf3, 0xf4, 0xf5, 0x65, 0xd5, 0x7a, 0x73, 0x59, 0xb5, 0xfe, 0xba, 0xac, 0x5a, 0xdf, 0x5f, 0x55, - 0x27, 0xde, 0x5c, 0x55, 0x27, 0xfe, 0xb8, 0xaa, 0x4e, 0x7c, 0xf1, 0x68, 0x60, 0xad, 0x25, 0x45, - 0x7c, 0xc8, 0x8e, 0x8e, 0xa8, 0x47, 0x71, 0x90, 0x7e, 0x37, 0xcd, 0x5f, 0x30, 0x72, 0xcf, 0x75, - 0x66, 0xe4, 0xcf, 0x90, 0x47, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe9, 0xf2, 0x88, 0x82, 0xe2, - 0x0c, 0x00, 0x00, + // 1101 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x3d, 0x6f, 0xdb, 0x46, + 0x18, 0x36, 0xfd, 0xad, 0x73, 0x1d, 0xcb, 0xb4, 0x1d, 0x2b, 0xb1, 0x2d, 0x05, 0x87, 0xb4, 0xd5, + 0x12, 0x09, 0x76, 0xd0, 0x25, 0x53, 0x4d, 0x1b, 0x46, 0x04, 0x37, 0x69, 0x71, 0x16, 0x3a, 0x74, + 0x21, 0x4e, 0xe4, 0xd9, 0x3e, 0x98, 0xd6, 0x31, 0xbc, 0x93, 0x53, 0x65, 0xec, 0xd2, 0x02, 0x5d, + 0x3a, 0x74, 0xea, 0x2f, 0x28, 0xd0, 0xa9, 0x43, 0x7f, 0x40, 0x3a, 0x65, 0x29, 0x90, 0xb1, 0xe8, + 0x40, 0x14, 0xf6, 0x3f, 0xd0, 0xd0, 0xb9, 0xe0, 0x1d, 0x79, 0x3c, 0x49, 0x76, 0x6a, 0x16, 0x99, + 0x6c, 0x3e, 0xef, 0x7b, 0xcf, 0xfb, 0xdc, 0xfb, 0x75, 0x10, 0xa8, 0x7b, 0xec, 0xdc, 0x27, 0x5f, + 0x37, 0x3d, 0x16, 0x04, 0xc4, 0x13, 0x2c, 0x6a, 0x5e, 0x6c, 0x77, 0x88, 0xc0, 0xdb, 0x39, 0xd2, + 0x08, 0x23, 0x26, 0x98, 0x5d, 0x51, 0x9e, 0x8d, 0x1c, 0x4f, 0x3d, 0xef, 0xaf, 0x9e, 0xb0, 0x13, + 0x26, 0x9d, 0x9a, 0xc9, 0x7f, 0xca, 0x1f, 0xbe, 0x9e, 0x06, 0x8b, 0x7b, 0x99, 0xef, 0x3e, 0x16, + 0xd8, 0xfe, 0xce, 0x02, 0xeb, 0xe9, 0x69, 0xe2, 0xbb, 0x5c, 0xe0, 0x0e, 0x0d, 0xa8, 0xe8, 0xbb, + 0xc7, 0x84, 0x54, 0xac, 0x07, 0x56, 0xbd, 0xe4, 0x7c, 0xf1, 0x26, 0xae, 0x4d, 0xfc, 0x15, 0xd7, + 0x3e, 0x3a, 0xa1, 0xe2, 0xb4, 0xd7, 0x69, 0x78, 0xec, 0xbc, 0xe9, 0x31, 0x7e, 0xce, 0x78, 0xfa, + 0xe7, 0x11, 0xf7, 0xcf, 0x9a, 0xa2, 0x1f, 0x12, 0xde, 0x68, 0x75, 0xc5, 0x20, 0xae, 0x55, 0xfb, + 0xf8, 0x3c, 0x78, 0x02, 0x6f, 0xa0, 0x85, 0x68, 0x4d, 0x5b, 0x8e, 0x32, 0xc3, 0x01, 0x21, 0xf6, + 0x37, 0x16, 0xc8, 0x2d, 0xae, 0x17, 0x30, 0x4e, 0xbb, 0x27, 0x52, 0xc8, 0xa4, 0x14, 0xf2, 0xbc, + 0xb0, 0x90, 0xcd, 0x51, 0x21, 0x06, 0x29, 0x44, 0x2b, 0x1a, 0xdf, 0x53, 0xf0, 0xb8, 0x08, 0x16, + 0x92, 0x6e, 0x26, 0x62, 0xea, 0x7d, 0x89, 0x30, 0x48, 0x4d, 0x11, 0x9f, 0x2b, 0x38, 0x11, 0xf1, + 0x93, 0x05, 0xb6, 0x02, 0xfa, 0xa2, 0x47, 0x7d, 0x2c, 0x28, 0xeb, 0xba, 0x11, 0x79, 0x89, 0x23, + 0x9f, 0xbb, 0xda, 0xb7, 0x32, 0x23, 0xc5, 0x7c, 0x59, 0x58, 0xcc, 0x43, 0x25, 0xe6, 0x9d, 0xe4, + 0x10, 0x6d, 0x18, 0x76, 0xa4, 0xcc, 0x7b, 0xda, 0xfa, 0x87, 0x05, 0x56, 0x9e, 0x13, 0x71, 0x40, + 0x88, 0xc6, 0x64, 0x27, 0xd5, 0xc1, 0x2c, 0x0e, 0x43, 0x97, 0xfa, 0xb2, 0x6f, 0xa6, 0x9d, 0xe5, + 0x41, 0x5c, 0x5b, 0x54, 0xe1, 0x14, 0x0e, 0xd1, 0x0c, 0x0e, 0xc3, 0x96, 0x6f, 0x7f, 0x6f, 0x81, + 0x35, 0xcc, 0x39, 0x11, 0x2d, 0xbf, 0xcd, 0x4c, 0x9e, 0xca, 0xe4, 0x83, 0xa9, 0xfa, 0xc2, 0x4e, + 0xb3, 0x71, 0x53, 0x5b, 0x37, 0x76, 0xaf, 0x3b, 0xe6, 0x3c, 0x4c, 0xf2, 0x90, 0xa7, 0xfa, 0x5a, + 0x6e, 0x88, 0xae, 0x8f, 0x09, 0x7f, 0xb7, 0xc0, 0xda, 0xb5, 0xb4, 0x76, 0x03, 0xcc, 0xcb, 0x23, + 0xf9, 0x9d, 0x56, 0x06, 0x71, 0x6d, 0xc9, 0x08, 0x22, 0x6f, 0x35, 0x97, 0xf2, 0xda, 0x7d, 0x60, + 0x77, 0x89, 0x48, 0xea, 0x6a, 0x96, 0x4a, 0x35, 0xef, 0x61, 0xe1, 0x52, 0xdd, 0x53, 0x71, 0xc6, + 0x19, 0x21, 0x2a, 0x77, 0x65, 0xfe, 0x8d, 0xa2, 0xbc, 0xb6, 0xc0, 0xe6, 0x6e, 0x92, 0xdc, 0x36, + 0x93, 0x77, 0xd1, 0x43, 0xfe, 0x0c, 0x87, 0x21, 0xed, 0x9e, 0x14, 0xa8, 0xce, 0x4b, 0xb0, 0xa4, + 0xee, 0xa6, 0xb3, 0x9f, 0x96, 0x65, 0xe7, 0x3f, 0xcb, 0x32, 0x14, 0x35, 0x09, 0xeb, 0xdc, 0x1f, + 0xc4, 0xb5, 0xbb, 0x66, 0xc2, 0xf4, 0x59, 0x88, 0xee, 0xe0, 0x21, 0xa5, 0xf0, 0x17, 0x0b, 0x54, + 0x6e, 0x22, 0x2a, 0x5c, 0x0b, 0x17, 0x94, 0x4c, 0xfd, 0x56, 0x7d, 0x61, 0xe7, 0xe3, 0x9b, 0xf5, + 0x0f, 0xed, 0x44, 0xa7, 0x92, 0xb6, 0x53, 0x79, 0x68, 0x72, 0x13, 0xc9, 0x39, 0x27, 0xfc, 0x67, + 0x1a, 0xac, 0xea, 0x63, 0x9f, 0x31, 0x76, 0xd6, 0x0b, 0xdb, 0xb8, 0x13, 0x90, 0x02, 0x99, 0x3e, + 0x04, 0xb6, 0xe6, 0x73, 0xf5, 0xed, 0x26, 0xe5, 0xa9, 0xad, 0xbc, 0x03, 0xc6, 0x7d, 0x20, 0x2a, + 0x6b, 0x30, 0xcd, 0x58, 0x42, 0xc6, 0x89, 0xc7, 0xba, 0x3e, 0x8e, 0xfa, 0x39, 0xd9, 0xd4, 0x28, + 0xd9, 0xb8, 0x0f, 0x44, 0x65, 0x0d, 0x66, 0x64, 0x2d, 0xb0, 0xcc, 0x7b, 0x51, 0x18, 0xf4, 0xb8, + 0x2b, 0x4e, 0x23, 0xc2, 0x4f, 0x59, 0xe0, 0x57, 0xa6, 0x25, 0xd7, 0xe6, 0x20, 0xae, 0x55, 0x52, + 0xae, 0x51, 0x97, 0x84, 0x4a, 0x61, 0xed, 0x0c, 0xb2, 0x3f, 0x05, 0x77, 0x7c, 0xd2, 0x11, 0x06, + 0xcf, 0x8c, 0xe4, 0xb9, 0x37, 0x88, 0x6b, 0x6b, 0x8a, 0x67, 0xd8, 0x0e, 0xd1, 0x62, 0x02, 0xe4, + 0x0c, 0x7d, 0x60, 0x07, 0xcc, 0x3b, 0x23, 0x91, 0xcb, 0xf1, 0x45, 0xb2, 0x38, 0x23, 0x2c, 0x48, + 0x65, 0xb6, 0xf0, 0x58, 0xed, 0x13, 0x2f, 0xcf, 0xc3, 0x38, 0x23, 0x44, 0x65, 0x05, 0x1e, 0x49, + 0x0c, 0x61, 0x41, 0x92, 0xae, 0x0b, 0x98, 0x70, 0x39, 0x7d, 0x45, 0x2a, 0x73, 0xa3, 0x5d, 0x97, + 0x59, 0x20, 0x9a, 0x0b, 0x98, 0x38, 0xa2, 0xaf, 0x88, 0xdd, 0x01, 0xa0, 0x43, 0x7d, 0xf7, 0x18, + 0xcb, 0xb6, 0x9b, 0x97, 0x12, 0xf7, 0x0a, 0x4b, 0x5c, 0x56, 0xfc, 0x39, 0x13, 0x44, 0xa5, 0x0e, + 0xf5, 0x0f, 0xd4, 0xff, 0xbf, 0x5a, 0x60, 0x69, 0xa4, 0xf1, 0x0a, 0xf4, 0x9c, 0x00, 0x6a, 0xec, + 0x92, 0x1b, 0xbb, 0xb4, 0x7b, 0xcc, 0xd2, 0xe1, 0x6e, 0xdc, 0x62, 0x38, 0x8c, 0x2e, 0x77, 0xb6, + 0xd2, 0x19, 0x59, 0x33, 0x26, 0x50, 0x73, 0x42, 0xb4, 0xa8, 0x81, 0x56, 0xf2, 0xfd, 0x02, 0xd8, + 0xbb, 0x61, 0xd8, 0x66, 0xfb, 0xa4, 0xcb, 0xce, 0x79, 0xf1, 0x9d, 0xb4, 0x0d, 0x4a, 0x59, 0xbb, + 0x72, 0x29, 0x78, 0xda, 0x59, 0xcd, 0x07, 0x54, 0x9b, 0x20, 0x9a, 0x4f, 0xe7, 0x9f, 0xc3, 0xdf, + 0x2c, 0xb0, 0xfc, 0x94, 0x72, 0xc1, 0x22, 0xea, 0xe1, 0x60, 0xb7, 0xe7, 0x25, 0x8f, 0x59, 0x81, + 0x90, 0x17, 0xa0, 0xac, 0x78, 0x05, 0x73, 0xb1, 0x3a, 0x7d, 0xcb, 0xe7, 0xa9, 0xcd, 0xd2, 0x68, + 0xe9, 0x3d, 0x9d, 0x8d, 0x41, 0x5c, 0x5b, 0x37, 0xa5, 0xe6, 0x94, 0xd9, 0x16, 0xd4, 0x67, 0xe0, + 0xb7, 0xd9, 0x73, 0x34, 0x4a, 0x63, 0xef, 0x80, 0x52, 0x7a, 0xaa, 0x95, 0xc9, 0x37, 0x93, 0x90, + 0x99, 0x20, 0xca, 0xdd, 0xec, 0x27, 0xe0, 0x03, 0x15, 0xd2, 0x97, 0x99, 0x97, 0x37, 0x28, 0x39, + 0xeb, 0x83, 0xb8, 0xb6, 0x62, 0x0a, 0x52, 0x56, 0x88, 0x16, 0xe4, 0xa7, 0xaa, 0x12, 0x8c, 0x2d, + 0xb0, 0xa1, 0x6b, 0x9f, 0x6a, 0xf9, 0x7f, 0x8b, 0xee, 0x47, 0x0b, 0xdc, 0xd5, 0x8f, 0xef, 0x10, + 0x53, 0x9a, 0xd2, 0x4f, 0x6e, 0xf1, 0xe2, 0x8f, 0x2b, 0x70, 0x3e, 0x4c, 0x9b, 0x70, 0x6b, 0xe4, + 0xdd, 0x1f, 0x72, 0x85, 0xe8, 0x86, 0xd8, 0xf0, 0xe7, 0x49, 0xb0, 0xf1, 0x0e, 0xfa, 0xc2, 0x6f, + 0xce, 0x21, 0xb0, 0x29, 0x77, 0xb3, 0xad, 0x98, 0x37, 0x8d, 0x55, 0x9f, 0x37, 0x57, 0xf0, 0xb8, + 0x0f, 0x44, 0x65, 0xca, 0x8f, 0x14, 0x96, 0x75, 0xaa, 0x03, 0x96, 0x28, 0x77, 0xe5, 0x6a, 0xcc, + 0x98, 0xa6, 0x24, 0x93, 0xf1, 0xa4, 0x8e, 0x38, 0x40, 0xb4, 0x48, 0xf9, 0x3e, 0xe9, 0x88, 0x8c, + 0xe3, 0x29, 0x58, 0xa6, 0x3a, 0x88, 0x8b, 0x3d, 0x41, 0x2f, 0x88, 0x5c, 0xe3, 0xf3, 0xe6, 0x1a, + 0x1f, 0x73, 0x81, 0x68, 0x89, 0x66, 0x3a, 0x76, 0x25, 0xe2, 0x3c, 0x7b, 0x73, 0x59, 0xb5, 0xde, + 0x5e, 0x56, 0xad, 0xbf, 0x2f, 0xab, 0xd6, 0x0f, 0x57, 0xd5, 0x89, 0xb7, 0x57, 0xd5, 0x89, 0x3f, + 0xaf, 0xaa, 0x13, 0x5f, 0x3d, 0x1e, 0x5a, 0x6b, 0x49, 0x11, 0x1f, 0xb1, 0xe3, 0x63, 0xea, 0x51, + 0x1c, 0xa4, 0xdf, 0x4d, 0xf3, 0x97, 0x8c, 0xdc, 0x73, 0x9d, 0x59, 0xf9, 0x73, 0xe4, 0xf1, 0xbf, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xbc, 0xab, 0x53, 0x4b, 0xea, 0x0c, 0x00, 0x00, } func (m *CollectorData) Marshal() (dAtA []byte, err error) { @@ -1015,35 +1014,31 @@ func (m *CollectorLookupTable) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.BidFactor != nil { - { - size := m.BidFactor.Size() - i -= size - if _, err := m.BidFactor.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintCollector(dAtA, i, uint64(size)) + { + size := m.BidFactor.Size() + i -= size + if _, err := m.BidFactor.MarshalTo(dAtA[i:]); err != nil { + return 0, err } - i-- - dAtA[i] = 0x42 + i = encodeVarintCollector(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x42 if m.LotSize != 0 { i = encodeVarintCollector(dAtA, i, uint64(m.LotSize)) i-- dAtA[i] = 0x38 } - if m.LockerSavingRate != nil { - { - size := m.LockerSavingRate.Size() - i -= size - if _, err := m.LockerSavingRate.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintCollector(dAtA, i, uint64(size)) + { + size := m.LockerSavingRate.Size() + i -= size + if _, err := m.LockerSavingRate.MarshalTo(dAtA[i:]); err != nil { + return 0, err } - i-- - dAtA[i] = 0x32 + i = encodeVarintCollector(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x32 if m.DebtThreshold != 0 { i = encodeVarintCollector(dAtA, i, uint64(m.DebtThreshold)) i-- @@ -1452,17 +1447,13 @@ func (m *CollectorLookupTable) Size() (n int) { if m.DebtThreshold != 0 { n += 1 + sovCollector(uint64(m.DebtThreshold)) } - if m.LockerSavingRate != nil { - l = m.LockerSavingRate.Size() - n += 1 + l + sovCollector(uint64(l)) - } + l = m.LockerSavingRate.Size() + n += 1 + l + sovCollector(uint64(l)) if m.LotSize != 0 { n += 1 + sovCollector(uint64(m.LotSize)) } - if m.BidFactor != nil { - l = m.BidFactor.Size() - n += 1 + l + sovCollector(uint64(l)) - } + l = m.BidFactor.Size() + n += 1 + l + sovCollector(uint64(l)) return n } @@ -2335,8 +2326,6 @@ func (m *CollectorLookupTable) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_cosmos_cosmos_sdk_types.Dec - m.LockerSavingRate = &v if err := m.LockerSavingRate.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2390,8 +2379,6 @@ func (m *CollectorLookupTable) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_cosmos_cosmos_sdk_types.Dec - m.BidFactor = &v if err := m.BidFactor.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/liquidation/keeper/liquidate_vaults.go b/x/liquidation/keeper/liquidate_vaults.go index 5e52bf1f6..883a32708 100644 --- a/x/liquidation/keeper/liquidate_vaults.go +++ b/x/liquidation/keeper/liquidate_vaults.go @@ -62,7 +62,7 @@ func (k Keeper) CreateLockedVault(ctx sdk.Context, vault vaulttypes.Vault, colla IsAuctionInProgress: false, CrAtLiquidation: collateralizationRatio, CurrentCollaterlisationRatio: collateralizationRatio, - CollateralToBeAuctioned: nil, + CollateralToBeAuctioned: sdk.ZeroDec(), LiquidationTimestamp: time.Now(), SellOffHistory: nil, } @@ -181,7 +181,7 @@ func (k Keeper) UpdateLockedVaults(ctx sdk.Context) error { } updatedLockedVault := lockedVault updatedLockedVault.CurrentCollaterlisationRatio = collateralizationRatio - updatedLockedVault.CollateralToBeAuctioned = &collateralToBeAuctioned + updatedLockedVault.CollateralToBeAuctioned = collateralToBeAuctioned k.SetLockedVault(ctx, *updatedLockedVault) } } diff --git a/x/liquidation/types/keys.go b/x/liquidation/types/keys.go index 2bbfe8490..65d1a82c9 100644 --- a/x/liquidation/types/keys.go +++ b/x/liquidation/types/keys.go @@ -17,7 +17,7 @@ var ( LockedVaultIdKey = []byte{0x01} LockedVaultKeyPrefix = []byte{0x11} LockedVaultKeyHistory = []byte{0x12} - AppIdsKeyPrefix = []byte{0x12} + AppIdsKeyPrefix = []byte{0x15} AppLockedVaultMappingKeyPrefix = []byte{0x13} AppIDLockedVaultMappingKeyPrefix = []byte{0x14} ) diff --git a/x/liquidation/types/locked_vault.pb.go b/x/liquidation/types/locked_vault.pb.go index 90439a369..b51b81124 100644 --- a/x/liquidation/types/locked_vault.pb.go +++ b/x/liquidation/types/locked_vault.pb.go @@ -39,15 +39,15 @@ type LockedVault struct { AmountOut github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=amount_out,json=amountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount_out" yaml:"amount_out"` //updated_amount_out = amount_out + interest_accumulated + opening_fee_accumulated // + closing_fee_accumulated - UpdatedAmountOut github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=updated_amount_out,json=updatedAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"updated_amount_out" yaml:"updated_amount_out"` - Initiator string `protobuf:"bytes,10,opt,name=initiator,proto3" json:"initiator,omitempty" yaml:"admin"` - IsAuctionComplete bool `protobuf:"varint,11,opt,name=is_auction_complete,json=isAuctionComplete,proto3" json:"is_auction_complete,omitempty" yaml:"is_auction_complete"` - IsAuctionInProgress bool `protobuf:"varint,12,opt,name=is_auction_in_progress,json=isAuctionInProgress,proto3" json:"is_auction_in_progress,omitempty" yaml:"is_auction_in_progress"` - CrAtLiquidation github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,13,opt,name=cr_at_liquidation,json=crAtLiquidation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"cr_at_liquidation" yaml:"cr_at_liquidation"` - CurrentCollaterlisationRatio github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,14,opt,name=current_collateralisation_ratio,json=currentCollateralisationRatio,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"current_collateralisation_ratio" yaml:"current_collateralisation_ratio"` - CollateralToBeAuctioned *github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,15,opt,name=collateral_to_be_auctioned,json=collateralToBeAuctioned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"collateral_to_be_auctioned,omitempty" yaml:"collateral_to_be_auctioned"` - LiquidationTimestamp time.Time `protobuf:"bytes,16,opt,name=liquidation_timestamp,json=liquidationTimestamp,proto3,stdtime" json:"liquidation_timestamp" yaml:"liquidation_timestamp"` - SellOffHistory []string `protobuf:"bytes,17,rep,name=selloff_history,json=selloffHistory,proto3" json:"selloff_history,omitempty" yaml:"selloff_history"` + UpdatedAmountOut github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=updated_amount_out,json=updatedAmountOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"updated_amount_out" yaml:"updated_amount_out"` + Initiator string `protobuf:"bytes,10,opt,name=initiator,proto3" json:"initiator,omitempty" yaml:"admin"` + IsAuctionComplete bool `protobuf:"varint,11,opt,name=is_auction_complete,json=isAuctionComplete,proto3" json:"is_auction_complete,omitempty" yaml:"is_auction_complete"` + IsAuctionInProgress bool `protobuf:"varint,12,opt,name=is_auction_in_progress,json=isAuctionInProgress,proto3" json:"is_auction_in_progress,omitempty" yaml:"is_auction_in_progress"` + CrAtLiquidation github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,13,opt,name=cr_at_liquidation,json=crAtLiquidation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"cr_at_liquidation" yaml:"cr_at_liquidation"` + CurrentCollaterlisationRatio github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,14,opt,name=current_collateralisation_ratio,json=currentCollateralisationRatio,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"current_collateralisation_ratio" yaml:"current_collateralisation_ratio"` + CollateralToBeAuctioned github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,15,opt,name=collateral_to_be_auctioned,json=collateralToBeAuctioned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"collateral_to_be_auctioned" yaml:"collateral_to_be_auctioned"` + LiquidationTimestamp time.Time `protobuf:"bytes,16,opt,name=liquidation_timestamp,json=liquidationTimestamp,proto3,stdtime" json:"liquidation_timestamp" yaml:"liquidation_timestamp"` + SellOffHistory []string `protobuf:"bytes,17,rep,name=selloff_history,json=selloffHistory,proto3" json:"selloff_history,omitempty" yaml:"selloff_history"` } func (m *LockedVault) Reset() { *m = LockedVault{} } @@ -169,7 +169,7 @@ func init() { } var fileDescriptor_6e1145b6fa4b74d3 = []byte{ - // 1014 bytes of a gzipped FileDescriptorProto + // 1011 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcd, 0x6e, 0xe3, 0x44, 0x1c, 0x8f, 0xfb, 0xb1, 0x34, 0xd3, 0xcf, 0x4c, 0x4b, 0xeb, 0x0d, 0xdb, 0x4c, 0xb0, 0x50, 0x09, 0x12, 0xb5, 0xb5, 0xbb, 0x42, 0x42, 0x70, 0xa1, 0x29, 0x48, 0x44, 0x2a, 0xb4, 0x32, 0x5d, 0x56, @@ -214,26 +214,26 @@ var fileDescriptor_6e1145b6fa4b74d3 = []byte{ 0x78, 0x2c, 0x56, 0x55, 0x1c, 0xe5, 0x17, 0x7d, 0x45, 0x25, 0xbb, 0xb8, 0x77, 0xb2, 0x47, 0xfb, 0x85, 0xf0, 0x7e, 0xa9, 0x3b, 0x96, 0xb5, 0xf3, 0xbf, 0x99, 0x44, 0x3b, 0x65, 0xcc, 0x37, 0xdb, 0x1b, 0xf6, 0xb6, 0x33, 0xa9, 0x43, 0x26, 0x84, 0xe0, 0xef, 0x1a, 0x68, 0x57, 0x5c, 0x2c, 0x38, - 0x3e, 0xa1, 0xe3, 0xd3, 0xa0, 0xae, 0xbe, 0xaa, 0xd2, 0x07, 0x57, 0x12, 0x69, 0xf7, 0x4a, 0xbf, - 0x55, 0xd9, 0x1d, 0xf3, 0x3e, 0xdd, 0x1b, 0x0b, 0x66, 0x12, 0xbd, 0x5b, 0x06, 0x7f, 0xad, 0xa9, - 0x61, 0x6f, 0x39, 0xd3, 0xd9, 0xf0, 0x17, 0x0d, 0xbc, 0x5d, 0x3b, 0x12, 0x7c, 0x33, 0x34, 0xf4, - 0xb5, 0xae, 0xd6, 0x5b, 0x7c, 0xd2, 0x36, 0x8b, 0xb1, 0x62, 0x8e, 0xc7, 0x8a, 0x79, 0x3c, 0x46, - 0xf4, 0x3f, 0xcb, 0x8f, 0x20, 0x95, 0x68, 0xa3, 0x76, 0x82, 0x37, 0xd5, 0x4c, 0xa2, 0x47, 0x45, - 0xae, 0xa9, 0xf2, 0xc6, 0xcb, 0xbf, 0x91, 0x66, 0x6f, 0x78, 0x53, 0x98, 0xf0, 0x19, 0x58, 0x8d, - 0xa9, 0xe7, 0xf1, 0xe1, 0x10, 0x9f, 0xb2, 0x58, 0xf0, 0xe8, 0x52, 0x6f, 0x75, 0x67, 0x7b, 0xcd, - 0xfe, 0x87, 0xf9, 0x37, 0xfa, 0x1b, 0xea, 0x79, 0x87, 0xc3, 0xe1, 0x97, 0x45, 0x25, 0x93, 0x68, - 0xb3, 0xb0, 0xb9, 0x45, 0x31, 0xec, 0x95, 0x72, 0xa5, 0x44, 0x1a, 0xbf, 0x6a, 0x60, 0xab, 0x36, - 0xe2, 0x8e, 0x79, 0x35, 0xb3, 0xe0, 0x7b, 0x77, 0x66, 0x9b, 0x9a, 0x8b, 0xb7, 0x86, 0xd7, 0x10, - 0x2c, 0xd5, 0x47, 0xb5, 0x3e, 0xd3, 0x9d, 0xed, 0x2d, 0x3e, 0x79, 0xdf, 0x7c, 0xfd, 0xac, 0x36, - 0x6b, 0x86, 0xfd, 0x76, 0x15, 0xb6, 0x2e, 0xa3, 0x26, 0xc9, 0xa2, 0x57, 0x01, 0x8d, 0x1f, 0x41, - 0xeb, 0xf9, 0x29, 0x13, 0xd4, 0x63, 0x71, 0xfe, 0xe9, 0x0a, 0xc3, 0x81, 0x1b, 0x43, 0x0a, 0xde, - 0x39, 0xaf, 0x16, 0xf1, 0x64, 0xdc, 0x58, 0xd7, 0xba, 0xb3, 0xbd, 0xb9, 0xfe, 0x4e, 0x26, 0x91, - 0x51, 0x58, 0xbc, 0x01, 0x6c, 0xd8, 0xfa, 0xf9, 0x84, 0xfe, 0xcd, 0x16, 0xe3, 0xfe, 0xf3, 0xab, - 0x7f, 0x3b, 0x8d, 0xdf, 0xd2, 0x4e, 0xe3, 0x2a, 0xed, 0x68, 0xaf, 0xd2, 0x8e, 0xf6, 0x4f, 0xda, - 0xd1, 0x5e, 0x5e, 0x77, 0x1a, 0xaf, 0xae, 0x3b, 0x8d, 0x3f, 0xaf, 0x3b, 0x8d, 0xef, 0x3e, 0x9a, - 0xe8, 0xd9, 0x7c, 0xe7, 0xbb, 0x7c, 0x38, 0x64, 0x0e, 0x23, 0x5e, 0x79, 0x6f, 0x4d, 0xfe, 0xcc, - 0x51, 0x6d, 0x7c, 0xf2, 0x40, 0x75, 0xd0, 0xd3, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x68, - 0xa0, 0xfa, 0x09, 0x09, 0x00, 0x00, + 0x3e, 0xa1, 0xe3, 0xd3, 0xa0, 0xae, 0xbe, 0xaa, 0xd2, 0x07, 0xf7, 0x4e, 0xbf, 0x55, 0xd9, 0x1d, + 0xf3, 0x3e, 0xdd, 0x1b, 0x0b, 0x66, 0x12, 0xbd, 0x5b, 0x06, 0x7f, 0xad, 0xa9, 0x61, 0x6f, 0x39, + 0xd3, 0xd9, 0xf0, 0x17, 0x0d, 0xbc, 0x5d, 0x3b, 0x12, 0x7c, 0x33, 0x34, 0xf4, 0xb5, 0xae, 0xd6, + 0x5b, 0x7c, 0xd2, 0x36, 0x8b, 0xb1, 0x62, 0x8e, 0xc7, 0x8a, 0x79, 0x3c, 0x46, 0xf4, 0x3f, 0xcb, + 0x37, 0x91, 0x4a, 0xb4, 0x51, 0x3b, 0xc1, 0x9b, 0x6a, 0x26, 0xd1, 0xa3, 0x22, 0xd7, 0x54, 0x79, + 0xe3, 0xe5, 0xdf, 0x48, 0xb3, 0x37, 0xbc, 0x29, 0x4c, 0xf8, 0x0c, 0xac, 0xc6, 0xd4, 0xf3, 0xf8, + 0x70, 0x88, 0x4f, 0x59, 0x2c, 0x78, 0x74, 0xa9, 0xb7, 0xba, 0xb3, 0xbd, 0x66, 0xff, 0xc3, 0xfc, + 0x1b, 0xfd, 0x0d, 0xf5, 0xbc, 0xc3, 0xe1, 0xf0, 0xcb, 0xa2, 0x92, 0x49, 0xb4, 0x59, 0xd8, 0xdc, + 0xa2, 0x18, 0xf6, 0x4a, 0xb9, 0x52, 0x22, 0x8d, 0x5f, 0x35, 0xb0, 0x55, 0x1b, 0x71, 0xc7, 0xbc, + 0x9a, 0x59, 0xf0, 0xbd, 0x3b, 0xb3, 0x4d, 0xcd, 0xc5, 0x5b, 0xc3, 0x6b, 0x08, 0x96, 0xea, 0xa3, + 0x5a, 0x9f, 0xe9, 0xce, 0xf6, 0x16, 0x9f, 0xbc, 0x6f, 0xbe, 0x7e, 0x56, 0x9b, 0x35, 0xc3, 0x7e, + 0xbb, 0x0a, 0x5b, 0x97, 0x51, 0x93, 0x64, 0xd1, 0xab, 0x80, 0xc6, 0x8f, 0xa0, 0xf5, 0xfc, 0x94, + 0x09, 0xea, 0xb1, 0x38, 0xff, 0x74, 0x85, 0xe1, 0xc0, 0x8d, 0x21, 0x05, 0xef, 0x9c, 0x57, 0x8b, + 0x78, 0x32, 0x6e, 0xac, 0x6b, 0xdd, 0xd9, 0xde, 0x5c, 0x7f, 0x27, 0x93, 0xc8, 0x28, 0x2c, 0xde, + 0x00, 0x36, 0x6c, 0xfd, 0x7c, 0x42, 0xff, 0x66, 0x8b, 0x71, 0xff, 0xf9, 0xd5, 0xbf, 0x9d, 0xc6, + 0x6f, 0x69, 0xa7, 0x71, 0x95, 0x76, 0xb4, 0x57, 0x69, 0x47, 0xfb, 0x27, 0xed, 0x68, 0x2f, 0xaf, + 0x3b, 0x8d, 0x57, 0xd7, 0x9d, 0xc6, 0x9f, 0xd7, 0x9d, 0xc6, 0x77, 0x1f, 0x4d, 0xf4, 0x6c, 0xbe, + 0xf3, 0x5d, 0x3e, 0x1c, 0x32, 0x87, 0x11, 0xaf, 0xbc, 0xb7, 0x26, 0x7f, 0xe6, 0xa8, 0x36, 0x3e, + 0x79, 0xa0, 0x3a, 0xe8, 0xe9, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x52, 0x8f, 0x72, 0x82, 0x09, + 0x09, 0x00, 0x00, } func (m *LockedVault) Marshal() (dAtA []byte, err error) { @@ -277,18 +277,16 @@ func (m *LockedVault) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x1 i-- dAtA[i] = 0x82 - if m.CollateralToBeAuctioned != nil { - { - size := m.CollateralToBeAuctioned.Size() - i -= size - if _, err := m.CollateralToBeAuctioned.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintLockedVault(dAtA, i, uint64(size)) + { + size := m.CollateralToBeAuctioned.Size() + i -= size + if _, err := m.CollateralToBeAuctioned.MarshalTo(dAtA[i:]); err != nil { + return 0, err } - i-- - dAtA[i] = 0x7a + i = encodeVarintLockedVault(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x7a { size := m.CurrentCollaterlisationRatio.Size() i -= size @@ -546,10 +544,8 @@ func (m *LockedVault) Size() (n int) { n += 1 + l + sovLockedVault(uint64(l)) l = m.CurrentCollaterlisationRatio.Size() n += 1 + l + sovLockedVault(uint64(l)) - if m.CollateralToBeAuctioned != nil { - l = m.CollateralToBeAuctioned.Size() - n += 1 + l + sovLockedVault(uint64(l)) - } + l = m.CollateralToBeAuctioned.Size() + n += 1 + l + sovLockedVault(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.LiquidationTimestamp) n += 2 + l + sovLockedVault(uint64(l)) if len(m.SellOffHistory) > 0 { @@ -1055,8 +1051,6 @@ func (m *LockedVault) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_cosmos_cosmos_sdk_types.Dec - m.CollateralToBeAuctioned = &v if err := m.CollateralToBeAuctioned.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/rewards/keeper/iter.go b/x/rewards/keeper/iter.go index d4206ba35..2997416f5 100644 --- a/x/rewards/keeper/iter.go +++ b/x/rewards/keeper/iter.go @@ -18,46 +18,46 @@ func (k Keeper) IterateLocker(ctx sdk.Context, appMappingId uint64, assetIds []u } CollectorLookup, _ := k.GetCollectorLookupByAsset(ctx, appMappingId, assetIds[i]) - LockerProductAssetMapping, _ := k.GetLockerLookupTable(ctx, appMappingId) - lockers := LockerProductAssetMapping.Lockers - for _, v := range lockers { - if v.AssetId == assetIds[i] { - lockerIds := v.LockerIds - for w := range lockerIds { - locker, _ := k.GetLocker(ctx, lockerIds[w]) - balance := locker.NetBalance - rewards, err := k.CalculateRewards(ctx, balance, *CollectorLookup.LockerSavingRate) - if err != nil { - return nil - } - // update the lock position - returnsAcc := locker.ReturnsAccumulated - updatedReturnsAcc := rewards.Add(returnsAcc) - netBalance := locker.NetBalance.Add(rewards) - updatedLocker := lockertypes.Locker{ - LockerId: locker.LockerId, - Depositor: locker.Depositor, - ReturnsAccumulated: updatedReturnsAcc, - NetBalance: netBalance, - CreatedAt: locker.CreatedAt, - AssetDepositId: locker.AssetDepositId, - IsLocked: locker.IsLocked, - AppMappingId: locker.AppMappingId, - } - netfeecollectedData, _ := k.GetNetFeeCollectedData(ctx, locker.AppMappingId) - for _, p := range netfeecollectedData.AssetIdToFeeCollected { - if p.AssetId == locker.AssetDepositId { - updatedNetFee := p.NetFeesCollected.Sub(rewards) - err := k.SetNetFeeCollectedData(ctx, locker.AppMappingId, locker.AssetDepositId, updatedNetFee) - if err != nil { - return err - } + LockerProductAssetMapping, _ := k.GetLockerLookupTable(ctx, appMappingId) + lockers := LockerProductAssetMapping.Lockers + for _, v := range lockers { + if v.AssetId == assetIds[i] { + lockerIds := v.LockerIds + for w := range lockerIds { + locker, _ := k.GetLocker(ctx, lockerIds[w]) + balance := locker.NetBalance + rewards, err := k.CalculateRewards(ctx, balance, CollectorLookup.LockerSavingRate) + if err != nil { + return nil + } + // update the lock position + returnsAcc := locker.ReturnsAccumulated + updatedReturnsAcc := rewards.Add(returnsAcc) + netBalance := locker.NetBalance.Add(rewards) + updatedLocker := lockertypes.Locker{ + LockerId: locker.LockerId, + Depositor: locker.Depositor, + ReturnsAccumulated: updatedReturnsAcc, + NetBalance: netBalance, + CreatedAt: locker.CreatedAt, + AssetDepositId: locker.AssetDepositId, + IsLocked: locker.IsLocked, + AppMappingId: locker.AppMappingId, + } + netfeecollectedData, _ := k.GetNetFeeCollectedData(ctx, locker.AppMappingId) + for _, p := range netfeecollectedData.AssetIdToFeeCollected { + if p.AssetId == locker.AssetDepositId { + updatedNetFee := p.NetFeesCollected.Sub(rewards) + err := k.SetNetFeeCollectedData(ctx, locker.AppMappingId, locker.AssetDepositId, updatedNetFee) + if err != nil { + return err } } - k.UpdateLocker(ctx, updatedLocker) } + k.UpdateLocker(ctx, updatedLocker) } } + } } return nil } From 5ec981ea65ee15f2f38e84ad17aebb870cd67d04 Mon Sep 17 00:00:00 2001 From: Chandragupta Singh Date: Wed, 1 Jun 2022 19:40:07 +0530 Subject: [PATCH 2/2] locker,vault query added --- .../comdex/collector/v1beta1/collector.proto | 4 +- proto/comdex/locker/v1beta1/query.proto | 31 + proto/comdex/vault/v1beta1/query.proto | 19 +- x/collector/client/cli/tx.go | 20 +- x/collector/types/collector.pb.go | 231 +++- x/locker/client/cli/cli.go | 2 + x/locker/client/cli/query.go | 75 + x/locker/keeper/grpc_query.go | 64 + x/locker/types/query.pb.go | 1204 ++++++++++++++--- x/locker/types/query.pb.gw.go | 246 ++++ x/vault/client/cli/query.go | 30 + x/vault/keeper/query_server.go | 52 +- x/vault/types/query.pb.go | 754 ++++++++--- x/vault/types/query.pb.gw.go | 101 ++ 14 files changed, 2371 insertions(+), 462 deletions(-) diff --git a/proto/comdex/collector/v1beta1/collector.proto b/proto/comdex/collector/v1beta1/collector.proto index b17380eb3..0d72ab5b0 100644 --- a/proto/comdex/collector/v1beta1/collector.proto +++ b/proto/comdex/collector/v1beta1/collector.proto @@ -121,5 +121,7 @@ message AssetIdToAuctionLookupTable { bool is_surplus_auction = 2 [(gogoproto.moretags) = "yaml:\"is_surplus_auction\""]; bool is_debt_auction = 3 [(gogoproto.moretags) = "yaml:\"is_debt_auction\""]; bool is_auction_active = 4 [(gogoproto.moretags) = "yaml:\"is_auction_active\""]; - + bool asset_out_oracle_price = 15 [ (gogoproto.moretags) = "yaml:\"asset_out_oracle_price\"" ]; + uint64 assset_out_price = 16 [ + (gogoproto.moretags) = "yaml:\"assset_out_price\"" ]; } \ No newline at end of file diff --git a/proto/comdex/locker/v1beta1/query.proto b/proto/comdex/locker/v1beta1/query.proto index d523f81be..3694f36b1 100644 --- a/proto/comdex/locker/v1beta1/query.proto +++ b/proto/comdex/locker/v1beta1/query.proto @@ -40,10 +40,18 @@ service Query { option (google.api.http).get = "/comdex/locker/v1beta1/owner_locker_info_by_all_product_owner/{owner}"; }; + rpc QueryOwnerTxDetailsLockerOfProductbyOwner(QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) returns (QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) { + option (google.api.http).get = "/comdex/locker/v1beta1/owner_locker_tx-details_by_product/{product_id}/{owner}"; + }; + rpc QueryOwnerLockerByProductToAssetIDbyOwner(QueryOwnerLockerByProductToAssetIDbyOwnerRequest) returns (QueryOwnerLockerByProductToAssetIDbyOwnerResponse) { option (google.api.http).get = "/comdex/locker/v1beta1/owner_locker_info_product_asset_id_owner/{product_id}/{asset_id}/{owner}"; }; + rpc QueryLockerByProductbyOwner(QueryLockerByProductbyOwnerRequest) returns (QueryLockerByProductbyOwnerResponse) { + option (google.api.http).get = "/comdex/locker/v1beta1/locker_info_product_owner/{product_id}/{owner}"; + }; + rpc QueryLockerCountByProductID(QueryLockerCountByProductIDRequest) returns (QueryLockerCountByProductIDResponse) { option (google.api.http).get = "/comdex/locker/v1beta1/total_locker_product_id/{product_id}"; }; @@ -134,6 +142,16 @@ message QueryOwnerLockerOfAllProductbyOwnerResponse { repeated string locker_ids = 1 [ (gogoproto.moretags) = "yaml:\"locker_ids\"" ]; } +message QueryOwnerTxDetailsLockerOfProductbyOwnerRequest { + uint64 product_id = 1 [ (gogoproto.moretags) = "yaml:\"product_id\"" ]; + string owner = 2 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; +} + +message QueryOwnerTxDetailsLockerOfProductbyOwnerResponse { + repeated UserTxData userTxData = 1 [ (gogoproto.moretags) = "yaml:\"userTxData\"", + (gogoproto.nullable) = false ]; +} + message QueryOwnerLockerByProductToAssetIDbyOwnerRequest { uint64 product_id = 1 [ (gogoproto.moretags) = "yaml:\"product_id\"" ]; uint64 asset_id = 2 [ (gogoproto.moretags) = "yaml:\"asset_id\"" ]; @@ -148,6 +166,19 @@ message QueryOwnerLockerByProductToAssetIDbyOwnerResponse { ]; } +message QueryLockerByProductbyOwnerRequest { + uint64 product_id = 1 [ (gogoproto.moretags) = "yaml:\"product_id\"" ]; + string owner = 2 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; +} + +message QueryLockerByProductbyOwnerResponse { + repeated Locker lockerInfo = 1[ + (gogoproto.customname) = "LockerInfo", + (gogoproto.moretags) = "yaml:\"lockerInfo\"", + (gogoproto.nullable) = false + ]; +} + message QueryLockerCountByProductIDRequest { uint64 product_id = 1 [ (gogoproto.moretags) = "yaml:\"product_id\"" ]; } diff --git a/proto/comdex/vault/v1beta1/query.proto b/proto/comdex/vault/v1beta1/query.proto index 31a1acfaf..2c5e5f7ec 100644 --- a/proto/comdex/vault/v1beta1/query.proto +++ b/proto/comdex/vault/v1beta1/query.proto @@ -60,6 +60,18 @@ message QueryVaultInfoResponse { ]; } +message QueryVaultInfoByOwnerRequest { + string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; +} + +message QueryVaultInfoByOwnerResponse { + repeated VaultInfo vaultsInfo = 1 [ + (gogoproto.customname) = "VaultsInfo", + (gogoproto.moretags) = "yaml:\"vaultsInfo\"", + (gogoproto.nullable) = false + ]; +} + message QueryAllVaultsRequest { cosmos.base.query.v1beta1.PageRequest pagination = 1 [ (gogoproto.moretags) = "yaml:\"pagination\"" ]; @@ -275,7 +287,8 @@ message QueryTVLlockedByAppRequest { } message QueryTVLlockedByAppResponse { -repeated TvlLockedDataMap tvldata = 1 [ (gogoproto.moretags) = "yaml:\"tvldata\"" ]; +repeated TvlLockedDataMap tvldata = 1 [ (gogoproto.moretags) = "yaml:\"tvldata\"", +(gogoproto.nullable) = false ]; } @@ -288,6 +301,10 @@ service Query { option (google.api.http).get = "/comdex/vault/v1beta1/vaultsInfo/{id}"; }; + rpc QueryVaultInfoByOwner(QueryVaultInfoByOwnerRequest) returns (QueryVaultInfoByOwnerResponse) { + option (google.api.http).get = "/comdex/vault/v1beta1/vaultsInfoByOwner/{owner}"; + }; + rpc QueryAllVaults(QueryAllVaultsRequest) returns (QueryAllVaultsResponse) { option (google.api.http).get = "/comdex/vault/v1beta1/vaults"; }; diff --git a/x/collector/client/cli/tx.go b/x/collector/client/cli/tx.go index ab4283add..09f4975b0 100644 --- a/x/collector/client/cli/tx.go +++ b/x/collector/client/cli/tx.go @@ -156,8 +156,8 @@ func NewCmdLookupTableParams() *cobra.Command { // NewCmdAuctionControlProposal cmd to update controls for auction params func NewCmdAuctionControlProposal() *cobra.Command { cmd := &cobra.Command{ - Use: "auction-control [app-id] [asset_id] [surplus_auction] [debt_auction]", - Args: cobra.ExactArgs(4), + Use: "auction-control [app-id] [asset_id] [surplus_auction] [debt_auction] [asset_out_oracle_price] [assset_out_price]", + Args: cobra.ExactArgs(6), Short: "Set auction control", RunE: func(cmd *cobra.Command, args []string) error { @@ -180,6 +180,16 @@ func NewCmdAuctionControlProposal() *cobra.Command { return err } + asset_out_oracle_price, err := ParseStringFromString(args[4], ",") + if err != nil { + return err + } + + assset_out_price, err := ParseUint64SliceFromString(args[5], ",") + if err != nil { + return err + } + clientCtx, err := client.GetClientTxContext(cmd) if err != nil { return err @@ -195,11 +205,17 @@ func NewCmdAuctionControlProposal() *cobra.Command { if err != nil { return err } + newasset_out_oracle_price, err := strconv.ParseBool(asset_out_oracle_price[i]) + if err != nil { + return err + } collectorAuctionLookupRecords.AppId = appId var AssetIdToAuctionLookup types.AssetIdToAuctionLookupTable AssetIdToAuctionLookup.AssetId = assetId[i] AssetIdToAuctionLookup.IsSurplusAuction = newSurplusAuction AssetIdToAuctionLookup.IsDebtAuction = newDebtAuction + AssetIdToAuctionLookup.AssetOutOraclePrice = newasset_out_oracle_price + AssetIdToAuctionLookup.AsssetOutPrice = assset_out_price[i] collectorAuctionLookupRecords.AssetIdToAuctionLookup = append(collectorAuctionLookupRecords.AssetIdToAuctionLookup, AssetIdToAuctionLookup) } diff --git a/x/collector/types/collector.pb.go b/x/collector/types/collector.pb.go index e456bcb26..42b3e5a29 100644 --- a/x/collector/types/collector.pb.go +++ b/x/collector/types/collector.pb.go @@ -612,10 +612,12 @@ func (m *CollectorAuctionLookupTable) GetAssetIdToAuctionLookup() []AssetIdToAuc } type AssetIdToAuctionLookupTable struct { - AssetId uint64 `protobuf:"varint,1,opt,name=asset_id,json=assetId,proto3" json:"asset_id,omitempty" yaml:"asset_id"` - IsSurplusAuction bool `protobuf:"varint,2,opt,name=is_surplus_auction,json=isSurplusAuction,proto3" json:"is_surplus_auction,omitempty" yaml:"is_surplus_auction"` - IsDebtAuction bool `protobuf:"varint,3,opt,name=is_debt_auction,json=isDebtAuction,proto3" json:"is_debt_auction,omitempty" yaml:"is_debt_auction"` - IsAuctionActive bool `protobuf:"varint,4,opt,name=is_auction_active,json=isAuctionActive,proto3" json:"is_auction_active,omitempty" yaml:"is_auction_active"` + AssetId uint64 `protobuf:"varint,1,opt,name=asset_id,json=assetId,proto3" json:"asset_id,omitempty" yaml:"asset_id"` + IsSurplusAuction bool `protobuf:"varint,2,opt,name=is_surplus_auction,json=isSurplusAuction,proto3" json:"is_surplus_auction,omitempty" yaml:"is_surplus_auction"` + IsDebtAuction bool `protobuf:"varint,3,opt,name=is_debt_auction,json=isDebtAuction,proto3" json:"is_debt_auction,omitempty" yaml:"is_debt_auction"` + IsAuctionActive bool `protobuf:"varint,4,opt,name=is_auction_active,json=isAuctionActive,proto3" json:"is_auction_active,omitempty" yaml:"is_auction_active"` + AssetOutOraclePrice bool `protobuf:"varint,15,opt,name=asset_out_oracle_price,json=assetOutOraclePrice,proto3" json:"asset_out_oracle_price,omitempty" yaml:"asset_out_oracle_price"` + AsssetOutPrice uint64 `protobuf:"varint,16,opt,name=assset_out_price,json=asssetOutPrice,proto3" json:"assset_out_price,omitempty" yaml:"assset_out_price"` } func (m *AssetIdToAuctionLookupTable) Reset() { *m = AssetIdToAuctionLookupTable{} } @@ -679,6 +681,20 @@ func (m *AssetIdToAuctionLookupTable) GetIsAuctionActive() bool { return false } +func (m *AssetIdToAuctionLookupTable) GetAssetOutOraclePrice() bool { + if m != nil { + return m.AssetOutOraclePrice + } + return false +} + +func (m *AssetIdToAuctionLookupTable) GetAsssetOutPrice() uint64 { + if m != nil { + return m.AsssetOutPrice + } + return 0 +} + func init() { proto.RegisterType((*CollectorData)(nil), "comdex.collector.v1beta1.CollectorData") proto.RegisterType((*NetFeeCollectedData)(nil), "comdex.collector.v1beta1.NetFeeCollectedData") @@ -699,77 +715,80 @@ func init() { } var fileDescriptor_f18765a8dff2a43b = []byte{ - // 1107 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x3f, 0x4f, 0x1c, 0x47, - 0x14, 0x67, 0x01, 0x03, 0x37, 0x04, 0x73, 0x2c, 0x60, 0xce, 0x06, 0xee, 0xac, 0x91, 0x93, 0x5c, - 0xe3, 0x3b, 0x81, 0x95, 0xc6, 0x4d, 0xc2, 0x82, 0x88, 0x4f, 0xc4, 0x4e, 0x34, 0x9c, 0x52, 0xa4, - 0xc8, 0x6a, 0x6e, 0x77, 0x80, 0x11, 0xcb, 0xcd, 0x7a, 0x67, 0x0e, 0x07, 0x97, 0x69, 0x12, 0x29, - 0x4d, 0x8a, 0x54, 0xf9, 0x04, 0x91, 0x52, 0xa5, 0xc8, 0x07, 0x70, 0x2a, 0x37, 0x91, 0x5c, 0x46, - 0x29, 0x56, 0x11, 0xf4, 0x29, 0xee, 0x13, 0x44, 0x3b, 0xb3, 0x3b, 0x3b, 0x77, 0xc7, 0x39, 0x6c, - 0x94, 0x0a, 0xf6, 0xf7, 0xde, 0xfc, 0xde, 0x6f, 0xde, 0xbf, 0xd1, 0x81, 0xba, 0xc7, 0xce, 0x7c, - 0xf2, 0x55, 0xd3, 0x63, 0x41, 0x40, 0x3c, 0xc1, 0xa2, 0xe6, 0xf9, 0x56, 0x87, 0x08, 0xbc, 0x95, - 0x23, 0x8d, 0x30, 0x62, 0x82, 0xd9, 0x15, 0xe5, 0xd9, 0xc8, 0xf1, 0xd4, 0xf3, 0xde, 0xca, 0x31, - 0x3b, 0x66, 0xd2, 0xa9, 0x99, 0xfc, 0xa7, 0xfc, 0xe1, 0xab, 0x69, 0xb0, 0xb0, 0x9b, 0xf9, 0xee, - 0x61, 0x81, 0xed, 0x6f, 0x2d, 0xb0, 0x96, 0x9e, 0x26, 0xbe, 0xcb, 0x05, 0xee, 0xd0, 0x80, 0x8a, - 0x0b, 0xf7, 0x88, 0x90, 0x8a, 0x75, 0xdf, 0xaa, 0x97, 0x9c, 0xcf, 0x5e, 0xc7, 0xb5, 0x89, 0x3f, - 0xe3, 0xda, 0x7b, 0xc7, 0x54, 0x9c, 0xf4, 0x3a, 0x0d, 0x8f, 0x9d, 0x35, 0x3d, 0xc6, 0xcf, 0x18, - 0x4f, 0xff, 0x3c, 0xe4, 0xfe, 0x69, 0x53, 0x5c, 0x84, 0x84, 0x37, 0x5a, 0x5d, 0xd1, 0x8f, 0x6b, - 0xd5, 0x0b, 0x7c, 0x16, 0x3c, 0x86, 0x63, 0x68, 0x21, 0x5a, 0xd5, 0x96, 0xc3, 0xcc, 0xb0, 0x4f, - 0x88, 0xfd, 0xb5, 0x05, 0x72, 0x8b, 0xeb, 0x05, 0x8c, 0xd3, 0xee, 0xb1, 0x14, 0x32, 0x29, 0x85, - 0x3c, 0x2b, 0x2c, 0x64, 0x63, 0x58, 0x88, 0x41, 0x0a, 0xd1, 0xb2, 0xc6, 0x77, 0x15, 0x3c, 0x2a, - 0x82, 0x85, 0xa4, 0x9b, 0x89, 0x98, 0xfa, 0xbf, 0x44, 0x18, 0xa4, 0xa6, 0x88, 0x4f, 0x15, 0x9c, - 0x88, 0xf8, 0xd1, 0x02, 0x9b, 0x01, 0x7d, 0xde, 0xa3, 0x3e, 0x16, 0x94, 0x75, 0xdd, 0x88, 0xbc, - 0xc0, 0x91, 0xcf, 0x5d, 0xed, 0x5b, 0xb9, 0x25, 0xc5, 0x7c, 0x5e, 0x58, 0xcc, 0x03, 0x25, 0xe6, - 0xad, 0xe4, 0x10, 0xad, 0x1b, 0x76, 0xa4, 0xcc, 0xbb, 0xda, 0xfa, 0xbb, 0x05, 0x96, 0x9f, 0x11, - 0xb1, 0x4f, 0x88, 0xc6, 0x64, 0x27, 0xd5, 0xc1, 0x0c, 0x0e, 0x43, 0x97, 0xfa, 0xb2, 0x6f, 0xa6, - 0x9d, 0xa5, 0x7e, 0x5c, 0x5b, 0x50, 0xe1, 0x14, 0x0e, 0xd1, 0x2d, 0x1c, 0x86, 0x2d, 0xdf, 0xfe, - 0xce, 0x02, 0xab, 0x98, 0x73, 0x22, 0x5a, 0x7e, 0x9b, 0x99, 0x3c, 0x95, 0xc9, 0xfb, 0x53, 0xf5, - 0xf9, 0xed, 0x66, 0x63, 0x5c, 0x5b, 0x37, 0x76, 0xae, 0x3b, 0xe6, 0x3c, 0x48, 0xf2, 0x90, 0xa7, - 0xfa, 0x5a, 0x6e, 0x88, 0xae, 0x8f, 0x09, 0x7f, 0xb3, 0xc0, 0xea, 0xb5, 0xb4, 0x76, 0x03, 0xcc, - 0xc9, 0x23, 0xf9, 0x9d, 0x96, 0xfb, 0x71, 0x6d, 0xd1, 0x08, 0x22, 0x6f, 0x35, 0x9b, 0xf2, 0xda, - 0x17, 0xc0, 0xee, 0x12, 0x91, 0xd4, 0xd5, 0x2c, 0x95, 0x6a, 0xde, 0x83, 0xc2, 0xa5, 0xba, 0xab, - 0xe2, 0x8c, 0x32, 0x42, 0x54, 0xee, 0xca, 0xfc, 0x1b, 0x45, 0x79, 0x65, 0x81, 0x8d, 0x9d, 0x24, - 0xb9, 0x6d, 0x26, 0xef, 0xa2, 0x87, 0xfc, 0x29, 0x0e, 0x43, 0xda, 0x3d, 0x2e, 0x50, 0x9d, 0x17, - 0x60, 0x51, 0xdd, 0x4d, 0x67, 0x3f, 0x2d, 0xcb, 0xf6, 0xbf, 0x96, 0x65, 0x20, 0x6a, 0x12, 0xd6, - 0xb9, 0xd7, 0x8f, 0x6b, 0x77, 0xcc, 0x84, 0xe9, 0xb3, 0x10, 0xdd, 0xc6, 0x03, 0x4a, 0xe1, 0xcf, - 0x16, 0xa8, 0x8c, 0x23, 0x2a, 0x5c, 0x0b, 0x17, 0x94, 0x4c, 0xfd, 0x56, 0x7d, 0x7e, 0xfb, 0xfd, - 0xf1, 0xfa, 0x07, 0x76, 0xa2, 0x53, 0x49, 0xdb, 0xa9, 0x3c, 0x30, 0xb9, 0x89, 0xe4, 0x9c, 0x13, - 0xfe, 0x3d, 0x0d, 0x56, 0xf4, 0xb1, 0x4f, 0x18, 0x3b, 0xed, 0x85, 0x6d, 0xdc, 0x09, 0x48, 0x81, - 0x4c, 0x1f, 0x00, 0x5b, 0xf3, 0xb9, 0xfa, 0x76, 0x93, 0xf2, 0xd4, 0x66, 0xde, 0x01, 0xa3, 0x3e, - 0x10, 0x95, 0x35, 0x98, 0x66, 0x2c, 0x21, 0xe3, 0xc4, 0x63, 0x5d, 0x1f, 0x47, 0x17, 0x39, 0xd9, - 0xd4, 0x30, 0xd9, 0xa8, 0x0f, 0x44, 0x65, 0x0d, 0x66, 0x64, 0x2d, 0xb0, 0xc4, 0x7b, 0x51, 0x18, - 0xf4, 0xb8, 0x2b, 0x4e, 0x22, 0xc2, 0x4f, 0x58, 0xe0, 0x57, 0xa6, 0x25, 0xd7, 0x46, 0x3f, 0xae, - 0x55, 0x52, 0xae, 0x61, 0x97, 0x84, 0x4a, 0x61, 0xed, 0x0c, 0xb2, 0x3f, 0x02, 0xb7, 0x7d, 0xd2, - 0x11, 0x06, 0xcf, 0x2d, 0xc9, 0x73, 0xb7, 0x1f, 0xd7, 0x56, 0x15, 0xcf, 0xa0, 0x1d, 0xa2, 0x85, - 0x04, 0xc8, 0x19, 0x7a, 0xc0, 0x0e, 0x98, 0x77, 0x4a, 0x22, 0x97, 0xe3, 0xf3, 0x64, 0x71, 0x46, - 0x58, 0x90, 0xca, 0x8c, 0x1c, 0xab, 0x8f, 0x6f, 0x38, 0x52, 0x7b, 0xc4, 0xcb, 0x73, 0x30, 0xca, - 0x06, 0x51, 0x59, 0x81, 0x87, 0x12, 0x43, 0x58, 0x90, 0xa4, 0xe3, 0x02, 0x26, 0x5c, 0x4e, 0x5f, - 0x92, 0xca, 0xec, 0x70, 0xc7, 0x65, 0x16, 0x88, 0x66, 0x03, 0x26, 0x0e, 0xe9, 0x4b, 0x62, 0x7f, - 0x09, 0x40, 0x87, 0xfa, 0xee, 0x11, 0x96, 0x2d, 0x37, 0x27, 0xe5, 0x7d, 0x58, 0x48, 0xde, 0x92, - 0xe2, 0xce, 0x59, 0x20, 0x2a, 0x75, 0xa8, 0xbf, 0xaf, 0xfe, 0xff, 0xc5, 0x02, 0x8b, 0x43, 0x0d, - 0x57, 0xa0, 0xd7, 0x04, 0x50, 0xe3, 0x96, 0xdc, 0xd6, 0xa5, 0xdd, 0x23, 0x96, 0x0e, 0x75, 0xe3, - 0x06, 0x43, 0x61, 0x74, 0xb7, 0xb3, 0x99, 0xce, 0xc6, 0xaa, 0x31, 0x79, 0x9a, 0x13, 0xa2, 0x05, - 0x0d, 0xb4, 0x92, 0xef, 0xe7, 0xc0, 0xde, 0x09, 0xc3, 0x36, 0xdb, 0x23, 0x5d, 0x76, 0xc6, 0x8b, - 0xef, 0xa2, 0x2d, 0x50, 0xca, 0xda, 0x94, 0x4b, 0xc1, 0xd3, 0xce, 0x4a, 0x3e, 0x98, 0xda, 0x04, - 0xd1, 0x5c, 0x3a, 0xf7, 0x1c, 0xfe, 0x6a, 0x81, 0xa5, 0x27, 0x94, 0x0b, 0x16, 0x51, 0x0f, 0x07, - 0x3b, 0x3d, 0x2f, 0x79, 0xc4, 0x0a, 0x84, 0x3c, 0x07, 0x65, 0xc5, 0x2b, 0x98, 0x8b, 0xd5, 0xe9, - 0x1b, 0x3e, 0x4b, 0x6d, 0x96, 0x46, 0x4b, 0xef, 0xe9, 0xac, 0xf7, 0xe3, 0xda, 0x9a, 0x29, 0x35, - 0xa7, 0xcc, 0xb6, 0x9f, 0x3e, 0x03, 0xbf, 0xc9, 0x9e, 0xa1, 0x61, 0x1a, 0x7b, 0x1b, 0x94, 0xd2, - 0x53, 0xad, 0x4c, 0xbe, 0x99, 0x84, 0xcc, 0x04, 0x51, 0xee, 0x66, 0x3f, 0x06, 0xef, 0xa8, 0x90, - 0xbe, 0xcc, 0xbc, 0xbc, 0x41, 0xc9, 0x59, 0xeb, 0xc7, 0xb5, 0x65, 0x53, 0x90, 0xb2, 0x42, 0x34, - 0x2f, 0x3f, 0x55, 0x95, 0x60, 0x6c, 0x81, 0x75, 0x5d, 0xfb, 0x54, 0xcb, 0x7f, 0x5b, 0x70, 0x3f, - 0x58, 0xe0, 0x8e, 0x7e, 0x74, 0x07, 0x98, 0xd2, 0x94, 0x7e, 0x70, 0x83, 0x97, 0x7e, 0x54, 0x81, - 0xf3, 0x6e, 0xda, 0x84, 0x9b, 0x43, 0xef, 0xfd, 0x80, 0x2b, 0x44, 0x63, 0x62, 0xc3, 0x9f, 0x26, - 0xc1, 0xfa, 0x5b, 0xe8, 0x0b, 0xbf, 0x35, 0x07, 0xc0, 0xa6, 0xdc, 0xcd, 0xb6, 0x61, 0xde, 0x34, - 0x56, 0x7d, 0xce, 0x5c, 0xbd, 0xa3, 0x3e, 0x10, 0x95, 0x29, 0x3f, 0x54, 0x58, 0xd6, 0xa9, 0x0e, - 0x58, 0xa4, 0xdc, 0x95, 0x2b, 0x31, 0x63, 0x9a, 0x92, 0x4c, 0xc6, 0x53, 0x3a, 0xe4, 0x00, 0xd1, - 0x02, 0xe5, 0x7b, 0xa4, 0x23, 0x32, 0x8e, 0x27, 0x60, 0x89, 0xea, 0x20, 0x2e, 0xf6, 0x04, 0x3d, - 0x27, 0x72, 0x7d, 0xcf, 0x99, 0xeb, 0x7b, 0xc4, 0x05, 0xa2, 0x45, 0x9a, 0xe9, 0xd8, 0x91, 0x88, - 0xf3, 0xf4, 0xf5, 0x65, 0xd5, 0x7a, 0x73, 0x59, 0xb5, 0xfe, 0xba, 0xac, 0x5a, 0xdf, 0x5f, 0x55, - 0x27, 0xde, 0x5c, 0x55, 0x27, 0xfe, 0xb8, 0xaa, 0x4e, 0x7c, 0xf1, 0x68, 0x60, 0xad, 0x25, 0x45, - 0x7c, 0xc8, 0x8e, 0x8e, 0xa8, 0x47, 0x71, 0x90, 0x7e, 0x37, 0xcd, 0x5f, 0x30, 0x72, 0xcf, 0x75, - 0x66, 0xe4, 0xcf, 0x90, 0x47, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe9, 0xf2, 0x88, 0x82, 0xe2, - 0x0c, 0x00, 0x00, + // 1164 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x3d, 0x53, 0x1b, 0xc7, + 0x1b, 0xe7, 0x78, 0xd7, 0xf2, 0xc7, 0x12, 0x07, 0x98, 0xb3, 0x01, 0xc9, 0xff, 0x1d, 0x27, 0x51, + 0x63, 0x69, 0xc0, 0x93, 0xc6, 0x4d, 0xc2, 0x41, 0x88, 0x35, 0xc4, 0xc6, 0xb3, 0x68, 0x5c, 0xa4, + 0xc8, 0xcd, 0xea, 0x6e, 0x81, 0x1d, 0x0e, 0xed, 0xf9, 0x76, 0x85, 0x83, 0xcb, 0x34, 0xc9, 0x4c, + 0x9a, 0x14, 0xa9, 0xf2, 0x15, 0x52, 0xa5, 0xc8, 0x07, 0x70, 0x9a, 0xb8, 0xc9, 0x8c, 0xcb, 0x4c, + 0x8a, 0x9b, 0x0c, 0xf4, 0x29, 0xf4, 0x09, 0x32, 0xb7, 0x7b, 0x2f, 0x2b, 0x09, 0x1c, 0x2e, 0x93, + 0x0a, 0xee, 0xf7, 0x3c, 0xfb, 0x7b, 0x7e, 0xfb, 0xbc, 0xed, 0x08, 0xd4, 0x5d, 0x76, 0xea, 0x91, + 0x2f, 0x9b, 0x2e, 0xf3, 0x7d, 0xe2, 0x0a, 0x16, 0x36, 0xcf, 0x36, 0x3a, 0x44, 0xe0, 0x8d, 0x1c, + 0x69, 0x04, 0x21, 0x13, 0xcc, 0xb4, 0x94, 0x67, 0x23, 0xc7, 0x13, 0xcf, 0xbb, 0x4b, 0x47, 0xec, + 0x88, 0x49, 0xa7, 0x66, 0xfc, 0x9f, 0xf2, 0x87, 0xaf, 0x27, 0xc1, 0xfc, 0x76, 0xea, 0xbb, 0x83, + 0x05, 0x36, 0xbf, 0x31, 0xc0, 0x4a, 0x72, 0x9a, 0x78, 0x0e, 0x17, 0xb8, 0x43, 0x7d, 0x2a, 0xce, + 0x9d, 0x43, 0x42, 0x2c, 0xe3, 0x9e, 0x51, 0x2f, 0xd9, 0xcf, 0xde, 0x44, 0xb5, 0xb1, 0x3f, 0xa2, + 0xda, 0xfb, 0x47, 0x54, 0x1c, 0xf7, 0x3a, 0x0d, 0x97, 0x9d, 0x36, 0x5d, 0xc6, 0x4f, 0x19, 0x4f, + 0xfe, 0x3c, 0xe0, 0xde, 0x49, 0x53, 0x9c, 0x07, 0x84, 0x37, 0x5a, 0x5d, 0xd1, 0x8f, 0x6a, 0xd5, + 0x73, 0x7c, 0xea, 0x3f, 0x82, 0xd7, 0xd0, 0x42, 0xb4, 0x9c, 0x59, 0x0e, 0x52, 0xc3, 0x2e, 0x21, + 0xe6, 0x57, 0x06, 0xc8, 0x2d, 0x8e, 0xeb, 0x33, 0x4e, 0xbb, 0x47, 0x52, 0xc8, 0xb8, 0x14, 0xf2, + 0xb4, 0xb0, 0x90, 0xb5, 0x61, 0x21, 0x1a, 0x29, 0x44, 0x8b, 0x19, 0xbe, 0xad, 0xe0, 0x51, 0x11, + 0x2c, 0x20, 0xdd, 0x54, 0xc4, 0xc4, 0x7f, 0x25, 0x42, 0x23, 0xd5, 0x45, 0xec, 0x2b, 0x38, 0x16, + 0xf1, 0x83, 0x01, 0xd6, 0x7d, 0xfa, 0xa2, 0x47, 0x3d, 0x2c, 0x28, 0xeb, 0x3a, 0x21, 0x79, 0x89, + 0x43, 0x8f, 0x3b, 0x99, 0xaf, 0x35, 0x25, 0xc5, 0x3c, 0x2f, 0x2c, 0xe6, 0xbe, 0x12, 0xf3, 0x4e, + 0x72, 0x88, 0x56, 0x35, 0x3b, 0x52, 0xe6, 0xed, 0xcc, 0xfa, 0x9b, 0x01, 0x16, 0x9f, 0x12, 0xb1, + 0x4b, 0x48, 0x86, 0xc9, 0x4e, 0xaa, 0x83, 0x69, 0x1c, 0x04, 0x0e, 0xf5, 0x64, 0xdf, 0x4c, 0xda, + 0x0b, 0xfd, 0xa8, 0x36, 0xaf, 0xc2, 0x29, 0x1c, 0xa2, 0x29, 0x1c, 0x04, 0x2d, 0xcf, 0xfc, 0xd6, + 0x00, 0xcb, 0x98, 0x73, 0x22, 0x5a, 0x5e, 0x9b, 0xe9, 0x3c, 0xd6, 0xf8, 0xbd, 0x89, 0xfa, 0xdc, + 0x66, 0xb3, 0x71, 0x5d, 0x5b, 0x37, 0xb6, 0xae, 0x3a, 0x66, 0xdf, 0x8f, 0xf3, 0x90, 0xa7, 0xfa, + 0x4a, 0x6e, 0x88, 0xae, 0x8e, 0x09, 0x7f, 0x31, 0xc0, 0xf2, 0x95, 0xb4, 0x66, 0x03, 0xcc, 0xca, + 0x23, 0xf9, 0x9d, 0x16, 0xfb, 0x51, 0xad, 0xac, 0x05, 0x91, 0xb7, 0x9a, 0x49, 0x78, 0xcd, 0x73, + 0x60, 0x76, 0x89, 0x88, 0xeb, 0xaa, 0x97, 0x4a, 0x35, 0xef, 0x5e, 0xe1, 0x52, 0xdd, 0x51, 0x71, + 0x46, 0x19, 0x21, 0xaa, 0x74, 0x65, 0xfe, 0xb5, 0xa2, 0xbc, 0x36, 0xc0, 0xda, 0x56, 0x9c, 0xdc, + 0x36, 0x93, 0x77, 0xc9, 0x86, 0xfc, 0x09, 0x0e, 0x02, 0xda, 0x3d, 0x2a, 0x50, 0x9d, 0x97, 0xa0, + 0xac, 0xee, 0x96, 0x65, 0x3f, 0x29, 0xcb, 0xe6, 0x3f, 0x96, 0x65, 0x20, 0x6a, 0x1c, 0xd6, 0xbe, + 0xdb, 0x8f, 0x6a, 0xb7, 0xf5, 0x84, 0x65, 0x67, 0x21, 0xba, 0x85, 0x07, 0x94, 0xc2, 0x1f, 0x0d, + 0x60, 0x5d, 0x47, 0x54, 0xb8, 0x16, 0x0e, 0x28, 0xe9, 0xfa, 0x8d, 0xfa, 0xdc, 0xe6, 0x07, 0xd7, + 0xeb, 0x1f, 0xd8, 0x89, 0xb6, 0x95, 0xb4, 0x53, 0x65, 0x60, 0x72, 0x63, 0xc9, 0x39, 0x27, 0xfc, + 0x6b, 0x12, 0x2c, 0x65, 0xc7, 0x3e, 0x63, 0xec, 0xa4, 0x17, 0xb4, 0x71, 0xc7, 0x27, 0x05, 0x32, + 0xbd, 0x07, 0xcc, 0x8c, 0xcf, 0xc9, 0x6e, 0x37, 0x2e, 0x4f, 0xad, 0xe7, 0x1d, 0x30, 0xea, 0x03, + 0x51, 0x25, 0x03, 0x93, 0x8c, 0xc5, 0x64, 0x9c, 0xb8, 0xac, 0xeb, 0xe1, 0xf0, 0x3c, 0x27, 0x9b, + 0x18, 0x26, 0x1b, 0xf5, 0x81, 0xa8, 0x92, 0x81, 0x29, 0x59, 0x0b, 0x2c, 0xf0, 0x5e, 0x18, 0xf8, + 0x3d, 0xee, 0x88, 0xe3, 0x90, 0xf0, 0x63, 0xe6, 0x7b, 0xd6, 0xa4, 0xe4, 0x5a, 0xeb, 0x47, 0x35, + 0x2b, 0xe1, 0x1a, 0x76, 0x89, 0xa9, 0x14, 0xd6, 0x4e, 0x21, 0xf3, 0x63, 0x70, 0xcb, 0x23, 0x1d, + 0xa1, 0xf1, 0x4c, 0x49, 0x9e, 0x3b, 0xfd, 0xa8, 0xb6, 0xac, 0x78, 0x06, 0xed, 0x10, 0xcd, 0xc7, + 0x40, 0xce, 0xd0, 0x03, 0xa6, 0xcf, 0xdc, 0x13, 0x12, 0x3a, 0x1c, 0x9f, 0xc5, 0x8b, 0x33, 0xc4, + 0x82, 0x58, 0xd3, 0x72, 0xac, 0x3e, 0xbd, 0xe1, 0x48, 0xed, 0x10, 0x37, 0xcf, 0xc1, 0x28, 0x1b, + 0x44, 0x15, 0x05, 0x1e, 0x48, 0x0c, 0x61, 0x41, 0xe2, 0x8e, 0xf3, 0x99, 0x70, 0x38, 0x7d, 0x45, + 0xac, 0x99, 0xe1, 0x8e, 0x4b, 0x2d, 0x10, 0xcd, 0xf8, 0x4c, 0x1c, 0xd0, 0x57, 0xc4, 0xfc, 0x02, + 0x80, 0x0e, 0xf5, 0x9c, 0x43, 0x2c, 0x5b, 0x6e, 0x56, 0xca, 0xfb, 0xa8, 0x90, 0xbc, 0x05, 0xc5, + 0x9d, 0xb3, 0x40, 0x54, 0xea, 0x50, 0x6f, 0x57, 0xfd, 0xff, 0x93, 0x01, 0xca, 0x43, 0x0d, 0x57, + 0xa0, 0xd7, 0x04, 0x50, 0xe3, 0x16, 0xdf, 0xd6, 0xa1, 0xdd, 0x43, 0x96, 0x0c, 0x75, 0xe3, 0x06, + 0x43, 0xa1, 0x75, 0xb7, 0xbd, 0x9e, 0xcc, 0xc6, 0xb2, 0x36, 0x79, 0x19, 0x27, 0x44, 0xf3, 0x19, + 0xd0, 0x8a, 0xbf, 0x5f, 0x00, 0x73, 0x2b, 0x08, 0xda, 0x6c, 0x87, 0x74, 0xd9, 0x29, 0x2f, 0xbe, + 0x8b, 0x36, 0x40, 0x29, 0x6d, 0x53, 0x2e, 0x05, 0x4f, 0xda, 0x4b, 0xf9, 0x60, 0x66, 0x26, 0x88, + 0x66, 0x93, 0xb9, 0xe7, 0xf0, 0x67, 0x03, 0x2c, 0x3c, 0xa6, 0x5c, 0xb0, 0x90, 0xba, 0xd8, 0xdf, + 0xea, 0xb9, 0xf1, 0x23, 0x56, 0x20, 0xe4, 0x19, 0xa8, 0x28, 0x5e, 0xc1, 0x1c, 0xac, 0x4e, 0xdf, + 0xf0, 0x59, 0x6a, 0xb3, 0x24, 0x5a, 0x72, 0x4f, 0x7b, 0xb5, 0x1f, 0xd5, 0x56, 0x74, 0xa9, 0x39, + 0x65, 0xba, 0xfd, 0xb2, 0x33, 0xf0, 0xeb, 0xf4, 0x19, 0x1a, 0xa6, 0x31, 0x37, 0x41, 0x29, 0x39, + 0xd5, 0x4a, 0xe5, 0xeb, 0x49, 0x48, 0x4d, 0x10, 0xe5, 0x6e, 0xe6, 0x23, 0xf0, 0x3f, 0x15, 0xd2, + 0x93, 0x99, 0x97, 0x37, 0x28, 0xd9, 0x2b, 0xfd, 0xa8, 0xb6, 0xa8, 0x0b, 0x52, 0x56, 0x88, 0xe6, + 0xe4, 0xa7, 0xaa, 0x12, 0x8c, 0x0c, 0xb0, 0x9a, 0xd5, 0x3e, 0xd1, 0xf2, 0xef, 0x16, 0xdc, 0xf7, + 0x06, 0xb8, 0x9d, 0x3d, 0xba, 0x03, 0x4c, 0x49, 0x4a, 0x3f, 0xbc, 0xc1, 0x4b, 0x3f, 0xaa, 0xc0, + 0x7e, 0x2f, 0x69, 0xc2, 0xf5, 0xa1, 0xf7, 0x7e, 0xc0, 0x15, 0xa2, 0x6b, 0x62, 0xc3, 0x5f, 0x27, + 0xc0, 0xea, 0x3b, 0xe8, 0x0b, 0xbf, 0x35, 0x7b, 0xc0, 0xa4, 0xdc, 0x49, 0xb7, 0x61, 0xde, 0x34, + 0x46, 0x7d, 0x56, 0x5f, 0xbd, 0xa3, 0x3e, 0x10, 0x55, 0x28, 0x3f, 0x50, 0x58, 0xda, 0xa9, 0x36, + 0x28, 0x53, 0xee, 0xc8, 0x95, 0x98, 0x32, 0x4d, 0x48, 0x26, 0xed, 0x29, 0x1d, 0x72, 0x80, 0x68, + 0x9e, 0xf2, 0x1d, 0xd2, 0x11, 0x29, 0xc7, 0x63, 0xb0, 0x40, 0xb3, 0x20, 0x0e, 0x76, 0x05, 0x3d, + 0x23, 0x72, 0x7d, 0xcf, 0xea, 0xeb, 0x7b, 0xc4, 0x05, 0xa2, 0x32, 0x4d, 0x75, 0x6c, 0x49, 0xc4, + 0x7c, 0x9e, 0x14, 0xd0, 0x61, 0x3d, 0xe1, 0xb0, 0x10, 0xbb, 0x3e, 0x71, 0x82, 0x90, 0xba, 0xc4, + 0x2a, 0x4b, 0xba, 0xff, 0x0f, 0x55, 0x61, 0xc4, 0x0f, 0xa2, 0x45, 0x69, 0xd8, 0xef, 0x89, 0x7d, + 0x09, 0x3f, 0x8b, 0x51, 0xf3, 0x13, 0x39, 0x65, 0xe9, 0x01, 0xc5, 0x58, 0x91, 0xa9, 0x1e, 0x1c, + 0x9a, 0x01, 0x0f, 0x35, 0x34, 0x8a, 0x4c, 0xd2, 0xd8, 0x4f, 0xde, 0x5c, 0x54, 0x8d, 0xb7, 0x17, + 0x55, 0xe3, 0xcf, 0x8b, 0xaa, 0xf1, 0xdd, 0x65, 0x75, 0xec, 0xed, 0x65, 0x75, 0xec, 0xf7, 0xcb, + 0xea, 0xd8, 0xe7, 0x0f, 0x07, 0xb6, 0x6e, 0xdc, 0x63, 0x0f, 0xd8, 0xe1, 0x21, 0x75, 0x29, 0xf6, + 0x93, 0xef, 0xa6, 0xfe, 0x03, 0x4b, 0xae, 0xe1, 0xce, 0xb4, 0xfc, 0x95, 0xf4, 0xf0, 0xef, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x6e, 0xd1, 0xf3, 0x7f, 0x81, 0x0d, 0x00, 0x00, } func (m *CollectorData) Marshal() (dAtA []byte, err error) { @@ -1301,6 +1320,23 @@ func (m *AssetIdToAuctionLookupTable) MarshalToSizedBuffer(dAtA []byte) (int, er _ = i var l int _ = l + if m.AsssetOutPrice != 0 { + i = encodeVarintCollector(dAtA, i, uint64(m.AsssetOutPrice)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x80 + } + if m.AssetOutOraclePrice { + i-- + if m.AssetOutOraclePrice { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x78 + } if m.IsAuctionActive { i-- if m.IsAuctionActive { @@ -1575,6 +1611,12 @@ func (m *AssetIdToAuctionLookupTable) Size() (n int) { if m.IsAuctionActive { n += 2 } + if m.AssetOutOraclePrice { + n += 2 + } + if m.AsssetOutPrice != 0 { + n += 2 + sovCollector(uint64(m.AsssetOutPrice)) + } return n } @@ -3080,6 +3122,45 @@ func (m *AssetIdToAuctionLookupTable) Unmarshal(dAtA []byte) error { } } m.IsAuctionActive = bool(v != 0) + case 15: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AssetOutOraclePrice", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCollector + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.AssetOutOraclePrice = bool(v != 0) + case 16: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AsssetOutPrice", wireType) + } + m.AsssetOutPrice = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCollector + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.AsssetOutPrice |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipCollector(dAtA[iNdEx:]) diff --git a/x/locker/client/cli/cli.go b/x/locker/client/cli/cli.go index 2b714c31f..2306dedd7 100644 --- a/x/locker/client/cli/cli.go +++ b/x/locker/client/cli/cli.go @@ -40,6 +40,8 @@ func GetQueryCmd(queryRoute string) *cobra.Command { queryLockerLookupTableByApp(), queryLockerLookupTableByAppAndAssetId(), queryLockerTotalDepositedByApp(), + queryOwnerTxDetailsLockerOfProductbyOwner(), + queryLockerByProductbyOwner(), queryState(), ) // this line is used by starport scaffolding # 1 diff --git a/x/locker/client/cli/query.go b/x/locker/client/cli/query.go index f75c31346..c909a24bf 100644 --- a/x/locker/client/cli/query.go +++ b/x/locker/client/cli/query.go @@ -186,6 +186,43 @@ func queryOwnerLockerByProductIDbyOwner() *cobra.Command { } flags.AddQueryFlagsToCmd(cmd) + return cmd +} + +func queryLockerByProductbyOwner() *cobra.Command { + cmd := &cobra.Command{ + Use: "locker-by-product-by-owner [product_id] [owner]", + Short: "locker by product by owner", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + productId, err := strconv.ParseUint(args[0], 10, 64) + if err != nil { + return err + } + + owner := args[1] + + queryClient := types.NewQueryClient(ctx) + res, err := queryClient.QueryLockerByProductbyOwner( + context.Background(), + &types.QueryLockerByProductbyOwnerRequest{ + ProductId: productId, + Owner: owner, + }, + ) + if err != nil { + return err + } + return ctx.PrintProto(res) + }, + } + flags.AddQueryFlagsToCmd(cmd) + return cmd } @@ -263,6 +300,44 @@ func queryOwnerLockerByProductToAssetIDbyOwner() *cobra.Command { return cmd } +func queryOwnerTxDetailsLockerOfProductbyOwner() *cobra.Command { + cmd := &cobra.Command{ + Use: "owner-tx-details-by-product-to-owner [product_id] [owner]", + Short: "owner locker tx details by product to owner", + Args: cobra.ExactArgs(3), + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + productId, err := strconv.ParseUint(args[0], 10, 64) + if err != nil { + return err + } + + + owner := args[1] + + queryClient := types.NewQueryClient(ctx) + res, err := queryClient.QueryOwnerTxDetailsLockerOfProductbyOwner( + context.Background(), + &types.QueryOwnerTxDetailsLockerOfProductbyOwnerRequest{ + ProductId: productId, + Owner: owner, + }, + ) + if err != nil { + return err + } + return ctx.PrintProto(res) + }, + } + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + func queryTotalLockerByProductID() *cobra.Command { cmd := &cobra.Command{ Use: "total-locker-by-product-id [product_id]", diff --git a/x/locker/keeper/grpc_query.go b/x/locker/keeper/grpc_query.go index b53141bec..b11d5b92a 100644 --- a/x/locker/keeper/grpc_query.go +++ b/x/locker/keeper/grpc_query.go @@ -2,6 +2,7 @@ package keeper import ( "context" + assettypes "github.com/comdex-official/comdex/x/asset/types" "github.com/comdex-official/comdex/x/locker/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -149,6 +150,42 @@ func (q *queryServer) QueryTotalDepositByProductAssetID(c context.Context, reque }, nil } +func (q *queryServer) QueryLockerByProductbyOwner(c context.Context, request *types.QueryLockerByProductbyOwnerRequest) (*types.QueryLockerByProductbyOwnerResponse, error) { + + if request == nil { + return nil, status.Error(codes.InvalidArgument, "request cannot be empty") + } + + var ( + ctx = sdk.UnwrapSDKContext(c) + ) + + app, found := q.GetApp(ctx, request.ProductId) + + if !found { + return nil, status.Errorf(codes.NotFound, "app does not exist for appID %d", request.ProductId) + } + + lockerLookupData, found := q.GetLockerLookupTable(ctx, app.Id) + + if !found { + return nil, status.Errorf(codes.NotFound, "no asset exists appID %d", app.Id) + } + + var lockerInfos []types.Locker + for _, locker := range lockerLookupData.Lockers { + for _, lockerID := range locker.LockerIds { + locker1, _ := q.GetLocker(ctx, lockerID) + if request.Owner == locker1.Depositor { + lockerInfos = append(lockerInfos, locker1) + } + } + } + return &types.QueryLockerByProductbyOwnerResponse{ + LockerInfo: lockerInfos, + }, nil +} + func (q *queryServer) QueryOwnerLockerByProductIDbyOwner(c context.Context, request *types.QueryOwnerLockerByProductIDbyOwnerRequest) (*types.QueryOwnerLockerByProductIDbyOwnerResponse, error) { if request == nil { @@ -205,6 +242,33 @@ func (q *queryServer) QueryOwnerLockerOfAllProductbyOwner(c context.Context, req }, nil } + +func (q *queryServer) QueryOwnerTxDetailsLockerOfProductbyOwner(c context.Context, request *types.QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) (*types.QueryOwnerTxDetailsLockerOfProductbyOwnerResponse, error) { + + if request == nil { + return nil, status.Error(codes.InvalidArgument, "request cannot be empty") + } + + var ( + ctx = sdk.UnwrapSDKContext(c) + userTxData []types.UserTxData + ) + userlockerLookupData, _ := q.GetUserLockerAssetMapping(ctx, request.Owner) + + if userlockerLookupData.Owner == request.Owner{ + for _, locker := range userlockerLookupData.LockerAppMapping { + if locker.AppMappingId == request.ProductId{ + for _, data := range locker.UserAssetLocker { + userTxData = append(userTxData, data.UserTxData...) + } + } + } + } + return &types.QueryOwnerTxDetailsLockerOfProductbyOwnerResponse{ + UserTxData: userTxData, + }, nil +} + func (q *queryServer) QueryOwnerLockerByProductToAssetIDbyOwner(c context.Context, request *types.QueryOwnerLockerByProductToAssetIDbyOwnerRequest) (*types.QueryOwnerLockerByProductToAssetIDbyOwnerResponse, error) { if request == nil { diff --git a/x/locker/types/query.pb.go b/x/locker/types/query.pb.go index 9c694de28..ec8beb924 100644 --- a/x/locker/types/query.pb.go +++ b/x/locker/types/query.pb.go @@ -503,6 +503,89 @@ func (m *QueryOwnerLockerOfAllProductbyOwnerResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryOwnerLockerOfAllProductbyOwnerResponse proto.InternalMessageInfo +type QueryOwnerTxDetailsLockerOfProductbyOwnerRequest struct { + ProductId uint64 `protobuf:"varint,1,opt,name=product_id,json=productId,proto3" json:"product_id,omitempty" yaml:"product_id"` + Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` +} + +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) Reset() { + *m = QueryOwnerTxDetailsLockerOfProductbyOwnerRequest{} +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) String() string { + return proto.CompactTextString(m) +} +func (*QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) ProtoMessage() {} +func (*QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_c4f9c00f752dba84, []int{12} +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryOwnerTxDetailsLockerOfProductbyOwnerRequest.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 *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryOwnerTxDetailsLockerOfProductbyOwnerRequest.Merge(m, src) +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryOwnerTxDetailsLockerOfProductbyOwnerRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryOwnerTxDetailsLockerOfProductbyOwnerRequest proto.InternalMessageInfo + +type QueryOwnerTxDetailsLockerOfProductbyOwnerResponse struct { + UserTxData []UserTxData `protobuf:"bytes,1,rep,name=userTxData,proto3" json:"userTxData" yaml:"userTxData"` +} + +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) Reset() { + *m = QueryOwnerTxDetailsLockerOfProductbyOwnerResponse{} +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) String() string { + return proto.CompactTextString(m) +} +func (*QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) ProtoMessage() {} +func (*QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_c4f9c00f752dba84, []int{13} +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryOwnerTxDetailsLockerOfProductbyOwnerResponse.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 *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryOwnerTxDetailsLockerOfProductbyOwnerResponse.Merge(m, src) +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryOwnerTxDetailsLockerOfProductbyOwnerResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryOwnerTxDetailsLockerOfProductbyOwnerResponse proto.InternalMessageInfo + type QueryOwnerLockerByProductToAssetIDbyOwnerRequest struct { ProductId uint64 `protobuf:"varint,1,opt,name=product_id,json=productId,proto3" json:"product_id,omitempty" yaml:"product_id"` AssetId uint64 `protobuf:"varint,2,opt,name=asset_id,json=assetId,proto3" json:"asset_id,omitempty" yaml:"asset_id"` @@ -517,7 +600,7 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) String() string { } func (*QueryOwnerLockerByProductToAssetIDbyOwnerRequest) ProtoMessage() {} func (*QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{12} + return fileDescriptor_c4f9c00f752dba84, []int{14} } func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -558,7 +641,7 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) String() string { } func (*QueryOwnerLockerByProductToAssetIDbyOwnerResponse) ProtoMessage() {} func (*QueryOwnerLockerByProductToAssetIDbyOwnerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{13} + return fileDescriptor_c4f9c00f752dba84, []int{15} } func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -587,6 +670,81 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) XXX_DiscardUnknown() var xxx_messageInfo_QueryOwnerLockerByProductToAssetIDbyOwnerResponse proto.InternalMessageInfo +type QueryLockerByProductbyOwnerRequest struct { + ProductId uint64 `protobuf:"varint,1,opt,name=product_id,json=productId,proto3" json:"product_id,omitempty" yaml:"product_id"` + Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` +} + +func (m *QueryLockerByProductbyOwnerRequest) Reset() { *m = QueryLockerByProductbyOwnerRequest{} } +func (m *QueryLockerByProductbyOwnerRequest) String() string { return proto.CompactTextString(m) } +func (*QueryLockerByProductbyOwnerRequest) ProtoMessage() {} +func (*QueryLockerByProductbyOwnerRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_c4f9c00f752dba84, []int{16} +} +func (m *QueryLockerByProductbyOwnerRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryLockerByProductbyOwnerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryLockerByProductbyOwnerRequest.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 *QueryLockerByProductbyOwnerRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryLockerByProductbyOwnerRequest.Merge(m, src) +} +func (m *QueryLockerByProductbyOwnerRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryLockerByProductbyOwnerRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryLockerByProductbyOwnerRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryLockerByProductbyOwnerRequest proto.InternalMessageInfo + +type QueryLockerByProductbyOwnerResponse struct { + LockerInfo []Locker `protobuf:"bytes,1,rep,name=lockerInfo,proto3" json:"lockerInfo" yaml:"lockerInfo"` +} + +func (m *QueryLockerByProductbyOwnerResponse) Reset() { *m = QueryLockerByProductbyOwnerResponse{} } +func (m *QueryLockerByProductbyOwnerResponse) String() string { return proto.CompactTextString(m) } +func (*QueryLockerByProductbyOwnerResponse) ProtoMessage() {} +func (*QueryLockerByProductbyOwnerResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_c4f9c00f752dba84, []int{17} +} +func (m *QueryLockerByProductbyOwnerResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryLockerByProductbyOwnerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryLockerByProductbyOwnerResponse.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 *QueryLockerByProductbyOwnerResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryLockerByProductbyOwnerResponse.Merge(m, src) +} +func (m *QueryLockerByProductbyOwnerResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryLockerByProductbyOwnerResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryLockerByProductbyOwnerResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryLockerByProductbyOwnerResponse proto.InternalMessageInfo + type QueryLockerCountByProductIDRequest struct { ProductId uint64 `protobuf:"varint,1,opt,name=product_id,json=productId,proto3" json:"product_id,omitempty" yaml:"product_id"` } @@ -595,7 +753,7 @@ func (m *QueryLockerCountByProductIDRequest) Reset() { *m = QueryLockerC func (m *QueryLockerCountByProductIDRequest) String() string { return proto.CompactTextString(m) } func (*QueryLockerCountByProductIDRequest) ProtoMessage() {} func (*QueryLockerCountByProductIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{14} + return fileDescriptor_c4f9c00f752dba84, []int{18} } func (m *QueryLockerCountByProductIDRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -632,7 +790,7 @@ func (m *QueryLockerCountByProductIDResponse) Reset() { *m = QueryLocker func (m *QueryLockerCountByProductIDResponse) String() string { return proto.CompactTextString(m) } func (*QueryLockerCountByProductIDResponse) ProtoMessage() {} func (*QueryLockerCountByProductIDResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{15} + return fileDescriptor_c4f9c00f752dba84, []int{19} } func (m *QueryLockerCountByProductIDResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -674,7 +832,7 @@ func (m *QueryLockerCountByProductToAssetIDRequest) String() string { } func (*QueryLockerCountByProductToAssetIDRequest) ProtoMessage() {} func (*QueryLockerCountByProductToAssetIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{16} + return fileDescriptor_c4f9c00f752dba84, []int{20} } func (m *QueryLockerCountByProductToAssetIDRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -715,7 +873,7 @@ func (m *QueryLockerCountByProductToAssetIDResponse) String() string { } func (*QueryLockerCountByProductToAssetIDResponse) ProtoMessage() {} func (*QueryLockerCountByProductToAssetIDResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{17} + return fileDescriptor_c4f9c00f752dba84, []int{21} } func (m *QueryLockerCountByProductToAssetIDResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -756,7 +914,7 @@ func (m *QueryWhiteListedAssetIDsByProductIDRequest) String() string { } func (*QueryWhiteListedAssetIDsByProductIDRequest) ProtoMessage() {} func (*QueryWhiteListedAssetIDsByProductIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{18} + return fileDescriptor_c4f9c00f752dba84, []int{22} } func (m *QueryWhiteListedAssetIDsByProductIDRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -797,7 +955,7 @@ func (m *QueryWhiteListedAssetIDsByProductIDResponse) String() string { } func (*QueryWhiteListedAssetIDsByProductIDResponse) ProtoMessage() {} func (*QueryWhiteListedAssetIDsByProductIDResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{19} + return fileDescriptor_c4f9c00f752dba84, []int{23} } func (m *QueryWhiteListedAssetIDsByProductIDResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -835,7 +993,7 @@ func (m *QueryWhiteListedAssetByAllProductRequest) Reset() { func (m *QueryWhiteListedAssetByAllProductRequest) String() string { return proto.CompactTextString(m) } func (*QueryWhiteListedAssetByAllProductRequest) ProtoMessage() {} func (*QueryWhiteListedAssetByAllProductRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{20} + return fileDescriptor_c4f9c00f752dba84, []int{24} } func (m *QueryWhiteListedAssetByAllProductRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -876,7 +1034,7 @@ func (m *QueryWhiteListedAssetByAllProductResponse) String() string { } func (*QueryWhiteListedAssetByAllProductResponse) ProtoMessage() {} func (*QueryWhiteListedAssetByAllProductResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{21} + return fileDescriptor_c4f9c00f752dba84, []int{25} } func (m *QueryWhiteListedAssetByAllProductResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -914,7 +1072,7 @@ func (m *ProductToAllAsset) Reset() { *m = ProductToAllAsset{} } func (m *ProductToAllAsset) String() string { return proto.CompactTextString(m) } func (*ProductToAllAsset) ProtoMessage() {} func (*ProductToAllAsset) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{22} + return fileDescriptor_c4f9c00f752dba84, []int{26} } func (m *ProductToAllAsset) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -950,7 +1108,7 @@ func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{23} + return fileDescriptor_c4f9c00f752dba84, []int{27} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -987,7 +1145,7 @@ func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } func (m *QueryParamsResponse) String() string { return proto.CompactTextString(m) } func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{24} + return fileDescriptor_c4f9c00f752dba84, []int{28} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1024,7 +1182,7 @@ func (m *QueryLockerLookupTableByAppRequest) Reset() { *m = QueryLockerL func (m *QueryLockerLookupTableByAppRequest) String() string { return proto.CompactTextString(m) } func (*QueryLockerLookupTableByAppRequest) ProtoMessage() {} func (*QueryLockerLookupTableByAppRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{25} + return fileDescriptor_c4f9c00f752dba84, []int{29} } func (m *QueryLockerLookupTableByAppRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1061,7 +1219,7 @@ func (m *QueryLockerLookupTableByAppResponse) Reset() { *m = QueryLocker func (m *QueryLockerLookupTableByAppResponse) String() string { return proto.CompactTextString(m) } func (*QueryLockerLookupTableByAppResponse) ProtoMessage() {} func (*QueryLockerLookupTableByAppResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{26} + return fileDescriptor_c4f9c00f752dba84, []int{30} } func (m *QueryLockerLookupTableByAppResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1103,7 +1261,7 @@ func (m *QueryLockerLookupTableByAppAndAssetIdRequest) String() string { } func (*QueryLockerLookupTableByAppAndAssetIdRequest) ProtoMessage() {} func (*QueryLockerLookupTableByAppAndAssetIdRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{27} + return fileDescriptor_c4f9c00f752dba84, []int{31} } func (m *QueryLockerLookupTableByAppAndAssetIdRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1144,7 +1302,7 @@ func (m *QueryLockerLookupTableByAppAndAssetIdResponse) String() string { } func (*QueryLockerLookupTableByAppAndAssetIdResponse) ProtoMessage() {} func (*QueryLockerLookupTableByAppAndAssetIdResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{28} + return fileDescriptor_c4f9c00f752dba84, []int{32} } func (m *QueryLockerLookupTableByAppAndAssetIdResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1181,7 +1339,7 @@ func (m *QueryLockerTotalDepositedByAppRequest) Reset() { *m = QueryLock func (m *QueryLockerTotalDepositedByAppRequest) String() string { return proto.CompactTextString(m) } func (*QueryLockerTotalDepositedByAppRequest) ProtoMessage() {} func (*QueryLockerTotalDepositedByAppRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{29} + return fileDescriptor_c4f9c00f752dba84, []int{33} } func (m *QueryLockerTotalDepositedByAppRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1220,7 +1378,7 @@ func (m *QueryLockerTotalDepositedByAppResponse) Reset() { func (m *QueryLockerTotalDepositedByAppResponse) String() string { return proto.CompactTextString(m) } func (*QueryLockerTotalDepositedByAppResponse) ProtoMessage() {} func (*QueryLockerTotalDepositedByAppResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{30} + return fileDescriptor_c4f9c00f752dba84, []int{34} } func (m *QueryLockerTotalDepositedByAppResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1260,7 +1418,7 @@ func (m *QueryStateRequest) Reset() { *m = QueryStateRequest{} } func (m *QueryStateRequest) String() string { return proto.CompactTextString(m) } func (*QueryStateRequest) ProtoMessage() {} func (*QueryStateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{31} + return fileDescriptor_c4f9c00f752dba84, []int{35} } func (m *QueryStateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1297,7 +1455,7 @@ func (m *QueryStateResponse) Reset() { *m = QueryStateResponse{} } func (m *QueryStateResponse) String() string { return proto.CompactTextString(m) } func (*QueryStateResponse) ProtoMessage() {} func (*QueryStateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c4f9c00f752dba84, []int{32} + return fileDescriptor_c4f9c00f752dba84, []int{36} } func (m *QueryStateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1339,8 +1497,12 @@ func init() { proto.RegisterType((*QueryOwnerLockerByProductIDbyOwnerResponse)(nil), "comdex.locker.v1beta1.QueryOwnerLockerByProductIDbyOwnerResponse") proto.RegisterType((*QueryOwnerLockerOfAllProductbyOwnerRequest)(nil), "comdex.locker.v1beta1.QueryOwnerLockerOfAllProductbyOwnerRequest") proto.RegisterType((*QueryOwnerLockerOfAllProductbyOwnerResponse)(nil), "comdex.locker.v1beta1.QueryOwnerLockerOfAllProductbyOwnerResponse") + proto.RegisterType((*QueryOwnerTxDetailsLockerOfProductbyOwnerRequest)(nil), "comdex.locker.v1beta1.QueryOwnerTxDetailsLockerOfProductbyOwnerRequest") + proto.RegisterType((*QueryOwnerTxDetailsLockerOfProductbyOwnerResponse)(nil), "comdex.locker.v1beta1.QueryOwnerTxDetailsLockerOfProductbyOwnerResponse") proto.RegisterType((*QueryOwnerLockerByProductToAssetIDbyOwnerRequest)(nil), "comdex.locker.v1beta1.QueryOwnerLockerByProductToAssetIDbyOwnerRequest") proto.RegisterType((*QueryOwnerLockerByProductToAssetIDbyOwnerResponse)(nil), "comdex.locker.v1beta1.QueryOwnerLockerByProductToAssetIDbyOwnerResponse") + proto.RegisterType((*QueryLockerByProductbyOwnerRequest)(nil), "comdex.locker.v1beta1.QueryLockerByProductbyOwnerRequest") + proto.RegisterType((*QueryLockerByProductbyOwnerResponse)(nil), "comdex.locker.v1beta1.QueryLockerByProductbyOwnerResponse") proto.RegisterType((*QueryLockerCountByProductIDRequest)(nil), "comdex.locker.v1beta1.QueryLockerCountByProductIDRequest") proto.RegisterType((*QueryLockerCountByProductIDResponse)(nil), "comdex.locker.v1beta1.QueryLockerCountByProductIDResponse") proto.RegisterType((*QueryLockerCountByProductToAssetIDRequest)(nil), "comdex.locker.v1beta1.QueryLockerCountByProductToAssetIDRequest") @@ -1365,114 +1527,124 @@ func init() { func init() { proto.RegisterFile("comdex/locker/v1beta1/query.proto", fileDescriptor_c4f9c00f752dba84) } var fileDescriptor_c4f9c00f752dba84 = []byte{ - // 1711 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0xba, 0x4d, 0x5a, 0x4f, 0x5a, 0x95, 0x4c, 0xd3, 0x12, 0x36, 0x8d, 0x9d, 0x4e, 0xd5, - 0x36, 0x69, 0xb1, 0xb7, 0xbf, 0xa0, 0xf4, 0x97, 0xda, 0x38, 0xa1, 0x25, 0x25, 0x69, 0xd2, 0x6d, - 0x10, 0xd0, 0x03, 0xd6, 0xda, 0xbb, 0x71, 0x56, 0x59, 0xef, 0x6c, 0xbd, 0x1b, 0x5a, 0x2b, 0x0a, - 0xe2, 0xc7, 0x01, 0x10, 0x42, 0x2a, 0xe2, 0xc0, 0x81, 0x13, 0x12, 0x88, 0x9e, 0xf9, 0x0b, 0x38, - 0xf6, 0x46, 0x05, 0x12, 0x82, 0x8b, 0x05, 0x09, 0x37, 0x6e, 0x39, 0x82, 0x2a, 0xd0, 0xce, 0xcc, - 0xee, 0x7a, 0x6d, 0xef, 0x78, 0x1d, 0x17, 0x7a, 0x6a, 0x76, 0xf7, 0xbd, 0x37, 0xdf, 0xf7, 0xcd, - 0xcc, 0x9b, 0xf9, 0x6a, 0x70, 0xb0, 0x88, 0xcb, 0xaa, 0x76, 0x4f, 0x32, 0x70, 0x71, 0x59, 0xab, - 0x48, 0x6f, 0x9f, 0x2c, 0x68, 0x8e, 0x72, 0x52, 0xba, 0xb3, 0xa2, 0x55, 0xaa, 0x59, 0xab, 0x82, - 0x1d, 0x0c, 0xf7, 0xd1, 0x90, 0x2c, 0x0d, 0xc9, 0xb2, 0x10, 0x71, 0xb0, 0x84, 0x4b, 0x98, 0x44, - 0x48, 0xee, 0x5f, 0x34, 0x58, 0x3c, 0x50, 0xc2, 0xb8, 0x64, 0x68, 0x92, 0x62, 0xe9, 0x92, 0x62, - 0x9a, 0xd8, 0x51, 0x1c, 0x1d, 0x9b, 0x36, 0xfb, 0x8a, 0x5a, 0x8f, 0xc6, 0x2a, 0x73, 0x63, 0x2c, - 0xa5, 0xa2, 0x94, 0xbd, 0x3a, 0xa3, 0x2c, 0x46, 0xb1, 0x6d, 0xcd, 0xf1, 0x43, 0xc8, 0x13, 0x8b, - 0x48, 0x15, 0xb1, 0x5d, 0xc6, 0xb6, 0x54, 0x50, 0x6c, 0xcd, 0x0f, 0x28, 0x62, 0xdd, 0xa4, 0xdf, - 0xd1, 0x59, 0xb0, 0xff, 0xa6, 0xcb, 0x71, 0x86, 0x8c, 0x32, 0x6d, 0x2e, 0x62, 0x59, 0xbb, 0xb3, - 0xa2, 0xd9, 0x0e, 0x1c, 0x01, 0x09, 0x5d, 0x1d, 0x12, 0x46, 0x85, 0xb1, 0x64, 0x6e, 0xf7, 0x66, - 0x2d, 0x9d, 0xac, 0x2a, 0x65, 0xe3, 0x3c, 0xd2, 0x55, 0x24, 0x27, 0x74, 0x15, 0xbd, 0x27, 0x80, - 0x67, 0x9b, 0x32, 0x6d, 0x0b, 0x9b, 0xb6, 0x06, 0x17, 0x01, 0x30, 0xfc, 0xb7, 0xa4, 0x44, 0xff, - 0xa9, 0x91, 0x6c, 0x4b, 0xf9, 0xb2, 0x34, 0x3d, 0x77, 0xf4, 0x61, 0x2d, 0xdd, 0xb3, 0x5e, 0x4b, - 0x83, 0xa0, 0xdc, 0x66, 0x2d, 0x3d, 0x40, 0xc7, 0x0c, 0x8a, 0x21, 0xb9, 0xae, 0x32, 0xfa, 0x54, - 0x00, 0x87, 0xeb, 0x30, 0xd8, 0xb9, 0xea, 0x7c, 0x05, 0xab, 0x2b, 0x45, 0x67, 0x01, 0x4f, 0xb8, - 0x1a, 0x4c, 0x4f, 0x79, 0x64, 0xce, 0x00, 0x60, 0xd1, 0x4f, 0x79, 0x46, 0x6a, 0x7b, 0x6e, 0x5f, - 0x30, 0x40, 0xf0, 0x0d, 0xc9, 0x49, 0xf6, 0x30, 0xad, 0xc2, 0x2c, 0xd8, 0x49, 0xb4, 0x74, 0x73, - 0x12, 0x24, 0x67, 0xef, 0x66, 0x2d, 0xbd, 0x87, 0xe6, 0x78, 0x5f, 0x90, 0xbc, 0x83, 0xfc, 0x39, - 0xad, 0xa2, 0xb7, 0xc0, 0x91, 0x76, 0x70, 0x98, 0x42, 0x67, 0x3c, 0x85, 0xf2, 0xba, 0x6a, 0x0f, - 0x09, 0xa3, 0xdb, 0xc6, 0x92, 0xf5, 0x78, 0x82, 0x6f, 0x48, 0x4e, 0x32, 0xc2, 0xaa, 0x8d, 0xde, - 0x04, 0x07, 0x1b, 0x24, 0xf7, 0x87, 0xe8, 0x92, 0x2a, 0xba, 0x0d, 0x10, 0xaf, 0x74, 0x57, 0xb0, - 0xef, 0x0b, 0x60, 0x8c, 0x14, 0x5f, 0xc0, 0x8e, 0x62, 0x4c, 0x69, 0x16, 0xb6, 0x75, 0xc7, 0x2f, - 0xff, 0x54, 0x66, 0x6a, 0x1e, 0x8c, 0xc7, 0x40, 0xc4, 0x58, 0x1f, 0x02, 0xbb, 0x1d, 0x37, 0x2e, - 0xaf, 0xd2, 0x40, 0x8a, 0x4a, 0xde, 0xe5, 0xd4, 0x25, 0xa3, 0x8f, 0x05, 0x56, 0x72, 0xee, 0xae, - 0xa9, 0x55, 0xd8, 0xaa, 0x0e, 0x24, 0x2c, 0xd0, 0xf7, 0xdd, 0xb1, 0x3c, 0x02, 0x7a, 0xb1, 0x5b, - 0x85, 0x50, 0x4c, 0xe6, 0x9e, 0xd9, 0xac, 0xa5, 0x77, 0xd1, 0x04, 0xf2, 0x1a, 0xc9, 0xf4, 0x33, - 0x2a, 0x80, 0x63, 0x71, 0xa0, 0x74, 0x35, 0xa9, 0x0b, 0xcd, 0x63, 0xcc, 0x2d, 0x4e, 0x18, 0x06, - 0x1b, 0xa6, 0x81, 0xaf, 0x8f, 0x7c, 0x1b, 0x1f, 0x79, 0x11, 0x1c, 0x8f, 0x55, 0xb5, 0x2b, 0xe8, - 0xdf, 0x0b, 0xe0, 0x44, 0xa4, 0x3e, 0xfe, 0x5e, 0x7d, 0x22, 0x33, 0xd6, 0xe1, 0xba, 0x8c, 0xad, - 0xd3, 0x97, 0x02, 0x38, 0xd9, 0x01, 0x85, 0x88, 0xbe, 0xbc, 0xed, 0x3f, 0xea, 0xcb, 0xe1, 0x66, - 0x32, 0x89, 0x57, 0x4c, 0xe7, 0x89, 0x35, 0xaa, 0xab, 0xe0, 0x10, 0xb7, 0x36, 0xa3, 0x9a, 0x06, - 0xfd, 0x74, 0xcf, 0x16, 0xdd, 0x08, 0xb6, 0x63, 0x01, 0x79, 0x45, 0x72, 0xd0, 0x67, 0xde, 0x7e, - 0x6d, 0x55, 0xe8, 0x29, 0x9d, 0x1f, 0xb3, 0x6c, 0x4f, 0xb5, 0x81, 0x14, 0x97, 0xa2, 0xd7, 0x06, - 0x5e, 0x5f, 0xd2, 0x1d, 0x6d, 0x46, 0xb7, 0x1d, 0x4d, 0x65, 0x35, 0xec, 0x27, 0x36, 0x1d, 0xd7, - 0xd9, 0x86, 0x6d, 0x37, 0x06, 0xc3, 0x3c, 0x0c, 0x92, 0x1e, 0x6f, 0xba, 0x5f, 0xb7, 0xcb, 0x3b, - 0x19, 0x7b, 0x1b, 0x1d, 0x63, 0xc7, 0x44, 0x63, 0xad, 0x5c, 0x35, 0xe8, 0x00, 0x0c, 0x2d, 0xfa, - 0xc6, 0x9b, 0x3e, 0x7e, 0x30, 0x1b, 0xf6, 0x1e, 0x18, 0xb0, 0x7c, 0x19, 0x0d, 0x83, 0x04, 0xb2, - 0xf5, 0x3f, 0x16, 0xb1, 0xfe, 0xe7, 0x1b, 0xe3, 0x73, 0xa3, 0xee, 0x56, 0xd8, 0xac, 0xa5, 0x87, - 0x42, 0x82, 0x04, 0x01, 0x48, 0x6e, 0x1e, 0x04, 0xbd, 0x03, 0x06, 0x9a, 0x2a, 0xc1, 0x91, 0x66, - 0xa9, 0xeb, 0x97, 0xcd, 0x75, 0xd0, 0x47, 0x34, 0xb1, 0x87, 0x12, 0x04, 0xe2, 0xb0, 0x07, 0x91, - 0x5e, 0xec, 0x3c, 0x84, 0x14, 0xd5, 0x3e, 0x86, 0x6a, 0x77, 0xdd, 0xaa, 0xb2, 0x91, 0xcc, 0x2a, - 0xa0, 0x41, 0x00, 0x89, 0x4c, 0xf3, 0xe4, 0xda, 0xe8, 0xa9, 0x57, 0x04, 0x7b, 0x43, 0x6f, 0x99, - 0x4c, 0x33, 0xa0, 0x8f, 0x5e, 0x2f, 0xdb, 0xdc, 0xd9, 0x68, 0x5a, 0xe3, 0xd0, 0x34, 0x15, 0xc9, - 0xac, 0x06, 0xba, 0x11, 0xea, 0x02, 0x33, 0x18, 0x2f, 0xaf, 0x58, 0x0b, 0x4a, 0xc1, 0xd0, 0x72, - 0xd5, 0x09, 0xcb, 0xf2, 0x96, 0xdd, 0x18, 0xe8, 0x53, 0x2c, 0x2b, 0x58, 0x72, 0x03, 0x75, 0x5c, - 0xc8, 0x7b, 0x24, 0xf7, 0x2a, 0x96, 0x35, 0xad, 0xa2, 0x07, 0x42, 0x68, 0xeb, 0x37, 0x17, 0x64, - 0x2c, 0xde, 0x15, 0xc0, 0xa0, 0x83, 0x97, 0x35, 0x73, 0x01, 0xd3, 0xc8, 0x59, 0xc5, 0xb2, 0x74, - 0xb3, 0xc4, 0x26, 0xfc, 0x78, 0x04, 0xa9, 0x85, 0x16, 0x29, 0xb9, 0xf4, 0x66, 0x2d, 0x3d, 0x4c, - 0xd1, 0xb4, 0x2a, 0x89, 0xe4, 0x96, 0x23, 0xa1, 0x8f, 0x04, 0xf0, 0x3c, 0x07, 0xea, 0x84, 0xc9, - 0x36, 0x89, 0xda, 0xb1, 0x0a, 0x1d, 0xf7, 0x94, 0xef, 0x04, 0x90, 0x89, 0x09, 0xa5, 0xbd, 0x7e, - 0xc2, 0xff, 0xa4, 0xdf, 0xcd, 0xd0, 0xbd, 0xbe, 0xfe, 0x92, 0xa6, 0xa9, 0x5b, 0x5c, 0x3d, 0x3f, - 0x08, 0xa1, 0xcb, 0x79, 0xcb, 0x9a, 0x4c, 0x80, 0xaf, 0x05, 0x70, 0x80, 0x90, 0x53, 0xfd, 0x80, - 0x89, 0xb2, 0xdb, 0x51, 0xa7, 0x14, 0x47, 0x99, 0x55, 0x2c, 0xb6, 0x90, 0x4e, 0xf3, 0x4e, 0xce, - 0x88, 0xd4, 0xdc, 0x71, 0xb6, 0x67, 0x0e, 0xd5, 0x9d, 0xa0, 0x11, 0xb1, 0x48, 0xe6, 0xa2, 0x40, - 0x36, 0x18, 0x20, 0x84, 0x6e, 0x39, 0x8a, 0xa3, 0x79, 0x82, 0x0c, 0x81, 0x1d, 0x8a, 0xaa, 0x56, - 0x34, 0x9b, 0xee, 0xe1, 0xa4, 0xec, 0x3d, 0xc2, 0x41, 0xd0, 0xab, 0x6a, 0x26, 0x2e, 0xd3, 0xcb, - 0xa3, 0x4c, 0x1f, 0xe0, 0x7e, 0xd0, 0xb7, 0xa4, 0xe9, 0xa5, 0x25, 0x87, 0xde, 0x38, 0x64, 0xf6, - 0xe4, 0xbe, 0x77, 0x94, 0x4a, 0x49, 0x73, 0x86, 0xb6, 0xd3, 0xf7, 0xf4, 0xc9, 0xbd, 0xe6, 0xc2, - 0xfa, 0x51, 0x99, 0x64, 0x36, 0xe8, 0x53, 0xca, 0xfe, 0x31, 0xd4, 0x7f, 0xea, 0xb9, 0x2c, 0xf5, - 0x9d, 0x59, 0xd7, 0x77, 0xfa, 0xca, 0x4c, 0x62, 0xdd, 0xcc, 0x5d, 0x69, 0x68, 0x58, 0x24, 0x0d, - 0xfd, 0x55, 0x4b, 0x1f, 0x2d, 0xe9, 0xce, 0xd2, 0x4a, 0xc1, 0x55, 0x55, 0x62, 0xae, 0x95, 0xfe, - 0x93, 0xb1, 0xd5, 0x65, 0xc9, 0xa9, 0x5a, 0x9a, 0x4d, 0x2a, 0xc8, 0x6c, 0xa8, 0x53, 0x5f, 0x1c, - 0x00, 0xbd, 0x04, 0x0b, 0xfc, 0x4a, 0x00, 0x7b, 0x1a, 0xec, 0x0b, 0xcc, 0x44, 0x4c, 0x4f, 0x6b, - 0xbb, 0x2b, 0x66, 0xe3, 0x86, 0x53, 0xc6, 0x48, 0x7a, 0xff, 0xa7, 0x3f, 0x3e, 0x4f, 0x8c, 0xc3, - 0xa3, 0x12, 0xcf, 0xcb, 0xe7, 0x75, 0x73, 0x11, 0x4b, 0xab, 0xba, 0xba, 0x06, 0xff, 0x14, 0x40, - 0x8a, 0xef, 0x0e, 0xe1, 0xc5, 0xf6, 0x18, 0xa2, 0x3d, 0xae, 0x78, 0x69, 0x8b, 0xd9, 0x8c, 0xd0, - 0x0c, 0x21, 0x74, 0x15, 0x4e, 0x71, 0x09, 0xd9, 0x84, 0x51, 0xde, 0x6b, 0x34, 0xd2, 0x6a, 0x70, - 0x90, 0xad, 0x49, 0xab, 0xde, 0xeb, 0x35, 0xf8, 0xb3, 0x00, 0xc4, 0x68, 0x43, 0x09, 0x5f, 0x8a, - 0xa7, 0x76, 0xf3, 0x35, 0x45, 0x3c, 0xb7, 0x85, 0x4c, 0xc6, 0x70, 0x92, 0x30, 0xbc, 0x04, 0x2f, - 0xc4, 0x61, 0x18, 0xf0, 0x0a, 0x71, 0x84, 0x8f, 0x05, 0x66, 0xc2, 0x79, 0xd6, 0x11, 0x5e, 0xe6, - 0xa1, 0x8c, 0x61, 0x83, 0xc5, 0x2b, 0x5b, 0x2f, 0xc0, 0xd8, 0xbe, 0x46, 0xd8, 0xce, 0xc1, 0xd9, - 0x08, 0xb6, 0x21, 0x4b, 0xeb, 0xd3, 0x6d, 0x3b, 0xb1, 0x1f, 0x24, 0xd8, 0xb1, 0xce, 0x35, 0x97, - 0x90, 0x8b, 0x3f, 0x8e, 0x45, 0x16, 0x27, 0xba, 0xa8, 0xc0, 0x24, 0x78, 0x83, 0x48, 0x20, 0xc3, - 0xf9, 0x08, 0x09, 0x88, 0x97, 0xca, 0xb3, 0x9d, 0x5a, 0xa8, 0xe6, 0x15, 0xc3, 0xf0, 0x85, 0x28, - 0x54, 0xf3, 0xe4, 0x73, 0x83, 0x10, 0xe4, 0xdd, 0x1a, 0xfc, 0xdb, 0xbb, 0x8b, 0xf0, 0x8d, 0x2a, - 0x8c, 0x4b, 0x22, 0xda, 0x3a, 0x8b, 0xb9, 0x6e, 0x4a, 0x30, 0x21, 0x66, 0x89, 0x10, 0xd7, 0xe0, - 0xcb, 0x71, 0x84, 0x20, 0xcb, 0xbf, 0x41, 0x0d, 0x26, 0x05, 0x63, 0xff, 0x6d, 0x82, 0xf3, 0x7f, - 0x1d, 0x8d, 0xee, 0x13, 0x5e, 0xeb, 0x74, 0x22, 0x23, 0x2c, 0xb8, 0xf8, 0x4a, 0xf7, 0x85, 0x98, - 0x1e, 0x25, 0xa2, 0x87, 0x02, 0xf3, 0xb1, 0xf5, 0x68, 0xdc, 0x1f, 0x2d, 0x17, 0x87, 0xbf, 0x4b, - 0x7c, 0xa5, 0x7e, 0x15, 0xc0, 0x30, 0xc7, 0xae, 0xc2, 0x18, 0xdd, 0x2c, 0xc2, 0x3e, 0x8b, 0xe7, - 0xb7, 0x92, 0x1a, 0xb3, 0x13, 0xd2, 0xde, 0xc0, 0xf8, 0x47, 0x75, 0xc2, 0x7f, 0x04, 0x8e, 0xcd, - 0x0f, 0x0e, 0xb5, 0x2b, 0x9d, 0xe2, 0x6c, 0x3a, 0xd8, 0x26, 0xba, 0xa8, 0xc0, 0x08, 0x2f, 0x10, - 0xc2, 0x37, 0xe0, 0x4c, 0x27, 0x84, 0xdb, 0xf6, 0xc2, 0xc7, 0x5e, 0x17, 0xe0, 0xbb, 0x5f, 0x7e, - 0x17, 0x88, 0xe5, 0xce, 0xf9, 0x5d, 0x20, 0x9e, 0xf9, 0x46, 0x73, 0x44, 0x84, 0x69, 0x78, 0x2d, - 0x42, 0x84, 0xbb, 0x6e, 0x19, 0x83, 0x94, 0xf1, 0xb9, 0xdb, 0x6e, 0x27, 0x88, 0x5a, 0x01, 0x1b, - 0xde, 0x59, 0xc8, 0x33, 0xe1, 0xfc, 0xb3, 0x30, 0x86, 0xd7, 0xe7, 0x9f, 0x85, 0x71, 0xfc, 0x3f, - 0xba, 0x40, 0x98, 0xbf, 0x00, 0x4f, 0xc7, 0x66, 0x1e, 0xd0, 0x84, 0x9f, 0x08, 0xa0, 0xbf, 0xce, - 0x2d, 0xc3, 0x71, 0x1e, 0x9c, 0x90, 0xcf, 0x16, 0x8f, 0xc5, 0x09, 0x65, 0x18, 0x0f, 0x13, 0x8c, - 0x69, 0x38, 0x22, 0xf1, 0x7e, 0xf8, 0x81, 0x3f, 0x86, 0x3b, 0x4a, 0xa3, 0x9f, 0x8b, 0xd3, 0x51, - 0x22, 0xac, 0x78, 0x9c, 0x8e, 0x12, 0x65, 0xba, 0xd1, 0x45, 0x82, 0xfe, 0x45, 0x78, 0x86, 0x7b, - 0xb7, 0xca, 0x18, 0x24, 0x3f, 0x53, 0xa8, 0x66, 0x14, 0xcb, 0x92, 0x56, 0xa9, 0x47, 0x5b, 0x83, - 0x1f, 0x26, 0x42, 0x86, 0x2f, 0xda, 0xa4, 0xc2, 0xc9, 0xce, 0x31, 0x36, 0xb9, 0x6d, 0x71, 0xaa, - 0xbb, 0x22, 0x8c, 0xf2, 0x2d, 0x42, 0x79, 0x16, 0xbe, 0xda, 0x01, 0xe5, 0x8c, 0x62, 0xaa, 0x19, - 0x66, 0xcd, 0x7d, 0xfa, 0xf5, 0x2d, 0xa5, 0x16, 0x76, 0x09, 0x2d, 0x6c, 0x6a, 0x1c, 0x97, 0x10, - 0xed, 0x98, 0xe3, 0xb8, 0x04, 0x8e, 0x37, 0x46, 0x97, 0x09, 0xe9, 0x73, 0xf0, 0x2c, 0x9f, 0xb4, - 0xea, 0x65, 0x37, 0x4d, 0x75, 0x11, 0x80, 0xc0, 0x3f, 0xc2, 0x31, 0x1e, 0x9a, 0x7a, 0x63, 0x2b, - 0x8e, 0xc7, 0x88, 0x64, 0x18, 0x7b, 0x72, 0xf2, 0xc3, 0xdf, 0x53, 0x3d, 0x0f, 0xd6, 0x53, 0x3d, - 0x0f, 0xd7, 0x53, 0xc2, 0xa3, 0xf5, 0x94, 0xf0, 0xdb, 0x7a, 0x4a, 0xb8, 0xbf, 0x91, 0xea, 0x79, - 0xb4, 0x91, 0xea, 0xf9, 0x65, 0x23, 0xd5, 0x73, 0xfb, 0x44, 0xc8, 0x6c, 0xba, 0x85, 0x33, 0x78, - 0x71, 0x51, 0x2f, 0xea, 0x8a, 0xe1, 0x31, 0xf3, 0xb9, 0x11, 0xeb, 0x59, 0xe8, 0x23, 0x3f, 0x98, - 0x9e, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x19, 0x4f, 0xd0, 0x46, 0x2a, 0x1e, 0x00, 0x00, + // 1858 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0x13, 0xc7, + 0x1e, 0xcf, 0x1a, 0x12, 0xf0, 0x04, 0xc4, 0xcb, 0x10, 0x78, 0xc1, 0x21, 0x76, 0x18, 0x04, 0x24, + 0xf0, 0xec, 0x85, 0xc0, 0x7b, 0x3c, 0x7e, 0x09, 0xe2, 0xe4, 0xc1, 0x0b, 0x2f, 0x21, 0x61, 0x31, + 0xaf, 0x2d, 0xaa, 0x6a, 0xad, 0xbd, 0x1b, 0x67, 0x95, 0x8d, 0x77, 0xf1, 0x6e, 0x4a, 0xac, 0x28, + 0x55, 0x4b, 0x0f, 0x6d, 0x55, 0x21, 0x51, 0x55, 0xe2, 0xd2, 0x53, 0xa5, 0x56, 0xe5, 0xdc, 0xbf, + 0xa0, 0x47, 0x6e, 0x45, 0xad, 0x54, 0xb5, 0x17, 0xab, 0x4d, 0x7a, 0xeb, 0x2d, 0xc7, 0x56, 0xa8, + 0xd5, 0xce, 0xcc, 0xfe, 0xb2, 0xbd, 0xe3, 0x71, 0xcc, 0x8f, 0x13, 0xde, 0xd9, 0xef, 0x7c, 0xe7, + 0xf3, 0xf9, 0xcc, 0xec, 0x77, 0x66, 0x3e, 0x04, 0x1c, 0x2a, 0x1a, 0x4b, 0x8a, 0xba, 0x22, 0xea, + 0x46, 0x71, 0x51, 0xad, 0x88, 0x6f, 0x9f, 0x2a, 0xa8, 0xb6, 0x7c, 0x4a, 0xbc, 0xbb, 0xac, 0x56, + 0xaa, 0x19, 0xb3, 0x62, 0xd8, 0x06, 0xdc, 0x47, 0x42, 0x32, 0x24, 0x24, 0x43, 0x43, 0x12, 0xfd, + 0x25, 0xa3, 0x64, 0xe0, 0x08, 0xd1, 0xf9, 0x45, 0x82, 0x13, 0x07, 0x4b, 0x86, 0x51, 0xd2, 0x55, + 0x51, 0x36, 0x35, 0x51, 0x2e, 0x97, 0x0d, 0x5b, 0xb6, 0x35, 0xa3, 0x6c, 0xd1, 0xb7, 0xa8, 0xf9, + 0x68, 0x34, 0x33, 0x33, 0xc6, 0x94, 0x2b, 0xf2, 0x92, 0x9b, 0x67, 0x98, 0xc6, 0xc8, 0x96, 0xa5, + 0xda, 0x5e, 0x08, 0x7e, 0xa2, 0x11, 0xc9, 0xa2, 0x61, 0x2d, 0x19, 0x96, 0x58, 0x90, 0x2d, 0xd5, + 0x0b, 0x28, 0x1a, 0x5a, 0x99, 0xbc, 0x47, 0x67, 0xc1, 0xfe, 0x9b, 0x0e, 0xc7, 0x69, 0x3c, 0xca, + 0x54, 0x79, 0xde, 0x90, 0xd4, 0xbb, 0xcb, 0xaa, 0x65, 0xc3, 0x21, 0x10, 0xd3, 0x94, 0x01, 0x61, + 0x58, 0x18, 0x89, 0x67, 0x77, 0x6f, 0xd6, 0x52, 0xf1, 0xaa, 0xbc, 0xa4, 0x9f, 0x47, 0x9a, 0x82, + 0xa4, 0x98, 0xa6, 0xa0, 0xf7, 0x04, 0xf0, 0xf7, 0x86, 0x9e, 0x96, 0x69, 0x94, 0x2d, 0x15, 0xce, + 0x03, 0xa0, 0x7b, 0xad, 0x38, 0x45, 0xef, 0xd8, 0x50, 0xa6, 0xa9, 0x7c, 0x19, 0xd2, 0x3d, 0x7b, + 0xec, 0x49, 0x2d, 0xd5, 0xb5, 0x5e, 0x4b, 0x01, 0x3f, 0xdd, 0x66, 0x2d, 0xd5, 0x47, 0xc6, 0xf4, + 0x93, 0x21, 0x29, 0x90, 0x19, 0x3d, 0x10, 0xc0, 0x91, 0x00, 0x06, 0x2b, 0x5b, 0x9d, 0xab, 0x18, + 0xca, 0x72, 0xd1, 0xce, 0x19, 0xe3, 0x8e, 0x06, 0x53, 0x93, 0x2e, 0x99, 0x33, 0x00, 0x98, 0xe4, + 0x55, 0x9e, 0x92, 0xda, 0x9e, 0xdd, 0xe7, 0x0f, 0xe0, 0xbf, 0x43, 0x52, 0x9c, 0x3e, 0x4c, 0x29, + 0x30, 0x03, 0x76, 0x62, 0x2d, 0x9d, 0x3e, 0x31, 0xdc, 0x67, 0xef, 0x66, 0x2d, 0xb5, 0x87, 0xf4, + 0x71, 0xdf, 0x20, 0x69, 0x07, 0xfe, 0x39, 0xa5, 0xa0, 0xb7, 0xc0, 0xd1, 0x56, 0x70, 0xa8, 0x42, + 0x67, 0x5c, 0x85, 0xf2, 0x9a, 0x62, 0x0d, 0x08, 0xc3, 0xdb, 0x46, 0xe2, 0x41, 0x3c, 0xfe, 0x3b, + 0x24, 0xc5, 0x29, 0x61, 0xc5, 0x42, 0x6f, 0x80, 0x43, 0x75, 0x92, 0x7b, 0x43, 0x74, 0x48, 0x15, + 0xdd, 0x01, 0x88, 0x95, 0xba, 0x23, 0xd8, 0x0f, 0x05, 0x30, 0x82, 0x93, 0xe7, 0x0c, 0x5b, 0xd6, + 0x27, 0x55, 0xd3, 0xb0, 0x34, 0xdb, 0x4b, 0xff, 0x4a, 0x66, 0x6a, 0x0e, 0x8c, 0x72, 0x20, 0xa2, + 0xac, 0x0f, 0x83, 0xdd, 0xb6, 0x13, 0x97, 0x57, 0x48, 0x20, 0x41, 0x25, 0xed, 0xb2, 0x03, 0x9d, + 0xd1, 0x47, 0x02, 0x4d, 0x39, 0x7b, 0xaf, 0xac, 0x56, 0xe8, 0xaa, 0xf6, 0x25, 0x2c, 0x90, 0xf6, + 0xce, 0x58, 0x1e, 0x05, 0xdd, 0x86, 0x93, 0x05, 0x53, 0x8c, 0x67, 0xff, 0xb6, 0x59, 0x4b, 0xed, + 0x22, 0x1d, 0x70, 0x33, 0x92, 0xc8, 0x6b, 0x54, 0x00, 0xc7, 0x79, 0xa0, 0x74, 0x34, 0xa9, 0xb9, + 0xc6, 0x31, 0x66, 0xe7, 0xc7, 0x75, 0x9d, 0x0e, 0x53, 0xc7, 0xd7, 0x43, 0xbe, 0x8d, 0x8d, 0xbc, + 0x08, 0x4e, 0x70, 0x65, 0xed, 0x74, 0x3d, 0x9e, 0xf4, 0x47, 0xc9, 0xad, 0x4c, 0xaa, 0xb6, 0xac, + 0xe9, 0x96, 0x3b, 0x5c, 0x73, 0x06, 0x2f, 0x76, 0xc6, 0x3e, 0x11, 0xc0, 0xa9, 0x36, 0x20, 0x51, + 0xfa, 0x6f, 0x02, 0xb0, 0x6c, 0xe1, 0x70, 0xd9, 0x96, 0x31, 0xfd, 0xde, 0xb1, 0x43, 0x11, 0x75, + 0xf6, 0xb6, 0x17, 0x98, 0x3d, 0xe0, 0xd4, 0x5a, 0x1f, 0xba, 0x9f, 0x02, 0x49, 0x81, 0x7c, 0xe8, + 0x9b, 0x90, 0x4c, 0x75, 0xcb, 0xc8, 0x2b, 0x69, 0xcf, 0x45, 0xa6, 0x36, 0x3f, 0x5f, 0xee, 0xe5, + 0xf4, 0x59, 0x48, 0xd6, 0x96, 0x14, 0x22, 0xb6, 0xaf, 0x6d, 0x2f, 0x68, 0xfb, 0xba, 0x2f, 0x84, + 0x8a, 0xae, 0x07, 0xec, 0xa5, 0xae, 0xbc, 0x07, 0x02, 0x38, 0xcc, 0x04, 0xf1, 0x92, 0x45, 0x09, + 0x6f, 0x44, 0x13, 0xc6, 0x72, 0xd9, 0x7e, 0x6e, 0x9b, 0xdc, 0xd5, 0x10, 0xd5, 0xc6, 0xdc, 0x94, + 0x6a, 0x0a, 0xf4, 0x92, 0x7a, 0x5f, 0x74, 0x22, 0x68, 0xb5, 0x07, 0xb8, 0x09, 0xf7, 0x71, 0xbe, + 0xd6, 0xd1, 0xc8, 0x44, 0xaf, 0xe8, 0xec, 0x31, 0x43, 0xeb, 0x71, 0x0b, 0x48, 0xbc, 0x14, 0xdd, + 0x2d, 0xe4, 0xb5, 0x05, 0xcd, 0x56, 0xa7, 0x35, 0xcb, 0x56, 0x15, 0x9a, 0xc3, 0x7a, 0x6e, 0xd3, + 0x71, 0x9d, 0x16, 0xfb, 0x56, 0x63, 0x50, 0xcc, 0x83, 0x20, 0xee, 0xf2, 0x26, 0xb5, 0x7e, 0xbb, + 0xb4, 0x93, 0xb2, 0xb7, 0xd0, 0x71, 0x7a, 0xc4, 0xa8, 0xcf, 0x95, 0xad, 0xfa, 0xbb, 0x07, 0x45, + 0x8b, 0xbe, 0x74, 0xa7, 0x8f, 0x1d, 0x4c, 0x87, 0x5d, 0x01, 0x7d, 0xa6, 0x27, 0xa3, 0xae, 0xe3, + 0x40, 0xba, 0xfe, 0x47, 0x22, 0xd6, 0xff, 0x5c, 0x7d, 0x7c, 0x76, 0x98, 0x96, 0xdc, 0x81, 0x90, + 0x20, 0x7e, 0x00, 0x92, 0x1a, 0x07, 0x41, 0xef, 0x80, 0xbe, 0x86, 0x4c, 0x70, 0xa8, 0x51, 0xea, + 0xe0, 0xb2, 0xb9, 0x0e, 0x7a, 0xb0, 0x26, 0xd6, 0x40, 0x0c, 0x43, 0x1c, 0x74, 0x21, 0x92, 0x4b, + 0x81, 0x8b, 0x90, 0xa0, 0xda, 0x47, 0x51, 0xed, 0x0e, 0xac, 0x2a, 0x0b, 0x49, 0x34, 0x03, 0xea, + 0x07, 0x10, 0xcb, 0x34, 0x87, 0xaf, 0x1c, 0xae, 0x7a, 0x45, 0xb0, 0x37, 0xd4, 0x4a, 0x65, 0x9a, + 0x06, 0x3d, 0xe4, 0x6a, 0xd2, 0xe2, 0xbc, 0x4f, 0xba, 0xd5, 0x0f, 0x4d, 0xba, 0x22, 0x89, 0xe6, + 0x40, 0x37, 0x42, 0x55, 0x60, 0xda, 0x30, 0x16, 0x97, 0xcd, 0x9c, 0x5c, 0xd0, 0xd5, 0x6c, 0x75, + 0xdc, 0x34, 0xdd, 0x65, 0x37, 0x02, 0x7a, 0x64, 0xd3, 0xf4, 0x97, 0x5c, 0x5f, 0x80, 0x0b, 0x6e, + 0x47, 0x52, 0xb7, 0x6c, 0x9a, 0x53, 0x0a, 0x7a, 0x1c, 0xae, 0x72, 0x8d, 0x09, 0x29, 0x8b, 0x77, + 0x05, 0xd0, 0x6f, 0x1b, 0x8b, 0x6a, 0x39, 0x67, 0x90, 0xc8, 0x19, 0xd9, 0x34, 0xb5, 0x72, 0x89, + 0x4e, 0xf8, 0x89, 0x08, 0x52, 0xb9, 0x26, 0x5d, 0xb2, 0xa9, 0xcd, 0x5a, 0x6a, 0x90, 0xa0, 0x69, + 0x96, 0x12, 0x49, 0x4d, 0x47, 0x42, 0x1f, 0x0a, 0xe0, 0x1f, 0x0c, 0xa8, 0xe3, 0x65, 0xfa, 0x91, + 0x28, 0x6d, 0xab, 0xd0, 0x76, 0x4d, 0xf9, 0x5a, 0x00, 0x69, 0x4e, 0x28, 0xad, 0xf5, 0x13, 0x5e, + 0x92, 0x7e, 0x37, 0x43, 0x77, 0xc2, 0xe0, 0x01, 0x5f, 0x55, 0xb6, 0xb8, 0x7a, 0xbe, 0x15, 0x42, + 0x17, 0xbb, 0xa6, 0x39, 0xa9, 0x00, 0x5f, 0x08, 0xe0, 0x20, 0x26, 0xa7, 0x78, 0x01, 0xe3, 0x4b, + 0x4e, 0x45, 0x75, 0x8e, 0x54, 0x33, 0xb2, 0x49, 0x17, 0xd2, 0x69, 0xd6, 0xce, 0x19, 0xd1, 0x35, + 0x7b, 0x82, 0x7e, 0x33, 0x87, 0x03, 0x3b, 0x68, 0x44, 0x2c, 0x92, 0x98, 0x28, 0x90, 0x05, 0xfa, + 0x30, 0xa1, 0x5b, 0xb6, 0x6c, 0xab, 0xae, 0x20, 0x03, 0x60, 0x87, 0xac, 0x28, 0x15, 0xd5, 0x22, + 0xdf, 0x70, 0x5c, 0x72, 0x1f, 0x61, 0x3f, 0xe8, 0x56, 0xd4, 0xb2, 0xb1, 0x44, 0x0e, 0x13, 0x12, + 0x79, 0x80, 0xfb, 0x41, 0xcf, 0x82, 0xaa, 0x95, 0x16, 0x6c, 0x72, 0x0c, 0x93, 0xe8, 0x93, 0xd3, + 0x6e, 0xcb, 0x95, 0x92, 0x6a, 0x0f, 0x6c, 0x27, 0xed, 0xe4, 0xc9, 0xb9, 0x22, 0xc1, 0xe0, 0xa8, + 0x54, 0x32, 0x0b, 0xf4, 0xc8, 0x4b, 0xde, 0x36, 0xd4, 0x3b, 0x76, 0x20, 0x43, 0x3c, 0x8b, 0x4c, + 0x41, 0xb6, 0x54, 0x4f, 0x99, 0x09, 0x43, 0x2b, 0x67, 0xaf, 0xd4, 0x15, 0x2c, 0xdc, 0x0d, 0xfd, + 0x5e, 0x4b, 0x1d, 0x2b, 0x69, 0xf6, 0xc2, 0x72, 0xc1, 0x51, 0x55, 0xa4, 0x8e, 0x07, 0xf9, 0x27, + 0x6d, 0x29, 0x8b, 0xa2, 0x5d, 0x35, 0x55, 0x0b, 0x67, 0x90, 0xe8, 0x50, 0x63, 0x8f, 0x86, 0x41, + 0x37, 0xc6, 0x02, 0x3f, 0x17, 0xc0, 0x9e, 0xba, 0xab, 0x2f, 0x4c, 0x47, 0x4c, 0x4f, 0x73, 0xab, + 0x24, 0x91, 0xe1, 0x0d, 0x27, 0x8c, 0x91, 0x78, 0xff, 0xfb, 0x5f, 0x3f, 0x8d, 0x8d, 0xc2, 0x63, + 0x22, 0xcb, 0x07, 0xca, 0x6b, 0xe5, 0x79, 0x43, 0x5c, 0xd5, 0x94, 0x35, 0xf8, 0x9b, 0x00, 0x92, + 0x6c, 0x67, 0x01, 0x5e, 0x6c, 0x8d, 0x21, 0xda, 0x1f, 0x49, 0x5c, 0xda, 0x62, 0x6f, 0x4a, 0x68, + 0x1a, 0x13, 0xba, 0x0a, 0x27, 0x99, 0x84, 0x2c, 0xcc, 0x28, 0xef, 0x16, 0x1a, 0x71, 0xd5, 0xdf, + 0xc8, 0xd6, 0xc4, 0x55, 0xb7, 0x79, 0x0d, 0xfe, 0x20, 0x80, 0x44, 0xb4, 0x19, 0x01, 0xff, 0xcd, + 0xa7, 0x76, 0xe3, 0x31, 0x25, 0x71, 0x6e, 0x0b, 0x3d, 0x29, 0xc3, 0x09, 0xcc, 0xf0, 0x12, 0xbc, + 0xc0, 0xc3, 0xd0, 0xe7, 0x15, 0xe2, 0x08, 0x9f, 0x09, 0xd4, 0xc0, 0x61, 0xd9, 0x0e, 0xf0, 0x32, + 0x0b, 0x25, 0x87, 0x85, 0x92, 0xb8, 0xb2, 0xf5, 0x04, 0x94, 0xed, 0x6d, 0xcc, 0x76, 0x16, 0xce, + 0x44, 0xb0, 0x0d, 0xd9, 0x21, 0x1e, 0xdd, 0x96, 0x13, 0xfb, 0x7e, 0x8c, 0x6e, 0xeb, 0x4c, 0x63, + 0x02, 0x32, 0xf1, 0xf3, 0xd8, 0x2b, 0x89, 0xf1, 0x0e, 0x32, 0x50, 0x09, 0x5e, 0xc7, 0x12, 0x48, + 0x70, 0x2e, 0x42, 0x02, 0x7c, 0x7b, 0xca, 0xd3, 0x2f, 0xb5, 0x50, 0xcd, 0xcb, 0xba, 0xee, 0x09, + 0x51, 0xa8, 0xe6, 0xf1, 0xeb, 0x3a, 0x21, 0x70, 0xdb, 0x1a, 0xfc, 0xc3, 0x3d, 0x8b, 0xb0, 0x4d, + 0x0e, 0xc8, 0x4b, 0x22, 0xda, 0x76, 0x49, 0x64, 0x3b, 0x49, 0x41, 0x85, 0x98, 0xc1, 0x42, 0x5c, + 0x83, 0xff, 0xe1, 0x11, 0x02, 0x2f, 0xff, 0x3a, 0x35, 0xa8, 0x14, 0x94, 0xfd, 0xa3, 0x58, 0xd0, + 0x27, 0x6b, 0xe1, 0x74, 0xc0, 0x6b, 0x2d, 0x09, 0xf0, 0xd9, 0x37, 0x89, 0xff, 0x76, 0x9e, 0x88, + 0xea, 0xf1, 0x7f, 0xac, 0xc7, 0x1c, 0xbc, 0xc1, 0xa3, 0x87, 0xbd, 0x92, 0x56, 0x48, 0x56, 0x47, + 0x15, 0xaa, 0x48, 0xf3, 0x65, 0xf1, 0x55, 0x8c, 0x61, 0x20, 0xd6, 0x7b, 0x15, 0x1c, 0xc2, 0xf0, + 0x19, 0x36, 0x1c, 0xc2, 0x70, 0xda, 0x26, 0xa8, 0x84, 0x85, 0x91, 0x61, 0x9e, 0x7b, 0xa1, 0xd4, + 0x17, 0x8e, 0xa6, 0x5f, 0x8d, 0x57, 0x3e, 0x3c, 0xa5, 0x36, 0x04, 0x30, 0xc8, 0xb0, 0x2c, 0x20, + 0x47, 0x99, 0x8f, 0xf0, 0x5a, 0x12, 0xe7, 0xb7, 0xd2, 0x95, 0xf3, 0x43, 0x69, 0xc6, 0x9c, 0x51, + 0x26, 0x7e, 0x0a, 0xb3, 0xac, 0x77, 0x2b, 0x78, 0x58, 0x46, 0xb8, 0x27, 0x3c, 0x2c, 0xa3, 0xcc, + 0x91, 0x96, 0x1b, 0x21, 0xd9, 0x1a, 0x28, 0xd7, 0xa8, 0x8d, 0xf0, 0x4f, 0x81, 0xe1, 0xf2, 0xf8, + 0x67, 0x9a, 0x2b, 0xed, 0xe2, 0x6c, 0x38, 0xd7, 0x8c, 0x77, 0x90, 0x81, 0x12, 0xce, 0x61, 0xc2, + 0x37, 0xe0, 0x74, 0x3b, 0x84, 0x5b, 0x6e, 0x85, 0xcf, 0xdc, 0x4d, 0x80, 0x6d, 0x7e, 0xb0, 0x37, + 0x01, 0x2e, 0x73, 0x86, 0xbd, 0x09, 0xf0, 0x79, 0x2f, 0x68, 0x16, 0x8b, 0x30, 0x05, 0xaf, 0x45, + 0x88, 0x70, 0xcf, 0x49, 0xa3, 0xe3, 0x34, 0x1e, 0xf7, 0x60, 0xc9, 0x6b, 0x58, 0x01, 0x1b, 0xee, + 0x51, 0x88, 0xe5, 0xc1, 0xb0, 0x8f, 0x42, 0x1c, 0x56, 0x0f, 0xfb, 0x28, 0xc4, 0x63, 0xff, 0xa0, + 0x0b, 0x98, 0xf9, 0x3f, 0xe1, 0x69, 0x6e, 0xe6, 0x3e, 0x4d, 0xf8, 0xb1, 0x00, 0x7a, 0x03, 0x66, + 0x09, 0x1c, 0x65, 0xc1, 0x09, 0xd9, 0x2c, 0x89, 0xe3, 0x3c, 0xa1, 0x14, 0xe3, 0x11, 0x8c, 0x31, + 0x05, 0x87, 0x44, 0xd6, 0xff, 0x19, 0xc3, 0xef, 0xc2, 0x15, 0xa5, 0xfe, 0x3a, 0xcf, 0x53, 0x51, + 0x22, 0x9c, 0x18, 0x9e, 0x8a, 0x12, 0xe5, 0xb9, 0xa0, 0x8b, 0x18, 0xfd, 0xbf, 0xe0, 0x19, 0x66, + 0xdd, 0x4c, 0xeb, 0xb8, 0x7f, 0xba, 0x50, 0x4d, 0xcb, 0xa6, 0x29, 0xae, 0x92, 0x2b, 0xfa, 0x1a, + 0xfc, 0x20, 0x16, 0xba, 0xef, 0x47, 0x7b, 0x14, 0x70, 0xa2, 0x7d, 0x8c, 0x0d, 0x66, 0x4b, 0x62, + 0xb2, 0xb3, 0x24, 0x94, 0xf2, 0x2d, 0x4c, 0x79, 0x06, 0xfe, 0xaf, 0x0d, 0xca, 0x69, 0xb9, 0xac, + 0xa4, 0xa9, 0x33, 0xe3, 0xd1, 0x0f, 0x96, 0x94, 0x5a, 0xf8, 0x92, 0xd8, 0xc4, 0xa5, 0xe0, 0xb9, + 0x24, 0x46, 0x1b, 0x26, 0x3c, 0x97, 0x44, 0x86, 0x35, 0x82, 0x2e, 0x63, 0xd2, 0xe7, 0xe0, 0x59, + 0x36, 0x69, 0xc5, 0xed, 0xdd, 0x30, 0xd5, 0x45, 0x00, 0x7c, 0xfb, 0x00, 0x8e, 0xb0, 0xd0, 0x04, + 0x7d, 0x8d, 0xc4, 0x28, 0x47, 0x24, 0xc5, 0xd8, 0x95, 0x95, 0x9e, 0xfc, 0x92, 0xec, 0x7a, 0xbc, + 0x9e, 0xec, 0x7a, 0xb2, 0x9e, 0x14, 0x9e, 0xae, 0x27, 0x85, 0x9f, 0xd7, 0x93, 0xc2, 0xc3, 0x8d, + 0x64, 0xd7, 0xd3, 0x8d, 0x64, 0xd7, 0x8f, 0x1b, 0xc9, 0xae, 0x3b, 0x27, 0x43, 0x5e, 0x83, 0x93, + 0x38, 0x6d, 0xcc, 0xcf, 0x6b, 0x45, 0x4d, 0xd6, 0x5d, 0x66, 0x1e, 0x37, 0xec, 0x3c, 0x14, 0x7a, + 0xf0, 0xdf, 0x5a, 0x9c, 0xfe, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xce, 0xa3, 0x6b, 0x65, 0x22, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1493,7 +1665,9 @@ type QueryClient interface { QueryTotalDepositByProductAssetID(ctx context.Context, in *QueryTotalDepositByProductAssetIDRequest, opts ...grpc.CallOption) (*QueryTotalDepositByProductAssetIDResponse, error) QueryOwnerLockerByProductIDbyOwner(ctx context.Context, in *QueryOwnerLockerByProductIDbyOwnerRequest, opts ...grpc.CallOption) (*QueryOwnerLockerByProductIDbyOwnerResponse, error) QueryOwnerLockerOfAllProductbyOwner(ctx context.Context, in *QueryOwnerLockerOfAllProductbyOwnerRequest, opts ...grpc.CallOption) (*QueryOwnerLockerOfAllProductbyOwnerResponse, error) + QueryOwnerTxDetailsLockerOfProductbyOwner(ctx context.Context, in *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest, opts ...grpc.CallOption) (*QueryOwnerTxDetailsLockerOfProductbyOwnerResponse, error) QueryOwnerLockerByProductToAssetIDbyOwner(ctx context.Context, in *QueryOwnerLockerByProductToAssetIDbyOwnerRequest, opts ...grpc.CallOption) (*QueryOwnerLockerByProductToAssetIDbyOwnerResponse, error) + QueryLockerByProductbyOwner(ctx context.Context, in *QueryLockerByProductbyOwnerRequest, opts ...grpc.CallOption) (*QueryLockerByProductbyOwnerResponse, error) QueryLockerCountByProductID(ctx context.Context, in *QueryLockerCountByProductIDRequest, opts ...grpc.CallOption) (*QueryLockerCountByProductIDResponse, error) QueryLockerCountByProductToAssetID(ctx context.Context, in *QueryLockerCountByProductToAssetIDRequest, opts ...grpc.CallOption) (*QueryLockerCountByProductToAssetIDResponse, error) QueryWhiteListedAssetIDsByProductID(ctx context.Context, in *QueryWhiteListedAssetIDsByProductIDRequest, opts ...grpc.CallOption) (*QueryWhiteListedAssetIDsByProductIDResponse, error) @@ -1567,6 +1741,15 @@ func (c *queryClient) QueryOwnerLockerOfAllProductbyOwner(ctx context.Context, i return out, nil } +func (c *queryClient) QueryOwnerTxDetailsLockerOfProductbyOwner(ctx context.Context, in *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest, opts ...grpc.CallOption) (*QueryOwnerTxDetailsLockerOfProductbyOwnerResponse, error) { + out := new(QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) + err := c.cc.Invoke(ctx, "/comdex.locker.v1beta1.Query/QueryOwnerTxDetailsLockerOfProductbyOwner", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *queryClient) QueryOwnerLockerByProductToAssetIDbyOwner(ctx context.Context, in *QueryOwnerLockerByProductToAssetIDbyOwnerRequest, opts ...grpc.CallOption) (*QueryOwnerLockerByProductToAssetIDbyOwnerResponse, error) { out := new(QueryOwnerLockerByProductToAssetIDbyOwnerResponse) err := c.cc.Invoke(ctx, "/comdex.locker.v1beta1.Query/QueryOwnerLockerByProductToAssetIDbyOwner", in, out, opts...) @@ -1576,6 +1759,15 @@ func (c *queryClient) QueryOwnerLockerByProductToAssetIDbyOwner(ctx context.Cont return out, nil } +func (c *queryClient) QueryLockerByProductbyOwner(ctx context.Context, in *QueryLockerByProductbyOwnerRequest, opts ...grpc.CallOption) (*QueryLockerByProductbyOwnerResponse, error) { + out := new(QueryLockerByProductbyOwnerResponse) + err := c.cc.Invoke(ctx, "/comdex.locker.v1beta1.Query/QueryLockerByProductbyOwner", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *queryClient) QueryLockerCountByProductID(ctx context.Context, in *QueryLockerCountByProductIDRequest, opts ...grpc.CallOption) (*QueryLockerCountByProductIDResponse, error) { out := new(QueryLockerCountByProductIDResponse) err := c.cc.Invoke(ctx, "/comdex.locker.v1beta1.Query/QueryLockerCountByProductID", in, out, opts...) @@ -1665,7 +1857,9 @@ type QueryServer interface { QueryTotalDepositByProductAssetID(context.Context, *QueryTotalDepositByProductAssetIDRequest) (*QueryTotalDepositByProductAssetIDResponse, error) QueryOwnerLockerByProductIDbyOwner(context.Context, *QueryOwnerLockerByProductIDbyOwnerRequest) (*QueryOwnerLockerByProductIDbyOwnerResponse, error) QueryOwnerLockerOfAllProductbyOwner(context.Context, *QueryOwnerLockerOfAllProductbyOwnerRequest) (*QueryOwnerLockerOfAllProductbyOwnerResponse, error) + QueryOwnerTxDetailsLockerOfProductbyOwner(context.Context, *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) (*QueryOwnerTxDetailsLockerOfProductbyOwnerResponse, error) QueryOwnerLockerByProductToAssetIDbyOwner(context.Context, *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) (*QueryOwnerLockerByProductToAssetIDbyOwnerResponse, error) + QueryLockerByProductbyOwner(context.Context, *QueryLockerByProductbyOwnerRequest) (*QueryLockerByProductbyOwnerResponse, error) QueryLockerCountByProductID(context.Context, *QueryLockerCountByProductIDRequest) (*QueryLockerCountByProductIDResponse, error) QueryLockerCountByProductToAssetID(context.Context, *QueryLockerCountByProductToAssetIDRequest) (*QueryLockerCountByProductToAssetIDResponse, error) QueryWhiteListedAssetIDsByProductID(context.Context, *QueryWhiteListedAssetIDsByProductIDRequest) (*QueryWhiteListedAssetIDsByProductIDResponse, error) @@ -1699,9 +1893,15 @@ func (*UnimplementedQueryServer) QueryOwnerLockerByProductIDbyOwner(ctx context. func (*UnimplementedQueryServer) QueryOwnerLockerOfAllProductbyOwner(ctx context.Context, req *QueryOwnerLockerOfAllProductbyOwnerRequest) (*QueryOwnerLockerOfAllProductbyOwnerResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryOwnerLockerOfAllProductbyOwner not implemented") } +func (*UnimplementedQueryServer) QueryOwnerTxDetailsLockerOfProductbyOwner(ctx context.Context, req *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) (*QueryOwnerTxDetailsLockerOfProductbyOwnerResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryOwnerTxDetailsLockerOfProductbyOwner not implemented") +} func (*UnimplementedQueryServer) QueryOwnerLockerByProductToAssetIDbyOwner(ctx context.Context, req *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) (*QueryOwnerLockerByProductToAssetIDbyOwnerResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryOwnerLockerByProductToAssetIDbyOwner not implemented") } +func (*UnimplementedQueryServer) QueryLockerByProductbyOwner(ctx context.Context, req *QueryLockerByProductbyOwnerRequest) (*QueryLockerByProductbyOwnerResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryLockerByProductbyOwner not implemented") +} func (*UnimplementedQueryServer) QueryLockerCountByProductID(ctx context.Context, req *QueryLockerCountByProductIDRequest) (*QueryLockerCountByProductIDResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryLockerCountByProductID not implemented") } @@ -1842,6 +2042,24 @@ func _Query_QueryOwnerLockerOfAllProductbyOwner_Handler(srv interface{}, ctx con return interceptor(ctx, in, info, handler) } +func _Query_QueryOwnerTxDetailsLockerOfProductbyOwner_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).QueryOwnerTxDetailsLockerOfProductbyOwner(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/comdex.locker.v1beta1.Query/QueryOwnerTxDetailsLockerOfProductbyOwner", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).QueryOwnerTxDetailsLockerOfProductbyOwner(ctx, req.(*QueryOwnerTxDetailsLockerOfProductbyOwnerRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Query_QueryOwnerLockerByProductToAssetIDbyOwner_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryOwnerLockerByProductToAssetIDbyOwnerRequest) if err := dec(in); err != nil { @@ -1860,6 +2078,24 @@ func _Query_QueryOwnerLockerByProductToAssetIDbyOwner_Handler(srv interface{}, c return interceptor(ctx, in, info, handler) } +func _Query_QueryLockerByProductbyOwner_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryLockerByProductbyOwnerRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).QueryLockerByProductbyOwner(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/comdex.locker.v1beta1.Query/QueryLockerByProductbyOwner", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).QueryLockerByProductbyOwner(ctx, req.(*QueryLockerByProductbyOwnerRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Query_QueryLockerCountByProductID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryLockerCountByProductIDRequest) if err := dec(in); err != nil { @@ -2050,10 +2286,18 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "QueryOwnerLockerOfAllProductbyOwner", Handler: _Query_QueryOwnerLockerOfAllProductbyOwner_Handler, }, + { + MethodName: "QueryOwnerTxDetailsLockerOfProductbyOwner", + Handler: _Query_QueryOwnerTxDetailsLockerOfProductbyOwner_Handler, + }, { MethodName: "QueryOwnerLockerByProductToAssetIDbyOwner", Handler: _Query_QueryOwnerLockerByProductToAssetIDbyOwner_Handler, }, + { + MethodName: "QueryLockerByProductbyOwner", + Handler: _Query_QueryLockerByProductbyOwner_Handler, + }, { MethodName: "QueryLockerCountByProductID", Handler: _Query_QueryLockerCountByProductID_Handler, @@ -2473,7 +2717,7 @@ func (m *QueryOwnerLockerOfAllProductbyOwnerResponse) MarshalToSizedBuffer(dAtA return len(dAtA) - i, nil } -func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2483,12 +2727,12 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Marshal() (dAtA []byt return dAtA[:n], nil } -func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2498,12 +2742,7 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) MarshalToSizedBuffer( copy(dAtA[i:], m.Owner) i = encodeVarintQuery(dAtA, i, uint64(len(m.Owner))) i-- - dAtA[i] = 0x1a - } - if m.AssetId != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.AssetId)) - i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } if m.ProductId != 0 { i = encodeVarintQuery(dAtA, i, uint64(m.ProductId)) @@ -2513,7 +2752,7 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) MarshalToSizedBuffer( return len(dAtA) - i, nil } -func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2523,20 +2762,20 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) Marshal() (dAtA []by return dAtA[:n], nil } -func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.LockerInfo) > 0 { - for iNdEx := len(m.LockerInfo) - 1; iNdEx >= 0; iNdEx-- { + if len(m.UserTxData) > 0 { + for iNdEx := len(m.UserTxData) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.LockerInfo[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.UserTxData[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2550,7 +2789,7 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) MarshalToSizedBuffer return len(dAtA) - i, nil } -func (m *QueryLockerCountByProductIDRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2560,16 +2799,28 @@ func (m *QueryLockerCountByProductIDRequest) Marshal() (dAtA []byte, err error) return dAtA[:n], nil } -func (m *QueryLockerCountByProductIDRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryLockerCountByProductIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0x1a + } + if m.AssetId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.AssetId)) + i-- + dAtA[i] = 0x10 + } if m.ProductId != 0 { i = encodeVarintQuery(dAtA, i, uint64(m.ProductId)) i-- @@ -2578,7 +2829,7 @@ func (m *QueryLockerCountByProductIDRequest) MarshalToSizedBuffer(dAtA []byte) ( return len(dAtA) - i, nil } -func (m *QueryLockerCountByProductIDResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2588,25 +2839,34 @@ func (m *QueryLockerCountByProductIDResponse) Marshal() (dAtA []byte, err error) return dAtA[:n], nil } -func (m *QueryLockerCountByProductIDResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryLockerCountByProductIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.TotalCount != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.TotalCount)) - i-- - dAtA[i] = 0x8 + if len(m.LockerInfo) > 0 { + for iNdEx := len(m.LockerInfo) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.LockerInfo[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } return len(dAtA) - i, nil } -func (m *QueryLockerCountByProductToAssetIDRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryLockerByProductbyOwnerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2616,20 +2876,22 @@ func (m *QueryLockerCountByProductToAssetIDRequest) Marshal() (dAtA []byte, err return dAtA[:n], nil } -func (m *QueryLockerCountByProductToAssetIDRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryLockerByProductbyOwnerRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryLockerCountByProductToAssetIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryLockerByProductbyOwnerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.AssetId != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.AssetId)) + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Owner))) i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } if m.ProductId != 0 { i = encodeVarintQuery(dAtA, i, uint64(m.ProductId)) @@ -2639,7 +2901,7 @@ func (m *QueryLockerCountByProductToAssetIDRequest) MarshalToSizedBuffer(dAtA [] return len(dAtA) - i, nil } -func (m *QueryLockerCountByProductToAssetIDResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryLockerByProductbyOwnerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2649,20 +2911,146 @@ func (m *QueryLockerCountByProductToAssetIDResponse) Marshal() (dAtA []byte, err return dAtA[:n], nil } -func (m *QueryLockerCountByProductToAssetIDResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryLockerByProductbyOwnerResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryLockerCountByProductToAssetIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryLockerByProductbyOwnerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.TotalCount != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.TotalCount)) - i-- - dAtA[i] = 0x8 + if len(m.LockerInfo) > 0 { + for iNdEx := len(m.LockerInfo) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.LockerInfo[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *QueryLockerCountByProductIDRequest) 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 *QueryLockerCountByProductIDRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryLockerCountByProductIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.ProductId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.ProductId)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *QueryLockerCountByProductIDResponse) 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 *QueryLockerCountByProductIDResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryLockerCountByProductIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.TotalCount != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.TotalCount)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *QueryLockerCountByProductToAssetIDRequest) 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 *QueryLockerCountByProductToAssetIDRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryLockerCountByProductToAssetIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.AssetId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.AssetId)) + i-- + dAtA[i] = 0x10 + } + if m.ProductId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.ProductId)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *QueryLockerCountByProductToAssetIDResponse) 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 *QueryLockerCountByProductToAssetIDResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryLockerCountByProductToAssetIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.TotalCount != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.TotalCount)) + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -3354,6 +3742,37 @@ func (m *QueryOwnerLockerOfAllProductbyOwnerResponse) Size() (n int) { return n } +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ProductId != 0 { + n += 1 + sovQuery(uint64(m.ProductId)) + } + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.UserTxData) > 0 { + for _, e := range m.UserTxData { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Size() (n int) { if m == nil { return 0 @@ -3388,6 +3807,37 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) Size() (n int) { return n } +func (m *QueryLockerByProductbyOwnerRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ProductId != 0 { + n += 1 + sovQuery(uint64(m.ProductId)) + } + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryLockerByProductbyOwnerResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.LockerInfo) > 0 { + for _, e := range m.LockerInfo { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + func (m *QueryLockerCountByProductIDRequest) Size() (n int) { if m == nil { return 0 @@ -4643,7 +5093,7 @@ func (m *QueryOwnerLockerOfAllProductbyOwnerResponse) Unmarshal(dAtA []byte) err } return nil } -func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Unmarshal(dAtA []byte) error { +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4666,10 +5116,10 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Unmarshal(dAtA []byte fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryOwnerLockerByProductToAssetIDbyOwnerRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryOwnerTxDetailsLockerOfProductbyOwnerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryOwnerLockerByProductToAssetIDbyOwnerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryOwnerTxDetailsLockerOfProductbyOwnerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4692,25 +5142,6 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Unmarshal(dAtA []byte } } case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AssetId", wireType) - } - m.AssetId = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.AssetId |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) } @@ -4763,7 +5194,7 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Unmarshal(dAtA []byte } return nil } -func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) Unmarshal(dAtA []byte) error { +func (m *QueryOwnerTxDetailsLockerOfProductbyOwnerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4786,10 +5217,399 @@ func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) Unmarshal(dAtA []byt fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryOwnerLockerByProductToAssetIDbyOwnerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryOwnerTxDetailsLockerOfProductbyOwnerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryOwnerLockerByProductToAssetIDbyOwnerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryOwnerTxDetailsLockerOfProductbyOwnerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field UserTxData", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.UserTxData = append(m.UserTxData, UserTxData{}) + if err := m.UserTxData[len(m.UserTxData)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryOwnerLockerByProductToAssetIDbyOwnerRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryOwnerLockerByProductToAssetIDbyOwnerRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryOwnerLockerByProductToAssetIDbyOwnerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ProductId", wireType) + } + m.ProductId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ProductId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AssetId", wireType) + } + m.AssetId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.AssetId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + 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 ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryOwnerLockerByProductToAssetIDbyOwnerResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryOwnerLockerByProductToAssetIDbyOwnerResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryOwnerLockerByProductToAssetIDbyOwnerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LockerInfo", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.LockerInfo = append(m.LockerInfo, Locker{}) + if err := m.LockerInfo[len(m.LockerInfo)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryLockerByProductbyOwnerRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryLockerByProductbyOwnerRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryLockerByProductbyOwnerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ProductId", wireType) + } + m.ProductId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ProductId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryLockerByProductbyOwnerResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryLockerByProductbyOwnerResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryLockerByProductbyOwnerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/locker/types/query.pb.gw.go b/x/locker/types/query.pb.gw.go index 875bb8e5e..f5254a8a1 100644 --- a/x/locker/types/query.pb.gw.go +++ b/x/locker/types/query.pb.gw.go @@ -423,6 +423,82 @@ func local_request_Query_QueryOwnerLockerOfAllProductbyOwner_0(ctx context.Conte } +func request_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryOwnerTxDetailsLockerOfProductbyOwnerRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["product_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "product_id") + } + + protoReq.ProductId, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "product_id", err) + } + + val, ok = pathParams["owner"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") + } + + protoReq.Owner, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) + } + + msg, err := client.QueryOwnerTxDetailsLockerOfProductbyOwner(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryOwnerTxDetailsLockerOfProductbyOwnerRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["product_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "product_id") + } + + protoReq.ProductId, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "product_id", err) + } + + val, ok = pathParams["owner"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") + } + + protoReq.Owner, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) + } + + msg, err := server.QueryOwnerTxDetailsLockerOfProductbyOwner(ctx, &protoReq) + return msg, metadata, err + +} + func request_Query_QueryOwnerLockerByProductToAssetIDbyOwner_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryOwnerLockerByProductToAssetIDbyOwnerRequest var metadata runtime.ServerMetadata @@ -521,6 +597,82 @@ func local_request_Query_QueryOwnerLockerByProductToAssetIDbyOwner_0(ctx context } +func request_Query_QueryLockerByProductbyOwner_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryLockerByProductbyOwnerRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["product_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "product_id") + } + + protoReq.ProductId, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "product_id", err) + } + + val, ok = pathParams["owner"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") + } + + protoReq.Owner, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) + } + + msg, err := client.QueryLockerByProductbyOwner(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_QueryLockerByProductbyOwner_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryLockerByProductbyOwnerRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["product_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "product_id") + } + + protoReq.ProductId, err = runtime.Uint64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "product_id", err) + } + + val, ok = pathParams["owner"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") + } + + protoReq.Owner, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) + } + + msg, err := server.QueryLockerByProductbyOwner(ctx, &protoReq) + return msg, metadata, err + +} + func request_Query_QueryLockerCountByProductID_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryLockerCountByProductIDRequest var metadata runtime.ServerMetadata @@ -1069,6 +1221,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_QueryOwnerLockerByProductToAssetIDbyOwner_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1092,6 +1267,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_QueryLockerByProductbyOwner_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_QueryLockerByProductbyOwner_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryLockerByProductbyOwner_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_QueryLockerCountByProductID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1437,6 +1635,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_QueryOwnerLockerByProductToAssetIDbyOwner_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1457,6 +1675,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_QueryLockerByProductbyOwner_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_QueryLockerByProductbyOwner_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryLockerByProductbyOwner_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_QueryLockerCountByProductID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1633,8 +1871,12 @@ var ( pattern_Query_QueryOwnerLockerOfAllProductbyOwner_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"comdex", "locker", "v1beta1", "owner_locker_info_by_all_product_owner", "owner"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"comdex", "locker", "v1beta1", "owner_locker_tx-details_by_product", "product_id", "owner"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_QueryOwnerLockerByProductToAssetIDbyOwner_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"comdex", "locker", "v1beta1", "owner_locker_info_product_asset_id_owner", "product_id", "asset_id", "owner"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_QueryLockerByProductbyOwner_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"comdex", "locker", "v1beta1", "locker_info_product_owner", "product_id", "owner"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_QueryLockerCountByProductID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"comdex", "locker", "v1beta1", "total_locker_product_id", "product_id"}, "", runtime.AssumeColonVerbOpt(true))) pattern_Query_QueryLockerCountByProductToAssetID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"comdex", "locker", "v1beta1", "total_locker_product_asset_id", "product_id", "asset_id"}, "", runtime.AssumeColonVerbOpt(true))) @@ -1665,8 +1907,12 @@ var ( forward_Query_QueryOwnerLockerOfAllProductbyOwner_0 = runtime.ForwardResponseMessage + forward_Query_QueryOwnerTxDetailsLockerOfProductbyOwner_0 = runtime.ForwardResponseMessage + forward_Query_QueryOwnerLockerByProductToAssetIDbyOwner_0 = runtime.ForwardResponseMessage + forward_Query_QueryLockerByProductbyOwner_0 = runtime.ForwardResponseMessage + forward_Query_QueryLockerCountByProductID_0 = runtime.ForwardResponseMessage forward_Query_QueryLockerCountByProductToAssetID_0 = runtime.ForwardResponseMessage diff --git a/x/vault/client/cli/query.go b/x/vault/client/cli/query.go index 64314e0e5..93d77e8cf 100644 --- a/x/vault/client/cli/query.go +++ b/x/vault/client/cli/query.go @@ -43,6 +43,7 @@ func GetQueryCmd() *cobra.Command { QueryExtendedPairVaultMappingByAppAndExtendedPairId(), QueryExtendedPairVaultMappingByOwnerAndApp(), QueryExtendedPairVaultMappingByOwnerAndAppAndExtendedPairID(), + QueryVaultInfoByOwner(), QueryTVLlockedByApp(), ) @@ -192,6 +193,35 @@ func QueryVaultOfOwnerByExtendedPair() *cobra.Command { return cmd } +func QueryVaultInfoByOwner() *cobra.Command { + cmd := &cobra.Command{ + Use: "vaultInfoByOwner [owner]", + Short: "vaults list for an owner", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + + res, err := queryClient.QueryVaultInfoByOwner(cmd.Context(), &types.QueryVaultInfoByOwnerRequest{ + Owner: args[0], + }) + + if err != nil { + return err + } + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + return cmd +} + func QueryAllVaultsByAppAndExtendedPair() *cobra.Command { cmd := &cobra.Command{ Use: "vaults-by-app-and-extended-pair [app_id] [extended_pair_id]", diff --git a/x/vault/keeper/query_server.go b/x/vault/keeper/query_server.go index 3759ab136..9dffd9752 100644 --- a/x/vault/keeper/query_server.go +++ b/x/vault/keeper/query_server.go @@ -103,6 +103,54 @@ func (q *queryServer) QueryVaultInfo(c context.Context, req *types.QueryVaultInf }, nil } +func (q *queryServer) QueryVaultInfoByOwner(c context.Context, req *types.QueryVaultInfoByOwnerRequest) (*types.QueryVaultInfoByOwnerResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "request cannot be empty") + } + + var ( + ctx = sdk.UnwrapSDKContext(c) + vaultsIds []string + vaultsInfo []types.VaultInfo + ) + + userVaultAssetData, found := q.GetUserVaultExtendedPairMapping(ctx, req.Owner) + if !found { + return nil, status.Errorf(codes.NotFound, "data does not exists for user addesss %s", req.Owner) + } + for _, data := range userVaultAssetData.UserVaultApp { + for _, inData := range data.UserExtendedPairVault { + vaultsIds = append(vaultsIds, inData.VaultId) + } + } + + for _,id := range vaultsIds{ + vault, found := q.GetVault(ctx, id) + if !found { + return nil, status.Errorf(codes.NotFound, "vault does not exist for id %d", vault.Id) + } + + collateralizationRatio, err := q.CalculateCollaterlizationRatio(ctx, vault.ExtendedPairVaultID, vault.AmountIn, vault.AmountOut) + if err != nil { + return nil, err + } + vaults := types.VaultInfo{ + Id: vault.Id, + PairID: vault.ExtendedPairVaultID, + Owner: vault.Owner, + Collateral: vault.AmountIn, + Debt: vault.AmountOut, + CollateralizationRatio: collateralizationRatio, + }; + vaultsInfo = append(vaultsInfo, vaults) + + } + + return &types.QueryVaultInfoByOwnerResponse{ + VaultsInfo: vaultsInfo, + }, nil +} + func (q *queryServer) QueryAllVaultsByAppAndExtendedPair(c context.Context, req *types.QueryAllVaultsByAppAndExtendedPairRequest) (*types.QueryAllVaultsByAppAndExtendedPairResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "request cannot be empty") @@ -581,7 +629,7 @@ func (q *queryServer) QueryTVLlockedByApp(c context.Context, req *types.QueryTVL } var ( ctx = sdk.UnwrapSDKContext(c) - tvlData []*types.TvlLockedDataMap + tvlData []types.TvlLockedDataMap ) _, found := q.GetApp(ctx, req.AppId) if !found { @@ -606,7 +654,7 @@ func (q *queryServer) QueryTVLlockedByApp(c context.Context, req *types.QueryTVL tvl.AssetDenom= denom.Denom tvl.CollateralLockedAmount = data.CollateralLockedAmount - tvlData = append(tvlData, &tvl) + tvlData = append(tvlData, tvl) } return &types.QueryTVLlockedByAppResponse{ diff --git a/x/vault/types/query.pb.go b/x/vault/types/query.pb.go index 641c5e1e4..96a8a79c3 100644 --- a/x/vault/types/query.pb.go +++ b/x/vault/types/query.pb.go @@ -221,6 +221,80 @@ func (m *QueryVaultInfoResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryVaultInfoResponse proto.InternalMessageInfo +type QueryVaultInfoByOwnerRequest struct { + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` +} + +func (m *QueryVaultInfoByOwnerRequest) Reset() { *m = QueryVaultInfoByOwnerRequest{} } +func (m *QueryVaultInfoByOwnerRequest) String() string { return proto.CompactTextString(m) } +func (*QueryVaultInfoByOwnerRequest) ProtoMessage() {} +func (*QueryVaultInfoByOwnerRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_8d35126a97363346, []int{5} +} +func (m *QueryVaultInfoByOwnerRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryVaultInfoByOwnerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryVaultInfoByOwnerRequest.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 *QueryVaultInfoByOwnerRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVaultInfoByOwnerRequest.Merge(m, src) +} +func (m *QueryVaultInfoByOwnerRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryVaultInfoByOwnerRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryVaultInfoByOwnerRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryVaultInfoByOwnerRequest proto.InternalMessageInfo + +type QueryVaultInfoByOwnerResponse struct { + VaultsInfo []VaultInfo `protobuf:"bytes,1,rep,name=vaultsInfo,proto3" json:"vaultsInfo" yaml:"vaultsInfo"` +} + +func (m *QueryVaultInfoByOwnerResponse) Reset() { *m = QueryVaultInfoByOwnerResponse{} } +func (m *QueryVaultInfoByOwnerResponse) String() string { return proto.CompactTextString(m) } +func (*QueryVaultInfoByOwnerResponse) ProtoMessage() {} +func (*QueryVaultInfoByOwnerResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_8d35126a97363346, []int{6} +} +func (m *QueryVaultInfoByOwnerResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryVaultInfoByOwnerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryVaultInfoByOwnerResponse.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 *QueryVaultInfoByOwnerResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVaultInfoByOwnerResponse.Merge(m, src) +} +func (m *QueryVaultInfoByOwnerResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryVaultInfoByOwnerResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryVaultInfoByOwnerResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryVaultInfoByOwnerResponse proto.InternalMessageInfo + type QueryAllVaultsRequest struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty" yaml:"pagination"` } @@ -229,7 +303,7 @@ func (m *QueryAllVaultsRequest) Reset() { *m = QueryAllVaultsRequest{} } func (m *QueryAllVaultsRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllVaultsRequest) ProtoMessage() {} func (*QueryAllVaultsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{5} + return fileDescriptor_8d35126a97363346, []int{7} } func (m *QueryAllVaultsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -267,7 +341,7 @@ func (m *QueryAllVaultsResponse) Reset() { *m = QueryAllVaultsResponse{} func (m *QueryAllVaultsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllVaultsResponse) ProtoMessage() {} func (*QueryAllVaultsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{6} + return fileDescriptor_8d35126a97363346, []int{8} } func (m *QueryAllVaultsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -304,7 +378,7 @@ func (m *QueryAllVaultsByProductRequest) Reset() { *m = QueryAllVaultsBy func (m *QueryAllVaultsByProductRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllVaultsByProductRequest) ProtoMessage() {} func (*QueryAllVaultsByProductRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{7} + return fileDescriptor_8d35126a97363346, []int{9} } func (m *QueryAllVaultsByProductRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -342,7 +416,7 @@ func (m *QueryAllVaultsByProductResponse) Reset() { *m = QueryAllVaultsB func (m *QueryAllVaultsByProductResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllVaultsByProductResponse) ProtoMessage() {} func (*QueryAllVaultsByProductResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{8} + return fileDescriptor_8d35126a97363346, []int{10} } func (m *QueryAllVaultsByProductResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -385,7 +459,7 @@ func (m *QueryAllVaultsByAppAndExtendedPairRequest) String() string { } func (*QueryAllVaultsByAppAndExtendedPairRequest) ProtoMessage() {} func (*QueryAllVaultsByAppAndExtendedPairRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{9} + return fileDescriptor_8d35126a97363346, []int{11} } func (m *QueryAllVaultsByAppAndExtendedPairRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -427,7 +501,7 @@ func (m *QueryAllVaultsByAppAndExtendedPairResponse) String() string { } func (*QueryAllVaultsByAppAndExtendedPairResponse) ProtoMessage() {} func (*QueryAllVaultsByAppAndExtendedPairResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{10} + return fileDescriptor_8d35126a97363346, []int{12} } func (m *QueryAllVaultsByAppAndExtendedPairResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -469,7 +543,7 @@ func (m *QueryVaultOfOwnerByExtendedPairRequest) Reset() { func (m *QueryVaultOfOwnerByExtendedPairRequest) String() string { return proto.CompactTextString(m) } func (*QueryVaultOfOwnerByExtendedPairRequest) ProtoMessage() {} func (*QueryVaultOfOwnerByExtendedPairRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{11} + return fileDescriptor_8d35126a97363346, []int{13} } func (m *QueryVaultOfOwnerByExtendedPairRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -508,7 +582,7 @@ func (m *QueryVaultOfOwnerByExtendedPairResponse) Reset() { func (m *QueryVaultOfOwnerByExtendedPairResponse) String() string { return proto.CompactTextString(m) } func (*QueryVaultOfOwnerByExtendedPairResponse) ProtoMessage() {} func (*QueryVaultOfOwnerByExtendedPairResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{12} + return fileDescriptor_8d35126a97363346, []int{14} } func (m *QueryVaultOfOwnerByExtendedPairResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -546,7 +620,7 @@ func (m *QueryVaultByProductRequest) Reset() { *m = QueryVaultByProductR func (m *QueryVaultByProductRequest) String() string { return proto.CompactTextString(m) } func (*QueryVaultByProductRequest) ProtoMessage() {} func (*QueryVaultByProductRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{13} + return fileDescriptor_8d35126a97363346, []int{15} } func (m *QueryVaultByProductRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -583,7 +657,7 @@ func (m *QueryVaultByProductResponse) Reset() { *m = QueryVaultByProduct func (m *QueryVaultByProductResponse) String() string { return proto.CompactTextString(m) } func (*QueryVaultByProductResponse) ProtoMessage() {} func (*QueryVaultByProductResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{14} + return fileDescriptor_8d35126a97363346, []int{16} } func (m *QueryVaultByProductResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -621,7 +695,7 @@ func (m *QueryAllVaultByOwnerRequest) Reset() { *m = QueryAllVaultByOwne func (m *QueryAllVaultByOwnerRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllVaultByOwnerRequest) ProtoMessage() {} func (*QueryAllVaultByOwnerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{15} + return fileDescriptor_8d35126a97363346, []int{17} } func (m *QueryAllVaultByOwnerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -658,7 +732,7 @@ func (m *QueryAllVaultByOwnerResponse) Reset() { *m = QueryAllVaultByOwn func (m *QueryAllVaultByOwnerResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllVaultByOwnerResponse) ProtoMessage() {} func (*QueryAllVaultByOwnerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{16} + return fileDescriptor_8d35126a97363346, []int{18} } func (m *QueryAllVaultByOwnerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -699,7 +773,7 @@ func (m *QueryTokenMintedAllProductsByPairRequest) Reset() { func (m *QueryTokenMintedAllProductsByPairRequest) String() string { return proto.CompactTextString(m) } func (*QueryTokenMintedAllProductsByPairRequest) ProtoMessage() {} func (*QueryTokenMintedAllProductsByPairRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{17} + return fileDescriptor_8d35126a97363346, []int{19} } func (m *QueryTokenMintedAllProductsByPairRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -740,7 +814,7 @@ func (m *QueryTokenMintedAllProductsByPairResponse) String() string { } func (*QueryTokenMintedAllProductsByPairResponse) ProtoMessage() {} func (*QueryTokenMintedAllProductsByPairResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{18} + return fileDescriptor_8d35126a97363346, []int{20} } func (m *QueryTokenMintedAllProductsByPairResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -778,7 +852,7 @@ func (m *QueryTokenMintedAllProductsRequest) Reset() { *m = QueryTokenMi func (m *QueryTokenMintedAllProductsRequest) String() string { return proto.CompactTextString(m) } func (*QueryTokenMintedAllProductsRequest) ProtoMessage() {} func (*QueryTokenMintedAllProductsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{19} + return fileDescriptor_8d35126a97363346, []int{21} } func (m *QueryTokenMintedAllProductsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -815,7 +889,7 @@ func (m *QueryTokenMintedAllProductsResponse) Reset() { *m = QueryTokenM func (m *QueryTokenMintedAllProductsResponse) String() string { return proto.CompactTextString(m) } func (*QueryTokenMintedAllProductsResponse) ProtoMessage() {} func (*QueryTokenMintedAllProductsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{20} + return fileDescriptor_8d35126a97363346, []int{22} } func (m *QueryTokenMintedAllProductsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -853,7 +927,7 @@ func (m *QueryVaultCountByProductRequest) Reset() { *m = QueryVaultCount func (m *QueryVaultCountByProductRequest) String() string { return proto.CompactTextString(m) } func (*QueryVaultCountByProductRequest) ProtoMessage() {} func (*QueryVaultCountByProductRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{21} + return fileDescriptor_8d35126a97363346, []int{23} } func (m *QueryVaultCountByProductRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -890,7 +964,7 @@ func (m *QueryVaultCountByProductResponse) Reset() { *m = QueryVaultCoun func (m *QueryVaultCountByProductResponse) String() string { return proto.CompactTextString(m) } func (*QueryVaultCountByProductResponse) ProtoMessage() {} func (*QueryVaultCountByProductResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{22} + return fileDescriptor_8d35126a97363346, []int{24} } func (m *QueryVaultCountByProductResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -931,7 +1005,7 @@ func (m *QueryVaultCountByProductAndPairRequest) Reset() { func (m *QueryVaultCountByProductAndPairRequest) String() string { return proto.CompactTextString(m) } func (*QueryVaultCountByProductAndPairRequest) ProtoMessage() {} func (*QueryVaultCountByProductAndPairRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{23} + return fileDescriptor_8d35126a97363346, []int{25} } func (m *QueryVaultCountByProductAndPairRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -970,7 +1044,7 @@ func (m *QueryVaultCountByProductAndPairResponse) Reset() { func (m *QueryVaultCountByProductAndPairResponse) String() string { return proto.CompactTextString(m) } func (*QueryVaultCountByProductAndPairResponse) ProtoMessage() {} func (*QueryVaultCountByProductAndPairResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{24} + return fileDescriptor_8d35126a97363346, []int{26} } func (m *QueryVaultCountByProductAndPairResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1013,7 +1087,7 @@ func (m *QueryTotalValueLockedByProductExtendedPairRequest) String() string { } func (*QueryTotalValueLockedByProductExtendedPairRequest) ProtoMessage() {} func (*QueryTotalValueLockedByProductExtendedPairRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{25} + return fileDescriptor_8d35126a97363346, []int{27} } func (m *QueryTotalValueLockedByProductExtendedPairRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1054,7 +1128,7 @@ func (m *QueryTotalValueLockedByProductExtendedPairResponse) String() string { } func (*QueryTotalValueLockedByProductExtendedPairResponse) ProtoMessage() {} func (*QueryTotalValueLockedByProductExtendedPairResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{26} + return fileDescriptor_8d35126a97363346, []int{28} } func (m *QueryTotalValueLockedByProductExtendedPairResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1092,7 +1166,7 @@ func (m *QueryExtendedPairIDByProductRequest) Reset() { *m = QueryExtend func (m *QueryExtendedPairIDByProductRequest) String() string { return proto.CompactTextString(m) } func (*QueryExtendedPairIDByProductRequest) ProtoMessage() {} func (*QueryExtendedPairIDByProductRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{27} + return fileDescriptor_8d35126a97363346, []int{29} } func (m *QueryExtendedPairIDByProductRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1129,7 +1203,7 @@ func (m *QueryExtendedPairIDByProductResponse) Reset() { *m = QueryExten func (m *QueryExtendedPairIDByProductResponse) String() string { return proto.CompactTextString(m) } func (*QueryExtendedPairIDByProductResponse) ProtoMessage() {} func (*QueryExtendedPairIDByProductResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{28} + return fileDescriptor_8d35126a97363346, []int{30} } func (m *QueryExtendedPairIDByProductResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1166,7 +1240,7 @@ func (m *QueryStableVaultInfoRequest) Reset() { *m = QueryStableVaultInf func (m *QueryStableVaultInfoRequest) String() string { return proto.CompactTextString(m) } func (*QueryStableVaultInfoRequest) ProtoMessage() {} func (*QueryStableVaultInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{29} + return fileDescriptor_8d35126a97363346, []int{31} } func (m *QueryStableVaultInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1203,7 +1277,7 @@ func (m *QueryStableVaultInfoResponse) Reset() { *m = QueryStableVaultIn func (m *QueryStableVaultInfoResponse) String() string { return proto.CompactTextString(m) } func (*QueryStableVaultInfoResponse) ProtoMessage() {} func (*QueryStableVaultInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{30} + return fileDescriptor_8d35126a97363346, []int{32} } func (m *QueryStableVaultInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1240,7 +1314,7 @@ func (m *QueryAllStableVaultsRequest) Reset() { *m = QueryAllStableVault func (m *QueryAllStableVaultsRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllStableVaultsRequest) ProtoMessage() {} func (*QueryAllStableVaultsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{31} + return fileDescriptor_8d35126a97363346, []int{33} } func (m *QueryAllStableVaultsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1277,7 +1351,7 @@ func (m *QueryAllStableVaultsResponse) Reset() { *m = QueryAllStableVaul func (m *QueryAllStableVaultsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllStableVaultsResponse) ProtoMessage() {} func (*QueryAllStableVaultsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{32} + return fileDescriptor_8d35126a97363346, []int{34} } func (m *QueryAllStableVaultsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1319,7 +1393,7 @@ func (m *QueryStableVaultByProductExtendedPairRequest) String() string { } func (*QueryStableVaultByProductExtendedPairRequest) ProtoMessage() {} func (*QueryStableVaultByProductExtendedPairRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{33} + return fileDescriptor_8d35126a97363346, []int{35} } func (m *QueryStableVaultByProductExtendedPairRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1360,7 +1434,7 @@ func (m *QueryStableVaultByProductExtendedPairResponse) String() string { } func (*QueryStableVaultByProductExtendedPairResponse) ProtoMessage() {} func (*QueryStableVaultByProductExtendedPairResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{34} + return fileDescriptor_8d35126a97363346, []int{36} } func (m *QueryStableVaultByProductExtendedPairResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1402,7 +1476,7 @@ func (m *QueryExtendedPairVaultMappingByAppAndExtendedPairIdRequest) String() st } func (*QueryExtendedPairVaultMappingByAppAndExtendedPairIdRequest) ProtoMessage() {} func (*QueryExtendedPairVaultMappingByAppAndExtendedPairIdRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{35} + return fileDescriptor_8d35126a97363346, []int{37} } func (m *QueryExtendedPairVaultMappingByAppAndExtendedPairIdRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1443,7 +1517,7 @@ func (m *QueryExtendedPairVaultMappingByAppAndExtendedPairIdResponse) String() s } func (*QueryExtendedPairVaultMappingByAppAndExtendedPairIdResponse) ProtoMessage() {} func (*QueryExtendedPairVaultMappingByAppAndExtendedPairIdResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{36} + return fileDescriptor_8d35126a97363346, []int{38} } func (m *QueryExtendedPairVaultMappingByAppAndExtendedPairIdResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1484,7 +1558,7 @@ func (m *QueryExtendedPairVaultMappingByAppRequest) String() string { } func (*QueryExtendedPairVaultMappingByAppRequest) ProtoMessage() {} func (*QueryExtendedPairVaultMappingByAppRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{37} + return fileDescriptor_8d35126a97363346, []int{39} } func (m *QueryExtendedPairVaultMappingByAppRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1525,7 +1599,7 @@ func (m *QueryExtendedPairVaultMappingByAppResponse) String() string { } func (*QueryExtendedPairVaultMappingByAppResponse) ProtoMessage() {} func (*QueryExtendedPairVaultMappingByAppResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{38} + return fileDescriptor_8d35126a97363346, []int{40} } func (m *QueryExtendedPairVaultMappingByAppResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1567,7 +1641,7 @@ func (m *QueryExtendedPairVaultMappingByOwnerAndAppRequest) String() string { } func (*QueryExtendedPairVaultMappingByOwnerAndAppRequest) ProtoMessage() {} func (*QueryExtendedPairVaultMappingByOwnerAndAppRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{39} + return fileDescriptor_8d35126a97363346, []int{41} } func (m *QueryExtendedPairVaultMappingByOwnerAndAppRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1608,7 +1682,7 @@ func (m *QueryExtendedPairVaultMappingByOwnerAndAppResponse) String() string { } func (*QueryExtendedPairVaultMappingByOwnerAndAppResponse) ProtoMessage() {} func (*QueryExtendedPairVaultMappingByOwnerAndAppResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{40} + return fileDescriptor_8d35126a97363346, []int{42} } func (m *QueryExtendedPairVaultMappingByOwnerAndAppResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1651,7 +1725,7 @@ func (m *QueryExtendedPairVaultMappingByOwnerAndAppAndExtendedPairIDRequest) Str } func (*QueryExtendedPairVaultMappingByOwnerAndAppAndExtendedPairIDRequest) ProtoMessage() {} func (*QueryExtendedPairVaultMappingByOwnerAndAppAndExtendedPairIDRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{41} + return fileDescriptor_8d35126a97363346, []int{43} } func (m *QueryExtendedPairVaultMappingByOwnerAndAppAndExtendedPairIDRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1692,7 +1766,7 @@ func (m *QueryExtendedPairVaultMappingByOwnerAndAppAndExtendedPairIDResponse) St } func (*QueryExtendedPairVaultMappingByOwnerAndAppAndExtendedPairIDResponse) ProtoMessage() {} func (*QueryExtendedPairVaultMappingByOwnerAndAppAndExtendedPairIDResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{42} + return fileDescriptor_8d35126a97363346, []int{44} } func (m *QueryExtendedPairVaultMappingByOwnerAndAppAndExtendedPairIDResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1729,7 +1803,7 @@ func (m *QueryTVLlockedByAppRequest) Reset() { *m = QueryTVLlockedByAppR func (m *QueryTVLlockedByAppRequest) String() string { return proto.CompactTextString(m) } func (*QueryTVLlockedByAppRequest) ProtoMessage() {} func (*QueryTVLlockedByAppRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{43} + return fileDescriptor_8d35126a97363346, []int{45} } func (m *QueryTVLlockedByAppRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1759,14 +1833,14 @@ func (m *QueryTVLlockedByAppRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryTVLlockedByAppRequest proto.InternalMessageInfo type QueryTVLlockedByAppResponse struct { - Tvldata []*TvlLockedDataMap `protobuf:"bytes,1,rep,name=tvldata,proto3" json:"tvldata,omitempty" yaml:"tvldata"` + Tvldata []TvlLockedDataMap `protobuf:"bytes,1,rep,name=tvldata,proto3" json:"tvldata" yaml:"tvldata"` } func (m *QueryTVLlockedByAppResponse) Reset() { *m = QueryTVLlockedByAppResponse{} } func (m *QueryTVLlockedByAppResponse) String() string { return proto.CompactTextString(m) } func (*QueryTVLlockedByAppResponse) ProtoMessage() {} func (*QueryTVLlockedByAppResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8d35126a97363346, []int{44} + return fileDescriptor_8d35126a97363346, []int{46} } func (m *QueryTVLlockedByAppResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1801,6 +1875,8 @@ func init() { proto.RegisterType((*QueryVaultResponse)(nil), "comdex.vault.v1beta1.QueryVaultResponse") proto.RegisterType((*QueryVaultInfoRequest)(nil), "comdex.vault.v1beta1.QueryVaultInfoRequest") proto.RegisterType((*QueryVaultInfoResponse)(nil), "comdex.vault.v1beta1.QueryVaultInfoResponse") + proto.RegisterType((*QueryVaultInfoByOwnerRequest)(nil), "comdex.vault.v1beta1.QueryVaultInfoByOwnerRequest") + proto.RegisterType((*QueryVaultInfoByOwnerResponse)(nil), "comdex.vault.v1beta1.QueryVaultInfoByOwnerResponse") proto.RegisterType((*QueryAllVaultsRequest)(nil), "comdex.vault.v1beta1.QueryAllVaultsRequest") proto.RegisterType((*QueryAllVaultsResponse)(nil), "comdex.vault.v1beta1.QueryAllVaultsResponse") proto.RegisterType((*QueryAllVaultsByProductRequest)(nil), "comdex.vault.v1beta1.QueryAllVaultsByProductRequest") @@ -1846,153 +1922,156 @@ func init() { func init() { proto.RegisterFile("comdex/vault/v1beta1/query.proto", fileDescriptor_8d35126a97363346) } var fileDescriptor_8d35126a97363346 = []byte{ - // 2322 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0x5d, 0x6c, 0x1c, 0x47, - 0x1d, 0xf7, 0xae, 0x3f, 0x52, 0x8f, 0xf3, 0xe5, 0x89, 0x9b, 0x9c, 0x2e, 0xe6, 0x36, 0x99, 0x34, - 0xb6, 0x1b, 0x72, 0x77, 0xb1, 0xdb, 0x84, 0x90, 0x36, 0x6d, 0xbd, 0x76, 0x48, 0x0e, 0xd5, 0x8a, - 0xbd, 0x75, 0xad, 0xa6, 0x90, 0x9c, 0xd6, 0xb7, 0x6b, 0x67, 0x95, 0xf5, 0xee, 0xf6, 0x76, 0x6d, - 0x6a, 0x2c, 0xbf, 0x04, 0x8a, 0x44, 0x5f, 0x52, 0x84, 0x00, 0x09, 0x1e, 0xe0, 0x81, 0x07, 0x1e, - 0xe0, 0x01, 0x09, 0x21, 0x81, 0x44, 0x45, 0x25, 0x90, 0x02, 0x12, 0x50, 0x09, 0x55, 0xa0, 0x3e, - 0xac, 0xc0, 0xe1, 0x91, 0xa7, 0x7b, 0x45, 0x42, 0x68, 0x67, 0x66, 0x6f, 0xf7, 0xf6, 0x76, 0x67, - 0xf7, 0xce, 0x4e, 0x8a, 0xd5, 0xa7, 0xd8, 0xde, 0x99, 0xff, 0xfc, 0x7f, 0xbf, 0xf9, 0x7f, 0xcc, - 0xfc, 0x46, 0x01, 0xa7, 0x6a, 0xe6, 0x9a, 0xa2, 0xbe, 0x5d, 0xde, 0x90, 0xd7, 0x75, 0xa7, 0xbc, - 0x31, 0xb9, 0xac, 0x3a, 0xf2, 0x64, 0xf9, 0xad, 0x75, 0xb5, 0xbe, 0x59, 0xb2, 0xea, 0xa6, 0x63, - 0xc2, 0x11, 0x32, 0xa2, 0x84, 0x47, 0x94, 0xe8, 0x88, 0xfc, 0xb9, 0x9a, 0x69, 0xaf, 0x99, 0x76, - 0x79, 0x59, 0xb6, 0x55, 0x32, 0xbc, 0x39, 0xd9, 0x92, 0x57, 0x35, 0x43, 0x76, 0x34, 0xd3, 0x20, - 0x16, 0xf2, 0x23, 0xab, 0xe6, 0xaa, 0x89, 0x7f, 0x2c, 0x7b, 0x3f, 0xd1, 0xbf, 0x8e, 0xae, 0x9a, - 0xe6, 0xaa, 0xae, 0x96, 0x65, 0x4b, 0x2b, 0xcb, 0x86, 0x61, 0x3a, 0x78, 0x8a, 0x4d, 0xbf, 0xc6, - 0xfb, 0x45, 0x7c, 0xc0, 0x23, 0xd0, 0xfb, 0xbd, 0x60, 0x70, 0xc9, 0xfb, 0xbd, 0x62, 0xac, 0x98, - 0xf0, 0x30, 0xe0, 0x35, 0x25, 0xc7, 0x9d, 0xe2, 0x26, 0x06, 0x25, 0x5e, 0x53, 0xe0, 0x45, 0x70, - 0xc0, 0x92, 0xb5, 0x7a, 0x55, 0x53, 0x72, 0xfc, 0x29, 0x6e, 0xa2, 0x4f, 0x1c, 0xdd, 0x71, 0x85, - 0x81, 0x79, 0x59, 0xab, 0x57, 0x66, 0x1b, 0xae, 0x70, 0x78, 0x53, 0x5e, 0xd3, 0xaf, 0x20, 0x3a, - 0x04, 0x49, 0x03, 0xde, 0x4f, 0x15, 0x05, 0x8e, 0x81, 0x7e, 0xf3, 0x2b, 0x86, 0x5a, 0xcf, 0xf5, - 0x7a, 0x96, 0xc4, 0xa3, 0x0d, 0x57, 0x38, 0x48, 0x86, 0xe2, 0x3f, 0x23, 0x89, 0x7c, 0x86, 0x35, - 0x00, 0x6a, 0xa6, 0xae, 0xcb, 0x8e, 0x5a, 0x97, 0xf5, 0x5c, 0x1f, 0x1e, 0x3c, 0xf3, 0xd0, 0x15, - 0x7a, 0x3e, 0x76, 0x85, 0xb1, 0x55, 0xcd, 0xb9, 0xbb, 0xbe, 0x5c, 0xaa, 0x99, 0x6b, 0x65, 0xca, - 0x12, 0xf9, 0xa7, 0x68, 0x2b, 0xf7, 0xca, 0xce, 0xa6, 0xa5, 0xda, 0xa5, 0x8a, 0xe1, 0x34, 0x5c, - 0x61, 0x98, 0x98, 0x0e, 0x2c, 0x21, 0x29, 0x64, 0x16, 0x2e, 0x80, 0x3e, 0x45, 0x5d, 0x76, 0x72, - 0xfd, 0xd8, 0xfc, 0xd5, 0x8e, 0xcd, 0x0f, 0x11, 0xf3, 0x9e, 0x0d, 0x24, 0x61, 0x53, 0xf0, 0x9b, - 0x1c, 0x38, 0x11, 0xac, 0xa0, 0x7d, 0x15, 0x73, 0x5e, 0xad, 0x7b, 0xff, 0xe4, 0x06, 0xf0, 0x32, - 0xf3, 0x1d, 0x2c, 0x33, 0xab, 0xd6, 0x1a, 0xae, 0x50, 0x88, 0xa2, 0x68, 0x31, 0x8b, 0xa4, 0xe3, - 0x6d, 0x5f, 0x24, 0xfc, 0x61, 0x0a, 0x0c, 0x2f, 0x78, 0x81, 0x83, 0x37, 0x51, 0x52, 0xdf, 0x5a, - 0x57, 0x6d, 0x07, 0x7e, 0x26, 0xd8, 0x47, 0xf1, 0x50, 0xc3, 0x15, 0x06, 0x89, 0x71, 0x6f, 0x8f, - 0x78, 0x4d, 0x41, 0xb7, 0x01, 0x0c, 0xcf, 0xb1, 0x2d, 0xd3, 0xb0, 0x55, 0x78, 0x1d, 0xf4, 0xe3, - 0xc8, 0xc0, 0xf3, 0x86, 0xa6, 0x4e, 0x96, 0xe2, 0x42, 0xb6, 0x84, 0xe7, 0x88, 0x23, 0x1e, 0xbe, - 0x60, 0x5b, 0xf1, 0x10, 0x24, 0x91, 0xf9, 0xe8, 0x12, 0x78, 0x3a, 0x30, 0xef, 0xc5, 0x55, 0x46, - 0xb7, 0xee, 0x73, 0xe0, 0x78, 0x74, 0x22, 0xf5, 0xed, 0x2e, 0x00, 0xd8, 0xb6, 0xed, 0xfd, 0x95, - 0x3a, 0x28, 0x30, 0x1c, 0xf4, 0x86, 0x89, 0xe3, 0x9e, 0x93, 0x3b, 0xae, 0x00, 0x96, 0x9a, 0x53, - 0x83, 0x70, 0x09, 0xcc, 0x21, 0x29, 0x64, 0x1b, 0x6d, 0x50, 0xe7, 0xa7, 0x75, 0x9d, 0x4c, 0xf3, - 0x9d, 0xbf, 0x0d, 0x40, 0x90, 0x93, 0xd4, 0x85, 0xb1, 0x12, 0xd9, 0xcd, 0x92, 0x97, 0xc0, 0x25, - 0x92, 0xef, 0xbe, 0x1f, 0xf3, 0xf2, 0xaa, 0x4a, 0xe7, 0x8a, 0x4f, 0x07, 0xeb, 0x06, 0x36, 0x90, - 0x14, 0x32, 0x88, 0x3e, 0xf0, 0xc1, 0x87, 0x16, 0x6e, 0xdf, 0x98, 0xde, 0xdd, 0x6c, 0x0c, 0xbc, - 0xd3, 0x02, 0x81, 0xc7, 0x10, 0xc6, 0x53, 0x21, 0x10, 0x2f, 0xb2, 0x60, 0xf8, 0x22, 0x28, 0xb4, - 0x42, 0x10, 0x37, 0xe7, 0xeb, 0xa6, 0xb2, 0x5e, 0x6b, 0x06, 0xe6, 0x04, 0x18, 0x90, 0x2d, 0xab, - 0x4a, 0xa3, 0xa0, 0x4f, 0x1c, 0x6e, 0xb8, 0xc2, 0x21, 0x62, 0x94, 0xfc, 0x1d, 0x49, 0xfd, 0xb2, - 0x65, 0x55, 0x14, 0xf4, 0x47, 0x0e, 0x08, 0x89, 0xc6, 0xf6, 0x1b, 0x31, 0xff, 0xe1, 0xc0, 0xb3, - 0x51, 0x30, 0xd3, 0x96, 0x35, 0x6d, 0x28, 0xd7, 0xde, 0x76, 0x54, 0x43, 0x51, 0x15, 0xaf, 0xa6, - 0x76, 0x4c, 0x12, 0xbc, 0x06, 0x8e, 0xaa, 0xd4, 0x40, 0xb5, 0xb5, 0x50, 0x9f, 0x6c, 0xb8, 0xc2, - 0x09, 0x32, 0x27, 0x3a, 0x02, 0x49, 0x87, 0xd5, 0xd0, 0xaa, 0x15, 0x25, 0x12, 0xda, 0xbd, 0x7b, - 0x1d, 0xda, 0x1f, 0x71, 0xe0, 0x5c, 0x16, 0xf4, 0xfb, 0x6d, 0x57, 0x7f, 0xca, 0x83, 0xb1, 0xa0, - 0x5e, 0xdd, 0x5c, 0xb9, 0xe9, 0x35, 0x35, 0x71, 0x33, 0x6e, 0x4b, 0x9f, 0x07, 0xc0, 0x22, 0xc1, - 0x1b, 0x6c, 0x6b, 0x78, 0x85, 0xe6, 0x37, 0x24, 0x0d, 0xd2, 0x5f, 0xc2, 0x7d, 0x94, 0x67, 0xf7, - 0xd1, 0xb8, 0x30, 0xe8, 0xdd, 0x6d, 0x18, 0xf4, 0xed, 0x75, 0x18, 0xdc, 0x02, 0xe3, 0xa9, 0x6c, - 0xd1, 0x10, 0x28, 0x81, 0xa7, 0xf0, 0x16, 0x56, 0x2b, 0x7e, 0xbb, 0x38, 0xd6, 0x70, 0x85, 0x23, - 0xa1, 0x4d, 0xae, 0x56, 0x14, 0x24, 0x1d, 0xc0, 0x3f, 0x56, 0x14, 0xf4, 0x73, 0x0e, 0xe4, 0x03, - 0xdb, 0x6d, 0x55, 0xa7, 0x3b, 0xf6, 0x6f, 0xc7, 0x84, 0xcf, 0x1e, 0xd2, 0x31, 0x0f, 0x4e, 0xc6, - 0xba, 0x4c, 0x29, 0x98, 0x04, 0x83, 0x04, 0xa8, 0xa6, 0xd8, 0x38, 0x13, 0x06, 0xc5, 0x91, 0x86, - 0x2b, 0x1c, 0x0d, 0x73, 0xa0, 0x29, 0x36, 0x92, 0x9e, 0xa2, 0x24, 0xd8, 0xe8, 0xc7, 0x1c, 0x35, - 0xe9, 0xe7, 0x99, 0xb8, 0x89, 0x49, 0xf6, 0x69, 0x68, 0x86, 0x13, 0xc7, 0x0e, 0xa7, 0xc7, 0x0c, - 0x7c, 0x01, 0x8c, 0xc6, 0x7b, 0xd9, 0x3d, 0xf2, 0x6f, 0xf0, 0x60, 0x02, 0xdb, 0x5c, 0x34, 0xef, - 0xa9, 0xc6, 0x9c, 0x66, 0x38, 0xaa, 0x32, 0xad, 0xeb, 0x94, 0x53, 0xaf, 0x73, 0xec, 0x3a, 0x17, - 0xf7, 0x47, 0xa9, 0xfd, 0x8e, 0xdf, 0x68, 0xd8, 0x44, 0x34, 0x4f, 0x55, 0x07, 0x1d, 0x6f, 0x5c, - 0x75, 0x0d, 0x0f, 0xa4, 0x71, 0x71, 0xad, 0xe3, 0x23, 0xf2, 0x31, 0xe2, 0x54, 0xd8, 0x16, 0x92, - 0x86, 0x9c, 0xc0, 0x05, 0xf4, 0x2b, 0x0e, 0x20, 0x86, 0x5f, 0xff, 0xd7, 0x89, 0xfa, 0x80, 0x03, - 0x67, 0x98, 0xbe, 0x3f, 0x71, 0x36, 0x7f, 0xe9, 0x9f, 0x8d, 0x70, 0xfe, 0xcc, 0x98, 0xeb, 0xc6, - 0x3e, 0xa9, 0x79, 0x5f, 0x02, 0xa7, 0x92, 0xfd, 0xa6, 0x34, 0x7e, 0x0e, 0x0c, 0x91, 0x1c, 0xaf, - 0x79, 0xdf, 0xa9, 0xe7, 0xc7, 0x1b, 0xae, 0x00, 0xc3, 0x05, 0x00, 0x7f, 0xf4, 0x4f, 0xee, 0xd8, - 0x12, 0xfa, 0x7a, 0x4b, 0x3b, 0x6e, 0xb5, 0x3e, 0x6d, 0x28, 0x9f, 0x96, 0x12, 0xb0, 0x1c, 0x6e, - 0xb3, 0x09, 0x2c, 0xec, 0x96, 0xea, 0x07, 0x3c, 0x98, 0xa4, 0x29, 0xe1, 0xc8, 0xfa, 0x92, 0xac, - 0xaf, 0xab, 0xaf, 0x9a, 0xb5, 0x7b, 0xaa, 0xd2, 0x5c, 0x6a, 0xef, 0x0e, 0x41, 0xfb, 0x83, 0xf5, - 0xaf, 0x71, 0x60, 0xaa, 0x13, 0x46, 0xe8, 0x0e, 0xcc, 0x81, 0x83, 0x1b, 0xde, 0xd8, 0xaa, 0x8e, - 0x07, 0xd3, 0x9a, 0x71, 0x2e, 0x7b, 0xbd, 0x90, 0x86, 0x36, 0x82, 0xb5, 0xd0, 0xaf, 0xfd, 0x52, - 0x15, 0x5e, 0xac, 0x32, 0xbb, 0x3f, 0x8a, 0x83, 0x05, 0x9e, 0x61, 0xfb, 0x4e, 0x39, 0xbb, 0x01, - 0x86, 0xa3, 0xdb, 0x4d, 0xce, 0x09, 0x7d, 0xe2, 0x68, 0xc3, 0x15, 0x72, 0xf1, 0x11, 0x61, 0x23, - 0xe9, 0x48, 0x6b, 0x48, 0xd8, 0x48, 0xa6, 0xe7, 0xa5, 0xd7, 0x1c, 0x79, 0x59, 0x57, 0xdb, 0xe4, - 0x0a, 0x11, 0x1c, 0xb1, 0xf1, 0x97, 0xaa, 0x7f, 0xe8, 0xa0, 0xfb, 0x93, 0x6f, 0xb8, 0xc2, 0x71, - 0xb2, 0x4c, 0x64, 0x00, 0x92, 0x0e, 0xd9, 0x21, 0x63, 0x8a, 0xd7, 0x3c, 0x46, 0xe3, 0xd7, 0xa0, - 0x68, 0x4c, 0x30, 0x4c, 0x6d, 0x78, 0xa5, 0xbe, 0x1a, 0x56, 0x60, 0xce, 0xc6, 0xdf, 0x7c, 0x88, - 0x25, 0xaf, 0x15, 0x90, 0xe3, 0x53, 0x08, 0x74, 0x9b, 0x25, 0x24, 0x51, 0x08, 0xcd, 0xe1, 0xe8, - 0x7a, 0x70, 0x48, 0x0c, 0xf9, 0x64, 0x77, 0x7e, 0x43, 0x6f, 0x42, 0x6b, 0xb3, 0xc4, 0x86, 0xd6, - 0xfb, 0xd8, 0xa0, 0xfd, 0x90, 0x03, 0xe7, 0xa3, 0x64, 0x33, 0x2b, 0xd2, 0x93, 0xbe, 0x69, 0xa3, - 0x1f, 0x71, 0xa0, 0x98, 0xd1, 0xc3, 0x4f, 0x2a, 0x3e, 0x7e, 0xc6, 0x81, 0x2b, 0x6d, 0x79, 0x88, - 0x3f, 0xcd, 0xc9, 0x96, 0xa5, 0x19, 0xab, 0x71, 0x97, 0xf7, 0x8a, 0xf2, 0x89, 0x51, 0xfa, 0x17, - 0x0e, 0xbc, 0xd0, 0x95, 0xbf, 0x94, 0xe0, 0x07, 0x1c, 0xc8, 0xa9, 0x09, 0x53, 0x29, 0xd1, 0xa5, - 0x78, 0xa2, 0x13, 0x17, 0x3c, 0xd3, 0x70, 0x05, 0xa1, 0xd5, 0xff, 0xe8, 0x18, 0x24, 0x25, 0x2e, - 0x8a, 0x5e, 0xa7, 0x67, 0x78, 0x26, 0xa0, 0xce, 0xf3, 0xf5, 0x7d, 0x5f, 0x86, 0x49, 0xb1, 0x9b, - 0x8d, 0x97, 0xde, 0x27, 0xcf, 0xcb, 0x3b, 0x1c, 0x3d, 0x75, 0x24, 0x03, 0xc0, 0x37, 0xc9, 0x69, - 0x43, 0x09, 0x11, 0x94, 0xf5, 0xd6, 0x1b, 0x10, 0xc9, 0xa7, 0x10, 0xf9, 0x67, 0xbf, 0xd7, 0x67, - 0xf4, 0x83, 0x12, 0xfa, 0x3d, 0x0e, 0xe4, 0xc3, 0xd8, 0x1c, 0x33, 0x86, 0xd2, 0x0b, 0xe9, 0x94, - 0x2e, 0xb6, 0xcc, 0x13, 0xcf, 0x36, 0x5c, 0xe1, 0x74, 0x3b, 0xa9, 0xad, 0xd6, 0x91, 0xc4, 0x58, - 0x1a, 0x7d, 0xc4, 0x01, 0x31, 0x3b, 0xa0, 0x68, 0x2a, 0xcd, 0x3e, 0x36, 0xa6, 0xe1, 0x55, 0x70, - 0xa8, 0xa5, 0x00, 0x50, 0x55, 0x2b, 0xd7, 0x70, 0x85, 0x91, 0x98, 0xfa, 0x80, 0xa4, 0x83, 0x61, - 0x94, 0xc8, 0x06, 0x33, 0xbb, 0x82, 0x45, 0x37, 0xee, 0x3c, 0xf0, 0x85, 0x26, 0x8a, 0x0c, 0x06, - 0x6f, 0x5f, 0xbe, 0x02, 0x15, 0x68, 0x51, 0x5f, 0xa0, 0x52, 0xd4, 0xe2, 0xd2, 0xab, 0x3a, 0x3d, - 0x01, 0x76, 0x95, 0xae, 0x36, 0xed, 0xd3, 0x51, 0x3b, 0xd4, 0xa9, 0x45, 0x70, 0xc0, 0xd9, 0xd0, - 0x15, 0xd9, 0x91, 0x69, 0xe4, 0x8c, 0xc5, 0x47, 0xce, 0xe2, 0x86, 0x4e, 0x0e, 0x87, 0xb3, 0xb2, - 0x23, 0xcf, 0xc9, 0x56, 0xd8, 0x79, 0x6a, 0x00, 0x49, 0xbe, 0xa9, 0xa9, 0x3f, 0x8c, 0x83, 0x7e, - 0xbc, 0x2a, 0x7c, 0x97, 0x03, 0x20, 0xb8, 0x47, 0xc0, 0xf1, 0x78, 0xeb, 0x6d, 0x4f, 0x4f, 0xf9, - 0x89, 0xf4, 0x81, 0x04, 0x01, 0x7a, 0xf6, 0xfe, 0x5f, 0xff, 0xf5, 0x6d, 0xfe, 0x0c, 0x3c, 0x5d, - 0x4e, 0x7e, 0xa5, 0xb4, 0xcb, 0x5b, 0x9a, 0xb2, 0x0d, 0xbf, 0xcf, 0x81, 0xc3, 0xad, 0x2f, 0x43, - 0xf0, 0xb3, 0x69, 0xeb, 0x84, 0x4e, 0x72, 0xf9, 0xf3, 0xd9, 0x06, 0x53, 0xc7, 0x8a, 0xd8, 0xb1, - 0x71, 0x78, 0x96, 0xe5, 0x98, 0x37, 0x83, 0x38, 0xf7, 0x2d, 0xdf, 0xb9, 0xa6, 0xbc, 0xcd, 0x74, - 0x2e, 0xfa, 0xb0, 0xc4, 0x74, 0xae, 0xed, 0x31, 0x08, 0x3d, 0x83, 0x9d, 0x2b, 0xc0, 0x51, 0x96, - 0x73, 0xf0, 0xb7, 0x1c, 0x38, 0x91, 0xf0, 0x7a, 0x02, 0x9f, 0xcf, 0xb2, 0x5e, 0xf4, 0xca, 0x90, - 0xbf, 0xd8, 0xe1, 0x2c, 0xea, 0xee, 0x65, 0xec, 0xee, 0x14, 0xbc, 0xc0, 0x72, 0xb7, 0xb8, 0xbc, - 0x59, 0xa4, 0xd7, 0x8c, 0xf2, 0x16, 0x49, 0x83, 0x6d, 0x78, 0x9f, 0xa7, 0x92, 0x11, 0xf3, 0xd5, - 0x00, 0xbe, 0x9c, 0xcd, 0xaf, 0xc4, 0xd7, 0x96, 0xfc, 0x2b, 0xdd, 0x1b, 0xa0, 0x18, 0x6f, 0x61, - 0x8c, 0xaf, 0xc1, 0x85, 0x34, 0x8c, 0xb2, 0x65, 0x15, 0x65, 0x43, 0x29, 0xfa, 0x45, 0xaa, 0xe8, - 0x15, 0xad, 0x26, 0xe2, 0xf2, 0x56, 0xf4, 0xb0, 0xb3, 0x0d, 0xdf, 0xe1, 0xc3, 0x4a, 0x4f, 0xac, - 0x68, 0x0e, 0x5f, 0x4c, 0x0b, 0x6e, 0xd6, 0xcb, 0x44, 0xfe, 0x6a, 0x97, 0xb3, 0x29, 0x76, 0x15, - 0x63, 0xaf, 0xc2, 0xdb, 0x0c, 0xec, 0x45, 0x73, 0xa5, 0x88, 0x2b, 0xbf, 0xc7, 0x41, 0x04, 0x7b, - 0x70, 0xd5, 0xdc, 0x2e, 0x6f, 0xe1, 0x41, 0xb1, 0x3c, 0xfc, 0x8e, 0x03, 0xc7, 0x62, 0xd4, 0x72, - 0x78, 0x21, 0xcd, 0xfb, 0xb6, 0x38, 0x9e, 0xec, 0x60, 0x06, 0xc5, 0x78, 0x03, 0x63, 0x14, 0xe1, - 0x2b, 0xf1, 0x18, 0xc3, 0x2d, 0x27, 0x26, 0x9e, 0x43, 0x08, 0xe1, 0x2f, 0x38, 0x30, 0x12, 0xa7, - 0x7d, 0xc3, 0xc9, 0x0c, 0x41, 0xd8, 0xaa, 0xe6, 0xe7, 0xa7, 0x3a, 0x99, 0x42, 0x91, 0x5c, 0xc4, - 0x48, 0xca, 0xb0, 0x98, 0x16, 0xa9, 0x78, 0x27, 0xfc, 0x0d, 0x81, 0xef, 0xf2, 0xe0, 0x74, 0xaa, - 0xaa, 0x0c, 0x5f, 0x62, 0x38, 0x94, 0x41, 0x97, 0xcf, 0xbf, 0xdc, 0xf5, 0x7c, 0x8a, 0x4e, 0xc1, - 0xe8, 0xee, 0xc0, 0x2f, 0xc7, 0xa3, 0xc3, 0x0a, 0x6a, 0x91, 0x08, 0xaa, 0xa1, 0x1d, 0xb2, 0x99, - 0x21, 0xd9, 0x1e, 0x8a, 0x7f, 0xf3, 0x5f, 0x59, 0xe2, 0x7d, 0x82, 0x97, 0x3b, 0x86, 0xe1, 0x13, - 0xf0, 0xf9, 0x2e, 0x66, 0x52, 0xe8, 0x33, 0x18, 0xfa, 0x55, 0xf8, 0x42, 0x67, 0xd0, 0x5b, 0xa3, - 0xf3, 0x4f, 0x1c, 0xc8, 0x25, 0x49, 0x87, 0xf0, 0x62, 0x5a, 0xde, 0xc4, 0xca, 0xd0, 0xf9, 0x4b, - 0x9d, 0x4e, 0xa3, 0x80, 0x44, 0x0c, 0xe8, 0x45, 0x78, 0x85, 0x55, 0x57, 0xb0, 0x32, 0x99, 0x8c, - 0xe7, 0xbf, 0x0c, 0x99, 0x9c, 0x4a, 0xa1, 0xe9, 0xc5, 0x93, 0xa5, 0x23, 0xa7, 0x17, 0x4f, 0xa6, - 0xfe, 0x8a, 0xee, 0x60, 0x90, 0x6f, 0xc0, 0xa5, 0x8e, 0x40, 0xe2, 0x16, 0x92, 0x29, 0x54, 0x7f, - 0xc0, 0xd3, 0x1b, 0x5f, 0x26, 0x51, 0x12, 0x5e, 0x67, 0xc6, 0x5f, 0x76, 0xa1, 0x37, 0x7f, 0x63, - 0xf7, 0x86, 0x28, 0x43, 0x6f, 0x62, 0x86, 0x16, 0xa1, 0x94, 0xc4, 0x90, 0xbe, 0xae, 0x16, 0xc9, - 0xf1, 0x38, 0x44, 0x51, 0x36, 0x76, 0x3e, 0xf6, 0xf5, 0xab, 0x04, 0xc1, 0x11, 0xb2, 0xf2, 0x91, - 0x2d, 0xb0, 0xe6, 0xaf, 0x74, 0x33, 0x35, 0x5b, 0x2e, 0x7b, 0x40, 0xea, 0x86, 0xac, 0x63, 0x90, - 0x89, 0x9d, 0xe6, 0x03, 0xbf, 0xd3, 0x44, 0x74, 0x47, 0x66, 0xa7, 0x89, 0xd7, 0x41, 0x99, 0x9d, - 0x26, 0x41, 0xd6, 0x4c, 0xcb, 0x5f, 0x22, 0x3a, 0x15, 0x49, 0x84, 0x2f, 0x6f, 0x16, 0x35, 0xa5, - 0xbc, 0x15, 0x91, 0x52, 0xb7, 0xe1, 0x6f, 0x42, 0xdd, 0x32, 0x2c, 0x30, 0xa6, 0x75, 0xcb, 0x18, - 0x59, 0x33, 0xad, 0x5b, 0xc6, 0xe9, 0x97, 0xe8, 0x25, 0x8c, 0xe1, 0x32, 0xbc, 0x94, 0x0d, 0x43, - 0xdb, 0x09, 0xf6, 0x3d, 0x1e, 0x9c, 0xcd, 0x24, 0xf6, 0x41, 0x31, 0x1b, 0xc3, 0xcc, 0xa4, 0x9b, - 0xd9, 0x95, 0x8d, 0x6c, 0x15, 0x29, 0x01, 0x72, 0x31, 0x7c, 0x04, 0x62, 0x9e, 0x67, 0x7f, 0xcf, - 0x83, 0xe7, 0xba, 0x10, 0xeb, 0xe0, 0x7c, 0xc6, 0x7c, 0xca, 0xac, 0x53, 0xe6, 0x17, 0xf6, 0xd0, - 0x22, 0x25, 0x4f, 0xc3, 0xe4, 0xd5, 0xa0, 0x9c, 0x7e, 0x4e, 0x5c, 0x8a, 0x32, 0xe8, 0xd5, 0xf4, - 0x56, 0xb3, 0x4c, 0x1e, 0xff, 0xed, 0xbf, 0xa7, 0x33, 0x5d, 0x65, 0x5e, 0x8e, 0xb2, 0xa8, 0x8b, - 0xcc, 0xcb, 0x51, 0x26, 0x19, 0x31, 0x4b, 0x35, 0x4b, 0x22, 0x25, 0xc8, 0xa4, 0xef, 0xf2, 0xa9, - 0xd2, 0x65, 0x48, 0xc9, 0x61, 0x36, 0xb2, 0x4e, 0xb4, 0x43, 0x66, 0x23, 0xeb, 0x48, 0xfc, 0x43, - 0xaf, 0x63, 0x1a, 0x6e, 0xc2, 0xb9, 0x0e, 0x68, 0x20, 0x77, 0x26, 0xdc, 0xed, 0x7d, 0x42, 0xfc, - 0x1b, 0x92, 0x4f, 0xcc, 0x0e, 0x9f, 0x2a, 0x7e, 0xb3, 0x24, 0x2e, 0xf8, 0xc6, 0x6e, 0x01, 0x26, - 0x89, 0x81, 0xf9, 0x5b, 0x8f, 0xc1, 0x32, 0xe5, 0xd2, 0xc0, 0x5c, 0xde, 0x85, 0x2b, 0x1d, 0x73, - 0x19, 0x5f, 0xaf, 0x22, 0xa4, 0x46, 0xf2, 0x0d, 0xdf, 0xda, 0x8e, 0xc5, 0x48, 0x71, 0xcc, 0xcb, - 0x67, 0xac, 0xfa, 0xc7, 0xbc, 0x7c, 0xc6, 0xeb, 0x7c, 0x69, 0x02, 0x8a, 0xb3, 0xa1, 0x87, 0xce, - 0x3f, 0xb2, 0x65, 0x35, 0x61, 0x88, 0x0b, 0x0f, 0xff, 0x59, 0xe8, 0xf9, 0xc9, 0x4e, 0xa1, 0xe7, - 0xe1, 0x4e, 0x81, 0xfb, 0x70, 0xa7, 0xc0, 0xfd, 0x63, 0xa7, 0xc0, 0xbd, 0xf7, 0xa8, 0xd0, 0xf3, - 0xe1, 0xa3, 0x42, 0xcf, 0xdf, 0x1f, 0x15, 0x7a, 0xde, 0x2c, 0xb7, 0xbc, 0x31, 0x7b, 0xd6, 0x8b, - 0xe6, 0xca, 0x8a, 0x56, 0xd3, 0x64, 0xdd, 0x5f, 0xcd, 0x5f, 0x0f, 0x3f, 0x38, 0x2f, 0x0f, 0xe0, - 0xff, 0x34, 0xf0, 0xdc, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x28, 0x27, 0xff, 0xcb, 0xf0, 0x30, - 0x00, 0x00, + // 2382 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0x4d, 0x6c, 0xdc, 0xc6, + 0x15, 0x16, 0x29, 0x59, 0x8e, 0x46, 0xfe, 0xd3, 0x58, 0x91, 0x17, 0x6b, 0x65, 0x69, 0x8f, 0x63, + 0x49, 0x76, 0xbd, 0xbb, 0x96, 0x1c, 0x3b, 0xae, 0x13, 0x27, 0x11, 0x25, 0xc7, 0xde, 0x22, 0x82, + 0x25, 0x46, 0x11, 0xec, 0xb4, 0xf6, 0x82, 0x5a, 0x52, 0x32, 0x61, 0x8a, 0x64, 0x96, 0x94, 0x12, + 0x55, 0xd0, 0xc5, 0xad, 0x0b, 0x24, 0x17, 0xa7, 0x28, 0xda, 0x02, 0xed, 0xa1, 0x3d, 0xf4, 0xd0, + 0x43, 0x7b, 0x28, 0x50, 0x14, 0x48, 0x81, 0x06, 0x0d, 0xd0, 0x02, 0x46, 0x81, 0xb6, 0x01, 0x8a, + 0xa0, 0x45, 0x0e, 0x44, 0x2b, 0xf7, 0xd8, 0xd3, 0x5e, 0x0b, 0x14, 0x05, 0x87, 0xc3, 0x25, 0x97, + 0x4b, 0x0e, 0xc9, 0x95, 0xe4, 0x54, 0xe8, 0xc9, 0x92, 0x38, 0xf3, 0xe6, 0x7d, 0xdf, 0xbc, 0x79, + 0xef, 0xcd, 0x37, 0x09, 0x38, 0x51, 0xd3, 0x57, 0x24, 0xf9, 0xbd, 0xf2, 0x9a, 0xb8, 0xaa, 0x5a, + 0xe5, 0xb5, 0xf1, 0x45, 0xd9, 0x12, 0xc7, 0xcb, 0xef, 0xac, 0xca, 0xf5, 0xf5, 0x92, 0x51, 0xd7, + 0x2d, 0x1d, 0x0e, 0xba, 0x23, 0x4a, 0x78, 0x44, 0x89, 0x8c, 0xc8, 0x9f, 0xad, 0xe9, 0xe6, 0x8a, + 0x6e, 0x96, 0x17, 0x45, 0x53, 0x76, 0x87, 0x37, 0x27, 0x1b, 0xe2, 0xb2, 0xa2, 0x89, 0x96, 0xa2, + 0x6b, 0xae, 0x85, 0xfc, 0xe0, 0xb2, 0xbe, 0xac, 0xe3, 0x1f, 0xcb, 0xce, 0x4f, 0xe4, 0xaf, 0xc3, + 0xcb, 0xba, 0xbe, 0xac, 0xca, 0x65, 0xd1, 0x50, 0xca, 0xa2, 0xa6, 0xe9, 0x16, 0x9e, 0x62, 0x92, + 0xaf, 0xd1, 0x7e, 0xb9, 0x3e, 0xe0, 0x11, 0xe8, 0xe3, 0x6e, 0xd0, 0xb7, 0xe0, 0xfc, 0x5e, 0xd1, + 0x96, 0x74, 0x78, 0x08, 0xb0, 0x8a, 0x94, 0x63, 0x4e, 0x30, 0x63, 0x7d, 0x02, 0xab, 0x48, 0xf0, + 0x22, 0xd8, 0x6f, 0x88, 0x4a, 0xbd, 0xaa, 0x48, 0x39, 0xf6, 0x04, 0x33, 0xd6, 0xc3, 0x0f, 0x6f, + 0xd9, 0x5c, 0xef, 0xac, 0xa8, 0xd4, 0x2b, 0xd3, 0x0d, 0x9b, 0x3b, 0xb4, 0x2e, 0xae, 0xa8, 0x57, + 0x10, 0x19, 0x82, 0x84, 0x5e, 0xe7, 0xa7, 0x8a, 0x04, 0x47, 0xc0, 0x3e, 0xfd, 0x5d, 0x4d, 0xae, + 0xe7, 0xba, 0x1d, 0x4b, 0xfc, 0x91, 0x86, 0xcd, 0x1d, 0x70, 0x87, 0xe2, 0x3f, 0x23, 0xc1, 0xfd, + 0x0c, 0x6b, 0x00, 0xd4, 0x74, 0x55, 0x15, 0x2d, 0xb9, 0x2e, 0xaa, 0xb9, 0x1e, 0x3c, 0x78, 0xea, + 0xb1, 0xcd, 0x75, 0x7d, 0x6e, 0x73, 0x23, 0xcb, 0x8a, 0x75, 0x6f, 0x75, 0xb1, 0x54, 0xd3, 0x57, + 0xca, 0x84, 0x25, 0xf7, 0x9f, 0xa2, 0x29, 0xdd, 0x2f, 0x5b, 0xeb, 0x86, 0x6c, 0x96, 0x2a, 0x9a, + 0xd5, 0xb0, 0xb9, 0x01, 0xd7, 0xb4, 0x6f, 0x09, 0x09, 0x01, 0xb3, 0x70, 0x0e, 0xf4, 0x48, 0xf2, + 0xa2, 0x95, 0xdb, 0x87, 0xcd, 0x5f, 0xcd, 0x6c, 0xbe, 0xdf, 0x35, 0xef, 0xd8, 0x40, 0x02, 0x36, + 0x05, 0xdf, 0x67, 0xc0, 0x31, 0x7f, 0x05, 0xe5, 0xeb, 0x98, 0xf3, 0x6a, 0xdd, 0xf9, 0x27, 0xd7, + 0x8b, 0x97, 0x99, 0xcd, 0xb0, 0xcc, 0xb4, 0x5c, 0x6b, 0xd8, 0x5c, 0x21, 0x8c, 0xa2, 0xc5, 0x2c, + 0x12, 0x86, 0xda, 0xbe, 0x08, 0xf8, 0xc3, 0x04, 0x18, 0x98, 0x73, 0x02, 0x07, 0x6f, 0xa2, 0x20, + 0xbf, 0xb3, 0x2a, 0x9b, 0x16, 0x7c, 0xce, 0xdf, 0x47, 0xfe, 0x60, 0xc3, 0xe6, 0xfa, 0x5c, 0xe3, + 0xce, 0x1e, 0xb1, 0x8a, 0x84, 0xee, 0x00, 0x18, 0x9c, 0x63, 0x1a, 0xba, 0x66, 0xca, 0xf0, 0x3a, + 0xd8, 0x87, 0x23, 0x03, 0xcf, 0xeb, 0x9f, 0x38, 0x5e, 0x8a, 0x0a, 0xd9, 0x12, 0x9e, 0xc3, 0x0f, + 0x3a, 0xf8, 0xfc, 0x6d, 0xc5, 0x43, 0x90, 0xe0, 0xce, 0x47, 0x97, 0xc0, 0xb3, 0xbe, 0x79, 0x27, + 0xae, 0x52, 0xba, 0xf5, 0x80, 0x01, 0x43, 0xe1, 0x89, 0xc4, 0xb7, 0x7b, 0x00, 0x60, 0xdb, 0xa6, + 0xf3, 0x57, 0xe2, 0x20, 0x47, 0x71, 0xd0, 0x19, 0xc6, 0x8f, 0x3a, 0x4e, 0x6e, 0xd9, 0x1c, 0x58, + 0x68, 0x4e, 0xf5, 0xc3, 0xc5, 0x37, 0x87, 0x84, 0x80, 0x6d, 0xf4, 0x3a, 0x18, 0x6e, 0xf5, 0x81, + 0x5f, 0xbf, 0xe9, 0x04, 0xab, 0x87, 0xa1, 0x19, 0xdb, 0x0c, 0x35, 0xb6, 0xd1, 0xfb, 0x0c, 0x78, + 0x2e, 0xc6, 0x50, 0x0c, 0xa6, 0xee, 0x5d, 0xc3, 0xb4, 0x46, 0x36, 0x64, 0x52, 0x55, 0xdd, 0x69, + 0x1e, 0x98, 0x3b, 0x00, 0xf8, 0x79, 0x86, 0xd0, 0x3a, 0x52, 0x72, 0x23, 0xb4, 0xe4, 0x24, 0xa5, + 0x92, 0x9b, 0xc3, 0x3c, 0x3f, 0x66, 0xc5, 0x65, 0x99, 0xcc, 0xe5, 0x9f, 0xf5, 0xd7, 0xf5, 0x6d, + 0x20, 0x21, 0x60, 0x10, 0x7d, 0xe2, 0x6d, 0x68, 0x60, 0xe1, 0xf6, 0x60, 0xeb, 0xde, 0x4e, 0xb0, + 0xc1, 0xbb, 0x2d, 0x10, 0x58, 0x0c, 0x61, 0x34, 0x11, 0x82, 0xeb, 0x45, 0x1a, 0x0c, 0x5f, 0x01, + 0x85, 0x56, 0x08, 0xfc, 0xfa, 0x6c, 0x5d, 0x97, 0x56, 0x6b, 0xcd, 0xc3, 0x36, 0x06, 0x7a, 0x45, + 0xc3, 0xa8, 0x92, 0xc8, 0xee, 0xe1, 0x07, 0x1a, 0x36, 0x77, 0xd0, 0x35, 0xea, 0xfe, 0x1d, 0x09, + 0xfb, 0x44, 0xc3, 0xa8, 0x48, 0xe8, 0x0f, 0x0c, 0xe0, 0x62, 0x8d, 0xed, 0x35, 0x62, 0xfe, 0xcd, + 0x80, 0x33, 0x61, 0x30, 0x93, 0x86, 0x31, 0xa9, 0x49, 0xd7, 0xde, 0xb3, 0x64, 0x4d, 0x92, 0x25, + 0xa7, 0x4e, 0x64, 0x26, 0x09, 0x5e, 0x03, 0x47, 0x64, 0x62, 0xa0, 0xda, 0x5a, 0x7c, 0x8e, 0x37, + 0x6c, 0xee, 0x98, 0x3b, 0x27, 0x3c, 0x02, 0x09, 0x87, 0xe4, 0xc0, 0xaa, 0x15, 0x29, 0x14, 0xda, + 0xdd, 0x3b, 0x1d, 0xda, 0x9f, 0x31, 0xe0, 0x6c, 0x1a, 0xf4, 0x7b, 0x6d, 0x57, 0x7f, 0xc6, 0x82, + 0x11, 0x3f, 0x6d, 0xdd, 0x5c, 0xc2, 0x29, 0x8b, 0x5f, 0x8f, 0xda, 0xd2, 0x17, 0x00, 0x30, 0xdc, + 0xe0, 0xf5, 0xb7, 0x35, 0xb8, 0x42, 0xf3, 0x1b, 0x12, 0xfa, 0xc8, 0x2f, 0xc1, 0xde, 0x80, 0xa5, + 0xf7, 0x06, 0x51, 0x61, 0xd0, 0xbd, 0xdd, 0x30, 0xe8, 0xd9, 0xe9, 0x30, 0xb8, 0x0d, 0x46, 0x13, + 0xd9, 0x22, 0x21, 0x50, 0x02, 0xcf, 0xe0, 0x2d, 0xac, 0x56, 0xbc, 0x12, 0x78, 0xb4, 0x61, 0x73, + 0x87, 0x03, 0x9b, 0x5c, 0xad, 0x48, 0x48, 0xd8, 0x8f, 0x7f, 0xac, 0x48, 0xe8, 0x17, 0x0c, 0xc8, + 0xfb, 0xb6, 0xdb, 0xb2, 0x4e, 0x67, 0xec, 0xdf, 0x89, 0x08, 0x9f, 0x1d, 0xa4, 0x63, 0x16, 0x1c, + 0x8f, 0x74, 0x99, 0x50, 0x30, 0x0e, 0xfa, 0x5c, 0xa0, 0x8a, 0x64, 0xe2, 0x93, 0xd0, 0xc7, 0x0f, + 0x36, 0x6c, 0xee, 0x48, 0x90, 0x03, 0x45, 0x32, 0x91, 0xf0, 0x0c, 0x21, 0xc1, 0x44, 0x3f, 0x61, + 0x88, 0x49, 0xef, 0x9c, 0x75, 0x56, 0x8e, 0x77, 0x1b, 0xf8, 0x1c, 0xe9, 0x1a, 0xda, 0xbc, 0xec, + 0x1c, 0xf9, 0xb7, 0x58, 0x30, 0x86, 0x6d, 0xce, 0xeb, 0xf7, 0x65, 0x6d, 0x46, 0xd1, 0x2c, 0x59, + 0x9a, 0x54, 0x55, 0xc2, 0xa9, 0x53, 0x39, 0xb6, 0x7d, 0x16, 0xf7, 0x46, 0xaa, 0xfd, 0xae, 0x57, + 0x68, 0xe8, 0x44, 0x34, 0xbb, 0xaa, 0x03, 0x96, 0x33, 0xae, 0xba, 0x82, 0x07, 0x92, 0xb8, 0xb8, + 0x96, 0xb9, 0xed, 0x3f, 0xea, 0x3a, 0x15, 0xb4, 0x85, 0x84, 0x7e, 0xcb, 0x77, 0x01, 0x7d, 0xc4, + 0x00, 0x44, 0xf1, 0xeb, 0x7f, 0xfa, 0xa0, 0x3e, 0x62, 0xc0, 0x29, 0xaa, 0xef, 0x4f, 0x9d, 0xcd, + 0x5f, 0x79, 0xbd, 0x11, 0x3e, 0x3f, 0x53, 0xfa, 0xaa, 0xb6, 0x47, 0x72, 0xde, 0x57, 0xc1, 0x89, + 0x78, 0xbf, 0x09, 0x8d, 0x2f, 0x82, 0x7e, 0xf7, 0x8c, 0xd7, 0x9c, 0xef, 0xc4, 0xf3, 0xa1, 0x86, + 0xcd, 0xc1, 0x60, 0x02, 0xc0, 0x1f, 0xbd, 0xce, 0x1d, 0x5b, 0x42, 0xdf, 0x6c, 0x29, 0xc7, 0xad, + 0xd6, 0x27, 0x35, 0xe9, 0xff, 0x25, 0x05, 0x2c, 0x06, 0xcb, 0x6c, 0x0c, 0x0b, 0xdb, 0xa5, 0xfa, + 0x11, 0x0b, 0xc6, 0xc9, 0x91, 0xb0, 0x44, 0x75, 0x41, 0x54, 0x57, 0xe5, 0x37, 0xf4, 0xda, 0x7d, + 0x59, 0x6a, 0x2e, 0xb5, 0x73, 0x4d, 0xd0, 0xde, 0x60, 0xfd, 0x1b, 0x0c, 0x98, 0xc8, 0xc2, 0x08, + 0xd9, 0x81, 0x19, 0x70, 0x60, 0xcd, 0x19, 0x5b, 0x55, 0xf1, 0x60, 0x92, 0x33, 0xce, 0xa6, 0xcf, + 0x17, 0x42, 0xff, 0x9a, 0xbf, 0x16, 0xfa, 0xb5, 0x97, 0xaa, 0x82, 0x8b, 0x55, 0xa6, 0xf7, 0x46, + 0x72, 0x30, 0xc0, 0xf3, 0x74, 0xdf, 0x09, 0x67, 0x37, 0xc0, 0x40, 0x78, 0xbb, 0xdd, 0x3e, 0xa1, + 0x87, 0x1f, 0x6e, 0xd8, 0x5c, 0x2e, 0x3a, 0x22, 0x4c, 0x24, 0x1c, 0x6e, 0x0d, 0x09, 0x13, 0x89, + 0xa4, 0x5f, 0x7a, 0xd3, 0x12, 0x17, 0x55, 0xb9, 0x4d, 0x82, 0xe1, 0xc1, 0x61, 0x13, 0x7f, 0xa9, + 0x7a, 0x4d, 0x07, 0xd9, 0x9f, 0x7c, 0xc3, 0xe6, 0x86, 0xdc, 0x65, 0x42, 0x03, 0x90, 0x70, 0xd0, + 0x0c, 0x18, 0x93, 0x9c, 0xe2, 0x31, 0x1c, 0xbd, 0x06, 0x41, 0xa3, 0x83, 0x01, 0x62, 0xc3, 0x49, + 0xf5, 0xd5, 0xa0, 0xaa, 0x74, 0x3a, 0xfa, 0xe6, 0xe3, 0x5a, 0x72, 0x4a, 0x81, 0xdb, 0x3e, 0x05, + 0x40, 0xb7, 0x59, 0x42, 0x02, 0x81, 0xd0, 0x1c, 0x8e, 0xae, 0xfb, 0x4d, 0x62, 0xc0, 0x27, 0x33, + 0xfb, 0x0d, 0xbd, 0x09, 0xad, 0xcd, 0x12, 0x1d, 0x5a, 0xf7, 0xae, 0x41, 0xfb, 0x11, 0x03, 0xce, + 0x85, 0xc9, 0xa6, 0x66, 0xa4, 0xa7, 0x7d, 0xd3, 0x46, 0x3f, 0x66, 0x40, 0x31, 0xa5, 0x87, 0x5f, + 0x54, 0x7c, 0xfc, 0x9c, 0x01, 0x57, 0xda, 0xce, 0x21, 0xfe, 0x34, 0x23, 0x1a, 0x86, 0xa2, 0x2d, + 0x47, 0x5d, 0xde, 0x2b, 0xd2, 0x17, 0x46, 0xe9, 0x9f, 0x19, 0xf0, 0x52, 0x47, 0xfe, 0x12, 0x82, + 0x1f, 0x31, 0x20, 0x27, 0xc7, 0x4c, 0x25, 0x44, 0x97, 0xa2, 0x89, 0x8e, 0x5d, 0xf0, 0x54, 0xc3, + 0xe6, 0xb8, 0x56, 0xff, 0xc3, 0x63, 0x90, 0x10, 0xbb, 0x28, 0x7a, 0x8b, 0xf4, 0xf0, 0x54, 0x40, + 0xd9, 0xcf, 0xeb, 0xc7, 0x9e, 0x0c, 0x93, 0x60, 0x37, 0x1d, 0x2f, 0xdd, 0x4f, 0x9f, 0x97, 0x87, + 0x0c, 0xe9, 0x3a, 0xe2, 0x01, 0xe0, 0x9b, 0xe4, 0xa4, 0x26, 0x05, 0x08, 0x4a, 0x7b, 0xeb, 0xf5, + 0x89, 0x64, 0x13, 0x88, 0xfc, 0x93, 0x57, 0xeb, 0x53, 0xfa, 0x41, 0x08, 0xfd, 0x3e, 0x03, 0xf2, + 0x41, 0x6c, 0x96, 0x1e, 0x41, 0xe9, 0xf9, 0x64, 0x4a, 0xe7, 0x5b, 0xe6, 0xf1, 0xa7, 0x1b, 0x36, + 0x77, 0xb2, 0x9d, 0xd4, 0x56, 0xeb, 0x48, 0xa0, 0x2c, 0x8d, 0x3e, 0x63, 0x00, 0x9f, 0x1e, 0x50, + 0xf8, 0x28, 0x4d, 0xef, 0x1a, 0xd3, 0xf0, 0x2a, 0x38, 0xd8, 0x92, 0x00, 0x88, 0xaa, 0x95, 0x6b, + 0xd8, 0xdc, 0x60, 0x44, 0x7e, 0x40, 0xc2, 0x81, 0x20, 0x4a, 0x64, 0x82, 0xa9, 0x6d, 0xc1, 0x22, + 0x1b, 0x77, 0x0e, 0x78, 0x42, 0x13, 0x41, 0x06, 0xfd, 0xf7, 0x3c, 0x4f, 0x81, 0xf2, 0xb5, 0xa8, + 0xd7, 0x89, 0x14, 0x35, 0xbf, 0xf0, 0x86, 0x4a, 0x3a, 0xc0, 0x8e, 0x8e, 0xeb, 0xbb, 0xa4, 0x4e, + 0x87, 0xed, 0x10, 0xa7, 0x6e, 0x81, 0xfd, 0xd6, 0x9a, 0x2a, 0x89, 0x96, 0x48, 0x22, 0x67, 0x24, + 0x3a, 0x72, 0xe6, 0xd7, 0x54, 0xb7, 0x39, 0x9c, 0x16, 0x2d, 0x71, 0x46, 0x34, 0xf8, 0x21, 0x22, + 0x99, 0x12, 0x00, 0xc4, 0x08, 0x12, 0x3c, 0x73, 0x13, 0x0f, 0xcf, 0x80, 0x7d, 0x78, 0x65, 0xf8, + 0x01, 0x03, 0x80, 0x7f, 0x97, 0x80, 0xa3, 0xd1, 0x2b, 0xb4, 0x3d, 0xa9, 0xe5, 0xc7, 0x92, 0x07, + 0xba, 0x28, 0xd0, 0x99, 0x07, 0x7f, 0xf9, 0xe7, 0x77, 0xd8, 0x53, 0xf0, 0x64, 0x39, 0xfe, 0xf5, + 0xd5, 0x2c, 0x6f, 0x28, 0xd2, 0x26, 0xfc, 0x01, 0x03, 0x0e, 0xb5, 0x3e, 0x12, 0xc1, 0x2f, 0x25, + 0xad, 0x13, 0xe8, 0xe6, 0xf2, 0xe7, 0xd2, 0x0d, 0x26, 0x8e, 0x15, 0xb1, 0x63, 0xa3, 0xf0, 0x34, + 0xcd, 0x31, 0x67, 0x86, 0xeb, 0xdc, 0x47, 0x4c, 0xf8, 0x1d, 0x8f, 0xc4, 0x16, 0x9c, 0x48, 0xb3, + 0x6c, 0xab, 0x50, 0x97, 0xbf, 0x90, 0x69, 0x0e, 0xf1, 0xf8, 0x45, 0xec, 0xf1, 0x38, 0x2c, 0x27, + 0x79, 0x4c, 0x26, 0x96, 0x37, 0xf0, 0x69, 0xdc, 0x84, 0xdf, 0xf6, 0x88, 0x6d, 0xca, 0xf3, 0x54, + 0x62, 0xc3, 0x0f, 0x63, 0x54, 0x62, 0xdb, 0x1e, 0xb3, 0xd0, 0xf3, 0xd8, 0xcd, 0x02, 0x1c, 0xa6, + 0xb9, 0x09, 0x7f, 0xcb, 0x80, 0x63, 0x31, 0xaf, 0x3f, 0xf0, 0x85, 0x34, 0xeb, 0x85, 0xaf, 0x3c, + 0xf9, 0x8b, 0x19, 0x67, 0x11, 0x77, 0x2f, 0x63, 0x77, 0x27, 0xe0, 0x79, 0x9a, 0xbb, 0xc5, 0xc5, + 0xf5, 0x22, 0xb9, 0x26, 0x95, 0x37, 0xdc, 0x63, 0xbc, 0x09, 0x1f, 0xb0, 0x44, 0xf2, 0xa2, 0xbe, + 0x7a, 0xc0, 0x57, 0xd3, 0xf9, 0x15, 0xfb, 0x5a, 0x94, 0x7f, 0xad, 0x73, 0x03, 0x04, 0xe3, 0x6d, + 0x8c, 0xf1, 0x4d, 0x38, 0x97, 0x84, 0x51, 0x34, 0x8c, 0xa2, 0xa8, 0x49, 0x45, 0x2f, 0xc9, 0x16, + 0x9d, 0xa4, 0xdb, 0x44, 0x5c, 0xde, 0x08, 0x37, 0x6b, 0x9b, 0xf0, 0x21, 0x1b, 0x54, 0xaa, 0x22, + 0x45, 0x7f, 0xf8, 0x72, 0x52, 0xb4, 0xd3, 0x5e, 0x56, 0xf2, 0x57, 0x3b, 0x9c, 0x4d, 0xb0, 0xcb, + 0x18, 0x7b, 0x15, 0xde, 0xa1, 0x60, 0x2f, 0xea, 0x4b, 0x45, 0x7c, 0x56, 0x1c, 0x0e, 0x42, 0xd8, + 0xfd, 0xab, 0xf2, 0xa6, 0x77, 0xa0, 0xa2, 0x78, 0xf8, 0x1d, 0x03, 0x8e, 0x46, 0xa8, 0xfd, 0xf0, + 0x7c, 0x92, 0xf7, 0x6d, 0x71, 0x3c, 0x9e, 0x61, 0x06, 0xc1, 0x78, 0x03, 0x63, 0xe4, 0xe1, 0x6b, + 0xd1, 0x18, 0x83, 0x25, 0x33, 0x22, 0x9e, 0x03, 0x08, 0xe1, 0x2f, 0x19, 0x30, 0x18, 0xa5, 0xdd, + 0xc3, 0xf1, 0x14, 0x41, 0x18, 0x4a, 0x72, 0x13, 0x59, 0xa6, 0x10, 0x24, 0x17, 0x31, 0x92, 0x32, + 0x2c, 0x26, 0x45, 0xaa, 0xde, 0x92, 0xe1, 0x3e, 0x60, 0xc1, 0xc9, 0x44, 0x55, 0x1c, 0xbe, 0x42, + 0x71, 0x28, 0xc5, 0xbb, 0x42, 0xfe, 0xd5, 0x8e, 0xe7, 0x13, 0x74, 0x12, 0x46, 0x77, 0x17, 0x7e, + 0x2d, 0x1a, 0x1d, 0x56, 0x80, 0x8b, 0xae, 0x20, 0x1c, 0xd8, 0x21, 0x93, 0x1a, 0x92, 0xed, 0xa1, + 0xf8, 0x57, 0xef, 0x95, 0x28, 0xda, 0x27, 0x78, 0x39, 0x33, 0x0c, 0x8f, 0x80, 0x2f, 0x77, 0x30, + 0x93, 0x40, 0x9f, 0xc2, 0xd0, 0xaf, 0xc2, 0x97, 0xb2, 0x41, 0x6f, 0x8d, 0xce, 0x3f, 0x32, 0x20, + 0x17, 0x27, 0x7d, 0xc2, 0x8b, 0x49, 0xe7, 0x26, 0x52, 0x46, 0xcf, 0x5f, 0xca, 0x3a, 0x8d, 0x00, + 0xe2, 0x31, 0xa0, 0x97, 0xe1, 0x15, 0x5a, 0x5e, 0xc1, 0xca, 0x6a, 0x3c, 0x9e, 0xff, 0x50, 0x64, + 0x7e, 0x22, 0xe5, 0x26, 0x27, 0x4f, 0x9a, 0x0e, 0x9e, 0x9c, 0x3c, 0xa9, 0xfa, 0x31, 0xba, 0x8b, + 0x41, 0xde, 0x82, 0x0b, 0x99, 0x40, 0xe2, 0x12, 0x92, 0x2a, 0x54, 0x7f, 0xc8, 0x92, 0x1b, 0x6b, + 0x2a, 0x51, 0x15, 0x5e, 0xa7, 0xc6, 0x5f, 0x7a, 0xa1, 0x3a, 0x7f, 0x63, 0xfb, 0x86, 0x08, 0x43, + 0x6f, 0x63, 0x86, 0xe6, 0xa1, 0x10, 0xc7, 0x90, 0xba, 0x2a, 0x17, 0xdd, 0xf6, 0x3e, 0x40, 0x51, + 0x3a, 0x76, 0x3e, 0xf7, 0xf4, 0xb7, 0x18, 0xc1, 0x14, 0xd2, 0xce, 0x23, 0x5d, 0x20, 0xce, 0x5f, + 0xe9, 0x64, 0x6a, 0xba, 0xb3, 0xec, 0x00, 0xa9, 0x6b, 0xa2, 0x8a, 0x41, 0xc6, 0x56, 0x9a, 0x4f, + 0xbc, 0x4a, 0x13, 0xd2, 0x4d, 0xa9, 0x95, 0x26, 0x5a, 0xc7, 0xa5, 0x56, 0x9a, 0x18, 0x59, 0x36, + 0xe9, 0xfc, 0xba, 0xa2, 0x59, 0xd1, 0x8d, 0xf0, 0xc5, 0xf5, 0xa2, 0x22, 0x95, 0x37, 0x42, 0x52, + 0xf0, 0x26, 0xfc, 0x4d, 0xa0, 0x5a, 0x06, 0x05, 0xd2, 0xa4, 0x6a, 0x19, 0x21, 0xcb, 0x26, 0x55, + 0xcb, 0x28, 0xfd, 0x15, 0xbd, 0x82, 0x31, 0x5c, 0x86, 0x97, 0xd2, 0x61, 0x68, 0xeb, 0x60, 0x3f, + 0x64, 0xc1, 0xe9, 0x54, 0x62, 0x25, 0xe4, 0xd3, 0x31, 0x4c, 0x3d, 0x74, 0x53, 0xdb, 0xb2, 0x91, + 0x2e, 0x23, 0xc5, 0x40, 0x2e, 0x06, 0x5b, 0x20, 0x6a, 0x3f, 0xfb, 0x7b, 0x16, 0x5c, 0xe8, 0x40, + 0x6c, 0x84, 0xb3, 0x29, 0xcf, 0x53, 0x6a, 0x9d, 0x35, 0x3f, 0xb7, 0x83, 0x16, 0x09, 0x79, 0x0a, + 0x26, 0xaf, 0x06, 0xc5, 0xe4, 0x3e, 0x71, 0x21, 0xcc, 0xa0, 0x93, 0xd3, 0x5b, 0xcd, 0x52, 0x79, + 0xfc, 0x97, 0xf7, 0xdf, 0x03, 0x50, 0x5d, 0xa5, 0x5e, 0x8e, 0xd2, 0xa8, 0xa3, 0xd4, 0xcb, 0x51, + 0x2a, 0x19, 0x34, 0x4d, 0x36, 0x8b, 0x23, 0xc5, 0x3f, 0x49, 0xdf, 0x63, 0x13, 0xa5, 0xd7, 0x80, + 0x12, 0x45, 0x2d, 0x64, 0x59, 0xb4, 0x4f, 0x6a, 0x21, 0xcb, 0x24, 0x5e, 0xa2, 0xb7, 0x30, 0x0d, + 0x37, 0xe1, 0x4c, 0x06, 0x1a, 0xdc, 0x3b, 0x13, 0xae, 0xf6, 0x1e, 0x21, 0xde, 0x0d, 0xc9, 0x23, + 0x66, 0x8b, 0x4d, 0x14, 0xef, 0x69, 0x12, 0x1d, 0xbc, 0xb5, 0x5d, 0x80, 0x71, 0x62, 0x66, 0xfe, + 0xf6, 0x2e, 0x58, 0x26, 0x5c, 0x6a, 0x98, 0xcb, 0x7b, 0x70, 0x29, 0x33, 0x97, 0xd1, 0xf9, 0x2a, + 0x44, 0x6a, 0xe8, 0xbc, 0xe1, 0x5b, 0xdb, 0xd1, 0x08, 0x29, 0x91, 0x7a, 0xf9, 0x8c, 0x54, 0x2f, + 0xa9, 0x97, 0xcf, 0x68, 0x9d, 0x32, 0x49, 0x40, 0xb1, 0xd6, 0xd4, 0x40, 0xff, 0x23, 0x1a, 0x46, + 0x13, 0x06, 0x3f, 0xf7, 0xf8, 0x1f, 0x85, 0xae, 0x9f, 0x6e, 0x15, 0xba, 0x1e, 0x6f, 0x15, 0x98, + 0x4f, 0xb7, 0x0a, 0xcc, 0xdf, 0xb7, 0x0a, 0xcc, 0x87, 0x4f, 0x0a, 0x5d, 0x9f, 0x3e, 0x29, 0x74, + 0xfd, 0xed, 0x49, 0xa1, 0xeb, 0xed, 0x72, 0xcb, 0x1b, 0xb9, 0x63, 0xbd, 0xa8, 0x2f, 0x2d, 0x29, + 0x35, 0x45, 0x54, 0xbd, 0xd5, 0xbc, 0xf5, 0xf0, 0x83, 0xf9, 0x62, 0x2f, 0xfe, 0x1f, 0x39, 0x2e, + 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x0c, 0x03, 0xf4, 0x84, 0x32, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2009,6 +2088,7 @@ const _ = grpc.SupportPackageIsVersion4 type QueryClient interface { QueryVault(ctx context.Context, in *QueryVaultRequest, opts ...grpc.CallOption) (*QueryVaultResponse, error) QueryVaultInfo(ctx context.Context, in *QueryVaultInfoRequest, opts ...grpc.CallOption) (*QueryVaultInfoResponse, error) + QueryVaultInfoByOwner(ctx context.Context, in *QueryVaultInfoByOwnerRequest, opts ...grpc.CallOption) (*QueryVaultInfoByOwnerResponse, error) QueryAllVaults(ctx context.Context, in *QueryAllVaultsRequest, opts ...grpc.CallOption) (*QueryAllVaultsResponse, error) QueryAllVaultsByProduct(ctx context.Context, in *QueryAllVaultsByProductRequest, opts ...grpc.CallOption) (*QueryAllVaultsByProductResponse, error) QueryAllVaultsByAppAndExtendedPair(ctx context.Context, in *QueryAllVaultsByAppAndExtendedPairRequest, opts ...grpc.CallOption) (*QueryAllVaultsByAppAndExtendedPairResponse, error) @@ -2057,6 +2137,15 @@ func (c *queryClient) QueryVaultInfo(ctx context.Context, in *QueryVaultInfoRequ return out, nil } +func (c *queryClient) QueryVaultInfoByOwner(ctx context.Context, in *QueryVaultInfoByOwnerRequest, opts ...grpc.CallOption) (*QueryVaultInfoByOwnerResponse, error) { + out := new(QueryVaultInfoByOwnerResponse) + err := c.cc.Invoke(ctx, "/comdex.vault.v1beta1.Query/QueryVaultInfoByOwner", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *queryClient) QueryAllVaults(ctx context.Context, in *QueryAllVaultsRequest, opts ...grpc.CallOption) (*QueryAllVaultsResponse, error) { out := new(QueryAllVaultsResponse) err := c.cc.Invoke(ctx, "/comdex.vault.v1beta1.Query/QueryAllVaults", in, out, opts...) @@ -2241,6 +2330,7 @@ func (c *queryClient) QueryTVLlockedByApp(ctx context.Context, in *QueryTVLlocke type QueryServer interface { QueryVault(context.Context, *QueryVaultRequest) (*QueryVaultResponse, error) QueryVaultInfo(context.Context, *QueryVaultInfoRequest) (*QueryVaultInfoResponse, error) + QueryVaultInfoByOwner(context.Context, *QueryVaultInfoByOwnerRequest) (*QueryVaultInfoByOwnerResponse, error) QueryAllVaults(context.Context, *QueryAllVaultsRequest) (*QueryAllVaultsResponse, error) QueryAllVaultsByProduct(context.Context, *QueryAllVaultsByProductRequest) (*QueryAllVaultsByProductResponse, error) QueryAllVaultsByAppAndExtendedPair(context.Context, *QueryAllVaultsByAppAndExtendedPairRequest) (*QueryAllVaultsByAppAndExtendedPairResponse, error) @@ -2273,6 +2363,9 @@ func (*UnimplementedQueryServer) QueryVault(ctx context.Context, req *QueryVault func (*UnimplementedQueryServer) QueryVaultInfo(ctx context.Context, req *QueryVaultInfoRequest) (*QueryVaultInfoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryVaultInfo not implemented") } +func (*UnimplementedQueryServer) QueryVaultInfoByOwner(ctx context.Context, req *QueryVaultInfoByOwnerRequest) (*QueryVaultInfoByOwnerResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryVaultInfoByOwner not implemented") +} func (*UnimplementedQueryServer) QueryAllVaults(ctx context.Context, req *QueryAllVaultsRequest) (*QueryAllVaultsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryAllVaults not implemented") } @@ -2374,6 +2467,24 @@ func _Query_QueryVaultInfo_Handler(srv interface{}, ctx context.Context, dec fun return interceptor(ctx, in, info, handler) } +func _Query_QueryVaultInfoByOwner_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryVaultInfoByOwnerRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).QueryVaultInfoByOwner(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/comdex.vault.v1beta1.Query/QueryVaultInfoByOwner", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).QueryVaultInfoByOwner(ctx, req.(*QueryVaultInfoByOwnerRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Query_QueryAllVaults_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllVaultsRequest) if err := dec(in); err != nil { @@ -2746,6 +2857,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "QueryVaultInfo", Handler: _Query_QueryVaultInfo_Handler, }, + { + MethodName: "QueryVaultInfoByOwner", + Handler: _Query_QueryVaultInfoByOwner_Handler, + }, { MethodName: "QueryAllVaults", Handler: _Query_QueryAllVaults_Handler, @@ -3029,6 +3144,73 @@ func (m *QueryVaultInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +func (m *QueryVaultInfoByOwnerRequest) 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 *QueryVaultInfoByOwnerRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryVaultInfoByOwnerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryVaultInfoByOwnerResponse) 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 *QueryVaultInfoByOwnerResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryVaultInfoByOwnerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.VaultsInfo) > 0 { + for iNdEx := len(m.VaultsInfo) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.VaultsInfo[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *QueryAllVaultsRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4588,6 +4770,34 @@ func (m *QueryVaultInfoResponse) Size() (n int) { return n } +func (m *QueryVaultInfoByOwnerRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryVaultInfoByOwnerResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.VaultsInfo) > 0 { + for _, e := range m.VaultsInfo { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + func (m *QueryAllVaultsRequest) Size() (n int) { if m == nil { return 0 @@ -5765,6 +5975,172 @@ func (m *QueryVaultInfoResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryVaultInfoByOwnerRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryVaultInfoByOwnerRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryVaultInfoByOwnerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + 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 ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryVaultInfoByOwnerResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryVaultInfoByOwnerResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryVaultInfoByOwnerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VaultsInfo", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VaultsInfo = append(m.VaultsInfo, VaultInfo{}) + if err := m.VaultsInfo[len(m.VaultsInfo)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *QueryAllVaultsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -9570,7 +9946,7 @@ func (m *QueryTVLlockedByAppResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Tvldata = append(m.Tvldata, &TvlLockedDataMap{}) + m.Tvldata = append(m.Tvldata, TvlLockedDataMap{}) if err := m.Tvldata[len(m.Tvldata)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/vault/types/query.pb.gw.go b/x/vault/types/query.pb.gw.go index cfcc6a73f..d09c955c3 100644 --- a/x/vault/types/query.pb.gw.go +++ b/x/vault/types/query.pb.gw.go @@ -141,6 +141,60 @@ func local_request_Query_QueryVaultInfo_0(ctx context.Context, marshaler runtime } +func request_Query_QueryVaultInfoByOwner_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryVaultInfoByOwnerRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["owner"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") + } + + protoReq.Owner, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) + } + + msg, err := client.QueryVaultInfoByOwner(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_QueryVaultInfoByOwner_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryVaultInfoByOwnerRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["owner"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner") + } + + protoReq.Owner, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner", err) + } + + msg, err := server.QueryVaultInfoByOwner(ctx, &protoReq) + return msg, metadata, err + +} + var ( filter_Query_QueryAllVaults_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) @@ -1677,6 +1731,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_QueryVaultInfoByOwner_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_QueryVaultInfoByOwner_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryVaultInfoByOwner_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_QueryAllVaults_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -2218,6 +2295,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_QueryVaultInfoByOwner_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_QueryVaultInfoByOwner_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryVaultInfoByOwner_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_QueryAllVaults_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -2626,6 +2723,8 @@ var ( pattern_Query_QueryVaultInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"comdex", "vault", "v1beta1", "vaultsInfo", "id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_QueryVaultInfoByOwner_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"comdex", "vault", "v1beta1", "vaultsInfoByOwner", "owner"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_QueryAllVaults_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"comdex", "vault", "v1beta1", "vaults"}, "", runtime.AssumeColonVerbOpt(true))) pattern_Query_QueryAllVaultsByProduct_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"comdex", "vault", "v1beta1", "vaults-by-product", "app_id"}, "", runtime.AssumeColonVerbOpt(true))) @@ -2672,6 +2771,8 @@ var ( forward_Query_QueryVaultInfo_0 = runtime.ForwardResponseMessage + forward_Query_QueryVaultInfoByOwner_0 = runtime.ForwardResponseMessage + forward_Query_QueryAllVaults_0 = runtime.ForwardResponseMessage forward_Query_QueryAllVaultsByProduct_0 = runtime.ForwardResponseMessage