diff --git a/.changeset/ninety-planets-cross.md b/.changeset/ninety-planets-cross.md
new file mode 100644
index 000000000..7d972ae6d
--- /dev/null
+++ b/.changeset/ninety-planets-cross.md
@@ -0,0 +1,5 @@
+---
+"@hyperlane-xyz/registry": patch
+---
+
+Add OP extension and Trumpchain warp route
diff --git a/deployments/warp_routes/TRUMP/arbitrum-avalanche-base-flowmainnet-form-optimism-solanamainnet-worldchain-addresses.yaml b/deployments/warp_routes/TRUMP/arbitrum-avalanche-base-flowmainnet-form-optimism-solanamainnet-worldchain-addresses.yaml
new file mode 100644
index 000000000..796f01b53
--- /dev/null
+++ b/deployments/warp_routes/TRUMP/arbitrum-avalanche-base-flowmainnet-form-optimism-solanamainnet-worldchain-addresses.yaml
@@ -0,0 +1,16 @@
+arbitrum:
+  synthetic: "0x5155EB1bcD30189915cF84717550Acfa537068bF"
+avalanche:
+  synthetic: "0x0e2A546a53678ee8F8605748193a8c114fA0317F"
+base:
+  synthetic: "0x53c0499e7E4aBD3e7994ca161523FD50A12Bb8C8"
+flowmainnet:
+  synthetic: "0xD3378b419feae4e3A4Bb4f3349DBa43a1B511760"
+form:
+  synthetic: "0x8528bAa7d1d386E7967603e480fa2B558a23644c"
+optimism:
+  synthetic: "0xe36c02471e708a9f16da58168da744b059a1c6fe"
+solanamainnet:
+  collateral: 21tAY4poz2VXvghqdSQpn9j7gYravQmGpuQi8pHPx9DS
+worldchain:
+  synthetic: "0x0fC7b3518C03BfA5e01995285b1eF3c4B55c8922"
diff --git a/deployments/warp_routes/TRUMP/arbitrum-avalanche-base-flowmainnet-form-solanamainnet-worldchain-config.yaml b/deployments/warp_routes/TRUMP/arbitrum-avalanche-base-flowmainnet-form-optimism-solanamainnet-worldchain-config.yaml
similarity index 80%
rename from deployments/warp_routes/TRUMP/arbitrum-avalanche-base-flowmainnet-form-solanamainnet-worldchain-config.yaml
rename to deployments/warp_routes/TRUMP/arbitrum-avalanche-base-flowmainnet-form-optimism-solanamainnet-worldchain-config.yaml
index a47da1d42..0c06d49eb 100644
--- a/deployments/warp_routes/TRUMP/arbitrum-avalanche-base-flowmainnet-form-solanamainnet-worldchain-config.yaml
+++ b/deployments/warp_routes/TRUMP/arbitrum-avalanche-base-flowmainnet-form-optimism-solanamainnet-worldchain-config.yaml
@@ -9,6 +9,7 @@ tokens:
       - token: ethereum|form|0x8528bAa7d1d386E7967603e480fa2B558a23644c
       - token: ethereum|avalanche|0x0e2A546a53678ee8F8605748193a8c114fA0317F
       - token: ethereum|worldchain|0x0fC7b3518C03BfA5e01995285b1eF3c4B55c8922
+      - token: ethereum|optimism|0xe36c02471e708a9f16da58168da744b059a1c6fe
     decimals: 18
     logoURI: /deployments/warp_routes/TRUMP/logo.png
     name: OFFICIAL TRUMP
@@ -23,6 +24,7 @@ tokens:
       - token: ethereum|avalanche|0x0e2A546a53678ee8F8605748193a8c114fA0317F
       - token: ethereum|worldchain|0x0fC7b3518C03BfA5e01995285b1eF3c4B55c8922
       - token: sealevel|solanamainnet|21tAY4poz2VXvghqdSQpn9j7gYravQmGpuQi8pHPx9DS
+      - token: ethereum|optimism|0xe36c02471e708a9f16da58168da744b059a1c6fe
     decimals: 18
     logoURI: /deployments/warp_routes/TRUMP/logo.png
     name: OFFICIAL TRUMP
@@ -37,6 +39,7 @@ tokens:
       - token: ethereum|form|0x8528bAa7d1d386E7967603e480fa2B558a23644c
       - token: ethereum|worldchain|0x0fC7b3518C03BfA5e01995285b1eF3c4B55c8922
       - token: sealevel|solanamainnet|21tAY4poz2VXvghqdSQpn9j7gYravQmGpuQi8pHPx9DS
+      - token: ethereum|optimism|0xe36c02471e708a9f16da58168da744b059a1c6fe
     decimals: 18
     logoURI: /deployments/warp_routes/TRUMP/logo.png
     name: OFFICIAL TRUMP
@@ -51,6 +54,7 @@ tokens:
       - token: ethereum|avalanche|0x0e2A546a53678ee8F8605748193a8c114fA0317F
       - token: ethereum|worldchain|0x0fC7b3518C03BfA5e01995285b1eF3c4B55c8922
       - token: sealevel|solanamainnet|21tAY4poz2VXvghqdSQpn9j7gYravQmGpuQi8pHPx9DS
+      - token: ethereum|optimism|0xe36c02471e708a9f16da58168da744b059a1c6fe
     decimals: 18
     logoURI: /deployments/warp_routes/TRUMP/logo.png
     name: OFFICIAL TRUMP
