fix(rebase): align skipNonce signatures and regression tests

Author: Bvvvp009

lighter/signer_client.py

@@ -1159,6 +1159,7 @@ async def create_tp_market_order_limited_slippage(
             integrator_taker_fee: int = 0,
             integrator_maker_fee: int = 0,
             ideal_price=None,
+            skip_nonce: int = SKIP_NONCE_OFF,
             nonce: int = DEFAULT_NONCE,
             api_key_index: int = DEFAULT_API_KEY_INDEX
         ) -> Union[Tuple[CreateOrder, RespSendTx, None], Tuple[None, None, str]]:
@@ -1296,6 +1297,7 @@ async def create_sl_market_order_limited_slippage(
             integrator_taker_fee: int = 0,
             integrator_maker_fee: int = 0,
             ideal_price=None,
+            skip_nonce: int = SKIP_NONCE_OFF,
             nonce: int = DEFAULT_NONCE,
             api_key_index: int = DEFAULT_API_KEY_INDEX
         ) -> Union[Tuple[CreateOrder, RespSendTx, None], Tuple[None, None, str]]:

test/test_issue_regressions.py

@@ -230,7 +230,7 @@ def SignUpdateLeverage(self, *args):
     finally:
         SignerClient._SignerClient__decode_tx_info = original_decode
 
-    assert fake_signer.captured_args == (3, 500, SignerClient.ISOLATED_MARGIN_MODE, 17, 9, 42)
+    assert fake_signer.captured_args == (3, 500, SignerClient.ISOLATED_MARGIN_MODE, SignerClient.SKIP_NONCE_OFF, 17, 9, 42)
 
 
 def test_update_leverage_keeps_public_margin_mode_and_fraction_mapping():
@@ -240,8 +240,8 @@ def test_update_leverage_keeps_public_margin_mode_and_fraction_mapping():
 
     captured = {}
 
-    def fake_sign_update_leverage(market_index, fraction, margin_mode, nonce, api_key_index):
-        captured["args"] = (market_index, fraction, margin_mode, nonce, api_key_index)
+    def fake_sign_update_leverage(market_index, fraction, margin_mode, skip_nonce, nonce, api_key_index):
+        captured["args"] = (market_index, fraction, margin_mode, skip_nonce, nonce, api_key_index)
         return 1, '{"MarginMode":1}', '0xabc', None
 
     client.sign_update_leverage = fake_sign_update_leverage
@@ -257,7 +257,7 @@ def fake_sign_update_leverage(market_index, fraction, margin_mode, nonce, api_ke
         )
     )
 
-    assert captured["args"] == (3, 500, SignerClient.ISOLATED_MARGIN_MODE, 17, 9)
+    assert captured["args"] == (3, 500, SignerClient.ISOLATED_MARGIN_MODE, SignerClient.SKIP_NONCE_OFF, 17, 9)
 
 
 def test_package_version_matches_distribution_metadata_when_installed():
@@ -445,6 +445,7 @@ def SignWithdraw(self, *args):
         SignerClient.ASSET_ID_USDC,
         SignerClient.ROUTE_SPOT,
         123456,
+        SignerClient.SKIP_NONCE_OFF,
         9,
         7,
         42,
@@ -617,9 +618,10 @@ def test_sign_create_grouped_orders_forwards_grouping_type_and_order_count():
     captured = {}
 
     class FakeSigner:
-        def SignCreateGroupedOrders(self, grouping_type, orders_arr, count, nonce, api_key_index, account_index):
+        def SignCreateGroupedOrders(self, grouping_type, orders_arr, count, integrator_account_index, integrator_taker_fee, integrator_maker_fee, skip_nonce, nonce, api_key_index, account_index):
             captured["grouping_type"] = grouping_type
             captured["count"] = count
+            captured["skip_nonce"] = skip_nonce
             captured["nonce"] = nonce
             captured["api_key_index"] = api_key_index
             # return a SignedTxResponse-like object with null fields so decode works
@@ -656,6 +658,7 @@ def SignCreateGroupedOrders(self, grouping_type, orders_arr, count, nonce, api_k
 
     assert captured["grouping_type"] == SignerClient.GROUPING_TYPE_ONE_CANCELS_THE_OTHER
     assert captured["count"] == 2
+    assert captured["skip_nonce"] == SignerClient.SKIP_NONCE_OFF
     assert captured["nonce"] == 42
     assert captured["api_key_index"] == 7