diff --git a/examples/binary-options/operator_create_market.py b/examples/binary-options/operator_create_market.py index c53c54a..84357b3 100644 --- a/examples/binary-options/operator_create_market.py +++ b/examples/binary-options/operator_create_market.py @@ -48,7 +48,7 @@ async def main(): executed = await tx_api.tx(by="hash", value=tx_hash.tx_hash) except lighter.ApiException: continue - print(f"public market index: {json.loads(executed.event_info)['m']}") + print(f"market index: {json.loads(executed.event_info)['m']}") break await client.close() diff --git a/examples/binary-options/operator_settle_market.py b/examples/binary-options/operator_settle_market.py index ffd67cf..91c4583 100644 --- a/examples/binary-options/operator_settle_market.py +++ b/examples/binary-options/operator_settle_market.py @@ -2,7 +2,7 @@ from examples.utils import default_example_setup MARKET_SLOT = 1900 -PUBLIC_MARKET_INDEX = 0 # from operator_create_market.py +MARKET_INDEX = 0 # from operator_create_market.py SETTLEMENT_CAP = 100 @@ -13,7 +13,7 @@ async def main(): # To void the market instead: settlement_price=0, is_refund=1 (everyone is paid default_price). tx, tx_hash, err = await client.binary_options_operator_settle_market( market_slot=MARKET_SLOT, - public_market_index=PUBLIC_MARKET_INDEX, + market_index=MARKET_INDEX, settlement_price=SETTLEMENT_CAP, is_refund=0, ) diff --git a/lighter/signer_client.py b/lighter/signer_client.py index 02c6a3b..eeb1c8f 100644 --- a/lighter/signer_client.py +++ b/lighter/signer_client.py @@ -67,7 +67,7 @@ class BinaryOptionsOperatorCreateMarketTxReq(ctypes.Structure): class BinaryOptionsOperatorUpdateMarketTxReq(ctypes.Structure): _fields_ = [ ("MarketSlot", ctypes.c_int16), - ("PublicMarketIndex", ctypes.c_longlong), + ("MarketIndex", ctypes.c_longlong), ("StartTimestampMs", ctypes.c_longlong), ("EndTimestampMs", ctypes.c_longlong), ("TakerFee", ctypes.c_uint32), @@ -83,7 +83,7 @@ class BinaryOptionsOperatorUpdateMarketTxReq(ctypes.Structure): class BinaryOptionsOperatorSettleMarketTxReq(ctypes.Structure): _fields_ = [ ("MarketSlot", ctypes.c_int16), - ("PublicMarketIndex", ctypes.c_longlong), + ("MarketIndex", ctypes.c_longlong), ("SettlementPrice", ctypes.c_uint32), ("IsRefund", ctypes.c_uint8), ] @@ -746,10 +746,10 @@ def sign_binary_options_operator_create_market(self, market_slot: int, start_tim ) return self.__decode_tx_info(self.signer.SignBinaryOptionsOperatorCreateMarket(ctypes.byref(req), skip_nonce, nonce, api_key_index, self.account_index)) - def sign_binary_options_operator_update_market(self, market_slot: int, public_market_index: int, start_timestamp_ms: int, end_timestamp_ms: int, taker_fee: int, maker_fee: int, min_base_amount: int, min_quote_amount: int, order_quote_limit: int, open_interest_limit: int, is_frozen: 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]]: + def sign_binary_options_operator_update_market(self, market_slot: int, market_index: int, start_timestamp_ms: int, end_timestamp_ms: int, taker_fee: int, maker_fee: int, min_base_amount: int, min_quote_amount: int, order_quote_limit: int, open_interest_limit: int, is_frozen: 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]]: req = BinaryOptionsOperatorUpdateMarketTxReq( MarketSlot=market_slot, - PublicMarketIndex=public_market_index, + MarketIndex=market_index, StartTimestampMs=start_timestamp_ms, EndTimestampMs=end_timestamp_ms, TakerFee=taker_fee, @@ -762,10 +762,10 @@ def sign_binary_options_operator_update_market(self, market_slot: int, public_ma ) return self.__decode_tx_info(self.signer.SignBinaryOptionsOperatorUpdateMarket(ctypes.byref(req), skip_nonce, nonce, api_key_index, self.account_index)) - def sign_binary_options_operator_settle_market(self, market_slot: int, public_market_index: int, settlement_price: int, is_refund: 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]]: + def sign_binary_options_operator_settle_market(self, market_slot: int, market_index: int, settlement_price: int, is_refund: 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]]: req = BinaryOptionsOperatorSettleMarketTxReq( MarketSlot=market_slot, - PublicMarketIndex=public_market_index, + MarketIndex=market_index, SettlementPrice=settlement_price, IsRefund=is_refund, ) @@ -1510,9 +1510,9 @@ async def binary_options_operator_create_market(self, market_slot: int, start_ti return tx_info, api_response, None @process_api_key_and_nonce - async def binary_options_operator_update_market(self, market_slot: int, public_market_index: int, start_timestamp_ms: int, end_timestamp_ms: int, taker_fee: int, maker_fee: int, min_base_amount: int, min_quote_amount: int, order_quote_limit: int, open_interest_limit: int, is_frozen: int, skip_nonce: int = SKIP_NONCE_OFF, nonce: int = DEFAULT_NONCE, api_key_index: int = DEFAULT_API_KEY_INDEX): + async def binary_options_operator_update_market(self, market_slot: int, market_index: int, start_timestamp_ms: int, end_timestamp_ms: int, taker_fee: int, maker_fee: int, min_base_amount: int, min_quote_amount: int, order_quote_limit: int, open_interest_limit: int, is_frozen: int, skip_nonce: int = SKIP_NONCE_OFF, nonce: int = DEFAULT_NONCE, api_key_index: int = DEFAULT_API_KEY_INDEX): tx_type, tx_info, tx_hash, error = self.sign_binary_options_operator_update_market( - market_slot, public_market_index, start_timestamp_ms, end_timestamp_ms, taker_fee, maker_fee, min_base_amount, min_quote_amount, order_quote_limit, open_interest_limit, is_frozen, skip_nonce, nonce, api_key_index + market_slot, market_index, start_timestamp_ms, end_timestamp_ms, taker_fee, maker_fee, min_base_amount, min_quote_amount, order_quote_limit, open_interest_limit, is_frozen, skip_nonce, nonce, api_key_index ) if error is not None: return None, None, error @@ -1520,9 +1520,9 @@ async def binary_options_operator_update_market(self, market_slot: int, public_m return tx_info, api_response, None @process_api_key_and_nonce - async def binary_options_operator_settle_market(self, market_slot: int, public_market_index: int, settlement_price: int, is_refund: int, skip_nonce: int = SKIP_NONCE_OFF, nonce: int = DEFAULT_NONCE, api_key_index: int = DEFAULT_API_KEY_INDEX): + async def binary_options_operator_settle_market(self, market_slot: int, market_index: int, settlement_price: int, is_refund: int, skip_nonce: int = SKIP_NONCE_OFF, nonce: int = DEFAULT_NONCE, api_key_index: int = DEFAULT_API_KEY_INDEX): tx_type, tx_info, tx_hash, error = self.sign_binary_options_operator_settle_market( - market_slot, public_market_index, settlement_price, is_refund, skip_nonce, nonce, api_key_index + market_slot, market_index, settlement_price, is_refund, skip_nonce, nonce, api_key_index ) if error is not None: return None, None, error diff --git a/lighter/signers/lighter-signer-darwin-amd64.dylib b/lighter/signers/lighter-signer-darwin-amd64.dylib index f01d922..fe0a324 100644 Binary files a/lighter/signers/lighter-signer-darwin-amd64.dylib and b/lighter/signers/lighter-signer-darwin-amd64.dylib differ diff --git a/lighter/signers/lighter-signer-darwin-amd64.h b/lighter/signers/lighter-signer-darwin-amd64.h index 54d4ac2..ba118c6 100644 --- a/lighter/signers/lighter-signer-darwin-amd64.h +++ b/lighter/signers/lighter-signer-darwin-amd64.h @@ -76,7 +76,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; int64_t StartTimestampMs; int64_t EndTimestampMs; uint32_t TakerFee; @@ -90,7 +90,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; uint32_t SettlementPrice; uint8_t IsRefund; } BinaryOptionsOperatorSettleMarketTxReq; diff --git a/lighter/signers/lighter-signer-darwin-arm64.dylib b/lighter/signers/lighter-signer-darwin-arm64.dylib index 63f18e3..fd7ace2 100644 Binary files a/lighter/signers/lighter-signer-darwin-arm64.dylib and b/lighter/signers/lighter-signer-darwin-arm64.dylib differ diff --git a/lighter/signers/lighter-signer-darwin-arm64.h b/lighter/signers/lighter-signer-darwin-arm64.h index d03f38d..7563c47 100644 --- a/lighter/signers/lighter-signer-darwin-arm64.h +++ b/lighter/signers/lighter-signer-darwin-arm64.h @@ -78,7 +78,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; int64_t StartTimestampMs; int64_t EndTimestampMs; uint32_t TakerFee; @@ -92,7 +92,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; uint32_t SettlementPrice; uint8_t IsRefund; } BinaryOptionsOperatorSettleMarketTxReq; diff --git a/lighter/signers/lighter-signer-linux-amd64.h b/lighter/signers/lighter-signer-linux-amd64.h index 5830d8e..305e94b 100644 --- a/lighter/signers/lighter-signer-linux-amd64.h +++ b/lighter/signers/lighter-signer-linux-amd64.h @@ -76,7 +76,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; int64_t StartTimestampMs; int64_t EndTimestampMs; uint32_t TakerFee; @@ -90,7 +90,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; uint32_t SettlementPrice; uint8_t IsRefund; } BinaryOptionsOperatorSettleMarketTxReq; diff --git a/lighter/signers/lighter-signer-linux-amd64.so b/lighter/signers/lighter-signer-linux-amd64.so index 61b41fa..f10d24d 100644 Binary files a/lighter/signers/lighter-signer-linux-amd64.so and b/lighter/signers/lighter-signer-linux-amd64.so differ diff --git a/lighter/signers/lighter-signer-linux-arm64.h b/lighter/signers/lighter-signer-linux-arm64.h index 5830d8e..305e94b 100644 --- a/lighter/signers/lighter-signer-linux-arm64.h +++ b/lighter/signers/lighter-signer-linux-arm64.h @@ -76,7 +76,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; int64_t StartTimestampMs; int64_t EndTimestampMs; uint32_t TakerFee; @@ -90,7 +90,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; uint32_t SettlementPrice; uint8_t IsRefund; } BinaryOptionsOperatorSettleMarketTxReq; diff --git a/lighter/signers/lighter-signer-linux-arm64.so b/lighter/signers/lighter-signer-linux-arm64.so index 19ab461..acf644f 100644 Binary files a/lighter/signers/lighter-signer-linux-arm64.so and b/lighter/signers/lighter-signer-linux-arm64.so differ diff --git a/lighter/signers/lighter-signer-windows-amd64.dll b/lighter/signers/lighter-signer-windows-amd64.dll index 86a83e1..c413c33 100644 Binary files a/lighter/signers/lighter-signer-windows-amd64.dll and b/lighter/signers/lighter-signer-windows-amd64.dll differ diff --git a/lighter/signers/lighter-signer-windows-amd64.h b/lighter/signers/lighter-signer-windows-amd64.h index 6921ded..f52a144 100644 --- a/lighter/signers/lighter-signer-windows-amd64.h +++ b/lighter/signers/lighter-signer-windows-amd64.h @@ -76,7 +76,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; int64_t StartTimestampMs; int64_t EndTimestampMs; uint32_t TakerFee; @@ -90,7 +90,7 @@ typedef struct { typedef struct { int16_t MarketSlot; - int64_t PublicMarketIndex; + int64_t MarketIndex; uint32_t SettlementPrice; uint8_t IsRefund; } BinaryOptionsOperatorSettleMarketTxReq;