Merge branch 'bug/482-burn-eth-from-son-account' into 'develop'
#482 burn eth from son account See merge request PBSA/peerplays!186
This commit is contained in:
commit
440e4fbb43
1 changed files with 11 additions and 1 deletions
|
|
@ -686,8 +686,18 @@ bool sidechain_net_handler_ethereum::settle_sidechain_transaction(const sidechai
|
||||||
if (count != json.get_child("result_array").size()) {
|
if (count != json.get_child("result_array").size()) {
|
||||||
wlog("Not all receipts received for transaction ${id}", ("id", sto.id));
|
wlog("Not all receipts received for transaction ${id}", ("id", sto.id));
|
||||||
return false;
|
return false;
|
||||||
} else
|
} else {
|
||||||
|
if (sto.object_id.is<son_wallet_id_type>()) {
|
||||||
|
settle_amount = asset(0, database.get_global_properties().parameters.eth_asset());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sto.object_id.is<son_wallet_withdraw_id_type>()) {
|
||||||
|
auto swwo = database.get<son_wallet_withdraw_object>(sto.object_id);
|
||||||
|
settle_amount = asset(swwo.withdraw_amount, database.get_global_properties().parameters.eth_asset());
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue