Support SPOT matching engine

.env.example

@@ -1,24 +1,29 @@
-# Required for consuming data
-REYA_WS_URL=
+### Cronos (testnet)
+CHAIN_ID=89346162
+REYA_WS_URL="wss://websocket-testnet.reya.xyz/"
+REYA_API_URL="https://api-cronos.reya.xyz/v2"
 
-# Required for running actions on Reya DEX
-PRIVATE_KEY=
-ACCOUNT_ID=
-CHAIN_ID= # 1729 mainnet and 89346162 cronos
+### Reya Network (mainnet)
+#CHAIN_ID=1729
+#REYA_WS_URL="wss://ws.reya.xyz/"
+#REYA_API_URL="https://api.reya.xyz/v2"
 
-# The wallet address that owns ACCOUNT_ID
-OWNER_WALLET_ADDRESS=
+### Staging (uses mainnet chain ID 1729)
+#CHAIN_ID=1729
+#REYA_WS_URL="wss://websocket-staging.reya.xyz"
+#REYA_API_URL="https://api-staging.reya.xyz/v2"
 
-### Reya Cronos (testnet) example
-ACCOUNT_ID=replaceme
-PRIVATE_KEY=replacemereplacemereplacemereplacemereplacemereplacemereplaceme
-CHAIN_ID=89346162
-REYA_WS_URL="wss://websocket-testnet.reya.xyz/"
-OWMNER_WALLET_ADDRESS=replaceme
+# PERP_ACCOUNT_ID_1
+PERP_ACCOUNT_ID_1=
+PERP_PRIVATE_KEY_1=
+PERP_WALLET_ADDRESS_1=
+
+# SPOT_ACCOUNT_ID_1
+SPOT_ACCOUNT_ID_1=
+SPOT_PRIVATE_KEY_1=
+SPOT_WALLET_ADDRESS_1=
 
-### Reya Network (mainnet) example
-ACCOUNT_ID=replaceme
-PRIVATE_KEY=replacemereplacemereplacemereplacemereplacemereplacemereplaceme
-CHAIN_ID=1729
-REYA_WS_URL="wss://ws.reya.xyz/"
-OWNER_WALLET_ADDRESS=replaceme
+# SPOT_ACCOUNT_ID_2
+SPOT_ACCOUNT_ID_2=
+SPOT_PRIVATE_KEY_2=
+SPOT_WALLET_ADDRESS_2=

.github/workflows/create-release.yml

@@ -8,6 +8,10 @@ on:
       - pyproject.toml
       - sdk/_version.py
 
+env:
+  CI_COMMIT_AUTHOR: ${{ github.event.repository.name }} Reya Bot
+  CI_COMMIT_EMAIL: devcold@voltz.xyz
+
 jobs:
   create-release:
     runs-on: ubuntu-latest
@@ -76,8 +80,8 @@ jobs:
           COMMIT_SHA="${{ github.sha }}"
 
           # Create annotated tag with v prefix
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
+          git config --local user.email "${{ env.CI_COMMIT_EMAIL }}"
+          git config --local user.name "${{ env.CI_COMMIT_AUTHOR }}"
           git tag -a "v$VERSION" -m "Release version v$VERSION
 
           Auto-tagged after merge to main branch.

.github/workflows/version-consistency.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [main, develop]
 
+env:
+  CI_COMMIT_AUTHOR: ${{ github.event.repository.name }} Reya Bot
+  CI_COMMIT_EMAIL: devcold@voltz.xyz
+
 jobs:
   version-consistency:
     runs-on: ubuntu-latest
@@ -107,11 +111,29 @@ jobs:
           BASE_SHA=$(git merge-base HEAD origin/${{ github.base_ref }})
 
           if git diff $BASE_SHA HEAD -- pyproject.toml | grep -q '^\+.*version = '; then
