Commit graph

39609 commits

Author SHA1 Message Date
Byron Hambly
fe648bc6f5
fix: minor fixes 2026-06-24 14:22:57 +02:00
Byron Hambly
6435e06408
validation: check subsidy asset and amount are explicit 2026-06-24 14:21:37 +02:00
merge-script
71b3bfe271
Merge ElementsProject/elements#1551: Eliminate early returns in ConnectBlock
Some checks failed
CI / lint [focal] (push) Has been cancelled
CI / ARM [unit tests, no functional tests] [bullseye] (push) Has been cancelled
CI / Win64 [unit tests, no gui tests, no boost::process, no functional tests] [jammy] (push) Has been cancelled
CI / 32-bit + dash [gui] [Rocky 8] (push) Has been cancelled
CI / [TSan, depends, gui] [2404] (push) Has been cancelled
CI / [MSan, depends] [focal] (push) Has been cancelled
CI / [ASan + LSan + UBSan + integer, no depends] [jammy] (push) Has been cancelled
CI / [fuzzer,address,undefined,integer, no depends] [jammy] (push) Has been cancelled
CI / [no wallet] [bionic] (push) Has been cancelled
CI / macOS 10.15 [gui, no tests] [focal] (push) Has been cancelled
CI / macOS 13 native arm64 [gui, sqlite only] [no depends] (push) Has been cancelled
CI / Win64 native [msvc] (functional tests + unit tests) (push) Has been cancelled
1d8b5b137a [validation] merge all ConnectBlock debug logging code paths (Pieter Wuille)

Pull request description:

  Cherry-pick of https://github.com/bitcoin/bitcoin/pull/31112/changes/492e1f09943fcb6145c21d470299305a19e17d8b

  To mitigate: https://bitcoincore.org/en/2026/05/05/disclose-cve-2024-52911/

  From https://github.com/bitcoin/bitcoin/pull/31112

ACKs for top commit:
  delta1:
    ACK 1d8b5b137a; tested locally

Tree-SHA512: 29576407c85c643b1377d67c33a3722edff0ae487c444cc2c7e9c29ba14e997c4f95f025dc3dacf5ed807804cdad59bdf5ad97a55db29d55b41fd465435791da
2026-06-04 13:32:41 +02:00
merge-script
1b08440a93
Merge ElementsProject/elements#1553: GHA CI migration
0331feb018 Remove cirrus YML file (Tom Trevethan)
09d9486fa0 Migrate CI to GHA (Tom Trevethan)

Pull request description:

  Migration of Elements CI from Cirrus (which is closing 1st June) to Github actions.

  Notes:

  GHA runners have IPV6 disabled in their linux containers. So `feature_proxy.py` and `rpc_blind.py --ipv6` disabled for these, as in https://github.com/bitcoin/bitcoin/pull/30193

  `windows-2019` is being deprecated and no runners appear to be readily available. https://github.com/actions/runner-images/issues/12045 (consider changing to `windows-2022`) for `win64-msvc` jobs.

  `previous-releases` requires a persistent self-hosted runner. This job was being skipped by Cirrus (with `No public persistent worker pools found!`).

ACKs for top commit:
  delta1:
    ACK 0331feb018; tested locally

Tree-SHA512: 5c1976a9afc4faa8d41f403f10f1e771763509e751506f9ffcf13e8174ba7a6c1464cfe2045c72f497177654df566f355f2c9e760ffa2ade81cd6c34dc094710
2026-06-04 08:39:25 +02:00
Tom Trevethan
0331feb018
Remove cirrus YML file 2026-06-03 14:12:22 +01:00
Tom Trevethan
09d9486fa0
Migrate CI to GHA 2026-06-03 14:11:52 +01:00
merge-script
6a0108a15c
Merge ElementsProject/elements#1550: Cherry-pick bitcoin/bitcoin#26777
8a0afee1f2 Merge bitcoin/bitcoin#26777: rpc: Remove duplicate field in RPCHelpMan for gettransactions (MarcoFalke)

