D7112.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D7112.diff
View Options

	diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
	--- a/src/wallet/wallet.h
	+++ b/src/wallet/wallet.h
	@@ -1340,6 +1340,18 @@
	CTransactionRef &tx, Amount &nFeeRet,
	int &nChangePosInOut, std::string &strFailReason,
	const CCoinControl &coin_control, bool sign = true);
	+ /**
	+ * Submit the transaction to the node's mempool and then relay to peers.
	+ * Should be called after CreateTransaction unless you want to abort
	+ * broadcasting the transaction.
	+ *
	+ * @param tx[in] The transaction to be broadcast.
	+ * @param mapValue[in] key-values to be set on the transaction.
	+ * @param orderForm[in] BIP 70 / BIP 21 order form details to be set on the
	+ * transaction.
	+ * @param state[in,out] TxValidationState object returning information about
	+ * whether the transaction was accepted
	+ */
	bool CommitTransaction(
	CTransactionRef tx, mapValue_t mapValue,
	std::vector<std::pair<std::string, std::string>> orderForm,
	diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
	--- a/src/wallet/wallet.cpp
	+++ b/src/wallet/wallet.cpp
	@@ -3664,9 +3664,6 @@
	return true;
	}

	-/**
	- * Call after CreateTransaction unless you want to abort
	- */
	bool CWallet::CommitTransaction(
	CTransactionRef tx, mapValue_t mapValue,
	std::vector<std::pair<std::string, std::string>> orderForm,