-            echo "VERSION_MANUALLY_MODIFIED=true" >> $GITHUB_ENV
-            echo "Version was manually modified in this PR"
+            echo "Version change detected in pyproject.toml"
+
+            # Check if the version change was made by the CI bot (auto-commit)
+            # Get the commit that last modified the version line in pyproject.toml
+            LAST_VERSION_COMMIT=$(git log --oneline -1 --format="%H" -- pyproject.toml)
+            LAST_VERSION_AUTHOR=$(git log --oneline -1 --format="%an" -- pyproject.toml)
+            LAST_VERSION_MESSAGE=$(git log --oneline -1 --format="%s" -- pyproject.toml)
+
+            echo "Last version commit: $LAST_VERSION_COMMIT"
+            echo "Last version author: $LAST_VERSION_AUTHOR"
+            echo "Last version message: $LAST_VERSION_MESSAGE"
+
+            # Check if it was an auto-commit by the CI bot
+            if [[ "$LAST_VERSION_MESSAGE" == "chore: bump SDK version to"* ]] && [[ "$LAST_VERSION_AUTHOR" == *"Reya Bot"* ]]; then
+              echo "VERSION_MANUALLY_MODIFIED=false" >> $GITHUB_ENV
+              echo "Version was modified by CI bot (auto-commit), not manually"
+            else
+              echo "VERSION_MANUALLY_MODIFIED=true" >> $GITHUB_ENV
+              echo "Version was manually modified in this PR"
+            fi
           else
             echo "VERSION_MANUALLY_MODIFIED=false" >> $GITHUB_ENV
-            echo "Version was not manually modified in this PR"
+            echo "Version was not modified in this PR"
           fi
 
       - name: Extract version components
@@ -197,8 +219,8 @@ jobs:
       - name: Commit version bump
         if: github.event_name == 'pull_request' && env.NEW_VERSION != ''
         run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
+          git config --local user.email "${{ env.CI_COMMIT_EMAIL }}"
+          git config --local user.name "${{ env.CI_COMMIT_AUTHOR }}"
           git add pyproject.toml
           git commit -m "chore: bump SDK version to $NEW_VERSION"
           git push origin HEAD:${{ github.head_ref }}

.openapi-generator/FILES

@@ -13,18 +13,24 @@ sdk/open_api/exceptions.py
 sdk/open_api/models/__init__.py
 sdk/open_api/models/account.py
 sdk/open_api/models/account_balance.py
+sdk/open_api/models/account_type.py
 sdk/open_api/models/asset_definition.py
 sdk/open_api/models/cancel_order_request.py
 sdk/open_api/models/cancel_order_response.py
 sdk/open_api/models/candle_history_data.py
 sdk/open_api/models/create_order_request.py
 sdk/open_api/models/create_order_response.py
+sdk/open_api/models/depth.py
+sdk/open_api/models/depth_type.py
 sdk/open_api/models/execution_type.py
 sdk/open_api/models/fee_tier_parameters.py
 sdk/open_api/models/global_fee_parameters.py
+sdk/open_api/models/level.py
 sdk/open_api/models/liquidity_parameters.py
 sdk/open_api/models/market_definition.py
 sdk/open_api/models/market_summary.py
+sdk/open_api/models/mass_cancel_request.py
+sdk/open_api/models/mass_cancel_response.py
 sdk/open_api/models/order.py
 sdk/open_api/models/order_status.py
 sdk/open_api/models/order_type.py
@@ -40,6 +46,7 @@ sdk/open_api/models/server_error_code.py
 sdk/open_api/models/side.py
 sdk/open_api/models/spot_execution.py
 sdk/open_api/models/spot_execution_list.py
+sdk/open_api/models/spot_market_definition.py
 sdk/open_api/models/tier_type.py
 sdk/open_api/models/time_in_force.py
 sdk/open_api/models/wallet_configuration.py

examples/rest_api/perps/__init__.py

@@ -0,0 +1,6 @@
+"""
+REST API examples for perpetual (perps) trading.
+
+These examples demonstrate how to interact with the Reya Trading API
+for perpetual futures markets (e.g., ETHRUSDPERP, BTCRUSDPERP).
+"""

examples/rest_api/account_info.py → examples/rest_api/perps/account_info.py

@@ -2,9 +2,13 @@
 """
 Example script showing how to get accounts for a wallet address using the Reya Trading SDK.
 
-Before running this example, ensure you have a .env file with the following variables:
-- PRIVATE_KEY: Your Ethereum private key
+Requirements:
 - CHAIN_ID: The chain ID (1729 for mainnet, 89346162 for testnet)
+- PERP_PRIVATE_KEY_1: Your Ethereum private key
+- PERP_WALLET_ADDRESS_1: Your wallet address
+
+Usage:
+    python -m examples.rest_api.perps.account_info
 """
 import asyncio
 

