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.

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

Backports 0.15 pr4 #2646

Merged
merged 10 commits into from
Jan 29, 2019
Merged

Conversation

PastaPastaPasta
Copy link
Member

backports bitcoin bitcoin#8775 and bitcoin bitcoin#9908

laanwj and others added 6 commits January 24, 2019 22:28
…tForJSONRPCRequest

d678771 Wallet: Sanitise -wallet parameter (Luke Dashjr)
9756be3 Wallet/RPC: Use filename rather than CWallet pointer, for lockwallet RPCRunLater job name (Luke Dashjr)
86be48a More tightly couple EnsureWalletIsAvailable with GetWalletForJSONRPCRequest where appropriate (Luke Dashjr)
a435632 Move wallet RPC declarations to rpcwallet.h (Luke Dashjr)
ad15734 RPC: Pass on JSONRPCRequest metadata (URI/user/etc) for "help" method (Luke Dashjr)
bf8a04a Reformat touched lines with C++11 (Luke Dashjr)
2e518e3 Move nWalletUnlockTime to CWallet::nRelockTime, and name timed task unique per CWallet (Luke Dashjr)
d77ad6d RPC: Do all wallet access through new GetWalletForJSONRPCRequest (Luke Dashjr)
eca550f RPC/Wallet: Pass CWallet as pointer to helper functions (Luke Dashjr)

Tree-SHA512: bfd592da841693390e16f83b451503eb5cedb71208089aa32b3fc45e973555584a3ed7696dd239f6409324464d565dacf0f3d0e36e8e13ae6a7843848465f960
e57a1fd Define 7200 second timestamp window constant (Russell Yanofsky)

Tree-SHA512: 449d20e4fd23905cd96be36f717c55a0a2360aba1002aaf55a3699cce4a41f6e94acc2fbe511a93c5cbe8f8e68386995a76cad67620ebb66ba9283e6080ab567
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see inline comments

src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved
src/wallet/rpcdump.cpp Show resolved Hide resolved
src/wallet/rpcdump.cpp Outdated Show resolved Hide resolved
src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved
src/rpc/misc.cpp Show resolved Hide resolved
src/rpc/rpcevo.cpp Show resolved Hide resolved
@UdjinM6 UdjinM6 added this to the 14.0 milestone Jan 25, 2019
@UdjinM6
Copy link

UdjinM6 commented Jan 25, 2019

UdjinM6@daca9ee should fix compilation issues, see https://travis-ci.org/UdjinM6/dash/builds/484452855

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good (and travis failures are once again unrelated ones, same weird Windows issue)

utACK

Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a small nit, see inline comment

src/rpc/server.cpp Outdated Show resolved Hide resolved
pwallet->UpdateTimeFirstKey(nTimeBegin);

CBlockIndex *pindex = chainActive.FindEarliestAtLeast(nTimeBegin - 7200);
CBlockIndex* pindex = chainActive.FindEarliestAtLeast(nTimeBegin - TIMESTAMP_WINDOW);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, this did not come in as a Dash improvement but as a backport of bitcoin#10410

src/rpc/server.cpp Outdated Show resolved Hide resolved
src/rpc/server.h Outdated Show resolved Hide resolved
src/rpc/server.cpp Outdated Show resolved Hide resolved
Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-utACK

Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@codablock codablock merged commit 15e1c3b into dashpay:develop Jan 29, 2019
@PastaPastaPasta PastaPastaPasta deleted the backports-0.15-pr4 branch March 11, 2019 04:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants