From 182c7b0dd72063f1427c7efacb75854b0ee23afa Mon Sep 17 00:00:00 2001
From: Steven Roose <steven@stevenroose.org>
Date: Wed, 21 Aug 2019 14:46:54 +0100
Subject: [PATCH] Fix build

---
 doc/man/Makefile.am       |  2 +-
 src/bitcoin-wallet-res.rc | 10 +++++-----
 src/wallet/rpcwallet.cpp  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 64e9735b82..aa546b8dac 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -19,6 +19,6 @@ endif
 
 if ENABLE_WALLET
 if BUILD_BITCOIN_WALLET
-  dist_man1_MANS+=bitcoin-wallet.1
+  dist_man1_MANS+=elements-wallet.1
 endif
 endif
diff --git a/src/bitcoin-wallet-res.rc b/src/bitcoin-wallet-res.rc
index e9fa2dbb40..2e0d5c184e 100644
--- a/src/bitcoin-wallet-res.rc
+++ b/src/bitcoin-wallet-res.rc
@@ -16,14 +16,14 @@ BEGIN
     BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
-            VALUE "CompanyName",        "Bitcoin"
-            VALUE "FileDescription",    "bitcoin-wallet (CLI tool for " PACKAGE_NAME " wallets)"
+            VALUE "CompanyName",        "Elements"
+            VALUE "FileDescription",    "elements-wallet (CLI tool for " PACKAGE_NAME " wallets)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
-            VALUE "InternalName",       "bitcoin-wallet"
+            VALUE "InternalName",       "elements-wallet"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
-            VALUE "OriginalFilename",   "bitcoin-wallet.exe"
-            VALUE "ProductName",        "bitcoin-wallet"
+            VALUE "OriginalFilename",   "elements-wallet.exe"
+            VALUE "ProductName",        "elements-wallet"
             VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
         END
     END
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 418cab0733..027d702305 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4667,8 +4667,8 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request)
         RPCTypeCheckArgument(replaceable_arg, UniValue::VBOOL);
         rbf = replaceable_arg.isTrue();
     }
-    CMutableTransaction rawTx = ConstructTransaction(request.params[0], request.params[1], request.params[2], rbf);
-    FundTransaction(pwallet, rawTx, fee, change_position, request.params[3], NullUniValue /* CA: assets_in */);
+    CMutableTransaction rawTx = ConstructTransaction(request.params[0], request.params[1], request.params[2], rbf, NullUniValue /* CA: assets_in */);
+    FundTransaction(pwallet, rawTx, fee, change_position, request.params[3]);
 
     // Make a blank psbt
     PartiallySignedTransaction psbtx(rawTx);