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

Fix build

Browse source
This commit is contained in:
Steven Roose 2019-08-21 14:46:54 +01:00
parent 6776a40611
commit 182c7b0dd7
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/man/Makefile.am
View file

@ -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

10
src/bitcoin-wallet-res.rc
View file

@ -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

4
src/wallet/rpcwallet.cpp
View file

@ -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);