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
