please comment with
- bitcoin PR / merged-master commit hash
- notes about conflicts/resolution or things to keep track of
for Bitcoin PR bitcoin/bitcoin#23508
Check this out -- this PR removed the following lines:
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index 3ef94e1f25..19c2387b66 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -160,25 +160,6 @@ class BlockchainTest(BitcoinTestFramework):
self.start_node(0, extra_args=[
'-stopatheight=207',
'-prune=550',
-<<<<<<< HEAD
- '-testactivationheight=bip34@2',
- '-testactivationheight=dersig@3',
- '-testactivationheight=cltv@4',
- '-testactivationheight=csv@5',
- '-testactivationheight=segwit@6',
- # ELEMENTS
- "-con_bip34height=2",
- "-con_bip66height=3",
- "-con_bip65height=4",
- "-con_csv_deploy_start=5",
-||||||| a4f7c41271
- '-testactivationheight=bip34@2',
- '-testactivationheight=dersig@3',
- '-testactivationheight=cltv@4',
- '-testactivationheight=csv@5',
- '-testactivationheight=segwit@6',
-=======
->>>>>>> d4e92d843650b0480b86d15ce46ed02b6fd9b5be
We treated it like a deletion. However, they were actually moved (I found this in the original PR), lower in that same file test/functional/rpc_blockchain.py
:
def _test_getdeploymentinfo(self):
# Note: continues past -stopatheight height, so must be invoked
# after _test_stopatheight
self.log.info("Test getdeploymentinfo")
self.stop_node(0)
self.start_node(0, extra_args=[
'-testactivationheight=bip34@2',
'-testactivationheight=dersig@3',
'-testactivationheight=cltv@4',
'-testactivationheight=csv@5',
'-testactivationheight=segwit@6',
])
So, we need to add
# ELEMENTS
"-con_bip34height=2",
"-con_bip66height=3",
"-con_bip65height=4",
"-con_csv_deploy_start=5",
there as well.
Update: upon further review of the commit, these arguments were already correctly added during the commit. I think the 4-way diff Wass just being strange. This is not actually an issue.
for Bitcoin PR bitcoin/bitcoin#24343
TODO: revisit failing test (I will do it when I'm done going through everything)
Update: fixed in jamesdorfman/elements@2ab19eb
for Bitcoin PR bitcoin/bitcoin#24409
Not specifically related to this commit, but we need to update the PACKAGE_NAME
variable in file build_msvc/bitcoin_config.h.ini
.
It's currently set to
/* Define to the full name of this package. */
#define PACKAGE_NAME "Bitcoin Core"
Update: fixed in jamesdorfman/elements@c37b88c
for Bitcoin PR bitcoin/bitcoin#24451
Confirm with @delta1 -- your commit message says All conflicts in the locale translation files were resolved by taking the upstream version of the files.
. I want to confirm that by upstream, you mean bitcoin. If that is the case, then I agree with this solution.
for Bitcoin PR bitcoin/bitcoin#24451
Confirm with @delta1 -- your commit message says
All conflicts in the locale translation files were resolved by taking the upstream version of the files.
. I want to confirm that by upstream, you mean bitcoin. If that is the case, then I agree with this solution.
@jamesdorfman yes exactly
delta1/elements@c53eb39for Bitcoin PR bitcoin/bitcoin#24035Upstream removed the extra fee but we didn't. Should we?Update: no we can't. The test fails without this extra fee, with the following error: