packages: core: actions: update order create/update actions to accept…

… external matches flag
renegade-fi · Oct 19, 2024 · 9d85d5d · 9d85d5d
1 parent ee58f44
commit 9d85d5d
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 13 deletions.
diff --git a/packages/core/src/actions/createOrder.ts b/packages/core/src/actions/createOrder.ts
@@ -16,6 +16,7 @@ export type CreateOrderParameters = {
   amount: bigint
   worstCasePrice?: string
   minFillSize?: bigint
+  allowExternalMatches?: boolean
 }
 
 export type CreateOrderReturnType = { taskId: string }
@@ -34,6 +35,7 @@ export async function createOrder(
     amount,
     worstCasePrice = '',
     minFillSize = BigInt(0),
+    allowExternalMatches = false,
   } = parameters
   const {
     getRelayerBaseUrl,
@@ -55,6 +57,7 @@ export async function createOrder(
     toHex(amount),
     worstCasePrice,
     toHex(minFillSize),
+    allowExternalMatches,
   )
 
   try {

diff --git a/packages/core/src/actions/createOrderInMatchingPool.ts b/packages/core/src/actions/createOrderInMatchingPool.ts
@@ -27,6 +27,7 @@ export async function createOrderInMatchingPool(
     amount,
     worstCasePrice = '',
     minFillSize = BigInt(0),
+    allowExternalMatches = false,
     matchingPool,
   } = parameters
   const {
@@ -49,6 +50,7 @@ export async function createOrderInMatchingPool(
     toHex(amount),
     worstCasePrice,
     toHex(minFillSize),
+    allowExternalMatches,
     matchingPool,
   )
 

diff --git a/packages/core/src/actions/updateOrder.ts b/packages/core/src/actions/updateOrder.ts
@@ -15,6 +15,7 @@ export type UpdateOrderParameters = {
   amount: bigint
   worstCasePrice?: string
   minFillSize?: bigint
+  allowExternalMatches?: boolean
 }
 
 export type UpdateOrderReturnType = Promise<{ taskId: string }>
@@ -31,6 +32,7 @@ export async function updateOrder(
     amount,
     worstCasePrice = '',
     minFillSize = BigInt(0),
+    allowExternalMatches = false,
   } = parameters
   const {
     getRelayerBaseUrl,
@@ -52,6 +54,7 @@ export async function updateOrder(
     toHex(amount),
     worstCasePrice,
     toHex(minFillSize),
+    allowExternalMatches,
   )
 
   try {

diff --git a/packages/core/src/types/order.ts b/packages/core/src/types/order.ts
@@ -7,6 +7,7 @@ export type Order = {
   worst_case_price: string
   amount: bigint
   min_fill_size: bigint
+  allow_external_matches: boolean
 }
 
 export enum OrderState {

diff --git a/packages/core/src/utils.d.ts b/packages/core/src/utils.d.ts
@@ -65,11 +65,11 @@ export function new_order(seed: string, wallet_str: string, id: string, base_min
 * @param {string} amount
 * @param {string} worst_case_price
 * @param {string} min_fill_size
-* @param {string} matching_pool
 * @param {boolean} allow_external_matches
+* @param {string} matching_pool
 * @returns {any}
 */
-export function new_order_in_matching_pool(seed: string, wallet_str: string, id: string, base_mint: string, quote_mint: string, side: string, amount: string, worst_case_price: string, min_fill_size: string, matching_pool: string, allow_external_matches: boolean): any;
+export function new_order_in_matching_pool(seed: string, wallet_str: string, id: string, base_mint: string, quote_mint: string, side: string, amount: string, worst_case_price: string, min_fill_size: string, allow_external_matches: boolean, matching_pool: string): any;
 /**
 * @param {string} seed
 * @param {string} wallet_str

diff --git a/packages/node/renegade-utils/index.d.ts b/packages/node/renegade-utils/index.d.ts
@@ -65,11 +65,11 @@ export function new_order(seed: string, wallet_str: string, id: string, base_min
 * @param {string} amount
 * @param {string} worst_case_price
 * @param {string} min_fill_size
-* @param {string} matching_pool
 * @param {boolean} allow_external_matches
+* @param {string} matching_pool
 * @returns {any}
 */
-export function new_order_in_matching_pool(seed: string, wallet_str: string, id: string, base_mint: string, quote_mint: string, side: string, amount: string, worst_case_price: string, min_fill_size: string, matching_pool: string, allow_external_matches: boolean): any;
+export function new_order_in_matching_pool(seed: string, wallet_str: string, id: string, base_mint: string, quote_mint: string, side: string, amount: string, worst_case_price: string, min_fill_size: string, allow_external_matches: boolean, matching_pool: string): any;
 /**
 * @param {string} seed
 * @param {string} wallet_str

diff --git a/packages/node/renegade-utils/index.js b/packages/node/renegade-utils/index.js
@@ -336,11 +336,11 @@ module.exports.new_order = function(seed, wallet_str, id, base_mint, quote_mint,
 * @param {string} amount
 * @param {string} worst_case_price
 * @param {string} min_fill_size
-* @param {string} matching_pool
 * @param {boolean} allow_external_matches
+* @param {string} matching_pool
 * @returns {any}
 */
-module.exports.new_order_in_matching_pool = function(seed, wallet_str, id, base_mint, quote_mint, side, amount, worst_case_price, min_fill_size, matching_pool, allow_external_matches) {
+module.exports.new_order_in_matching_pool = function(seed, wallet_str, id, base_mint, quote_mint, side, amount, worst_case_price, min_fill_size, allow_external_matches, matching_pool) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         const ptr0 = passStringToWasm0(seed, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -363,7 +363,7 @@ module.exports.new_order_in_matching_pool = function(seed, wallet_str, id, base_
         const len8 = WASM_VECTOR_LEN;
         const ptr9 = passStringToWasm0(matching_pool, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len9 = WASM_VECTOR_LEN;
-        wasm.new_order_in_matching_pool(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7, ptr8, len8, ptr9, len9, allow_external_matches);
+        wasm.new_order_in_matching_pool(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7, ptr8, len8, allow_external_matches, ptr9, len9);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         var r2 = getInt32Memory0()[retptr / 4 + 2];

diff --git a/packages/node/renegade-utils/index_bg.wasm b/packages/node/renegade-utils/index_bg.wasm
diff --git a/packages/react/renegade-utils/index.d.ts b/packages/react/renegade-utils/index.d.ts
@@ -65,11 +65,11 @@ export function new_order(seed: string, wallet_str: string, id: string, base_min
 * @param {string} amount
 * @param {string} worst_case_price
 * @param {string} min_fill_size
-* @param {string} matching_pool
 * @param {boolean} allow_external_matches
+* @param {string} matching_pool
 * @returns {any}
 */
-export function new_order_in_matching_pool(seed: string, wallet_str: string, id: string, base_mint: string, quote_mint: string, side: string, amount: string, worst_case_price: string, min_fill_size: string, matching_pool: string, allow_external_matches: boolean): any;
+export function new_order_in_matching_pool(seed: string, wallet_str: string, id: string, base_mint: string, quote_mint: string, side: string, amount: string, worst_case_price: string, min_fill_size: string, allow_external_matches: boolean, matching_pool: string): any;
 /**
 * @param {string} seed
 * @param {string} wallet_str

diff --git a/packages/react/renegade-utils/index.js b/packages/react/renegade-utils/index.js
@@ -333,11 +333,11 @@ export function new_order(seed, wallet_str, id, base_mint, quote_mint, side, amo
 * @param {string} amount
 * @param {string} worst_case_price
 * @param {string} min_fill_size
-* @param {string} matching_pool
 * @param {boolean} allow_external_matches
+* @param {string} matching_pool
 * @returns {any}
 */
-export function new_order_in_matching_pool(seed, wallet_str, id, base_mint, quote_mint, side, amount, worst_case_price, min_fill_size, matching_pool, allow_external_matches) {
+export function new_order_in_matching_pool(seed, wallet_str, id, base_mint, quote_mint, side, amount, worst_case_price, min_fill_size, allow_external_matches, matching_pool) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         const ptr0 = passStringToWasm0(seed, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -360,7 +360,7 @@ export function new_order_in_matching_pool(seed, wallet_str, id, base_mint, quot
         const len8 = WASM_VECTOR_LEN;
         const ptr9 = passStringToWasm0(matching_pool, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len9 = WASM_VECTOR_LEN;
-        wasm.new_order_in_matching_pool(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7, ptr8, len8, ptr9, len9, allow_external_matches);
+        wasm.new_order_in_matching_pool(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7, ptr8, len8, allow_external_matches, ptr9, len9);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         var r2 = getInt32Memory0()[retptr / 4 + 2];

diff --git a/packages/react/renegade-utils/index_bg.wasm b/packages/react/renegade-utils/index_bg.wasm
diff --git a/wasm/src/external_api/http.rs b/wasm/src/external_api/http.rs
@@ -490,8 +490,8 @@ pub fn new_order_in_matching_pool(
     amount: &str,
     worst_case_price: &str,
     min_fill_size: &str,
-    matching_pool: &str,
     allow_external_matches: bool,
+    matching_pool: &str,
 ) -> Result<JsValue, JsError> {
     let create_order_req = create_order_request(
         seed,