< bitcoin-git> [bitcoin] fanquake pushed 2 commits to master: https://github.com/bitcoin/bitcoin/compare/54e31742d208...624a19333022
< bitcoin-git> bitcoin/master d4b67c8 Vasil Dimov: scripted-diff: remove ResetI2PPorts() (revert e0a2b390c14)
< bitcoin-git> bitcoin/master 624a193 fanquake: Merge bitcoin/bitcoin#22497: scripted-diff: remove ResetI2PPorts() (revert...
< bitcoin-git> [bitcoin] fanquake merged pull request #22497: scripted-diff: remove ResetI2PPorts() (revert e0a2b390c14) (master...remove_ResetI2PPorts) https://github.com/bitcoin/bitcoin/pull/22497
< bitcoin-git> [bitcoin] fanquake closed pull request #22468: addrman: don't overwrite addr_info when resetting I2P ports (master...reset_i2p_ports_no_overwrite_pos) https://github.com/bitcoin/bitcoin/pull/22468
< bitcoin-git> [bitcoin] fanquake closed pull request #22471: addrman: reset I2P ports in all "new" buckets (master...reset_all_new_i2p_ports) https://github.com/bitcoin/bitcoin/pull/22471
< bitcoin-git> [bitcoin] fanquake pushed 2 commits to master: https://github.com/bitcoin/bitcoin/compare/624a19333022...d542603c5ac9
< bitcoin-git> bitcoin/master facd567 MarcoFalke: scripted-diff: Revert "fuzz: Add Temporary debug assert for oss-fuzz issue...
< bitcoin-git> bitcoin/master d542603 fanquake: Merge bitcoin/bitcoin#22502: scripted-diff: Revert "fuzz: Add Temporary de...
< bitcoin-git> [bitcoin] fanquake merged pull request #22502: scripted-diff: Revert "fuzz: Add Temporary debug assert for oss-fuzz issue" (master...2107-fuzzTempRevert) https://github.com/bitcoin/bitcoin/pull/22502
< bitcoin-git> [bitcoin] fanquake pushed 10 commits to master: https://github.com/bitcoin/bitcoin/compare/d542603c5ac9...e7441a6a4583
< bitcoin-git> bitcoin/master 263220a Carl Dong: guix: Check for a sane services database
< bitcoin-git> bitcoin/master fc4f844 Carl Dong: guix: Update various check_tools lists
< bitcoin-git> bitcoin/master 46ce6ce Carl Dong: tree-wide: Rename gitian-keys to builder-keys
< bitcoin-git> [bitcoin] fanquake merged pull request #21711: guix: Add full installation and usage documentation (master...2021-03-guix-docs) https://github.com/bitcoin/bitcoin/pull/21711
< bitcoin-git> [bitcoin] fanquake pushed 6 commits to master: https://github.com/bitcoin/bitcoin/compare/e7441a6a4583...4fdd0ff9ee90
< bitcoin-git> bitcoin/master dca6c90 fanquake: macdeploy: remove unused plistlib import
< bitcoin-git> bitcoin/master 3d26b6b fanquake: macdeploy: fix framework printing when passing -verbose
< bitcoin-git> bitcoin/master 639f064 fanquake: macdeploy: select the plugins we need, rather than excluding those we don't
< bitcoin-git> [bitcoin] fanquake merged pull request #22199: macdeploy: minor fixups and simplifications (master...macdeploy_further_simplify) https://github.com/bitcoin/bitcoin/pull/22199
< bitcoin-git> [bitcoin] fanquake pushed 3 commits to master: https://github.com/bitcoin/bitcoin/compare/4fdd0ff9ee90...201c5e4aec52
< bitcoin-git> bitcoin/master 90fd13b Carl Dong: guix: Pin kernel header version
< bitcoin-git> bitcoin/master e6a94d4 Carl Dong: guix: Bump to version-1.3.0 from upstream
< bitcoin-git> bitcoin/master 201c5e4 fanquake: Merge bitcoin/bitcoin#22465: guix: Pin kernel-header version, time-machine...
< bitcoin-git> [bitcoin] fanquake merged pull request #22465: guix: Pin kernel-header version, time-machine to upstream 1.3.0 commit (master...2021-07-guix-kernel-old) https://github.com/bitcoin/bitcoin/pull/22465
< bitcoin-git> [bitcoin] fanquake pushed 2 commits to master: https://github.com/bitcoin/bitcoin/compare/201c5e4aec52...5c8820b399f9
< bitcoin-git> bitcoin/master 54c7754 fanquake: build: use aarch64 Clang if cross-compiling for darwin on aarch64
< bitcoin-git> bitcoin/master 5c8820b fanquake: Merge bitcoin/bitcoin#22436: build: use aarch64 Clang if cross-compiling f...
< bitcoin-git> [bitcoin] fanquake merged pull request #22436: build: use aarch64 Clang if cross-compiling for darwin on aarch64 (master...arm64_macos_cross_clang) https://github.com/bitcoin/bitcoin/pull/22436
< jnewbery> fanquake: #22096 and #22261 look ready for merge
<@gribble> https://github.com/bitcoin/bitcoin/issues/22096 | p2p: AddrFetch - dont disconnect on self-announcements by mzumsande · Pull Request #22096 · bitcoin/bitcoin · GitHub
<@gribble> https://github.com/bitcoin/bitcoin/issues/22261 | [p2p/mempool] Two small fixes to node broadcast logic by jnewbery · Pull Request #22261 · bitcoin/bitcoin · GitHub
< fanquake> 👀
< bitcoin-git> [bitcoin] fanquake pushed 5 commits to master: https://github.com/bitcoin/bitcoin/compare/5c8820b399f9...e4487fd5bbce
< bitcoin-git> bitcoin/master b6c5d1e Martin Zumsande: p2p: AddrFetch - don't disconnect on self-announcements
< bitcoin-git> bitcoin/master 533500d Martin Zumsande: p2p: Add timeout for AddrFetch peers
< bitcoin-git> bitcoin/master c34ad33 Martin Zumsande: net, rpc: Enable AddrFetch connections for functional testing
< bitcoin-git> [bitcoin] fanquake merged pull request #22096: p2p: AddrFetch - don't disconnect on self-announcements (master...202105_addrfetch_fix) https://github.com/bitcoin/bitcoin/pull/22096
< bitcoin-git> [bitcoin] fanquake pushed 6 commits to master: https://github.com/bitcoin/bitcoin/compare/e4487fd5bbce...8ed8164e6f1e
< bitcoin-git> bitcoin/master 2837a9f John Newbery: [mempool] Only add a transaction to the unbroadcast set when it's added to...
< bitcoin-git> bitcoin/master 847b6ed Duncan Dean: [test] Test transactions are not re-added to unbroadcast set
< bitcoin-git> bitcoin/master cd48372 John Newbery: [mempool] Allow rebroadcast for same-txid-different-wtxid transactions
< bitcoin-git> [bitcoin] fanquake merged pull request #22261: [p2p/mempool] Two small fixes to node broadcast logic (master...2021-06-broadcast-fixes) https://github.com/bitcoin/bitcoin/pull/22261
< bitcoin-git> [bitcoin] jnewbery opened pull request #22505: addrman: Remove unused test_before_evict argument from Good() (master...2021-07-addrman-good-test-before-evict) https://github.com/bitcoin/bitcoin/pull/22505
< jnewbery> 🙏
< MarcoFalke> wen rc1?
< fanquake> just about
< bitcoin-git> [bitcoin] MarcoFalke pushed 3 commits to master: https://github.com/bitcoin/bitcoin/compare/8ed8164e6f1e...539023ab4155
< bitcoin-git> bitcoin/master 25d99e6 Andrew Chow: Reorder dumpwallet so that cs_main functions go first
< bitcoin-git> bitcoin/master 9b85a5e Andrew Chow: tests: Test for dumpwallet lock order issue
< bitcoin-git> bitcoin/master 539023a MarcoFalke: Merge bitcoin/bitcoin#22492: wallet: Reorder locks in dumpwallet to avoid ...
< bitcoin-git> [bitcoin] MarcoFalke merged pull request #22492: wallet: Reorder locks in dumpwallet to avoid lock order assertion (master...dumpwallet-lock-order) https://github.com/bitcoin/bitcoin/pull/22492
< MarcoFalke> 🚢
< laanwj> time to branch?
< laanwj> #22499 is left
<@gribble> https://github.com/bitcoin/bitcoin/issues/22499 | Update assumed chain params by sriramdvt · Pull Request #22499 · bitcoin/bitcoin · GitHub
< bitcoin-git> [bitcoin] fanquake pushed 2 commits to master: https://github.com/bitcoin/bitcoin/compare/539023ab4155...42af9596ce85
< bitcoin-git> bitcoin/master eeddd1c Sriram: Update assumed chain params
< bitcoin-git> bitcoin/master 42af959 fanquake: Merge bitcoin/bitcoin#22499: Update assumed chain params
< MarcoFalke> I don't think it is blocking rc1. Sure, could get one or two more ACKs, but there are 2 weeks to gather them
< bitcoin-git> [bitcoin] fanquake merged pull request #22499: Update assumed chain params (master...update_chainparams) https://github.com/bitcoin/bitcoin/pull/22499
< MarcoFalke> (assumevalid won't take any effect until it is buried by 2 weeks worth of blocks)
< laanwj> going to branch off 22.0, please don't merge anything for a bit
< MarcoFalke> fanquake: Are you tagging rc1 tis time?
< fanquake> Post-merge ACKs can still accumulate.
< hebasto> I've verified that there no changes in translatable string since string freeze
< MarcoFalke> *this
< laanwj> i guess the branch should be called "22", not "0.22"?
< laanwj> or 22.0
< MarcoFalke> There will be 22.1, surely
< fanquake> I think 22.0
< laanwj> yes, but not a branch
< hebasto> 22.1 is a tag, branch could be 22
< laanwj> i think 22 (just dropping 0.) is more in line with the plan
< laanwj> right
< laanwj> 22.x would be a possibility too
< hebasto> even better :)
< laanwj> ok, doing that
< bitcoin-git> [bitcoin] laanwj pushed 1 commit to master: https://github.com/bitcoin/bitcoin/compare/42af9596ce85...3d8c714d8e79
< bitcoin-git> bitcoin/master 3d8c714 W. J. van der Laan: build: Bump master version to 22.99.0
< laanwj> branch 22.x was created, master is free for 23.x merging
< hebasto> \o/
< laanwj> tag format will be: v22.0rc1 right? or v22.0.0rc1?
< laanwj> any opinions? we've always used vX.Y.Z, and in exceptional cases vX.Y.Z.W (eg v0.20.0.1)
< MarcoFalke> v22.0rc1 Seems fine
< MarcoFalke> I don't think anyone is using regex on the version tags, and if the regex breaks, it will be a good thing
< laanwj> well, I am (for https://github.com/bitcoin-core/bitcoin-maintainer-tools/blob/master/make-tag.py), but I need to update that anyhow because '_CLIENT_VERSION_REVISION' is not a thing anymore, so it doesn't matter too much, just need a consistent naming
< bitcoin-git> [bitcoin] MarcoFalke pushed 2 commits to master: https://github.com/bitcoin/bitcoin/compare/3d8c714d8e79...9faa4b68db80
< bitcoin-git> bitcoin/master fa621ed MarcoFalke: refactor: Pass script verify flags as uint32_t
< bitcoin-git> bitcoin/master 9faa4b6 MarcoFalke: Merge bitcoin/bitcoin#22232: refactor: Pass interpreter flags as uint32_t ...
< bitcoin-git> [bitcoin] MarcoFalke merged pull request #22232: refactor: Pass interpreter flags as uint32_t instead of signed int (master...2106-refactorFlags) https://github.com/bitcoin/bitcoin/pull/22232
< laanwj> it's weird that we got rid of REVISION but not BUILD
< MarcoFalke> Anyone who does use a regex will have to update it. "Breaking" the format will hopefully "notify" anyone that the regex needs update.
< laanwj> BUILD is the fourth number, we have an optional fourth number now but not a third one
< MarcoFalke> I don't expect BUILD to be used
< laanwj> we did use it sometimes
< laanwj> but I would have expected to now use REVISION for that, as, it's moved by one
< MarcoFalke> Hmm, worst case is we just use vX.Y+1 instead of REVISION/BUILD
< laanwj> now we can have, e.g. v22.0.0.2, v22.1.0.3, etc which is fine,
< bitcoin-git> [bitcoin] hebasto opened pull request #22506: build: Support x86_64 <-> arm64 cross-compiling for macOS (master...210720-xmac) https://github.com/bitcoin/bitcoin/pull/22506
< laanwj> I'd personally prefer changing BUILD to REVISION
< laanwj> getting rid of it completely is an option too of course, but I don't see why we should artificially limit ourselves that way
< laanwj> #define BUILD_DESC "v" STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
< laanwj> oh
< laanwj> we just use non-standard naming, okay, fine too
< jonatack> yay! so IIUC this is when we taildraggers start using guix?
< laanwj> i'll tag it in a few minutes
< laanwj> need to update the script to check the new versioning scheme correctly
< jarolrod> 🎉
< bitcoin-git> [bitcoin] laanwj pushed tag v22.0rc1: https://github.com/bitcoin/bitcoin/compare/v22.0rc1
< hebasto> nice!
< laanwj> you can start your guix builds now! let's hope it will all go as expected
< laanwj> sure we did a test run, but this is the first actual rc
< hebasto> anyone who needs a simple step-by-step guide for guix builds could follow this one https://gist.github.com/hebasto/7293726cbfcd0b58e1cfd5418316cee3
< jonatack> thanks hebasto!
< bitcoin-git> [bitcoin] MarcoFalke opened pull request #22507: doc: Adjust commit message template for the guix.sigs repo (master...2107-docGuixCommit) https://github.com/bitcoin/bitcoin/pull/22507
< bitcoin-git> [bitcoin] apoelstra opened pull request #22508: fuzz: replace every fuzzer-controlled while loop with a macro (master...2021-07--fuzzer-loops) https://github.com/bitcoin/bitcoin/pull/22508
< bitcoin-git> [bitcoin] MarcoFalke pushed 3 commits to master: https://github.com/bitcoin/bitcoin/compare/9faa4b68db80...951850bebfde
< bitcoin-git> bitcoin/master fa27f03 MarcoFalke: Move LoadBlockIndexDB to BlockManager
< bitcoin-git> bitcoin/master faa54e3 MarcoFalke: Move pblocktree global to BlockManager
< bitcoin-git> bitcoin/master 951850b MarcoFalke: Merge bitcoin/bitcoin#22371: Move pblocktree global to BlockManager
< bitcoin-git> [bitcoin] MarcoFalke merged pull request #22371: Move pblocktree global to BlockManager (master...2106-treeGlobalNooo) https://github.com/bitcoin/bitcoin/pull/22371
< shiza> I have an usage question about an old wallet. Is that still off topic?
< shiza> I asked in #bitcoin about five hourse ago, but I can wait more.
< sipa> https://bitcoin.stackexchange.com may be a better place (search for existing questions on the topic first)
< shiza> I read some questions not to much success, then messing with the console commands quickly gave info useful enough. :)
< bitcoin-git> [bitcoin] sriramdvt opened pull request #22509: test: Use MiniWallet in mempool_accept.py (master...mini_memaccept) https://github.com/bitcoin/bitcoin/pull/22509
< hebasto> #20586 has 3 ACKs, isn't it a good time to merge it, just after branching off :)
<@gribble> https://github.com/bitcoin/bitcoin/issues/20586 | Fix Windows build with --enable-werror by hebasto · Pull Request #20586 · bitcoin/bitcoin · GitHub
< bitcoin-git> [bitcoin] laanwj pushed 2 commits to master: https://github.com/bitcoin/bitcoin/compare/951850bebfde...bb09ec6f106c
< bitcoin-git> bitcoin/master fafade9 MarcoFalke: doc: Adjust commit message template for the guix.sigs repo
< bitcoin-git> bitcoin/master bb09ec6 W. J. van der Laan: Merge bitcoin/bitcoin#22507: doc: Adjust commit message template for the g...
< bitcoin-git> [bitcoin] laanwj merged pull request #22507: doc: Adjust commit message template for the guix.sigs repo (master...2107-docGuixCommit) https://github.com/bitcoin/bitcoin/pull/22507
< bitcoin-git> [gui] ShaMan239 opened pull request #384: add copy subnet action for banned peer (master...copy-subnet) https://github.com/bitcoin-core/gui/pull/384
< bitcoin-git> [bitcoin] siv2r closed pull request #22312: changes for wait_for_getheaders to include hash_list (master...modify-wait-getheaders) https://github.com/bitcoin/bitcoin/pull/22312
< jamesob> Do we ever expect to support an index that actually requires sequential indexing? Jimpo's BaseIndex advertises that it will index sequentially, but at the moment none of the particular indexers require this. Furthermore, we will have BlockConnected events triggering indexing out of order once we start using background chainstates for assumeutxo.
< sipa> maybe the index itself can handle this if this ever becomes a requirement?
< sipa> i.e. it'd cache the last block it is synchronized up to, and only does work when that last block changes
< jamesob> Hm yeah, I think an indexer subclass could potentially override Init or ThreadSync to build itself once background chainstates are out of use
< jamesob> But anyway I'm thinking of removing the sequential advertisement (which for now only exists in the class documentation) since we don't even make use of that assumption at the moment
< jamesob> Hm, am I missing something of does txindex (via BaseIndex) not handle reorgs properly? BlockDisconnected events are not handled by BaseIndex and I can't see where unlinked block txns would be removed from the txindex... I guess this isn't a problem so long as inclusion in the index is not ever treated to mean "confirmed in the active chain"
< sipa> they're not removed no
< sipa> it allows you to look up transactions in inactive chains, if they haven't been re-confirmed in the main chain
< jamesob> good to know - maybe I'll make a note of that in the class doc
< luke-jr> can whoever controls the @Bitcoincoreorg Twitter handle retweet https://twitter.com/LukeDashjr/status/1417589399215292420?s=20 ?
< bitcoin-git> [bitcoin] theStack opened pull request #22510: test: add test for RPC error 'Transaction already in block chain' (master...202107-test-tx_already_in_blockchain) https://github.com/bitcoin/bitcoin/pull/22510
< sipa> luke-jr: what is going on?
< robertspigler> Congratulations on the branch-off!
< bitcoin-git> [bitcoin] dongcarl opened pull request #22511: guix: Silence `getent(1)` invocation (master...2021-07-guix-silence-getent) https://github.com/bitcoin/bitcoin/pull/22511