npm - @chainflip/processor - Versions diffs - 2.2.0-alpha.7 → 2.2.0-beta.0 - Mend

@chainflip/processor 2.2.0-alpha.7 → 2.2.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1249) hide show

package/dist/11200/swapping/swapRequested.d.cts CHANGED Viewed

@@ -7,21 +7,21 @@ declare const swappingSwapRequested: z.ZodObject<{
   inputAsset: z.ZodEffects<z.ZodObject<{
     __kind: z.ZodEnum<["Eth", "Flip", "Usdc", "Dot", "Btc", "ArbEth", "ArbUsdc", "Usdt", "Sol", "SolUsdc", "HubDot", "HubUsdt", "HubUsdc"]>;
   }, "strip", z.ZodTypeAny, {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   }, {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
-  }>, "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc", {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
+  }>, "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc", {
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   }>;
   inputAmount: z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>;
   outputAsset: z.ZodEffects<z.ZodObject<{
     __kind: z.ZodEnum<["Eth", "Flip", "Usdc", "Dot", "Btc", "ArbEth", "ArbUsdc", "Usdt", "Sol", "SolUsdc", "HubDot", "HubUsdt", "HubUsdc"]>;
   }, "strip", z.ZodTypeAny, {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   }, {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
-  }>, "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc", {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
+  }>, "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc", {
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   }>;
   origin: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
     __kind: z.ZodLiteral<"DepositChannel">;
@@ -29,11 +29,11 @@ declare const swappingSwapRequested: z.ZodObject<{
       __kind: z.ZodEnum<["Eth", "Dot", "Btc", "Arb", "Sol", "Hub"]>;
       value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     }, "strip", z.ZodTypeAny, {
-      value: `0x${string}`;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: `0x${string}`;
     }, {
-      value: string;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: string;
     }>, {
       readonly chain: "Ethereum";
       readonly address: `0x${string}`;
@@ -53,13 +53,14 @@ declare const swappingSwapRequested: z.ZodObject<{
       readonly chain: "Assethub";
       readonly address: string;
     }, {
-      value: string;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: string;
     }>;
     channelId: z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>;
     depositBlockHeight: z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>;
     brokerId: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `cF${string}`, string>;
   }, "strip", z.ZodTypeAny, {
+    __kind: "DepositChannel";
     depositAddress: {
       readonly chain: "Ethereum";
       readonly address: `0x${string}`;
@@ -79,16 +80,15 @@ declare const swappingSwapRequested: z.ZodObject<{
       readonly chain: "Assethub";
       readonly address: string;
     };
-    __kind: "DepositChannel";
     channelId: bigint;
     depositBlockHeight: bigint;
     brokerId: `cF${string}`;
   }, {
+    __kind: "DepositChannel";
     depositAddress: {
-      value: string;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: string;
     };
-    __kind: "DepositChannel";
     channelId: string | number;
     depositBlockHeight: string | number;
     brokerId: string;
@@ -98,20 +98,20 @@ declare const swappingSwapRequested: z.ZodObject<{
       __kind: z.ZodLiteral<"Evm">;
       value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     }, "strip", z.ZodTypeAny, {
-      value: `0x${string}`;
       __kind: "Evm";
+      value: `0x${string}`;
     }, {
-      value: string;
       __kind: "Evm";
+      value: string;
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"Bitcoin">;
       value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     }, "strip", z.ZodTypeAny, {
-      value: `0x${string}`;
       __kind: "Bitcoin";
+      value: `0x${string}`;
     }, {
-      value: string;
       __kind: "Bitcoin";
+      value: string;
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"Polkadot">;
       value: z.ZodObject<{
@@ -125,26 +125,26 @@ declare const swappingSwapRequested: z.ZodObject<{
         extrinsicIndex: number;
       }>;
     }, "strip", z.ZodTypeAny, {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     }, {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"Solana">;
       value: z.ZodTuple<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>], null>;
     }, "strip", z.ZodTypeAny, {
-      value: [`0x${string}`, bigint];
       __kind: "Solana";
+      value: [`0x${string}`, bigint];
     }, {
-      value: [string, string | number];
       __kind: "Solana";
+      value: [string, string | number];
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"None">;
     }, "strip", z.ZodTypeAny, {
@@ -156,20 +156,20 @@ declare const swappingSwapRequested: z.ZodObject<{
   }, "strip", z.ZodTypeAny, {
     __kind: "Vault";
     txId: {
-      value: `0x${string}`;
       __kind: "Evm";
-    } | {
       value: `0x${string}`;
+    } | {
       __kind: "Bitcoin";
+      value: `0x${string}`;
     } | {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     } | {
-      value: [`0x${string}`, bigint];
       __kind: "Solana";
+      value: [`0x${string}`, bigint];
     } | {
       __kind: "None";
     };
@@ -177,20 +177,20 @@ declare const swappingSwapRequested: z.ZodObject<{
   }, {
     __kind: "Vault";
     txId: {
-      value: string;
       __kind: "Evm";
-    } | {
       value: string;
+    } | {
       __kind: "Bitcoin";
+      value: string;
     } | {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     } | {
-      value: [string, string | number];
       __kind: "Solana";
+      value: [string, string | number];
     } | {
       __kind: "None";
     };
@@ -205,11 +205,11 @@ declare const swappingSwapRequested: z.ZodObject<{
     __kind: z.ZodLiteral<"OnChainAccount">;
     value: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `cF${string}`, string>;
   }, "strip", z.ZodTypeAny, {
-    value: `cF${string}`;
     __kind: "OnChainAccount";
+    value: `cF${string}`;
   }, {
-    value: string;
     __kind: "OnChainAccount";
+    value: string;
   }>]>;
   requestType: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
     __kind: z.ZodLiteral<"NetworkFee">;
@@ -285,6 +285,7 @@ declare const swappingSwapRequested: z.ZodObject<{
                 fallbackAddress: string;
               }>;
             }, "strip", z.ZodTypeAny, {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -296,8 +297,8 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             }, {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -309,7 +310,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             }>, z.ZodObject<{
               __kind: z.ZodLiteral<"V1">;
               ccmAccounts: z.ZodObject<{
@@ -386,7 +386,9 @@ declare const swappingSwapRequested: z.ZodObject<{
               alts: string[];
             }>]>;
           }, "strip", z.ZodTypeAny, {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -398,7 +400,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -414,9 +415,10 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           }, {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -428,7 +430,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -444,7 +445,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           }>]>;
         }, "strip", z.ZodTypeAny, {
           message: `0x${string}`;
@@ -452,7 +452,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -464,7 +466,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -480,7 +481,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         }, {
           message: string;
@@ -488,7 +488,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -500,7 +502,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -516,7 +517,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         }>;
         sourceChain: z.ZodEffects<z.ZodObject<{
@@ -532,11 +532,11 @@ declare const swappingSwapRequested: z.ZodObject<{
           __kind: z.ZodEnum<["Eth", "Dot", "Btc", "Arb", "Sol", "Hub"]>;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         }>, {
           readonly chain: "Ethereum";
           readonly address: `0x${string}`;
@@ -556,8 +556,8 @@ declare const swappingSwapRequested: z.ZodObject<{
           readonly chain: "Assethub";
           readonly address: string;
         }, {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         }>>>;
       }, "strip", z.ZodTypeAny, {
         channelMetadata: {
@@ -566,7 +566,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -578,7 +580,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -594,7 +595,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
@@ -624,7 +624,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -636,7 +638,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -652,26 +653,25 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         } | null | undefined;
       }>>>;
       outputAddress: z.ZodEffects<z.ZodObject<{
         __kind: z.ZodEnum<["Eth", "Dot", "Btc", "Arb", "Sol", "Hub"]>;
         value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
       }, "strip", z.ZodTypeAny, {
-        value: `0x${string}`;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: `0x${string}`;
       }, {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       }>, {
         readonly chain: "Ethereum";
         readonly address: `0x${string}`;
@@ -691,8 +691,8 @@ declare const swappingSwapRequested: z.ZodObject<{
         readonly chain: "Assethub";
         readonly address: string;
       }, {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       }>;
     }, "strip", z.ZodTypeAny, {
       __kind: "Egress";
@@ -722,7 +722,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -734,7 +736,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -750,7 +751,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
@@ -777,8 +777,8 @@ declare const swappingSwapRequested: z.ZodObject<{
     }, {
       __kind: "Egress";
       outputAddress: {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       };
       ccmDepositMetadata?: {
         channelMetadata: {
@@ -787,7 +787,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -799,7 +801,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -815,26 +816,25 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"CreditOnChain">;
       accountId: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `cF${string}`, string>;
     }, "strip", z.ZodTypeAny, {
-      accountId: `cF${string}`;
       __kind: "CreditOnChain";
+      accountId: `cF${string}`;
     }, {
-      accountId: string;
       __kind: "CreditOnChain";
+      accountId: string;
     }>]>;
   }, "strip", z.ZodTypeAny, {
     __kind: "Regular";
@@ -866,7 +866,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -878,7 +880,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -894,7 +895,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
@@ -919,16 +919,16 @@ declare const swappingSwapRequested: z.ZodObject<{
         } | null | undefined;
       } | null | undefined;
     } | {
-      accountId: `cF${string}`;
       __kind: "CreditOnChain";
+      accountId: `cF${string}`;
     };
   }, {
     __kind: "Regular";
     outputAction: {
       __kind: "Egress";
       outputAddress: {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       };
       ccmDepositMetadata?: {
         channelMetadata: {
@@ -937,7 +937,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -949,7 +951,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -965,20 +966,19 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     } | {
-      accountId: string;
       __kind: "CreditOnChain";
+      accountId: string;
     };
   }>]>;
   brokerFees: z.ZodArray<z.ZodObject<{
@@ -1005,78 +1005,78 @@ declare const swappingSwapRequested: z.ZodObject<{
         __kind: z.ZodLiteral<"InternalAccount">;
         value: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `cF${string}`, string>;
       }, "strip", z.ZodTypeAny, {
-        value: `cF${string}`;
         __kind: "InternalAccount";
+        value: `cF${string}`;
       }, {
-        value: string;
         __kind: "InternalAccount";
+        value: string;
       }>, z.ZodObject<{
         __kind: z.ZodLiteral<"ExternalAddress">;
         value: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
           __kind: z.ZodLiteral<"Eth">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Eth";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Eth";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Dot">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Dot";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Dot";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Btc">;
           value: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
             __kind: z.ZodLiteral<"P2PKH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2PKH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2PKH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2SH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2SH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2SH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2WPKH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2WPKH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2WPKH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2WSH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2WSH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2WSH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"Taproot">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "Taproot";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "Taproot";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"OtherSegwit">;
             version: z.ZodNumber;
@@ -1091,157 +1091,157 @@ declare const swappingSwapRequested: z.ZodObject<{
             program: string;
           }>]>;
         }, "strip", z.ZodTypeAny, {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         }, {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Arb">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Arb";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Arb";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Sol">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Sol";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Sol";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Hub">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Hub";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Hub";
+          value: string;
         }>]>;
       }, "strip", z.ZodTypeAny, {
+        __kind: "ExternalAddress";
         value: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         };
-        __kind: "ExternalAddress";
       }, {
+        __kind: "ExternalAddress";
         value: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         };
