Skip to content

Comments

Merge hotfix changes from v0.7.0-rc.26 back to main#57

Open
ovitrif wants to merge 7 commits intomainfrom
base/v0.7.0-rc.18
Open

Merge hotfix changes from v0.7.0-rc.26 back to main#57
ovitrif wants to merge 7 commits intomainfrom
base/v0.7.0-rc.18

Conversation

@ovitrif
Copy link
Collaborator

@ovitrif ovitrif commented Feb 23, 2026

Summary

  • Peer address upsert fix: PeerStore::add_peer now updates the stored socket address when a peer reconnects with a different IP, instead of silently ignoring it. Includes unit + integration tests.
  • Test rename: peer_address_updated_on_readdpeer_address_updated_on_re_add
  • Android minSdk bump: 21 → 24
  • Kotlin publishing: Switch to GitHub Packages with com.synonym groupId (already on main, should auto-resolve)

Test plan

  • Verify peer address upsert unit tests pass
  • Verify peer address upsert integration test passes
  • Verify no merge conflicts
  • Verify Android build with minSdk 24

🤖 Generated with Claude Code

ben-kaufman and others added 7 commits February 21, 2026 22:36
PeerStore::add_peer previously returned early if a peer already existed,
silently discarding address updates. When an LSP node's IP changed, the
reconnection loop would indefinitely retry the stale cached address.

This commit:
1. Changes add_peer to upsert: if the peer exists but the address
   differs, update and re-persist it.
2. Reorders Node::connect to persist the peer *before* attempting the
   connection, so the new address is saved even if the connection
   races with an in-flight reconnection attempt at the old address.
3. Adds unit tests for the upsert logic and an integration test for
   persist-on-failed-connect.

See upstream issue lightningdevkit#700.

Co-authored-by: Cursor <cursoragent@cursor.com>
The JVM groupId was still hardcoded to org.lightningdevkit while Android
correctly used com.synonym. This aligns both by reading group from
gradle.properties, matching the Android pattern.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…size

fix: switch Kotlin publishing to GitHub Packages
@ovitrif
Copy link
Collaborator Author

ovitrif commented Feb 23, 2026

Merge Conflicts

This PR has conflicts in version-related and binary files, which is expected since both branches had independent version bumps:

Text conflicts (version strings):

  • CHANGELOG.md
  • Cargo.toml
  • Package.swift
  • bindings/kotlin/ldk-node-android/gradle.properties
  • bindings/kotlin/ldk-node-jvm/gradle.properties
  • bindings/python/pyproject.toml

Binary conflicts (compiled bindings):

  • bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so
  • bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so
  • bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so
  • bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-aarch64/libldk_node.dylib
  • bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-x86-64/libldk_node.dylib

Resolution plan: The key changes (peer address upsert fix, test rename, minSdk bump) merge cleanly. The version/binary conflicts should be resolved by keeping main's versions (rc.25) since no version bump is intended in this PR — that will happen in a subsequent PR with a fresh binding regeneration.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants