From bbc67dab49cebc91bf7c06099627dd521ccabf10 Mon Sep 17 00:00:00 2001 From: vonhenry Date: Thu, 28 Nov 2019 11:37:01 +0800 Subject: [PATCH] update --- plugins/ibc_plugin/ibc_plugin.cpp | 21 ++++++++++++------- .../include/eosio/ibc_plugin/ibc_plugin.hpp | 1 + 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/plugins/ibc_plugin/ibc_plugin.cpp b/plugins/ibc_plugin/ibc_plugin.cpp index f0543bb3a..f9447a684 100644 --- a/plugins/ibc_plugin/ibc_plugin.cpp +++ b/plugins/ibc_plugin/ibc_plugin.cpp @@ -887,7 +887,8 @@ namespace eosio { namespace ibc { auto actn = get_action( account, N(chaininit), vector{{ my_impl->relay, config::active_name}}, mvo() ("header", fc::raw::pack(msg.header)) ("active_schedule", msg.active_schedule) - ("blockroot_merkle", msg.blockroot_merkle)); + ("blockroot_merkle", msg.blockroot_merkle) + ("relay", my_impl->relay)); if ( ! actn.valid() ){ elog("chain_init: get action failed"); @@ -899,7 +900,8 @@ namespace eosio { namespace ibc { void ibc_chain_contract::pushsection( const lwc_section_data_message& msg ){ auto actn = get_action( account, N(pushsection), vector{{ my_impl->relay, config::active_name}}, mvo() ("headers", fc::raw::pack(msg.headers)) - ("blockroot_merkle", msg.blockroot_merkle)); + ("blockroot_merkle", msg.blockroot_merkle) + ("relay", my_impl->relay)); if ( ! actn.valid() ){ elog("newsection: get action failed"); @@ -913,7 +915,8 @@ namespace eosio { namespace ibc { ("headers", fc::raw::pack(msg.headers)) ("blockroot_merkle", msg.blockroot_merkle) ("proof_data", msg.proof_data) - ("proof_type", msg.proof_type)); + ("proof_type", msg.proof_type) + ("relay", my_impl->relay)); if ( ! actn.valid() ){ elog("newsection: get action failed"); @@ -923,7 +926,8 @@ namespace eosio { namespace ibc { } void ibc_chain_contract::rmfirstsctn(){ - auto actn = get_action( account, N(rmfirstsctn), vector{{ my_impl->relay, config::active_name}}, mvo()); + auto actn = get_action( account, N(rmfirstsctn), vector{{ my_impl->relay, config::active_name}}, mvo() + ("relay", my_impl->relay)); if ( ! actn.valid() ){ elog("newsection: get action failed"); @@ -1337,7 +1341,8 @@ namespace eosio { namespace ibc { ("anchor_block_num", par.anchor_block_num) ("to", par.to) ("quantity", par.quantity) - ("memo", par.memo)); + ("memo", par.memo) + ("relay", my_impl->relay)); if ( ! actn.valid() ){ elog("get cash action failed"); @@ -1521,7 +1526,8 @@ namespace eosio { namespace ibc { ("anchor_block_num", par.anchor_block_num) ("to", par.to) ("quantity", par.quantity) - ("memo", par.memo)); + ("memo", par.memo) + ("relay", my_impl->relay)); if ( ! actn.valid() ){ elog("cash: get action failed"); @@ -1576,7 +1582,8 @@ namespace eosio { namespace ibc { auto trx_id = params->at(index); auto actn = get_action( account, action_name, vector{{ my_impl->relay, config::active_name}}, mvo() ("peerchain_name", peerchain_name) - ("trx_id", trx_id)); + ("trx_id", trx_id) + ("relay", my_impl->relay)); if ( ! actn.valid() ){ elog("newsection: get action failed"); diff --git a/plugins/ibc_plugin/include/eosio/ibc_plugin/ibc_plugin.hpp b/plugins/ibc_plugin/include/eosio/ibc_plugin/ibc_plugin.hpp index 2b93e5d5d..3491ae79c 100644 --- a/plugins/ibc_plugin/include/eosio/ibc_plugin/ibc_plugin.hpp +++ b/plugins/ibc_plugin/include/eosio/ibc_plugin/ibc_plugin.hpp @@ -158,6 +158,7 @@ namespace eosio { namespace ibc { name to; asset quantity; string memo; + name relay; }; struct cashconfirm_action_params {