diff --git a/web/services/iroh/publicationPolicy.ts b/web/services/iroh/publicationPolicy.ts index 4a9a1761997a..89e757264134 100644 --- a/web/services/iroh/publicationPolicy.ts +++ b/web/services/iroh/publicationPolicy.ts @@ -8,10 +8,13 @@ */ export const MANAGED_RELAY_URLS = [ - "https://euc1-1.relay.lawrence.cmux.iroh.link/", - "https://use1-1.relay.lawrence.cmux.iroh.link/", - "https://usw1-1.relay.lawrence.cmux.iroh.link/", - "https://aps1-1.relay.lawrence.cmux.iroh.link/", + "https://usc1.relay.cmux.dev/", + "https://usw1.relay.cmux.dev/", + "https://use4.relay.cmux.dev/", + "https://euw4.relay.cmux.dev/", + "https://apne1.relay.cmux.dev/", + "https://apse1.relay.cmux.dev/", + "https://ape1.relay.cmux.dev/", ] as const; const MANAGED_RELAY_URL_SET: ReadonlySet = new Set(MANAGED_RELAY_URLS); diff --git a/web/tests/devices-route.test.ts b/web/tests/devices-route.test.ts index 71c22b4f60da..2fe5253e5b98 100644 --- a/web/tests/devices-route.test.ts +++ b/web/tests/devices-route.test.ts @@ -35,7 +35,7 @@ let sql: Sql | null = null; const DEVICE_A = "11111111-1111-4111-8111-111111111111"; const DEVICE_B = "22222222-2222-4222-8222-222222222222"; const IROH_ENDPOINT_ID = "a".repeat(64); -const APPROVED_IROH_RELAY = "https://use1-1.relay.lawrence.cmux.iroh.link/"; +const APPROVED_IROH_RELAY = "https://use4.relay.cmux.dev/"; const legacyTailscaleRoute = { id: "legacy", diff --git a/workers/presence/src/routePrivacy.ts b/workers/presence/src/routePrivacy.ts index 208c4079f53e..2b41aaa7663f 100644 --- a/workers/presence/src/routePrivacy.ts +++ b/workers/presence/src/routePrivacy.ts @@ -2,10 +2,13 @@ // The Worker cannot import from `web/` because each deployment has its own // build root. Exact URLs are intentional: arbitrary relay URLs are path hints. export const APPROVED_IROH_RELAY_URLS = [ - "https://euc1-1.relay.lawrence.cmux.iroh.link/", - "https://use1-1.relay.lawrence.cmux.iroh.link/", - "https://usw1-1.relay.lawrence.cmux.iroh.link/", - "https://aps1-1.relay.lawrence.cmux.iroh.link/", + "https://usc1.relay.cmux.dev/", + "https://usw1.relay.cmux.dev/", + "https://use4.relay.cmux.dev/", + "https://euw4.relay.cmux.dev/", + "https://apne1.relay.cmux.dev/", + "https://apse1.relay.cmux.dev/", + "https://ape1.relay.cmux.dev/", ] as const; const APPROVED_IROH_RELAY_URL_SET: ReadonlySet = new Set(APPROVED_IROH_RELAY_URLS); diff --git a/workers/presence/test/core.test.ts b/workers/presence/test/core.test.ts index b268925b6030..1c5cfec61d70 100644 --- a/workers/presence/test/core.test.ts +++ b/workers/presence/test/core.test.ts @@ -332,7 +332,7 @@ describe("heartbeat routes", () => { endpoint: { type: "peer", id: "a".repeat(64), - relay_url: "https://use1-1.relay.lawrence.cmux.iroh.link/", + relay_url: "https://use4.relay.cmux.dev/", relay_hint: "legacy-private-relay-hint", direct_addrs: ["192.168.1.20:49152"], }, @@ -344,7 +344,7 @@ describe("heartbeat routes", () => { endpoint: { type: "peer", id: "a".repeat(64), - relay_url: "https://use1-1.relay.lawrence.cmux.iroh.link/", + relay_url: "https://use4.relay.cmux.dev/", }, }; diff --git a/workers/presence/test/syncPairedMacs.test.ts b/workers/presence/test/syncPairedMacs.test.ts index 1f110ea49f29..754574055ad2 100644 --- a/workers/presence/test/syncPairedMacs.test.ts +++ b/workers/presence/test/syncPairedMacs.test.ts @@ -134,7 +134,7 @@ describe("parsePairedMacBackup", () => { id: "a".repeat(64), direct_addrs: ["192.168.1.20:49152"], relay_hint: "legacy-private-relay-hint", - relay_url: "https://use1-1.relay.lawrence.cmux.iroh.link/", + relay_url: "https://use4.relay.cmux.dev/", }, }, ], @@ -153,7 +153,7 @@ describe("parsePairedMacBackup", () => { endpoint: { type: "peer", id: "a".repeat(64), - relay_url: "https://use1-1.relay.lawrence.cmux.iroh.link/", + relay_url: "https://use4.relay.cmux.dev/", }, }, ]); @@ -175,7 +175,7 @@ describe("applyBackupOps", () => { id: "a".repeat(64), direct_addrs: ["192.168.1.20:49152"], relay_hint: "legacy-private-relay-hint", - relay_url: "https://use1-1.relay.lawrence.cmux.iroh.link/", + relay_url: "https://use4.relay.cmux.dev/", }, }, ], @@ -211,7 +211,7 @@ describe("applyBackupOps", () => { endpoint: { type: "peer", id: "a".repeat(64), - relay_url: "https://use1-1.relay.lawrence.cmux.iroh.link/", + relay_url: "https://use4.relay.cmux.dev/", }, }, ]); diff --git a/workers/presence/test/syncStorage.test.ts b/workers/presence/test/syncStorage.test.ts index 7e3428f34bf8..00cdba349697 100644 --- a/workers/presence/test/syncStorage.test.ts +++ b/workers/presence/test/syncStorage.test.ts @@ -598,7 +598,7 @@ describe("deriveDeviceRecord edge cases", () => { id: "a".repeat(64), direct_addrs: ["192.168.1.20:49152"], relay_hint: "legacy-private-relay-hint", - relay_url: "https://use1-1.relay.lawrence.cmux.iroh.link/", + relay_url: "https://use4.relay.cmux.dev/", }, }, ], @@ -614,7 +614,7 @@ describe("deriveDeviceRecord edge cases", () => { endpoint: { type: "peer", id: "a".repeat(64), - relay_url: "https://use1-1.relay.lawrence.cmux.iroh.link/", + relay_url: "https://use4.relay.cmux.dev/", }, }, ]); diff --git a/workers/presence/test/validate.test.ts b/workers/presence/test/validate.test.ts index 305bf7b1a9ec..ad9ffe4d544f 100644 --- a/workers/presence/test/validate.test.ts +++ b/workers/presence/test/validate.test.ts @@ -3,7 +3,7 @@ import { MAX_REQUEST_BYTES, MAX_ROUTES, parseHeartbeat, readBoundedJson } from " const DEVICE_ID = "11111111-2222-4333-8444-555555555555"; const IROH_ENDPOINT_ID = "a".repeat(64); -const APPROVED_IROH_RELAY = "https://use1-1.relay.lawrence.cmux.iroh.link/"; +const APPROVED_IROH_RELAY = "https://use4.relay.cmux.dev/"; function postRequest( body: string | ReadableStream,