refactor(swap): Upgrade libp2p to 0.53.2, reliable retry mechanisms #109

binarybaron · 2024-10-10T12:19:32Z

Our libp2p version is out of date, and we need to tackle the upgrade even though it's a significant undertaking. This'll also fix some other issues.

This PR includes the following changes:

Breaking network protocol change: The libp2p version has been upgraded to 0.53 which includes breaking network protocol changes. ASBs and CLIs will not be able to swap if one of them is on the old version.
ASB: Transfer proofs will be repeatedly sent until they are acknowledged by the other party. This fixes a bug where it'd seem to Bob as if the Alice never locked the Monero. Forcing the swap to be refunded.
CLI: Encrypted signatures will be repeatedly sent until they are acknowledged by the other party
CLI+ASB: Libp2p network errors in request-response protocols are now propagated throught the event loop channels. This allows the caller to retry if an error occurs (e.g timeout)

Closes #101, #95

- Update libp2p dependency to 0.53.2 in Cargo.toml - Add libp2p-swarm-derive dependency - Update imports and usage of libp2p types and traits - Refactor NetworkBehaviour implementations to match new API - Update Identify and Ping behavior configurations - Adjust event handling in network behaviors - Fix compiler errors and warnings related to API changes

…2p/rust-libp2p#3746)