Pull request description:

  Merge https://github.com/bitcoin/bitcoin/pull/26777: rpc: Remove duplicate field in RPCHelpMan for gettransactions

  090ad51c80 rpc: Remove duplicate field in RPCHelpMan for gettransactions (Joshua Kelly)

  Pull request description:

  The field 'comment' appears twice in TransactionDescriptionString, incorrectly - this commit removes the instance of the comment field without a description, preserving the one with a description.

  On master, the duplicate fields can be be viewed here: https://github.com/bitcoin/bitcoin/blob/master/src/wallet/rpc/transactions.cpp#L419-L423

  TransactionDescriptionString is included in RPC calls such as listtransactions which have functional tests.

ACKs for top commit:
  delta1:
    ACK 8a0afee1f2; tested locally

Tree-SHA512: c0f0349c571c62e14b2145691e72fbe079c8815015a8e5a26d45fe88a1a68cd39153dba11300084f0e7a8b74a10a836b2b850654bbc338868bf616f73c851d40
2026-05-21 15:05:52 +02:00
Pieter Wuille
1d8b5b137a
[validation] merge all ConnectBlock debug logging code paths 2026-05-21 12:45:06 +01:00
MarcoFalke
8a0afee1f2
Merge bitcoin/bitcoin#26777: rpc: Remove duplicate field in RPCHelpMan for gettransactions
090ad51c80 rpc: Remove duplicate field in RPCHelpMan for gettransactions (Joshua Kelly)

Pull request description:

  The field 'comment' appears twice in `TransactionDescriptionString`, incorrectly - this commit removes the instance of the comment field without a description, preserving the one with a description.

  On master, the duplicate fields can be be viewed here: https://github.com/bitcoin/bitcoin/blob/master/src/wallet/rpc/transactions.cpp#L419-L423

  `TransactionDescriptionString` is included in RPC calls such as `listtransactions` which have functional tests.

ACKs for top commit:
  w0xlt:
    ACK https://github.com/bitcoin/bitcoin/pull/26777/commits/090ad51c80fe02a73f8988c1d5b867d2e90ab2f3

Tree-SHA512: 4bacdafdb517dda2af6d1c193f331b634ae74bd62ac6289c0c288957f39f98a73d07aeab72fbe5bf1ece5532406d4a40a5b8a2277be50115f76c92bb938e21fa
2026-05-20 13:13:05 +01:00
merge-script
797965ef71
Merge ElementsProject/elements#1535: Wallet: don't create transaction chains that will be rejected by mempool by default
a76dc401d6 Merge bitcoin/bitcoin#24502: wallet: don't create long chains by default (MarcoFalke)

Pull request description:

  Cherry pick of bitcoin/bitcoin#24502 with additional functional test to check rejection.

ACKs for top commit:
  delta1:
    ACK a76dc401d6; tested locally

Tree-SHA512: e053109dfda4cc2603a286641a1376d83f3d6cbaa42603d23d38e02d77e6c56d1e0192d2fb504b70c6ba44d92850f449c65d5bc22cba8bf108eb6cb5bb64ab82
2026-04-17 15:13:40 +02:00
merge-script
e6595f1acd
Merge ElementsProject/elements#1546: Fix createfromdump deletion
b6369329ce wallettool: do not use fs::remove_all in createfromdump cleanup (Ava Chow)
086e185a8d wallet: introduce method to return all db created files (furszy)
552ce5ca2c use break-system-packages for pip (Tom Trevethan)
53cef282f4 change test order in feature_discount_ct to fix intermittent failure (Tom Trevethan)

Pull request description:

  Cherry pick of https://github.com/bitcoin/bitcoin/pull/34215

  Required new Files() method to return all db created files for sqlite and bdb (1de423e0a0)

ACKs for top commit:
  delta1:
    ACK b6369329ce; tested locally

