Version 11: fix account storage stat and null in RUNVM (#1690)

* Bugfix in AccountStorageStat::remove_cell

* Fix returning null as c4/c5 in RUNVM

Author: SpyCheese

crypto/block/account-storage-stat.cpp

@@ -154,7 +154,7 @@ td::Status AccountStorageStat::remove_cell(const Ref<vm::Cell>& cell) {
   if (e.refcnt_diff < 0 && !e.refcnt) {
     TRY_STATUS(fetch_from_dict(e));
   }
-  if (e.refcnt.value() + e.refcnt_diff != 0) {
+  if (e.refcnt_diff >= 0 || e.refcnt.value() + e.refcnt_diff != 0) {
     return td::Status::OK();
   }
   bool spec;

crypto/vm/vm.cpp

@@ -785,11 +785,20 @@ void VmState::restore_parent_vm(int res) {
     cur_stack.push(std::move(child_state.stack->at(i)));
   }
   cur_stack.push_smallint(res);
-  if (parent->return_data) {
-    cur_stack.push_cell(child_state.get_committed_state().c4);
-  }
-  if (parent->return_actions) {
-    cur_stack.push_cell(child_state.get_committed_state().c5);
+  if (global_version >= 11 && !child_state.get_committed_state().committed) {
+    if (parent->return_data) {
+      cur_stack.push_null();
+    }
+    if (parent->return_actions) {
+      cur_stack.push_null();
+    }
+  } else {
+    if (parent->return_data) {
+      cur_stack.push_cell(child_state.get_committed_state().c4);
+    }
+    if (parent->return_actions) {
+      cur_stack.push_cell(child_state.get_committed_state().c5);
+    }
   }
   if (parent->return_gas) {
     cur_stack.push_smallint(child_state.gas.gas_consumed());

doc/GlobalVersions.md

@@ -221,4 +221,7 @@ Reserve modes `+1`, `+4` and `+8` ("reserve all except", "add original balance"
 Along with the storage stat (cells and bits count), each account now stores the hash of the **storage dict**.
 
 **Storage dict** is the dictionary that stores refcnt for each cell in the account state.
-This is required to help computing storage stats in the future, after collator-validator separation.
+This is required to help computing storage stats in the future, after collator-validator separation.
+
+### Other TVM changes
+- Fix returning `null` as `c4` and `c5` (when VM state is not committed) in `RUNVM`.

test/regression-tests.ans

@@ -25,7 +25,7 @@ Test_Fift_test_rist255_default f4d7558f200a656934f986145c19b1dedbe2ad029292a5a97
 Test_Fift_test_secp256k1_default 3118450dace6af05fcdbd54a87d9446162ce11ac6ef6dfc57998cf113587d602
 Test_Fift_test_sort2_default 9b57d47e6a10e7d1bbb565db35400debf2f963031f434742a702ec76555a5d3a
 Test_Fift_test_sort_default 9b57d47e6a10e7d1bbb565db35400debf2f963031f434742a702ec76555a5d3a
-Test_Fift_test_tvm_runvm_default ff3d2a4031b543c18d6b555f0a1f1a891c7825e6d1e2e9beb4bf13b37441450b
+Test_Fift_test_tvm_runvm_default b3e0d70c00f0e8bdf6d45c56c7c0817fa5be7a3fc540190786233a394de72e42
 Test_Fift_testvm2_default 8a6e35fc0224398be9d2de39d31c86ea96965ef1eca2aa9e0af2303150ed4a7b
 Test_Fift_testvm3_default 3c1b77471c5fd914ed8b5f528b9faed618e278693f5030b953ff150e543864ae
 Test_Fift_testvm4_default 8a6e35fc0224398be9d2de39d31c86ea96965ef1eca2aa9e0af2303150ed4a7b