-        __kind: "ExternalAddress";
       }>]>;
       refundCcmMetadata: z.ZodOptional<z.ZodNullable<z.ZodObject<{
         channelMetadata: z.ZodObject<{
@@ -1301,6 +1301,7 @@ declare const swappingSwapRequested: z.ZodObject<{
                 fallbackAddress: string;
               }>;
             }, "strip", z.ZodTypeAny, {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -1312,8 +1313,8 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             }, {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -1325,7 +1326,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             }>, z.ZodObject<{
               __kind: z.ZodLiteral<"V1">;
               ccmAccounts: z.ZodObject<{
@@ -1402,7 +1402,9 @@ declare const swappingSwapRequested: z.ZodObject<{
               alts: string[];
             }>]>;
           }, "strip", z.ZodTypeAny, {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -1414,7 +1416,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -1430,9 +1431,10 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           }, {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -1444,7 +1446,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -1460,7 +1461,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           }>]>;
         }, "strip", z.ZodTypeAny, {
           message: `0x${string}`;
@@ -1468,7 +1468,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -1480,7 +1482,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -1496,7 +1497,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         }, {
           message: string;
@@ -1504,7 +1504,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -1516,7 +1518,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -1532,7 +1533,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         }>;
         sourceChain: z.ZodEffects<z.ZodObject<{
@@ -1548,67 +1548,67 @@ declare const swappingSwapRequested: z.ZodObject<{
           __kind: z.ZodLiteral<"Eth">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Eth";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Eth";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Dot">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Dot";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Dot";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Btc">;
           value: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
             __kind: z.ZodLiteral<"P2PKH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2PKH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2PKH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2SH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2SH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2SH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2WPKH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2WPKH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2WPKH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2WSH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2WSH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2WSH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"Taproot">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "Taproot";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "Taproot";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"OtherSegwit">;
             version: z.ZodNumber;
@@ -1623,76 +1623,76 @@ declare const swappingSwapRequested: z.ZodObject<{
             program: string;
           }>]>;
         }, "strip", z.ZodTypeAny, {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         }, {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Arb">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Arb";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Arb";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Sol">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Sol";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Sol";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Hub">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Hub";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Hub";
+          value: string;
         }>]>>>;
       }, "strip", z.ZodTypeAny, {
         channelMetadata: {
@@ -1701,7 +1701,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -1713,7 +1715,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -1729,47 +1730,46 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         sourceAddress?: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         } | null | undefined;
       }, {
         channelMetadata: {
@@ -1778,7 +1778,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -1790,7 +1792,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -1806,97 +1807,96 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         } | null | undefined;
       }>>>;
     }, "strip", z.ZodTypeAny, {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: `cF${string}`;
         __kind: "InternalAccount";
+        value: `cF${string}`;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -1905,7 +1905,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -1917,7 +1919,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -1933,95 +1934,94 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         sourceAddress?: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         } | null | undefined;
       } | null | undefined;
     }, {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: string;
         __kind: "InternalAccount";
+        value: string;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -2030,7 +2030,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -2042,7 +2044,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -2058,104 +2059,102 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     }>]>;
     minPrice: z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>;
     maxOraclePriceSlippage: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
   }, "strip", z.ZodTypeAny, {
-    minPrice: bigint;
     expiryBehaviour: {
       __kind: "NoExpiry";
     } | {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: `cF${string}`;
         __kind: "InternalAccount";
+        value: `cF${string}`;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -2164,7 +2163,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -2176,7 +2177,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -2192,101 +2192,100 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         sourceAddress?: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         } | null | undefined;
       } | null | undefined;
     };
