Merge pull request #569 from tonkeeper/extra-currency-value

Extra currency value
tonkeeper · Dec 13, 2024 · c471dec · c471dec
2 parents 1f9e6c3 + 062850b
commit c471dec
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 134 deletions.
diff --git a/api/openapi.json b/api/openapi.json
@@ -3128,6 +3128,11 @@
       "example": 5,
       "type": "integer"
      },
+     "id": {
+      "example": 239,
+      "format": "int32",
+      "type": "integer"
+     },
      "image": {
       "example": "https://cache.tonapi.io/images/extra.jpg",
       "type": "string"
@@ -3138,6 +3143,7 @@
      }
     },
     "required": [
+     "id",
      "symbol",
      "decimals",
      "image"
@@ -3267,24 +3273,13 @@
       "type": "string",
       "x-js-format": "bigint"
      },
-     "decimals": {
-      "example": 5,
-      "type": "integer"
-     },
-     "id": {
-      "example": 239,
-      "format": "int32",
-      "type": "integer"
-     },
-     "name": {
-      "example": "FMS",
-      "type": "string"
+     "preview": {
+      "$ref": "#/components/schemas/EcPreview"
      }
     },
     "required": [
-     "id",
      "amount",
-     "decimals"
+     "preview"
     ],
     "type": "object"
    },

diff --git a/api/openapi.yml b/api/openapi.yml
@@ -5880,10 +5880,15 @@ components:
     EcPreview:
       type: object
       required:
+        - id
         - symbol
         - decimals
         - image
       properties:
+        id:
+          type: integer
+          example: 239
+          format: int32
         symbol:
           type: string
           example: FMS
@@ -7469,26 +7474,17 @@ components:
           format: int64
           example: 1668436763
     ExtraCurrency:
-      type: object
-      required:
-        - id
-        - amount
-        - decimals
-      properties:
-        id:
-          type: integer
-          example: 239
-          format: int32
-        amount:
-          type: string
-          x-js-format: bigint
-          example: "1000000000"
-        name:
-          type: string
-          example: FMS
-        decimals:
-          type: integer
-          example: 5
+          type: object
+          required:
+            - amount
+            - preview
+          properties:
+            amount:
+              type: string
+              x-js-format: bigint
+              example: "1000000000"
+            preview:
+              $ref: '#/components/schemas/EcPreview'
     SourceFile:
       type: object
       required:

diff --git a/pkg/api/account_converters.go b/pkg/api/account_converters.go
@@ -81,12 +81,13 @@ func convertExtraCurrencies(extraBalances core.ExtraCurrencies) []oas.ExtraCurre
 		amount := big.Int(v)
 		meta := references.GetExtraCurrencyMeta(k)
 		cur := oas.ExtraCurrency{
-			ID:       k,
-			Amount:   amount.String(),
-			Decimals: meta.Decimals,
-		}
-		if meta.Name != "" {
-			cur.Name.SetTo(meta.Name)
+			Amount: amount.String(),
+			Preview: oas.EcPreview{
+				ID:       k,
+				Symbol:   meta.Symbol,
+				Decimals: meta.Decimals,
+				Image:    meta.Image,
+			},
 		}
 		res = append(res, cur)
 	}

diff --git a/pkg/api/event_converters.go b/pkg/api/event_converters.go
@@ -162,16 +162,18 @@ func (h *Handler) convertActionExtraCurrencyTransfer(t *bath.ExtraCurrencyTransf
 		Sender:           convertAccountAddress(t.Sender, h.addressBook),
 		EncryptedComment: convertEncryptedComment(t.EncryptedComment),
 		Currency: oas.EcPreview{
+			ID:       t.CurrencyID,
 			Symbol:   meta.Symbol,
 			Decimals: meta.Decimals,
 			Image:    meta.Image,
 		},
 	})
+	value := ScaleJettons(big.Int(t.Amount), meta.Decimals)
 	simplePreview := oas.ActionSimplePreview{
 		Name:        "Extra Currency Transfer",
 		Description: "", // TODO: add description
 		Accounts:    distinctAccounts(viewer, h.addressBook, &t.Sender, &t.Recipient),
-		// TODO: add value
+		Value:       oas.NewOptString(fmt.Sprintf("%v %v", value.String(), meta.Symbol)),
 	}
 	return action, simplePreview
 }

diff --git a/pkg/oas/oas_json_gen.go b/pkg/oas/oas_json_gen.go