Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/ibc #3

Merged
merged 6 commits into from
Jan 17, 2019
Merged

Feature/ibc #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f268463
update
vonhenry Jan 14, 2019
8dfadda
update
vonhenry Jan 14, 2019
64dae87
update
vonhenry Jan 14, 2019
96bfece
update
vonhenry Jan 14, 2019
2df2776
update
vonhenry Jan 15, 2019
0671ee9
update
vonhenry Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 75 additions & 92 deletions plugins/ibc_plugin/ibc_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,48 +926,49 @@ namespace eosio { namespace ibc {
name account;
};

optional<memo_info_type> ibc_token_contract::get_memo_info( const string& memo ){
auto get_item = [=]( string item ) -> string {
string search = string(" ") + item + "=";
auto pos = memo.find( search );
decltype(pos) pos_end;
if ( pos != std::string::npos ){
if ( item == "notes" ){
pos_end = memo.size();
} else {
pos_end = memo.find(" ", pos + search.length());
if( pos_end == std::string::npos ) {
pos_end = memo.size();
}
}
optional<memo_info_type> ibc_token_contract::get_memo_info( const string& memo_str ){

auto start = pos + search.length();
auto count = pos_end - start;
auto res = memo.substr( start, count );
if( res.length() == 0){
elog("ibc system error, memo contain incomplete item");
}
return res;
} else {
return string();
}
};
memo_info_type info;

string receiver_str = get_item("receiver");
string r_str = get_item("r");
string memo = memo_str;
trim( memo );

memo_info_type info;
if ( receiver_str != string() ){
info.receiver = name( receiver_str );
// --- get receiver ---
auto pos = memo.find("@");
if ( pos == std::string::npos ){
elog("memo format error, didn't find charactor \'@\' in memo");
return optional<memo_info_type>();
}

string receiver_str = memo.substr( 0, pos );
trim( receiver_str );
info.receiver = name( receiver_str );

// --- trim ---
memo = memo.substr( pos + 1 );
trim( memo );

// --- get chain name and notes ---
pos = memo.find(" ");
if ( pos == std::string::npos ){
info.chain = name( memo );
info.notes = "";
} else {
if( r_str == string() ){
elog("ibc system error, none of \"receiver\" or \"r\" is provided");
return optional<memo_info_type>();
}
info.receiver = name( r_str );
info.chain = name( memo.substr(0,pos) );
info.notes = memo.substr( pos + 1 );
trim( info.notes );
}

info.notes = get_item("notes");
if ( info.receiver == name() ){
elog("memo format error, receiver not provided in memo");
return optional<memo_info_type>();
}

if ( info.chain == name() ){
elog("memo format error, chain not provided in memo");
return optional<memo_info_type>();
}

return info;
}

Expand Down Expand Up @@ -1171,7 +1172,7 @@ namespace eosio { namespace ibc {
elog("push cash transaction failed, index ${i}",("i",index));
} else {
auto trx_id = result.get<chain_apis::read_write::push_transaction_results>().transaction_id;
ilog("pushed cash transaction: ${id}, index ${idx}", ( "id", trx_id )("idx", index));
dlog("pushed cash transaction: ${id}, index ${idx}", ( "id", trx_id )("idx", index));
next_seq_num += 1;
}

Expand All @@ -1180,7 +1181,7 @@ namespace eosio { namespace ibc {
if (next_index < params->size()) {
push_cash_recurse( next_index, params, next_seq_num );
} else {
ilog("all ${sum} cash transactions have tried to push, which belongs to blocks [${f},${t}]",
dlog("all ${sum} cash transactions have tried to push, which belongs to blocks [${f},${t}]",
("sum",params->size())("f",params->front().orig_trx_block_num)("t",params->back().orig_trx_block_num));
}
};
Expand Down Expand Up @@ -1261,14 +1262,14 @@ namespace eosio { namespace ibc {
return;
} else {
auto trx_id = result.get<chain_apis::read_write::push_transaction_results>().transaction_id;
ilog("pushed cashconfirm transaction: ${id}, index ${idx}", ( "id", trx_id )("idx", index));
dlog("pushed cashconfirm transaction: ${id}, index ${idx}", ( "id", trx_id )("idx", index));
}

int next_index = index + 1;
if (next_index < params->size()) {
push_cashconfirm_recurse( next_index, params );
} else {
ilog("successfully pushed all ${sum} cashconfirm transactions, which belongs to blocks [${f},${t}]",
dlog("successfully pushed all ${sum} cashconfirm transactions, which belongs to blocks [${f},${t}]",
("sum",params->size())("f",params->front().cash_trx_block_num)("t",params->back().cash_trx_block_num));
}
};
Expand Down Expand Up @@ -1987,13 +1988,13 @@ namespace eosio { namespace ibc {
}

void ibc_plugin_impl::irreversible_block(const block_state_ptr& block) {
fc_dlog(logger,"signaled, block: ${n}, id: ${id}",("n", block->block_num)("id", block->id));
/* fc_dlog(logger,"signaled, block: ${n}, id: ${id}",("n", block->block_num)("id", block->id)); */
blockroot_merkle_type brtm;
brtm.block_num = block->block_num;
brtm.merkle = block->blockroot_merkle;

blockroot_merkle_cache.push_back( brtm );
if ( blockroot_merkle_cache.size() > 3600*BlocksPerSecond*2 ){ // two hours
if ( blockroot_merkle_cache.size() > 3600*BlocksPerSecond*24 ){ // one day
blockroot_merkle_cache.erase( blockroot_merkle_cache.begin() );
}

Expand Down Expand Up @@ -2169,7 +2170,11 @@ namespace eosio { namespace ibc {
void ibc_plugin_impl::handle_message( connection_ptr c, const ibc_heartbeat_message &msg) {
peer_ilog(c, "received ibc_heartbeat_message");

idump((msg.origtrxs_table_id_range)(msg.cashtrxs_table_seq_num_range)(msg.new_producers_block_num));
dlog("msg.origtrxs_table_id_range: [${of},${ot}] msg.cashtrxs_table_seq_num_range: [${cf},${ct}] msg.new_producers_block_num: ${n}",
(msg.origtrxs_table_id_range.first)(msg.origtrxs_table_id_range.second)
(msg.cashtrxs_table_seq_num_range.first)(msg.cashtrxs_table_seq_num_range.second)
(msg.new_producers_block_num));
// idump((msg.origtrxs_table_id_range)(msg.cashtrxs_table_seq_num_range)(msg.new_producers_block_num));

// step one: check ibc_chain_state and lwcls
if ( msg.ibc_chain_state == deployed ) { // send lwc_init_message
Expand Down Expand Up @@ -2348,22 +2353,22 @@ namespace eosio { namespace ibc {
ilog("didn't find block_state of number ${n} in forkdb, calculate it by known blockroot_merkles",("n",check_num));

chain_contract->get_blkrtmkls_tb();
static blockroot_merkle_type walk_point;

if ( walk_point.block_num == 0 ){
for ( auto brtm : chain_contract->history_blockroot_merkles ) {
if ( walk_point.block_num < brtm.block_num && brtm.block_num <= check_num ){
walk_point = brtm;
}
blockroot_merkle_type walk_point;

for ( auto brtm : chain_contract->history_blockroot_merkles ) {
if ( walk_point.block_num < brtm.block_num && brtm.block_num <= check_num ){
walk_point = brtm;
}
}

if ( walk_point.block_num == 0 ){
elog("can not find fit blockroot_merkle to calculation blockroot_merkle of blcok ${n}", ("n",check_num));
return;
}

static const uint32_t max_interval_blocks = BlocksPerSecond * 3600 * 26; // 26 hours
ilog("find block ${b} with fit blockroot_merkle",("b",walk_point.block_num));

static const uint32_t max_interval_blocks = BlocksPerSecond * 3600; // 1 hours
if ( check_num - walk_point.block_num <= max_interval_blocks ){
while( walk_point.block_num < check_num ){
walk_point.merkle.append( chain_plug->chain().get_block_id_for_num( walk_point.block_num ) );
Expand All @@ -2390,6 +2395,8 @@ namespace eosio { namespace ibc {
}
peer_ilog(c,"sending lwc_section_data_message, range [${from},${to}], merkle nodes ${nodes}", ("from",start_num)("to",tmp_end_num)("nodes",ret_msg.blockroot_merkle._active_nodes.size()));
c->enqueue( ret_msg );

return; // send only once
}
}

Expand Down Expand Up @@ -2611,6 +2618,9 @@ namespace eosio { namespace ibc {
blockroot_merkle_cache.begin()->block_num <= block_num && block_num <= blockroot_merkle_cache.rbegin()->block_num ){
return blockroot_merkle_cache[ block_num - blockroot_merkle_cache.begin()->block_num ].merkle;
}



incremental_merkle mkl;
mkl._node_count = 0;
return mkl;
Expand Down Expand Up @@ -2695,51 +2705,24 @@ namespace eosio { namespace ibc {
return;
}

signed_block_ptr check_begin, check_end;
try {
check_begin = chain_plug->chain().fetch_block_by_number( lwcls.last_num );
check_end = chain_plug->chain().fetch_block_by_number( local_safe_head_num );
} catch (...) {
elog("exception ocurred when fetch block ${n1}, ${n2}",("n1",lwcls.last_num)("n2",local_safe_head_num));
return;
}

if ( check_begin == signed_block_ptr() || check_end == signed_block_ptr() ){
elog("internal error, fetch block ${n1}, ${n2} failed",("n1",lwcls.last_num)("n2",local_safe_head_num));
return;
static uint32_t check_block_num = 0;

if ( lwcls.last_num > check_block_num ){
check_block_num = lwcls.last_num;
}

auto get_block_ptr = [=]( uint32_t num ) -> signed_block_ptr {
return chain_plug->chain().fetch_block_by_number(num);
};

// check if producer schedule updated
if ( check_begin->schedule_version < check_end->schedule_version ){
// find the last header whose schedule version equal to check_begin's schedule version, use binary search
signed_block_ptr search_first, search_middle, search_last;

search_first = check_begin;
search_last = check_end;
search_middle = get_block_ptr( search_first->block_num() + ( search_last->block_num() - search_first->block_num() ) / 2 );

while ( search_last->block_num() - search_first->block_num() >= 4 ){
if ( search_middle->schedule_version > search_first->schedule_version ){
search_last = search_middle;
search_middle = get_block_ptr( search_first->block_num() + ( search_last->block_num() - search_first->block_num() ) / 2 );
} else {
search_first = search_middle;
search_middle = get_block_ptr( search_first->block_num() + ( search_last->block_num() - search_first->block_num() ) / 2 );
}
}

for( uint32_t blk_num = search_first->block_num() + 1; blk_num <= search_last->block_num(); ++blk_num ){
if ( get_block_ptr( blk_num )->schedule_version == check_begin->schedule_version + 1 ){
msg.new_producers_block_num = blk_num - 1;
ilog("find new_producers_block_num ${n}", ("n", msg.new_producers_block_num));
return;
}
while ( check_block_num < local_safe_head_num ){
auto np_opt = get_block_ptr(check_block_num)->new_producers;
if ( np_opt.valid() && np_opt->producers.size() > 0 ){
msg.new_producers_block_num = check_block_num - 1;
ilog("find new_producers_block_num ${n} < ---- new producers ---- >",("n",msg.new_producers_block_num));
return;
}
elog("internal errror, can't find fit block num for the next schedule_version");
++check_block_num;
}
}

Expand Down Expand Up @@ -3002,7 +2985,7 @@ namespace eosio { namespace ibc {
cash_begin = local_cashtrxs.begin()->table_id;
cash_end = local_cashtrxs.rbegin()->table_id;
}
dlog("local_origtrxs id range [${of} - ${ot}], local_cashtrxs id range [${cf} - ${ct}]",("of",orig_begin)("ot",orig_end)("cf",cash_begin)("ct",cash_end));
// ilog("local_origtrxs id range [${of} - ${ot}], local_cashtrxs id range [${cf} - ${ct}]",("of",orig_begin)("ot",orig_end)("cf",cash_begin)("ct",cash_end));


if ( chain_contract->state != working || token_contract->state != working ){
Expand Down
6 changes: 4 additions & 2 deletions plugins/ibc_plugin/include/eosio/ibc_plugin/ibc_plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ namespace eosio { namespace ibc {

struct global_state_ibc_token {
name ibc_contract;
name peerchain_name;
name peerchain_ibc_token_contract;
uint32_t max_origtrxs_table_records;
uint32_t cache_cashtrxs_table_records;
Expand Down Expand Up @@ -152,6 +153,7 @@ namespace eosio { namespace ibc {
// ---- ibc.token contract others ----
struct memo_info_type {
name receiver;
name chain;
string notes;
};

Expand All @@ -166,10 +168,10 @@ FC_REFLECT( eosio::ibc::blockroot_merkle_type, (block_num)(merkle) )

FC_REFLECT( eosio::ibc::transfer_action_type, (from)(to)(quantity)(memo) )
FC_REFLECT( eosio::ibc::transfer_action_info, (contract)(from)(quantity) )
FC_REFLECT( eosio::ibc::global_state_ibc_token, (ibc_contract)(peerchain_ibc_token_contract)(max_origtrxs_table_records)(cache_cashtrxs_table_records)(max_original_trxs_per_block)(active)(lock_start_time)(lock_minutes) )
FC_REFLECT( eosio::ibc::global_state_ibc_token, (ibc_contract)(peerchain_name)(peerchain_ibc_token_contract)(max_origtrxs_table_records)(cache_cashtrxs_table_records)(max_original_trxs_per_block)(active)(lock_start_time)(lock_minutes) )
FC_REFLECT( eosio::ibc::global_mutable_ibc_token, (cash_seq_num)(last_finished_trx_block_time_slot)(current_block_time_slot)(current_block_trxs)(origtrxs_tb_next_id) )
FC_REFLECT( eosio::ibc::original_trx_info, (id)(block_time_slot)(trx_id)(action) )
FC_REFLECT( eosio::ibc::cash_trx_info, (seq_num)(block_time_slot)(trx_id)(action)(orig_trx_id)(orig_trx_block_num) )
FC_REFLECT( eosio::ibc::cash_action_params, (seq_num)(orig_trx_block_num)(orig_trx_packed_trx_receipt)(orig_trx_merkle_path)(orig_trx_id)(to)(quantity)(memo)(relay) )
FC_REFLECT( eosio::ibc::cashconfirm_action_params, (cash_trx_block_num)(cash_trx_packed_trx_receipt)(cash_trx_merkle_path)(cash_trx_id)(orig_trx_id) )
FC_REFLECT( eosio::ibc::memo_info_type, (receiver)(notes) )
FC_REFLECT( eosio::ibc::memo_info_type, (receiver)(chain)(notes) )