Tidy up & include wallet in funcs

IndigoProtocol · May 13, 2024 · b8e1bef · b8e1bef
1 parent 0e7a53b
commit b8e1bef
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 64 deletions.
diff --git a/src/dex/api/sundaeswap-v3-api.ts b/src/dex/api/sundaeswap-v3-api.ts
@@ -104,8 +104,8 @@ export class SundaeSwapV3Api extends BaseApi {
                         BigInt(pool.current.quantityA),
                         BigInt(pool.current.quantityB),
                         this.dex.poolAddress,
-                        this.dex.getDynamicOrderAddress(''), // TODO Need to get sender stake key hash.
-                        this.dex.getDynamicOrderAddress(''), // TODO Need to get sender stake key hash.
+                        '',
+                        '',
                     );
 
                     liquidityPool.identifier = pool.id;

diff --git a/src/dex/base-dex.ts b/src/dex/base-dex.ts
@@ -5,6 +5,7 @@ import { AssetBalance, DatumParameters, PayToAddress, SpendUTxO, SwapFee, UTxO }
 import { DatumParameterKey } from '@app/constants';
 import { tokensMatch } from '@app/utils';
 import { BaseApi } from '@dex/api/base-api';
+import { BaseWalletProvider } from '@providers/wallet/base-wallet-provider';
 
 export abstract class BaseDex {
 
@@ -16,17 +17,17 @@ export abstract class BaseDex {
     /**
      * Fetch addresses mapped to a liquidity pool.
      */
-    abstract liquidityPoolAddresses(provider: BaseDataProvider): Promise<string[]>;
+    abstract liquidityPoolAddresses(provider?: BaseDataProvider): Promise<string[]>;
 
     /**
      * Fetch all liquidity pools.
      */
-    abstract liquidityPools(provider: BaseDataProvider): Promise<LiquidityPool[]>;
+    abstract liquidityPools(provider: BaseDataProvider, wallet?: BaseWalletProvider): Promise<LiquidityPool[]>;
 
     /**
      * Craft liquidity pool state from a valid UTxO.
      */
-    abstract liquidityPoolFromUtxo(provider: BaseDataProvider, utxo: UTxO): Promise<LiquidityPool | undefined>;
+    abstract liquidityPoolFromUtxo(provider: BaseDataProvider, utxo: UTxO, wallet?: BaseWalletProvider): Promise<LiquidityPool | undefined>;
 
     /**
      * Estimated swap in amount given for a swap out token & amount on a liquidity pool.
@@ -51,7 +52,7 @@ export abstract class BaseDex {
     /**
      * Craft a swap order cancellation for this DEX.
      */
-    abstract buildCancelSwapOrder(txOutputs: UTxO[], returnAddress: string): Promise<PayToAddress[]>;
+    abstract buildCancelSwapOrder(txOutputs: UTxO[], returnAddress: string, wallet?: BaseWalletProvider): Promise<PayToAddress[]>;
 
     /**
      * Fees associated with submitting a swap order.

diff --git a/src/dex/definitions/sundaeswap-v3/order.ts b/src/dex/definitions/sundaeswap-v3/order.ts
@@ -1,7 +1,6 @@
 import { DatumParameterKey } from '@app/constants';
-import { DefinitionField } from '@app/types';
 
-const datum = {
+export default {
   constructor: 0,
   fields: [
     {
@@ -93,7 +92,5 @@ const datum = {
     {
       bytes: DatumParameterKey.CancelDatum,
     },
-  ] as DefinitionField[],
+  ],
 };
-
-export default datum;
diff --git a/src/dex/definitions/sundaeswap-v3/pool.ts b/src/dex/definitions/sundaeswap-v3/pool.ts
@@ -1,5 +1,4 @@
 import { DatumParameterKey } from '@app/constants';
-import { DefinitionField, DefinitionList } from '@app/types';
 
 export default {
   constructor: 0,
@@ -10,26 +9,62 @@ export default {
     {
       list: [
         {
-          list: [{ bytes: DatumParameterKey.PoolAssetAPolicyId }, { bytes: DatumParameterKey.PoolAssetAAssetName }] as DefinitionList,
+          list: [
+            {
+              bytes: DatumParameterKey.PoolAssetAPolicyId
+            },
+            {
+              bytes: DatumParameterKey.PoolAssetAAssetName
+            }
+          ],
         },
         {
-          list: [{ bytes: DatumParameterKey.PoolAssetBPolicyId }, { bytes: DatumParameterKey.PoolAssetBAssetName }] as DefinitionList,
+          list: [
+            {
+              bytes: DatumParameterKey.PoolAssetBPolicyId
+            },
+            {
+              bytes: DatumParameterKey.PoolAssetBAssetName
+            }
+          ],
         },
-      ] as unknown as DefinitionList,
+      ],
     },
-    { int: DatumParameterKey.TotalLpTokens },
     {
-      list: [{ int: DatumParameterKey.OpeningFee }, { int: DatumParameterKey.FinalFee }] as DefinitionList, // Need to confirm these?
+      int: DatumParameterKey.TotalLpTokens
     },
     {
-      list: [{ int: DatumParameterKey.OpeningFee }, { int: DatumParameterKey.FinalFee }] as DefinitionList, // Need to confirm these?
+      list: [
+        {
+          int: DatumParameterKey.OpeningFee
+        },
+        {
+          int: DatumParameterKey.FinalFee
+        }
+      ],
+    },
+    {
+      list: [
+        {
+          int: DatumParameterKey.OpeningFee
+        },
+        {
+          int: DatumParameterKey.FinalFee
+        }
+      ],
     },
     {
       fields: [],
       constructor: 1,
     },
-    { int: DatumParameterKey.MarketOpen },
-    { int: DatumParameterKey.FeesFinalized },
-    { int: DatumParameterKey.ProtocolFee },
-  ] as DefinitionField[],
+    {
+      int: DatumParameterKey.MarketOpen
+    },
+    {
+      int: DatumParameterKey.FeesFinalized
+    },
+    {
+      int: DatumParameterKey.ProtocolFee
+    },
+  ],
 };
diff --git a/src/dex/sundaeswap-v1.ts b/src/dex/sundaeswap-v1.ts
@@ -111,6 +111,7 @@ export class SundaeSwapV1 extends BaseDex {
             const datum: DefinitionField = await provider.datumValue(utxo.datumHash);
             const parameters: DatumParameters = builder.pullParameters(datum as DefinitionConstr);
 
+            liquidityPool.lpToken = lpToken;
             liquidityPool.identifier = typeof parameters.PoolIdentifier === 'string'
                 ? parameters.PoolIdentifier
                 : '';

diff --git a/src/dex/sundaeswap-v3.ts b/src/dex/sundaeswap-v3.ts
diff --git a/src/types.ts b/src/types.ts
@@ -72,8 +72,11 @@ export type DefinitionInt = {
   int: number | DatumParameterKey;
 };
 
-export type DefinitionField = DefinitionConstr | DefinitionBytes | DefinitionInt | DefinitionField[] | DefinitionList | DefinitionList[] | Function;
-export type DefinitionList = DefinitionBytes | DefinitionInt | DefinitionList[] | Function;
+export type DefinitionList = {
+  list: DefinitionField[] | DefinitionList[];
+};
+
+export type DefinitionField = DefinitionConstr | DefinitionBytes | DefinitionInt | DefinitionList| Function | DefinitionField[];
 
 export type DefinitionConstr = {
   constructor: number | DatumParameterKey;