examples/rest_api/assets_example.py → examples/rest_api/perps/assets_example.py

@@ -2,8 +2,12 @@
 """
 Example script showing how to get assets information using the Reya Trading SDK.
 
-Before running this example, ensure you have a .env file with the following variables:
-- API_URL: (optional) The API URL to use
+Requirements:
+- CHAIN_ID: The chain ID (1729 for mainnet, 89346162 for testnet)
+- PERP_WALLET_ADDRESS_1: Your wallet address
+
+Usage:
+    python -m examples.rest_api.perps.assets_example
 """
 import asyncio
 

examples/rest_api/markets_example.py → examples/rest_api/perps/markets_example.py

@@ -2,8 +2,12 @@
 """
 Example script showing how to get markets information using the Reya Trading SDK.
 
-Before running this example, ensure you have a .env file with the following variables:
-- API_URL: (optional) The API URL to use
+Requirements:
+- CHAIN_ID: The chain ID (1729 for mainnet, 89346162 for testnet)
+- PERP_WALLET_ADDRESS_1: Your wallet address
+
+Usage:
+    python -m examples.rest_api.perps.markets_example
 """
 
 import asyncio

examples/rest_api/order_entry.py → examples/rest_api/perps/order_entry.py

@@ -9,11 +9,14 @@
 - Take Profit (TP) Orders
 - Order Cancellation
 
-Before running this example, ensure you have a .env file with the following variables:
-- PRIVATE_KEY: Your Ethereum private key
-- ACCOUNT_ID: Your Reya account ID
+Requirements:
 - CHAIN_ID: The chain ID (1729 for mainnet, 89346162 for testnet)
-- API_URL: The API URL (optional, defaults based on chain ID)
+- PERP_ACCOUNT_ID_1: Your Reya account ID
+- PERP_PRIVATE_KEY_1: Your Ethereum private key
+- PERP_WALLET_ADDRESS_1: Your wallet address
+
+Usage:
+    python -m examples.rest_api.perps.order_entry
 """
 import asyncio
 import logging
@@ -239,7 +242,7 @@ async def main():
     load_dotenv()
 
     # Verify required environment variables
-    required_vars = ["PRIVATE_KEY", "ACCOUNT_ID"]
+    required_vars = ["PERP_PRIVATE_KEY_1", "PERP_ACCOUNT_ID_1", "PERP_WALLET_ADDRESS_1"]
     missing_vars = [var for var in required_vars if not os.getenv(var)]
 
     if missing_vars:

examples/rest_api/prices_example.py → examples/rest_api/perps/prices_example.py

@@ -1,8 +1,13 @@
 #!/usr/bin/env python3
-"""Example script showing how to get price information using the Reya Trading SDK.
+"""
+Example script showing how to get price information using the Reya Trading SDK.
+
+Requirements:
+- CHAIN_ID: The chain ID (1729 for mainnet, 89346162 for testnet)
+- PERP_WALLET_ADDRESS_1: Your wallet address
 
-Before running this example, ensure you have a .env file with the following variables:
-- API_URL: (optional) The API URL to use
+Usage:
+    python -m examples.rest_api.perps.prices_example
 """
 import asyncio
 

examples/rest_api/wallet_example.py → examples/rest_api/perps/wallet_example.py

@@ -13,10 +13,14 @@
 - Getting auto exchange settings
 - Getting wallet stats
 
-Before running this example, ensure you have a .env file with the following variables:
-- PRIVATE_KEY: Your Ethereum private key
-- ACCOUNT_ID: Your Reya account ID
+Requirements:
 - CHAIN_ID: The chain ID (1729 for mainnet, 89346162 for testnet)
+- PERP_ACCOUNT_ID_1: Your Reya account ID
+- PERP_PRIVATE_KEY_1: Your Ethereum private key
+- PERP_WALLET_ADDRESS_1: Your wallet address
+
+Usage:
+    python -m examples.rest_api.perps.wallet_example
 """
 import asyncio
 

examples/rest_api/spot/__init__.py

@@ -0,0 +1,6 @@
+"""
+REST API examples for spot trading.
+
+These examples demonstrate how to interact with the Reya Trading API
+for spot markets (e.g., WETHRUSD).
+"""