GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MERGE-FIX: Fix compilation errors

Browse source
This commit is contained in:
Steven Roose 2019-05-01 20:51:19 +01:00
parent 7256637dab
commit 9f4f2e7519
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
19 changed files with 63 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/assetsdir.cpp
View file

@ -6,7 +6,7 @@
#include <chainparams.h>
#include <tinyformat.h>
#include <utilstrencodings.h>
#include <util/strencodings.h>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>

2
src/blind.cpp
View file

@ -9,7 +9,7 @@
#include <primitives/confidential.h>
#include <issuance.h>
#include <random.h>
#include <util.h>
#include <util/system.h>
static secp256k1_context* secp256k1_blind_context = NULL;

2
src/init.cpp
View file

@ -45,7 +45,7 @@
#include <ui_interface.h>
#include <util/system.h>
#include <util/moneystr.h>
#include <utilstrencodings.h>
#include <util/strencodings.h>
#include <validation.h>
#include <validationinterface.h>
#include <warnings.h>

4
src/mainchainrpc.cpp
View file

@ -1,8 +1,8 @@
#include <mainchainrpc.h>
#include <chainparamsbase.h>
#include <util.h>
#include <utilstrencodings.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <rpc/protocol.h>
#include <support/events.h>

2
src/pegins.cpp
View file

@ -19,7 +19,7 @@
#include <script/interpreter.h>
#include <script/standard.h>
#include <streams.h>
#include <util.h>
#include <util/system.h>
//
// ELEMENTS

2
src/primitives/bitcoin/block.cpp
View file