+    minPrice: bigint;
     maxOraclePriceSlippage?: number | null | undefined;
   }, {
-    minPrice: string | number;
     expiryBehaviour: {
       __kind: "NoExpiry";
     } | {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: string;
         __kind: "InternalAccount";
+        value: string;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -2295,7 +2294,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -2307,7 +2308,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -2323,52 +2323,52 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     };
+    minPrice: string | number;
     maxOraclePriceSlippage?: number | null | undefined;
   }>>>;
   dcaParameters: z.ZodOptional<z.ZodNullable<z.ZodObject<{
@@ -2383,10 +2383,11 @@ declare const swappingSwapRequested: z.ZodObject<{
   }>>>;
 }, "strip", z.ZodTypeAny, {
   swapRequestId: bigint;
-  inputAsset: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
-  outputAsset: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+  inputAsset: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
+  outputAsset: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   inputAmount: bigint;
   origin: {
+    __kind: "DepositChannel";
     depositAddress: {
       readonly chain: "Ethereum";
       readonly address: `0x${string}`;
@@ -2406,27 +2407,26 @@ declare const swappingSwapRequested: z.ZodObject<{
       readonly chain: "Assethub";
       readonly address: string;
     };
-    __kind: "DepositChannel";
     channelId: bigint;
     depositBlockHeight: bigint;
     brokerId: `cF${string}`;
   } | {
     __kind: "Vault";
     txId: {
-      value: `0x${string}`;
       __kind: "Evm";
-    } | {
       value: `0x${string}`;
+    } | {
       __kind: "Bitcoin";
+      value: `0x${string}`;
     } | {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     } | {
-      value: [`0x${string}`, bigint];
       __kind: "Solana";
+      value: [`0x${string}`, bigint];
     } | {
       __kind: "None";
     };
@@ -2434,8 +2434,8 @@ declare const swappingSwapRequested: z.ZodObject<{
   } | {
     __kind: "Internal";
   } | {
-    value: `cF${string}`;
     __kind: "OnChainAccount";
+    value: `cF${string}`;
   };
   requestType: {
     __kind: "NetworkFee";
@@ -2471,7 +2471,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -2483,7 +2485,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -2499,7 +2500,6 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
@@ -2524,8 +2524,8 @@ declare const swappingSwapRequested: z.ZodObject<{
         } | null | undefined;
       } | null | undefined;
     } | {
-      accountId: `cF${string}`;
       __kind: "CreditOnChain";
+      accountId: `cF${string}`;
     };
   };
   brokerFees: {
@@ -2533,55 +2533,54 @@ declare const swappingSwapRequested: z.ZodObject<{
     bps: number;
   }[];
   priceLimitsAndExpiry?: {
-    minPrice: bigint;
     expiryBehaviour: {
       __kind: "NoExpiry";
     } | {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: `cF${string}`;
         __kind: "InternalAccount";
+        value: `cF${string}`;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -2590,7 +2589,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -2602,7 +2603,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -2618,50 +2618,50 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         sourceAddress?: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         } | null | undefined;
       } | null | undefined;
     };
+    minPrice: bigint;
     maxOraclePriceSlippage?: number | null | undefined;
   } | null | undefined;
   dcaParameters?: {
@@ -2671,38 +2671,38 @@ declare const swappingSwapRequested: z.ZodObject<{
 }, {
   swapRequestId: string | number;
   inputAsset: {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   };
   outputAsset: {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   };
   inputAmount: string | number;
   origin: {
+    __kind: "DepositChannel";
     depositAddress: {
-      value: string;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: string;
     };
-    __kind: "DepositChannel";
     channelId: string | number;
     depositBlockHeight: string | number;
     brokerId: string;
   } | {
     __kind: "Vault";
     txId: {
-      value: string;
       __kind: "Evm";
-    } | {
       value: string;
+    } | {
       __kind: "Bitcoin";
+      value: string;
     } | {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     } | {
-      value: [string, string | number];
       __kind: "Solana";
+      value: [string, string | number];
     } | {
       __kind: "None";
     };
@@ -2710,8 +2710,8 @@ declare const swappingSwapRequested: z.ZodObject<{
   } | {
     __kind: "Internal";
   } | {
-    value: string;
     __kind: "OnChainAccount";
+    value: string;
   };
   requestType: {
     __kind: "NetworkFee";
@@ -2722,8 +2722,8 @@ declare const swappingSwapRequested: z.ZodObject<{
     outputAction: {
       __kind: "Egress";
       outputAddress: {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       };
       ccmDepositMetadata?: {
         channelMetadata: {
@@ -2732,7 +2732,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -2744,7 +2746,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -2760,20 +2761,19 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     } | {
-      accountId: string;
       __kind: "CreditOnChain";
+      accountId: string;
     };
   };
   brokerFees: {
@@ -2781,55 +2781,54 @@ declare const swappingSwapRequested: z.ZodObject<{
     bps: number;
   }[];
   priceLimitsAndExpiry?: {
-    minPrice: string | number;
     expiryBehaviour: {
       __kind: "NoExpiry";
     } | {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: string;
         __kind: "InternalAccount";
+        value: string;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -2838,7 +2837,9 @@ declare const swappingSwapRequested: z.ZodObject<{
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -2850,7 +2851,6 @@ declare const swappingSwapRequested: z.ZodObject<{
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -2866,52 +2866,52 @@ declare const swappingSwapRequested: z.ZodObject<{
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     };
+    minPrice: string | number;
     maxOraclePriceSlippage?: number | null | undefined;
   } | null | undefined;
   dcaParameters?: {
@@ -2924,21 +2924,21 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
   inputAsset: z.ZodEffects<z.ZodObject<{
     __kind: z.ZodEnum<["Eth", "Flip", "Usdc", "Dot", "Btc", "ArbEth", "ArbUsdc", "Usdt", "Sol", "SolUsdc", "HubDot", "HubUsdt", "HubUsdc"]>;
   }, "strip", z.ZodTypeAny, {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   }, {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
-  }>, "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc", {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
+  }>, "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc", {
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   }>;
   inputAmount: z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>;
   outputAsset: z.ZodEffects<z.ZodObject<{
     __kind: z.ZodEnum<["Eth", "Flip", "Usdc", "Dot", "Btc", "ArbEth", "ArbUsdc", "Usdt", "Sol", "SolUsdc", "HubDot", "HubUsdt", "HubUsdc"]>;
   }, "strip", z.ZodTypeAny, {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   }, {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
-  }>, "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc", {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
+  }>, "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc", {
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   }>;
   origin: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
     __kind: z.ZodLiteral<"DepositChannel">;
@@ -2946,11 +2946,11 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
       __kind: z.ZodEnum<["Eth", "Dot", "Btc", "Arb", "Sol", "Hub"]>;
       value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     }, "strip", z.ZodTypeAny, {
-      value: `0x${string}`;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: `0x${string}`;
     }, {
-      value: string;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: string;
     }>, {
       readonly chain: "Ethereum";
       readonly address: `0x${string}`;
@@ -2970,13 +2970,14 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
       readonly chain: "Assethub";
       readonly address: string;
     }, {
-      value: string;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: string;
     }>;
     channelId: z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>;
     depositBlockHeight: z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>;
     brokerId: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `cF${string}`, string>;
   }, "strip", z.ZodTypeAny, {
+    __kind: "DepositChannel";
     depositAddress: {
       readonly chain: "Ethereum";
       readonly address: `0x${string}`;
@@ -2996,16 +2997,15 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
       readonly chain: "Assethub";
       readonly address: string;
     };
-    __kind: "DepositChannel";
     channelId: bigint;
     depositBlockHeight: bigint;
     brokerId: `cF${string}`;
   }, {
+    __kind: "DepositChannel";
     depositAddress: {
-      value: string;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: string;
     };
-    __kind: "DepositChannel";
     channelId: string | number;
     depositBlockHeight: string | number;
     brokerId: string;
@@ -3015,20 +3015,20 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
       __kind: z.ZodLiteral<"Evm">;
       value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     }, "strip", z.ZodTypeAny, {
-      value: `0x${string}`;
       __kind: "Evm";
+      value: `0x${string}`;
     }, {
-      value: string;
       __kind: "Evm";
+      value: string;
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"Bitcoin">;
       value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     }, "strip", z.ZodTypeAny, {
-      value: `0x${string}`;
       __kind: "Bitcoin";
+      value: `0x${string}`;
     }, {
-      value: string;
       __kind: "Bitcoin";
+      value: string;
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"Polkadot">;
       value: z.ZodObject<{
@@ -3042,26 +3042,26 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
         extrinsicIndex: number;
       }>;
     }, "strip", z.ZodTypeAny, {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     }, {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"Solana">;
       value: z.ZodTuple<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>], null>;
     }, "strip", z.ZodTypeAny, {
-      value: [`0x${string}`, bigint];
       __kind: "Solana";
+      value: [`0x${string}`, bigint];
     }, {
-      value: [string, string | number];
       __kind: "Solana";
+      value: [string, string | number];
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"None">;
     }, "strip", z.ZodTypeAny, {
@@ -3073,20 +3073,20 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
   }, "strip", z.ZodTypeAny, {
     __kind: "Vault";
     txId: {
-      value: `0x${string}`;
       __kind: "Evm";
-    } | {
       value: `0x${string}`;
+    } | {
       __kind: "Bitcoin";
+      value: `0x${string}`;
     } | {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     } | {
-      value: [`0x${string}`, bigint];
       __kind: "Solana";
+      value: [`0x${string}`, bigint];
     } | {
       __kind: "None";
     };
@@ -3094,20 +3094,20 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
   }, {
     __kind: "Vault";
     txId: {
-      value: string;
       __kind: "Evm";
-    } | {
       value: string;
+    } | {
       __kind: "Bitcoin";
+      value: string;
     } | {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     } | {
-      value: [string, string | number];
       __kind: "Solana";
+      value: [string, string | number];
     } | {
       __kind: "None";
     };
@@ -3122,11 +3122,11 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
     __kind: z.ZodLiteral<"OnChainAccount">;
     value: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `cF${string}`, string>;
   }, "strip", z.ZodTypeAny, {
-    value: `cF${string}`;
     __kind: "OnChainAccount";
+    value: `cF${string}`;
   }, {
-    value: string;
     __kind: "OnChainAccount";
+    value: string;
   }>]>;
   requestType: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
     __kind: z.ZodLiteral<"NetworkFee">;
@@ -3202,6 +3202,7 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 fallbackAddress: string;
               }>;
             }, "strip", z.ZodTypeAny, {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -3213,8 +3214,8 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             }, {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -3226,7 +3227,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             }>, z.ZodObject<{
               __kind: z.ZodLiteral<"V1">;
               ccmAccounts: z.ZodObject<{
@@ -3303,7 +3303,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               alts: string[];
             }>]>;
           }, "strip", z.ZodTypeAny, {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -3315,7 +3317,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3331,9 +3332,10 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           }, {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -3345,7 +3347,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3361,7 +3362,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           }>]>;
         }, "strip", z.ZodTypeAny, {
           message: `0x${string}`;
@@ -3369,7 +3369,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -3381,7 +3383,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3397,7 +3398,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         }, {
           message: string;
@@ -3405,7 +3405,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -3417,7 +3419,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3433,7 +3434,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         }>;
         sourceChain: z.ZodEffects<z.ZodObject<{
@@ -3449,11 +3449,11 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           __kind: z.ZodEnum<["Eth", "Dot", "Btc", "Arb", "Sol", "Hub"]>;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         }>, {
           readonly chain: "Ethereum";
           readonly address: `0x${string}`;
@@ -3473,8 +3473,8 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           readonly chain: "Assethub";
           readonly address: string;
         }, {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         }>>>;
       }, "strip", z.ZodTypeAny, {
         channelMetadata: {
@@ -3483,7 +3483,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -3495,7 +3497,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3511,7 +3512,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
@@ -3541,7 +3541,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -3553,7 +3555,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3569,26 +3570,25 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         } | null | undefined;
       }>>>;
       outputAddress: z.ZodEffects<z.ZodObject<{
         __kind: z.ZodEnum<["Eth", "Dot", "Btc", "Arb", "Sol", "Hub"]>;
         value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
       }, "strip", z.ZodTypeAny, {
-        value: `0x${string}`;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: `0x${string}`;
       }, {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       }>, {
         readonly chain: "Ethereum";
         readonly address: `0x${string}`;
@@ -3608,8 +3608,8 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
         readonly chain: "Assethub";
         readonly address: string;
       }, {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       }>;
     }, "strip", z.ZodTypeAny, {
       __kind: "Egress";
@@ -3639,7 +3639,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -3651,7 +3653,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3667,7 +3668,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
@@ -3694,8 +3694,8 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
     }, {
       __kind: "Egress";
       outputAddress: {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       };
       ccmDepositMetadata?: {
         channelMetadata: {
@@ -3704,7 +3704,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -3716,7 +3718,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3732,26 +3733,25 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     }>, z.ZodObject<{
       __kind: z.ZodLiteral<"CreditOnChain">;
       accountId: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `cF${string}`, string>;
     }, "strip", z.ZodTypeAny, {
-      accountId: `cF${string}`;
       __kind: "CreditOnChain";
+      accountId: `cF${string}`;
     }, {
-      accountId: string;
       __kind: "CreditOnChain";
+      accountId: string;
     }>]>;
   }, "strip", z.ZodTypeAny, {
     __kind: "Regular";
@@ -3783,7 +3783,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -3795,7 +3797,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3811,7 +3812,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
@@ -3836,16 +3836,16 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
         } | null | undefined;
       } | null | undefined;
     } | {
-      accountId: `cF${string}`;
       __kind: "CreditOnChain";
+      accountId: `cF${string}`;
     };
   }, {
     __kind: "Regular";
     outputAction: {
       __kind: "Egress";
       outputAddress: {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       };
       ccmDepositMetadata?: {
         channelMetadata: {
@@ -3854,7 +3854,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -3866,7 +3868,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -3882,20 +3883,19 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     } | {
-      accountId: string;
       __kind: "CreditOnChain";
+      accountId: string;
     };
   }>]>;
   brokerFees: z.ZodArray<z.ZodObject<{
@@ -3922,78 +3922,78 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
         __kind: z.ZodLiteral<"InternalAccount">;
         value: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, `0x${string}`, string>]>, `cF${string}`, string>;
       }, "strip", z.ZodTypeAny, {
-        value: `cF${string}`;
         __kind: "InternalAccount";
+        value: `cF${string}`;
       }, {
-        value: string;
         __kind: "InternalAccount";
+        value: string;
       }>, z.ZodObject<{
         __kind: z.ZodLiteral<"ExternalAddress">;
         value: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
           __kind: z.ZodLiteral<"Eth">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Eth";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Eth";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Dot">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Dot";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Dot";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Btc">;
           value: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
             __kind: z.ZodLiteral<"P2PKH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2PKH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2PKH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2SH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2SH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2SH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2WPKH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2WPKH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2WPKH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2WSH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2WSH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2WSH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"Taproot">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "Taproot";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "Taproot";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"OtherSegwit">;
             version: z.ZodNumber;
@@ -4008,157 +4008,157 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
             program: string;
           }>]>;
         }, "strip", z.ZodTypeAny, {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         }, {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Arb">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Arb";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Arb";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Sol">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Sol";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Sol";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Hub">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Hub";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Hub";
+          value: string;
         }>]>;
       }, "strip", z.ZodTypeAny, {
+        __kind: "ExternalAddress";
         value: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         };
