From d818c455261497b6d034e86b341e022391f9d23e Mon Sep 17 00:00:00 2001 From: Daniel Dimitrov Date: Wed, 26 Jun 2024 13:30:48 +0200 Subject: [PATCH] reafactor: order types (#182) --- src/index.ts | 4 ++-- src/types/api.ts | 4 ++-- src/types/decoded-data.ts | 6 +++--- src/types/transactions.ts | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/index.ts b/src/index.ts index f7098e1a..56ce3ca0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -22,7 +22,7 @@ import type { SafeInfo, SafeOverview } from './types/safe-info' import type { ChainListResponse, ChainInfo } from './types/chains' import type { SafeAppsResponse } from './types/safe-apps' import type { MasterCopyReponse } from './types/master-copies' -import type { BaselineConfirmationView, CowConfirmationView, DecodedDataResponse } from './types/decoded-data' +import type { BaselineConfirmationView, OrderConfirmationView, DecodedDataResponse } from './types/decoded-data' import type { SafeMessage, SafeMessageListPage } from './types/safe-messages' import { DEFAULT_BASE_URL } from './config' import type { DelegateResponse, DelegatesRequest } from './types/delegates' @@ -304,7 +304,7 @@ export function getConfirmationView( safeAddress: string, encodedData: operations['data_decoder']['parameters']['body']['data'], to?: operations['data_decoder']['parameters']['body']['to'], -): Promise { +): Promise { return postEndpoint(baseUrl, '/v1/chains/{chainId}/safes/{safe_address}/views/transaction-confirmation', { path: { chainId: chainId, safe_address: safeAddress }, body: { data: encodedData, to }, diff --git a/src/types/api.ts b/src/types/api.ts index 65c79361..5c42955a 100644 --- a/src/types/api.ts +++ b/src/types/api.ts @@ -22,7 +22,7 @@ import type { ChainListResponse, ChainInfo } from './chains' import type { SafeAppsResponse } from './safe-apps' import type { BaselineConfirmationView, - CowConfirmationView, + OrderConfirmationView, DecodedDataRequest, DecodedDataResponse, } from './decoded-data' @@ -794,7 +794,7 @@ export interface operations { } responses: { 200: { - schema: BaselineConfirmationView | CowConfirmationView + schema: BaselineConfirmationView | OrderConfirmationView } } } diff --git a/src/types/decoded-data.ts b/src/types/decoded-data.ts index 934cda0d..592b5f19 100644 --- a/src/types/decoded-data.ts +++ b/src/types/decoded-data.ts @@ -42,14 +42,14 @@ export type BaselineConfirmationView = { type: 'GENERIC' } & DecodedDataResponse -export type SwapConfirmationView = { +export type SwapOrderConfirmationView = { type: ConfirmationViewTypes.COW_SWAP_ORDER } & DecodedDataResponse & Omit -export type TwapConfirmationView = { +export type TwapOrderConfirmationView = { type: ConfirmationViewTypes.COW_SWAP_TWAP_ORDER } & DecodedDataResponse & Omit -export type CowConfirmationView = SwapConfirmationView | TwapConfirmationView +export type OrderConfirmationView = SwapOrderConfirmationView | TwapOrderConfirmationView diff --git a/src/types/transactions.ts b/src/types/transactions.ts index 7e64f0f1..1272792b 100644 --- a/src/types/transactions.ts +++ b/src/types/transactions.ts @@ -287,20 +287,20 @@ export type BaseOrder = { } export enum DurationType { - Auto, - LimitDuration, + AUTO = 'AUTO', + LIMIT_DURATION = 'LIMIT_DURATION', } export enum StartTimeValue { - AtMiningTime, - AtEpoch, + AT_MINING_TIME = 'AT_MINING_TIME', + AT_EPOCH = 'AT_EPOCH', } type DurationOfPart = - | { durationType: DurationType.Auto } - | { durationType: DurationType.LimitDuration; duration: number } + | { durationType: DurationType.AUTO } + | { durationType: DurationType.LIMIT_DURATION; duration: number } -type StartTime = { startType: StartTimeValue.AtMiningTime } | { startType: StartTimeValue.AtEpoch; epoch: number } +type StartTime = { startType: StartTimeValue.AT_MINING_TIME } | { startType: StartTimeValue.AT_EPOCH; epoch: number } // Specific type for SwapOrder export type SwapOrder = BaseOrder & {