feat(smartcontract, activator): remove multiple tunnel restriction (#2725) by bgm-malbeclabs · Pull Request #2728 · malbeclabs/doublezero

bgm-malbeclabs · 2026-01-26T22:58:10Z

Summary of Changes

This PR adds the ability from the CLI and the smart contract to add simultaneous tunnels: a single unicast and a single mulitcast tunnel (subscriber or publisher only).

Closes #2735

Testing Verification

E2E tests were extended to include creating multiple tunnels for a single user
The coexistence tests that were skipped are now enabled and pass
This also adds tests to verify that pubkey is always the last deserialized field in both go and rust
Tests to validate the default ip and edge cases
Claude helped extend the tests

smartcontract/sdk/go/serviceability/deserialize.go

client/doublezero/src/dzd_latency.rs

Copilot

Pull request overview

This PR removes the restriction that allowed only a single tunnel per user, enabling users to maintain both a unicast (IBRL) tunnel and a multicast tunnel simultaneously. The implementation creates separate user accounts per tunnel type while sharing the same client IP, with each tunnel connecting to potentially different devices.

Changes:

Added tunnel_endpoint field to User state to track device-side GRE endpoints for multiple concurrent tunnels
Modified CLI and smart contract to support creating multiple user accounts (one per UserType) for the same client IP
Extended E2E tests to validate concurrent IBRL+multicast tunnel scenarios

Reviewed changes

Copilot reviewed 35 out of 35 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
smartcontract/programs/doublezero-serviceability/src/state/user.rs	Added tunnel_endpoint field and capability helper methods to User struct
smartcontract/programs/doublezero-serviceability/src/processors/user/activate.rs	Updated activate processor to handle tunnel_endpoint parameter
smartcontract/sdk/rs/src/commands/user/activate.rs	Added tunnel_endpoint parameter to ActivateUserCommand
client/doublezero/src/command/connect.rs	Modified connection logic to support multiple user types per IP and device selection
client/doublezero/src/dzd_latency.rs	Added exclude_ips parameter to prevent selecting same device for concurrent tunnels
e2e/ibrl_multicast_coexistence_test.go	Added comprehensive tests for concurrent IBRL+multicast tunnels
activator/src/process/user.rs	Updated to use new capability helper methods and set tunnel_endpoint

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

client/doublezero/src/dzd_latency.rs

e2e/ibrl_multicast_coexistence_test.go

Copilot · 2026-01-29T23:01:22Z

e2e/ibrl_multicast_coexistence_test.go

+// For single-client scenarios where the same user has both IBRL and multicast, both tunnels
+// use sequential addresses in the 169.254.0.x range (e.g., IBRL on .0/.1, multicast on .2/.3).
+func verifyConcurrentMulticastPIMAdjacency(t *testing.T, log *slog.Logger, device *devnet.Device) {
+	// log.Info("==> Verifying concurrent multicast PIM adjacency", "deviceCode", device.Code)


Remove commented-out log statement.

Suggested change

// log.Info("==> Verifying concurrent multicast PIM adjacency", "deviceCode", device.Code)

smartcontract/programs/doublezero-serviceability/src/state/user.rs

activator/src/process/user.rs

snormore · 2026-01-30T13:53:50Z

e2e/ibrl_multicast_coexistence_test.go


+	// Give extra time for agent config to be applied to device before verification
+	log.Info("==> Waiting for agent config to be applied to device")
+	time.Sleep(15 * time.Second)


Want to use a poll/eventually check here instead of the 15s sleep?

snormore · 2026-01-30T13:57:10Z

e2e/ibrl_multicast_coexistence_test.go

+
+// TestE2E_SingleClient_IBRL_Then_Multicast_Publisher tests a single client connecting
+// to IBRL first, then adding multicast publisher capability.
+func TestE2E_SingleClient_IBRL_Then_Multicast_Publisher(t *testing.T) {


Want to combine the subscriber and publisher part of these (1 DZD, 2 clients)?

elitegreg

LGTM. Did you verify that doublezero status with two tunnels connected to separate devices still shows that the user is connect to the "best" devices?

client/doublezero/src/command/connect.rs

vihu · 2026-01-30T17:37:55Z

activator/src/process/user.rs

-                UserType::Multicast => !user.publishers.is_empty(),
-            };
+            // Use device public_ip as tunnel_endpoint
+            let tunnel_endpoint = device_state.device.public_ip;


@elitegreg is this correct or should it use the first ip from device_state.device.dz_prefixes?

This is correct. He's setting the tunnel endpoint address (what device to connect to).

vihu · 2026-01-30T17:49:54Z

Not included in this PR but potentially relevant:

doublezero/smartcontract/programs/doublezero-serviceability/src/processors/accesspass/set.rs

Line 30 in da8453b

    
           const AIRDROP_USER_RENT_LAMPORTS_BYTES: usize = 236 * 3; // 236 bytes per User account x 3 accounts = 708 bytes

I think this should be changed to:

  const AIRDROP_USER_RENT_LAMPORTS_BYTES: usize = 240 * 3; // 240 bytes per User account

To account for the 4 bytes for the newly added tunnel_endpoint.

elitegreg · 2026-01-30T18:24:33Z

  const AIRDROP_USER_RENT_LAMPORTS_BYTES: usize = 240 * 3; // 240 bytes per User account
To account for the 4 bytes for the newly added tunnel_endpoint.

Maybe we can add a test for this so it doesn't get forgotten is User grows?

…/pub

bgm-malbeclabs · 2026-01-30T21:11:20Z

  const AIRDROP_USER_RENT_LAMPORTS_BYTES: usize = 240 * 3; // 240 bytes per User account
To account for the 4 bytes for the newly added tunnel_endpoint.
Maybe we can add a test for this so it doesn't get forgotten is User grows?

added a test - good call out. Also added tests to validate go and rust deserialization given the requirement for pubkey to be the last field

packethog · 2026-01-30T21:53:53Z

e2e/ibrl_multicast_coexistence_test.go

+
+	// Give time for agent to apply the configuration
+	log.Info("==> Waiting for agent to apply configuration")
+	time.Sleep(10 * time.Second)


Do we need this sleep if we're waiting for client tunnels to be up below?

yea probably not

packethog · 2026-01-30T22:02:05Z

activator/src/process/user.rs

            )
            .unwrap();

+            // Use device public_ip as tunnel_endpoint (preserve existing if set)


I thought we were separating out the 2nd tunnel endpoint work. If this lands as is, what else is needed to enable that, at least on the serviceability/client front? I'm worried about fracturing support for it across multiple PRs where some are multi-feature.

bgm-malbeclabs marked this pull request as draft January 26, 2026 22:58

bgm-malbeclabs force-pushed the bgm/simultaneous_tunnels_cli branch from 14a2136 to 231d212 Compare January 27, 2026 01:06

bgm-malbeclabs self-assigned this Jan 27, 2026

packethog reviewed Jan 28, 2026

View reviewed changes

smartcontract/sdk/go/serviceability/deserialize.go Show resolved Hide resolved

bgm-malbeclabs force-pushed the bgm/simultaneous_tunnels_cli branch 2 times, most recently from 10c95c2 to 4bda09f Compare January 28, 2026 20:18

bgm-malbeclabs commented Jan 28, 2026

View reviewed changes

client/doublezero/src/dzd_latency.rs Outdated Show resolved Hide resolved

bgm-malbeclabs force-pushed the bgm/simultaneous_tunnels_cli branch 2 times, most recently from 1efa5cf to 3b7754c Compare January 29, 2026 22:09

DNM: feat(cli): remove multiple tunnel restriction (#2725)

42711d2

bgm-malbeclabs force-pushed the bgm/simultaneous_tunnels_cli branch from 3b7754c to 42711d2 Compare January 29, 2026 22:39

bgm-malbeclabs changed the title ~~DNM: feat(cli): remove multiple tunnel restriction (#2725)~~ feat(cli, smartcontract, activator): remove multiple tunnel restriction (#2725) Jan 29, 2026

update user struct

62c3c4b

bgm-malbeclabs marked this pull request as ready for review January 29, 2026 22:46

bgm-malbeclabs requested review from Copilot, elitegreg, snormore and vihu January 29, 2026 23:00

Copilot AI reviewed Jan 29, 2026

View reviewed changes

bgm-malbeclabs added 2 commits January 29, 2026 16:49

add some more comments

64eba8e

fmt...

d12b3da

snormore reviewed Jan 30, 2026

View reviewed changes

elitegreg approved these changes Jan 30, 2026

View reviewed changes

vihu reviewed Jan 30, 2026

View reviewed changes

client/doublezero/src/command/connect.rs Show resolved Hide resolved

vihu reviewed Jan 30, 2026

View reviewed changes

bgm-malbeclabs added 3 commits January 30, 2026 11:13

set bytes to 240 (+4 for tunnel_endpoint), constrain single mcast sub…

f18da0f

…/pub

another test

fdf036b

deserialize correctly

4d2ca0a

bgm-malbeclabs added 2 commits January 30, 2026 12:50

more tests

c81a6fb

new tests

466aab3

vihu approved these changes Jan 30, 2026

View reviewed changes

packethog requested changes Jan 30, 2026

View reviewed changes

bgm-malbeclabs mentioned this pull request Jan 31, 2026

feat(cli): remove one tunnel restriction (#2725) #2771

Open

bgm-malbeclabs changed the title ~~feat(cli, smartcontract, activator): remove multiple tunnel restriction (#2725)~~ feat(smartcontract, activator): remove multiple tunnel restriction (#2725) Jan 31, 2026

Conversation

bgm-malbeclabs commented Jan 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of Changes

Testing Verification

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Copilot AI Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

snormore Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

snormore Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

elitegreg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vihu Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

elitegreg Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

vihu commented Jan 30, 2026

Uh oh!

elitegreg commented Jan 30, 2026

Uh oh!

bgm-malbeclabs commented Jan 30, 2026

Uh oh!

packethog Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

bgm-malbeclabs Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

packethog Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bgm-malbeclabs commented Jan 26, 2026 •

edited

Loading