Fix self-trade bindings, restore linux signer libs, add examples

- sign_create_order: drop bogus cancel_all_market_index arg and fix
  argument order (self_trade_behavior/equality before skip_nonce)
- sign_cancel_all_orders: pass cancel_all_market_index through to the
  signer and default it to NIL_MARKET_INDEX (backward compatible)
- sign_modify_order: pass self_trade_equality_mode (was duplicating
  self_trade_behavior_mode)
- cancel_all_orders: default cancel_all_market_index to NIL_MARKET_INDEX
- rebuild + restore linux amd64/arm64 signer libs from lighter-go
  self-trade branch (they were dropped on this branch)
- wire darwin-amd64 dylib into the loader
- add self-trade and single-market cancel-all examples

Co-Authored-By: mihai <mihai2004marcu@gmail.com>

Author: devin-ai-integration[bot]

examples/cancel_all_orders_single_market.py

@@ -0,0 +1,49 @@
+import asyncio
+from utils import default_example_setup
+
+
+# Scope a cancel-all to a single market.
+#
+# cancel_all_market_index:
+#   NIL_MARKET_INDEX (255, default) - cancel resting orders across ALL markets
+#   0..254                          - cancel resting orders only in that perp market
+#
+# Note: a non-nil market index is only valid for an immediate cancel-all
+# (TIME_IN_FORCE_IMMEDIATE_OR_CANCEL), not for a scheduled / dead-man's-switch one.
+async def main():
+    client, api_client, _ = default_example_setup()
+    client.check_client()
+
+    market_index = 0
+
+    # cancel all of our resting orders, but only in market 0 (immediate uses timestamp_ms=0)
+    api_key_index, nonce = client.nonce_manager.next_nonce()
+    tx, tx_hash, err = await client.cancel_all_orders(
+        time_in_force=client.CANCEL_ALL_TIF_IMMEDIATE,
+        timestamp_ms=0,
+        cancel_all_market_index=market_index,
+        nonce=nonce,
+        api_key_index=api_key_index,
+    )
+    print(f"Cancel All (market {market_index}) {tx=} {tx_hash=} {err=}")
+    if err is not None:
+        raise Exception(err)
+
+    # for reference: omit cancel_all_market_index (defaults to all markets)
+    api_key_index, nonce = client.nonce_manager.next_nonce(api_key_index)
+    tx, tx_hash, err = await client.cancel_all_orders(
+        time_in_force=client.CANCEL_ALL_TIF_IMMEDIATE,
+        timestamp_ms=0,
+        nonce=nonce,
+        api_key_index=api_key_index,
+    )
+    print(f"Cancel All (all markets) {tx=} {tx_hash=} {err=}")
+    if err is not None:
+        raise Exception(err)
+
+    await client.close()
+    await api_client.close()
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

examples/self_trade_create_modify_order.py

@@ -0,0 +1,72 @@
+import asyncio
+from utils import default_example_setup
+
+
+# Self-trade prevention (STP) on order creation / modification.
+#
+# self_trade_behavior_mode: what happens when your incoming order would match
+#   one of your own resting orders.
+#     EXPIRE_MAKER (0, default) - cancel your resting (maker) order
+#     EXPIRE_TAKER (1)          - cancel the incoming (taker) order
+#     EXPIRE_BOTH  (2)          - cancel both
+#     REDUCE       (3)          - net the two against each other (no booked self-fill)
+#
+# self_trade_equality_mode: what counts as "yourself" for the check above.
+#     ACCOUNT_INDEX        (0, default) - only the exact same account
+#     MASTER_ACCOUNT_INDEX (1)          - any sub-account under the same master
+#
+# Notes:
+#   * Defaults (EXPIRE_MAKER + ACCOUNT_INDEX) reproduce the previous behavior and
+#     do not change the signed payload.
+#   * REDUCE is not allowed together with MASTER_ACCOUNT_INDEX.
+#   * Self-trade modes cannot be combined with integrator fees on the same tx.
+async def main():
+    client, api_client, _ = default_example_setup()
+    client.check_client()
+
+    market_index = 0
+
+    # create order: cancel the incoming order if it would hit our own resting order
+    api_key_index, nonce = client.nonce_manager.next_nonce()
+    tx, tx_hash, err = await client.create_order(
+        market_index=market_index,
+        client_order_index=123,
+        base_amount=1000,  # 0.1 ETH
+        price=4050_00,  # $4050
+        is_ask=True,
+        order_type=client.ORDER_TYPE_LIMIT,
+        time_in_force=client.ORDER_TIME_IN_FORCE_GOOD_TILL_TIME,
+        reduce_only=False,
+        trigger_price=0,
+        self_trade_behavior_mode=client.SELF_TRADE_BEHAVIOR_EXPIRE_TAKER,
+        self_trade_equality_mode=client.SELF_TRADE_EQUALITY_MASTER_ACCOUNT_INDEX,
+        nonce=nonce,
+        api_key_index=api_key_index,
+    )
+    print(f"Create Order {tx=} {tx_hash=} {err=}")
+    if err is not None:
+        raise Exception(err)
+
+    # modify order: self-trade modes can be re-specified on modify as well
+    api_key_index, nonce = client.nonce_manager.next_nonce(api_key_index)
+    tx, tx_hash, err = await client.modify_order(
+        market_index=market_index,
+        order_index=123,
+        base_amount=1100,  # 0.11 ETH
+        price=4100_00,  # $4100
+        trigger_price=0,
+        self_trade_behavior_mode=client.SELF_TRADE_BEHAVIOR_EXPIRE_BOTH,
+        self_trade_equality_mode=client.SELF_TRADE_EQUALITY_ACCOUNT_INDEX,
+        nonce=nonce,
+        api_key_index=api_key_index,
+    )
+    print(f"Modify Order {tx=} {tx_hash=} {err=}")
+    if err is not None:
+        raise Exception(err)
+
+    await client.close()
+    await api_client.close()
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

