Commit graph

29886 commits

Author SHA1 Message Date
Andrew Poelstra
a0f440e27a Merge d4159984c3 into merged_master (Bitcoin PR #20223) 2021-05-07 15:22:08 +00:00
Andrew Poelstra
9068fbf10e Merge ea460291f9 into merged_master (Bitcoin PR #20430) 2021-05-07 14:59:39 +00:00
Andrew Poelstra
ff371ab483 Merge 4c2ee5c855 into merged_master (Bitcoin PR #20424) 2021-05-07 14:39:18 +00:00
Andrew Poelstra
d9f59e1ce0 Merge 094663842d into merged_master (Bitcoin PR bitcoin-core/gui#13) 2021-05-07 14:18:41 +00:00
Andrew Poelstra
46ee0e1bd1 Merge c45e1d9aa7 into merged_master (Bitcoin PR bitcoin-core/gui#21) 2021-05-07 13:59:36 +00:00
Andrew Poelstra
1357911374 Merge 3d632c3f49 into merged_master (Bitcoin PR #20428) 2021-05-06 22:59:14 +00:00
Andrew Poelstra
9d9fec3785 Merge fdd068507d into merged_master (Bitcoin PR #20056) 2021-05-06 22:30:00 +00:00
Andrew Poelstra
575da3c422 Merge 46f0b2f976 into merged_master (Bitcoin PR #19851) 2021-05-06 22:22:51 +00:00
Andrew Poelstra
5fd99738b0 Merge 2878167c18 into merged_master (Bitcoin PR #20000) 2021-05-06 22:15:27 +00:00
Andrew Poelstra
436a1295e9 Merge 0a267f4eb8 into merged_master (Bitcoin PR bitcoin-core/gui#46) 2021-05-06 22:08:23 +00:00
Andrew Poelstra
516ffe8400 Merge db58b857f7 into merged_master (Bitcoin PR #20329) 2021-05-06 22:01:12 +00:00
Andrew Poelstra
00e18636bf Merge 04670ef81e into merged_master (Bitcoin PR #20385) 2021-05-06 21:53:52 +00:00
Andrew Poelstra
74ec32907f Merge 848d66519c into merged_master (Bitcoin PR #20054) 2021-05-06 21:38:12 +00:00
Andrew Poelstra
1ecb6390d4 Merge 884bde510e into merged_master (Bitcoin PR #20291) 2021-05-06 21:31:08 +00:00
Andrew Poelstra
82faa689f1 Merge c4d1e24f54 into merged_master (Bitcoin PR #20047) 2021-05-06 21:24:00 +00:00
Andrew Poelstra
bd90341b97 Merge 7aa94569ce into merged_master (Bitcoin PR #20024) 2021-05-06 21:14:55 +00:00
Andrew Poelstra
ec8588c71e Merge 71d068db40 into merged_master (Bitcoin PR #18531)
(Mostly) mechanical RPC changes
2021-05-06 21:05:40 +00:00
Andrew Poelstra
620add9627 Merge 9ab9665c74 into merged_master (Bitcoin PR #15710) 2021-05-06 19:50:01 +00:00
Andrew Poelstra
b21a36e10a Merge d9180c50b6 into merged_master (Bitcoin PR #20145) 2021-05-06 19:42:45 +00:00
Andrew Poelstra
a1c928558e Merge 1cc5e693c1 into merged_master (Bitcoin PR #20358) 2021-05-06 19:35:38 +00:00
Andrew Poelstra
155b09bf5e Merge fbb2bee82d into merged_master (Bitcoin PR #20067) 2021-05-06 19:28:29 +00:00
Andrew Poelstra
9662170619 Merge e12ad7f383 into merged_master (Bitcoin PR #19968) 2021-05-06 19:21:13 +00:00
Andrew Poelstra
0a5ce15bb1 Merge 47b6ad837c into merged_master (Bitcoin PR #20333) 2021-05-06 19:14:01 +00:00
Andrew Poelstra
304d53b5f7 Merge 888c22e0dd into merged_master (Bitcoin PR #20359) 2021-05-06 19:06:58 +00:00
Andrew Poelstra
bf6e5e0fb6 Merge cddcd22ab3 into merged_master (Bitcoin PR #20288) 2021-05-06 18:59:41 +00:00
Andrew Poelstra
1d951c2239 Merge ea7926527c into merged_master (Bitcoin PR #20413) 2021-05-06 18:51:59 +00:00
Andrew Poelstra
af4f4ad2db Merge 50e019a97a into merged_master (Bitcoin PR #20414) 2021-05-06 18:40:47 +00:00
Andrew Poelstra
3efc2ffae5 Merge d020e8839f into merged_master (Bitcoin PR #20418) 2021-05-06 18:28:57 +00:00
Andrew Poelstra
d12efb3e2b Merge 5bcae7967f into merged_master (Bitcoin PR #20408) 2021-05-06 17:16:52 +00:00
Andrew Poelstra
882fd6628a Merge a64ff1c4d3 into merged_master (Bitcoin PR #19905) 2021-05-06 16:40:36 +00:00
Andrew Poelstra
fe47385795 Merge 54532f46c4 into merged_master (Bitcoin PR bitcoin-core/gui#109) 2021-05-06 16:33:09 +00:00
Andrew Poelstra
3c748b001b Merge 4ae04090bb into merged_master (Bitcoin PR bitcoin-core/gui#118) 2021-05-06 16:25:50 +00:00
Andrew Poelstra
b8d53f04fb Merge 4b24c3962f into merged_master (Bitcoin PR #19504) 2021-05-06 16:02:38 +00:00
Andrew Poelstra
7110119210 Merge 108e1ba7bb into merged_master (Elements PR ElementsProject/elements#984) 2021-05-06 15:49:15 +00:00
Andrew Poelstra
4af137b371 Merge 4db1799620 into merged_master (Elements PR ElementsProject/elements#951) 2021-05-06 15:20:13 +00:00
Andrew Poelstra
41916be516 Merge 46fdd2795c into merged_master (Elements PR ElementsProject/elements#982) 2021-05-06 15:20:12 +00:00
Steven Roose
108e1ba7bb
Merge ElementsProject/elements#984: Address problems raised in #935 (0.21 rebase)
f2a0050f31 primitives: do not de/serialize asset issuance in bitcoin mode (Andrew Poelstra)
9c1de4d85f ci: give more memory to a couple Cirrus jobs (Andrew Poelstra)
40c09f637c rpc: fix error message accidentally changed in 5e62edc (Andrew Poelstra)
adbd9f163a qt: fix PSBT/PSET change from 4839db857d (Andrew Poelstra)
057237bd02 qt: fix double-scoping of enum introduced in c3b6bbb (Andrew Poelstra)
5819f25975 bitcoin-tx: add ASSET to the help text of some option (Andrew Poelstra)
1f3cfb451a chainparamsbase: fix bool-vs-enum mistake in 9c3480fea9 (Andrew Poelstra)
2573747447 fix test code duplication from 3a0de44d90 (Andrew Poelstra)
0045cafd75 rpc/mining: restore code erroneously dropped in 0e2c963dbf (Andrew Poelstra)
39112e1eaa correct copy/paste error in error message (Andrew Poelstra)

Pull request description:

ACKs for top commit:
  stevenroose:
    utACK f2a0050

Tree-SHA512: 5ce831ef24e51e76b93cd4d8e345a382dbd716e38c99565a7c2f25b5eeb8bac1e36c623491c5763ceb7b47444024b5821a878942df150bb01b33eeae33f292b1
2021-05-06 15:33:55 +01:00
Steven Roose
4db1799620
Merge ElementsProject/elements#951: Spec for PSET
8e19dfa35b Specify PSET (Andrew Chow)

Pull request description:

  Adds the document specifying the new PSET format that #900 implements.

  Pulled out of #900

Top commit has no ACKs.

Tree-SHA512: 892d27a5735fc581b0963b3e230cc028c08f7750a55c8b4030f9f909dee89910348fdc565739c6ec73ce206b7cfd08d3614ccaf884d5abc43a7470f36368ca43
2021-05-06 15:28:58 +01:00
Andrew Poelstra
070ffbbe70 Merge a49c01693b into merged_master (Elements PR #935) 2021-05-06 13:46:44 +00:00
Steven Roose
46fdd2795c
Merge ElementsProject/elements#982: Add liquidv1test chainparams.
b47c279ee1 Fix compilation errors after rebase onto master (Glenn Willen)
6d19c44bd0 Add liquidv1test chainparams. (Glenn Willen)
a8704b270d Fix description of -chain parameter (Glenn Willen)
188283eecb Change stray uses of global gArgs to args in CCustomParams (Glenn Willen)

Pull request description:

  Add the `liquidv1test` chain, which is meant to more closely track the `liquidv1` chain for realistic testing in CI and on test networks (vs `elementsregtest`, a "custom chain" which has diverged a bit more than I'm comfortable with.)

  I also fixed a few stray things that looked like minor mistakes to me (uses of the global `gArgs` instead of the parameter `args`, and the `-chain` help text not mentioning `liquidv1` as the default.)

Top commit has no ACKs.

Tree-SHA512: 0009740b6811af4b52c771e4559a4e941aec188e9994809b28642b5bd74f6e10fc0053c6246f89a7d8224269305308b7ffae082c93ac61355c305bdb326daeca
2021-04-30 13:42:07 +01:00
Glenn Willen
b47c279ee1 Fix compilation errors after rebase onto master 2021-04-29 15:00:54 -07:00
Andrew Poelstra
f2a0050f31 primitives: do not de/serialize asset issuance in bitcoin mode
Fixes a fuzztest failure related to `g_con_elementsmode`.
2021-04-28 22:33:34 +00:00
Andrew Poelstra
9c1de4d85f ci: give more memory to a couple Cirrus jobs 2021-04-28 22:33:24 +00:00
Andrew Chow
8e19dfa35b Specify PSET 2021-04-20 18:08:17 -04:00
Andrew Poelstra
40c09f637c rpc: fix error message accidentally changed in 5e62edc 2021-04-15 18:06:52 +00:00
Andrew Poelstra
adbd9f163a qt: fix PSBT/PSET change from 4839db857d 2021-04-15 18:04:01 +00:00
Andrew Poelstra
057237bd02 qt: fix double-scoping of enum introduced in c3b6bbb 2021-04-15 17:39:50 +00:00
Andrew Poelstra
5819f25975 bitcoin-tx: add ASSET to the help text of some option 2021-04-15 17:33:44 +00:00
Andrew Poelstra
1f3cfb451a chainparamsbase: fix bool-vs-enum mistake in 9c3480fea9 2021-04-15 17:09:11 +00:00
Andrew Poelstra
2573747447 fix test code duplication from 3a0de44d90 2021-04-15 17:06:37 +00:00