wip

Emurgo · Nov 19, 2024 · 79bc03c · 79bc03c
1 parent 51ea966
commit 79bc03c
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 123 deletions.
diff --git a/packages/swap/src/adapters/api/dexhunter/transformers.ts b/packages/swap/src/adapters/api/dexhunter/transformers.ts
@@ -297,6 +297,7 @@ export const transformersMaker = ({
         total_input = 0,
         total_output = 0,
       }: LimitBuildResponse): Swap.CreateResponse => ({
+        aggregator: Swap.Aggregator.Dexhunter,
         cbor,
         splits: splits?.map(transformSplit) ?? [],
         batcherFee: batcher_fee,
@@ -336,6 +337,7 @@ export const transformersMaker = ({
         total_output = 0,
         total_output_without_slippage = 0,
       }: BuildResponse): Swap.CreateResponse => ({
+        aggregator: Swap.Aggregator.Dexhunter,
         cbor,
         splits: splits?.map(transformSplit) ?? [],
         batcherFee: batcher_fee,

diff --git a/packages/swap/src/adapters/api/muesliswap/transformers.ts b/packages/swap/src/adapters/api/muesliswap/transformers.ts
@@ -247,22 +247,14 @@ export const transformersMaker = ({
       response: (
         res: ConstructSwapDatumResponse,
         estimate: Swap.EstimateResponse,
-      ): Swap.CreateResponse => {
-        const cbor: string = swapCreateCbor(res)
-
-        return {
-          cbor,
-          ...estimate,
-          totalInput: estimate.totalInput ?? estimate.splits[0]?.amountIn ?? 0,
-        }
-      },
+      ): Swap.CreateResponse => ({
+        aggregator: Swap.Aggregator.Muesliswap,
+        contractAddress: res.address,
+        datumData: res.datum,
+        datumHash: res.hash,
+        ...estimate,
+        totalInput: estimate.totalInput ?? estimate.splits[0]?.amountIn ?? 0,
+      }),
     },
   } as const
 }
-
-// TODO: Transform contractAddress, datum, hash into cbor, code in StartSwapOrderScreen.tsx
-const swapCreateCbor = ({
-  address: contractAddress,
-  datum,
-  hash,
-}: ConstructSwapDatumResponse) => `${contractAddress}${datum}${hash}`
diff --git a/packages/swap/src/fixtures/ErrorBoundary.tsx b/packages/swap/src/fixtures/ErrorBoundary.tsx
diff --git a/packages/swap/src/fixtures/SuspenseBoundary.tsx b/packages/swap/src/fixtures/SuspenseBoundary.tsx
diff --git a/packages/swap/src/fixtures/manager-wrapper.tsx b/packages/swap/src/fixtures/manager-wrapper.tsx
diff --git a/packages/swap/src/fixtures/query-client.ts b/packages/swap/src/fixtures/query-client.ts
diff --git a/packages/swap/src/helpers/getLiquidityProviderFee.ts b/packages/swap/src/helpers/getLiquidityProviderFee.ts
diff --git a/packages/types/src/swap/api.ts b/packages/types/src/swap/api.ts
@@ -95,8 +95,8 @@ export type SwapCreateRequest = {
     }
 )
 
+// Leaks aggregator because of current challenge creating a cbor inside package
 export type SwapCreateResponse = {
-  cbor: string
   splits: SwapSplit[]
   batcherFee: number
   deposits: number
@@ -107,7 +107,22 @@ export type SwapCreateResponse = {
   totalInput: number
   totalOutput: number
   totalOutputWithoutSlippage?: number
-}
+} & (
+  | {
+      aggregator: typeof SwapAggregator.Muesliswap
+      datumData: string
+      datumHash: string
+      contractAddress: string
+      cbor?: undefined
+    }
+  | {
+      aggregator: typeof SwapAggregator.Dexhunter
+      datumData?: undefined
+      datumHash?: undefined
+      contractAddress?: undefined
+      cbor: string
+    }
+)
 
 export type SwapCancelRequest = {
   order: SwapOrder