refactor

tonkeeper · Oct 9, 2024 · 42f0f52 · 42f0f52
1 parent e2da312
commit 42f0f52
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/pkg/bath/stonfi.go b/pkg/bath/stonfi.go
@@ -195,20 +195,20 @@ var StonfiSwapV2Straw = Straw[BubbleJettonSwap]{
 			if body.QueryId > 0 && a.IsZero() && b.IsZero() {
 				return nil
 			}
-			//newAction.Out.Amount = big.Int(body.MinOut)
-			//s, err := tongo.AccountIDFromTlb(body.SenderAddress)
-			//if err != nil {
-			//	return err
-			//}
-			//if s != nil && *s == b {
-			//	a, b = b, a
-			//}
-			//newAction.In.JettonWallet = a
-			//newAction.Out.JettonWallet = b
-			//if tx.additionalInfo != nil {
-			//	newAction.In.JettonMaster, _ = tx.additionalInfo.JettonMaster(a)
-			//	newAction.Out.JettonMaster, _ = tx.additionalInfo.JettonMaster(b)
-			//}
+			newAction.Out.Amount = big.Int(body.DexPayload.SwapBody.MinOut)
+			s, err := tongo.AccountIDFromTlb(body.FromUser)
+			if err != nil {
+				return err
+			}
+			if s != nil && *s == b {
+				a, b = b, a
+			}
+			newAction.In.JettonWallet = a
+			newAction.Out.JettonWallet = b
+			if tx.additionalInfo != nil {
+				newAction.In.JettonMaster, _ = tx.additionalInfo.JettonMaster(a)
+				newAction.Out.JettonMaster, _ = tx.additionalInfo.JettonMaster(b)
+			}
 			return nil
 		},
 		SingleChild: &Straw[BubbleJettonSwap]{

diff --git a/pkg/bath/straws.go b/pkg/bath/straws.go
@@ -45,6 +45,7 @@ var DefaultStraws = []Merger{
 	WtonMintStraw,
 	NftPurchaseStraw,
 	StonfiSwapStraw,
+	StonfiSwapV2Straw,
 	DedustSwapJettonsStraw,
 	DedustSwapToTONStraw,
 	DedustSwapFromTONStraw,

diff --git a/pkg/core/trace.go b/pkg/core/trace.go
@@ -117,7 +117,7 @@ type STONfiPoolID struct {
 type InformationSource interface {
 	JettonMastersForWallets(ctx context.Context, wallets []tongo.AccountID) (map[tongo.AccountID]tongo.AccountID, error)
 	NftSaleContracts(ctx context.Context, contracts []tongo.AccountID) (map[tongo.AccountID]NftSaleContract, error)
-	STONfiPools(ctx context.Context, poolIDs []tongo.AccountID) (map[tongo.AccountID]STONfiPool, error)
+	STONfiPools(ctx context.Context, poolIDs []STONfiPoolID) (map[tongo.AccountID]STONfiPool, error)
 }
 
 func isDestinationJettonWallet(inMsg *Message) bool {