72e4e1cf21 use break-system-packages for pip (Tom Trevethan)
Pull request description:
Add --break-system-packages to PIP_PACKAGES in macos CI, to allow for macos-runner images to update homebrew packages.
ACKs for top commit:
delta1:
ACK 72e4e1cf21; fixes macos ci task
Tree-SHA512: 27dc712309940afde1d21c9f465c244eb49d0d1bb8bbf2faba3bf64d00a63f975943825019cd45f1c32e462ab6b5d74490cb0876aeb5e6397da20e668fff2823
6515f58351 change test order in feature_discount_ct to fix intermittent failure (Tom Trevethan)
Pull request description:
Prevents blinded output being selected intermittently and resulting in vszie and fee assertions failing.
ACKs for top commit:
delta1:
ACK 6515f58351; fixes discount_ct test flakiness
Tree-SHA512: 32d8c64011125e5531dd19ce84dbe39b2d4496a02c5bf5ece0cbc2f0c2bf6660816d6d61593fe32a615dd96a8632d94cba6bc09e792ffa6ea57fbdc4f52424da
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
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
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
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
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
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
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
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".
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
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
49b96499a6 Replace Bitcoin Relative Timelock Jets
89ddb43eed Mark depricated parts of the TxEnv as obsolete
ff5d6fe4f7 Deprecate Broken Jets
ae008201ac Test Bitcoin jet deserialization
e81b68f197 Add GenPrimitive --bitcoin option
7887d16f24 Bitcoin specific fee jets
68603073b3 Bitcoin specific environment
ae3287e60f Refactor Makefile
99e3804e2d C: replace string initializations with arrays
c3dd9331cd Allow building on non-intel systems
git-subtree-dir: src/simplicity
git-subtree-split: 49b96499a6bb93b31d2f712fc1d4524f341ae640
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.
