diff --git a/libraries/chain/sidechain_transaction_evaluator.cpp b/libraries/chain/sidechain_transaction_evaluator.cpp index e644d91e..7a684b79 100644 --- a/libraries/chain/sidechain_transaction_evaluator.cpp +++ b/libraries/chain/sidechain_transaction_evaluator.cpp @@ -15,8 +15,8 @@ void_result bitcoin_transaction_send_evaluator::do_evaluate(const bitcoin_transa { try { - FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK"); // can be removed after HF date pass - FC_ASSERT(op.payer == db().get_global_properties().parameters.get_son_btc_account_id(), "Payer should be the son btc account"); + FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK"); + FC_ASSERT( op.payer == GRAPHENE_SON_ACCOUNT, "SON paying account must be set as payer." ); return void_result(); } FC_CAPTURE_AND_RETHROW((op)) @@ -104,8 +104,8 @@ void_result bitcoin_send_transaction_process_evaluator::do_evaluate(const bitcoi { try { - FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK"); // can be removed after HF date pass - FC_ASSERT(op.payer == db().get_global_properties().parameters.get_son_btc_account_id(), "Payer should be the son btc account"); + FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK"); + FC_ASSERT( op.payer == GRAPHENE_SON_ACCOUNT, "SON paying account must be set as payer." ); const auto& btidx = db().get_index_type().indices().get(); const auto btobj = btidx.find(op.bitcoin_transaction_id); FC_ASSERT(btobj != btidx.end(), "Bitcoin Transaction Object not found"); diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp index b4ab363c..64fea1be 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp @@ -36,8 +36,8 @@ protected: virtual std::string transfer( const std::string& from, const std::string& to, const uint64_t amount ) = 0; virtual std::string sign_transaction( const std::string& transaction ) = 0; virtual std::string send_transaction( const std::string& transaction ) = 0; - virtual std::string transfer_deposit_to_primary_wallet (const sidechain_event_data& sed) = 0; - virtual std::string transfer_withdrawal_from_primary_wallet(const std::string& user_address, double sidechain_amount) = 0; + //virtual std::string transfer_deposit_to_primary_wallet (const sidechain_event_data& sed) = 0; + //virtual std::string transfer_withdrawal_from_primary_wallet(const std::string& user_address, double sidechain_amount) = 0; private: diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp index 16967907..e89bd9c8 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp @@ -65,9 +65,6 @@ void sidechain_net_handler::sidechain_event_data_received(const sidechain_event_ // Deposit request if ((sed.peerplays_to == GRAPHENE_SON_ACCOUNT) && (sed.sidechain_currency.compare("1.3.0") != 0)) { - - transfer_deposit_to_primary_wallet(sed); - son_wallet_deposit_create_operation op; op.payer = GRAPHENE_SON_ACCOUNT; op.timestamp = sed.timestamp; diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index ee4b13e6..dd644f3d 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -670,7 +670,7 @@ std::string sidechain_net_handler_bitcoin::transfer_deposit_to_primary_wallet ( std::string txid = sed.sidechain_transaction_id; std::string suid = sed.sidechain_uid; std::string nvout = suid.substr(suid.find_last_of("-")+1); - uint64_t deposit_amount = sed.sidechain_amount; + uint64_t deposit_amount = sed.sidechain_amount.value; uint64_t fee_rate = bitcoin_client->receive_estimated_fee(); uint64_t min_fee_rate = 1000; fee_rate = std::max(fee_rate, min_fee_rate); diff --git a/tests/tests/sidechain_transaction_tests.cpp b/tests/tests/sidechain_transaction_tests.cpp index 8d8bb64f..0246d009 100644 --- a/tests/tests/sidechain_transaction_tests.cpp +++ b/tests/tests/sidechain_transaction_tests.cpp @@ -150,7 +150,21 @@ BOOST_AUTO_TEST_CASE(bitcoin_transaction_send_test) generate_block(); - const auto &son_btc_account = db.create([&](account_object &obj) { + const auto& acc_idx = db.get_index_type().indices().get(); + auto acc_itr = acc_idx.find(GRAPHENE_SON_ACCOUNT); + BOOST_REQUIRE(acc_itr != acc_idx.end()); + db.modify(*acc_itr, [&](account_object &obj) { + obj.active.account_auths.clear(); + obj.active.add_authority(bob_id, 1); + obj.active.add_authority(alice_id, 1); + obj.active.weight_threshold = 2; + obj.owner.account_auths.clear(); + obj.owner.add_authority(bob_id, 1); + obj.owner.add_authority(alice_id, 1); + obj.owner.weight_threshold = 2; + }); + + /*const auto &son_btc_account = db.create([&](account_object &obj) { obj.name = "son_btc_account"; obj.statistics = db.create([&](account_statistics_object &acc_stat) { acc_stat.owner = obj.id; }).id; obj.membership_expiration_date = time_point_sec::maximum(); @@ -170,7 +184,7 @@ BOOST_AUTO_TEST_CASE(bitcoin_transaction_send_test) _gpo.parameters.extensions.value.son_btc_account = son_btc_account.get_id(); if( _gpo.pending_parameters ) _gpo.pending_parameters->extensions.value.son_btc_account = son_btc_account.get_id(); - }); + });*/ generate_block(); @@ -181,7 +195,7 @@ BOOST_AUTO_TEST_CASE(bitcoin_transaction_send_test) bitcoin_transaction_send_operation send_op; - send_op.payer = db.get_global_properties().parameters.get_son_btc_account_id(); + send_op.payer = GRAPHENE_SON_ACCOUNT; proposal_create_operation proposal_op; proposal_op.fee_paying_account = alice_id; @@ -297,7 +311,7 @@ BOOST_AUTO_TEST_CASE(bitcoin_transaction_send_test) bitcoin_send_transaction_process_operation process_op; process_op.bitcoin_transaction_id = bitcoin_transaction_id_type(0); - process_op.payer = db.get_global_properties().parameters.get_son_btc_account_id(); + process_op.payer = GRAPHENE_SON_ACCOUNT; proposal_create_operation proposal_op; proposal_op.fee_paying_account = alice_id;