Merge remote-tracking branch 'origin/new-msg-sender'

Author: mr-tron

api/openapi.json

@@ -430,6 +430,12 @@
         "boc": {
          "format": "cell",
          "type": "string"
+        },
+        "meta": {
+         "additionalProperties": {
+          "type": "string"
+         },
+         "type": "object"
         }
        },
        "type": "object"

api/openapi.yml

@@ -3156,6 +3156,10 @@ components:
                 items:
                   type: string
                   format: cell
+              meta:
+                type: object
+                additionalProperties:
+                  type: string
     EmulationBoc:
       description: bag-of-cells serialized to base64/hex and additional parameters to configure emulation
       required: true

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/sourcegraph/conc v0.3.0
 	github.com/stretchr/testify v1.9.0
 	github.com/tonkeeper/scam_backoffice_rules v0.0.0-20241106130559-c44de2d4177b
-	github.com/tonkeeper/tongo v1.10.3
+	github.com/tonkeeper/tongo v1.13.0
 	go.opentelemetry.io/otel v1.24.0
 	go.opentelemetry.io/otel/metric v1.24.0
 	go.opentelemetry.io/otel/trace v1.24.0

go.sum

@@ -270,8 +270,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tonkeeper/scam_backoffice_rules v0.0.0-20241106130559-c44de2d4177b h1:udp2XHUF2gba2mrHbPcEjmeedRoXvpldO+3mXDiKJ2A=
 github.com/tonkeeper/scam_backoffice_rules v0.0.0-20241106130559-c44de2d4177b/go.mod h1:SqZXYO9vbID8ku+xnnaKXeNGmehxigODGrk5V1KqbRA=
-github.com/tonkeeper/tongo v1.10.3 h1:T1xGxikAfVRDLd5SUWDOCKZurlUDRoChoXzFvy8AGsw=
-github.com/tonkeeper/tongo v1.10.3/go.mod h1:MjgIgAytFarjCoVjMLjYEtpZNN1f2G/pnZhKjr28cWs=
+github.com/tonkeeper/tongo v1.13.0 h1:LesxO+HFrLSkhDYMXLl+zlabZpVTnaMNHUqwkIhzl0c=
+github.com/tonkeeper/tongo v1.13.0/go.mod h1:MjgIgAytFarjCoVjMLjYEtpZNN1f2G/pnZhKjr28cWs=
 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/api/event_handlers.go

@@ -73,6 +73,10 @@ func (h *Handler) SendBlockchainMessage(ctx context.Context, request *oas.SendBl
 	if !request.Boc.IsSet() && len(request.Batch) == 0 {
 		return toError(http.StatusBadRequest, fmt.Errorf("boc not found"))
 	}
+	var meta map[string]string
+	if request.Meta.IsSet() {
+		meta = request.Meta.Value
+	}
 	if request.Boc.IsSet() {
 		m, err := decodeMessage(request.Boc.Value)
 		if err != nil {
@@ -86,6 +90,7 @@ func (h *Handler) SendBlockchainMessage(ctx context.Context, request *oas.SendBl
 			MsgBoc:  m.base64,
 			Payload: m.payload,
 			Details: h.ctxToDetails(ctx),
+			Meta:    meta,
 		}
 		sendMessageCounter.Inc()
 		if err := h.msgSender.SendMessage(ctx, msgCopy); err != nil {
@@ -114,6 +119,7 @@ func (h *Handler) SendBlockchainMessage(ctx context.Context, request *oas.SendBl
 			MsgBoc:  m.base64,
 			Payload: m.payload,
 			Details: h.ctxToDetails(ctx),
+			Meta:    meta,
 		}
 		copies = append(copies, msgCopy)
 	}

pkg/api/staking_handlers.go

@@ -268,10 +268,8 @@ func (h *Handler) GetStakingPoolHistory(ctx context.Context, params oas.GetStaki
 		return nil, toError(http.StatusNotFound, err)
 	}
 	logAddress := tlb.MsgAddress{SumType: "AddrExtern"}
-	logAddress.AddrExtern = &struct {
-		Len             tlb.Uint9
-		ExternalAddress boc.BitString
-	}{Len: 256, ExternalAddress: g.Must(boc.BitStringFromFiftHex("0000000000000000000000000000000000000000000000000000000000000003"))}
+	addr := g.Must(boc.BitStringFromFiftHex("0000000000000000000000000000000000000000000000000000000000000003"))
+	logAddress.AddrExtern = &addr
 	logs, err := h.storage.GetLogs(ctx, pool.ID, &logAddress, 100, 0)
 	if err != nil {
 		return nil, toError(http.StatusInternalServerError, err)

pkg/blockchain/msg_sender.go

@@ -49,6 +49,8 @@ type ExtInMsgCopy struct {
 	// Accounts is set when the message is emulated.
 	Accounts map[tongo.AccountID]struct{}
 
+	Meta map[string]string
+
 	SendFailed bool // default is false, so we are good with backward compatibility.
 }
 

pkg/core/transactions.go

@@ -190,6 +190,5 @@ func externalAddressFromTlb(address tlb.MsgAddress) *ExternalAddress {
 	if address.SumType != "AddrExtern" {
 		return nil
 	}
-	external := address.AddrExtern.ExternalAddress
-	return &external
+	return address.AddrExtern
 }

pkg/litestorage/transactions.go

@@ -35,7 +35,7 @@ func (s *LiteStorage) GetLogs(ctx context.Context, account tongo.AccountID, dest
 					if destination.SumType == "AddrNone" && m.DestinationExtern != nil {
 						continue
 					}
-					if destination.SumType == "AddrExtern" && (m.DestinationExtern == nil || m.DestinationExtern.ToFiftHex() != destination.AddrExtern.ExternalAddress.ToFiftHex()) {
+					if destination.SumType == "AddrExtern" && (m.DestinationExtern == nil || m.DestinationExtern.ToFiftHex() != destination.AddrExtern.ToFiftHex()) {
 						continue
 					}
 				}