Merge pull request #243 from tonkeeper/skip-ShardStateUnsplitOther

Temporary skip decoding ShardStateUnsplitOther
tonkeeper · Feb 16, 2024 · 5f82a85 · 5f82a85
2 parents e83ba3c + 337625b
commit 5f82a85
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 1 deletion.
diff --git a/tlb/block_test.go b/tlb/block_test.go
@@ -53,6 +53,10 @@ func Test_tlb_Unmarshal(t *testing.T) {
 			name:   "block (0,D83800000000000,4168601)",
 			folder: "testdata/block-4",
 		},
+		{
+			name:   "block (0,D83800000000000,(-1,8000000000000000,17734191)",
+			folder: "testdata/block-5",
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {

diff --git a/tlb/proof.go b/tlb/proof.go
@@ -57,7 +57,7 @@ type ShardStateUnsplitData struct {
 	OutMsgQueueInfo OutMsgQueueInfo `tlb:"^"`
 	BeforeSplit     bool
 	Accounts        HashmapAugE[Bits256, ShardAccount, DepthBalanceInfo] `tlb:"^"`
-	Other           ShardStateUnsplitOther                               `tlb:"^"`
+	Other           boc.Cell                                             `tlb:"^"` // ShardStateUnsplitOther
 	Custom          Maybe[Ref[McStateExtra]]
 }
 

diff --git a/tlb/testdata/block-5/block.bin b/tlb/testdata/block-5/block.bin
diff --git a/tlb/testdata/block-5/block.expected.json b/tlb/testdata/block-5/block.expected.json
@@ -0,0 +1,135 @@
+{
+   "Accounts": {
+     "3333333333333333333333333333333333333333333333333333333333333333": {
+       "Transactions": {
+         "24836995000001": {
+           "AccountAddr": "3333333333333333333333333333333333333333333333333333333333333333",
+           "Lt": 24836995000001,
+           "PrevTransHash": "fcf09ae6d37913a8d5c2032dc2ac902ca7381948520cf9ae8c51bf49a84329ce",
+           "PrevTransLt": 24836994000002,
+           "Now": 1642757054,
+           "OutMsgCnt": 0,
+           "OrigStatus": "active",
+           "EndStatus": "active"
+         },
+         "24836995000002": {
+           "AccountAddr": "3333333333333333333333333333333333333333333333333333333333333333",
+           "Lt": 24836995000002,
+           "PrevTransHash": "9c953c51e6cb6388e5ccd6690b94d11326f5a254dfb69fc566a674a527de810f",
+           "PrevTransLt": 24836995000001,
+           "Now": 1642757054,
+           "OutMsgCnt": 0,
+           "OrigStatus": "active",
+           "EndStatus": "active"
+         }
+       }
+     },
+     "34517c7bdf5187c55af4f8b61fdc321588c7ab768dee24b006df29106458d7cf": {
+       "Transactions": {
+         "24836995000001": {
+           "AccountAddr": "34517c7bdf5187c55af4f8b61fdc321588c7ab768dee24b006df29106458d7cf",
+           "Lt": 24836995000001,
+           "PrevTransHash": "d3ac858e72faf37706a91bcf6ef97eac5408e1351c1a51251887110c2679ee13",
+           "PrevTransLt": 24836994000003,
+           "Now": 1642757054,
+           "OutMsgCnt": 0,
+           "OrigStatus": "active",
+           "EndStatus": "active"
+         },
+         "24836995000003": {
+           "AccountAddr": "34517c7bdf5187c55af4f8b61fdc321588c7ab768dee24b006df29106458d7cf",
+           "Lt": 24836995000003,
+           "PrevTransHash": "d93787d0225a1c5b2a0bce2599b755fbd29c251f056bd1da83839f3db765f4bb",
+           "PrevTransLt": 24836995000001,
+           "Now": 1642757054,
+           "OutMsgCnt": 0,
+           "OrigStatus": "active",
+           "EndStatus": "active"
+         }
+       }
+     },
+     "5555555555555555555555555555555555555555555555555555555555555555": {
+       "Transactions": {
+         "24836995000003": {
+           "AccountAddr": "5555555555555555555555555555555555555555555555555555555555555555",
+           "Lt": 24836995000003,
+           "PrevTransHash": "2f19538db8d76a34f93ec1b4db91f8dc9eef6e759156bd3ce8310dec52829e50",
+           "PrevTransLt": 24836994000003,
+           "Now": 1642757054,
+           "OutMsgCnt": 0,
+           "OrigStatus": "active",
+           "EndStatus": "active"
+         }
+       }
+     },
+     "8e421c91a3430717750901caa9754c43c8c63bd2a911194e5d5281f00a84613c": {
+       "Transactions": {
+         "24836995000001": {
+           "AccountAddr": "8e421c91a3430717750901caa9754c43c8c63bd2a911194e5d5281f00a84613c",
+           "Lt": 24836995000001,
+           "PrevTransHash": "659a71fed5d12dc3617953bd76b5798cd274dba4e9cadd4e32e1ee23e45d3acc",
+           "PrevTransLt": 24836973000001,
+           "Now": 1642757054,
+           "OutMsgCnt": 0,
+           "OrigStatus": "uninit",
+           "EndStatus": "active"
+         }
+       }
+     }
+   },
+   "TxHashes": [
+     "9c953c51e6cb6388e5ccd6690b94d11326f5a254dfb69fc566a674a527de810f",
+     "b442b4478494bfb8e4667156919d03f43a119a9b57e81edfbc47faa2fc7ed849",
+     "ca53acbff14ecc7dce82eed6667ba25f96d5dea5ec6ba2ce9e0c36338f49d81b",
+     "cad1c533bc78217b08b25d0ce8d0d951d153a141087ca0f624f2194bb5602c8f",
+     "d93787d0225a1c5b2a0bce2599b755fbd29c251f056bd1da83839f3db765f4bb",
+     "f468928319bd3e40e19154753eb210f3c138f5fc0325c55d8de36d5c4138030c"
+   ],
+   "ValueFlow": {
+     "FromPrevBlk": {
+       "Grams": "2684874604613377715",
+       "Other": {
+         "239": "664333333334",
+         "4294967279": "998444444446"
+       }
+     },
+     "ToNextBlk": {
+       "Grams": "2684874608295932660",
+       "Other": {
+         "239": "664333333334",
+         "4294967279": "998444444446"
+       }
+     },
+     "Imported": {
+       "Grams": "0",
+       "Other": {}
+     },
+     "Exported": {
+       "Grams": "0",
+       "Other": {}
+     },
+     "FeesCollected": {
+       "Grams": "3756556529",
+       "Other": {}
+     },
+     "Burned": null,
+     "FeesImported": {
+       "Grams": "2019555737",
+       "Other": {}
+     },
+     "Recovered": {
+       "Grams": "3719555737",
+       "Other": {}
+     },
+     "Created": {
+       "Grams": "1700000000",
+       "Other": {}
+     },
+     "Minted": {
+       "Grams": "0",
+       "Other": {}
+     }
+   },
+   "InMsgDescrLength": 2,
+   "OutMsgDescrLength": 0
+ }