Sprint 1.14

.github/workflows/ci.yml

@@ -38,12 +38,12 @@ jobs:
           sudo apt-get -y install build-essential nghttp2 libnghttp2-dev libssl-dev
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.57.1
           skip-build-cache: true
           skip-pkg-cache: true
           only-new-issues: true

go.mod

@@ -2,9 +2,11 @@ module github.com/0chain/system_test
 
 go 1.21
 
+toolchain go1.22.1
+
 require (
 	github.com/0chain/errors v1.0.3
-	github.com/0chain/gosdk v1.13.6
+	github.com/0chain/gosdk v1.14.0-RC2
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/herumi/bls-go-binary v1.31.0
 	github.com/shopspring/decimal v1.3.1

go.sum

@@ -40,8 +40,10 @@ github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 h1:z+DtCR8mBsjPnEs
 github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565/go.mod h1:UyDC8Qyl5z9lGkCnf9RHJPMektnFX8XtCJZHXCCVj8E=
 github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
 github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
-github.com/0chain/gosdk v1.13.6 h1:uPd3Hp63bk8utVzIxZnYl981/SsblTwIHMBJ+Le9CwU=
-github.com/0chain/gosdk v1.13.6/go.mod h1:tgAiVAuIy+Vs1tGfKCPEuuWWARwNQBEw32y950LrqrU=
+github.com/0chain/gosdk v1.14.0-RC1.0.20240415100519-3195fb50d00e h1:aMMZkBlV4Kcy8ITxAhkCADUxt+BEYM20szqqVkv/7uI=
+github.com/0chain/gosdk v1.14.0-RC1.0.20240415100519-3195fb50d00e/go.mod h1:tgAiVAuIy+Vs1tGfKCPEuuWWARwNQBEw32y950LrqrU=
+github.com/0chain/gosdk v1.14.0-RC2 h1:OIpjj7mDKxVqJVlxJKm8/fPzdJRN5roXO7/plBCtmTg=
+github.com/0chain/gosdk v1.14.0-RC2/go.mod h1:tgAiVAuIy+Vs1tGfKCPEuuWWARwNQBEw32y950LrqrU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Luzifer/go-openssl/v3 v3.1.0 h1:QqKqo6kYXGGUsvtUoCpRZm8lHw+jDfhbzr36gVj+/gw=

internal/api/model/api.go

@@ -487,7 +487,8 @@ type ChallengeTiming struct {
 }
 
 type SCRestGetAllocationBlobbersResponse struct {
-	Blobbers *[]string `json:"blobbers"`
+	Blobbers           *[]string `json:"blobbers"`
+	BlobberAuthTickets []string  `json:"blobber_auth_tickets"`
 	BlobberRequirements
 }
 
@@ -541,6 +542,7 @@ type UpdateAllocationRequest struct {
 	Extend               bool   `json:"extend"`
 	SetImmutable         bool   `json:"set_immutable"`
 	AddBlobberId         string `json:"add_blobber_id"`
+	AddBlobberAuthTicket string `json:"add_blobber_auth_ticket"`
 	RemoveBlobberId      string `json:"remove_blobber_id"`
 	ThirdPartyExtendable bool   `json:"third_party_extendable"`
 	FileOptionsChanged   bool   `json:"file_options_changed"`

internal/api/model/zbox.go

@@ -24,6 +24,11 @@ type CSRFToken struct {
 	CSRFToken string `json:"csrf_token"`
 }
 
+type ZboxOwner struct {
+	PhoneNumber string `json:"phone_number"`
+	UserName    string `json:"username"`
+}
+
 type ZboxWallet struct {
 	ClientID    string           `json:"client_id"`
 	WalletId    int              `json:"wallet_id"`
@@ -61,8 +66,8 @@ type ZboxFreeStorageMarkerResponse struct {
 	RecipientPublicKey string `json:"recipient_public_key"`
 }
 type ZboxResourceExist struct {
-	Exist *bool   `json:"exist"`
-	Error *string `json:"error"`
+	Exists bool   `json:"exists"`
+	Field  string `json:"field"`
 }
 
 type ZboxFCMResponse struct {
@@ -85,6 +90,17 @@ type MessageContainer struct {
 	Message string `json:"message"`
 }
 
+type AllocResponse struct {
+	ID               string  `json:"id"`
+	WalletID         int64   `json:"wallet_id"`
+	Name             *string `json:"name"`
+	Description      *string `json:"description"`
+	AllocationType   string  `json:"allocation_type"`
+	BlobbersReplaced int64   `json:"blobbers_replaced"`
+	AppType          string  `json:"app_type"`
+	UpdateAt         string  `json:"last_update"`
+}
+
 type ZboxWalletList struct {
 	MessageContainer
 	Data []ZboxWallet `json:"data"`
@@ -95,10 +111,6 @@ type ZboxAllocationList struct {
 	Allocs     []ZboxAllocation `json:"allocs"`
 }
 
-type ZboxWalletArr []struct {
-	*ZboxWallet
-}
-
 type DexState struct {
 	TxHash    string `form:"tx_hash" json:"tx_hash" binding:"-"`
 	Stage     string `form:"stage" json:"stage" binding:"required"`
@@ -144,14 +156,11 @@ type ZboxGraphChallengesResponse struct {
 type ZboxShareInfo struct {
 	AuthTicket string `json:"auth_ticket"` // FIXME: THIS IS INCONSISTENT WITH THE SPELLING OF "USERNAME"
 	Message    string `json:"message"`
-	FromInfo   string `json:"from_info"`
 	ClientID   string `json:"client_id"`
-	Receiver   string `json:"Receiver"`
+	Receiver   string `json:"receiver_client_id"`
 	LookUpHash string `json:"lookup_hash"`
 	CreatedAt  string `json:"CreatedAt"`
 	UpdatedAt  string `json:"UpdatedAt"`
-	AppType    int    `json:"app_type"`
-	// [FIXME] need string for app type. Sanchit is working o this.
 }
 
 type ZboxShareInfoList struct {
@@ -189,30 +198,31 @@ type ZboxNftCollectionList struct {
 }
 
 type ReferralCodeOfUser struct {
-	ReferrerCode  string `json:"referral_code"`
-	ReferrerLink  string `json:"referral_link"`
-	ReferrerPhone string `json:"referer_mail"`
+	ReferrerCode string `json:"referral_code"`
+	ReferrerLink string `json:"referral_link"`
 }
 
-type ReferralCountOfUser struct {
-	ReferralCount int64 `json:"referral_count"`
-	RewardPoints  int64 `json:"reward_points"`
+type ReferralCount struct {
+	ReferralCount int64  `json:"referral_count"`
+	RewardPoints  int64  `json:"reward_points"`
+	TotalRewards  uint64 `json:"total_rewards"`
 }
 
-type TopUser struct {
-	Score int64 `json:"score"`
-	Rank  int64 `json:"rank"`
+type TopReferrer struct {
+	Referrer     string `json:"referrer"`
+	ReferrerName string `json:"referrer_name"`
+	Count        int    `json:"count"`
+	Avatar       []byte `json:"avatar"`
 }
 
-type ReferralLeaderBoard struct {
-	Users []TopUser `json:"users"`
-	Total int64     `json:"total"`
+type TopReferrerResponse struct {
+	TopUsers []TopReferrer `json:"top_users"`
 }
 
 type ReferralRankOfUser struct {
-	UserRank  int64  `json:"rank"`
-	UserScore int64  `json:"score"`
-	UserPhone string `json:"phone"`
+	UserRank   int64 `json:"rank"`
+	UserCount  int64 `json:"count"`
+	ReferrerID int64 `json:"referrer_id"`
 }
 
 type ZboxNft struct {

internal/api/util/client/api_client.go

@@ -713,6 +713,9 @@ func (c *APIClient) V1SCRestGetAllocationBlobbers(t *test.SystemTest, scRestGetA
 		SharderServiceProvider)
 
 	scRestGetAllocationBlobbersResponse.Blobbers = blobbers
+	for range *blobbers {
+		scRestGetAllocationBlobbersResponse.BlobberAuthTickets = append(scRestGetAllocationBlobbersResponse.BlobberAuthTickets, "")
+	}
 	scRestGetAllocationBlobbersResponse.BlobberRequirements = scRestGetAllocationBlobbersRequest.BlobberRequirements
 
 	return scRestGetAllocationBlobbersResponse, resp, err

internal/api/util/client/http_client.go

@@ -47,7 +47,7 @@ func (c *BaseHttpClient) executeForServiceProvider(t *test.SystemTest, url strin
 	case HttpGETMethod:
 		resp, err = c.HttpClient.R().SetHeaders(executionRequest.Headers).SetQueryParams(executionRequest.QueryParams).Get(url)
 	case HttpDELETEMethod:
-		resp, err = c.HttpClient.R().SetHeaders(executionRequest.Headers).SetFormData(executionRequest.FormData).SetBody(executionRequest.Body).Delete(url)
+		resp, err = c.HttpClient.R().SetHeaders(executionRequest.Headers).SetFormData(executionRequest.FormData).SetQueryParams(executionRequest.QueryParams).SetBody(executionRequest.Body).Delete(url)
 	}
 
 	if err != nil {

internal/api/util/client/sdk.go

@@ -237,7 +237,7 @@ func (c *SDKClient) AddUploadOperation(t *test.SystemTest, path, format string,
 	require.NoError(t, err)
 
 	remoteName := filepath.Base(path)
-	remotePath := "/" + filepath.Join("", filepath.Base(path))
+	remotePath := "/" + filepath.Join(filepath.Dir(path), filepath.Base(path))
 	if path == "" {
 		remoteName = filepath.Base(tmpFile.Name())
 		remotePath = "/" + filepath.Join("", filepath.Base(tmpFile.Name()))