Support ValueFlow v2 with burned CurrencyCollection

Author: aleksej-paschenko

tlb/blocks.go

@@ -248,38 +248,45 @@ type BlockIdExt struct {
 }
 
 // ValueFlow
-// value_flow ^[ from_prev_blk:CurrencyCollection
-// to_next_blk:CurrencyCollection
-// imported:CurrencyCollection
-// exported:CurrencyCollection ]
+//
+// v1:
+// ^[ from_prev_blk:CurrencyCollection to_next_blk:CurrencyCollection imported:CurrencyCollection exported:CurrencyCollection ]
 // fees_collected:CurrencyCollection
-// ^[
-// fees_imported:CurrencyCollection
-// recovered:CurrencyCollection
-// created:CurrencyCollection
-// minted:CurrencyCollection
-// ] = ValueFlow;
+// ^[  fees_imported:CurrencyCollection recovered:CurrencyCollection  created:CurrencyCollection minted:CurrencyCollection
+// ];
+//
+// v2:
+//
+//	^[ from_prev_blk:CurrencyCollection to_next_blk:CurrencyCollection imported:CurrencyCollection exported:CurrencyCollection ]
+//	fees_collected: CurrencyCollection
+//	burned: CurrencyCollection
+//	^[ fees_imported:CurrencyCollection recovered:CurrencyCollection created:CurrencyCollection minted:CurrencyCollection ]
 type ValueFlow struct {
-	Magic         Magic `tlb:"value_flow#b8e48dfb" json:"-"`
+	Magic         Magic `json:"-"`
 	FromPrevBlk   CurrencyCollection
 	ToNextBlk     CurrencyCollection
 	Imported      CurrencyCollection
 	Exported      CurrencyCollection
 	FeesCollected CurrencyCollection
+	Burned        *CurrencyCollection
 	FeesImported  CurrencyCollection
 	Recovered     CurrencyCollection
 	Created       CurrencyCollection
 	Minted        CurrencyCollection
 }
 
+const valueFlowV1 = 0xb8e48dfb
+const valueFlowV2 = 0x3ebf98b7
+
 func (m *ValueFlow) UnmarshalTLB(c *boc.Cell, decoder *Decoder) error {
 	sumType, err := c.ReadUint(32)
 	if err != nil {
 		return err
 	}
-	if sumType != 0xb8e48dfb {
-		return fmt.Errorf("invalid tag")
+	if sumType != valueFlowV1 && sumType != valueFlowV2 {
+		return fmt.Errorf("value flow invalid tag: %v", sumType)
 	}
+	m.Magic = Magic(sumType)
 	firstGroup, err := c.NextRef()
 	if err != nil {
 		return err
@@ -304,6 +311,13 @@ func (m *ValueFlow) UnmarshalTLB(c *boc.Cell, decoder *Decoder) error {
 	if err != nil {
 		return err
 	}
+	if sumType == valueFlowV2 {
+		m.Burned = &CurrencyCollection{}
+		err = decoder.Unmarshal(c, &m.Burned)
+		if err != nil {
+			return err
+		}
+	}
 	secondGroup, err := c.NextRef()
 	if err != nil {
 		return err

tlb/testdata/value-flow.expected.json

@@ -25,6 +25,7 @@
      "Grams": "8808391638",
      "Other": {}
    },
+   "Burned": null,
    "FeesImported": {
      "Grams": "0",
      "Other": {}