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

2455 commits

Author SHA1 Message Date
Andrew Poelstra
1dd57b5dc3 Merge c609e10545 into merged_master (Bitcoin PR bitcoin/bitcoin#22292) 2021-07-30 17:34:54 +00:00
Andrew Poelstra
35df56002a Merge bfd910cae4 into merged_master (Bitcoin PR bitcoin/bitcoin#18568) 2021-07-29 15:40:49 +00:00
Andrew Poelstra
e577745980 Merge 8cdf91735f into merged_master (Bitcoin PR bitcoin/bitcoin#22349) 2021-07-29 06:36:50 +00:00
Andrew Poelstra
0c75e5a6e7 Merge ac238f76bf into merged_master (Bitcoin PR bitcoin/bitcoin#22339) 2021-07-29 05:59:10 +00:00
Andrew Poelstra
a1f89ca048 Merge b7565c708d into merged_master (Bitcoin PR bitcoin/bitcoin#22250) 2021-07-29 00:25:20 +00:00
Andrew Poelstra
91ecc65c31 Merge c31161f4f7 into merged_master (Bitcoin PR bitcoin/bitcoin#22320) 2021-07-28 19:32:30 +00:00
Andrew Poelstra
e8b84fa091 Merge d6e0d78c31 into merged_master (Bitcoin PR bitcoin/bitcoin#20966) 2021-07-28 14:05:54 +00:00
Andrew Poelstra
01feb5521a Merge 398dd67833 into merged_master (Bitcoin PR bitcoin/bitcoin#22296) 2021-07-28 04:13:16 +00:00
Andrew Poelstra
a83d2595bc Merge 6556da77d7 into merged_master (Bitcoin PR bitcoin/bitcoin#21056) 2021-07-28 02:41:57 +00:00
Andrew Poelstra
150d75939d Merge 4bff49bbb1 into merged_master (Bitcoin PR bitcoin/bitcoin#22172) 2021-07-25 02:56:00 +00:00
Andrew Poelstra
0649daf81f Merge 356f421fb0 into merged_master (Bitcoin PR bitcoin/bitcoin#22204) 2021-07-24 00:28:11 +00:00
Andrew Poelstra
3ffb9aa14f Merge c7dd9ff71b into merged_master (Bitcoin PR bitcoin/bitcoin#22051) 
Does the bare minimum to introduce Taproot wallet support with CT; just
adds a CPubKey blinding_pubkey to the taproot destination variant and
updates some visitors.

In future when we define blech32 we will need to make sure we are using
that encoding and using the pubkey.
 2021-07-21 23:15:57 +00:00
Andrew Poelstra
aca7078cf9 Merge 1186910b6b into merged_master (Bitcoin PR bitcoin/bitcoin#22088) 2021-07-20 22:01:46 +00:00
Andrew Poelstra
19eaa87430 Merge a83bbf02c7 into merged_master (Bitcoin PR bitcoin/bitcoin#22054) 2021-07-20 15:42:46 +00:00
Andrew Poelstra
3bb3c02495 Merge 933c6466c2 into merged_master (Bitcoin PR bitcoin/bitcoin#22109) 2021-07-19 19:25:00 +00:00
Andrew Poelstra
8a669eccfb Merge 7257e50dba into merged_master (Bitcoin PR bitcoin/bitcoin#20833) 2021-07-18 18:11:25 +00:00
Andrew Poelstra
2d90d5eaa9 Merge 35b83e6e43 into merged_master (Bitcoin PR bitcoin/bitcoin#22056) 2021-07-17 16:21:56 +00:00
Andrew Poelstra
6bd09c0cf3 Merge 18cf1c5165 into merged_master (Bitcoin PR bitcoin/bitcoin#21991) 2021-07-11 20:40:15 +00:00
Andrew Poelstra
bae18ea9ed Merge 37e9f07996 into merged_master (Bitcoin PR bitcoin/bitcoin#21843) 2021-07-11 17:21:19 +00:00
Andrew Poelstra
5fd960f5a7 Merge 2fa3f30050 into merged_master (Bitcoin PR bitcoin/bitcoin#21988) 2021-07-11 01:00:25 +00:00
Andrew Poelstra
cc70f8d6da Merge 1ef34ee25e into merged_master (Bitcoin PR bitcoin/bitcoin#21947) 2021-07-10 18:04:07 +00:00
Andrew Poelstra
251048913c Merge 61fea52171 into merged_master (Bitcoin PR bitcoin/bitcoin#21942) 2021-07-10 13:37:53 +00:00
Andrew Poelstra
79ae2abb80 Merge db2990d01f into merged_master (Bitcoin PR bitcoin/bitcoin#21925) 2021-07-09 23:53:45 +00:00
Andrew Poelstra
424ca6c841 Merge 176842daa8 into merged_master (Bitcoin PR bitcoin/bitcoin#21912) 2021-07-09 15:15:21 +00:00
Andrew Poelstra
d56bdbd28f Merge 32692d2681 into merged_master (Bitcoin PR bitcoin/bitcoin#21359) 
I hacked up rpc_fundrawtransaction.py a little bit because our `get_address`
method here depends on nobody having called `createwallet` on a particular
node ... the "correct" fix for this would be to redo the Elements changes
to this functional test for the 0.20+ createwallet changes, but because
there will be big future changes to this test (in Elements #900 (PSET))
I did the quick/hacky thing, and will defer cleanups to a separate
post-rebase PR.
 2021-07-08 16:08:49 +00:00
Andrew Poelstra
50835e366e Merge 576300afb0 into merged_master (Bitcoin PR bitcoin/bitcoin#21856) 2021-07-06 22:46:46 +00:00
Andrew Poelstra
a5a02a17ab Merge 54617fad99 into merged_master (Bitcoin PR bitcoin/bitcoin#21709) 2021-07-06 21:57:10 +00:00
Andrew Poelstra
7cb5955c4e Merge 23109cc548 into merged_master (Bitcoin PR bitcoin/bitcoin#21753) 2021-07-06 19:46:06 +00:00
Andrew Poelstra
fb60da4597 Merge 60132382a7 into merged_master (Bitcoin PR bitcoin/bitcoin#20867) 2021-07-29 13:40:05 +00:00
Andrew Poelstra
d4e09a0738 Merge 2448457cca into merged_master (Bitcoin PR #21830) 2021-07-05 01:53:52 +00:00
Andrew Poelstra
3c9222f410 Merge 59869704c0 into merged_master (Bitcoin PR bitcoin/bitcoin#21818) 2021-07-05 01:03:56 +00:00
fanquake
c609e10545
Merge bitcoin/bitcoin#22292: bench, doc: benchmarking updates and fixups 
d8513fe411 doc: update doc/benchmarking.md (Jon Atack)
84e2d5b781 bench: bench_bitcoin.cpp help fixups (Jon Atack)
10f4ce2078 bench: bench.h fixes and improvements (Jon Atack)

Pull request description:

  Fixups and updates I noticed while writing benchmarks for #22284.

ACKs for top commit:
  za-kk:
    ACK d8513fe411
  theStack:
    ACK d8513fe411 🚤

Tree-SHA512: d494956b5d6a3329e98e8b6f4405a10613b8fce51a04bbf4493d8b3497b8d5b177c1a9a3eeb828796eb4edb92b0ace769595151e223671c0dc8f09bcf631ebb5
 2021-07-05 08:47:36 +08:00
Andrew Poelstra
5f0c45b568 Merge ac219dcbcc into merged_master (Bitcoin PR bitcoin/bitcoin#19160) 2021-07-01 13:29:36 +00:00
Andrew Poelstra
a4e1fd2f33 Merge 0180453471 into merged_master (Bitcoin PR #21595) 2021-06-30 22:59:13 +00:00
Andrew Poelstra
d6c12d487e Merge 585cbe2257 into merged_master (Bitcoin PR #21695) 2021-06-30 18:02:40 +00:00
Andrew Poelstra
8b4d62b0ff Merge 3aa4935db7 into merged_master (Bitcoin PR #17934) 2021-06-30 02:40:16 +00:00
Andrew Poelstra
f2bd5dd18b Merge f0b457212f into merged_master (Bitcoin PR #21467) 2021-07-27 01:26:50 +00:00
fanquake
bfd910cae4
Merge bitcoin/bitcoin#18568: doc: Clarify developer notes about constant naming 
05f9770c1f doc: Clarify developer notes about constant naming (Russell Yanofsky)

Pull request description:

  I'm pretty sure developer notes were intended to say constants should be upper case and variables should be lower case, but right now they are ambiguous about whether to write:

  ```c++
  extern const int SYMBOL;
  ```

  or:

  ```c++
  extern const int g_symbol;
  ```

  First convention above is better than the second convention because it tells you without having to look anything up that the value of `SYMBOL` won't change at runtime. Also I haven't seen other c++ projects using the second convention.

ACKs for top commit:
  MarcoFalke:
    cr ACK 05f9770c1f
  practicalswift:
    ACK 05f9770c1f
  jarolrod:
    ACK 05f9770c1f 🥃

Tree-SHA512: 766d0e25d9db818d45df4ad6386987014f2053584cbced4b755ceef8bda6b7e2cfeb34eb8516423bd03b140faaf577614d5e3be2799f7eed0eb439187ab85323
 2021-06-30 09:23:15 +08:00
Andrew Poelstra
3e3bb1c338 Merge f6c44e999b into merged_master (Bitcoin PR #21602) 2021-06-30 00:20:58 +00:00
Andrew Poelstra
83785ab18c Merge cb79cabdd9 into merged_master (Bitcoin PR #21594) 2021-06-29 21:29:09 +00:00
Andrew Poelstra
31f571ed0d Merge 9ac8f6d7dd into merged_master (Bitcoin PR #21598) 2021-06-29 17:22:19 +00:00
Andrew Poelstra
ccd5ecbdde Merge 2b2ab9ab78 into merged_master (Bitcoin PR #21544) 2021-06-29 00:57:03 +00:00
Andrew Poelstra
d39d57c704 Merge 1c7be9ab90 into merged_master (Bitcoin PR #20286) 
I hate this PR.
 2021-06-28 21:30:17 +00:00
Andrew Poelstra
256ce55913 Merge 3bcd278aa6 into merged_master (Bitcoin PR bitcoin-core/gui#154) 2021-06-28 18:11:45 +00:00
Andrew Poelstra
eaa0d0b11c Merge 11840509fb into merged_master (Bitcoin PR #21484) 2021-06-28 17:59:25 +00:00
Andrew Poelstra
d5101eebcb Merge 23b15601df into merged_master (Bitcoin PR #17227) 2021-06-28 13:45:32 +00:00
MarcoFalke
8cdf91735f
Merge bitcoin/bitcoin#22349: doc: repository IRC updates 
dd49f1b52e doc: doc/README.md IRC updates (Jon Atack)

Pull request description:

  Follow-up to https://github.com/bitcoin/bitcoin/pull/22109:

  - update remaining link and reference from Freenode to Libera
  - remove defunct #bitcoin-dev channel
  - other minor fixups

ACKs for top commit:
  fanquake:
    ACK dd49f1b52e

Tree-SHA512: de20a8f3889028def7139be1cd0fa15daa3351ca987a16090d0caa6b4cd397e370400e2b3033ec776e270aa3a1ab085ada20fbdcc063ac88e2ad3b8351a596e7
 2021-06-28 08:00:47 +02:00
Andrew Poelstra
fef8907d8d Merge fa2a5b8f3a into merged_master (Bitcoin PR #20421) 2021-06-28 03:33:18 +00:00
Hennadii Stepanov
18c2027c76
doc: Document minimum required libc++ version 2021-06-28 05:10:56 +03:00
Andrew Poelstra
be12099e49 Merge 05757aa860 into merged_master (Bitcoin PR #21423) 2021-06-27 19:37:26 +00:00