Skip to content

Commit

Permalink
Fix missing block bug (crustio#238)
Browse files Browse the repository at this point in the history 
* fix miss block

* rename var

* add some logs
  • Loading branch information
@LowEntropyBody
LowEntropyBody authored Oct 12, 2020
1 parent 4e77e2f commit abb9864
Showing 1 changed file with 78 additions and 85 deletions.
163 changes: 78 additions & 85 deletions src/app/process/WorkReport.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ crust::Log *p_log = crust::Log::get_instance();
size_t get_random_wait_time(std::string seed)
{
unsigned int seed_number = 0;
for(size_t i = 0; i < seed.size(); i++)
for (size_t i = 0; i < seed.size(); i++)
{
seed_number += seed[i];
}
srand(time(NULL)+seed_number);
srand(time(NULL) + seed_number);
//[9 199]
return (rand() % (REPORT_INTERVAL_BLCOK_NUMBER_UPPER_LIMIT - REPORT_INTERVAL_BLCOK_NUMBER_LOWER_LIMIT + 1) + REPORT_INTERVAL_BLCOK_NUMBER_LOWER_LIMIT - 1) * BLOCK_INTERVAL;
}
Expand All @@ -29,124 +29,117 @@ void work_report_loop(void)
crust_status_t crust_status = CRUST_SUCCESS;
crust::Chain *p_chain = crust::Chain::get_instance();
size_t offline_base_height = REPORT_BLOCK_HEIGHT_BASE;
//int order_report_interval = 0;
size_t target_block_height = REPORT_BLOCK_HEIGHT_BASE;

while (true)
// Generate target block height
if (!offline_chain_mode)
{
// ----- Report order report ----- //
/*
if (3 == order_report_interval)
crust::BlockHeader *block_header = p_chain->get_block_header();
if (block_header == NULL)
{
// Ecall_get_signed_order_report will store order report in g_order_report
if(SGX_SUCCESS != Ecall_get_signed_order_report(global_eid, &crust_status)
|| CRUST_SUCCESS != crust_status)
{
if (CRUST_REPORT_NO_ORDER_FILE != crust_status)
{
p_log->err("Get signed order report failed! Error code: %x\n", crust_status);
}
}
else
{
p_log->info("Get order report:%s\n", get_g_order_report().c_str());
}
set_g_order_report("");
order_report_interval = 0;
p_log->warn("Cannot get block header! Set target block height %d\n", target_block_height);
}
order_report_interval++;
*/
else
{
target_block_height = (block_header->number / REPORT_BLOCK_HEIGHT_BASE + 1) * REPORT_BLOCK_HEIGHT_BASE;
p_log->info("Set target block height %d\n", target_block_height);
}
}

while (true)
{
// ----- Report work report ----- //
crust::BlockHeader *block_header = NULL;
if (!offline_chain_mode)
{
block_header = p_chain->get_block_header();
if (block_header == NULL)
{
p_log->warn("Cannot get block header!\n");
goto loop;
}

if (block_header->number < target_block_height)
{
goto loop;
}

block_header->number = (block_header->number / REPORT_BLOCK_HEIGHT_BASE) * REPORT_BLOCK_HEIGHT_BASE;

size_t wait_time = get_random_wait_time(Config::get_instance()->chain_address + Config::get_instance()->base_url);
p_log->info("It is estimated that the workload will be reported at the %lu block\n", block_header->number + (wait_time / BLOCK_INTERVAL) + 1);
sleep(wait_time);

// Get confirmed block hash
block_header->hash = p_chain->get_block_hash(block_header->number);
if (block_header->hash == "" || block_header->hash == "0000000000000000000000000000000000000000000000000000000000000000")
{
p_log->warn("Get block hash failed");
goto loop;
}

target_block_height = block_header->number + REPORT_BLOCK_HEIGHT_BASE;
}
else
{
block_header = new crust::BlockHeader();
block_header->hash = "0000000000000000000000000000000000000000000000000000000000000000";
block_header->hash = "1000000000000000000000000000000000000000000000000000000000000001";
block_header->number = offline_base_height;
offline_base_height += REPORT_BLOCK_HEIGHT_BASE;
sleep(60);
}

if (block_header == NULL)
// Get signed validation report
if (SGX_SUCCESS != Ecall_get_signed_work_report(global_eid, &crust_status,
block_header->hash.c_str(), block_header->number))
{
p_log->warn("Cannot get block header!\n");
goto loop;
p_log->err("Get signed work report failed!\n");
}
if (0 == block_header->number % REPORT_BLOCK_HEIGHT_BASE)
else
{
if (!offline_chain_mode)
if (CRUST_SUCCESS == crust_status)
{
size_t wait_time = get_random_wait_time(Config::get_instance()->chain_address+Config::get_instance()->base_url);
p_log->info("It is estimated that the workload will be reported at the %lu block\n", block_header->number + (wait_time / BLOCK_INTERVAL) + 1);
sleep(wait_time);
// Send signed validation report to crust chain
std::string work_str = get_g_enclave_workreport();
p_log->info("Sign validation report successfully!\n%s\n", work_str.c_str());

// Get confirmed block hash
block_header->hash = p_chain->get_block_hash(block_header->number);
if (block_header->hash == "")
if (!offline_chain_mode)
{
goto loop;
}
}
else
{
sleep(60);
}

// Get signed validation report
if (SGX_SUCCESS != Ecall_get_signed_work_report(global_eid, &crust_status,
block_header->hash.c_str(), block_header->number))
{
p_log->err("Get signed work report failed!\n");
}
else
{
if (CRUST_SUCCESS == crust_status)
{
// Send signed validation report to crust chain
std::string work_str = get_g_enclave_workreport();
p_log->info("Sign validation report successfully!\n%s\n", work_str.c_str());

if (!offline_chain_mode)
// Delete space and line break
remove_char(work_str, '\\');
remove_char(work_str, '\n');
remove_char(work_str, ' ');
if (!p_chain->post_sworker_work_report(work_str))
{
// Delete space and line break
remove_char(work_str, '\\');
remove_char(work_str, '\n');
remove_char(work_str, ' ');
if (!p_chain->post_sworker_work_report(work_str))
{
p_log->err("Send work report to crust chain failed!\n");
}
else
{
p_log->info("Send work report to crust chain successfully!\n");
report_add_callback();
}
p_log->err("Send work report to crust chain failed!\n");
}
else
{
p_log->info("Send work report to crust chain successfully!\n");
report_add_callback();
}
}
else if (crust_status == CRUST_BLOCK_HEIGHT_EXPIRED)
{
p_log->info("Block height expired.\n");
}
else if (crust_status == CRUST_FIRST_WORK_REPORT_AFTER_REPORT)
{
p_log->info("Can't generate work report for the first time after restart\n");
}
else if (crust_status == CRUST_NO_KARST)
{
p_log->info("Can't generate work report. You have meaningful files, please start karst\n");
}
else
{
p_log->err("Get signed validation report failed! Error code: %x\n", crust_status);
report_add_callback();
}
}
else if (crust_status == CRUST_BLOCK_HEIGHT_EXPIRED)
{
p_log->info("Block height expired.\n");
}
else if (crust_status == CRUST_FIRST_WORK_REPORT_AFTER_REPORT)
{
p_log->info("Can't generate work report for the first time after restart\n");
}
else if (crust_status == CRUST_NO_KARST)
{
p_log->info("Can't generate work report. You have meaningful files, please start karst\n");
}
else
{
p_log->err("Get signed validation report failed! Error code: %x\n", crust_status);
}
}

loop:
Expand Down

0 comments on commit abb9864

Please # to comment.