@@ -65,6 +69,7 @@ tokens:
       - token: ethereum|worldchain|0x0fC7b3518C03BfA5e01995285b1eF3c4B55c8922
       - token: ethereum|base|0x53c0499e7E4aBD3e7994ca161523FD50A12Bb8C8
       - token: sealevel|solanamainnet|21tAY4poz2VXvghqdSQpn9j7gYravQmGpuQi8pHPx9DS
+      - token: ethereum|optimism|0xe36c02471e708a9f16da58168da744b059a1c6fe
     decimals: 18
     logoURI: /deployments/warp_routes/TRUMP/logo.png
     name: OFFICIAL TRUMP
@@ -72,6 +77,21 @@ tokens:
     symbol: TRUMP
   - addressOrDenom: "0x0fC7b3518C03BfA5e01995285b1eF3c4B55c8922"
     chainName: worldchain
+    connections:
+      - token: ethereum|arbitrum|0x5155EB1bcD30189915cF84717550Acfa537068bF
+      - token: ethereum|flowmainnet|0xD3378b419feae4e3A4Bb4f3349DBa43a1B511760
+      - token: ethereum|form|0x8528bAa7d1d386E7967603e480fa2B558a23644c
+      - token: ethereum|avalanche|0x0e2A546a53678ee8F8605748193a8c114fA0317F
+      - token: ethereum|base|0x53c0499e7E4aBD3e7994ca161523FD50A12Bb8C8
+      - token: sealevel|solanamainnet|21tAY4poz2VXvghqdSQpn9j7gYravQmGpuQi8pHPx9DS
+      - token: ethereum|optimism|0xe36c02471e708a9f16da58168da744b059a1c6fe
+    decimals: 18
+    logoURI: /deployments/warp_routes/TRUMP/logo.png
+    name: OFFICIAL TRUMP
+    standard: EvmHypSynthetic
+    symbol: TRUMP
+  - addressOrDenom: "0xe36c02471e708a9f16da58168da744b059a1c6fe"
+    chainName: optimism
     connections:
       - token: ethereum|arbitrum|0x5155EB1bcD30189915cF84717550Acfa537068bF
       - token: ethereum|flowmainnet|0xD3378b419feae4e3A4Bb4f3349DBa43a1B511760
@@ -96,6 +116,7 @@ tokens:
       - token: ethereum|form|0x8528bAa7d1d386E7967603e480fa2B558a23644c
       - token: ethereum|avalanche|0x0e2A546a53678ee8F8605748193a8c114fA0317F
       - token: ethereum|worldchain|0x0fC7b3518C03BfA5e01995285b1eF3c4B55c8922
+      - token: ethereum|optimism|0xe36c02471e708a9f16da58168da744b059a1c6fe
     decimals: 6
     logoURI: /deployments/warp_routes/TRUMP/logo.png
     name: OFFICIAL TRUMP
diff --git a/deployments/warp_routes/TRUMP/base-addresses.yaml b/deployments/warp_routes/TRUMP/base-addresses.yaml
deleted file mode 100644
index 4d588f858..000000000
--- a/deployments/warp_routes/TRUMP/base-addresses.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-base:
-  synthetic: "0x53c0499e7E4aBD3e7994ca161523FD50A12Bb8C8"
diff --git a/deployments/warp_routes/TRUMP/solanamainnet-trumpchain-addresses.yaml b/deployments/warp_routes/TRUMP/solanamainnet-trumpchain-addresses.yaml
new file mode 100644
index 000000000..d4cae6d44
--- /dev/null
+++ b/deployments/warp_routes/TRUMP/solanamainnet-trumpchain-addresses.yaml
@@ -0,0 +1,4 @@
+base:
+  synthetic: "0xD84981Ecd4c411A86E1Ccda77F944c8f3D9737ab"
+solanamainnet:
+  collateral: AyJk3V2SjswRv1ppDazVofXnFgjCTeydNEDSyA2UyVNX
diff --git a/deployments/warp_routes/TRUMP/solanamainnet-trumpchain-config.yaml b/deployments/warp_routes/TRUMP/solanamainnet-trumpchain-config.yaml
new file mode 100644
index 000000000..2a4cb870e
--- /dev/null
+++ b/deployments/warp_routes/TRUMP/solanamainnet-trumpchain-config.yaml
@@ -0,0 +1,22 @@
+# yaml-language-server: $schema=../schema.json
+tokens:
+  - addressOrDenom: "0xD84981Ecd4c411A86E1Ccda77F944c8f3D9737ab"
+    chainName: trumpchain
+    connections:
+      - token: sealevel|solanamainnet|AyJk3V2SjswRv1ppDazVofXnFgjCTeydNEDSyA2UyVNX
+    decimals: 18
+    logoURI: /deployments/warp_routes/TRUMP/logo.png
+    name: OFFICIAL TRUMP
+    standard: EvmHypNative
+    symbol: TRUMP
+  - addressOrDenom: AyJk3V2SjswRv1ppDazVofXnFgjCTeydNEDSyA2UyVNX
+    chainName: solanamainnet
+    coinGeckoId: official-trump
+    collateralAddressOrDenom: 6p6xgHyF7AeE6TZkSmFsko444wqoP15icUSqi2jfGiPN
+    connections:
+      - token: ethereum|trumpchain|0xD84981Ecd4c411A86E1Ccda77F944c8f3D9737ab
+    decimals: 6
+    logoURI: /deployments/warp_routes/TRUMP/logo.png
+    name: OFFICIAL TRUMP
+    standard: SealevelHypCollateral
+    symbol: TRUMP