Commit graph

1692 commits

Author SHA1 Message Date
Andrew Poelstra
760d7ce6f0 Merge c94852e791 into merged_master (Bitcoin PR #15564) 2020-10-27 23:23:30 +00:00
Andrew Poelstra
5ae23eb085 Merge 887f57eb72 into merged_master (Bitcoin PR #15566) 2020-10-27 23:22:22 +00:00
Andrew Poelstra
7c2d98230d Merge 4952a95358 into merged_master (Bitcoin PR #15534) 2020-10-27 22:50:03 +00:00
Andrew Poelstra
67d718b048 Merge a74d588f21 into merged_master (Bitcoin PR #14954) 2020-10-27 22:32:24 +00:00
Andrew Poelstra
a599a81d3a Merge 789b0bbf2a into merged_master (Bitcoin PR #15335) 2020-10-27 21:39:17 +00:00
Andrew Poelstra
b612189f3c Merge 9e3122de05 into merged_master (Bitcoin PR #15492) 2020-10-27 20:46:09 +00:00
Andrew Poelstra
0f6e886bdb Merge f9dbb319d2 into merged_master (Bitcoin PR #15485) 2020-10-27 20:06:35 +00:00
Andrew Poelstra
9369666813 Merge a6d7026a45 into merged_master (Bitcoin PR #15497) 2020-10-27 19:54:52 +00:00
Andrew Poelstra
52cfc0a157 Merge e8612adc5d into merged_master (Bitcoin PR #15507) 2020-10-27 19:48:05 +00:00
Andrew Poelstra
2b24674400 Merge d88f7f8764 into merged_master (Bitcoin PR #15471) 2020-10-27 19:13:32 +00:00
Andrew Poelstra
91b410a694 Merge 8f470ecc53 into merged_master (Bitcoin PR #15419) 2020-10-27 18:04:26 +00:00
Andrew Poelstra
3e41b646fc Merge 1a8a5ede9f into merged_master (Bitcoin PR #15401) 2020-10-27 16:19:25 +00:00
Andrew Poelstra
4489ede527 fix missing includes 2020-10-27 16:19:15 +00:00
Steven Roose
3c0f3d7bc7
Disable feature_notifications functional test 2019-05-30 15:14:48 +01:00
Steven Roose
de81c0d97e
MERGE-FIX: Fix linter (mostly RPC help)
I also moved some RPC methods that were not at the end of the file with
the other ELEMENTS RPC methods. This makes the diff on my machine look
crazy. Let's hope GitHub has more intelligent diffs..
2019-05-27 17:40:16 +01:00
Steven Roose
efe4e8ff04
MERGE-FIX: Fix functional tests 2019-05-24 17:11:47 +01:00
Steven Roose
473e1e9ca1
MERGE-FIX: Fix compatibility functional tests 2019-05-22 16:54:46 +01:00
Steven Roose
420e38ae8f
MERGE-FIX: Update compatibility functional tests
I should have split this into one commit copying the entire folder and
one where I fix the ELEMENTS-based things. However, grepping the diff
for "elements" case-insensitive makes you catch all differences.
The next commit will contain the more subtle differences.
2019-05-21 12:52:40 +01:00
Steven Roose
f4889a5253
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master 2019-05-17 16:17:09 +01:00
Steven Roose
872d39fbe8
Prevent Travis from failing when tests are disabled 2019-05-15 09:11:14 +01:00
Steven Roose
4ed0bb36b4
Fix dead-code linter issues 2019-05-14 20:59:06 +01:00
Steven Roose
dc900eb7d7
Merge branch 'master' into catchup 2019-05-14 16:49:18 +01:00
Steven Roose
bf4f1d0094
MERGE-FIX: Disable p2p_invalid_messages tests to fix later 2019-05-14 15:10:18 +01:00
Steven Roose
ee0e510f30
MERGE-FIX: Fix other functional tests 2019-05-14 15:09:22 +01:00
Steven Roose
5492cefcc6
MERGE-FIX: Fix fedpeg and pak tests for 0.18.0 2019-05-14 15:09:20 +01:00
Steven Roose
1a2a93a5ff
MERGE-FIX: General fixes for functional tests 2019-05-14 15:09:19 +01:00
Gregory Sanders
cd0a56a5d1
Merge #621: Make fedpeg test compatible with bitcoind v0.18.0 parent
2939b5d Make fedpeg test compatible with bitcoind v0.18.0 parent (Steven Roose)

Pull request description:

Tree-SHA512: c1fd6f0acf53957e1bb3df4ae87081b875b52046118fba1c79b279a3bfa672ce344225bac2d3eacdbae6b681d5fa48147ddd7aa8b92181049ab60acea804aa3b
2019-05-14 09:32:13 -04:00
Gregory Sanders
879b64b010
Merge #607: Fix default permitsigdata value not working on converttopsbt command
794c305 Test that default `permitsigdata` is false (Steven Roose)
c8525c9 Fix bug in converttopsbt (Steven Roose)

Pull request description:

  We're not really supporting PSBT for Elements yet. The `rpc_psbt.py` integration test is disabled because of this; that's also why we didn't catch this. It's fixed upstream.

  I added an extra test to catch the error, but it's not actually executed.

  @instagibbs, up to you to decide if it's worth having this patched right now. I cherry-picked that fix commit literally from the catchup PR I'm working on, so if we don't patch it here, it will get patched while catching up.

Tree-SHA512: 2ee9ed733659c028f349b75aba19b80cef13894eacb0d85d0ab4377ee9e07b4aa90888edb402a5c31784f5d0848a0f22a445736995d9a6fca0bbeccf15f75dcb
2019-05-14 09:31:29 -04:00
Steven Roose
2939b5d41e
Make fedpeg test compatible with bitcoind v0.18.0 parent 2019-05-14 13:36:15 +01:00
Steven Roose
52ef28305f
Improve the fedpeg test with extra double claim tests
- changes the expected behavior of claimpegin to fail on double spend
- adds extra test to make sure a block with a double spend is also not
  accepted:
  1. a tx with two identical pegin inputs (mempool & block)
  2. a tx claiming a pegin that another mempool tx also claims
  3. a tx claiming a pegin that a confirmed tx already claimed (mempool
     & block)
2019-05-08 15:50:03 +01:00
Steven Roose
71723f794f
MERGE-FIX: Adapt bitcoin_functional 2019-05-03 17:46:17 +01:00
Steven Roose
449ac89f39
MERGE-FIX: Copy bitcoin_functional from upstream 2019-05-03 17:46:15 +01:00
Steven Roose
794c305cdd
Test that default permitsigdata is false 2019-05-03 14:42:53 +01:00
Steven Roose
7f894ae00b
UPSTREAM MERGE BROKEN: Merge commit 'f617e05c38' into master 2019-05-01 19:18:18 +01:00
Gregory Sanders
b919ca3d93 fedpeg test makes sure claim_script is wpkh 2019-05-01 10:54:06 -04:00
Gregory Sanders
a4a051e756 Add tests for fundrawtransaction placing back blinding keys properly 2019-04-19 07:39:32 -04:00
Gregory Sanders
2e6191d73a QA: Hack around no issuance an non-witness tx bug issue#473 2019-04-19 07:39:32 -04:00
Gregory Sanders
fb184c8303 mempool_package: make sure small UTXOs aren't selected for spending chain 2019-04-15 08:45:52 -04:00
Gregory Sanders
d70367bcf8 Add broken python serialization to always give issuance input, test for decode failure 2019-04-12 11:50:01 -04:00
Gregory Sanders
2cb47d1705 Disallow coinbase output witness data, since outputs are explicit anyways 2019-04-12 11:50:01 -04:00
Gregory Sanders
8b2e8859d6 Test for block-blinding by txinwit-overstuffed block 2019-04-12 11:50:01 -04:00
Gregory Sanders
789d4b97f7 Disallow output witness data in coinbase transactions 2019-04-12 11:50:01 -04:00
Gregory Sanders
e64324e3ec Test coinbase witness data consensus rules 2019-04-12 11:50:01 -04:00
Gregory Sanders
ac98ca4eb1 python test support for issuance and peg-in serialization and data 2019-04-12 11:50:01 -04:00
Gregory Sanders
97356e8c14 test_framework: Fix CTxInWitness.is_null with pegin_witness 2019-04-12 11:50:01 -04:00
Gregory Sanders
23095087f6 feature_fedpeg.py: change sidechain's parent bech32 prefix to match 2019-04-12 11:50:01 -04:00
Steven Roose
6c4f6efb64
Merge #563: Some more standard pegout testing
30eb323e9 ensure pak wallet is returning right kind of addresses (Gregory Sanders)
9e56c87ec have validateaddress give useful parent chain addr info (Gregory Sanders)
894d76e7c test all single-key pegout address types (Gregory Sanders)
40a62a151 DestinationEncoder: don't assert when a parent destination is unblinded (Gregory Sanders)

Pull request description:

  Added more utility to `validateaddress` for parent addresses by returning an additional object `parent_address_info`, then used it to enhance various tests.

Tree-SHA512: 941ef1dc8b7469c3274a50907ea788fe520398809d5c4ac901ef057dfa688f63b45f0be298de14c07c250015d02de8f2f4687e430da121fba759e3879823947f
2019-04-12 15:34:40 +01:00
Steven Roose
8fd8a45011
Merge #568: Adapt Elements default adress prefix bytes to elements-0.14 style
91294ca01 Adapt Elements default adress prefix bytes to elements-0.14 style (Gregory Sanders)
410d5fa08 sendtomainchain_base should be decoding parent destination (Gregory Sanders)

Pull request description:

  Also chose `ert` as bech32 hrp, just to make it distinct.

  Clustered the various address parameters for ease of the reader.

  resolves https://github.com/ElementsProject/elements/issues/567

Tree-SHA512: aae4b31b0c5ead9801dad13a50ddfc934216df783d6294bb4e2ae515bba27960a9643ccaae87a60c9637c44aeb6d4b0329eeb70846b07e6e88e9133edcd74315
2019-04-11 17:25:33 +01:00
Gregory Sanders
91294ca01a Adapt Elements default adress prefix bytes to elements-0.14 style 2019-04-10 16:08:39 -04:00
Steven Roose
6fa39762c3
Merge #565: Turn off mempool consistency check in fedpeg test to avoid assert
8b718d25d Turn off mempool consistency check in fedpeg test to avoid assert (Gregory Sanders)

Pull request description:

  Problem is this assert is hard to hit in practice, only Travis seems to.

  We should not be relying on the mempool consistency checks to make sure bad blocks don't get accepted during parent chain RPC failure so let's just have the node continue and check behavior we expect.

Tree-SHA512: 26d778de9d0a2afc155e54e30858d949c1cc870ea5905bafaaffa70ad445baa1b1b5eaf8fee766b926e4fa3013af7a8ce792d3b4e40c225d4c9df6577ca57e20
2019-04-10 19:05:43 +01:00