From af815a9739a707c99bf3d72ed49f70021ac0d622 Mon Sep 17 00:00:00 2001 From: Jayash Date: Tue, 28 May 2024 20:53:43 +0530 Subject: [PATCH 1/3] Reset blobber stats --- zboxcore/sdk/sdk.go | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/zboxcore/sdk/sdk.go b/zboxcore/sdk/sdk.go index 102a9191b..59e36adce 100644 --- a/zboxcore/sdk/sdk.go +++ b/zboxcore/sdk/sdk.go @@ -662,14 +662,29 @@ type UpdateBlobber struct { IsRestricted *bool `json:"is_restricted,omitempty"` } -type ResetBlobberStatsDto struct { - BlobberID string `json:"blobber_id"` - PrevAllocated int64 `json:"prev_allocated"` - PrevSavedData int64 `json:"prev_saved_data"` - NewAllocated int64 `json:"new_allocated"` - NewSavedData int64 `json:"new_saved_data"` +type ResetBlobberStatsV2Dto struct { + AllocatedUpdates BlobberAllocatedUpdates `json:"allocated_updates"` + SavedDataUpdates BlobberSavedDataUpdates `json:"saved_data_updates"` + TotalOffersUpdates BlobberTotalOffersUpdates `json:"total_offers_updates"` } +type BlobberAllocatedUpdates struct { + BlobberIds []string `json:"blobber_ids"` + PrevAllocated []int64 `json:"prev_allocated"` + NewAllocated []int64 `json:"new_allocated"` +} + +type BlobberSavedDataUpdates struct { + BlobberIds []string `json:"blobber_ids"` + PrevSavedData []int64 `json:"prev_saved_data"` + NewSavedData []int64 `json:"new_saved_data"` +} + +type BlobberTotalOffersUpdates struct { + BlobberIds []string `json:"blobber_ids"` + PrevTotalOffers []currency.Coin `json:"prev_total_offers"` + NewTotalOffers []currency.Coin `json:"new_total_offers"` +} type Validator struct { ID common.Key `json:"validator_id"` BaseURL string `json:"url"` @@ -1484,7 +1499,7 @@ func UpdateValidatorSettings(v *UpdateValidator) (resp string, nonce int64, err return } -func ResetBlobberStats(rbs *ResetBlobberStatsDto) (string, int64, error) { +func ResetBlobberStats(rbs *ResetBlobberStatsV2Dto) (string, int64, error) { if !sdkInitialized { return "", 0, sdkNotInitialized } From fb99ed899b1c15c3b61c74b3d8194f1834472639 Mon Sep 17 00:00:00 2001 From: Jayash Date: Wed, 29 May 2024 00:28:25 +0530 Subject: [PATCH 2/3] Reset blobber stats --- zboxcore/sdk/sdk.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zboxcore/sdk/sdk.go b/zboxcore/sdk/sdk.go index 59e36adce..7f1b46967 100644 --- a/zboxcore/sdk/sdk.go +++ b/zboxcore/sdk/sdk.go @@ -662,10 +662,10 @@ type UpdateBlobber struct { IsRestricted *bool `json:"is_restricted,omitempty"` } -type ResetBlobberStatsV2Dto struct { - AllocatedUpdates BlobberAllocatedUpdates `json:"allocated_updates"` - SavedDataUpdates BlobberSavedDataUpdates `json:"saved_data_updates"` - TotalOffersUpdates BlobberTotalOffersUpdates `json:"total_offers_updates"` +type ResetBlobberStatsDto struct { + BlobberID string `json:"blobber_id"` + PrevTotalOffers currency.Coin `json:"prev_total_offers"` + NewTotalOffers currency.Coin `json:"new_total_offers"` } type BlobberAllocatedUpdates struct { @@ -1499,7 +1499,7 @@ func UpdateValidatorSettings(v *UpdateValidator) (resp string, nonce int64, err return } -func ResetBlobberStats(rbs *ResetBlobberStatsV2Dto) (string, int64, error) { +func ResetBlobberStats(rbs *ResetBlobberStatsDto) (string, int64, error) { if !sdkInitialized { return "", 0, sdkNotInitialized } From 6c78afebf4642d7c4f8cfecd4c5400d5a6877a62 Mon Sep 17 00:00:00 2001 From: Jayash Date: Fri, 31 May 2024 01:23:22 +0530 Subject: [PATCH 3/3] Fix --- zboxcore/sdk/sdk.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/zboxcore/sdk/sdk.go b/zboxcore/sdk/sdk.go index 7f1b46967..90eafbe36 100644 --- a/zboxcore/sdk/sdk.go +++ b/zboxcore/sdk/sdk.go @@ -668,23 +668,6 @@ type ResetBlobberStatsDto struct { NewTotalOffers currency.Coin `json:"new_total_offers"` } -type BlobberAllocatedUpdates struct { - BlobberIds []string `json:"blobber_ids"` - PrevAllocated []int64 `json:"prev_allocated"` - NewAllocated []int64 `json:"new_allocated"` -} - -type BlobberSavedDataUpdates struct { - BlobberIds []string `json:"blobber_ids"` - PrevSavedData []int64 `json:"prev_saved_data"` - NewSavedData []int64 `json:"new_saved_data"` -} - -type BlobberTotalOffersUpdates struct { - BlobberIds []string `json:"blobber_ids"` - PrevTotalOffers []currency.Coin `json:"prev_total_offers"` - NewTotalOffers []currency.Coin `json:"new_total_offers"` -} type Validator struct { ID common.Key `json:"validator_id"` BaseURL string `json:"url"`