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
29879 commits 49 branches 359 tags 252 MiB
Commit graph

29879 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Poelstra
24ed74c392 fix RPC linter issues 2020-12-16 20:14:46 +00:00
Andrew Poelstra
b690d51937 travis: temporarily disable lint-git-commit-check.sh 
This fails on upstream commit messages which are incorrectly formatted
and there is obviously nothing we can do about this. Re-enable this
check after the rebase is merged.
 2020-12-16 20:14:46 +00:00
Andrew Poelstra
606f4a3cf0 travis: temporarily blacklist a specific commit in the scripted-diff filter 
Commit f471a3be00 currently has the text "scripted diff"
rather than "scripted-diff", which causes the scripted-diff linter to fail, saying
that it sees a script but not the magic words.

Changing the linter to detect "scripted diff" causes it to fail on this commit,
because the included script does not work. (For reference, the script is

    r() { sed -i 's/vout must be positive/vout cannot be negative/g' $1 }
    r $(git grep -l 'vout must be positive')

Bet you can't guess why bash rejects this without running it!)

We should remember to change this back.
 2020-12-16 20:14:46 +00:00
Andrew Poelstra
7a8ccee155 Merge 1e9e4b68f3 into merged_master (Bitcoin PR #20469) 2020-12-03 21:06:05 +00:00
Andrew Poelstra
171f291a15 Merge efd4cdb81f into merged_master (Bitcoin PR #20456) 2020-12-03 20:58:37 +00:00
Andrew Poelstra
5bab6b8347 Merge ca4a784942 into merged_master (Bitcoin PR #20410) 2020-12-03 20:50:32 +00:00
Andrew Poelstra
8a67d8674e Merge 31c9987976 into merged_master (Bitcoin PR #20447) 2020-12-03 20:41:46 +00:00
Andrew Poelstra
709e525647 Merge 9402159b9b into merged_master (Bitcoin PR #20472) 2020-12-03 20:27:01 +00:00
Andrew Poelstra
f77fcc409a Merge 3a32b62fa7 into merged_master (Bitcoin PR #20462) (Core 0.21rc2 branch point) 2020-12-03 20:19:06 +00:00
Andrew Poelstra
f95071d91b Merge 6f9dac5ede into merged_master (Bitcoin PR #20473) 2020-12-03 20:04:09 +00:00
Andrew Poelstra
12af6ff01a Merge 7ebbee551d into merged_master (Bitcoin PR #19764) 2020-12-03 19:49:08 +00:00
Andrew Poelstra
4ad42e1db6 Merge cb89e18845 into merged_master (Bitcoin PR #19179) 2020-12-03 19:41:25 +00:00
Andrew Poelstra
f739a81dc1 Merge 2ee954daae into merged_master (Bitcoin PR #20458) 2020-12-03 19:26:33 +00:00
Andrew Poelstra
87a24444c1 Merge 555b5d1bf9 into merged_master (Bitcoin PR #20419) 2020-12-03 19:18:53 +00:00
Andrew Poelstra
8c09ed0915 Merge b0c9024a7c into merged_master (Bitcoin PR #20449) 2020-12-03 19:11:11 +00:00
Andrew Poelstra
dc7d88b372 Merge 86bf3ae3b5 into merged_master (Bitcoin PR #20202) 2020-12-03 18:37:55 +00:00
Andrew Poelstra
b0189ec0cc Merge 1b75f2542d into merged_master (Bitcoin PR #20432) 2020-12-03 18:25:47 +00:00
Andrew Poelstra
8a03ca3359 Merge e9a1c9fbde into merged_master (Bitcoin PR #19867) 2020-12-03 18:18:12 +00:00
Andrew Poelstra
7d503ae5ed Merge 816132e6eb into merged_master (Bitcoin PR #20426) 2020-12-03 18:09:50 +00:00
Andrew Poelstra
9e4db637d8 Merge d4159984c3 into merged_master (Bitcoin PR #20223) 2020-12-03 17:37:53 +00:00
Andrew Poelstra
8ab9a6ea7e Merge ea460291f9 into merged_master (Bitcoin PR #20430) 2020-12-03 17:28:21 +00:00
Andrew Poelstra
ad539cd40a Merge 4c2ee5c855 into merged_master (Bitcoin PR #20424) 2020-12-03 17:14:12 +00:00
Andrew Poelstra
fbac33bbcc Merge 094663842d into merged_master (Bitcoin PR bitcoin-core/gui#13) 2020-12-03 17:05:56 +00:00
Andrew Poelstra
1dfa6369bc Merge c45e1d9aa7 into merged_master (Bitcoin PR bitcoin-core/gui#21) 2020-12-03 16:58:00 +00:00
Andrew Poelstra
4f1000e9ca Merge 3d632c3f49 into merged_master (Bitcoin PR #20428) 2020-12-03 16:50:31 +00:00
Andrew Poelstra
91bdd20828 Merge fdd068507d into merged_master (Bitcoin PR #20056) 2020-12-03 16:27:23 +00:00
Andrew Poelstra
02dda82859 Merge 46f0b2f976 into merged_master (Bitcoin PR #19851) 2020-12-03 16:11:41 +00:00
Andrew Poelstra
791586cefe Merge 2878167c18 into merged_master (Bitcoin PR #20000) 2020-12-03 16:03:28 +00:00
Andrew Poelstra
d2e4f52b01 Merge 0a267f4eb8 into merged_master (Bitcoin PR bitcoin-core/gui#46) 2020-12-03 15:45:18 +00:00
Andrew Poelstra
9e0060a685 Merge db58b857f7 into merged_master (Bitcoin PR #20329) 2020-12-03 15:37:28 +00:00
Andrew Poelstra
0350198c1d Merge 04670ef81e into merged_master (Bitcoin PR #20385) 2020-12-03 15:29:08 +00:00
Andrew Poelstra
ba808b0996 Merge 848d66519c into merged_master (Bitcoin PR #20054) 2020-12-03 15:12:39 +00:00
Andrew Poelstra
b903bbf4e2 Merge 884bde510e into merged_master (Bitcoin PR #20291) 2020-12-03 14:59:23 +00:00
Andrew Poelstra
90e684b7ff Merge c4d1e24f54 into merged_master (Bitcoin PR #20047) 2020-12-03 14:51:29 +00:00
Andrew Poelstra
b91e046731 Merge 7aa94569ce into merged_master (Bitcoin PR #20024) 2020-12-03 14:42:37 +00:00
Andrew Poelstra
e8cacf655c Merge 71d068db40 into merged_master (Bitcoin PR #18531) 
Last of the RPC cleanups, the old constructor is removed :)
 2020-12-03 14:34:33 +00:00
Andrew Poelstra
f766518acd Merge 9ab9665c74 into merged_master (Bitcoin PR #15710) 2020-12-03 06:48:14 +00:00
Andrew Poelstra
a79cb95cbd Merge d9180c50b6 into merged_master (Bitcoin PR #20145) 2020-12-03 06:40:54 +00:00
Andrew Poelstra
aabea708cd Merge 1cc5e693c1 into merged_master (Bitcoin PR #20358) 2020-12-03 06:26:21 +00:00
Andrew Poelstra
40893fb05b Merge fbb2bee82d into merged_master (Bitcoin PR #20067) 2020-12-03 06:18:37 +00:00
Andrew Poelstra
ee905c4cf3 Merge e12ad7f383 into merged_master (Bitcoin PR #19968) 2020-12-03 06:03:55 +00:00
Andrew Poelstra
f190faa2cd Merge 47b6ad837c into merged_master (Bitcoin PR #20333) 2020-12-03 05:24:19 +00:00
Andrew Poelstra
53e40934d5 Merge 888c22e0dd into merged_master (Bitcoin PR #20359) 2020-12-03 05:15:47 +00:00
Andrew Poelstra
f455acefd6 Merge cddcd22ab3 into merged_master (Bitcoin PR #20288) 2020-12-03 04:49:50 +00:00
Andrew Poelstra
aeb802289a Merge ea7926527c into merged_master (Bitcoin PR #20413) 2020-12-03 04:23:53 +00:00
Andrew Poelstra
4f42a72dac Merge 50e019a97a into merged_master (Bitcoin PR #20414) 2020-12-03 04:09:10 +00:00
Andrew Poelstra
e59299b6e9 Merge d020e8839f into merged_master (Bitcoin PR #20418) 2020-12-03 03:39:26 +00:00
Andrew Poelstra
8fcec291bd Merge 5bcae7967f into merged_master (Bitcoin PR #20408) 2020-12-03 03:14:29 +00:00
Andrew Poelstra
9d0940aebe Merge a64ff1c4d3 into merged_master (Bitcoin PR #19905) 2020-12-03 03:05:22 +00:00
Andrew Poelstra
c5cacb2464 Merge 54532f46c4 into merged_master (Bitcoin PR bitcoin-core/gui#109) 2020-12-03 02:56:20 +00:00