Fix boc.DeserializeBoc() when cells serialized with hashes

tonkeeper · Dec 25, 2023 · 7bf6788 · 7bf6788
1 parent 96b610b
commit 7bf6788
Show file tree

Hide file tree

Showing 4 changed files with 6,453 additions and 5 deletions.
diff --git a/boc/boc.go b/boc/boc.go
@@ -194,6 +194,10 @@ func deserializeCellData(cellData []byte, referenceIndexSize int) (*Cell, []int,
 	withHashes := (d1 & 0b10000) != 0
 	mask := levelMask(d1 >> 5)
 
+	if withHashes {
+		offset := mask.HashesCount() * (hashSize + depthSize)
+		cellData = cellData[offset:]
+	}
 	var cell *Cell
 	if isExotic {
 		// the first byte of an exotic cell stores the cell's type.
@@ -204,10 +208,6 @@ func deserializeCellData(cellData []byte, referenceIndexSize int) (*Cell, []int,
 		cell = NewCell()
 		cell.mask = mask
 	}
-	if withHashes {
-		offset := mask.HashesCount() * (hashSize + depthSize)
-		cellData = cellData[offset:]
-	}
 
 	if len(cellData) < dataBytesSize+referenceIndexSize*refNum {
 		return nil, nil, nil, errors.New("not enough bytes to encode cell data")

diff --git a/boc/boc_test.go b/boc/boc_test.go
@@ -82,7 +82,12 @@ func TestDeserializeBoc(t *testing.T) {
 		resultFilename string
 	}{
 		{
-			resultFilename: "testdata/deserialize_block.json",
+			name:           "block 1",
+			resultFilename: "testdata/deserialize-block-1.json",
+		},
+		{
+			name:           "block 2",
+			resultFilename: "testdata/deserialize-block-2.json",
 		},
 	}
 	for _, tc := range testCases {

diff --git a/boc/testdata/deserialize_block.json → boc/testdata/deserialize-block-1.json b/boc/testdata/deserialize_block.json → boc/testdata/deserialize-block-1.json