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

Whitespace and tab linting

Browse source
This commit is contained in:
Gregory Sanders 2019-03-20 11:15:45 -04:00
parent 30552459dc
commit 665d9ebe0e
9 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/blind.cpp
View file

@ -426,7 +426,7 @@ int BlindTransaction(std::vector<uint256 >& input_value_blinding_factors, const
// Derive the asset of the issuance asset/token // Derive the asset of the issuance asset/token
if (issuance.assetBlindingNonce.IsNull()) { if (issuance.assetBlindingNonce.IsNull()) {
uint256 entropy; uint256 entropy;
GenerateAssetEntropy(entropy, tx.vin[nIn].prevout, issuance.assetEntropy); GenerateAssetEntropy(entropy, tx.vin[nIn].prevout, issuance.assetEntropy);
if (nPseudo == 0) { if (nPseudo == 0) {
CalculateAsset(asset, entropy); CalculateAsset(asset, entropy);
@ -434,7 +434,7 @@ int BlindTransaction(std::vector<uint256 >& input_value_blinding_factors, const
bool blind_issuance = (token_blinding_privkey.size() > nIn && token_blinding_privkey[nIn].IsValid()) ? true : false; bool blind_issuance = (token_blinding_privkey.size() > nIn && token_blinding_privkey[nIn].IsValid()) ? true : false;
CalculateReissuanceToken(asset, entropy, blind_issuance); CalculateReissuanceToken(asset, entropy, blind_issuance);
} }
} else { } else {
if (nPseudo == 0) { if (nPseudo == 0) {
CalculateAsset(asset, issuance.assetEntropy); CalculateAsset(asset, issuance.assetEntropy);
} else { } else {

6
src/chainparams.cpp
View file

@ -679,7 +679,7 @@ public:
vSeeds.clear(); vSeeds.clear();
vSeeds.emplace_back("seed.liquidnetwork.io"); vSeeds.emplace_back("seed.liquidnetwork.io");
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_liquidv1, pnSeed6_liquidv1 + ARRAYLEN(pnSeed6_liquidv1)); vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_liquidv1, pnSeed6_liquidv1 + ARRAYLEN(pnSeed6_liquidv1));
// //
// ELEMENTS fields // ELEMENTS fields
@ -777,8 +777,8 @@ std::unique_ptr<const CChainParams> CreateChainParams(const std::string& chain)
return std::unique_ptr<CChainParams>(new CTestNetParams()); return std::unique_ptr<CChainParams>(new CTestNetParams());
else if (chain == CBaseChainParams::REGTEST) else if (chain == CBaseChainParams::REGTEST)
return std::unique_ptr<CChainParams>(new CRegTestParams(gArgs)); return std::unique_ptr<CChainParams>(new CRegTestParams(gArgs));
else if (chain == CBaseChainParams::LIQUID1) else if (chain == CBaseChainParams::LIQUID1)
return std::unique_ptr<CChainParams>(new CLiquidV1Params()); return std::unique_ptr<CChainParams>(new CLiquidV1Params());
return std::unique_ptr<CChainParams>(new CCustomParams(chain, gArgs)); return std::unique_ptr<CChainParams>(new CCustomParams(chain, gArgs));
} }

8
src/key_io.cpp
View file

@ -144,8 +144,8 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par
if (data.size() == hash.size() + pubkey_prefix.size() && std::equal(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin())) { if (data.size() == hash.size() + pubkey_prefix.size() && std::equal(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin())) {
std::copy(data.begin() + pubkey_prefix.size(), data.end(), hash.begin()); std::copy(data.begin() + pubkey_prefix.size(), data.end(), hash.begin());
return PKHash(hash); return PKHash(hash);
} else if (data.size() == hash.size() + blinded_prefix.size() + pubkey_prefix.size() + pk_size && } else if (data.size() == hash.size() + blinded_prefix.size() + pubkey_prefix.size() + pk_size &&
std::equal(blinded_prefix.begin(), blinded_prefix.end(), data.begin()) && std::equal(blinded_prefix.begin(), blinded_prefix.end(), data.begin()) &&
std::equal(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin() + blinded_prefix.size())) { std::equal(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin() + blinded_prefix.size())) {
auto payload_start = data.begin() + blinded_prefix.size() + pubkey_prefix.size(); auto payload_start = data.begin() + blinded_prefix.size() + pubkey_prefix.size();
CPubKey pubkey; CPubKey pubkey;
@ -161,8 +161,8 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par
if (data.size() == hash.size() + script_prefix.size() && std::equal(script_prefix.begin(), script_prefix.end(), data.begin())) { if (data.size() == hash.size() + script_prefix.size() && std::equal(script_prefix.begin(), script_prefix.end(), data.begin())) {
std::copy(data.begin() + script_prefix.size(), data.end(), hash.begin()); std::copy(data.begin() + script_prefix.size(), data.end(), hash.begin());
return ScriptHash(hash); return ScriptHash(hash);
} else if (data.size() == hash.size() + blinded_prefix.size() + pubkey_prefix.size() + pk_size && } else if (data.size() == hash.size() + blinded_prefix.size() + pubkey_prefix.size() + pk_size &&
std::equal(blinded_prefix.begin(), blinded_prefix.end(), data.begin()) && std::equal(blinded_prefix.begin(), blinded_prefix.end(), data.begin()) &&
std::equal(script_prefix.begin(), script_prefix.end(), data.begin() + blinded_prefix.size())) { std::equal(script_prefix.begin(), script_prefix.end(), data.begin() + blinded_prefix.size())) {
auto payload_start = data.begin() + blinded_prefix.size() + script_prefix.size(); auto payload_start = data.begin() + blinded_prefix.size() + script_prefix.size();
CPubKey pubkey; CPubKey pubkey;

2
src/rpc/blockchain.cpp
View file

@ -2236,7 +2236,7 @@ UniValue scantxoutset(const JSONRPCRequest& request)
result.pushKV("success", res); result.pushKV("success", res);
result.pushKV("searched_items", count); result.pushKV("searched_items", count);
if (!g_con_elementsmode) { if (!g_con_elementsmode) {
for (const auto& it : coins) { for (const auto& it : coins) {
const COutPoint& outpoint = it.first; const COutPoint& outpoint = it.first;
const Coin& coin = it.second; const Coin& coin = it.second;

2
src/rpc/client.cpp
View file

@ -160,7 +160,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "echojson", 7, "arg7" }, { "echojson", 7, "arg7" },
{ "echojson", 8, "arg8" }, { "echojson", 8, "arg8" },
{ "echojson", 9, "arg9" }, { "echojson", 9, "arg9" },
// ELEMENTS: // ELEMENTS:
{ "rescanblockchain", 0, "start_height" }, { "rescanblockchain", 0, "start_height" },
{ "rescanblockchain", 1, "stop_height" }, { "rescanblockchain", 1, "stop_height" },
{ "createwallet", 1, "disable_private_keys" }, { "createwallet", 1, "disable_private_keys" },

2
src/script/bitcoinconsensus.cpp
View file

@ -102,7 +102,7 @@ static int verify_script(const unsigned char *scriptPubKey, unsigned int scriptP
} }
} }
int bitcoinconsensus_verify_script_with_amount(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen, int bitcoinconsensus_verify_script_with_amount(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen,
const unsigned char *amount, unsigned int amountLen, const unsigned char *amount, unsigned int amountLen,
const unsigned char *txTo , unsigned int txToLen, const unsigned char *txTo , unsigned int txToLen,
unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err) unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err)

2
src/script/bitcoinconsensus.h
View file

@ -68,7 +68,7 @@ EXPORT_SYMBOL int bitcoinconsensus_verify_script(const unsigned char *scriptPubK
const unsigned char *txTo , unsigned int txToLen, const unsigned char *txTo , unsigned int txToLen,
unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err); unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err);
EXPORT_SYMBOL int bitcoinconsensus_verify_script_with_amount(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen, EXPORT_SYMBOL int bitcoinconsensus_verify_script_with_amount(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen,
const unsigned char *amount, unsigned int amountLen, const unsigned char *amount, unsigned int amountLen,
const unsigned char *txTo , unsigned int txToLen, const unsigned char *txTo , unsigned int txToLen,
unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err); unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err);

2
src/wallet/rpcwallet.cpp
View file

@ -964,7 +964,7 @@ static UniValue sendmany(const JSONRPCRequest& request)
CAmountMap totalAmount; CAmountMap totalAmount;
std::vector<std::string> keys = sendTo.getKeys(); std::vector<std::string> keys = sendTo.getKeys();
for (const std::string& name_ : keys) { for (const std::string& name_ : keys) {
std::string strasset = Params().GetConsensus().pegged_asset.GetHex(); std::string strasset = Params().GetConsensus().pegged_asset.GetHex();
if (!assets.isNull() && assets[name_].isStr()) { if (!assets.isNull() && assets[name_].isStr()) {
strasset = assets[name_].get_str(); strasset = assets[name_].get_str();
} }

2
src/wallet/wallet.cpp
View file

@ -2906,7 +2906,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransac
// Preserve order of selected inputs for surjection proofs // Preserve order of selected inputs for surjection proofs
std::vector<CInputCoin> selected_coins; std::vector<CInputCoin> selected_coins;
// A map that keeps track of the change script for each asset and also // A map that keeps track of the change script for each asset and also
// the index of the reserveKeys used for that script (-1 if none). // the index of the reserveKeys used for that script (-1 if none).
std::map<CAsset, std::pair<int, CScript>> mapScriptChange; std::map<CAsset, std::pair<int, CScript>> mapScriptChange;