extra value for messages

Author: akos-tk

api/openapi.json

@@ -4211,6 +4211,12 @@
       "format": "int64",
       "type": "integer",
       "x-js-format": "bigint"
+     },
+     "value_extra": {
+      "items": {
+       "$ref": "#/components/schemas/ExtraCurrency"
+      },
+      "type": "array"
      }
     },
     "required": [

api/openapi.yml

@@ -3723,6 +3723,10 @@ components:
           format: int64
           x-js-format: bigint
           example: 60000000
+        value_extra:
+          type: array
+          items:
+            $ref: '#/components/schemas/ExtraCurrency'
         fwd_fee:
           type: integer
           format: int64

pkg/api/account_converters.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"fmt"
-	"github.com/shopspring/decimal"
 	imgGenerator "github.com/tonkeeper/opentonapi/pkg/image"
 	"github.com/tonkeeper/opentonapi/pkg/references"
 	"sort"
@@ -75,7 +74,7 @@ func convertToRawAccount(account *core.Account) (oas.BlockchainRawAccount, error
 	return rawAccount, nil
 }
 
-func convertExtraCurrencies(extraBalances map[uint32]decimal.Decimal) []oas.ExtraCurrency {
+func convertExtraCurrencies(extraBalances core.ExtraCurrencies) []oas.ExtraCurrency {
 	res := make([]oas.ExtraCurrency, 0, len(extraBalances))
 	for k, v := range extraBalances {
 		cur := oas.ExtraCurrency{

pkg/api/blockchain_converters.go

@@ -269,6 +269,9 @@ func convertMessage(m core.Message, book addressBook) oas.Message {
 		value, _ := json.Marshal(m.DecodedBody.Value)
 		msg.DecodedBody = g.ChangeJsonKeys(value, g.CamelToSnake)
 	}
+	if m.ValueExtra != nil {
+		msg.ValueExtra = convertExtraCurrencies(m.ValueExtra)
+	}
 	return msg
 }
 

pkg/core/account.go

@@ -6,7 +6,6 @@ import (
 	"github.com/tonkeeper/tongo/abi"
 	"github.com/tonkeeper/tongo/ton"
 
-	"github.com/shopspring/decimal"
 	"github.com/tonkeeper/tongo/tlb"
 )
 
@@ -15,7 +14,7 @@ type Account struct {
 	AccountAddress      ton.AccountID
 	Status              tlb.AccountStatus
 	TonBalance          int64
-	ExtraBalances       map[uint32]decimal.Decimal
+	ExtraBalances       ExtraCurrencies
 	LastTransactionLt   uint64
 	LastTransactionHash ton.Bits256
 	Code                []byte

pkg/core/converters.go

@@ -313,6 +313,7 @@ func ConvertMessage(message tlb.Message, txLT uint64, cd *abi.ContractDescriptio
 		if err != nil {
 			return Message{}, err
 		}
+
 		return Message{
 			MessageID: MessageID{
 				CreatedLt:   info.CreatedLt,
@@ -324,6 +325,7 @@ func ConvertMessage(message tlb.Message, txLT uint64, cd *abi.ContractDescriptio
 			Bounce:      info.Bounce,
 			Bounced:     info.Bounced,
 			Value:       int64(info.Value.Grams),
+			ValueExtra:  extractExtraCurrencies(info.Value.Other),
 			FwdFee:      int64(info.FwdFee),
 			IhrFee:      int64(info.IhrFee),
 			ImportFee:   0,
@@ -434,15 +436,7 @@ func ConvertToAccount(accountId tongo.AccountID, shardAccount tlb.ShardAccount)
 	}
 	balance := acc.Account.Storage.Balance
 	res.TonBalance = int64(balance.Grams)
-	items := balance.Other.Dict.Items()
-	if len(items) > 0 {
-		otherBalances := make(map[uint32]decimal.Decimal, len(items))
-		for _, item := range items {
-			value := big.Int(item.Value)
-			otherBalances[uint32(item.Key)] = decimal.NewFromBigInt(&value, 0)
-		}
-		res.ExtraBalances = otherBalances
-	}
+	res.ExtraBalances = extractExtraCurrencies(balance.Other)
 	res.LastTransactionLt = shardAccount.LastTransLt
 	res.LastTransactionHash = tongo.Bits256(shardAccount.LastTransHash)
 	if acc.Account.Storage.State.SumType == "AccountUninit" {
@@ -481,6 +475,19 @@ func ConvertToAccount(accountId tongo.AccountID, shardAccount tlb.ShardAccount)
 	return res, nil
 }
 
+func extractExtraCurrencies(extraCurrencyCollection tlb.ExtraCurrencyCollection) ExtraCurrencies {
+	items := extraCurrencyCollection.Dict.Items()
+	if len(items) > 0 {
+		res := make(map[uint32]decimal.Decimal, len(items))
+		for _, item := range items {
+			value := big.Int(item.Value)
+			res[uint32(item.Key)] = decimal.NewFromBigInt(&value, 0)
+		}
+		return res
+	}
+	return nil // TODO: or return empty map
+}
+
 func ExtractTransactions(id tongo.BlockIDExt, block *tlb.Block) ([]*Transaction, error) {
 	rawTransactions := block.AllTransactions()
 	transactions := make([]*Transaction, 0, len(rawTransactions))

pkg/core/extra_currencies.go

@@ -0,0 +1,5 @@
+package core
+
+import "github.com/shopspring/decimal"
+
+type ExtraCurrencies map[uint32]decimal.Decimal

pkg/core/transactions.go

@@ -163,6 +163,7 @@ type Message struct {
 	Bounce            bool
 	Bounced           bool
 	Value             int64
+	ValueExtra        ExtraCurrencies
 	FwdFee            int64
 	IhrFee            int64
 	ImportFee         int64