Tree-SHA512: effa9fbaf2c2c2381b1e0f937da4761ded7b017afd0e5d308182767848806df31a318545cd132e0c0f1959b3a16f43d98f72825f4b46285257abfacd52278cea
2026-04-17 15:03:07 +02:00
Ava Chow
b6369329ce
wallettool: do not use fs::remove_all in createfromdump cleanup 2026-04-16 15:44:25 +01:00
furszy
086e185a8d
wallet: introduce method to return all db created files 2026-04-16 15:44:25 +01:00
Tom Trevethan
552ce5ca2c
use break-system-packages for pip 2026-04-16 15:44:25 +01:00
Tom Trevethan
53cef282f4
change test order in feature_discount_ct to fix intermittent failure 2026-04-16 15:44:24 +01:00
merge-script
dd4667dd86
Merge ElementsProject/elements#1545: Elem 23.4.0rc2
03d9d8308c Update manpages (Pablo Greco)
d5c0e5bc11 Bump version to 23.4.0-rc2 (Pablo Greco)
6e079ea838 updated documentation for elements chain types (Tom Trevethan)
56b2572cef enabled > 21m for issued assets in GUI amount field (Tom Trevethan)

Pull request description:

  Updates master to 8db19e90c8, which fixes a GUI issue after ELIP 203 and a small documentation fix.

  Also and bumps version/manpages

ACKs for top commit:
  delta1:
    ACK 03d9d8308c; tested locally
  tomt1664:
    Tested ACK 03d9d8308c

Tree-SHA512: a892c33e413dde5c6243e8c7b21987fae8c791154cb356a4c78b68a46cbe8e151df1bc7786d11343def99a92eee22e60efe15d5691c708e5f456a301a8df557d
2026-04-10 12:43:59 +02:00
Pablo Greco
03d9d8308c
Update manpages 2026-04-03 06:42:52 -07:00
Pablo Greco
d5c0e5bc11
Bump version to 23.4.0-rc2 2026-04-03 06:34:26 -07:00
Pablo Greco
1002f8dfef
Merge branch 'master' into elem-23.4.0rc2 2026-04-03 06:34:16 -07:00
merge-script
8db19e90c8
Merge ElementsProject/elements#1541: Correct documentation for elements chain types
6e079ea838 updated documentation for elements chain types (Tom Trevethan)

Pull request description:

  Change config and RPC documentation for Elements chain type options.

ACKs for top commit:
  delta1:
    ACK 6e079ea838; just an RPC documentation update

Tree-SHA512: 4128669f5dda2700562706f7d341f37fecbd8e1c5deee2aed56869b20995f474e51af86d6228246c06a2c90fda1251066a7f86bb2fa55732ab46e58deb55b476
2026-04-01 10:21:11 -07:00
Tom Trevethan
6e079ea838 updated documentation for elements chain types 2026-03-31 16:46:46 +01:00
merge-script
34f056583b
Merge ElementsProject/elements#1540: Enabled >21m for issued assets in GUI amount field
56b2572cef enabled > 21m for issued assets in GUI amount field (Tom Trevethan)

Pull request description:

  Only pegged asset limited to `MAX_MONEY` for the GUI amount field. Issued assets can have amounts displayed > MAX_MONEY.

ACKs for top commit:
  delta1:
    ACK 56b2572cef; ran tests locally but have not tested the GUI

Tree-SHA512: 9a04ed9016b420a32bbaa98b80712725691619c5ca854a6b6d0b07e5a91c9ff818e6367a93f6f5c54ae8e0e9e799b6367042c0f823b6c066c5e25a9624b8adc2
2026-03-25 11:43:44 +02:00
Tom Trevethan
56b2572cef enabled > 21m for issued assets in GUI amount field 2026-03-17 12:16:36 +00:00
merge-script
1b431cb31c
Merge ElementsProject/elements#1538: Prepare elements 23.4.0rc1
de274e59be Update manpages (Pablo Greco)
a36a96175c Bump version to 23.4.0-rc1 (Pablo Greco)
56eb713150 Log status of ELIP 203 (Pablo Greco)
d8052363f3 liquidv1: allow enabling -acceptunlimitedissuances (Pablo Greco)
bd59321098 contrib: upstream my merge-prs.sh changes (Byron Hambly)

