Commit graph

39590 commits

Author SHA1 Message Date
merge-script
1af7a4d9be
Merge ElementsProject/elements#1544: Elem 23.3.3 final
0ecea5ceb8 Update manpages (Pablo Greco)
1d767802c6 Bump version to 23.3.3 final (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 for release

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

Tree-SHA512: 5493957cae60b0dd11f28d8ff560f25bff6a27b88f19af98ddd8c7c0b634d784daea459ff487d09a54ae94663633e20ee9d5fd1e20eb205184e448616dd81428
2026-04-10 09:50:16 +02:00
Pablo Greco
0ecea5ceb8
Update manpages 2026-04-03 06:56:10 -07:00
Pablo Greco
1d767802c6
Bump version to 23.3.3 final 2026-04-03 06:26:02 -07:00
Pablo Greco
5e36c0e36f
Merge branch 'master' into elem-23.3.3-final 2026-04-03 06:23:02 -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
2262381e4e
Merge ElementsProject/elements#1537: Prepare 23.3.3rc2
fa01ad2d06 Update manpages (Pablo Greco)
cc2dd3c2fb Bump version to 23.3.3-rc2 (Pablo Greco)
87b72b8da3 Revert "Merge ElementsProject/elements#1499: ELIP 202: Implementation of optional sidechain peg-in subsidy and minimum peg-in amount" (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)
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 c990492c48, which adds support for enabling ELIP 203 in liquidv1, but with  ELIP 202 reverted. Also and bumps version/manpages

ACKs for top commit:
  delta1:
    ACK fa01ad2d06; tested locally, diff as expected
  tomt1664:
    Tested ACK fa01ad2d06

Tree-SHA512: b84da4948d72a638a107868a89676387ec4154e53f3e3c8b937db4cba022819945d49e3f9630c3d6c4574fe32ae8931cc8088374a02229ea027c9f50c487008c
2026-03-13 12:12:31 +02:00
Pablo Greco
fa01ad2d06
Update manpages 2026-03-12 06:15:24 -07:00
Pablo Greco
cc2dd3c2fb
Bump version to 23.3.3-rc2 2026-03-12 05:36:07 -07:00
Pablo Greco
515aa7e9f5
Merge branch 'master-no-upp-test' into elem-23.3.3rc2 2026-03-12 05:28:36 -07:00
Pablo Greco
87b72b8da3
Revert "Merge ElementsProject/elements#1499: ELIP 202: Implementation of optional sidechain peg-in subsidy and minimum peg-in amount"
This reverts commit 7791d31bcf, reversing
changes made to 6bb916a57f.
2026-03-12 05:27:20 -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
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
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
Pablo Greco
df5f043e06
Update manpages 2026-01-20 16:30:28 -08:00
Pablo Greco
af662eb18e
Bump version to 23.3.2-rc1 2026-01-20 15:08:17 -08:00
Pablo Greco
116c2b43b1
Update copyright year to 2026 2026-01-20 15:07:35 -08:00
Pablo Greco
029c24a8e8
Merge branch 'master' into elem-23.3.2rc1 2026-01-20 15:01:13 -08:00
Pablo Greco
6d29a59f61
Merge pull request #1522 from delta1/2026-01-tweakfedpegscript
rpc!: change tweakfedpegscript to output both p2wsh and p2shwsh addresses
2026-01-20 08:02:40 -08:00
Byron Hambly
5d64e8945d
rpc!: change tweakfedpegscript to output P2WSH address
Changes tweakfedpegscript to return both p2wsh and p2shwsh version of
the tweaked address.

"address" has been removed from the result and replaced with "p2wsh" and
"p2shwsh".
2026-01-20 15:03:08 +02:00
merge-script
c1a8b82968
Merge ElementsProject/elements#1526: ci: fix windows jobs for 23.x
75bd182f82 ci(windows): pin jom to 1.1.2 (Byron Hambly)
aad3baf6f0 ci: update qt link for windows job (Byron Hambly)

Pull request description:

  copy of #1520 for elements-23.x

ACKs for top commit:
  delta1:
    ACK [75bd182](https://github.com/ElementsProject/elements/pull/1526/commits/75bd182f821baf6d1221d61e864a6009bc7854ee); CI changes only and CI passed successfully

Tree-SHA512: 237f4aea13f36da5840fcb34a04ee8fc08dceb8e841fb13b7bbe61885d35661ea95e3228a996634f0a75f481a1cf36a5131404c9033ddab52c37c333385d6994
2026-01-20 11:35:27 +02:00
merge-script
166bc34054
Merge ElementsProject/elements#1525: miner: fix addPackageTxs unsigned integer overflow
70d2293e62 miner: fix `addPackageTxs` unsigned integer overflow (ismaelsadeeq)

Pull request description:

  Cherry-pick of https://github.com/bitcoin/bitcoin/pull/33475

ACKs for top commit:
  delta1:
    ACK 70d2293e62; ran tests locally

Tree-SHA512: e9e470fe4ceccd282bc12e942cfde4e3b1c6abfa9747df93a4975c58ac17ff1266f26d35b1bc5b4887e8b6dfdba3380d67144ae35f2ee1489fa355ab211f2fc5
2026-01-20 10:41:29 +02:00
Byron Hambly
75bd182f82
ci(windows): pin jom to 1.1.2
(cherry picked from commit 656ad6d1fb)
2026-01-20 09:49:11 +02:00
Byron Hambly
aad3baf6f0
ci: update qt link for windows job
(cherry picked from commit 2161cf464d)
2026-01-20 09:48:55 +02:00
ismaelsadeeq
70d2293e62 miner: fix addPackageTxs unsigned integer overflow 2026-01-19 16:51:23 +00:00
Byron Hambly
a18a88b31b
grammar: prefer peg-in to pegin in messages 2026-01-15 18:10:52 +02:00
Byron Hambly
90b2b3bbb0
test: add pegin subsidy functional test 2026-01-15 18:10:51 +02:00
Byron Hambly
186bb25a08
validation: check for peg-in subsidy and minimum 2026-01-15 18:10:51 +02:00
Byron Hambly
51c89c65d0
subsidy: implementation for claimpegin, createrawpegin, and RPCs 2026-01-15 18:10:51 +02:00
Byron Hambly
94cde59dc3
subsidy: add chainparams and init 2026-01-15 18:10:50 +02:00
Byron Hambly
f3b63f4b8c
DecomposePeginWitness: fix deserialization flags for MerkleBlock proof
In CreatePeginWitnessInner, the MerkleBlock is always serialized without
witness: PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS

In DecomposePeginWitness before this change, the MerkleBlock was
deserialized with witness: PROTOCOL_VERSION

This was only noticed as an issue in the pegin subsidy implementation,
in a failure in the feature_dynafed functional test. In the
test_transition_mempool_eject test case, the Merkle block proof is coming
from the same chain where we are creating a pegin.

See the comment: "hack: since we're not validating peg-ins in parent chain,
just make both the funding and claim tx on same chain (printing money)"

I haven't investigated enough to explain why this causes a
deserialization failure in this specific case, but presumably this change
is correct since we're always serializing without witness. Before this
DecomposePeginWitness was only used in src/psbt.cpp
2026-01-15 18:10:50 +02:00
merge-script
9a74bc9e2d
Merge ElementsProject/elements#1519: simplicity: update to d1905055
87c0b44f78 Squashed 'src/simplicity/' changes from 6d503ea4f8..49b96499a6 (Byron Hambly)
73d1e521bf docs: add simplicity code update instructions (Byron Hambly)

Pull request description:

  Updates Simplicity C source subtree from current master BlockstreamResearch/Simplicity@d190505509

  Adds new document describing the process.

  Pushed the C-master branch subtree split to my repo [delta1/simplicity/tree/C-master](https://github.com/delta1/simplicity/tree/C-master) and upstreamed in BlockstreamResearch/Simplicity#330

ACKs for top commit:
  delta1:
    ACK 4539002bee; compiled and tested locally

Tree-SHA512: e9fab8baa728ac122597bf2e3c5ae4fe1c5956c655fc336e1cc7a2be591f1deebcab32004a8b6b4ad359c51154ad47bca5f40c21d06823d5d059a6d66efb15af
2026-01-13 09:04:55 +02:00
Byron Hambly
4539002bee
Merge commit '87c0b44f78' into 2026-01-simplicity-update 2026-01-12 12:56:33 +02:00