Merge remote-tracking branch 'origin/update_jettons_score'

mr-tron · mr-tron · commit ab20e622d19f · 2025-01-10T17:20:32.000+03:00
diff --git a/api/openapi.json b/api/openapi.json
@@ -3821,10 +3821,6 @@
       "example": "https://cache.tonapi.io/images/jetton.jpg",
       "type": "string"
      },
-     "score": {
-      "format": "int32",
-      "type": "integer"
-     },
      "total_supply": {
       "example": "5887105890579978",
       "type": "string",
@@ -3983,7 +3979,8 @@
      "symbol",
      "decimals",
      "verification",
-     "image"
+     "image",
+     "score"
     ],
     "type": "object"
    },
diff --git a/api/openapi.yml b/api/openapi.yml
@@ -5415,6 +5415,7 @@ components:
         - decimals
         - verification
         - image
+        - score
       properties:
         address:
           type: string
@@ -7050,9 +7051,6 @@ components:
           type: integer
           format: int32
           example: 2000
-        score:
-          type: integer
-          format: int32
     JettonHolders:
       type: object
       required:
diff --git a/pkg/api/jetton_converters.go b/pkg/api/jetton_converters.go
@@ -23,13 +23,11 @@ func jettonPreview(master ton.AccountID, meta NormalizedMetadata, score int32) o
 		Verification: oas.JettonVerificationType(meta.Verification),
 		Decimals:     meta.Decimals,
 		Image:        meta.PreviewImage,
+		Score:        score,
 	}
 	if meta.CustomPayloadApiUri != "" {
 		preview.CustomPayloadAPIURI = oas.NewOptString(meta.CustomPayloadApiUri)
 	}
-	if score != 0 {
-		preview.Score = oas.NewOptInt32(score)
-	}
 	return preview
 }
 
@@ -172,7 +170,7 @@ func (h *Handler) convertJettonBalance(ctx context.Context, wallet core.JettonWa
 	return jettonBalance, nil
 }
 
