Merge pull request #61 from tonkeeper/msg-op-name

Use MsgOpName type instead of text strings when working with message operations

Author: mr-tron

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/sourcegraph/conc v0.3.0
 	github.com/stretchr/testify v1.8.1
 	github.com/tonkeeper/scam_backoffice_rules v0.0.0-20230413094040-a66ab71fb269
-	github.com/tonkeeper/tongo v1.0.15-0.20230501203905-82920df08b2f
+	github.com/tonkeeper/tongo v1.0.15-0.20230508095306-c4c3b7a0ae50
 	go.opentelemetry.io/otel v1.11.1
 	go.opentelemetry.io/otel/metric v0.33.0
 	go.opentelemetry.io/otel/trace v1.11.1

go.sum

@@ -267,6 +267,8 @@ github.com/tonkeeper/tongo v1.0.14-0.20230425143018-42fbbbfed2a3 h1:7pbY+FHPuUXt
 github.com/tonkeeper/tongo v1.0.14-0.20230425143018-42fbbbfed2a3/go.mod h1:Nn/5t5MGQHBUuEm56O135FIYwk9WpPgDITjWPk+fPGc=
 github.com/tonkeeper/tongo v1.0.15-0.20230501203905-82920df08b2f h1:0pqgkGrgosH8PX7+RTz2YfnEwAymUJ9VHlhb2VkIaQE=
 github.com/tonkeeper/tongo v1.0.15-0.20230501203905-82920df08b2f/go.mod h1:LdOBjpUz6vLp1EdX3E0XLNks9YI5XMSqaQahfOMrBEY=
+github.com/tonkeeper/tongo v1.0.15-0.20230508095306-c4c3b7a0ae50 h1:WG6lvONwtWRb4HlJqgjmf2eJXKRoi4bYJWQdgW53hoo=
+github.com/tonkeeper/tongo v1.0.15-0.20230508095306-c4c3b7a0ae50/go.mod h1:LdOBjpUz6vLp1EdX3E0XLNks9YI5XMSqaQahfOMrBEY=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=

pkg/bath/straws.go

@@ -57,7 +57,7 @@ func FindNFTTransfer(bubble *Bubble) bool {
 	if !ok {
 		return false
 	}
-	if !nftBubble.operation("NftTransfer") {
+	if !nftBubble.operation(abi.NftTransferMsgOp) {
 		return false
 	}
 	transfer := nftBubble.decodedBody.Value.(abi.NftTransferMsgBody)
@@ -80,7 +80,7 @@ func FindNFTTransfer(bubble *Bubble) bool {
 			if !ok {
 				return nil
 			}
-			if !tx.operation("Excess") {
+			if !tx.operation(abi.ExcessMsgOp) {
 				return nil
 			}
 			newBubble.Fee.Add(child.Fee)
@@ -93,7 +93,7 @@ func FindNFTTransfer(bubble *Bubble) bool {
 			if !ok {
 				return nil
 			}
-			if !tx.operation("NftOwnershipAssigned") {
+			if !tx.operation(abi.NftOwnershipAssignedMsgOp) {
 				return nil
 			}
 			newBubble.Fee.Add(child.Fee)
@@ -147,7 +147,7 @@ func FindJettonTransfer(bubble *Bubble) bool {
 	if !ok {
 		return false
 	}
-	if !jettonBubble.operation("JettonTransfer") {
+	if !jettonBubble.operation(abi.JettonTransferMsgOp) {
 		return false
 	}
 	intention := jettonBubble.decodedBody.Value.(abi.JettonTransferMsgBody)
@@ -181,7 +181,7 @@ func FindJettonTransfer(bubble *Bubble) bool {
 				if !ok {
 					return nil
 				}
-				if !tx.operation("JettonInternalTransfer") {
+				if !tx.operation(abi.JettonInternalTransferMsgOp) {
 					return nil
 				}
 				if tx.success {
@@ -194,7 +194,7 @@ func FindJettonTransfer(bubble *Bubble) bool {
 						if !ok {
 							return nil
 						}
-						if !tx.operation("Excess") {
+						if !tx.operation(abi.ExcessMsgOp) {
 							return nil
 						}
 						return &Merge{children: excess.Children}
@@ -204,7 +204,7 @@ func FindJettonTransfer(bubble *Bubble) bool {
 						if !ok {
 							return nil
 						}
-						if !tx.operation("JettonNotify") {
+						if !tx.operation(abi.JettonNotifyMsgOp) {
 							return nil
 						}
 						transfer.success = true

pkg/bath/subscriptions.go

@@ -16,10 +16,9 @@ func FindInitialSubscription(bubble *Bubble) bool {
 	if !ok {
 		return false
 	}
-	if txBubble.opCode == nil || *txBubble.opCode != 0xf06c7567 { //todo: use decoded after tongo update
+	if !txBubble.operation(abi.PaymentRequestResponseMsgOp) {
 		return false
 	}
-
 	newBubble := Bubble{
 		Accounts: append(bubble.Accounts, txBubble.account.Address),
 		Fee:      bubble.Fee,
@@ -36,7 +35,7 @@ func FindInitialSubscription(bubble *Bubble) bool {
 			if !ok {
 				return nil
 			}
-			if tx.opCode == nil || *tx.opCode != 0x73756273 { //todo: use decoded after tongo update
+			if !tx.operation(abi.SubscriptionPaymentMsgOp) {
 				return nil
 			}
 			success = true
@@ -76,7 +75,7 @@ func FindExtendedSubscription(bubble *Bubble) bool {
 	if !ok {
 		return false
 	}
-	if !command.operation("PaymentRequest") { //todo: use constant
+	if !command.operation(abi.PaymentRequestMsgOp) {
 		return false
 	}
 	request := command.decodedBody.Value.(abi.PaymentRequestMsgBody)