GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
29954 commits 49 branches 359 tags 252 MiB
Commit graph

318 commits

Author SHA1 Message Date
Andrew Poelstra
f1642283f5 travis: temporarily remove bitcoin_functional tests from Python linter 2021-03-26 17:33:04 +00:00
Andrew Poelstra
29ab3fdda1 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.
 2021-03-26 01:34:49 +00:00
Andrew Poelstra
ae064874bc 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.
 2021-03-26 01:34:49 +00:00
Andrew Poelstra
6a1fadf8a6 Merge 3457054c61 into merged_master (Bitcoin PR #20346) 2020-12-02 16:06:54 +00:00
Andrew Poelstra
4285f7d6f0 Merge 2f7a53cc9d into merged_master (Bitcoin PR #20069) 2020-11-30 06:00:06 +00:00
Andrew Poelstra
0fd697aa7b Merge 06314fbb55 into merged_master (Bitcoin PR #20071) 2020-11-30 05:53:34 +00:00
Andrew Poelstra
ac33feb400 Merge 9876ab8c74 into merged_master (Bitcoin PR #19844) 2020-11-28 21:19:29 +00:00
Andrew Poelstra
afe472121a Merge a1d14f522c into merged_master (Bitcoin PR #19671) 2020-11-28 19:48:53 +00:00
Andrew Poelstra
477ecda390 Merge baf9cedee8 into merged_master (Bitcoin PR #18817) 2020-11-28 16:35:47 +00:00
Andrew Poelstra
519f434cd7 Merge e4df534c60 into merged_master (Bitcoin PR #15382) 2020-11-27 01:48:55 +00:00
Andrew Poelstra
7f6b8f75e8 Merge 65e4ecabd5 into merged_master (Bitcoin PR #19654) 2020-11-27 01:26:49 +00:00
Andrew Poelstra
c1d416e56b Merge edec7f7c25 into merged_master (Bitcoin PR #19439) 2020-11-26 22:57:11 +00:00
Andrew Poelstra
0f9a38732c Merge 4ebe2f6e75 into merged_master (Bitcoin PR #18011) 2020-11-26 21:44:11 +00:00
Andrew Poelstra
09f5846d79 Merge fd9db45c3e into merged_master (Bitcoin PR #19258) 2020-11-26 01:09:22 +00:00
Andrew Poelstra
7fabb1de9a Merge 5ec19df687 into merged_master (Bitcoin PR #19277) 2020-11-26 01:09:19 +00:00
Andrew Poelstra
75957715ea Merge daae8b8a1b into merged_master (Bitcoin PR #18649) 2020-11-26 01:09:18 +00:00
Andrew Poelstra
c5a26c7e94 Merge ffa70801da into merged_master (Bitcoin PR #19256) 2020-11-26 01:09:17 +00:00
Andrew Poelstra
ec5e799c05 Merge 910f0468a1 into merged_master (Bitcoin PR #19348) 2020-11-26 01:09:13 +00:00
Andrew Poelstra
4839db857d Merge c27330897d into merged_master (Bitcoin PR #18027) 2020-11-26 01:09:11 +00:00
Andrew Poelstra
1044c64be3 Merge 17cfa52d38 into merged_master (Bitcoin PR #19172) 2020-11-26 01:08:59 +00:00
Andrew Poelstra
195eb8a243 Merge 4ede05d421 into merged_master (Bitcoin PR #18758) 2020-11-26 01:08:58 +00:00
Andrew Poelstra
67f55c5173 Merge 234fabab90 into merged_master (Bitcoin PR #18210) 2020-11-26 01:08:57 +00:00
Andrew Poelstra
e991e7713b Merge d96fdc2a39 into merged_master (Bitcoin PR #18741) 2020-11-26 01:08:38 +00:00
Andrew Poelstra
60b8726cbb Merge 65fb3dfc8d into merged_master (Bitcoin PR #18556) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
5b3e849748 Merge 2e97d80017 into merged_master (Bitcoin PR #18134) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
2d35bebf6b Merge 3516a31eaa into merged_master (Bitcoin PR #18234) 2020-11-26 01:07:50 +00:00
Andrew Poelstra
60e037bb94 Merge 45cdcd47d9 into merged_master (Bitcoin PR #18126) 2020-11-26 01:07:50 +00:00
Andrew Poelstra
cad0fb9200 Merge a2a77ba34f into merged_master (Bitcoin PR #18056) 2020-11-26 01:07:49 +00:00
Andrew Poelstra
cdeb19ce22 Merge 088604221b into merged_master (Bitcoin PR #18253) 2020-11-26 01:07:48 +00:00
Andrew Poelstra
47d76259bf Merge 22d11187ee into merged_master (Bitcoin PR #17398) 2020-11-26 01:07:41 +00:00
Andrew Poelstra
a0298bba14 Merge 02fafdd12c into merged_master (Bitcoin PR #18060) 2020-11-26 00:29:44 +00:00
Andrew Poelstra
ea713d1c99 Merge f05c1ac444 into merged_master (Bitcoin PR #17937) 2020-11-26 00:29:43 +00:00
Andrew Poelstra
33564b8849 Merge cadb9d3342 into merged_master (Bitcoin PR #18036) 2020-11-26 00:29:43 +00:00
Andrew Poelstra
7500590938 Merge 7fcaa8291c into merged_master (Bitcoin PR #18009) 2020-11-14 18:13:04 +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
Andrew Poelstra
1b7df1d514 Merge 95ca6aeec7 into merged_master (Bitcoin PR #17691) 2020-11-14 16:52:08 +00:00
Andrew Poelstra
7c53615bb6 Merge af05bd9e1e into merged_master (Bitcoin PR #17891) 2020-11-14 16:52:07 +00:00
Andrew Poelstra
bf82cc6a32 Merge e7f8450357 into merged_master (Bitcoin PR #16688) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
a936f8e538 Merge 816464198c into merged_master (Bitcoin PR #17851) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
009bc2fdfb Merge 99813a9745 into merged_master (Bitcoin PR #17829) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
f3ec9fa522 Merge 7da9e3a817 into merged_master (Bitcoin PR #17050) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
b4d7d9d503 Merge 1f59885d27 into merged_master (Bitcoin PR #17361) 2020-11-14 16:51:50 +00:00
Andrew Poelstra
7a8b5877f2 Merge 9cbd87d8ee into merged_master (Bitcoin PR #17518) 2020-11-14 16:51:48 +00:00
Andrew Poelstra
f1f5409705 Merge bb862d7864 into merged_master (Bitcoin PR #14384) 2020-11-09 23:10:14 +00:00
Andrew Poelstra
9fdb7c094a Merge 69a6f1ad1f into merged_master (Bitcoin PR #17513) 2020-11-09 23:10:14 +00:00
Andrew Poelstra
23e022906c Merge 22a58811d4 into merged_master (Bitcoin PR #17353) 2020-11-09 23:10:07 +00:00
Andrew Poelstra
00d30ddc6c Merge 94a26b192f into merged_master (Bitcoin PR #17318) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
c82f65f262 Merge 73b26e38d7 into merged_master (Bitcoin PR #17351) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
d472d58b7b Merge 811c381ab6 into merged_master (Bitcoin PR #17329) 2020-11-09 21:20:49 +00:00