change the jetton score field to required

tonkeeper · Jan 9, 2025 · 32316d9 · 32316d9
1 parent 026cfba
commit 32316d9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 60 deletions.
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