Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send to address updates #385

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Send to address updates #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/wallet/rpcwallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,14 +361,11 @@ UniValue sendtoaddress(const JSONRPCRequest &request) {
RPCResult::Type::STR_HEX, "txid", "The transaction id."
},
RPCExamples{
HelpExampleCli("sendtoaddress", "\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 0.1")
+ HelpExampleCli("sendtoaddress",
"\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 0.1 '{\"future_maturity\":100, \"future_locktime\":10000}'")
+ HelpExampleCli("sendtoaddress",
"\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 0.1 [] \"donation\" \"seans outpost\"")
+ HelpExampleCli("sendtoaddress", "\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 0.1 \"\" \"\" true")
+ HelpExampleRpc("sendtoaddress",
"\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\", [], 0.1, \"donation\", \"seans outpost\"")
HelpExampleCli("sendtoaddress", "\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 0.1")
+ HelpExampleCli("sendtoaddress", "\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 0.1 '{\"future_maturity\":100, \"future_locktime\":10000}'")
+ HelpExampleCli("sendtoaddress", "\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 0.1 [] \"donation\" \"seans outpost\"")
+ HelpExampleCli("sendtoaddress", "\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 0.1 [] \"\" \"\" true")
+ HelpExampleRpc("sendtoaddress", "\"RwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\", 0.1, [], \"donation\", \"seans outpost\"")
},
}.Check(request);

Expand Down Expand Up @@ -405,7 +402,7 @@ UniValue sendtoaddress(const JSONRPCRequest &request) {
hasFuture = true;
fpp.maturity = request.params[nextParamsIndex]["future_maturity"].get_int();
fpp.locktime = request.params[nextParamsIndex]["future_locktime"].get_int();
fpp.futureRecScript = GetScriptForDestination(dest);
fpp.futureRecScript = GetScriptForDestination(dest);
}
}
nextParamsIndex++;
Expand All @@ -415,7 +412,7 @@ UniValue sendtoaddress(const JSONRPCRequest &request) {
nextParamsIndex++;
if (!request.params[nextParamsIndex].isNull() && !request.params[nextParamsIndex].get_str().empty()){
mapValue["to"] = request.params[nextParamsIndex].get_str();
}
}
nextParamsIndex++;
bool fSubtractFeeFromAmount = false;
if (!request.params[nextParamsIndex].isNull()) {
Expand Down
12 changes: 7 additions & 5 deletions src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2121,6 +2121,7 @@ bool CWalletTx::isFutureSpendable(unsigned int outputIndex) const {

CFutureTx futureTx;
if (GetTxPayload(tx->vExtraPayload, futureTx)) {
LOCK(cs_main);
int maturity = GetDepthInMainChain();
int64_t adjustCurrentTime = GetAdjustedTime();
uint32_t confirmedTime = GetConfirmationTime();
Expand Down Expand Up @@ -2548,7 +2549,7 @@ bool CWalletTx::SubmitMemoryPoolAndRelay(std::string &err_string, bool relay) {
if (GetDepthInMainChain() != 0) return false;
// Don't try to submit transactions locked via InstantSend.
if (IsLockedByInstantSend()) return false;

// Submit transaction to mempool for relay
pwallet->WalletLogPrintf("Submitting wtx %s to mempool for relay\n", GetHash().ToString());
// We must set fInMempool here - while it will be re-set to true by the
Expand Down Expand Up @@ -3380,7 +3381,7 @@ std::map <std::string, std::pair<CAmount, CAmount>> CWallet::getAssetsBalanceAll
CAssetTransfer transferTemp;
if (!GetTransferAsset(coin.txout.scriptPubKey, transferTemp))
continue;

if (!output.fSpendable || (output.isFuture && !output.isFutureSpendable) || (output.nDepth <
(output.tx->IsFromMe(ISMINE_ALL) ? 0 : 1)))
pending += transferTemp.nAmount;
Expand Down Expand Up @@ -4480,7 +4481,7 @@ bool CWallet::CreateTransaction(const std::vector <CRecipient> &vecSend, CTransa
return false;
}
vecCoins.insert(vecCoins.end(), setAssetsTmp.begin(), setAssetsTmp.end());

std::map<std::string, std::vector<std::pair<uint64_t, uint64_t>>> mapUniqueIds;
mapUniqueIds.clear();

Expand All @@ -4491,7 +4492,7 @@ bool CWallet::CreateTransaction(const std::vector <CRecipient> &vecSend, CTransa
if(assetTransfer.isUnique){
uint64_t rangeEnd = assetTransfer.uniqueId + assetTransfer.nAmount / COIN;
if (!mapUniqueIds.count(assetTransfer.assetId)){
std::vector<std::pair<uint64_t, uint64_t>> tmp;
std::vector<std::pair<uint64_t, uint64_t>> tmp;
tmp.push_back(std::make_pair(assetTransfer.uniqueId, rangeEnd));
mapUniqueIds.insert(std::make_pair(assetTransfer.assetId, tmp));
} else {
Expand Down Expand Up @@ -4547,7 +4548,7 @@ bool CWallet::CreateTransaction(const std::vector <CRecipient> &vecSend, CTransa
}
if (change) {
entry.first = entry.first + (amount / COIN);
mapUniqueIds.at(asset.first).push_back(entry);
mapUniqueIds.at(asset.first).push_back(entry);
}
}
}
Expand Down Expand Up @@ -5803,6 +5804,7 @@ bool CWallet::Verify(interfaces::Chain &chain, const WalletLocation &location, s
if (!tempWallet->AutoBackupWallet(wallet_path, warning_string, error_string) && !error_string.empty()) {
return false;
}
return true;
}

std::shared_ptr <CWallet> CWallet::CreateWalletFromFile(interfaces::Chain &chain, const WalletLocation &location,
Expand Down