diff --git a/src/blind.cpp b/src/blind.cpp index 5791d9faa76af..c168b23e4b971 100644 --- a/src/blind.cpp +++ b/src/blind.cpp @@ -426,7 +426,7 @@ int BlindTransaction(std::vector& input_value_blinding_factors, const // Derive the asset of the issuance asset/token if (issuance.assetBlindingNonce.IsNull()) { - uint256 entropy; + uint256 entropy; GenerateAssetEntropy(entropy, tx.vin[nIn].prevout, issuance.assetEntropy); if (nPseudo == 0) { CalculateAsset(asset, entropy); @@ -434,7 +434,7 @@ int BlindTransaction(std::vector& input_value_blinding_factors, const bool blind_issuance = (token_blinding_privkey.size() > nIn && token_blinding_privkey[nIn].IsValid()) ? true : false; CalculateReissuanceToken(asset, entropy, blind_issuance); } - } else { + } else { if (nPseudo == 0) { CalculateAsset(asset, issuance.assetEntropy); } else { diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 8f4cc2fc0f108..6cd7b36320e0c 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -679,7 +679,7 @@ class CLiquidV1Params : public CChainParams { vSeeds.clear(); vSeeds.emplace_back("seed.liquidnetwork.io"); - vFixedSeeds = std::vector(pnSeed6_liquidv1, pnSeed6_liquidv1 + ARRAYLEN(pnSeed6_liquidv1)); + vFixedSeeds = std::vector(pnSeed6_liquidv1, pnSeed6_liquidv1 + ARRAYLEN(pnSeed6_liquidv1)); // // ELEMENTS fields @@ -777,8 +777,8 @@ std::unique_ptr CreateChainParams(const std::string& chain) return std::unique_ptr(new CTestNetParams()); else if (chain == CBaseChainParams::REGTEST) return std::unique_ptr(new CRegTestParams(gArgs)); - else if (chain == CBaseChainParams::LIQUID1) - return std::unique_ptr(new CLiquidV1Params()); + else if (chain == CBaseChainParams::LIQUID1) + return std::unique_ptr(new CLiquidV1Params()); return std::unique_ptr(new CCustomParams(chain, gArgs)); } diff --git a/src/key_io.cpp b/src/key_io.cpp index 0b693bad38d00..9ee053bdbeb2b 100644 --- a/src/key_io.cpp +++ b/src/key_io.cpp @@ -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())) { std::copy(data.begin() + pubkey_prefix.size(), data.end(), hash.begin()); return PKHash(hash); - } else if (data.size() == hash.size() + blinded_prefix.size() + pubkey_prefix.size() + pk_size && - std::equal(blinded_prefix.begin(), blinded_prefix.end(), data.begin()) && + } 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(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin() + blinded_prefix.size())) { auto payload_start = data.begin() + blinded_prefix.size() + pubkey_prefix.size(); 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())) { std::copy(data.begin() + script_prefix.size(), data.end(), hash.begin()); return ScriptHash(hash); - } else if (data.size() == hash.size() + blinded_prefix.size() + pubkey_prefix.size() + pk_size && - std::equal(blinded_prefix.begin(), blinded_prefix.end(), data.begin()) && + } 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(script_prefix.begin(), script_prefix.end(), data.begin() + blinded_prefix.size())) { auto payload_start = data.begin() + blinded_prefix.size() + script_prefix.size(); CPubKey pubkey; diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 3e5a8c9747708..4e19c64ff2820 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -2236,7 +2236,7 @@ UniValue scantxoutset(const JSONRPCRequest& request) result.pushKV("success", res); result.pushKV("searched_items", count); - if (!g_con_elementsmode) { + if (!g_con_elementsmode) { for (const auto& it : coins) { const COutPoint& outpoint = it.first; const Coin& coin = it.second; diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index d677a2af3faa0..8758195cff4ac 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -160,7 +160,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "echojson", 7, "arg7" }, { "echojson", 8, "arg8" }, { "echojson", 9, "arg9" }, - // ELEMENTS: + // ELEMENTS: { "rescanblockchain", 0, "start_height" }, { "rescanblockchain", 1, "stop_height" }, { "createwallet", 1, "disable_private_keys" }, diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp index 408957a6bc79d..a6240afa69ac2 100644 --- a/src/script/bitcoinconsensus.cpp +++ b/src/script/bitcoinconsensus.cpp @@ -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 *txTo , unsigned int txToLen, unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err) diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h index bb4f1e5143bb7..5eeed7be06d0a 100644 --- a/src/script/bitcoinconsensus.h +++ b/src/script/bitcoinconsensus.h @@ -68,7 +68,7 @@ EXPORT_SYMBOL int bitcoinconsensus_verify_script(const unsigned char *scriptPubK const unsigned char *txTo , unsigned int txToLen, 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 *txTo , unsigned int txToLen, unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 7f430488600ce..5953388ecc214 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -964,7 +964,7 @@ static UniValue sendmany(const JSONRPCRequest& request) CAmountMap totalAmount; std::vector keys = sendTo.getKeys(); 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()) { strasset = assets[name_].get_str(); } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index da825a2b71c01..41369df814d8c 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2906,7 +2906,7 @@ bool CWallet::CreateTransaction(const std::vector& vecSend, CTransac // Preserve order of selected inputs for surjection proofs std::vector 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). std::map> mapScriptChange;