fix failed transfers with pton

Author: mr-tron

pkg/bath/bath_test.go

@@ -350,7 +350,7 @@ func TestFindActions(t *testing.T) {
 			straws: []Merger{
 				NftTransferStraw,
 				NftTransferNotifyStraw,
-				JettonTransferPTONStraw,
+				StonfiV1PTONStraw,
 				JettonTransferClassicStraw,
 			},
 		},
@@ -359,7 +359,7 @@ func TestFindActions(t *testing.T) {
 			hash:           "6a4c8e0dca5b052ab75f535df9d42ede949054f0004d3dd7aa6197af9dff0e1e",
 			filenamePrefix: "megatonfi-swap",
 			straws: []Merger{
-				JettonTransferPTONStraw,
+				StonfiV1PTONStraw,
 				JettonTransferClassicStraw,
 				MegatonFiJettonSwap,
 			},

pkg/bath/stonfi.go

@@ -123,6 +123,37 @@ var StonfiSwapStraw = Straw[BubbleJettonSwap]{
 	},
 }
 
+var StonfiV1PTONStraw = Straw[BubbleJettonTransfer]{
+	CheckFuncs: []bubbleCheck{IsTx, HasInterface(abi.JettonWallet), HasOperation(abi.JettonTransferMsgOp)},
+	Builder: func(newAction *BubbleJettonTransfer, bubble *Bubble) error {
+		tx := bubble.Info.(BubbleTx)
+		newAction.master, _ = tx.additionalInfo.JettonMaster(tx.account.Address)
+		newAction.senderWallet = tx.account.Address
+		newAction.sender = tx.inputFrom
+		body := tx.decodedBody.Value.(abi.JettonTransferMsgBody)
+		newAction.amount = body.Amount
+		newAction.isWrappedTon = true
+		recipient, err := ton.AccountIDFromTlb(body.Destination)
+		if err == nil && recipient != nil {
+			newAction.recipient = &Account{Address: *recipient}
+			bubble.Accounts = append(bubble.Accounts, *recipient)
+		}
+		return nil
+	},
+	SingleChild: &Straw[BubbleJettonTransfer]{
+		CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.JettonNotifyMsgOp)},
+		Builder: func(newAction *BubbleJettonTransfer, bubble *Bubble) error {
+			tx := bubble.Info.(BubbleTx)
+			newAction.success = true
+			body := tx.decodedBody.Value.(abi.JettonNotifyMsgBody)
+			newAction.amount = body.Amount
+			newAction.payload = body.ForwardPayload.Value
+			newAction.recipient = &tx.account
+			return nil
+		},
+	},
+}
+
 var StonfiV2PTONStraw = Straw[BubbleJettonTransfer]{
 	CheckFuncs: []bubbleCheck{IsTx, HasInterface(abi.JettonWallet), HasOperation(abi.PtonTonTransferMsgOp)},
 	Builder: func(newAction *BubbleJettonTransfer, bubble *Bubble) error {
@@ -153,6 +184,34 @@ var StonfiV2PTONStraw = Straw[BubbleJettonTransfer]{
 	},
 }
 
+var StonfiV2PTONStrawReverse = Straw[BubbleJettonTransfer]{
+	CheckFuncs: []bubbleCheck{IsTx, HasInterface(abi.JettonWallet), HasOperation(abi.JettonTransferMsgOp)},
+	Builder: func(newAction *BubbleJettonTransfer, bubble *Bubble) error {
+		tx := bubble.Info.(BubbleTx)
+		newAction.master, _ = tx.additionalInfo.JettonMaster(tx.account.Address)
+		newAction.senderWallet = tx.account.Address
+		newAction.sender = tx.inputFrom
+		body := tx.decodedBody.Value.(abi.JettonTransferMsgBody)
+		newAction.amount = body.Amount
+		newAction.isWrappedTon = true
+		newAction.payload = body.ForwardPayload.Value
+		recipient, err := ton.AccountIDFromTlb(body.Destination)
+		if err == nil {
+			newAction.recipient = &Account{Address: *recipient}
+		}
+		return nil
+	},
+	SingleChild: &Straw[BubbleJettonTransfer]{
+		CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.PtonTonTransferMsgOp)},
+		Builder: func(newAction *BubbleJettonTransfer, bubble *Bubble) error {
+			tx := bubble.Info.(BubbleTx)
+			newAction.success = true
+			newAction.recipient = &tx.account
+			return nil
+		},
+	},
+}
+
 var StonfiSwapV2Straw = Straw[BubbleJettonSwap]{
 	CheckFuncs: []bubbleCheck{func(bubble *Bubble) bool {
 		jettonTx, ok := bubble.Info.(BubbleJettonTransfer)

pkg/bath/straws.go

@@ -14,7 +14,9 @@ type Merger interface {
 }
 
 var JettonTransfersBurnsMints = []Merger{
-	JettonTransferPTONStraw,
+	StonfiV1PTONStraw,
+	StonfiV2PTONStrawReverse,
+	StonfiV2PTONStraw,
 	JettonTransferClassicStraw,
 	JettonTransferMinimalStraw,
 	JettonBurnStraw,
@@ -38,7 +40,8 @@ var DefaultStraws = []Merger{
 	StrawFindAuctionBidFragmentSimple,
 	NftTransferStraw,
 	NftTransferNotifyStraw,
-	JettonTransferPTONStraw,
+	StonfiV1PTONStraw,
+	StonfiV2PTONStrawReverse,
 	StonfiV2PTONStraw,
 	JettonTransferClassicStraw,
 	JettonTransferMinimalStraw,
@@ -71,37 +74,6 @@ var DefaultStraws = []Merger{
 	DNSRenewStraw,
 }
 
-var JettonTransferPTONStraw = Straw[BubbleJettonTransfer]{
-	CheckFuncs: []bubbleCheck{IsTx, HasInterface(abi.JettonWallet), HasOperation(abi.JettonTransferMsgOp)},
-	Builder: func(newAction *BubbleJettonTransfer, bubble *Bubble) error {
-		tx := bubble.Info.(BubbleTx)
-		newAction.master, _ = tx.additionalInfo.JettonMaster(tx.account.Address)
-		newAction.senderWallet = tx.account.Address
-		newAction.sender = tx.inputFrom
-		body := tx.decodedBody.Value.(abi.JettonTransferMsgBody)
-		newAction.amount = body.Amount
-		newAction.isWrappedTon = true
-		recipient, err := ton.AccountIDFromTlb(body.Destination)
-		if err == nil && recipient != nil {
-			newAction.recipient = &Account{Address: *recipient}
-			bubble.Accounts = append(bubble.Accounts, *recipient)
-		}
-		return nil
-	},
-	SingleChild: &Straw[BubbleJettonTransfer]{
-		CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.JettonNotifyMsgOp)},
-		Builder: func(newAction *BubbleJettonTransfer, bubble *Bubble) error {
-			tx := bubble.Info.(BubbleTx)
-			newAction.success = true
-			body := tx.decodedBody.Value.(abi.JettonNotifyMsgBody)
-			newAction.amount = body.Amount
-			newAction.payload = body.ForwardPayload.Value
-			newAction.recipient = &tx.account
-			return nil
-		},
-	},
-}
-
 var JettonTransferClassicStraw = Straw[BubbleJettonTransfer]{
 	CheckFuncs: []bubbleCheck{IsTx, HasInterface(abi.JettonWallet), HasOperation(abi.JettonTransferMsgOp)},
 	Builder: func(newAction *BubbleJettonTransfer, bubble *Bubble) error {