diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3184,9 +3184,9 @@ std::string error; std::string warning; WalletCreationStatus status; - std::shared_ptr wallet = CreateWallet( - config.GetChainParams(), *g_rpc_chain, request.params[0].get_str(), - error, warning, status, passphrase, flags); + std::shared_ptr wallet = + CreateWallet(config.GetChainParams(), *g_rpc_chain, passphrase, flags, + request.params[0].get_str(), error, warning, status); if (status == WalletCreationStatus::CREATION_FAILED) { throw JSONRPCError(RPC_WALLET_ERROR, error); } else if (status == WalletCreationStatus::ENCRYPTION_FAILED) { diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -59,9 +59,9 @@ std::shared_ptr CreateWallet(const CChainParams ¶ms, interfaces::Chain &chain, + const SecureString &passphrase, uint64_t wallet_creation_flags, const std::string &name, std::string &error, std::string &warning, - WalletCreationStatus &status, const SecureString &passphrase, - uint64_t wallet_creation_flags); + WalletCreationStatus &status); //! Default for -keypool static const unsigned int DEFAULT_KEYPOOL_SIZE = 1000; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -168,9 +168,9 @@ std::shared_ptr CreateWallet(const CChainParams ¶ms, interfaces::Chain &chain, + const SecureString &passphrase, uint64_t wallet_creation_flags, const std::string &name, std::string &error, std::string &warning, - WalletCreationStatus &status, const SecureString &passphrase, - uint64_t wallet_creation_flags) { + WalletCreationStatus &status) { // Indicate that the wallet is actually supposed to be blank and not just // blank to make it encrypted bool create_blank = (wallet_creation_flags & WALLET_FLAG_BLANK_WALLET);