Skip to content

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Nov 9, 2017

This fixes some multiwallet issues on the 0.15 branch...

jonasschnelli and others added 7 commits November 3, 2017 10:07
This fixes "Wallet file not specified" errors when making batch wallet RPC
calls with more than one wallet loaded. This issue was reported by
NicolasDorier <[email protected]>
bitcoin#11257

Request URI is not used for anything except multiwallet request dispatching, so
this change has no other effects.

Fixes bitcoin#11257

Github-Pull: bitcoin#11277
Rebased-From: edafc71
Change AuthServiceProxyWrapper.__getattr__ to only wrap proxied attributes, not
real attributes. This way AuthServiceProxyWrapper can continue logging RPC
calls without complicating other object usages, and special case handling for
the .url property can be dropped.

Github-Pull: bitcoin#11277
Rebased-From: e02007a
Split off AuthServiceProxy.get_request method to make it easier to batch RPC
requests without duplicating code and remove leading underscore from _batch
method.

This does not change any existing behavior.

Github-Pull: bitcoin#11277
Rebased-From: 9f67646
This fixes a bug in coverage logging that's been around since the logging was
introduced.

Github-Pull: bitcoin#11277
Rebased-From: 505530c
Without this change, batch RPC calls are not included in coverage logs.

Github-Pull: bitcoin#11277
Rebased-From: 74182f2
Tests bug reported in bitcoin#11257

Github-Pull: bitcoin#11277
Rebased-From: 4526d21
meshcollider and others added 3 commits November 9, 2017 14:52
OpenRC changed their program binary names in 2014 (3 years ago), and using the old names has loud warnings now

Github-Pull: bitcoin#11676
Rebased-From: 2f041f0
@laanwj
Copy link
Member

laanwj commented Nov 30, 2017

utACK 7af2457
ACK on commit list, changes look sane, I have not replicated this commit-by-commit though.

@laanwj laanwj merged commit 7af2457 into bitcoin:0.15 Dec 17, 2017
laanwj added a commit that referenced this pull request Dec 17, 2017
7af2457 contrib/init: Update openrc-run filename (Luke Dashjr)
3f1db56 Wrap dumpwallet warning and note scripts aren't dumped (MeshCollider)
42ea47d Add wallet backup text to import*, add* and dumpwallet RPCs (MeshCollider)
3a6cdd4 Add test for multiwallet batch RPC calls (Russell Yanofsky)
1c8c7f8 Add missing batch rpc calls to python coverage logs (Russell Yanofsky)
1036c43 Add missing multiwallet rpc calls to python coverage logs (Russell Yanofsky)
2eea279 Make AuthServiceProxy._batch method usable (Russell Yanofsky)
305f768 Limit AuthServiceProxyWrapper.__getattr__ wrapping (Russell Yanofsky)
7026845 Fix uninitialized URI in batch RPC requests (Russell Yanofsky)
6372a75 [Wallet] always show help-line of wallet encryption calls (Jonas Schnelli)

Pull request description:

  This fixes some multiwallet issues on the 0.15 branch...

Tree-SHA512: 304a6c6acbce22c8b7338d1e618451978ab2cd04938c71a3daf40fe9996ef14e324645d642fbc21950a5481fb993254082d54da1cb953a739ebaeaab34c080d4
@maflcko maflcko deleted the Mf1711-0152backports branch December 17, 2017 14:45
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants