From 491c031ceabe306b43dedd9d3af3171c13b786dd Mon Sep 17 00:00:00 2001 From: Victoria Erokhina Date: Wed, 11 Dec 2024 13:42:33 +0000 Subject: [PATCH 1/3] rewrite extract risk from messages --- pkg/api/converters.go | 18 ++++++--- pkg/api/multisig_handlers.go | 22 ---------- pkg/wallet/risk.go | 78 +++++++++++++++++++++--------------- 3 files changed, 57 insertions(+), 61 deletions(-) diff --git a/pkg/api/converters.go b/pkg/api/converters.go index ea91b7b3..8cb078c1 100644 --- a/pkg/api/converters.go +++ b/pkg/api/converters.go @@ -268,13 +268,19 @@ func (h *Handler) convertMultisig(ctx context.Context, item core.Multisig) (*oas for _, account := range order.Signers { signers = append(signers, account.ToRaw()) } - messages, err := convertMultisigActionsToRawMessages(order.Actions) - if err != nil { - return nil, err + risk := &walletPkg.Risk{ + TransferAllRemainingBalance: false, + Jettons: map[tongo.AccountID]big.Int{}, } - risk, err := walletPkg.ExtractRiskFromRawMessages(messages) - if err != nil { - return nil, err + for _, action := range order.Actions { + switch action.SumType { + case "SendMessage": + var err error + risk, err = walletPkg.ExtractRiskFromMessage(action.SendMessage.Field0.Message, risk, action.SendMessage.Field0.Mode) + if err != nil { + return nil, err + } + } } oasRisk, err := h.convertRisk(ctx, *risk, item.AccountID) if err != nil { diff --git a/pkg/api/multisig_handlers.go b/pkg/api/multisig_handlers.go index 655a6c13..87ace688 100644 --- a/pkg/api/multisig_handlers.go +++ b/pkg/api/multisig_handlers.go @@ -7,31 +7,9 @@ import ( "github.com/tonkeeper/opentonapi/pkg/core" "github.com/tonkeeper/opentonapi/pkg/oas" - "github.com/tonkeeper/tongo/abi" - "github.com/tonkeeper/tongo/boc" - "github.com/tonkeeper/tongo/tlb" "github.com/tonkeeper/tongo/ton" - tongoWallet "github.com/tonkeeper/tongo/wallet" ) -func convertMultisigActionsToRawMessages(actions []abi.MultisigSendMessageAction) ([]tongoWallet.RawMessage, error) { - var messages []tongoWallet.RawMessage - for _, action := range actions { - switch action.SumType { - case "SendMessage": - msg := boc.NewCell() - if err := tlb.Marshal(msg, action.SendMessage.Field0.Message); err != nil { - return nil, err - } - messages = append(messages, tongoWallet.RawMessage{ - Message: msg, - Mode: action.SendMessage.Field0.Mode, - }) - } - } - return messages, nil -} - func (h *Handler) GetMultisigAccount(ctx context.Context, params oas.GetMultisigAccountParams) (*oas.Multisig, error) { accountID, err := ton.ParseAccountID(params.AccountID) if err != nil { diff --git a/pkg/wallet/risk.go b/pkg/wallet/risk.go index 27083a71..25f9b5a8 100644 --- a/pkg/wallet/risk.go +++ b/pkg/wallet/risk.go @@ -32,7 +32,7 @@ func ExtractRisk(version tongoWallet.Version, msg *boc.Cell) (*Risk, error) { } func ExtractRiskFromRawMessages(rawMessages []tongoWallet.RawMessage) (*Risk, error) { - risk := Risk{ + risk := &Risk{ TransferAllRemainingBalance: false, Jettons: map[tongo.AccountID]big.Int{}, } @@ -45,42 +45,54 @@ func ExtractRiskFromRawMessages(rawMessages []tongoWallet.RawMessage) (*Risk, er if err := tlb.Unmarshal(rawMsg.Message, &m); err != nil { return nil, err } - tonValue := uint64(m.MessageInternal.Value.Grams) - destination, err := ton.AccountIDFromTlb(m.MessageInternal.Dest) + var err error + risk, err = ExtractRiskFromMessage(m, risk, rawMsg.Mode) if err != nil { return nil, err } - risk.Ton += tonValue - msgBody := m.MessageInternal.Body.Value.Value - if err != nil { - continue + } + return risk, nil +} + +func ExtractRiskFromMessage(m abi.MessageRelaxed, risk *Risk, mode byte) (*Risk, error) { + if tongoWallet.IsMessageModeSet(int(mode), tongoWallet.AttachAllRemainingBalance) { + risk.TransferAllRemainingBalance = true + } + tonValue := uint64(m.MessageInternal.Value.Grams) + destination, err := ton.AccountIDFromTlb(m.MessageInternal.Dest) + if err != nil { + return nil, err + } + risk.Ton += tonValue + msgBody := m.MessageInternal.Body.Value.Value + if err != nil { + return risk, err + } + switch x := msgBody.(type) { + case abi.NftTransferMsgBody: + if destination == nil { + return risk, err + } + // here, destination is an NFT + risk.Nfts = append(risk.Nfts, *destination) + case abi.JettonBurnMsgBody: + if destination == nil { + return risk, err } - switch x := msgBody.(type) { - case abi.NftTransferMsgBody: - if destination == nil { - continue - } - // here, destination is an NFT - risk.Nfts = append(risk.Nfts, *destination) - case abi.JettonBurnMsgBody: - if destination == nil { - continue - } - // here, destination is a jetton wallet - amount := big.Int(x.Amount) - currentJettons := risk.Jettons[*destination] - var total big.Int - risk.Jettons[*destination] = *total.Add(¤tJettons, &amount) - case abi.JettonTransferMsgBody: - if destination == nil { - continue - } - // here, destination is a jetton wallet - amount := big.Int(x.Amount) - currentJettons := risk.Jettons[*destination] - var total big.Int - risk.Jettons[*destination] = *total.Add(¤tJettons, &amount) + // here, destination is a jetton wallet + amount := big.Int(x.Amount) + currentJettons := risk.Jettons[*destination] + var total big.Int + risk.Jettons[*destination] = *total.Add(¤tJettons, &amount) + case abi.JettonTransferMsgBody: + if destination == nil { + return risk, err } + // here, destination is a jetton wallet + amount := big.Int(x.Amount) + currentJettons := risk.Jettons[*destination] + var total big.Int + risk.Jettons[*destination] = *total.Add(¤tJettons, &amount) } - return &risk, nil + return risk, err } From 902cc030e856d838ccb9bc52169ecbca9ac9dce8 Mon Sep 17 00:00:00 2001 From: Victoria Erokhina Date: Wed, 11 Dec 2024 14:36:12 +0000 Subject: [PATCH 2/3] remove pointers --- pkg/wallet/risk.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkg/wallet/risk.go b/pkg/wallet/risk.go index 25f9b5a8..53ea88e6 100644 --- a/pkg/wallet/risk.go +++ b/pkg/wallet/risk.go @@ -32,7 +32,7 @@ func ExtractRisk(version tongoWallet.Version, msg *boc.Cell) (*Risk, error) { } func ExtractRiskFromRawMessages(rawMessages []tongoWallet.RawMessage) (*Risk, error) { - risk := &Risk{ + risk := Risk{ TransferAllRemainingBalance: false, Jettons: map[tongo.AccountID]big.Int{}, } @@ -51,23 +51,20 @@ func ExtractRiskFromRawMessages(rawMessages []tongoWallet.RawMessage) (*Risk, er return nil, err } } - return risk, nil + return &risk, nil } -func ExtractRiskFromMessage(m abi.MessageRelaxed, risk *Risk, mode byte) (*Risk, error) { +func ExtractRiskFromMessage(m abi.MessageRelaxed, risk Risk, mode byte) (Risk, error) { if tongoWallet.IsMessageModeSet(int(mode), tongoWallet.AttachAllRemainingBalance) { risk.TransferAllRemainingBalance = true } tonValue := uint64(m.MessageInternal.Value.Grams) destination, err := ton.AccountIDFromTlb(m.MessageInternal.Dest) if err != nil { - return nil, err + return Risk{}, err } risk.Ton += tonValue msgBody := m.MessageInternal.Body.Value.Value - if err != nil { - return risk, err - } switch x := msgBody.(type) { case abi.NftTransferMsgBody: if destination == nil { From bfd41b30fb7a5c3465c359cc34bd420bb65be2a9 Mon Sep 17 00:00:00 2001 From: Victoria Erokhina Date: Wed, 11 Dec 2024 14:37:44 +0000 Subject: [PATCH 3/3] remove pointers --- pkg/api/converters.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/converters.go b/pkg/api/converters.go index 8cb078c1..e0eca7b6 100644 --- a/pkg/api/converters.go +++ b/pkg/api/converters.go @@ -268,7 +268,7 @@ func (h *Handler) convertMultisig(ctx context.Context, item core.Multisig) (*oas for _, account := range order.Signers { signers = append(signers, account.ToRaw()) } - risk := &walletPkg.Risk{ + risk := walletPkg.Risk{ TransferAllRemainingBalance: false, Jettons: map[tongo.AccountID]big.Int{}, } @@ -282,7 +282,7 @@ func (h *Handler) convertMultisig(ctx context.Context, item core.Multisig) (*oas } } } - oasRisk, err := h.convertRisk(ctx, *risk, item.AccountID) + oasRisk, err := h.convertRisk(ctx, risk, item.AccountID) if err != nil { return nil, err }