Fix todo for order type compatibility in client (#26)

* Fix todo for order type compatibility in client * fmt * min out atoms
CKS-Systems · Aug 27, 2024 · 957180b · 957180b
1 parent 28ebfe8
commit 957180b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/client/idl/generateIdl.js b/client/idl/generateIdl.js
@@ -250,10 +250,7 @@ function modifyIdlCore(programName) {
             name: 'PostOnly',
           },
           {
-            name: 'PostOnlySlide',
-          },
-          {
-            name: 'FillOrKill',
+            name: 'Global',
           },
         ],
       },

diff --git a/client/idl/wrapper.json b/client/idl/wrapper.json
@@ -474,10 +474,7 @@
             "name": "PostOnly"
           },
           {
-            "name": "PostOnlySlide"
-          },
-          {
-            "name": "FillOrKill"
+            "name": "Global"
           }
         ]
       }

diff --git a/client/ts/src/client.ts b/client/ts/src/client.ts
@@ -210,7 +210,7 @@ export class ManifestClient {
    *
    * @returns TransactionInstruction
    */
-  public static createMarketIx(
+  private static createMarketIx(
     payer: PublicKey,
     baseMint: PublicKey,
     quoteMint: PublicKey,
@@ -468,7 +468,7 @@ export type WrapperPlaceOrderParamsExternal = {
   /** Type of order (Limit, PostOnly, ...). */
   orderType: OrderType;
   /** Used in fill or kill orders. Set to zero otherwise. */
-  minOutAtoms: bignum;
+  minOutAtoms?: bignum;
   /** Client order id used for cancelling orders. Does not need to be unique. */
   clientOrderId: bignum;
 };
@@ -485,11 +485,10 @@ function toWrapperPlaceOrderParams(
   }
   priceMantissa = Math.floor(priceMantissa);
 
-  // TODO: Fix this
-  // @ts-ignore
   return {
     ...wrapperPlaceOrderParamsExternal,
     priceMantissa,
     priceExponent,
+    minOutAtoms: wrapperPlaceOrderParamsExternal.minOutAtoms ?? 0,
   };
 }
diff --git a/client/ts/src/wrapper/types/OrderType.ts b/client/ts/src/wrapper/types/OrderType.ts
@@ -14,8 +14,7 @@ export enum OrderType {
   Limit,
   ImmediateOrCancel,
   PostOnly,
-  PostOnlySlide,
-  FillOrKill,
+  Global,
 }
 
 /**

diff --git a/client/ts/tests/createMarket.ts b/client/ts/tests/createMarket.ts
@@ -61,7 +61,7 @@ export async function createMarket(
     programId: PROGRAM_ID,
   });
 
-  const createMarketIx = ManifestClient.createMarketIx(
+  const createMarketIx = ManifestClient['createMarketIx'](
     payerKeypair.publicKey,
     baseMint,
     quoteMint,