Skip to content

Commit

Permalink
Explicitly handle special cells in action list (#777)
Browse files Browse the repository at this point in the history
  • Loading branch information
SpyCheese authored and EmelyanenkoK committed Oct 20, 2023
1 parent 65d22c4 commit 866fbf9
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions crypto/block/transaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,12 @@ int output_actions_count(Ref<vm::Cell> list) {
int i = -1;
do {
++i;
list = load_cell_slice(std::move(list)).prefetch_ref();
bool special = true;
auto cs = load_cell_slice_special(std::move(list), special);
if (special) {
break;
}
list = cs.prefetch_ref();
} while (list.not_null());
return i;
}
Expand Down Expand Up @@ -1122,7 +1127,8 @@ bool Transaction::prepare_compute_phase(const ComputePhaseConfig& cfg) {
int out_act_num = output_actions_count(cp.actions);
if (verbosity > 2) {
std::cerr << "new smart contract data: ";
load_cell_slice(cp.new_data).print_rec(std::cerr);
bool can_be_special = true;
load_cell_slice_special(cp.new_data, can_be_special).print_rec(std::cerr);
std::cerr << "output actions: ";
block::gen::OutList{out_act_num}.print_ref(std::cerr, cp.actions);
}
Expand Down Expand Up @@ -1192,7 +1198,15 @@ bool Transaction::prepare_action_phase(const ActionPhaseConfig& cfg) {
int n = 0;
while (true) {
ap.action_list.push_back(list);
auto cs = load_cell_slice(std::move(list));
bool special = true;
auto cs = load_cell_slice_special(std::move(list), special);
if (special) {
ap.result_code = 32; // action list invalid
ap.result_arg = n;
ap.action_list_invalid = true;
LOG(DEBUG) << "action list invalid: special cell";
return true;
}
if (!cs.size_ext()) {
break;
}
Expand Down

0 comments on commit 866fbf9

Please sign in to comment.