-        __kind: "ExternalAddress";
       }, {
+        __kind: "ExternalAddress";
         value: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         };
-        __kind: "ExternalAddress";
       }>]>;
       refundCcmMetadata: z.ZodOptional<z.ZodNullable<z.ZodObject<{
         channelMetadata: z.ZodObject<{
@@ -4218,6 +4218,7 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 fallbackAddress: string;
               }>;
             }, "strip", z.ZodTypeAny, {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -4229,8 +4230,8 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             }, {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -4242,7 +4243,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             }>, z.ZodObject<{
               __kind: z.ZodLiteral<"V1">;
               ccmAccounts: z.ZodObject<{
@@ -4319,7 +4319,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               alts: string[];
             }>]>;
           }, "strip", z.ZodTypeAny, {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -4331,7 +4333,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -4347,9 +4348,10 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           }, {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -4361,7 +4363,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -4377,7 +4378,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           }>]>;
         }, "strip", z.ZodTypeAny, {
           message: `0x${string}`;
@@ -4385,7 +4385,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -4397,7 +4399,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -4413,7 +4414,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         }, {
           message: string;
@@ -4421,7 +4421,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -4433,7 +4435,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -4449,7 +4450,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         }>;
         sourceChain: z.ZodEffects<z.ZodObject<{
@@ -4465,67 +4465,67 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           __kind: z.ZodLiteral<"Eth">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Eth";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Eth";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Dot">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Dot";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Dot";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Btc">;
           value: z.ZodDiscriminatedUnion<"__kind", [z.ZodObject<{
             __kind: z.ZodLiteral<"P2PKH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2PKH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2PKH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2SH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2SH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2SH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2WPKH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2WPKH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2WPKH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"P2WSH">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "P2WSH";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "P2WSH";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"Taproot">;
             value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
           }, "strip", z.ZodTypeAny, {
-            value: `0x${string}`;
             __kind: "Taproot";
+            value: `0x${string}`;
           }, {
-            value: string;
             __kind: "Taproot";
+            value: string;
           }>, z.ZodObject<{
             __kind: z.ZodLiteral<"OtherSegwit">;
             version: z.ZodNumber;
@@ -4540,76 +4540,76 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
             program: string;
           }>]>;
         }, "strip", z.ZodTypeAny, {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         }, {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Arb">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Arb";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Arb";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Sol">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Sol";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Sol";
+          value: string;
         }>, z.ZodObject<{
           __kind: z.ZodLiteral<"Hub">;
           value: z.ZodEffects<z.ZodString, `0x${string}`, string>;
         }, "strip", z.ZodTypeAny, {
-          value: `0x${string}`;
           __kind: "Hub";
+          value: `0x${string}`;
         }, {
-          value: string;
           __kind: "Hub";
+          value: string;
         }>]>>>;
       }, "strip", z.ZodTypeAny, {
         channelMetadata: {
@@ -4618,7 +4618,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -4630,7 +4632,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -4646,47 +4647,46 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         sourceAddress?: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         } | null | undefined;
       }, {
         channelMetadata: {
@@ -4695,7 +4695,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -4707,7 +4709,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -4723,97 +4724,96 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         } | null | undefined;
       }>>>;
     }, "strip", z.ZodTypeAny, {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: `cF${string}`;
         __kind: "InternalAccount";
+        value: `cF${string}`;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -4822,7 +4822,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -4834,7 +4836,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -4850,95 +4851,94 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         sourceAddress?: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         } | null | undefined;
       } | null | undefined;
     }, {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: string;
         __kind: "InternalAccount";
+        value: string;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -4947,7 +4947,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -4959,7 +4961,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -4975,104 +4976,102 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     }>]>;
     minPrice: z.ZodEffects<z.ZodUnion<[z.ZodNumber, z.ZodEffects<z.ZodString, `0x${string}`, string>, z.ZodEffects<z.ZodString, string, string>]>, bigint, string | number>;
     maxOraclePriceSlippage: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
   }, "strip", z.ZodTypeAny, {
-    minPrice: bigint;
     expiryBehaviour: {
       __kind: "NoExpiry";
     } | {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: `cF${string}`;
         __kind: "InternalAccount";
+        value: `cF${string}`;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -5081,7 +5080,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -5093,7 +5094,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -5109,101 +5109,100 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         sourceAddress?: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         } | null | undefined;
       } | null | undefined;
     };
