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

change double input values to satoshis

Browse source
This commit is contained in:
gladcow 2020-04-09 16:04:31 +03:00
parent ca9e791c70
commit 3937a3a67b
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/plugins/peerplays_sidechain/bitcoin_utils.cpp
View file

@ -1,5 +1,6 @@
#include <fc/crypto/base58.hpp> #include <fc/crypto/base58.hpp>
#include <fc/crypto/elliptic.hpp> #include <fc/crypto/elliptic.hpp>
#include <fc/crypto/hex.hpp>
#include <fc/crypto/ripemd160.hpp> #include <fc/crypto/ripemd160.hpp>
#include <fc/crypto/sha256.hpp> #include <fc/crypto/sha256.hpp>
#include <fc/io/raw.hpp> #include <fc/io/raw.hpp>

2
libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp
View file

@ -20,7 +20,7 @@ class btc_txout {
public: public:
std::string txid_; std::string txid_;
unsigned int out_num_; unsigned int out_num_;
double amount_; uint64_t amount_;
}; };
class bitcoin_rpc_client { class bitcoin_rpc_client {

24
libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
View file

@ -585,7 +585,9 @@ std::vector<btc_txout> bitcoin_rpc_client::listunspent(const uint32_t minconf, c
btc_txout txo; btc_txout txo;
txo.txid_ = entry.second.get_child("txid").get_value<std::string>(); txo.txid_ = entry.second.get_child("txid").get_value<std::string>();
txo.out_num_ = entry.second.get_child("vout").get_value<unsigned int>(); txo.out_num_ = entry.second.get_child("vout").get_value<unsigned int>();
txo.amount_ = entry.second.get_child("amount").get_value<double>(); string amount = entry.second.get_child("amount").get_value<std::string>();
amount.erase(std::remove(amount.begin(), amount.end(), '.'), amount.end());
txo.amount_ = std::stoll(amount);
result.push_back(txo); result.push_back(txo);
} }
} }
@ -623,7 +625,9 @@ std::vector<btc_txout> bitcoin_rpc_client::listunspent_by_address_and_amount(con
btc_txout txo; btc_txout txo;
txo.txid_ = entry.second.get_child("txid").get_value<std::string>(); txo.txid_ = entry.second.get_child("txid").get_value<std::string>();
txo.out_num_ = entry.second.get_child("vout").get_value<unsigned int>(); txo.out_num_ = entry.second.get_child("vout").get_value<unsigned int>();
txo.amount_ = entry.second.get_child("amount").get_value<double>(); string amount = entry.second.get_child("amount").get_value<std::string>();
amount.erase(std::remove(amount.begin(), amount.end(), '.'), amount.end());
txo.amount_ = std::stoll(amount);
result.push_back(txo); result.push_back(txo);
} }
} }
@ -1348,8 +1352,7 @@ std::string sidechain_net_handler_bitcoin::create_primary_wallet_transaction() {
uint64_t min_fee_rate = 1000; uint64_t min_fee_rate = 1000;
fee_rate = std::max(fee_rate, min_fee_rate); fee_rate = std::max(fee_rate, min_fee_rate);
double min_amount = ((double)fee_rate / 100000000.0); // Account only for relay fee for now uint64_t total_amount = 0.0;
double total_amount = 0.0;
std::vector<btc_txout> inputs = bitcoin_client->listunspent_by_address_and_amount(prev_pw_address, 0); std::vector<btc_txout> inputs = bitcoin_client->listunspent_by_address_and_amount(prev_pw_address, 0);
if (inputs.size() == 0) { if (inputs.size() == 0) {
@ -1360,14 +1363,14 @@ std::string sidechain_net_handler_bitcoin::create_primary_wallet_transaction() {
total_amount += utx.amount_; total_amount += utx.amount_;
} }
if (min_amount >= total_amount) { if (fee_rate >= total_amount) {
elog("Failed not enough BTC to transfer from ${fa}", ("fa", prev_pw_address)); elog("Failed not enough BTC to transfer from ${fa}", ("fa", prev_pw_address));
return ""; return "";
} }
} }
fc::flat_map<std::string, double> outputs; fc::flat_map<std::string, double> outputs;
outputs[active_pw_address] = total_amount - min_amount; outputs[active_pw_address] = double(total_amount - fee_rate) / 100000000.0;
return create_transaction(inputs, outputs); return create_transaction(inputs, outputs);
} }
@ -1430,8 +1433,7 @@ std::string sidechain_net_handler_bitcoin::create_withdrawal_transaction(const s
uint64_t min_fee_rate = 1000; uint64_t min_fee_rate = 1000;
fee_rate = std::max(fee_rate, min_fee_rate); fee_rate = std::max(fee_rate, min_fee_rate);
double min_amount = ((double)(swwo.withdraw_amount.value + fee_rate) / 100000000.0); // Account only for relay fee for now uint64_t total_amount = 0;
double total_amount = 0.0;
std::vector<btc_txout> inputs = bitcoin_client->listunspent_by_address_and_amount(pw_address, 0); std::vector<btc_txout> inputs = bitcoin_client->listunspent_by_address_and_amount(pw_address, 0);
if (inputs.size() == 0) { if (inputs.size() == 0) {
@ -1442,7 +1444,7 @@ std::string sidechain_net_handler_bitcoin::create_withdrawal_transaction(const s
total_amount += utx.amount_; total_amount += utx.amount_;
} }
if (min_amount > total_amount) { if (fee_rate > total_amount) {
elog("Failed not enough BTC to spend for ${pw}", ("pw", pw_address)); elog("Failed not enough BTC to spend for ${pw}", ("pw", pw_address));
return ""; return "";
} }
@ -1450,8 +1452,8 @@ std::string sidechain_net_handler_bitcoin::create_withdrawal_transaction(const s
fc::flat_map<std::string, double> outputs; fc::flat_map<std::string, double> outputs;
outputs[swwo.withdraw_address] = swwo.withdraw_amount.value / 100000000.0; outputs[swwo.withdraw_address] = swwo.withdraw_amount.value / 100000000.0;
if ((total_amount - min_amount) > 0.0) { if ((total_amount - fee_rate) > 0.0) {
outputs[pw_address] = total_amount - min_amount; outputs[pw_address] = double(total_amount - fee_rate) / 100000000.0;
} }
return create_transaction(inputs, outputs); return create_transaction(inputs, outputs);