examples/self_trade_grouped_orders.py

@@ -0,0 +1,67 @@
+import asyncio
+from lighter.signer_client import CreateOrderTxReq
+from utils import default_example_setup
+
+
+# Self-trade prevention applied to a grouped (OTOCO) order.
+#
+# For grouped orders the self-trade modes are specified once at the group level
+# (a single value for the whole batch), matching the underlying signer.
+async def main():
+    client, api_client, _ = default_example_setup()
+    client.check_client()
+
+    ioc_order = CreateOrderTxReq(
+        MarketIndex=0,
+        ClientOrderIndex=0,
+        BaseAmount=1000,  # 0.1 ETH
+        Price=2500_00,  # $2500
+        IsAsk=1,  # sell
+        Type=client.ORDER_TYPE_LIMIT,
+        TimeInForce=client.ORDER_TIME_IN_FORCE_IMMEDIATE_OR_CANCEL,
+        ReduceOnly=0,
+        TriggerPrice=0,
+        OrderExpiry=0,
+    )
+
+    take_profit_order = CreateOrderTxReq(
+        MarketIndex=0,
+        ClientOrderIndex=0,
+        BaseAmount=0,
+        Price=1550_00,
+        IsAsk=0,
+        Type=client.ORDER_TYPE_TAKE_PROFIT_LIMIT,
+        TimeInForce=client.ORDER_TIME_IN_FORCE_GOOD_TILL_TIME,
+        ReduceOnly=1,
+        TriggerPrice=1500_00,
+        OrderExpiry=-1,
+    )
+
+    stop_loss_order = CreateOrderTxReq(
+        MarketIndex=0,
+        ClientOrderIndex=0,
+        BaseAmount=0,
+        Price=5050_00,
+        IsAsk=0,
+        Type=client.ORDER_TYPE_STOP_LOSS_LIMIT,
+        TimeInForce=client.ORDER_TIME_IN_FORCE_GOOD_TILL_TIME,
+        ReduceOnly=1,
+        TriggerPrice=5000_00,
+        OrderExpiry=-1,
+    )
+
+    transaction = await client.create_grouped_orders(
+        grouping_type=client.GROUPING_TYPE_ONE_TRIGGERS_A_ONE_CANCELS_THE_OTHER,
+        orders=[ioc_order, take_profit_order, stop_loss_order],
+        self_trade_behavior_mode=client.SELF_TRADE_BEHAVIOR_EXPIRE_TAKER,
+        self_trade_equality_mode=client.SELF_TRADE_EQUALITY_ACCOUNT_INDEX,
+    )
+
+    print("Create Grouped Order Tx:", transaction)
+
+    await client.close()
+    await api_client.close()
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

lighter/signer_client.py

@@ -72,6 +72,8 @@ def __get_shared_library():
 
     if is_arm and is_mac:
         return ctypes.CDLL(os.path.join(path_to_signer_folders, "lighter-signer-darwin-arm64.dylib"))
+    elif is_x64 and is_mac:
+        return ctypes.CDLL(os.path.join(path_to_signer_folders, "lighter-signer-darwin-amd64.dylib"))
     elif is_linux and is_x64:
         return ctypes.CDLL(os.path.join(path_to_signer_folders, "lighter-signer-linux-amd64.so"))
     elif is_linux and is_arm:
@@ -81,7 +83,7 @@ def __get_shared_library():
     else:
         raise Exception(
             f"Unsupported platform/architecture: {platform.system()}/{platform.machine()}. "
-            "Currently supported: Linux(x86_64), macOS(arm64), and Windows(x86_64)."
+            "Currently supported: Linux(x86_64/arm64), macOS(arm64/x86_64), and Windows(x86_64)."
         )
 
 
