diff options
| author | Bitflash <btf01@proton.me> | 2026-07-29 12:05:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-29 12:05:12 -0300 |
| commit | 137a166fe0b95ccdef444041e907358bd26bc226 (patch) | |
| tree | bab295f18576f5d139bd7746f3c141fbbdfea3e2 /src/nostr.h | |
| parent | 96a8e42bbc313f96d54377ae5886da84298e61a3 (diff) | |
Remove peer exchange from main; it was merged unreviewed (#27)
PR #25 was opened, reviewed and approved as a single-file change to net.cpp:
the .btf peer cache, +169/-0. I then pushed peer exchange and a /port option
onto that same branch while the PR was open, which silently widened it to six
files. The merge carried all of it in.
Nothing about the peer exchange had been validated. Its two-node test never
completed -- node B could not dial node A at all -- so what landed on main is
unproven network protocol code that no one agreed to take.
This restores main to what #25 actually described. The peer cache stays, with
its runtime numbers (36.3s to 2.1s to first peer). #26 stays. What comes out:
- the "btfpeers" message, both directions
- BtfPexCollect / BtfPexAccept and the per-message caps
- CNode::nLastPexRecv
- the `desc` field on the cached peer record
- BtfLocalDescriptor / BtfSecpContext
- /port
Peer exchange returns as its own pull request once its test passes. The /port
option is worth having on its own -- two nodes cannot share a machine without
it, which is what blocked the test -- and should go up separately rather than
ride along again.
Release v1.2.2 is unaffected: it was built from ba2de82, before either merge.
Diffstat (limited to 'src/nostr.h')
| -rw-r--r-- | src/nostr.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/nostr.h b/src/nostr.h index b5eb5e3..04149e3 100644 --- a/src/nostr.h +++ b/src/nostr.h | |||
| @@ -82,14 +82,6 @@ bool BtfGetIdentity(unsigned char pubkey[32], unsigned char enc_sk[32]); | |||
| 82 | // This node's printable .btf address, or "" if the identity failed to load. | 82 | // This node's printable .btf address, or "" if the identity failed to load. |
| 83 | std::string BtfLocalAddress(); | 83 | std::string BtfLocalAddress(); |
| 84 | 84 | ||
| 85 | // This node's own signed descriptor, ready to hand to a peer over the wire. | ||
| 86 | // "" until ThreadBtfAccept has registered at a rendezvous. | ||
| 87 | std::string BtfLocalDescriptor(); | ||
| 88 | |||
| 89 | // The shared secp256k1 context, for btf::VerifyDescriptor (which takes it as | ||
| 90 | // void* to keep headers free of secp). NULL if the identity failed to load. | ||
| 91 | void* BtfSecpContext(); | ||
| 92 | |||
| 93 | // Resolve a .btf address via the public discovery relays: fetch the owner's | 85 | // Resolve a .btf address via the public discovery relays: fetch the owner's |
| 94 | // self-certified descriptor and return its meeting node ("host:port") and | 86 | // self-certified descriptor and return its meeting node ("host:port") and |
| 95 | // x25519 public key for the end-to-end channel. | 87 | // x25519 public key for the end-to-end channel. |