Pull request description:

  Updates master to c990492c48, which adds support for enabling ELIP 203 in liquidv1. ELIP 202 support was added in 23.3.3rc1, which was renamed to 24.x. Also and bumps version/manpages

ACKs for top commit:
  delta1:
    ACK de274e59be; tested locally
  tomt1664:
    Tested ACK de274e59be

Tree-SHA512: 073080a6392cd1c10ce3b26e2faef061f583f7f1759fa3c76a71d8418aa5f9e20c0f128cae244910bacb4c09f69039dd70361bd3ab359845f27e8bb12ab21f95
2026-03-13 12:11:40 +02:00
Pablo Greco
de274e59be
Update manpages 2026-03-12 07:41:08 -07:00
Pablo Greco
a36a96175c
Bump version to 23.4.0-rc1 2026-03-12 05:32:00 -07:00
Pablo Greco
6d21020ab3
Merge branch 'master' into elem-23.4.0rc1 2026-03-12 05:31:26 -07:00
merge-script
c990492c48
Merge ElementsProject/elements#1536: liquidv1: allow enabling -acceptunlimitedissuances
56eb713150 Log status of ELIP 203 (Pablo Greco)
d8052363f3 liquidv1: allow enabling -acceptunlimitedissuances (Pablo Greco)

Pull request description:

  Preparation for the activation of  [ELIP 203](https://github.com/ElementsProject/ELIPs/blob/main/elip-0203.mediawiki), we need to move from a hardcoded false to an optionin liquidv1

ACKs for top commit:
  tomt1664:
    Tested ACK 56eb713150
  delta1:
    ACK 56eb713150; tested locally, changes allow acceptunlimitedissuances to be configurable on liquidv1 chain

Tree-SHA512: 1671634af6f3dfeaf48c9c6f9aa8598fed1eddc6a279b7bbbfd6d7d7062b89d85a60ec561560308d55ef4e80790db760b8dd20c19167db248d13d41570893314
2026-03-12 08:28:00 +02:00
Pablo Greco
56eb713150
Log status of ELIP 203 2026-03-10 08:39:25 -07:00
Pablo Greco
d8052363f3
liquidv1: allow enabling -acceptunlimitedissuances 2026-03-10 06:37:54 -07:00
MarcoFalke
a76dc401d6 Merge bitcoin/bitcoin#24502: wallet: don't create long chains by default
da2bc865d6 [wallet] don't create long chains by default (glozow)

Additional functional test for too-long-chains rejected.

Pull request description:

  Default mempool policy doesn't let you have chains longer than 25 transactions. This is locally configurable of course, but it's not really safe to assume that a chain longer than 25 transactions will propagate. Thus, the wallet should probably avoid creating such transactions by default; set `DEFAULT_WALLET_REJECT_LONG_CHAINS` to true.

  Closes #9752
  Closes #10004

ACKs for top commit:
  MarcoFalke:
    re-ACK da2bc865d6 only change is fixing typos in tests 🎏

Tree-SHA512: 65d8e4ec437fe928adf554aa7e819a52e0599b403d5310895f4e371e99bbc838219b3097c4d2f775bc870ac617ef6b4227b94291f2b376f824f14e8f2b152f31
2026-03-09 14:59:53 +00:00
merge-script
2d6711c9e2
Merge ElementsProject/elements#1534: Prepare 23.3.3rc1
6c45fa066a Update manpages (Pablo Greco)
3df185136b Bump version to 23.3.3-rc1 (Pablo Greco)
a18a88b31b grammar: prefer peg-in to pegin in messages (Byron Hambly)
90b2b3bbb0 test: add pegin subsidy functional test (Byron Hambly)
186bb25a08 validation: check for peg-in subsidy and minimum (Byron Hambly)
51c89c65d0 subsidy: implementation for claimpegin, createrawpegin, and RPCs (Byron Hambly)
94cde59dc3 subsidy: add chainparams and init (Byron Hambly)
f3b63f4b8c DecomposePeginWitness: fix deserialization flags for MerkleBlock proof (Byron Hambly)

Pull request description:

  Updates master to 7791d31bcf which ELIP 202 and bumps version/manpages

ACKs for top commit:
  tomt1664:
    Tested ACK [6c45fa0](https://github.com/ElementsProject/elements/pull/1534/commits/6c45fa066a3918a2832823c8da2cf45e8d0028de)
  delta1:
    ACK 6c45fa066a; diff looks as expected, built and tested locally

Tree-SHA512: 514f29b67a3ede75405391c6b2c34ae636042c6bf4189bcc0d85641f824f2d9ba0664b77ea3ae95f98b29b284823b8916688ff1e00699189de03bea4646f8cd0
2026-02-18 12:16:42 +02:00
merge-script
8dda12b5a6
Merge ElementsProject/elements#1532: contrib: upstream my merge-prs.sh changes
bd59321098 contrib: upstream my merge-prs.sh changes (Byron Hambly)

Pull request description:

  Cleaned up and lightly documented my updates to the `merge-prs.sh` script. Still need to write a usage doc.

ACKs for top commit:
  delta1:
    ACK bd59321098; this script is currently being used for merging

Tree-SHA512: 16ca19af21441424d471263ba1bf817856bf3c7d5801a2ce55e83b22cacf62cb92c3bcc84c9f485d173a15b0dda4e0b8b1ec99b3c9cef4835b16aaaafe461d1f
2026-02-17 20:14:15 +02:00
Pablo Greco
6c45fa066a
Update manpages 2026-02-17 08:11:13 -08:00
Pablo Greco
3df185136b
Bump version to 23.3.3-rc1 2026-02-17 08:10:50 -08:00
Pablo Greco
0d7590dbab
Merge branch 'master' into elem-23.3.3rc1 2026-02-17 07:53:04 -08:00
merge-script
a3752d0f9c
Merge ElementsProject/elements#1533: Prepare 23.3.2
43f9542cad Bump version to 23.3.2 final (Pablo Greco)

Pull request description:

  Only version bump changes since rc2

ACKs for top commit:
  tomt1664:
    ACK 43f9542cad
  delta1:
    ACK 43f9542cad; only changes RC version for release

Tree-SHA512: a3424d432a8adefa3e4d31d28781e20e8d7fb01ad10286455a722d138621a3d21fc608eb6300085f26f71fbd999866a5b5e062fc1f0e329b41e8cc6ffeb11e8b
2026-02-13 18:08:10 +02:00
Byron Hambly
bd59321098
contrib: upstream my merge-prs.sh changes 2026-02-13 16:30:02 +02:00
Pablo Greco
43f9542cad
Bump version to 23.3.2 final 2026-02-13 05:57:46 -08:00
merge-script
7791d31bcf
Merge ElementsProject/elements#1499: ELIP 202: Implementation of optional sidechain peg-in subsidy and minimum peg-in amount
a18a88b31b grammar: prefer peg-in to pegin in messages (Byron Hambly)
90b2b3bbb0 test: add pegin subsidy functional test (Byron Hambly)
186bb25a08 validation: check for peg-in subsidy and minimum (Byron Hambly)
51c89c65d0 subsidy: implementation for claimpegin, createrawpegin, and RPCs (Byron Hambly)
94cde59dc3 subsidy: add chainparams and init (Byron Hambly)
f3b63f4b8c DecomposePeginWitness: fix deserialization flags for MerkleBlock proof (Byron Hambly)

Pull request description:

  Implementation for [ELIP 202](https://github.com/ElementsProject/ELIPs/blob/main/elip-0202.mediawiki)

ACKs for top commit:
  jsarenik:
    Running ACK a18a88b
  tomt1664:
    Tested ACK a18a88b31b

Tree-SHA512: 984fe2aa32e6814e14c9535e9fea7e03d3b6cf7a35621ccfb2a081a6ebab01906c5e883c5b505ced53f254401d30b6e975cb05e88efc8d3fbedc79abd0be72a2
2026-02-09 09:14:44 -08:00
merge-script
52a33e6b66
Merge ElementsProject/elements#1531: Prepare 23.3.2rc2
73db0cf72b Bump version to 23.3.2-rc2 (Pablo Greco)
6544256fcb Update manpages (Pablo Greco)
4c79d5a572 fix: use liquidnetwork or liquidtestnet for uri in elements mode (Byron Hambly)
8f28d82f57 docs: add github-merge.py process for merging PRs (Byron Hambly)
6c7788adf3 Avoid Simplicity header dependency propogation (Russell O'Connor)

Pull request description:

  Updates master to 6bb916a57f which includes fixes for simplicity header dependency and qr code generation for QT

ACKs for top commit:
  delta1:
    ACK 73db0cf72b; diff looks as expected, tested locally successfully

Tree-SHA512: d23312a81033b759466f9bc2d8bbb0bfcdd5bfd0a1d80b101e8461e62a151841910310e82ed8a1ba4ed6bb8a363f53dc2e8e5674c27b9ebafe02169a88b08ed9
2026-02-04 13:21:12 +02:00
Pablo Greco
73db0cf72b
Bump version to 23.3.2-rc2 2026-02-03 20:17:18 -08:00
Pablo Greco
6544256fcb
Update manpages 2026-02-03 20:17:18 -08:00
Pablo Greco
672fbda25e
Merge branch 'master' into elem-23.3.2rc2 2026-02-03 20:03:19 -08:00
merge-script
6bb916a57f
Merge ElementsProject/elements#1530: fix: use liquidnetwork or liquidtestnet for qr uri
4c79d5a572 fix: use liquidnetwork or liquidtestnet for uri in elements mode (Byron Hambly)

Pull request description:

  fixes #1529

ACKs for top commit:
  tomt1664:
    ACK 4c79d5a572
  psgreco:
    ACK 4c79d5a572

Tree-SHA512: 00862c3851bd1663ed17dfde9ef155840d4d735b3e61ad890155dccdc9cb7fb4fc086021a9ae1a1030ff8e809dc6ffb46a5aeed35d3c5625b44f65ec6cdae421
2026-01-31 08:12:36 -08:00
Byron Hambly
4c79d5a572
fix: use liquidnetwork or liquidtestnet for uri in elements mode 2026-01-30 10:54:24 +02:00
merge-script
344581cabd
Merge ElementsProject/elements#1528: docs: add github-merge.py process for merging PRs
8f28d82f57 docs: add github-merge.py process for merging PRs (Byron Hambly)

Pull request description:

  Documents how to merge PRs using the github-merge.py script from Bitcoin maintainer tools repo.

ACKs for top commit:
  psgreco:
    ACK 8f28d82f57

Tree-SHA512: b263dd7715fa71926ceeae053e453a4a19b64fa89c88cb0f84fa15bafbcc1051f35ca4f28a05f41dfc8d3af1d1de9eb2bb6cd832867cf7d7d7772a3c7267777b
2026-01-25 10:28:20 -08:00
Byron Hambly
8f28d82f57
docs: add github-merge.py process for merging PRs 2026-01-23 12:09:21 +02:00
merge-script
e360a967b6
Merge ElementsProject/elements#1518: Avoid Simplicity header dependency propogation
6c7788adf3 Avoid Simplicity header dependency propogation (Russell O'Connor)

Pull request description:

  The problem with including <simplicity/elements/env.h> in interpreter.h is that now everyone who needs to include interpreter.h also needs access to Simplicity's header files too.

  This commit breaks that dependency chain by using forward declarations.  It will pay signifigant dividends when elements switches to CMake.

ACKs for top commit:
  delta1:
    ACK 6c7788a; built and tested locally
  apoelstra:
    ACK 6c7788adf3; successfully ran local tests

Tree-SHA512: 78d043a094f0a2bb51e0f103313ae568b42ec2852d8fe9a3fbbcad9c0fbf6829ef1347f83bfd361547ec165c01965e7342188a38d8faacfcf90ef70c5b7001f6
2026-01-22 14:52:00 +02:00
Tom Trevethan
7d23662e5a
Merge pull request #1527 from psgreco/elem-23.3.2rc1
Prepare 23.3.2rc1
2026-01-21 16:39:25 +00:00