Merge pull request #19 from mkdir700/develop

Develop

Author: mkdir700

src/tg_bot/conversations/copytrade/create.py

@@ -6,17 +6,20 @@
 from aiogram.types import CallbackQuery, ForceReply, Message
 from loguru import logger
 
-from common.config import settings
 from tg_bot.conversations.copytrade.render import render
 from tg_bot.conversations.states import CopyTradeStates
 from tg_bot.keyboards.copytrade import create_copytrade_keyboard
 from tg_bot.models.copytrade import CopyTrade
 from tg_bot.services.copytrade import CopyTradeService
+from tg_bot.services.setting import SettingService
+from tg_bot.services.user import UserService
 from tg_bot.templates import CREATE_COPYTRADE_MESSAGE
 from tg_bot.utils import validate_solana_address
 
 router = Router()
 copy_trade_service = CopyTradeService()
+setting_service = SettingService()
+user_service = UserService()
 
 
 @router.callback_query(F.data == "create_copytrade")
@@ -31,10 +34,11 @@ async def start_create_copytrade(callback: CallbackQuery, state: FSMContext):
         return
 
     chat_id = callback.message.chat.id
+    pubkey = await user_service.get_pubkey(chat_id=chat_id)
 
     # Initialize copytrade settings
     copytrade_settings = CopyTrade(
-        owner=settings.wallet.keypair.pubkey().__str__(),
+        owner=pubkey,
         chat_id=chat_id,
     )
 

src/tg_bot/main.py

@@ -4,7 +4,7 @@
 from aiogram import Bot, Dispatcher, F
 from aiogram.client.default import DefaultBotProperties
 from aiogram.enums import ParseMode
-from aiogram.filters import Command
+from aiogram.filters import Command, StateFilter
 from aiogram.fsm.storage.memory import MemoryStorage
 from loguru import logger
 
@@ -22,6 +22,7 @@
     wallet,
 )
 from tg_bot.conversations.router import router
+from tg_bot.conversations.states import CopyTradeStates, MonitorStates, WalletStates
 from tg_bot.middlewares import AuthorizationMiddleware, DebugMiddleware
 from tg_bot.notify.notify import Notify
 
@@ -52,7 +53,17 @@ async def start_bot():
     dp.message.register(setting.setting_command, Command("set"))
     dp.message.register(wallet.wallet_command, Command("wallet"))
     dp.message.register(asset.asset_command, Command("asset"))
-    dp.message.register(swap.info_command, F.text.regexp(r"^[a-zA-Z0-9]{44}$"))
+    excluded_states = [
+        CopyTradeStates.CREATE_WAITING_FOR_ADDRESS,
+        CopyTradeStates.EDIT_WAITING_FOR_ADDRESS,
+        MonitorStates.CREATE_WAITING_FOR_ADDRESS,
+        WalletStates.WAITING_FOR_NEW_PRIVATE_KEY,
+    ]
+    dp.message.register(
+        swap.info_command,
+        F.text.regexp(r"^[a-zA-Z0-9]{44}$"),
+        ~StateFilter(*excluded_states),
+    )
     dp.message.register(
         swap.swap_command, Command(re.compile(r"^buy.*"), re.compile(r"^sell.*"))
     )