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

Merge branch 'develop' into 'feature/270-funtions-unified-form'

Browse source 
Conflicts are resolved:
  libraries/app/database_api.cpp
  libraries/app/include/graphene/app/database_api.hpp
This commit is contained in:
Vlad Dobromyslov 2022-02-11 05:19:03 +00:00
commit c8da295060
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.gitmodules vendored
View file

@ -1,9 +1,9 @@
[submodule "docs"] [submodule "docs"]
path = docs path = docs
url = https://github.com/bitshares/bitshares-core.wiki.git url = https://github.com/bitshares/bitshares-core.wiki.git
ignore = dirty ignore = dirty
[submodule "libraries/fc"] [submodule "libraries/fc"]
path = libraries/fc path = libraries/fc
url = https://github.com/peerplays-network/peerplays-fc.git url = https://gitlab.com/PBSA/tools-libs/peerplays-fc.git
branch = latest-fc branch = latest-fc
ignore = dirty ignore = dirty

2
docs

@ -1 +1 @@
Subproject commit 8df8f66389853df73ab8f6dd73981be2a6957df8 Subproject commit 1e924950c2f92b166c34ceb294e8b8c4997a6c4e

2
libraries/fc

@ -1 +1 @@
Subproject commit 488883921936139e8734b99822d3a589afe80da1 Subproject commit 86b77c6eb450f97a29c627d3fa9728e25bed933a

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;