@@ -485,7 +487,6 @@ def sign_create_order(
             integrator_account_index: int = 0,
             integrator_taker_fee: int = 0,
             integrator_maker_fee: int = 0,
-            cancel_all_market_index: int = 255,
             self_trade_behavior_mode: int = 0,
             self_trade_equality_mode: int = 0,
             skip_nonce: int = SKIP_NONCE_OFF,
@@ -506,10 +507,9 @@ def sign_create_order(
             integrator_account_index,
             integrator_taker_fee,
             integrator_maker_fee,
-            skip_nonce,
-            cancel_all_market_index,
             self_trade_behavior_mode,
             self_trade_equality_mode,
+            skip_nonce,
             nonce,
             api_key_index,
             self.account_index,
@@ -544,8 +544,8 @@ def sign_withdraw(self, asset_index: int, route_type: int, amount: int, skip_non
     def sign_create_sub_account(self, skip_nonce: int = SKIP_NONCE_OFF, nonce: int = DEFAULT_NONCE, api_key_index: int = DEFAULT_API_KEY_INDEX) -> Union[Tuple[str, str, str, None], Tuple[None, None, None, str]]:
         return self.__decode_tx_info(self.signer.SignCreateSubAccount(skip_nonce, nonce, api_key_index, self.account_index))
 
-    def sign_cancel_all_orders(self, time_in_force: int, timestamp_ms: int, cancel_all_market_index: int, skip_nonce: int = SKIP_NONCE_OFF, nonce: int = DEFAULT_NONCE, api_key_index: int = DEFAULT_API_KEY_INDEX) -> Union[Tuple[str, str, str, None], Tuple[None, None, None, str]]:
-        return self.__decode_tx_info(self.signer.SignCancelAllOrders(time_in_force, timestamp_ms, skip_nonce, nonce, api_key_index, self.account_index))
+    def sign_cancel_all_orders(self, time_in_force: int, timestamp_ms: int, cancel_all_market_index: int = NIL_MARKET_INDEX, skip_nonce: int = SKIP_NONCE_OFF, nonce: int = DEFAULT_NONCE, api_key_index: int = DEFAULT_API_KEY_INDEX) -> Union[Tuple[str, str, str, None], Tuple[None, None, None, str]]:
+        return self.__decode_tx_info(self.signer.SignCancelAllOrders(time_in_force, timestamp_ms, cancel_all_market_index, skip_nonce, nonce, api_key_index, self.account_index))
 
     def sign_modify_order(
             self,
@@ -564,7 +564,7 @@ def sign_modify_order(
             nonce: int = DEFAULT_NONCE,
             api_key_index: int = DEFAULT_API_KEY_INDEX
     ) -> Union[Tuple[str, str, str, None], Tuple[None, None, None, str]]:
-        return self.__decode_tx_info(self.signer.SignModifyOrder(market_index, order_index, base_amount, price, trigger_price, integrator_account_index, integrator_taker_fee, integrator_maker_fee, self_trade_behavior_mode, self_trade_behavior_mode, skip_nonce, nonce, api_key_index, self.account_index))
+        return self.__decode_tx_info(self.signer.SignModifyOrder(market_index, order_index, base_amount, price, trigger_price, integrator_account_index, integrator_taker_fee, integrator_maker_fee, self_trade_behavior_mode, self_trade_equality_mode, skip_nonce, nonce, api_key_index, self.account_index))
 
     def sign_approve_integrator(
             self,
@@ -1146,8 +1146,8 @@ async def create_sub_account(self, skip_nonce : int = SKIP_NONCE_OFF, nonce: int
         return tx_info, api_response, None
 
     @process_api_key_and_nonce
-    async def cancel_all_orders(self, time_in_force, timestamp_ms, cancel_all_market_index, skip_nonce : int = SKIP_NONCE_OFF, nonce: int = DEFAULT_NONCE, api_key_index: int = DEFAULT_API_KEY_INDEX)-> Union[Tuple[Withdraw, RespSendTx, None], Tuple[None, None, str]]:
-        tx_type, tx_info, tx_hash, error = self.sign_cancel_all_orders(time_in_force, timestamp_ms, cancel_all_market_index ,skip_nonce, nonce, api_key_index)
+    async def cancel_all_orders(self, time_in_force, timestamp_ms, cancel_all_market_index: int = NIL_MARKET_INDEX, skip_nonce : int = SKIP_NONCE_OFF, nonce: int = DEFAULT_NONCE, api_key_index: int = DEFAULT_API_KEY_INDEX)-> Union[Tuple[Withdraw, RespSendTx, None], Tuple[None, None, str]]:
+        tx_type, tx_info, tx_hash, error = self.sign_cancel_all_orders(time_in_force, timestamp_ms, cancel_all_market_index, skip_nonce, nonce, api_key_index)
         if error is not None:
             return None, None, error