Andrew Poelstra
a20f127ddd
Merge a5e756b74e into merged_master (Bitcoin PR #21676 )
2021-06-30 17:06:01 +00:00
Andrew Poelstra
b945a1dacf
Merge a1f0b8b62e into merged_master (Bitcoin PR #21634 )
2021-06-30 12:41:09 +00:00
Andrew Poelstra
770892540f
Merge 6664211be2 into merged_master (Bitcoin PR #21574 )
2021-06-29 22:00:51 +00:00
Andrew Poelstra
d20af8f9ea
Merge 602b038d43 into merged_master (Bitcoin PR #21366 )
2021-06-29 00:32:18 +00:00
Andrew Poelstra
26fd4eb181
Merge a9d1b40d53 into merged_master (Bitcoin PR #21415 )
2021-06-27 15:02:35 +00:00
Andrew Poelstra
8c54b98b25
Merge e0bc27a14c into merged_master (Bitcoin PR #21404 )
2021-06-26 22:39:09 +00:00
Andrew Poelstra
acf709b3ab
Merge bd6af53e1f into merged_master (Bitcoin PR #20480 )
...
what a trainwreck of a programming language..
2021-06-17 15:15:29 +00:00
Andrew Poelstra
ee43c19115
Merge 736eb4d808 into merged_master (Bitcoin PR #19982 )
2021-06-14 00:27:44 +00:00
Andrew Poelstra
a3b6f760ed
Merge e98d1d6740 into merged_master (Bitcoin PR #19425 )
2021-06-11 19:06:47 +00:00
MarcoFalke
fa40d6a1c4
test: Reset mocktime in the common setup
...
Doing it there will reduce code bloat and also ensure no test can "forget" to reset it
2021-04-14 17:38:07 +02:00
MarcoFalke
a1f0b8b62e
Merge #21634 : tests: Skip SQLite fsyncs while testing
...
41f891da50Fixes #21628
ACKs for top commit:
vasild:
ACK 41f891da50
2021-04-13 16:31:12 +02:00
Andrew Chow
41f891da50
tests: Skip SQLite fsyncs while testing
...
Since we want tests to run quickly, and since tests do a lot more db
operations than expected we expect to see in actual usage, we disable
sqlite's syncing behavior to make db operations run much faster. This
syncing behavior is necessary for normal operation as it helps guarantee
that data won't become lost or corrupted, but in tests, we don't care
about that.
2021-04-12 19:29:03 -04:00
Russell Yanofsky
9044522ef7
Drop JSONRPCRequest constructors after #21366
...
This just makes an additional simplification after #21366 replaced
util::Ref with std::any. It was originally suggested
https://github.com/bitcoin/bitcoin/pull/21366#issuecomment-792044351 but
delayed for a followup. It would have prevented usage bug
https://github.com/bitcoin/bitcoin/pull/21572 .
2021-04-07 04:53:26 -04:00
Sebastian Falbesoner
8dbb87a393
refactor: replace util::Ref by std::any (C++17)
2021-03-29 23:29:42 +02:00
fanquake
57e980d13c
scripted-diff: remove Optional & nullopt
...
-BEGIN VERIFY SCRIPT-
git rm src/optional.h
sed -i -e 's/Optional</std::optional</g' $(git grep -l 'Optional<' src)
sed -i -e 's/{nullopt}/{std::nullopt}/g' $(git grep -l 'nullopt' src)
sed -i -e 's/ nullopt;/ std::nullopt;/g' $(git grep -l 'nullopt' src)
sed -i -e 's/ nullopt)/ std::nullopt)/g' $(git grep -l 'nullopt' src)
sed -i -e 's/(nullopt)/(std::nullopt)/g' $(git grep -l 'nullopt' src)
sed -i -e 's/ nullopt,/ std::nullopt,/g' $(git grep -l 'nullopt' src)
sed -i -e 's/? nullopt :/? std::nullopt :/g' $(git grep -l 'nullopt' src)
sed -i -e 's/: nullopt}/: std::nullopt}/g' $(git grep -l 'nullopt' src)
sed -i -e '/optional.h \\/d' src/Makefile.am
sed -i -e '/#include <optional.h>/d' src/test/fuzz/autofile.cpp src/test/fuzz/buffered_file.cpp src/test/fuzz/node_eviction.cpp
sed -i -e 's/#include <optional.h>/#include <optional>/g' $(git grep -l '#include <optional.h>' src)
-END VERIFY SCRIPT-
2021-03-15 10:41:30 +08:00
fanquake
3ba2840e7e
scripted-diff: remove MakeUnique<T>()
...
-BEGIN VERIFY SCRIPT-
git rm src/util/memory.h
sed -i -e 's/MakeUnique/std::make_unique/g' $(git grep -l MakeUnique src)
sed -i -e '/#include <util\/memory.h>/d' $(git grep -l '#include <util/memory.h>' src)
sed -i -e '/util\/memory.h \\/d' src/Makefile.am
-END VERIFY SCRIPT-
2021-03-11 13:45:14 +08:00
MarcoFalke
faa8f68943
Replace boost::variant with std::variant
2021-01-05 10:10:50 +01:00
Hennadii Stepanov
e1e68b6305
test: Fix inconsistent lock order in wallet_tests/CreateWallet
2020-12-10 20:49:06 +02:00
Russell Yanofsky
5baa88fd38
test: Remove no longer needed MakeChain calls
...
These calls are no longer needed after edc316020e#19098 which started instantiating BasicTestingSetup.m_node.chain
Patch from MarcoFalke <falke.marco@gmail.com> in
https://github.com/bitcoin/bitcoin/pull/19425#discussion_r526701954
Co-authored-by: MarcoFalke <falke.marco@gmail.com>
2020-12-07 20:46:03 -05:00
Russell Yanofsky
6965f1352d
refactor: Replace uses ChainActive() in interfaces/chain.cpp
...
Suggested https://github.com/bitcoin/bitcoin/pull/19425#discussion_r456236407
2020-12-07 09:09:53 -04:00
Andrew Poelstra
631d208e8e
Merge bcd142e479 into merged_master (Bitcoin PR #20285 )
2020-12-02 13:05:54 +00:00
Andrew Poelstra
1b85209c18
Merge 1769828684 into merged_master (Bitcoin PR #19501 )
...
Adds "verbose" flag to a bunch of RPC that pass through to SendMoney. I also
added it to sendtomainchain and destroyamount.
2020-11-30 02:17:54 +00:00
Andrew Poelstra
5f5f4279ed
Merge 1b313cacc9 into merged_master (Bitcoin PR #19927 )
2020-11-29 21:07:46 +00:00
Andrew Poelstra
d4e8eb56b0
Merge 56d47e19ed into merged_master (Bitcoin PR #19619 )
2020-11-29 00:21:17 +00:00
Andrew Poelstra
646aa14168
Merge a0a422c34c into merged_master (Bitcoin PR #19754 )
2020-11-28 22:31:57 +00:00
Andrew Poelstra
ad7f014d11
Merge 89a8299a14 into merged_master (Bitcoin PR #19717 )
2020-11-28 19:34:51 +00:00
Andrew Poelstra
54f2d85914
Merge 34eb236258 into merged_master (Bitcoin PR #19326 )
2020-11-27 00:39:12 +00:00
Andrew Poelstra
116bea9453
Merge 93decbc7a4 into merged_master (Bitcoin PR #19370 )
2020-11-26 15:43:33 +00:00
Andrew Poelstra
9f8a009047
Merge 42fe6aad32 into merged_master (Bitcoin PR #19493 )
2020-11-26 01:09:24 +00:00
Andrew Poelstra
5f6468f6b8
Merge 4fc9224ee7 into merged_master (Bitcoin PR #18850 )
2020-11-26 01:09:24 +00:00
Andrew Poelstra
7fabb1de9a
Merge 5ec19df687 into merged_master (Bitcoin PR #19277 )
2020-11-26 01:09:19 +00:00
Andrew Poelstra
8e770d3f21
Merge 915ac8a861 into merged_master (Bitcoin PR #19413 )
2020-11-26 01:09:19 +00:00
Andrew Poelstra
b99679fa3c
Merge dbd7a91fdf into merged_master (Bitcoin PR #19310 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
6bb4431a8f
Merge 807b9f8114 into merged_master (Bitcoin PR #19188 )
2020-11-26 01:09:00 +00:00
Andrew Poelstra
29b17c1221
Merge 793e0ff22c into merged_master (Bitcoin PR #18698 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
51965ad1e6
Merge 25ad2c623a into merged_master (Bitcoin PR #18740 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
f32fd217a5
Merge ec4d27fa8b into merged_master (Bitcoin PR #18216 )
2020-11-26 01:08:40 +00:00
Andrew Poelstra
e5faae4af6
Merge 60091d20f9 into merged_master (Bitcoin PR #9381 )
2020-11-26 01:08:38 +00:00
Andrew Poelstra
d4711bdf91
Merge 23c926d859 into merged_master (Bitcoin PR #18699 )
2020-11-26 01:08:37 +00:00
Andrew Poelstra
4414990576
Merge 608359b071 into merged_master (Bitcoin PR #16426 )
2020-11-26 01:08:35 +00:00
Andrew Poelstra
5ae752cb8f
Merge 0f204dd3f2 into merged_master (Bitcoin PR #18727 )
2020-11-26 01:08:34 +00:00
Andrew Poelstra
1c12ae1719
Merge eef90c14ed into merged_master (Bitcoin PR #16528 )
...
This is the 43-commit descriptor wallet PR. It was remarkably easy to merge, given
its magnitude. With this commit Elements supports importing Bitcoin descriptors
and deriving (Bitcoin) addresses, though of course it does not support blinding
yet. That is a post-rebase project.
The material changes were:
1. Changing constants in the tests (super annoying but nothing surprising)
2. Adding a missing "skip if this coin is not ours" check in src/script/sign.cpp
which was causing us to erroneously remove existing witnesses from transactions.
This wasn't a problem before this commit since we would only ask specific
scriptpubkeymans to sign, and we'd never ask any to sign inputs we didn't
own. Andy simplified the logic here to always try every scriptpubkeyman,
which means they have to play a bit more nicely with each other.
Other than that, this was a big diff with many conflicts but literally all of
them were "we both added code" and the resolution was to take both sides.
2020-11-26 01:08:31 +00:00
Andrew Poelstra
6990af3107
Merge e890c15e2c into merged_master (Bitcoin PR #18671 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
569c68a0f2
Merge f8102d9088 into merged_master (Bitcoin PR #18601 )
2020-11-26 01:08:25 +00:00
Andrew Poelstra
fd37b7c5d6
Merge 54f812d9d2 into merged_master (Bitcoin PR #18673 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
23cab4213a
Merge 4702cadca9 into merged_master (Bitcoin PR #17954 )
2020-11-26 01:08:19 +00:00
Andrew Poelstra
9ce236f051
Merge 10358a381a into merged_master (Bitcoin PR #17737 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
91e195d7cd
Merge 2d6e76af24 into merged_master (Bitcoin PR #17261 )
...
Moved GetOnlinePakKey to the scriptpubkey manager; the other blinding
stuff remains in the CWallet. At some point after the rebase we should
consider whether there's a better separation to be had between the PAK
related stuff now that we have wallet boxes.
2020-11-14 17:16:10 +00:00
fanquake
c82336c493
Remove references to CreateWalletFromFile
...
CWallet::CreateWalletFromFile() was removed in
8b5e7297c0
2020-11-12 13:12:29 +08:00
Andrew Poelstra
c1d327d827
Merge 4a3b6f47cd into merged_master (Bitcoin PR #17354 )
2020-11-09 23:10:09 +00:00