@ -7,7 +7,7 @@
#include <hash.h>
#include <tinyformat.h>
#include <utilstrencodings.h>
#include <util/strencodings.h>
#include <crypto/common.h>
namespace Sidechain {

2
src/primitives/bitcoin/merkleblock.cpp
View file

@ -7,7 +7,7 @@
#include <hash.h>
#include <consensus/consensus.h>
#include <utilstrencodings.h>
#include <util/strencodings.h>
namespace Sidechain {
namespace Bitcoin {

2
src/primitives/bitcoin/transaction.cpp
View file

@ -7,7 +7,7 @@
#include <hash.h>
#include <tinyformat.h>
#include <utilstrencodings.h>
#include <util/strencodings.h>
namespace Sidechain {
namespace Bitcoin {

2
src/primitives/confidential.h
View file

@ -8,7 +8,7 @@
#include <serialize.h>
#include <span.h>
#include <uint256.h>
#include <utilstrencodings.h>
#include <util/strencodings.h>
extern bool g_con_elementsmode;

2
src/qt/bitcoinamountfield.cpp
View file

@ -66,7 +66,7 @@ public:
if(valid)
{
val = qBound(m_min_amount, val, m_max_amount);
input = GUIUtil::formatAssetAmount(current_asset, val, false, currentUnit, BitcoinUnits::separatorAlways, false);
input = GUIUtil::formatAssetAmount(current_asset, val, currentUnit, BitcoinUnits::separatorAlways, false);
lineEdit()->setText(input);
}
}

1
src/qt/forms/sendcoinsdialog.ui
View file

@ -888,7 +888,6 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
</widget>
</item>
<item>
<widget class="QLabel" name="labelMinFeeWarning">
<widget class="QLabel" name="labelCustomFeeWarning">
<property name="enabled">
<bool>true</bool>

2
src/qt/paymentserver.h
View file

@ -125,7 +125,7 @@ public Q_SLOTS:
#ifdef ENABLE_BIP70
// Submit Payment message to a merchant, get back PaymentACK:
void fetchPaymentACK(WalletModel* walletModel, const SendCoinsRecipient& recipient, QByteArray transaction);
void fetchPaymentACK(WalletModel* walletModel, const SendAssetsRecipient& recipient, QByteArray transaction);
#endif
private Q_SLOTS:

2
src/test/blech32_tests.cpp
View file

@ -4,7 +4,7 @@
#include <blech32.h>
#include <random.h>
#include <utilstrencodings.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <boost/test/unit_test.hpp>

4
src/test/pegin_spent_tests.cpp
View file

@ -13,8 +13,8 @@
#include <script/standard.h>
#include <txmempool.h>
#include <uint256.h>
#include <util.h>
#include <utilstrencodings.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <txdb.h>

4
src/test/pegin_witness_tests.cpp
View file

@ -13,11 +13,11 @@
#include <policy/policy.h>
#include <script/script.h>
#include <script/script_error.h>
#include <utilstrencodings.h>
#include <util/strencodings.h>
#include <validation.h>
#include <streams.h>
#include <test/test_bitcoin.h>
#include <util.h>
#include <util/system.h>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>

24
src/wallet/rpcdump.cpp
View file

@ -914,7 +914,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
CScriptID redeem_id(redeemScript);
// Check that the redeemScript and scriptPubKey match
if (GetScriptForDestination(redeem_id) != script) {
if (GetScriptForDestination(ScriptHash(redeem_id)) != script) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "The redeemScript does not match the scriptPubKey");
}
@ -1281,7 +1281,8 @@ UniValue getwalletpakinfo(const JSONRPCRequest& request)
"}\n"
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
if (pwallet->offline_counter == -1) {
throw JSONRPCError(RPC_MISC_ERROR, "This wallet has not been initialized for PAK-enforced peg-outs.");
@ -1336,7 +1337,8 @@ UniValue importblindingkey(const JSONRPCRequest& request)
+ HelpExampleCli("importblindingkey", "\"my blinded CT address\" <blindinghex>")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
CTxDestination dest = DecodeDestination(request.params[0].get_str());
if (!IsValidDestination(dest)) {
@ -1390,7 +1392,8 @@ UniValue importmasterblindingkey(const JSONRPCRequest& request)
+ HelpExampleCli("importmasterblindingkey", "<hexkey>")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
if (!IsHex(request.params[0].get_str())) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid hexadecimal for key");
@ -1434,7 +1437,8 @@ UniValue importissuanceblindingkey(const JSONRPCRequest& request)
+ HelpExampleCli("importblindingkey", "\"my blinded CT address\" <blindinghex>")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
if (!request.params[0].isStr() || !IsHex(request.params[0].get_str()) || request.params[0].get_str().size() != 64) {
throw JSONRPCError(RPC_TYPE_ERROR, "First argument must be a txid string");
@ -1508,8 +1512,8 @@ UniValue dumpblindingkey(const JSONRPCRequest& request)
+ HelpExampleCli("dumpblindingkey", "\"my address\"")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
CTxDestination dest = DecodeDestination(request.params[0].get_str());
if (!IsValidDestination(dest)) {
@ -1550,7 +1554,8 @@ UniValue dumpmasterblindingkey(const JSONRPCRequest& request)
+ HelpExampleCli("dumpmasterblindingkey", "")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
if (!pwallet->blinding_derivation_key.IsNull()) {
return HexStr(pwallet->blinding_derivation_key);
@ -1581,7 +1586,8 @@ UniValue dumpissuanceblindingkey(const JSONRPCRequest& request)
+ HelpExampleCli("dumpissuanceblindingkey", "\"<txid>\", 0")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
if (!request.params[0].isStr() || !IsHex(request.params[0].get_str()) || request.params[0].get_str().size() != 64) {
throw JSONRPCError(RPC_TYPE_ERROR, "First argument must be a txid string");

47
src/wallet/rpcwallet.cpp
View file

@ -4757,7 +4757,8 @@ UniValue initpegoutwallet(const JSONRPCRequest& request)
+ HelpExampleRpc("initpegoutwallet", "sh(wpkh(tpubDAY5hwtonH4NE8zY46ZMFf6B6F3fqMis7cwfNihXXpAg6XzBZNoHAdAzAZx2peoU8nTWFqvUncXwJ9qgE5VxcnUKxdut8F6mptVmKjfiwDQ/0/*))")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
// Check that network cares about PAK
if (!Params().GetEnforcePak()) {
@ -4909,7 +4910,8 @@ UniValue sendtomainchain_base(const JSONRPCRequest& request)
+ HelpExampleRpc("sendtomainchain", "\"mgWEy4vBJSHt3mC8C2SEWJQitifb4qeZQq\" 0.1")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
EnsureWalletIsUnlocked(pwallet);
@ -4941,7 +4943,7 @@ UniValue sendtomainchain_base(const JSONRPCRequest& request)
mapValue_t mapValue;
CCoinControl no_coin_control; // This is a deprecated API
CTransactionRef tx = SendMoney(pwallet, address, nAmount, Params().GetConsensus().pegged_asset, subtract_fee, no_coin_control, std::move(mapValue), true /* ignore_blind_fail */);
CTransactionRef tx = SendMoney(*locked_chain, pwallet, address, nAmount, Params().GetConsensus().pegged_asset, subtract_fee, no_coin_control, std::move(mapValue), true /* ignore_blind_fail */);
return (*tx).GetHash().GetHex();
@ -5017,7 +5019,8 @@ UniValue sendtomainchain_pak(const JSONRPCRequest& request)
+ HelpExampleRpc("sendtomainchain", "\"\" 0.1")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
EnsureWalletIsUnlocked(pwallet);
@ -5183,7 +5186,7 @@ UniValue sendtomainchain_pak(const JSONRPCRequest& request)
mapValue_t mapValue;
CCoinControl no_coin_control; // This is a deprecated API
CTransactionRef tx = SendMoney(pwallet, address, nAmount, Params().GetConsensus().pegged_asset, subtract_fee, no_coin_control, std::move(mapValue), true /* ignore_blind_fail */);
CTransactionRef tx = SendMoney(*locked_chain, pwallet, address, nAmount, Params().GetConsensus().pegged_asset, subtract_fee, no_coin_control, std::move(mapValue), true /* ignore_blind_fail */);
pwallet->SetOfflineCounter(counter+1);
@ -5248,7 +5251,8 @@ static UniValue createrawpegin(const JSONRPCRequest& request, T_tx_ref& txBTCRef
std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
CWallet* const pwallet = wallet.get();
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
if (!IsHex(request.params[0].get_str()) || !IsHex(request.params[1].get_str())) {
throw JSONRPCError(RPC_TYPE_ERROR, "the first two arguments must be hex strings");
@ -5467,7 +5471,8 @@ UniValue claimpegin(const JSONRPCRequest& request)
CTransactionRef tx_ref;
CMutableTransaction mtx;
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
if (IsInitialBlockDownload()) {
throw JSONRPCError(RPC_WALLET_ERROR, "Peg-ins cannot be completed during initial sync or reindexing.");
@ -5819,7 +5824,7 @@ static UniValue unblindrawtransaction(const JSONRPCRequest& request)
return result;
}
static CTransactionRef SendGenerationTransaction(const CScript& asset_script, const CPubKey &asset_pubkey, const CScript& token_script, const CPubKey &token_pubkey, CAmount asset_amount, CAmount token_amount, IssuanceDetails* issuance_details, CWallet* pwallet)
static CTransactionRef SendGenerationTransaction(const CScript& asset_script, const CPubKey &asset_pubkey, const CScript& token_script, const CPubKey &token_pubkey, CAmount asset_amount, CAmount token_amount, IssuanceDetails* issuance_details, interfaces::Chain::Lock& locked_chain, CWallet* pwallet)
{
CAsset reissue_token = issuance_details->reissuance_token;
CAmount curBalance = pwallet->GetBalance()[reissue_token];
@ -5860,7 +5865,7 @@ static CTransactionRef SendGenerationTransaction(const CScript& asset_script, co
CCoinControl dummy_control;
BlindDetails blind_details;
CTransactionRef tx_ref(MakeTransactionRef());
if (!pwallet->CreateTransaction(vecSend, tx_ref, change_keys, nFeeRequired, nChangePosRet, strError, dummy_control, true, &blind_details, issuance_details)) {
if (!pwallet->CreateTransaction(locked_chain, vecSend, tx_ref, change_keys, nFeeRequired, nChangePosRet, strError, dummy_control, true, &blind_details, issuance_details)) {
throw JSONRPCError(RPC_WALLET_ERROR, strError);
}
@ -5905,7 +5910,8 @@ UniValue issueasset(const JSONRPCRequest& request)
+ HelpExampleRpc("issueasset", "10, 0")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
CAmount nAmount = AmountFromValue(request.params[0]);
CAmount nTokens = AmountFromValue(request.params[1]);
@ -5946,7 +5952,7 @@ UniValue issueasset(const JSONRPCRequest& request)
CAsset dummyasset;
IssuanceDetails issuance_details;
issuance_details.blind_issuance = blind_issuances;
CTransactionRef tx_ref = SendGenerationTransaction(GetScriptForDestination(asset_dest), asset_dest_blindpub, GetScriptForDestination(token_dest), token_dest_blindpub, nAmount, nTokens, &issuance_details, pwallet);
CTransactionRef tx_ref = SendGenerationTransaction(GetScriptForDestination(asset_dest), asset_dest_blindpub, GetScriptForDestination(token_dest), token_dest_blindpub, nAmount, nTokens, &issuance_details, *locked_chain, pwallet);
// Calculate asset type, assumes first vin is used for issuance
CAsset asset;
@ -5992,7 +5998,8 @@ UniValue reissueasset(const JSONRPCRequest& request)
+ HelpExampleRpc("reissueasset", "<asset>, 0")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
std::string assetstr = request.params[0].get_str();
CAsset asset = GetAssetFromString(assetstr);
@ -6042,7 +6049,7 @@ UniValue reissueasset(const JSONRPCRequest& request)
CPubKey token_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(token_dest));
// Attempt a send.
CTransactionRef tx_ref = SendGenerationTransaction(GetScriptForDestination(asset_dest), asset_dest_blindpub, GetScriptForDestination(token_dest), token_dest_blindpub, nAmount, -1, &issuance_details, pwallet);
CTransactionRef tx_ref = SendGenerationTransaction(GetScriptForDestination(asset_dest), asset_dest_blindpub, GetScriptForDestination(token_dest), token_dest_blindpub, nAmount, -1, &issuance_details, *locked_chain, pwallet);
assert(!tx_ref->vin.empty());
UniValue obj(UniValue::VOBJ);
@ -6094,7 +6101,8 @@ UniValue listissuances(const JSONRPCRequest& request)
+ HelpExampleRpc("listissuances", "<asset>")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
std::string assetstr;
CAsset asset_filter;
@ -6177,7 +6185,8 @@ UniValue destroyamount(const JSONRPCRequest& request)
+ HelpExampleRpc("destroyamount", "\"bitcoin\" 100 \"destroy assets\"")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
std::string strasset = request.params[0].get_str();
CAsset asset = GetAssetFromString(strasset);
@ -6197,7 +6206,7 @@ UniValue destroyamount(const JSONRPCRequest& request)
NullData nulldata;
CTxDestination address(nulldata);
CCoinControl no_coin_control; // This is a deprecated API
CTransactionRef tx = SendMoney(pwallet, address, nAmount, asset, false, no_coin_control, std::move(mapValue), true);
CTransactionRef tx = SendMoney(*locked_chain, pwallet, address, nAmount, asset, false, no_coin_control, std::move(mapValue), true);
return tx->GetHash().GetHex();
}
@ -6226,7 +6235,8 @@ UniValue generatepegoutproof(const JSONRPCRequest& request)
+ HelpExampleRpc("generatepegoutproof", "\"cQtNrRngdc4RJ9CkuTVKVLyxPFsijiTJySob24xCdKXGohdFhXML\" \"02c611095119e3dc96db428a0e190a3e142237bcd2efa4fb358257497885af3ab6\" \"0390695fff5535780df1e04c1f6c10e7c0a399fa56cfce34bf8108d0a9bc7a437b\"")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
if (!IsHex(request.params[1].get_str()))
throw JSONRPCError(RPC_TYPE_ERROR, "btcpubkey must be hex string");
@ -6327,7 +6337,8 @@ UniValue getpegoutkeys(const JSONRPCRequest& request)
+ HelpExampleRpc("getpegoutkeys", "\"5Kb8kLf9zgWQnogidDA76MzPL6TsZZY36hWXMssSzNydYXYB9KF\", \"0389275d512326f7016e014d8625f709c01f23bd0dc16522bf9845a9ee1ef6cbf9\"")
);
LOCK2(cs_main, pwallet->cs_wallet);
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);
if (!request.params[1].isStr() || !IsHex(request.params[1].get_str()) || request.params[1].get_str().size() != 66) {
throw JSONRPCError(RPC_TYPE_ERROR, "offlinepubkey must be hex string of size 66");

3
src/wallet/wallet.cpp
View file

@ -5355,7 +5355,8 @@ void CWalletTx::WipeUnknownBlindingData()
std::map<uint256, std::pair<CAsset, CAsset> > CWallet::GetReissuanceTokenTypes() const {
std::map<uint256, std::pair<CAsset, CAsset> > tokenMap;
{
LOCK2(cs_main, cs_wallet);
auto locked_chain = chain().lock();
LOCK(cs_wallet);
for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) {
const CWalletTx* pcoin = &(*it).second;
CAsset asset;

2
src/wallet/wallet.h
View file

@ -524,8 +524,6 @@ public:
/** Pass this transaction to the mempool. Fails if absolute fee exceeds absurd fee. */
bool AcceptToMemoryPool(interfaces::Chain::Lock& locked_chain, const CAmount& nAbsurdFee, CValidationState& state);
std::set<uint256> GetConflicts() const;
// ELEMENTS:
private: