GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20673 commits 49 branches 359 tags 252 MiB
Commit graph

1739 commits

Author SHA1 Message Date
Andrew Poelstra
8b4b800d49 Merge f9f6c11a74 into merged_master (Bitcoin PR #15771) 2020-10-28 02:12:01 +00:00
Andrew Poelstra
c8a4572c1f Merge f3ecf3025f into merged_master (Bitcoin PR #15772) 2020-10-28 02:02:37 +00:00
Andrew Poelstra
f58b9ee068 Merge 54798c3a31 into merged_master (Bitcoin PR #15749) 2020-10-28 01:51:02 +00:00
Andrew Poelstra
b10d0a931c Merge 327d2746fb into merged_master (Bitcoin PR #15495) 2020-10-28 00:55:06 +00:00
Andrew Poelstra
de7ec6ebb1 Merge efbc86733a into merged_master (Bitcoin PR #15660) 2020-10-28 00:54:56 +00:00
Andrew Poelstra
4ddc27c626 Merge 8dbb2c5e67 into merged_master (Bitcoin PR #15680) 2020-10-28 00:53:05 +00:00
Andrew Poelstra
977c818532 Merge 5a2a9b5b06 into merged_master (Bitcoin PR #15652) 2020-10-28 00:52:44 +00:00
Andrew Poelstra
e790cca639 Merge dc5c2e4407 into merged_master (Bitcoin PR #15686) 2020-10-28 00:48:57 +00:00
Andrew Poelstra
215a7cb64d Merge 3702e1c17b into merged_master (Bitcoin PR #15646) 2020-10-28 00:47:30 +00:00
Andrew Poelstra
addd2da647 Merge 208406038c into merged_master (Bitcoin PR #15519) 2020-10-28 00:11:58 +00:00
Andrew Poelstra
56d472ec04 Merge e14cd04abb into merged_master (Bitcoin PR #15637) 2020-10-28 00:11:51 +00:00
Andrew Poelstra
da079d831f Merge 7b13c64645 into merged_master (Bitcoin PR #15642) 2020-10-28 00:11:29 +00:00
Andrew Poelstra
66d440750b Merge 68520597cc into merged_master (Bitcoin PR #15631) 2020-10-28 00:11:06 +00:00
Andrew Poelstra
7d93f137a0 Merge c033c4b5ce into merged_master (Bitcoin PR #13541) 2020-10-28 00:09:04 +00:00
Andrew Poelstra
ef17d97342 Merge 27781b6530 into merged_master (Bitcoin PR #15466) 2020-10-28 00:07:44 +00:00
Andrew Poelstra
32a1b86572 Merge 8e1704c015 into merged_master (Bitcoin PR #15559) 2020-10-27 23:27:48 +00:00
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