minor tweaks (BinTree usage in McBlockExtra, McStateExtra and ShardHa…

…shes)
neodix42 · Aug 17, 2024 · 1e22ca5 · 1e22ca5
1 parent 3f17a56
commit 1e22ca5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 27 deletions.
diff --git a/cell/src/main/java/org/ton/java/cell/BinTree.java b/cell/src/main/java/org/ton/java/cell/BinTree.java
@@ -77,8 +77,8 @@ private Cell addToBinTree(BinTree left, BinTree right) {
     }
 
     public static BinTree deserialize(CellSlice cs) {
-        if (cs.isExotic()) {
-            return new BinTree();
+        if (cs.bits.getLength() == 0 || cs.isExotic()) {
+            return null;
         }
 
         if (cs.loadBit()) {

diff --git a/cell/src/main/java/org/ton/java/tlb/types/McBlockExtra.java b/cell/src/main/java/org/ton/java/tlb/types/McBlockExtra.java
@@ -26,8 +26,7 @@
 public class McBlockExtra {
     long magic;
     boolean keyBlock;
-    //    ShardHashes shardHashes;
-    TonHashMapE shardHashes;
+    ShardHashes shardHashes;
     //    ShardFees shardFees;
     TonHashMapAugE shardFees;
     McBlockExtraInfo info;
@@ -41,12 +40,8 @@ public Cell toCell() {
         return CellBuilder.beginCell()
                 .storeUint(0xcca5, 32)
                 .storeBit(keyBlock)
-//                .storeCell(shardHashes.toCell())
+                .storeDict(shardHashes.toCell())
 //                .storeCell(shardFees.toCell())
-                .storeDict(shardHashes.serialize(
-                        k -> CellBuilder.beginCell().storeUint((Long) k, 32).endCell().getBits(),
-                        v -> CellBuilder.beginCell().storeRef((Cell) v).endCell() // todo ShardDescr
-                ))
                 .storeDict(shardFees.serialize(
                         k -> CellBuilder.beginCell().storeUint((Long) k, 96).endCell().getBits(),
                         v -> CellBuilder.beginCell().storeCell((Cell) v), // todo ShardFeeCreated
@@ -66,13 +61,10 @@ public static McBlockExtra deserialize(CellSlice cs) {
         McBlockExtra mcBlockExtra = McBlockExtra.builder()
                 .magic(0xcca5L)
                 .keyBlock(keyBlock)
-//                .shardHashes(ShardHashes.deserialize(cs))
+                .shardHashes(ShardHashes.deserialize(cs))
 //                .shardFees(ShardFees.deserialize(cs))
-                .shardHashes(cs.loadDictE(32,
-                        k -> k.readInt(32),
-                        v -> CellSlice.beginParse(v).loadRef())) // ref
-                .shardFees(cs.loadDictAugE(92,
-                        k -> k.readInt(92),
+                .shardFees(cs.loadDictAugE(96,
+                        k -> k.readInt(96),
                         v -> v,
                         e -> e))
                 .build();

diff --git a/cell/src/main/java/org/ton/java/tlb/types/McStateExtra.java b/cell/src/main/java/org/ton/java/tlb/types/McStateExtra.java
@@ -30,8 +30,7 @@
  */
 public class McStateExtra {
     long magic;
-    //    ShardHashes shardHashes;
-    TonHashMapE shardHashes;
+    ShardHashes shardHashes;
     ConfigParams configParams;
     McStateExtraInfo info;
     CurrencyCollection globalBalance;
@@ -43,11 +42,7 @@ private String getMagic() {
     public Cell toCell() {
         return CellBuilder.beginCell()
                 .storeUint(0xcc26, 16)
-//                .storeDict(shardHashes.toCell())
-                .storeDict(shardHashes.serialize(
-                        k -> CellBuilder.beginCell().storeUint((Long) k, 32).endCell().getBits(),
-                        v -> CellBuilder.beginCell().storeRef((Cell) v).endCell() // todo ShardDescr
-                ))
+                .storeDict(shardHashes.toCell())
                 .storeCell(configParams.toCell())
                 .storeRef(info.toCell())
                 .storeCell(globalBalance.toCell())
@@ -67,10 +62,7 @@ public static McStateExtra deserialize(CellSlice cs) {
 
         McStateExtra mcStateExtra = McStateExtra.builder()
                 .magic(0xcc26L)
-//                .shardHashes(ShardHashes.deserialize(cs))
-                .shardHashes(cs.loadDictE(32,
-                        k -> k.readInt(32),
-                        v -> v)) // todo BinTree
+                .shardHashes(ShardHashes.deserialize(cs))
                 .build();
 
         mcStateExtra.setConfigParams(ConfigParams.deserialize(cs));

diff --git a/cell/src/main/java/org/ton/java/tlb/types/ShardHashes.java b/cell/src/main/java/org/ton/java/tlb/types/ShardHashes.java
@@ -29,7 +29,7 @@ public static ShardHashes deserialize(CellSlice cs) {
         return ShardHashes.builder()
                 .shardHashes(cs.loadDictE(32,
                         k -> k.readInt(32),
-                        v -> BinTree.deserialize(CellSlice.beginParse(cs.loadRef()))))
+                        v -> BinTree.deserialize(CellSlice.beginParse(v))))
                 .build();
     }