…macro (See: https://docs.rs/libp2p/latest/libp2p/swarm/trait.NetworkBehaviour.html#custom-networkbehaviour-with-the-derive-macro)

…p/rust-libp2p#5429)

…op.rs

…nal cbor impl, remove custom one (See: Remove custom cbor request response implementation, replaced with one from library (See: github.com/libp2p/rust-libp2p/pull/3952)

…ibp2p/rust-libp2p#3848 and https://github.com/libp2p/rust-libp2p/blob/master/swarm/CHANGELOG.md)

…unctions

binarybaron · 2024-10-19T14:28:04Z

@Einliterflasche I think this is reasonably distributed across the code base that it'll be possible to work on this concurrently. Feel free to push to this branch.

…ailed in swap/src/asb/event_loop.rs

See libp2p/rust-libp2p#2652

See: libp2p/rust-libp2p#3920 This should be backwards compatible because SelectUpgrade should allow older clients to use yamux instead of mplex

binarybaron · 2024-10-21T18:43:27Z

* [ ]  Update `upgrade` module function calls in `swap/src/network/swap_setup.rs`:
  
  * [ ]  Replace `upgrade::read_length_prefixed` with an alternative
  * [ ]  Replace `upgrade::write_length_prefixed` with an alternative

These functions were removed in this PR. I haven't been able to figure out quite what to replace our current approach with. Probably some combination of asynchronous-codec, quick-protobuf-codec and unsigned-varint.

We should use libp2p/rust-libp2p#4787 as a starting point on how to migrate.

…epalive and something else

binarybaron · 2024-10-22T15:00:08Z

@Einliterflasche Do you want to work on swap/src/network/swap_setup/alice.rs?

I'll work on what I described in the comment above.

Einliterflasche · 2024-10-22T15:17:20Z

I partially implemented swap/src/network/swap_setup/alice.rs, I'll have to check if I moved the function bodies correctly. I also fixed some of the import issues. It's down to 27 errors now, though there are two things I don't know how to fix: KeepAlive in network\swap_setup\alice.rs doesn't seem to be exported anywhere, and I commented out NetworkBehaviourEventProcess as well

…ssed_transfer_proof

…edgement

…network interface The reason for this is to ensure the asb does not crash if the websocket listen address is still present in the config file. Support for it has been removed.

swap/src/network/swap_setup/bob.rs

swap/src/network/swap_setup/alice.rs

- Remove connection guards and channel timeout from request handling, dial directly - Implement retries for quote, swap setup and cooperative redeem requests. Max 60s timeout. Max interval 5s - Make NewSwap derive Clone to support retrying requests

- Remove redundant code - Only reset backoff interval when we connect

…r outbound connections

…enied by ConnectionHandler anyway

…109) Our libp2p version is out of date, and we need to tackle the upgrade even though it's a significant undertaking. This'll also fix some other [issues](#95). - Breaking network protocol change: The libp2p version has been upgraded to 0.53 which includes breaking network protocol changes. ASBs and CLIs will not be able to swap if one of them is on the old version. - ASB: Transfer proofs will be repeatedly sent until they are acknowledged by the other party. This fixes a bug where it'd seem to Bob as if the Alice never locked the Monero. Forcing the swap to be refunded. - CLI: Encrypted signatures will be repeatedly sent until they are acknowledged by the other party - CLI+ASB: Libp2p network errors in request-response protocols are now propagated throught the event loop channels. This allows the caller to retry if an error occurs (e.g timeout) Closes #101, #95

binarybaron added 2 commits October 10, 2024 14:18

wip: migrate to libp2p 0.53.2

04c9d7c

remove submodule

7029b7d

binarybaron mentioned this pull request Oct 10, 2024

Can't swap: can't list-sellers because local peer doesn't support protocols requested by remote comit-network/xmr-btc-swap#1414

Open

update Cargo.lock

fec79f6

binarybaron changed the title ~~Upgrade libp2p to 0.53.2~~ refactor(swap): Upgrade libp2p to 0.53.2 Oct 11, 2024

binarybaron added 10 commits October 16, 2024 19:05

fix: custom impl_from_rr_event macro

4c28dcb

work in progress

0d3424d

fix(libp2p): impl AsRef<str> instead of ProtocolName trait (See: libp…

70ea2f1

…2p/rust-libp2p#3746)

fix(libp2p): Rename out_event to to_swarm in NetworkBehaviour derive …

b483168

…macro (See: https://docs.rs/libp2p/latest/libp2p/swarm/trait.NetworkBehaviour.html#custom-networkbehaviour-with-the-derive-macro)

fix(libp2p): Handle Io errors in impl_from_rr_event macro (See: libp2…

eea7ddc

…p/rust-libp2p#5429)

fix(libp2p): Replace RequestId with OutboundRequestId in cli/event_lo…

a7e394d

…op.rs

refactor(libp2p): Use new request_response imports, syntax. Use inter…

c1b6607

…nal cbor impl, remove custom one (See: Remove custom cbor request response implementation, replaced with one from library (See: github.com/libp2p/rust-libp2p/pull/3952)

fix(libp2p): Use native json request_response impl, remove custom one

df64e76

wip(libp2p): Use new API for swap/src/network/swap_setup/bob.rs (See l…

0b8f578

…ibp2p/rust-libp2p#3848 and https://github.com/libp2p/rust-libp2p/blob/master/swarm/CHANGELOG.md)

This comment was marked as outdated.

Sign in to view

binarybaron added 3 commits October 18, 2024 15:51

fix(libp2p): Use new API for mplex, yamux, noise in transport setup f…

bdd67a1

…unctions

fix(lip2p): Use new NetworkBehaviour API for swap/src/network/redial.rs

26da7d0

fix(libp2p): Omit removed argument from Swarm::add_external_address

2a7bdf2

binarybaron added 2 commits October 21, 2024 18:57

fix(libp2p): Destructure libp2p::rendezvous::client::Event::RegisterF…

f402c1a

…ailed in swap/src/asb/event_loop.rs

fix(libp2p): Use new Transport API for TorDialOnlyTransport

93cb6cb

See libp2p/rust-libp2p#2652

This comment was marked as outdated.

Sign in to view

fix(libp2p): Remove deprecated mplex

b06ecc7

See: libp2p/rust-libp2p#3920 This should be backwards compatible because SelectUpgrade should allow older clients to use yamux instead of mplex

binarybaron mentioned this pull request Oct 21, 2024

Replace monero-wallet-rpc with monero bindings #114

Open

refactor: fix alice swap_setup behaviour and handler, maybe. TODO: ke…

5676596

…epalive and something else

fix more error, mostly add StreamProtocol

26de166

binarybaron added 10 commits November 8, 2024 17:34

fix: clippy warnings

e3bff92

refactor(libp2p): Print errors during negotiation in swap_setup/bob.rs

74e211d

Merge branch 'master' into libp2p/upgrade

c8a0fb1

fix(asb): Remove websocket listen address from default config

b21f58c

refactor(cli): Do not match cancel/refund states as has_already_proce…

988fd57

…ssed_transfer_proof

refactor(asb): Add TODO for listening to enc signature before acknowl…

c39d097

…edgement

refactor: Remove Cargo.lock from subdirectory

3f95985

refactor: Fix clippy errors

88614a7

fix(clippy): Remove redundant .into()

aa8c1a9

feat(asb): Warn instead of bail, if we cannot listen on a particular …

aec6bac

…network interface The reason for this is to ensure the asb does not crash if the websocket listen address is still present in the config file. Support for it has been removed.

binarybaron force-pushed the libp2p/upgrade branch from a93e691 to aec6bac Compare November 9, 2024 19:09

binarybaron mentioned this pull request Nov 10, 2024

Proposal: first stable release #148

Open

12 tasks

Merge branch 'master' into libp2p/upgrade

8f09dda

binarybaron commented Nov 10, 2024

View reviewed changes

swap/src/network/swap_setup/bob.rs Show resolved Hide resolved

binarybaron commented Nov 10, 2024

View reviewed changes

swap/src/network/swap_setup/alice.rs Outdated Show resolved Hide resolved

Merge branch 'master' into libp2p/upgrade

e3c7256

binarybaron force-pushed the libp2p/upgrade branch from 6e47bcb to f49396d Compare November 10, 2024 21:55

binarybaron force-pushed the libp2p/upgrade branch from f49396d to 0163eab Compare November 10, 2024 21:58

binarybaron added 5 commits November 10, 2024 23:08

refactor(cli/event_loop.rs): Move timeouts into static

601f375

fix(libp2p): Redial behaviour

04cac99

- Remove redundant code - Only reset backoff interval when we connect

fix(swap_setup/alice.rs): Create swap_setup ConnectionHandler even fo…

32b6ee3

…r outbound connections

fix(swap_setup/bob.rs): Do not panic on inbound connection as it is d…

005e869

…enied by ConnectionHandler anyway

remaining leftovers

230265a

binarybaron marked this pull request as ready for review November 10, 2024 23:07

binarybaron changed the title ~~refactor(swap): Upgrade libp2p to 0.53.2, harden transfer proof and encrypted signature network protocol~~ refactor(swap): Upgrade libp2p to 0.53.2, reliable retry mechanisms Nov 10, 2024

dprint fmt

15b30e3

binarybaron merged commit c027e51 into master Nov 10, 2024
26 of 29 checks passed

Einliterflasche mentioned this pull request Nov 14, 2024

Release build segfaults on quote request #95

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(swap): Upgrade libp2p to 0.53.2, reliable retry mechanisms #109

refactor(swap): Upgrade libp2p to 0.53.2, reliable retry mechanisms #109

binarybaron commented Oct 10, 2024 •

edited

Loading

This comment was marked as outdated.

binarybaron commented Oct 19, 2024

This comment was marked as outdated.

binarybaron commented Oct 21, 2024 •

edited

Loading

binarybaron commented Oct 22, 2024

Einliterflasche commented Oct 22, 2024

refactor(swap): Upgrade libp2p to 0.53.2, reliable retry mechanisms #109

refactor(swap): Upgrade libp2p to 0.53.2, reliable retry mechanisms #109

Conversation

binarybaron commented Oct 10, 2024 • edited Loading

This PR includes the following changes:

This comment was marked as outdated.

binarybaron commented Oct 19, 2024

This comment was marked as outdated.

binarybaron commented Oct 21, 2024 • edited Loading

binarybaron commented Oct 22, 2024

Einliterflasche commented Oct 22, 2024

binarybaron commented Oct 10, 2024 •

edited

Loading

binarybaron commented Oct 21, 2024 •

edited

Loading