Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

#266 Fix hard-coded fee for issuing assets in sidechain plugin #646

Merged
vampik merged 1 commit from bug/266-fee-assets into develop 2022-02-10 23:02:00 +00:00
Conversation 3 Commits 1 Files changed 2 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
View file

@ -589,7 +589,7 @@ void sidechain_net_handler::settle_sidechain_transactions() {
if (settle_amount.amount != 0) { if (settle_amount.amount != 0) {
if (sto.object_id.is<son_wallet_deposit_id_type>()) { if (sto.object_id.is<son_wallet_deposit_id_type>()) {
asset_issue_operation ai_op; asset_issue_operation ai_op;
ai_op.fee = asset(2001000); ai_op.fee = database.current_fee_schedule().calculate_fee(ai_op);
ai_op.issuer = gpo.parameters.son_account(); ai_op.issuer = gpo.parameters.son_account();
ai_op.asset_to_issue = settle_amount; ai_op.asset_to_issue = settle_amount;
ai_op.issue_to_account = database.get<son_wallet_deposit_object>(sto.object_id).peerplays_from; ai_op.issue_to_account = database.get<son_wallet_deposit_object>(sto.object_id).peerplays_from;
@ -598,7 +598,7 @@ void sidechain_net_handler::settle_sidechain_transactions() {
if (sto.object_id.is<son_wallet_withdraw_id_type>()) { if (sto.object_id.is<son_wallet_withdraw_id_type>()) {
asset_reserve_operation ar_op; asset_reserve_operation ar_op;
ar_op.fee = asset(2001000); ar_op.fee = database.current_fee_schedule().calculate_fee(ar_op);
ar_op.payer = gpo.parameters.son_account(); ar_op.payer = gpo.parameters.son_account();
ar_op.amount_to_reserve = settle_amount; ar_op.amount_to_reserve = settle_amount;
proposal_op.proposed_ops.emplace_back(ar_op); proposal_op.proposed_ops.emplace_back(ar_op);

2
libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp
View file

@ -627,7 +627,7 @@ bool sidechain_net_handler_hive::process_deposit(const son_wallet_deposit_object
proposal_op.proposed_ops.emplace_back(swdp_op); proposal_op.proposed_ops.emplace_back(swdp_op);
asset_issue_operation ai_op; asset_issue_operation ai_op;
ai_op.fee = asset(2001000); ai_op.fee = database.current_fee_schedule().calculate_fee(ai_op);
ai_op.issuer = gpo.parameters.son_account(); ai_op.issuer = gpo.parameters.son_account();
ai_op.asset_to_issue = asset_to_issue; ai_op.asset_to_issue = asset_to_issue;
ai_op.issue_to_account = swdo.peerplays_from; ai_op.issue_to_account = swdo.peerplays_from;