From 32316d9e01e3c52f902d85c9d038982a1314e3bb Mon Sep 17 00:00:00 2001 From: Zakhar Petukhov Date: Thu, 9 Jan 2025 12:33:03 +0800 Subject: [PATCH] change the jetton score field to required --- api/openapi.json | 7 ++----- api/openapi.yml | 4 +--- pkg/api/jetton_converters.go | 9 ++------- pkg/api/jetton_handlers.go | 9 +++------ pkg/oas/oas_json_gen.go | 33 ++++++++------------------------- pkg/oas/oas_schemas_gen.go | 17 +++-------------- 6 files changed, 19 insertions(+), 60 deletions(-) diff --git a/api/openapi.json b/api/openapi.json index e3edc0d2..ade86fe7 100644 --- 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 index 053d5ea3..7b595b6b 100644 --- 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 index d3d26963..613cfe85 100644 --- 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 index 3f813082..52301254 100644 --- 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 index e6c33009..98ccbb42 100644 --- a/pkg/oas/oas_json_gen.go +++ b/pkg/oas/oas_json_gen.go @@ -24057,15 +24057,9 @@ func (s *JettonInfo) encodeFields(e *jx.Encoder) { e.FieldStart("holders_count") e.Int32(s.HoldersCount) } - { - if s.Score.Set { - e.FieldStart("score") - s.Score.Encode(e) - } - } } -var jsonFieldsNameOfJettonInfo = [8]string{ +var jsonFieldsNameOfJettonInfo = [7]string{ 0: "mintable", 1: "total_supply", 2: "admin", @@ -24073,7 +24067,6 @@ var jsonFieldsNameOfJettonInfo = [8]string{ 4: "preview", 5: "verification", 6: "holders_count", - 7: "score", } // Decode decodes JettonInfo from json. @@ -24163,16 +24156,6 @@ func (s *JettonInfo) Decode(d *jx.Decoder) error { }(); err != nil { return errors.Wrap(err, "decode field \"holders_count\"") } - case "score": - if err := func() error { - s.Score.Reset() - if err := s.Score.Decode(d); err != nil { - return err - } - return nil - }(); err != nil { - return errors.Wrap(err, "decode field \"score\"") - } default: return d.Skip() } @@ -24701,10 +24684,8 @@ func (s *JettonPreview) encodeFields(e *jx.Encoder) { } } { - if s.Score.Set { - e.FieldStart("score") - s.Score.Encode(e) - } + e.FieldStart("score") + e.Int32(s.Score) } } @@ -24809,9 +24790,11 @@ func (s *JettonPreview) Decode(d *jx.Decoder) error { return errors.Wrap(err, "decode field \"custom_payload_api_uri\"") } case "score": + requiredBitSet[0] |= 1 << 7 if err := func() error { - s.Score.Reset() - if err := s.Score.Decode(d); err != nil { + v, err := d.Int32() + s.Score = int32(v) + if err != nil { return err } return nil @@ -24828,7 +24811,7 @@ func (s *JettonPreview) Decode(d *jx.Decoder) error { // Validate required fields. var failures []validate.FieldError for i, mask := range [1]uint8{ - 0b00111111, + 0b10111111, } { if result := (requiredBitSet[i] & mask) ^ mask; result != 0 { // Mask only required fields and check equality to mask using XOR. diff --git a/pkg/oas/oas_schemas_gen.go b/pkg/oas/oas_schemas_gen.go index c04c5d97..8b3aa15b 100644 --- a/pkg/oas/oas_schemas_gen.go +++ b/pkg/oas/oas_schemas_gen.go @@ -7955,7 +7955,6 @@ type JettonInfo struct { Preview string `json:"preview"` Verification JettonVerificationType `json:"verification"` HoldersCount int32 `json:"holders_count"` - Score OptInt32 `json:"score"` } // GetMintable returns the value of Mintable. @@ -7993,11 +7992,6 @@ func (s *JettonInfo) GetHoldersCount() int32 { return s.HoldersCount } -// GetScore returns the value of Score. -func (s *JettonInfo) GetScore() OptInt32 { - return s.Score -} - // SetMintable sets the value of Mintable. func (s *JettonInfo) SetMintable(val bool) { s.Mintable = val @@ -8033,11 +8027,6 @@ func (s *JettonInfo) SetHoldersCount(val int32) { s.HoldersCount = val } -// SetScore sets the value of Score. -func (s *JettonInfo) SetScore(val OptInt32) { - s.Score = val -} - // Ref: #/components/schemas/JettonMetadata type JettonMetadata struct { Address string `json:"address"` @@ -8213,7 +8202,7 @@ type JettonPreview struct { Image string `json:"image"` Verification JettonVerificationType `json:"verification"` CustomPayloadAPIURI OptString `json:"custom_payload_api_uri"` - Score OptInt32 `json:"score"` + Score int32 `json:"score"` } // GetAddress returns the value of Address. @@ -8252,7 +8241,7 @@ func (s *JettonPreview) GetCustomPayloadAPIURI() OptString { } // GetScore returns the value of Score. -func (s *JettonPreview) GetScore() OptInt32 { +func (s *JettonPreview) GetScore() int32 { return s.Score } @@ -8292,7 +8281,7 @@ func (s *JettonPreview) SetCustomPayloadAPIURI(val OptString) { } // SetScore sets the value of Score. -func (s *JettonPreview) SetScore(val OptInt32) { +func (s *JettonPreview) SetScore(val int32) { s.Score = val }