From 51b2ca625e55a405950bad276f11923299cf8c50 Mon Sep 17 00:00:00 2001 From: kstdl Date: Wed, 27 Dec 2017 17:21:56 +0300 Subject: [PATCH] added owner to lottery_asset_options. commented async call in on_applied_block callback --- libraries/app/api.cpp | 4 +++- libraries/chain/include/graphene/chain/protocol/asset_ops.hpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 0cb6ae0d..a6db2008 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -160,7 +160,9 @@ namespace graphene { namespace app { { auto block_num = b.block_num(); auto& callback = _callbacks.find(id)->second; - fc::async( [capture_this,this,id,block_num,trx_num,trx,callback](){ callback( fc::variant(transaction_confirmation{ id, block_num, trx_num, trx}) ); } ); + // fc::async( [capture_this,this,id,block_num,trx_num,trx,callback](){ + callback( fc::variant(transaction_confirmation{ id, block_num, trx_num, trx}) ); + // } ); } } } diff --git a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp index 1639d4cd..e2b93fd2 100644 --- a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp +++ b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp @@ -658,7 +658,7 @@ FC_REFLECT( graphene::chain::bitasset_options, FC_REFLECT( graphene::chain::benefactor, (id)(share) ) -FC_REFLECT( graphene::chain::lottery_asset_options, (benefactors)(winning_tickets)(ticket_price)(end_date)(ending_on_soldout)(is_active) ) +FC_REFLECT( graphene::chain::lottery_asset_options, (benefactors)(owner)(winning_tickets)(ticket_price)(end_date)(ending_on_soldout)(is_active) ) FC_REFLECT( graphene::chain::asset_create_operation::fee_parameters_type, (symbol3)(symbol4)(long_symbol)(price_per_kbyte) )