@swapkit/api-sdk-typescript 1.0.3 → 1.0.5

package/dist/index.js

@@ -13,7 +13,7 @@ var extraPrefixesMap = {
 var extraPrefixes = Object.entries(extraPrefixesMap);
 
 // src/core/serverSentEvents.ts
-var createSseClient = ({
+function createSseClient({
   onRequest,
   onSseError,
   onSseEvent,
@@ -25,7 +25,7 @@ var createSseClient = ({
   sseSleepFn,
   url,
   ...options
-}) => {
+}) {
   let lastEventId;
   const sleep = sseSleepFn ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   const createStream = async function* () {
@@ -69,7 +69,7 @@ var createSseClient = ({
             const { done, value } = await reader.read();
             if (done) break;
             buffer += value;
-            buffer = buffer.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+            buffer = buffer.replace(/\r\n?/g, "\n");
             const chunks = buffer.split("\n\n");
             buffer = chunks.pop() ?? "";
             for (const chunk of chunks) {
@@ -137,7 +137,7 @@ var createSseClient = ({
   };
   const stream = createStream();
   return { stream };
-};
+}
 
 // src/core/pathSerializer.ts
 var separatorArrayExplode = (style) => {
@@ -625,8 +625,9 @@ var createClient = (config = {}) => {
     if (opts.body === void 0 || opts.serializedBody === "") {
       opts.headers.delete("Content-Type");
     }
-    const url = buildUrl(opts);
-    return { opts, url };
+    const resolvedOpts = opts;
+    const url = buildUrl(resolvedOpts);
+    return { opts: resolvedOpts, url };
   };
   const request = async (options) => {
     const { opts, url } = await beforeRequest(options);
@@ -772,8 +773,9 @@ var createClient = (config = {}) => {
       url
     });
   };
+  const _buildUrl = (options) => buildUrl({ ..._config, ...options });
   return {
-    buildUrl,
+    buildUrl: _buildUrl,
     connect: makeMethodFn("CONNECT"),
     delete: makeMethodFn("DELETE"),
     get: makeMethodFn("GET"),
@@ -802,7 +804,7 @@ var createClient = (config = {}) => {
 };
 
 // src/client.ts
-var client = createClient(createConfig({ baseUrl: "http://localhost:8080" }));
+var client = createClient(createConfig({ baseUrl: "http://localhost:0" }));
 
 // src/config.ts
 function configureSwapKit(options) {
@@ -824,17 +826,17 @@ var getTokens = (options) => (options?.client ?? client).get({
   url: "/tokens",
   ...options
 });
-var getSwapTo = (options) => (options.client ?? client).get({
+var getSwapToAssets = (options) => (options.client ?? client).get({
   security: [{ name: "x-api-key", type: "apiKey" }],
   url: "/swapTo",
   ...options
 });
-var getSwapFrom = (options) => (options.client ?? client).get({
+var getSwapFromAssets = (options) => (options.client ?? client).get({
   security: [{ name: "x-api-key", type: "apiKey" }],
   url: "/swapFrom",
   ...options
 });
-var postChainflipBrokerChannel = (options) => (options.client ?? client).post({
+var createBrokerChannel = (options) => (options.client ?? client).post({
   security: [{ name: "x-api-key", type: "apiKey" }],
   url: "/chainflip/broker/channel",
   ...options,
@@ -843,7 +845,7 @@ var postChainflipBrokerChannel = (options) => (options.client ?? client).post({
     ...options.headers
   }
 });
-var postTrack = (options) => (options?.client ?? client).post({
+var trackTransaction = (options) => (options?.client ?? client).post({
   security: [{ name: "x-api-key", type: "apiKey" }],
   url: "/track",
   ...options,
@@ -852,7 +854,7 @@ var postTrack = (options) => (options?.client ?? client).post({
     ...options?.headers
   }
 });
-var postScreen = (options) => (options.client ?? client).post({
+var screenAddress = (options) => (options.client ?? client).post({
   security: [{ name: "x-api-key", type: "apiKey" }],
   url: "/screen",
   ...options,
@@ -861,17 +863,17 @@ var postScreen = (options) => (options.client ?? client).post({
     ...options.headers
   }
 });
-var getGasHistory = (options) => (options?.client ?? client).get({
+var getGasPrices = (options) => (options?.client ?? client).get({
   security: [{ name: "x-api-key", type: "apiKey" }],
-  url: "/gas/history",
+  url: "/gas",
   ...options
 });
-var getGas = (options) => (options?.client ?? client).get({
+var getGasHistory = (options) => (options?.client ?? client).get({
   security: [{ name: "x-api-key", type: "apiKey" }],
-  url: "/gas",
+  url: "/gas/history",
   ...options
 });
-var postPriceCachedPrice = (options) => (options.client ?? client).post({
+var getCachedPrice = (options) => (options.client ?? client).post({
   security: [{ name: "x-api-key", type: "apiKey" }],
   url: "/price/cached-price",
   ...options,
@@ -880,7 +882,7 @@ var postPriceCachedPrice = (options) => (options.client ?? client).post({
     ...options.headers
   }
 });
-var postV3Quote = (options) => (options.client ?? client).post({
+var getQuote = (options) => (options.client ?? client).post({
   security: [{ name: "x-api-key", type: "apiKey" }],
   url: "/v3/quote",
   ...options,
@@ -889,7 +891,7 @@ var postV3Quote = (options) => (options.client ?? client).post({
     ...options.headers
   }
 });
-var postV3Swap = (options) => (options.client ?? client).post({
+var executeSwap = (options) => (options.client ?? client).post({
   security: [{ name: "x-api-key", type: "apiKey" }],
   url: "/v3/swap",
   ...options,
@@ -904,43 +906,43 @@ var SwapKitService = class {
 };
 SwapKitService.getProviders = getProviders;
 SwapKitService.getTokens = getTokens;
-SwapKitService.getSwapTo = getSwapTo;
-SwapKitService.getSwapFrom = getSwapFrom;
-SwapKitService.getQuote = postV3Quote;
-SwapKitService.getSwap = postV3Swap;
-SwapKitService.trackTransaction = postTrack;
-SwapKitService.screenAddress = postScreen;
-SwapKitService.getGasPrices = getGas;
+SwapKitService.getSwapTo = getSwapToAssets;
+SwapKitService.getSwapFrom = getSwapFromAssets;
+SwapKitService.getQuote = getQuote;
+SwapKitService.getSwap = executeSwap;
+SwapKitService.trackTransaction = trackTransaction;
+SwapKitService.screenAddress = screenAddress;
+SwapKitService.getGasPrices = getGasPrices;
 SwapKitService.getGasHistory = getGasHistory;
-SwapKitService.getCachedPrice = postPriceCachedPrice;
-SwapKitService.createBrokerChannel = postChainflipBrokerChannel;
+SwapKitService.getCachedPrice = getCachedPrice;
+SwapKitService.createBrokerChannel = createBrokerChannel;
 var TokenlistService = {
   getProviders,
   getTokens,
-  getSwapTo,
-  getSwapFrom
+  getSwapTo: getSwapToAssets,
+  getSwapFrom: getSwapFromAssets
 };
 var QuoteService = {
-  getQuote: postV3Quote
+  getQuote
 };
 var SwapService = {
-  getSwap: postV3Swap
+  getSwap: executeSwap
 };
 var TrackService = {
-  trackTransaction: postTrack
+  trackTransaction
 };
 var ScreenService = {
-  screenAddress: postScreen
+  screenAddress
 };
 var GasService = {
-  getGasPrices: getGas,
+  getGasPrices,
   getGasHistory
 };
 var PriceService = {
-  getCachedPrice: postPriceCachedPrice
+  getCachedPrice
 };
 var ChainflipService = {
-  createBrokerChannel: postChainflipBrokerChannel
+  createBrokerChannel
 };
 export {
   ChainflipService,
@@ -954,16 +956,16 @@ export {
   TrackService,
   client,
   configureSwapKit,
-  getGas,
+  createBrokerChannel,
+  executeSwap,
+  getCachedPrice,
   getGasHistory,
+  getGasPrices,
   getProviders,
-  getSwapFrom,
-  getSwapTo,
+  getQuote,
+  getSwapFromAssets,
+  getSwapToAssets,
   getTokens,
-  postChainflipBrokerChannel,
-  postPriceCachedPrice,
-  postScreen,
-  postTrack,
-  postV3Quote,
-  postV3Swap
+  screenAddress,
+  trackTransaction
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swapkit/api-sdk-typescript",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Type-safe TypeScript SDK for the SwapKit API",
   "license": "MIT",
   "type": "module",
@@ -19,7 +19,9 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsup src/index.ts --format cjs,esm --dts"
+    "build": "tsup src/index.ts --format cjs,esm --dts",
+    "typecheck": "tsc --noEmit",
+    "release:check": "npm run typecheck && npm run build && npm pack --dry-run"
   },
   "dependencies": {},
   "devDependencies": {

package/src/client.ts

@@ -11,6 +11,6 @@ import type { ClientOptions as ClientOptions2 } from './types';
  * `setConfig()`. This is useful for example if you're using Next.js
  * to ensure your client always has the correct values.
  */
-export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T> | Promise<Config<Required<ClientOptions> & T>>;
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
 
-export const client = createClient(createConfig<ClientOptions2>({ baseUrl: 'http://localhost:8080' }));
+export const client = createClient(createConfig<ClientOptions2>({ baseUrl: 'http://localhost:0' }));

package/src/core/bodySerializer.ts

@@ -4,7 +4,7 @@ import type { ArrayStyle, ObjectStyle, SerializerOptions } from './pathSerialize
 
 export type QuerySerializer = (query: Record<string, unknown>) => string;
 
-export type BodySerializer = (body: any) => any;
+export type BodySerializer = (body: unknown) => unknown;
 
 type QuerySerializerOptionsObject = {
   allowReserved?: boolean;
@@ -39,12 +39,10 @@ const serializeUrlSearchParamsPair = (data: URLSearchParams, key: string, value:
 };
 
 export const formDataBodySerializer = {
-  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
-    body: T,
-  ): FormData => {
+  bodySerializer: (body: unknown): FormData => {
     const data = new FormData();
 
-    Object.entries(body).forEach(([key, value]) => {
+    Object.entries(body as Record<string, unknown>).forEach(([key, value]) => {
       if (value === undefined || value === null) {
         return;
       }
@@ -60,15 +58,15 @@ export const formDataBodySerializer = {
 };
 
 export const jsonBodySerializer = {
-  bodySerializer: <T>(body: T): string =>
+  bodySerializer: (body: unknown): string =>
     JSON.stringify(body, (_key, value) => (typeof value === 'bigint' ? value.toString() : value)),
 };
 
 export const urlSearchParamsBodySerializer = {
-  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(body: T): string => {
+  bodySerializer: (body: unknown): string => {
     const data = new URLSearchParams();
 
-    Object.entries(body).forEach(([key, value]) => {
+    Object.entries(body as Record<string, unknown>).forEach(([key, value]) => {
       if (value === undefined || value === null) {
         return;
       }

package/src/core/serverSentEvents.ts

@@ -79,7 +79,7 @@ export type ServerSentEventsResult<TData = unknown, TReturn = void, TNext = unkn
   >;
 };
 
-export const createSseClient = <TData = unknown>({
+export function createSseClient<TData = unknown>({
   onRequest,
   onSseError,
   onSseEvent,
@@ -91,7 +91,7 @@ export const createSseClient = <TData = unknown>({
   sseSleepFn,
   url,
   ...options
-}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> {
   let lastEventId: string | undefined;
 
   const sleep = sseSleepFn ?? ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
@@ -155,8 +155,7 @@ export const createSseClient = <TData = unknown>({
             const { done, value } = await reader.read();
             if (done) break;
             buffer += value;
-            // Normalize line endings: CRLF -> LF, then CR -> LF
-            buffer = buffer.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+            buffer = buffer.replace(/\r\n?/g, '\n'); // normalize line endings
 
             const chunks = buffer.split('\n\n');
             buffer = chunks.pop() ?? '';
@@ -240,4 +239,4 @@ export const createSseClient = <TData = unknown>({
   const stream = createStream();
 
   return { stream };
-};
+}

package/src/core/types.ts

@@ -80,7 +80,7 @@ export interface Config {
   requestValidator?: (data: unknown) => Promise<unknown>;
   /**
    * A function transforming response data before it's returned. This is useful
-   * for post-processing data, e.g. converting ISO strings into Date objects.
+   * for post-processing data, e.g., converting ISO strings into Date objects.
    */
   responseTransformer?: (data: unknown) => Promise<unknown>;
   /**

package/src/core/utils.ts

@@ -126,7 +126,7 @@ export function getValidRequestBody(options: {
       return hasSerializedBody ? options.serializedBody : null;
     }
 
-    // not all clients implement a serializedBody property (i.e. client-axios)
+    // not all clients implement a serializedBody property (i.e., client-axios)
     return options.body !== '' ? options.body : null;
   }
 

package/src/http/client.ts

@@ -31,13 +31,20 @@ export const createClient = (config: Config = {}): Client => {
 
   const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <
+    TData = unknown,
+    TResponseStyle extends 'data' | 'fields' = 'fields',
+    ThrowOnError extends boolean = boolean,
+    Url extends string = string,
+  >(
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
       fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
       headers: mergeHeaders(_config.headers, options.headers),
-      serializedBody: undefined,
+      serializedBody: undefined as string | undefined,
     };
 
     if (opts.security) {
@@ -52,7 +59,7 @@ export const createClient = (config: Config = {}): Client => {
     }
 
     if (opts.body !== undefined && opts.bodySerializer) {
-      opts.serializedBody = opts.bodySerializer(opts.body);
+      opts.serializedBody = opts.bodySerializer(opts.body) as string | undefined;
     }
 
     // remove Content-Type header if body is empty to avoid sending invalid requests
@@ -60,13 +67,14 @@ export const createClient = (config: Config = {}): Client => {
       opts.headers.delete('Content-Type');
     }
 
-    const url = buildUrl(opts);
+    const resolvedOpts = opts as typeof opts &
+      ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
+    const url = buildUrl(resolvedOpts);
 
-    return { opts, url };
+    return { opts: resolvedOpts, url };
   };
 
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     const requestInit: ReqInit = {
       redirect: 'follow',
@@ -258,8 +266,10 @@ export const createClient = (config: Config = {}): Client => {
     });
   };
 
+  const _buildUrl: Client['buildUrl'] = (options) => buildUrl({ ..._config, ...options });
+
   return {
-    buildUrl,
+    buildUrl: _buildUrl,
     connect: makeMethodFn('CONNECT'),
     delete: makeMethodFn('DELETE'),
     get: makeMethodFn('GET'),

package/src/http/types.ts

@@ -93,6 +93,7 @@ export interface ResolvedRequestOptions<
   ThrowOnError extends boolean = boolean,
   Url extends string = string,
 > extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  headers: Headers;
   serializedBody?: string;
 }
 
@@ -152,7 +153,7 @@ type SseFn = <
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+  options: Omit<RequestOptions<never, TResponseStyle, ThrowOnError>, 'method'>,
 ) => Promise<ServerSentEventsResult<TData, TError>>;
 
 type RequestFn = <
@@ -190,7 +191,7 @@ export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn>
  */
 export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
   override?: Config<ClientOptions & T>,
-) => Config<Required<ClientOptions> & T> | Promise<Config<Required<ClientOptions> & T>>;
+) => Config<Required<ClientOptions> & T>;
 
 export interface TDataShape {
   body?: unknown;

package/src/http/utils.ts

@@ -204,7 +204,7 @@ export const mergeHeaders = (
           mergedHeaders.append(key, v as string);
         }
       } else if (value !== undefined) {
-        // assume object headers are meant to be JSON stringified, i.e. their
+        // assume object headers are meant to be JSON stringified, i.e., their
         // content value in OpenAPI specification is 'application/json'
         mergedHeaders.set(
           key,

package/src/index.ts

@@ -14,33 +14,33 @@ export * from "./sdk";
 // ---------------------------------------------------------------------------
 
 import {
+  createBrokerChannel,
+  executeSwap,
+  getCachedPrice,
+  getGasHistory,
+  getGasPrices,
   getProviders,
+  getQuote,
+  getSwapFromAssets,
+  getSwapToAssets,
   getTokens,
-  getSwapTo,
-  getSwapFrom,
-  postV3Quote,
-  postV3Swap,
-  postTrack,
-  postScreen,
-  getGas,
-  getGasHistory,
-  postPriceCachedPrice,
-  postChainflipBrokerChannel,
+  screenAddress,
+  trackTransaction,
 } from "./sdk";
 
 export class SwapKitService {
   static getProviders = getProviders;
   static getTokens = getTokens;
-  static getSwapTo = getSwapTo;
-  static getSwapFrom = getSwapFrom;
-  static getQuote = postV3Quote;
-  static getSwap = postV3Swap;
-  static trackTransaction = postTrack;
-  static screenAddress = postScreen;
-  static getGasPrices = getGas;
+  static getSwapTo = getSwapToAssets;
+  static getSwapFrom = getSwapFromAssets;
+  static getQuote = getQuote;
+  static getSwap = executeSwap;
+  static trackTransaction = trackTransaction;
+  static screenAddress = screenAddress;
+  static getGasPrices = getGasPrices;
   static getGasHistory = getGasHistory;
-  static getCachedPrice = postPriceCachedPrice;
-  static createBrokerChannel = postChainflipBrokerChannel;
+  static getCachedPrice = getCachedPrice;
+  static createBrokerChannel = createBrokerChannel;
 }
 
 // ---------------------------------------------------------------------------
@@ -51,42 +51,42 @@ export class SwapKitService {
 export const TokenlistService = {
   getProviders,
   getTokens,
-  getSwapTo,
-  getSwapFrom,
+  getSwapTo: getSwapToAssets,
+  getSwapFrom: getSwapFromAssets,
 } as const;
 
 /** @deprecated Use `SwapKitService` instead */
 export const QuoteService = {
-  getQuote: postV3Quote,
+  getQuote,
 } as const;
 
 /** @deprecated Use `SwapKitService` instead */
 export const SwapService = {
-  getSwap: postV3Swap,
+  getSwap: executeSwap,
 } as const;
 
 /** @deprecated Use `SwapKitService` instead */
 export const TrackService = {
-  trackTransaction: postTrack,
+  trackTransaction,
 } as const;
 
 /** @deprecated Use `SwapKitService` instead */
 export const ScreenService = {
-  screenAddress: postScreen,
+  screenAddress,
 } as const;
 
 /** @deprecated Use `SwapKitService` instead */
 export const GasService = {
-  getGasPrices: getGas,
+  getGasPrices,
   getGasHistory,
 } as const;
 
 /** @deprecated Use `SwapKitService` instead */
 export const PriceService = {
-  getCachedPrice: postPriceCachedPrice,
+  getCachedPrice,
 } as const;
 
 /** @deprecated Use `SwapKitService` instead */
 export const ChainflipService = {
-  createBrokerChannel: postChainflipBrokerChannel,
+  createBrokerChannel,
 } as const;

package/src/sdk.ts

@@ -2,9 +2,9 @@
 
 import type { Client, Options as Options2, TDataShape } from './http';
 import { client } from './client';
-import type { GetGasData, GetGasHistoryData, GetGasHistoryResponses, GetGasResponses, GetProvidersData, GetProvidersErrors, GetProvidersResponses, GetSwapFromData, GetSwapFromErrors, GetSwapFromResponses, GetSwapToData, GetSwapToErrors, GetSwapToResponses, GetTokensData, GetTokensErrors, GetTokensResponses, PostChainflipBrokerChannelData, PostChainflipBrokerChannelResponses, PostPriceCachedPriceData, PostPriceCachedPriceResponses, PostScreenData, PostScreenErrors, PostScreenResponses, PostTrackData, PostTrackResponses, PostV3QuoteData, PostV3QuoteErrors, PostV3QuoteResponses, PostV3SwapData, PostV3SwapErrors, PostV3SwapResponses } from './types';
+import type { CreateBrokerChannelData, CreateBrokerChannelResponses, ExecuteSwapData, ExecuteSwapErrors, ExecuteSwapResponses, GetCachedPriceData, GetCachedPriceResponses, GetGasHistoryData, GetGasHistoryResponses, GetGasPricesData, GetGasPricesResponses, GetProvidersData, GetProvidersErrors, GetProvidersResponses, GetQuoteData, GetQuoteErrors, GetQuoteResponses, GetSwapFromAssetsData, GetSwapFromAssetsErrors, GetSwapFromAssetsResponses, GetSwapToAssetsData, GetSwapToAssetsErrors, GetSwapToAssetsResponses, GetTokensData, GetTokensErrors, GetTokensResponses, ScreenAddressData, ScreenAddressErrors, ScreenAddressResponses, TrackTransactionData, TrackTransactionErrors, TrackTransactionResponses } from './types';
 
-export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean, TResponse = unknown> = Options2<TData, ThrowOnError, TResponse> & {
     /**
      * You can provide a client instance returned by `createClient()` instead of
      * individual options. This might be also useful if you want to implement a
@@ -30,19 +30,19 @@ export const getTokens = <ThrowOnError extends boolean = false>(options?: Option
     ...options
 });
 
-export const getSwapTo = <ThrowOnError extends boolean = false>(options: Options<GetSwapToData, ThrowOnError>) => (options.client ?? client).get<GetSwapToResponses, GetSwapToErrors, ThrowOnError>({
+export const getSwapToAssets = <ThrowOnError extends boolean = false>(options: Options<GetSwapToAssetsData, ThrowOnError>) => (options.client ?? client).get<GetSwapToAssetsResponses, GetSwapToAssetsErrors, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
     url: '/swapTo',
     ...options
 });
 
-export const getSwapFrom = <ThrowOnError extends boolean = false>(options: Options<GetSwapFromData, ThrowOnError>) => (options.client ?? client).get<GetSwapFromResponses, GetSwapFromErrors, ThrowOnError>({
+export const getSwapFromAssets = <ThrowOnError extends boolean = false>(options: Options<GetSwapFromAssetsData, ThrowOnError>) => (options.client ?? client).get<GetSwapFromAssetsResponses, GetSwapFromAssetsErrors, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
     url: '/swapFrom',
     ...options
 });
 
-export const postChainflipBrokerChannel = <ThrowOnError extends boolean = false>(options: Options<PostChainflipBrokerChannelData, ThrowOnError>) => (options.client ?? client).post<PostChainflipBrokerChannelResponses, unknown, ThrowOnError>({
+export const createBrokerChannel = <ThrowOnError extends boolean = false>(options: Options<CreateBrokerChannelData, ThrowOnError>) => (options.client ?? client).post<CreateBrokerChannelResponses, unknown, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
     url: '/chainflip/broker/channel',
     ...options,
@@ -52,7 +52,7 @@ export const postChainflipBrokerChannel = <ThrowOnError extends boolean = false>
     }
 });
 
-export const postTrack = <ThrowOnError extends boolean = false>(options?: Options<PostTrackData, ThrowOnError>) => (options?.client ?? client).post<PostTrackResponses, unknown, ThrowOnError>({
+export const trackTransaction = <ThrowOnError extends boolean = false>(options?: Options<TrackTransactionData, ThrowOnError>) => (options?.client ?? client).post<TrackTransactionResponses, TrackTransactionErrors, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
     url: '/track',
     ...options,
@@ -62,7 +62,7 @@ export const postTrack = <ThrowOnError extends boolean = false>(options?: Option
     }
 });
 
-export const postScreen = <ThrowOnError extends boolean = false>(options: Options<PostScreenData, ThrowOnError>) => (options.client ?? client).post<PostScreenResponses, PostScreenErrors, ThrowOnError>({
+export const screenAddress = <ThrowOnError extends boolean = false>(options: Options<ScreenAddressData, ThrowOnError>) => (options.client ?? client).post<ScreenAddressResponses, ScreenAddressErrors, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
     url: '/screen',
     ...options,
@@ -72,19 +72,19 @@ export const postScreen = <ThrowOnError extends boolean = false>(options: Option
     }
 });
 
-export const getGasHistory = <ThrowOnError extends boolean = false>(options?: Options<GetGasHistoryData, ThrowOnError>) => (options?.client ?? client).get<GetGasHistoryResponses, unknown, ThrowOnError>({
+export const getGasPrices = <ThrowOnError extends boolean = false>(options?: Options<GetGasPricesData, ThrowOnError>) => (options?.client ?? client).get<GetGasPricesResponses, unknown, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
-    url: '/gas/history',
+    url: '/gas',
     ...options
 });
 
-export const getGas = <ThrowOnError extends boolean = false>(options?: Options<GetGasData, ThrowOnError>) => (options?.client ?? client).get<GetGasResponses, unknown, ThrowOnError>({
+export const getGasHistory = <ThrowOnError extends boolean = false>(options?: Options<GetGasHistoryData, ThrowOnError>) => (options?.client ?? client).get<GetGasHistoryResponses, unknown, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
-    url: '/gas',
+    url: '/gas/history',
     ...options
 });
 
-export const postPriceCachedPrice = <ThrowOnError extends boolean = false>(options: Options<PostPriceCachedPriceData, ThrowOnError>) => (options.client ?? client).post<PostPriceCachedPriceResponses, unknown, ThrowOnError>({
+export const getCachedPrice = <ThrowOnError extends boolean = false>(options: Options<GetCachedPriceData, ThrowOnError>) => (options.client ?? client).post<GetCachedPriceResponses, unknown, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
     url: '/price/cached-price',
     ...options,
@@ -94,7 +94,7 @@ export const postPriceCachedPrice = <ThrowOnError extends boolean = false>(optio
     }
 });
 
-export const postV3Quote = <ThrowOnError extends boolean = false>(options: Options<PostV3QuoteData, ThrowOnError>) => (options.client ?? client).post<PostV3QuoteResponses, PostV3QuoteErrors, ThrowOnError>({
+export const getQuote = <ThrowOnError extends boolean = false>(options: Options<GetQuoteData, ThrowOnError>) => (options.client ?? client).post<GetQuoteResponses, GetQuoteErrors, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
     url: '/v3/quote',
     ...options,
@@ -104,7 +104,7 @@ export const postV3Quote = <ThrowOnError extends boolean = false>(options: Optio
     }
 });
 
-export const postV3Swap = <ThrowOnError extends boolean = false>(options: Options<PostV3SwapData, ThrowOnError>) => (options.client ?? client).post<PostV3SwapResponses, PostV3SwapErrors, ThrowOnError>({
+export const executeSwap = <ThrowOnError extends boolean = false>(options: Options<ExecuteSwapData, ThrowOnError>) => (options.client ?? client).post<ExecuteSwapResponses, ExecuteSwapErrors, ThrowOnError>({
     security: [{ name: 'x-api-key', type: 'apiKey' }],
     url: '/v3/swap',
     ...options,