extra currency transfer action

tonkeeper · Dec 10, 2024 · 4a2d6c8 · 4a2d6c8
1 parent 30eb0a1
commit 4a2d6c8
Show file tree

Hide file tree

Showing 13 changed files with 907 additions and 67 deletions.
diff --git a/api/openapi.json b/api/openapi.json
@@ -1063,6 +1063,9 @@
      "ElectionsRecoverStake": {
       "$ref": "#/components/schemas/ElectionsRecoverStakeAction"
      },
+     "ExtraCurrencyTransfer": {
+      "$ref": "#/components/schemas/ExtraCurrencyTransferAction"
+     },
      "InscriptionMint": {
       "$ref": "#/components/schemas/InscriptionMintAction"
      },
@@ -1127,6 +1130,7 @@
      "type": {
       "enum": [
        "TonTransfer",
+       "ExtraCurrencyTransfer",
        "JettonTransfer",
        "JettonBurn",
        "JettonMint",
@@ -3119,6 +3123,33 @@
     ],
     "type": "object"
    },
+   "EcPreview": {
+    "properties": {
+     "decimals": {
+      "example": 5,
+      "type": "integer"
+     },
+     "image": {
+      "example": "https://cache.tonapi.io/images/extra.jpg",
+      "type": "string"
+     },
+     "name": {
+      "example": "FMS",
+      "type": "string"
+     },
+     "symbol": {
+      "example": "FMS",
+      "type": "string"
+     }
+    },
+    "required": [
+     "name",
+     "symbol",
+     "decimals",
+     "image"
+    ],
+    "type": "object"
+   },
    "ElectionsDepositStakeAction": {
     "properties": {
      "amount": {
@@ -3263,6 +3294,42 @@
     ],
     "type": "object"
    },
+   "ExtraCurrencyTransferAction": {
+    "properties": {
+     "amount": {
+      "description": "amount in quanta of tokens",
+      "example": "1000000000",
+      "type": "string",
+      "x-js-format": "bigint"
+     },
+     "comment": {
+      "example": "Hi! This is your salary. \nFrom accounting with love.",
+      "type": "string"
+     },
+     "currency": {
+      "$ref": "#/components/schemas/EcPreview"
+     },
+     "encrypted_comment": {
+      "$ref": "#/components/schemas/EncryptedComment"
+     },
+     "recipient": {
+      "$ref": "#/components/schemas/AccountAddress"
+     },
+     "refund": {
+      "$ref": "#/components/schemas/Refund"
+     },
+     "sender": {
+      "$ref": "#/components/schemas/AccountAddress"
+     }
+    },
+    "required": [
+     "sender",
+     "recipient",
+     "amount",
+     "currency"
+    ],
+    "type": "object"
+   },
    "FoundAccounts": {
     "properties": {
      "addresses": {

diff --git a/api/openapi.yml b/api/openapi.yml
@@ -5744,6 +5744,7 @@ components:
           example: "TonTransfer"
           enum:
             - TonTransfer
+            - ExtraCurrencyTransfer
             - JettonTransfer
             - JettonBurn
             - JettonMint
@@ -5772,6 +5773,8 @@ components:
             - failed
         TonTransfer:
           $ref: '#/components/schemas/TonTransferAction'
+        ExtraCurrencyTransfer:
+          $ref: '#/components/schemas/ExtraCurrencyTransferAction'
         ContractDeploy:
           $ref: '#/components/schemas/ContractDeployAction'
         JettonTransfer:
@@ -5842,6 +5845,52 @@ components:
           $ref: '#/components/schemas/EncryptedComment'
         refund:
           $ref: '#/components/schemas/Refund'
+    EcPreview:
+      type: object
+      required:
+        - name
+        - symbol
+        - decimals
+        - image
+      properties:
+        name:
+          type: string
+          example: FMS
+        symbol:
+          type: string
+          example: FMS
+        decimals:
+          type: integer
+          example: 5
+        image:
+          type: string
+          example: https://cache.tonapi.io/images/extra.jpg
+    ExtraCurrencyTransferAction:
+      type: object
+      required:
+        - sender
+        - recipient
+        - amount
+        - currency
+      properties:
+        sender:
+          $ref: '#/components/schemas/AccountAddress'
+        recipient:
+          $ref: '#/components/schemas/AccountAddress'
+        amount:
+          type: string
+          x-js-format: bigint
+          example: "1000000000"
+          description: amount in quanta of tokens
+        comment:
+          type: string
+          example: "Hi! This is your salary. \nFrom accounting with love."
+        encrypted_comment:
+          $ref: '#/components/schemas/EncryptedComment'
+        refund:
+          $ref: '#/components/schemas/Refund'
+        currency:
+          $ref: '#/components/schemas/EcPreview'
     SmartContractAction:
       type: object
       required:

diff --git a/pkg/api/account_converters.go b/pkg/api/account_converters.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	imgGenerator "github.com/tonkeeper/opentonapi/pkg/image"
 	"github.com/tonkeeper/opentonapi/pkg/references"
+	"math/big"
 	"sort"
 
 	"github.com/tonkeeper/tongo/abi"
@@ -60,7 +61,8 @@ func convertToRawAccount(account *core.Account) (oas.BlockchainRawAccount, error
 	if account.ExtraBalances != nil {
 		balances := make(map[string]string, len(account.ExtraBalances))
 		for key, value := range account.ExtraBalances {
-			balances[fmt.Sprintf("%v", int32(key))] = fmt.Sprintf("%v", value)
+			v := big.Int(value)
+			balances[fmt.Sprintf("%v", key)] = fmt.Sprintf("%v", v.String())
 		}
 		rawAccount.ExtraBalance = oas.NewOptBlockchainRawAccountExtraBalance(balances)
 	}
@@ -76,15 +78,15 @@ func convertToRawAccount(account *core.Account) (oas.BlockchainRawAccount, error
 func convertExtraCurrencies(extraBalances core.ExtraCurrencies) []oas.ExtraCurrency {
 	res := make([]oas.ExtraCurrency, 0, len(extraBalances))
 	for k, v := range extraBalances {
+		amount := big.Int(v)
+		meta := references.GetExtraCurrencyMeta(k)
 		cur := oas.ExtraCurrency{
-			ID:       int32(k),
-			Amount:   v.String(),
-			Decimals: 9, // TODO: or replace with default const
+			ID:       k,
+			Amount:   amount.String(),
+			Decimals: meta.Decimals,
 		}
-		meta, ok := references.ExtraCurrencies[int32(k)]
-		if ok {
+		if meta.Name != "" {
 			cur.Name.SetTo(meta.Name)
-			cur.Decimals = meta.Decimals
 		}
 		res = append(res, cur)
 	}

diff --git a/pkg/api/event_converters.go b/pkg/api/event_converters.go
@@ -151,6 +151,38 @@ func (h *Handler) convertActionTonTransfer(t *bath.TonTransferAction, acceptLang
 	return action, simplePreview
 }
 
+func (h *Handler) convertActionExtraCurrencyTransfer(t *bath.ExtraCurrencyTransferAction, acceptLanguage string, viewer *tongo.AccountID) (oas.OptExtraCurrencyTransferAction, oas.ActionSimplePreview) {
+	var action oas.OptExtraCurrencyTransferAction
+	amount := big.Int(t.Amount)
+	meta := references.GetExtraCurrencyMeta(t.CurrencyID)
+	action.SetTo(oas.ExtraCurrencyTransferAction{
+		Amount:           amount.String(),
+		Comment:          g.Opt(t.Comment),
+		Recipient:        convertAccountAddress(t.Recipient, h.addressBook),
+		Sender:           convertAccountAddress(t.Sender, h.addressBook),
+		EncryptedComment: convertEncryptedComment(t.EncryptedComment),
+		Currency: oas.EcPreview{
+			Name:     meta.Name,
+			Symbol:   meta.Symbol,
+			Decimals: meta.Decimals,
+			Image:    meta.Image,
+		},
+	})
+	if t.Refund != nil {
+		action.Value.Refund.SetTo(oas.Refund{
+			Type:   oas.RefundType(t.Refund.Type),
+			Origin: t.Refund.Origin,
+		})
+	}
+	simplePreview := oas.ActionSimplePreview{
+		Name:        "Extra Currency Transfer",
+		Description: "", // TODO: add description
+		Accounts:    distinctAccounts(viewer, h.addressBook, &t.Sender, &t.Recipient),
+		// TODO: add value
+	}
+	return action, simplePreview
+}
+
 func (h *Handler) convertActionNftTransfer(t *bath.NftTransferAction, acceptLanguage string, viewer *tongo.AccountID) (oas.OptNftItemTransferAction, oas.ActionSimplePreview) {
 	var action oas.OptNftItemTransferAction
 	action.SetTo(oas.NftItemTransferAction{
@@ -428,6 +460,8 @@ func (h *Handler) convertAction(ctx context.Context, viewer *tongo.AccountID, a
 	switch a.Type {
 	case bath.TonTransfer:
 		action.TonTransfer, action.SimplePreview = h.convertActionTonTransfer(a.TonTransfer, acceptLanguage.Value, viewer)
+	case bath.ExtraCurrencyTransfer:
+		action.ExtraCurrencyTransfer, action.SimplePreview = h.convertActionExtraCurrencyTransfer(a.ExtraCurrencyTransfer, acceptLanguage.Value, viewer)
 	case bath.NftItemTransfer:
 		action.NftItemTransfer, action.SimplePreview = h.convertActionNftTransfer(a.NftItemTransfer, acceptLanguage.Value, viewer)
 	case bath.JettonTransfer:

diff --git a/pkg/bath/actions.go b/pkg/bath/actions.go
@@ -19,6 +19,7 @@ import (
 
 const (
 	TonTransfer           ActionType = "TonTransfer"
+	ExtraCurrencyTransfer ActionType = "ExtraCurrencyTransfer"
 	SmartContractExec     ActionType = "SmartContractExec"
 	NftItemTransfer       ActionType = "NftItemTransfer"
 	NftPurchase           ActionType = "NftPurchase"
@@ -69,6 +70,7 @@ type (
 
 	Action struct {
 		TonTransfer           *TonTransferAction           `json:",omitempty"`
+		ExtraCurrencyTransfer *ExtraCurrencyTransferAction `json:",omitempty"`
 		SmartContractExec     *SmartContractAction         `json:",omitempty"`
 		NftItemTransfer       *NftTransferAction           `json:",omitempty"`
 		NftPurchase           *NftPurchaseAction           `json:",omitempty"`
@@ -101,6 +103,15 @@ type (
 		Sender           tongo.AccountID
 		Refund           *Refund
 	}
+	ExtraCurrencyTransferAction struct {
+		CurrencyID       int32
+		Amount           tlb.VarUInteger32
+		Comment          *string
+		EncryptedComment *EncryptedComment
+		Recipient        tongo.AccountID
+		Sender           tongo.AccountID
+		Refund           *Refund
+	}
 	SmartContractAction struct {
 		TonAttached int64
 		Executor    tongo.AccountID

diff --git a/pkg/bath/bubble.go b/pkg/bath/bubble.go
@@ -78,6 +78,7 @@ func fromTrace(trace *core.Trace) *Bubble {
 		btx.bounced = msg.Bounced
 		btx.inputAmount += msg.Value
 		btx.inputAmount += msg.IhrFee
+		btx.inputExtraAmount = msg.ValueExtra
 		btx.opCode = msg.OpCode
 		btx.decodedBody = msg.DecodedBody
 		btx.inputFrom = source
@@ -95,6 +96,7 @@ func fromTrace(trace *core.Trace) *Bubble {
 		Children: make([]*Bubble, len(trace.Children)),
 		ValueFlow: &ValueFlow{
 			Accounts: map[tongo.AccountID]*AccountValueFlow{
+				// TODO: add extra currency
 				trace.Account: {
 					Ton: inputAmount,
 				},