-func (h *Handler) convertJettonInfo(ctx context.Context, master core.JettonMaster, holders map[tongo.AccountID]int32, score int32) oas.JettonInfo {
+func (h *Handler) convertJettonInfo(ctx context.Context, master core.JettonMaster, holders map[tongo.AccountID]int32) oas.JettonInfo {
 	meta := h.GetJettonNormalizedMetadata(ctx, master.Address)
 	metadata := jettonMetadata(master.Address, meta)
 	info := oas.JettonInfo{
@@ -184,8 +182,5 @@ func (h *Handler) convertJettonInfo(ctx context.Context, master core.JettonMaste
 		Admin:        convertOptAccountAddress(master.Admin, h.addressBook),
 		Preview:      meta.PreviewImage,
 	}
-	if score != 0 {
-		info.Score = oas.NewOptInt32(score)
-	}
 	return info
 }
diff --git a/pkg/api/jetton_handlers.go b/pkg/api/jetton_handlers.go
@@ -82,8 +82,7 @@ func (h *Handler) GetJettonInfo(ctx context.Context, params oas.GetJettonInfoPar
 	if err != nil {
 		return nil, toError(http.StatusInternalServerError, err)
 	}
-	score, _ := h.score.GetJettonScore(account.ID)
-	converted := h.convertJettonInfo(ctx, master, holders, score)
+	converted := h.convertJettonInfo(ctx, master, holders)
 	return &converted, nil
 }
 
@@ -155,8 +154,7 @@ func (h *Handler) GetJettons(ctx context.Context, params oas.GetJettonsParams) (
 	}
 	results := make([]oas.JettonInfo, len(jettons))
 	for idx, master := range jettons {
-		score, _ := h.score.GetJettonScore(master.Address)
-		results[idx] = h.convertJettonInfo(ctx, master, holders, score)
+		results[idx] = h.convertJettonInfo(ctx, master, holders)
 	}
 	return &oas.Jettons{Jettons: results}, nil
 }
@@ -287,8 +285,7 @@ func (h *Handler) GetJettonInfosByAddresses(ctx context.Context, request oas.Opt
 	}
 	results := make([]oas.JettonInfo, len(jettons))
 	for idx, master := range jettons {
-		score, _ := h.score.GetJettonScore(master.Address)
-		results[idx] = h.convertJettonInfo(ctx, master, jettonsHolders, score)
+		results[idx] = h.convertJettonInfo(ctx, master, jettonsHolders)
 	}
 
 	return &oas.Jettons{Jettons: results}, nil
diff --git a/pkg/oas/oas_json_gen.go b/pkg/oas/oas_json_gen.go
diff --git a/pkg/oas/oas_schemas_gen.go b/pkg/oas/oas_schemas_gen.go

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,11 @@ func jettonPreview(master ton.AccountID, meta NormalizedMetadata, score int32) o`
`23`	`23`	`Verification: oas.JettonVerificationType(meta.Verification),`
`24`	`24`	`Decimals: meta.Decimals,`
`25`	`25`	`Image: meta.PreviewImage,`
	`26`	`+ Score: score,`
`26`	`27`	`}`
`27`	`28`	`if meta.CustomPayloadApiUri != "" {`
`28`	`29`	`preview.CustomPayloadAPIURI = oas.NewOptString(meta.CustomPayloadApiUri)`
`29`	`30`	`}`
`30`		`- if score != 0 {`
`31`		`- preview.Score = oas.NewOptInt32(score)`
`32`		`- }`
`33`	`31`	`return preview`
`34`	`32`	`}`
`35`	`33`
`@@ -172,7 +170,7 @@ func (h *Handler) convertJettonBalance(ctx context.Context, wallet core.JettonWa`
`172`	`170`	`return jettonBalance, nil`
`173`	`171`	`}`
`174`	`172`
`175`		`-func (h *Handler) convertJettonInfo(ctx context.Context, master core.JettonMaster, holders map[tongo.AccountID]int32, score int32) oas.JettonInfo {`
	`173`	`+func (h *Handler) convertJettonInfo(ctx context.Context, master core.JettonMaster, holders map[tongo.AccountID]int32) oas.JettonInfo {`
`176`	`174`	`meta := h.GetJettonNormalizedMetadata(ctx, master.Address)`
`177`	`175`	`metadata := jettonMetadata(master.Address, meta)`
`178`	`176`	`info := oas.JettonInfo{`
`@@ -184,8 +182,5 @@ func (h *Handler) convertJettonInfo(ctx context.Context, master core.JettonMaste`
`184`	`182`	`Admin: convertOptAccountAddress(master.Admin, h.addressBook),`
`185`	`183`	`Preview: meta.PreviewImage,`
`186`	`184`	`}`
`187`		`- if score != 0 {`
`188`		`- info.Score = oas.NewOptInt32(score)`
`189`		`- }`
`190`	`185`	`return info`
`191`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,7 @@ func (h *Handler) GetJettonInfo(ctx context.Context, params oas.GetJettonInfoPar`
`82`	`82`	`if err != nil {`
`83`	`83`	`return nil, toError(http.StatusInternalServerError, err)`
`84`	`84`	`}`
`85`		`- score, _ := h.score.GetJettonScore(account.ID)`
`86`		`- converted := h.convertJettonInfo(ctx, master, holders, score)`
	`85`	`+ converted := h.convertJettonInfo(ctx, master, holders)`
`87`	`86`	`return &converted, nil`
`88`	`87`	`}`
`89`	`88`
`@@ -155,8 +154,7 @@ func (h *Handler) GetJettons(ctx context.Context, params oas.GetJettonsParams) (`
`155`	`154`	`}`
`156`	`155`	`results := make([]oas.JettonInfo, len(jettons))`
`157`	`156`	`for idx, master := range jettons {`
`158`		`- score, _ := h.score.GetJettonScore(master.Address)`
`159`		`- results[idx] = h.convertJettonInfo(ctx, master, holders, score)`
	`157`	`+ results[idx] = h.convertJettonInfo(ctx, master, holders)`
`160`	`158`	`}`
`161`	`159`	`return &oas.Jettons{Jettons: results}, nil`
`162`	`160`	`}`
`@@ -287,8 +285,7 @@ func (h *Handler) GetJettonInfosByAddresses(ctx context.Context, request oas.Opt`
`287`	`285`	`}`
`288`	`286`	`results := make([]oas.JettonInfo, len(jettons))`
`289`	`287`	`for idx, master := range jettons {`
`290`		`- score, _ := h.score.GetJettonScore(master.Address)`
`291`		`- results[idx] = h.convertJettonInfo(ctx, master, jettonsHolders, score)`
	`288`	`+ results[idx] = h.convertJettonInfo(ctx, master, jettonsHolders)`
`292`	`289`	`}`
`293`	`290`
`294`	`291`	`return &oas.Jettons{Jettons: results}, nil`