extra balances

Author: akos-tk

api/openapi.json

@@ -735,6 +735,12 @@
       "example": {},
       "type": "object"
      },
+     "extra_balance": {
+      "items": {
+       "$ref": "#/components/schemas/ExtraCurrency"
+      },
+      "type": "array"
+     },
      "get_methods": {
       "example": [
        "get_item_data"
@@ -3229,6 +3235,34 @@
     ],
     "type": "object"
    },
+   "ExtraCurrency": {
+    "properties": {
+     "amount": {
+      "example": "1000000000",
+      "type": "string",
+      "x-js-format": "bigint"
+     },
+     "decimals": {
+      "example": 5,
+      "type": "integer"
+     },
+     "id": {
+      "example": 239,
+      "format": "int32",
+      "type": "integer"
+     },
+     "name": {
+      "example": "FMS",
+      "type": "string"
+     }
+    },
+    "required": [
+     "id",
+     "amount",
+     "decimals"
+    ],
+    "type": "object"
+   },
    "FoundAccounts": {
     "properties": {
      "addresses": {

api/openapi.yml

@@ -4600,6 +4600,10 @@ components:
           format: int64
           example: 123456789
           x-js-format: bigint
+        extra_balance:
+          type: array
+          items:
+            $ref: '#/components/schemas/ExtraCurrency'
         currencies_balance:
           description: "{'USD': 1, 'IDR': 1000}"
           type: object
@@ -7389,6 +7393,27 @@ components:
           type: integer
           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
 
   responses:
     Error:

pkg/api/account_converters.go

@@ -2,7 +2,9 @@ package api
 
 import (
 	"fmt"
+	"github.com/shopspring/decimal"
 	imgGenerator "github.com/tonkeeper/opentonapi/pkg/image"
+	"github.com/tonkeeper/opentonapi/pkg/references"
 	"sort"
 
 	"github.com/tonkeeper/tongo/abi"
@@ -57,6 +59,7 @@ func convertToRawAccount(account *core.Account) (oas.BlockchainRawAccount, error
 		}
 	}
 	if account.ExtraBalances != nil {
+		// TODO: use int instead of uint?
 		balances := make(map[string]string, len(account.ExtraBalances))
 		for key, value := range account.ExtraBalances {
 			balances[fmt.Sprintf("%v", key)] = fmt.Sprintf("%v", value)
@@ -72,6 +75,24 @@ func convertToRawAccount(account *core.Account) (oas.BlockchainRawAccount, error
 	return rawAccount, nil
 }
 
+func convertExtraCurrencies(extraBalances map[uint32]decimal.Decimal) []oas.ExtraCurrency {
+	res := make([]oas.ExtraCurrency, 0, len(extraBalances))
+	for k, v := range extraBalances {
+		cur := oas.ExtraCurrency{
+			ID:       int32(k),
+			Amount:   v.String(),
+			Decimals: 9, // TODO: or replace with default const
+		}
+		meta, ok := references.ExtraCurrencies[int32(k)]
+		if ok {
+			cur.Name.SetTo(meta.Name)
+			cur.Decimals = meta.Decimals
+		}
+		res = append(res, cur)
+	}
+	return res
+}
+
 func convertToAccount(account *core.Account, ab *addressbook.KnownAddress, state chainState) oas.Account {
 	acc := oas.Account{
 		Address:      account.AccountAddress.ToRaw(),

pkg/api/account_handlers.go

@@ -72,6 +72,9 @@ func (h *Handler) GetAccount(ctx context.Context, params oas.GetAccountParams) (
 	} else {
 		res = convertToAccount(rawAccount, nil, h.state)
 	}
+	if rawAccount.ExtraBalances != nil {
+		res.ExtraBalance = convertExtraCurrencies(rawAccount.ExtraBalances)
+	}
 	return &res, nil
 }
 
@@ -114,6 +117,9 @@ func (h *Handler) GetAccounts(ctx context.Context, request oas.OptGetAccountsReq
 		} else {
 			res = convertToAccount(account, nil, h.state)
 		}
+		if account.ExtraBalances != nil {
+			res.ExtraBalance = convertExtraCurrencies(account.ExtraBalances)
+		}
 		results[account.AccountAddress] = res
 	}
 	// if we don't find an account, we return it with "nonexist" status

pkg/api/wallet_handlers.go

@@ -38,6 +38,9 @@ func (h *Handler) GetWalletsByPublicKey(ctx context.Context, params oas.GetWalle
 		} else {
 			res = convertToAccount(account, nil, h.state)
 		}
+		if account.ExtraBalances != nil {
+			res.ExtraBalance = convertExtraCurrencies(account.ExtraBalances)
+		}
 		results = append(results, res)
 	}
 	return &oas.Accounts{Accounts: results}, nil

pkg/oas/oas_json_gen.go

@@ -0,0 +1,13 @@
+package references
+
+type ExtraCurrencyMeta struct {
+	Name     string
+	Decimals int
+}
+
+var ExtraCurrencies = map[int32]ExtraCurrencyMeta{
+	239: {
+		Name:     "FMS",
+		Decimals: 5,
+	},
+}