Skip to content

Conversation

@idky137
Copy link
Contributor

@idky137 idky137 commented Feb 3, 2026

Pulls #815 (and therefore dev) and fixes conflicts, fixing all conflicts with dev and the downstream branch in the process.

AloeareV and others added 30 commits December 15, 2025 12:19
…a block by height, zaino does not sync in the current waiting period
- Add `zaino-common::net` module with `resolve_socket_addr()` and
  `try_resolve_address()` for hostname:port resolution
- Change validator address config fields from `SocketAddr` to `String`
- Add `AddressResolution` enum to distinguish between resolved addresses,
  valid hostnames pending DNS, and invalid formats
- Reject malformed addresses (missing port, invalid format) at config time
- Defer DNS resolution for valid hostnames (Docker DNS) to connection time
- Update `From<ZainodConfig>` to `TryFrom<ZainodConfig>` for proper error handling
- Mark DNS-dependent tests with `#[ignore]` to prevent CI flakiness
@idky137 idky137 changed the title Update state service chain index integration Update state service chain index integration: Feature/lightclient protocol v0.4.0 Feb 3, 2026
@idky137 idky137 marked this pull request as ready for review February 3, 2026 16:16
@idky137
Copy link
Contributor Author

idky137 commented Feb 3, 2026

All tests passing locally

NOTE: only b752840 and 35b4475 are new commits, all other commits are from dev or #650.

@idky137 idky137 requested review from AloeareV and nachog00 and removed request for AloeareV February 3, 2026 18:14
Copy link
Contributor

@AloeareV AloeareV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict resolution all looks good!

@AloeareV AloeareV merged commit 3221c90 into zingolabs:state_service_chain_index_integration Feb 3, 2026
65 of 80 checks passed
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.

8 participants