+    minPrice: bigint;
     maxOraclePriceSlippage?: number | null | undefined;
   }, {
-    minPrice: string | number;
     expiryBehaviour: {
       __kind: "NoExpiry";
     } | {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: string;
         __kind: "InternalAccount";
+        value: string;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -5212,7 +5211,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -5224,7 +5225,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -5240,52 +5240,52 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     };
+    minPrice: string | number;
     maxOraclePriceSlippage?: number | null | undefined;
   }>>>;
   dcaParameters: z.ZodOptional<z.ZodNullable<z.ZodObject<{
@@ -5300,10 +5300,11 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
   }>>>;
 }, "strip", z.ZodTypeAny, {
   swapRequestId: bigint;
-  inputAsset: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
-  outputAsset: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+  inputAsset: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
+  outputAsset: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   inputAmount: bigint;
   origin: {
+    __kind: "DepositChannel";
     depositAddress: {
       readonly chain: "Ethereum";
       readonly address: `0x${string}`;
@@ -5323,27 +5324,26 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
       readonly chain: "Assethub";
       readonly address: string;
     };
-    __kind: "DepositChannel";
     channelId: bigint;
     depositBlockHeight: bigint;
     brokerId: `cF${string}`;
   } | {
     __kind: "Vault";
     txId: {
-      value: `0x${string}`;
       __kind: "Evm";
-    } | {
       value: `0x${string}`;
+    } | {
       __kind: "Bitcoin";
+      value: `0x${string}`;
     } | {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     } | {
-      value: [`0x${string}`, bigint];
       __kind: "Solana";
+      value: [`0x${string}`, bigint];
     } | {
       __kind: "None";
     };
@@ -5351,8 +5351,8 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
   } | {
     __kind: "Internal";
   } | {
-    value: `cF${string}`;
     __kind: "OnChainAccount";
+    value: `cF${string}`;
   };
   requestType: {
     __kind: "NetworkFee";
@@ -5388,7 +5388,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -5400,7 +5402,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -5416,7 +5417,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
@@ -5441,8 +5441,8 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
         } | null | undefined;
       } | null | undefined;
     } | {
-      accountId: `cF${string}`;
       __kind: "CreditOnChain";
+      accountId: `cF${string}`;
     };
   };
   brokerFees: {
@@ -5450,55 +5450,54 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
     bps: number;
   }[];
   priceLimitsAndExpiry?: {
-    minPrice: bigint;
     expiryBehaviour: {
       __kind: "NoExpiry";
     } | {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: `cF${string}`;
         __kind: "InternalAccount";
+        value: `cF${string}`;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -5507,7 +5506,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: `0x${string}`;
@@ -5519,7 +5520,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: `0x${string}`;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -5535,50 +5535,50 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: `0x${string}`[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         sourceAddress?: {
-          value: `0x${string}`;
           __kind: "Eth";
-        } | {
           value: `0x${string}`;
+        } | {
           __kind: "Dot";
+          value: `0x${string}`;
         } | {
+          __kind: "Btc";
           value: {
-            value: `0x${string}`;
             __kind: "P2PKH";
-          } | {
             value: `0x${string}`;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: `0x${string}`;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: `0x${string}`;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: `0x${string}`;
+          } | {
             __kind: "Taproot";
+            value: `0x${string}`;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: `0x${string}`;
           };
-          __kind: "Btc";
         } | {
-          value: `0x${string}`;
           __kind: "Arb";
-        } | {
           value: `0x${string}`;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: `0x${string}`;
+        } | {
           __kind: "Hub";
+          value: `0x${string}`;
         } | null | undefined;
       } | null | undefined;
     };
+    minPrice: bigint;
     maxOraclePriceSlippage?: number | null | undefined;
   } | null | undefined;
   dcaParameters?: {
@@ -5588,38 +5588,38 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
 }, {
   swapRequestId: string | number;
   inputAsset: {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   };
   outputAsset: {
-    __kind: "HubDot" | "HubUsdt" | "HubUsdc" | "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc";
+    __kind: "ArbEth" | "ArbUsdc" | "Eth" | "Flip" | "Usdc" | "Dot" | "Btc" | "Usdt" | "Sol" | "SolUsdc" | "HubDot" | "HubUsdt" | "HubUsdc";
   };
   inputAmount: string | number;
   origin: {
+    __kind: "DepositChannel";
     depositAddress: {
-      value: string;
       __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+      value: string;
     };
-    __kind: "DepositChannel";
     channelId: string | number;
     depositBlockHeight: string | number;
     brokerId: string;
   } | {
     __kind: "Vault";
     txId: {
-      value: string;
       __kind: "Evm";
-    } | {
       value: string;
+    } | {
       __kind: "Bitcoin";
+      value: string;
     } | {
+      __kind: "Polkadot";
       value: {
         blockNumber: number;
         extrinsicIndex: number;
       };
-      __kind: "Polkadot";
     } | {
-      value: [string, string | number];
       __kind: "Solana";
+      value: [string, string | number];
     } | {
       __kind: "None";
     };
@@ -5627,8 +5627,8 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
   } | {
     __kind: "Internal";
   } | {
-    value: string;
     __kind: "OnChainAccount";
+    value: string;
   };
   requestType: {
     __kind: "NetworkFee";
@@ -5639,8 +5639,8 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
     outputAction: {
       __kind: "Egress";
       outputAddress: {
-        value: string;
         __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+        value: string;
       };
       ccmDepositMetadata?: {
         channelMetadata: {
@@ -5649,7 +5649,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -5661,7 +5663,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -5677,20 +5678,19 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth" | "Dot" | "Btc" | "Sol" | "Arb" | "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     } | {
-      accountId: string;
       __kind: "CreditOnChain";
+      accountId: string;
     };
   };
   brokerFees: {
@@ -5698,55 +5698,54 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
     bps: number;
   }[];
   priceLimitsAndExpiry?: {
-    minPrice: string | number;
     expiryBehaviour: {
       __kind: "NoExpiry";
     } | {
       __kind: "RefundIfExpires";
       retryDuration: number;
       refundAddress: {
-        value: string;
         __kind: "InternalAccount";
+        value: string;
       } | {
+        __kind: "ExternalAddress";
         value: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         };
-        __kind: "ExternalAddress";
       };
       refundCcmMetadata?: {
         channelMetadata: {
@@ -5755,7 +5754,9 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
           ccmAdditionalData: {
             __kind: "NotRequired";
           } | {
+            __kind: "Solana";
             value: {
+              __kind: "V0";
               value: {
                 cfReceiver: {
                   pubkey: string;
@@ -5767,7 +5768,6 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
                 }[];
                 fallbackAddress: string;
               };
-              __kind: "V0";
             } | {
               __kind: "V1";
               ccmAccounts: {
@@ -5783,52 +5783,52 @@ declare const swappingSwapRequestedEvent: _$_chainflip_processor_event0.EventDes
               };
               alts: string[];
             };
-            __kind: "Solana";
           };
         };
         sourceChain: {
           __kind: "Ethereum" | "Polkadot" | "Bitcoin" | "Arbitrum" | "Solana" | "Assethub";
         };
         sourceAddress?: {
-          value: string;
           __kind: "Eth";
-        } | {
           value: string;
+        } | {
           __kind: "Dot";
+          value: string;
         } | {
+          __kind: "Btc";
           value: {
-            value: string;
             __kind: "P2PKH";
-          } | {
             value: string;
-            __kind: "P2SH";
           } | {
+            __kind: "P2SH";
             value: string;
-            __kind: "P2WPKH";
           } | {
+            __kind: "P2WPKH";
             value: string;
-            __kind: "P2WSH";
           } | {
+            __kind: "P2WSH";
             value: string;
+          } | {
             __kind: "Taproot";
+            value: string;
           } | {
             __kind: "OtherSegwit";
             version: number;
             program: string;
           };
-          __kind: "Btc";
         } | {
-          value: string;
           __kind: "Arb";
-        } | {
           value: string;
-          __kind: "Sol";
         } | {
+          __kind: "Sol";
           value: string;
+        } | {
           __kind: "Hub";
+          value: string;
         } | null | undefined;
       } | null | undefined;
     };
+    minPrice: string | number;
     maxOraclePriceSlippage?: number | null | undefined;
   } | null | undefined;
   dcaParameters?: {