diff --git a/Packages/Primitives/Sources/SwapProvider.swift b/Packages/Primitives/Sources/SwapProvider.swift
index 8480e3e25..4937b8e0f 100644
--- a/Packages/Primitives/Sources/SwapProvider.swift
+++ b/Packages/Primitives/Sources/SwapProvider.swift
@@ -24,4 +24,5 @@ public enum SwapProvider: String, Codable, Equatable, Hashable, Sendable {
 	case relay
 	case hyperliquid
 	case orca
+	case squid
 }
diff --git a/Packages/PrimitivesComponents/Sources/Extensions/SwapProviderType+Gemstone.swift b/Packages/PrimitivesComponents/Sources/Extensions/SwapProviderType+Gemstone.swift
index 8d6c2320f..8a908b5a9 100644
--- a/Packages/PrimitivesComponents/Sources/Extensions/SwapProviderType+Gemstone.swift
+++ b/Packages/PrimitivesComponents/Sources/Extensions/SwapProviderType+Gemstone.swift
@@ -26,6 +26,7 @@ public extension SwapProvider {
         case .orca: Images.SwapProviders.orca
         case .panora: Images.SwapProviders.panora
         case .okx: Images.SwapProviders.okx
+        case .squid: Images.SwapProviders.squid
         }
     }
 }
diff --git a/Packages/Signer/Sources/Chains/CosmosSigner.swift b/Packages/Signer/Sources/Chains/CosmosSigner.swift
index db7a50541..847c08fe4 100644
--- a/Packages/Signer/Sources/Chains/CosmosSigner.swift
+++ b/Packages/Signer/Sources/Chains/CosmosSigner.swift
@@ -3,7 +3,6 @@
 import Foundation
 import WalletCore
 import Primitives
-import Keystore
 
 // https://github.com/trustwallet/wallet-core/blob/master/swift/Tests/Blockchains/THORChainTests.swift#L27
 struct CosmosSigner: Signable {
@@ -63,6 +62,10 @@ struct CosmosSigner: Signable {
         return output.serialized
     }
     
+    func signSwap(input: SignerInput, privateKey: Data) throws -> [String] {
+        try ChainSigner(chain: input.asset.chain).signSwap(input: input, privateKey: privateKey)
+    }
+
     func signData(input: Primitives.SignerInput, privateKey: Data) throws -> String {
         fatalError()
     }
diff --git a/Packages/Style/Sources/Images.swift b/Packages/Style/Sources/Images.swift
index 4f39d4f5c..ed7574c5f 100644
--- a/Packages/Style/Sources/Images.swift
+++ b/Packages/Style/Sources/Images.swift
@@ -83,6 +83,7 @@ public enum Images {
         public static let panora = Image(.panora)
         public static let okx = Image(.okx)
         public static let nearIntents = Image(.nearIntents)
+        public static let squid = Image(.squid)
     }
 
     public enum EarnProviders {
diff --git a/Packages/Style/Sources/Resources/Assets.xcassets/swap_providers/squid.imageset/Contents.json b/Packages/Style/Sources/Resources/Assets.xcassets/swap_providers/squid.imageset/Contents.json
new file mode 100644
index 000000000..3ad41ee30
--- /dev/null
+++ b/Packages/Style/Sources/Resources/Assets.xcassets/swap_providers/squid.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "squid.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Packages/Style/Sources/Resources/Assets.xcassets/swap_providers/squid.imageset/squid.svg b/Packages/Style/Sources/Resources/Assets.xcassets/swap_providers/squid.imageset/squid.svg
new file mode 100644
index 000000000..05762c1f8
--- /dev/null
+++ b/Packages/Style/Sources/Resources/Assets.xcassets/swap_providers/squid.imageset/squid.svg
@@ -0,0 +1,5 @@
+<svg width="48" height="48" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="250" cy="250" r="250" fill="#E6FA36"/>
+<path d="M330.37,394.04c7.13-30.65,2.38-61.7-9.81-91.06c-20.87-50.27-48.6-66-49.52-109.63c-0.3-14.36,0.79-42.98-21.04-40.89 c-20.67,1.98-18.11,25.45-13.61,39.99c6.98,22.56,25.23,41.64,42.35,71.02c12.82,21.99,21.31,38.09,23.12,62.65 c1.88,25.49-5.09,53.38-19.96,75.67c-13.79,20.67-43.42,40.18-73.71,25.99c-11.04-5.17-17.78-14.73-20.95-25.04 c-9.93-32.36,2.96-63.98,6.2-103.76c5.4-66.24-39.27-157.11-125.18-115.05c-27.59,13.51-49.17,48.83-58.35,81.63 c-3.34,11.93-4.61,24.7-4.23,37.61c5.22,24.08,13.9,46.87,25.5,67.82l0,0c-3.14-10.81-4.84-23.04-5.77-38.86 c-1.5-25.49,7.98-65.34,23.85-87.18c14.65-20.16,47.7-39.18,79.19-22.39c16.63,8.87,34.45,42.78,14.5,113.91 c-10.79,38.46-15.96,81.72,10.56,118.4c22.3,30.85,63.1,38.74,98.33,29.12C295.9,471.94,320.35,437.17,330.37,394.04z" fill="black"/>
+<path d="M494.13,234.96c1.72-6.13,2.88-12.49,3.56-18.97c0,0.03,0.01,0.05,0.01,0.07c-3.52-25.91-11-50.56-21.82-73.32 c1.31,7.53,2.17,15.9,2.74,25.64c1.5,25.49-7.98,65.34-23.85,87.18c-14.65,20.16-47.7,39.18-79.19,22.39 c-16.63-8.87-34.45-42.78-14.5-113.91c10.79-38.46,15.96-81.72-10.56-118.4c-22.3-30.85-63.1-38.74-98.33-29.12 c-44.06,12.03-68.51,46.8-78.53,89.93c-7.13,30.65-2.38,61.7,9.81,91.06c20.87,50.27,48.6,66,49.52,109.63 c0.3,14.36-0.79,42.98,21.04,40.89c20.67-1.98,18.11-25.45,13.61-39.98c-6.98-22.56-25.23-41.64-42.35-71.02 c-12.82-21.99-21.31-38.09-23.13-62.65c-1.88-25.49,5.09-53.38,19.96-75.67c13.79-20.67,43.42-40.18,73.71-25.99 c11.04,5.17,17.78,14.73,20.95,25.04c9.93,32.36-2.96,63.98-6.2,103.76c-5.4,66.24,39.27,157.11,125.18,115.05 C463.36,303.08,484.95,267.75,494.13,234.96z" fill="black"/>
+</svg>
diff --git a/core b/core
index f2414c42c..822e82cc5 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit f2414c42c31f134c05ce0d1ac4b2d86df39dbb7e
+Subproject commit 822e82cc5ea82336bc43266f0773b2cb8501b77c