Add CJDNS network to -addrinfo and -netinfo #23175

pull jonatack wants to merge 2 commits into bitcoin:master from jonatack:add-cjdns-to-addrinfo-and-netinfo changing 1 files +14 −15

jonatack commented at 3:46 PM on October 4, 2021: member

Follow-up to #23077 and #23324.

$ ./src/bitcoin-cli -addrinfo
{
  "addresses_known": {
    "ipv4": 47782,
    "ipv6": 10307,
    "onion": 8030,
    "i2p": 41,
    "cjdns": 1,
    "total": 66161
  }
}
$ ./src/bitcoin-cli -netinfo 
Bitcoin Core client v22.99.0-deb6223d4c55 - server 70016/Satoshi:22.99.0(jon)/

        ipv4    ipv6   onion     i2p   cjdns   total   block  manual
in         0       5      12       5       1      23
out        2       2       9       5       2      20       2      10
total      2       7      21      10       3      43

$ ./src/bitcoin-cli -netinfo 1

Screenshot from 2021-10-10 12-01-58

DrahtBot added the label Utils/log/libs on Oct 4, 2021
laanwj commented at 9:02 PM on October 4, 2021: member

Concept ACK
dunxen commented at 6:10 AM on October 5, 2021: contributor

Concept ACK

I'm rebasing this on #23077 and testing it out :)
practicalswift commented at 10:24 AM on October 5, 2021: contributor

Concept ACK

Thanks for improving -addrinfo and -netinfo.
ghost commented at 11:25 AM on October 5, 2021: none

I am still not sure about CJDNS and have no opinions on #23077

However, looking at the support from others it will most likely get merged so this PR makes sense.

Concept ACK
DrahtBot commented at 8:55 AM on October 21, 2021: member



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

No conflicts as of last run.
laanwj referenced this in commit ee1294f155 on Oct 21, 2021
sidhujag referenced this in commit b43d231c1d on Oct 21, 2021
Zero-1729 commented at 11:29 AM on October 22, 2021: contributor

Concept ACK
laanwj commented at 1:47 PM on November 8, 2021: member

Needs rebase (and can go out of draft) now that #23175 is merged.
prusnak commented at 6:16 PM on November 8, 2021: contributor

Needs rebase (and can go out of draft) now that #23175 is merged.

laanwj meant #23077 (#23175 is this PR)
cli: add cjdns network to -addrinfo and -netinfo 5bd40a3e84
cli: hoist networks class data members to a constant 7b6528746a
jonatack marked this as ready for review on Nov 11, 2021
jonatack commented at 12:25 PM on November 11, 2021: member

Thanks! Rebased and updated (simplified) following the merge of #23324, and bringing out of draft now that #23077 has been merged.
jonatack force-pushed on Nov 11, 2021
prusnak approved
prusnak commented at 1:13 PM on November 11, 2021: contributor

utACK
laanwj commented at 9:19 PM on November 15, 2021: member

Code review ACK 7b6528746acf9c915d7157bb860ec899b58dded7
laanwj referenced this in commit caf8b26b52 on Nov 15, 2021
DrahtBot added the label Needs rebase on Nov 15, 2021
DrahtBot commented at 9:41 PM on November 15, 2021: member



🐙 This pull request conflicts with the target branch and needs rebase.

<sub>Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".</sub>
prusnak commented at 9:53 PM on November 15, 2021: contributor

This PR has been merged into master via https://github.com/bitcoin/bitcoin/commit/caf8b26b52bf38289899dfa1ca15aa9c9d140971
sipa closed this on Nov 15, 2021
sipa commented at 9:57 PM on November 15, 2021: member

Closing as merged.
sidhujag referenced this in commit 5371b96f1e on Nov 16, 2021
jonatack deleted the branch on Nov 16, 2021
DrahtBot locked this on Nov 17, 2022