Skip to content

Improve mint straws #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Improve mint straws #460

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7495cf3
Improve mint straws
erokhinav Sep 3, 2024
8db15d2
Add nil check
erokhinav Sep 3, 2024
d96809b
undo change recipient
erokhinav Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 33 additions & 9 deletions pkg/bath/jettons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,23 @@ var DedustLPJettonMintStraw = Straw[BubbleJettonMint]{
newAction.amount = msg.Amount
newAction.recipientWallet = tx.account.Address
newAction.success = tx.success
newAction.recipient = *parseAccount(msg.ResponseAddress)
return nil
},
Children: []Straw[BubbleJettonMint]{
{
CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.JettonNotifyMsgOp)},
CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.JettonNotifyMsgOp), func(bubble *Bubble) bool {
if len(bubble.Children) > 0 {
return false
}
return true
}},
Builder: func(newAction *BubbleJettonMint, bubble *Bubble) error {
tx := bubble.Info.(BubbleTx)
newAction.recipient = tx.account
return nil
},
Optional: true,
},
{CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.ExcessMsgOp)}, Optional: true},
},
Expand Down Expand Up @@ -162,13 +169,17 @@ var JettonBurnStraw = Straw[BubbleJettonBurn]{
}

var JettonMintStrawGovernance = Straw[BubbleJettonMint]{
CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.JettonMintMsgOp), HasInterface(abi.JettonMaster)},
CheckFuncs: []bubbleCheck{IsTx, Or(HasOperation(abi.JettonMintMsgOp), HasOpcode(0x7362d09c)), HasInterface(abi.JettonMaster)},
Builder: func(newAction *BubbleJettonMint, bubble *Bubble) error {
tx := bubble.Info.(BubbleTx)
msg := tx.decodedBody.Value.(abi.JettonMintMsgBody)
dest, err := tongo.AccountIDFromTlb(msg.ToAddress)
if err == nil && dest != nil {
newAction.recipient = Account{Address: *dest}
msg, ok := tx.decodedBody.Value.(abi.JettonMintMsgBody)
if ok {
dest, err := tongo.AccountIDFromTlb(msg.ToAddress)
if err == nil && dest != nil {
newAction.recipient = Account{Address: *dest}
}
} else {
newAction.master = tx.account.Address
}
return nil
},
Expand All @@ -183,9 +194,22 @@ var JettonMintStrawGovernance = Straw[BubbleJettonMint]{
newAction.success = tx.success
return nil
},
SingleChild: &Straw[BubbleJettonMint]{
Optional: true,
CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.ExcessMsgOp)},
Children: []Straw[BubbleJettonMint]{
{
CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.JettonNotifyMsgOp), func(bubble *Bubble) bool {
if len(bubble.Children) > 0 {
return false
}
return true
}},
Builder: func(newAction *BubbleJettonMint, bubble *Bubble) error {
tx := bubble.Info.(BubbleTx)
newAction.recipient = tx.account
return nil
},
Optional: true,
},
{CheckFuncs: []bubbleCheck{IsTx, HasOperation(abi.ExcessMsgOp)}, Optional: true},
},
},
}
Expand Down
Loading