diff --git a/.gitignore b/.gitignore index 9d6ec61..006376d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,5 +18,4 @@ agent-mAId/dist/main.exe agent-mAId/output.wav .node-persist/storage/* logs/* -crypto/sol/.env crypto/sol/.env.secret diff --git a/crypto/sol/.env b/crypto/sol/.env index f0b63f2..f22f5ff 100644 --- a/crypto/sol/.env +++ b/crypto/sol/.env @@ -2,12 +2,16 @@ SOLANA_WS_URL="wss://api.mainnet-beta.solana.com" SOLANA_WS_URL2="wss://mainnet.rpcpool.com" SOLANA_HTTP_URL="https://api.mainnet-beta.solana.com" -DEVELOPER_CHAT_ID="777826553" -# Niki's -# FOLLOWED_WALLET="9U7D916zuQ8qcL9kQZqkcroWhHGho5vD8VNekvztrutN" -# My test Brave sync wallet -FOLLOWED_WALLET="7QXGLRjvyFAmxdRaP9Wk18KwWTMfspF4Na2sr3o3PzxV" -YOUR_WALLET="65nzyZXTLC81MthTo52a2gRJjqryTizWVqpK2fDKLye5" +DEVELOPER_CHAT_ID="777826553" TELEGRAM_BOT_TOKEN="6805059978:AAHNJKuOeazMSJHc3-BXRCsFfEVyFHeFnjw" -DISPLAY_CURRENCY=USD \ No newline at end of file + +DISPLAY_CURRENCY=USD + +# Niki's to Sync: [PROD] +FOLLOWED_WALLET="9U7D916zuQ8qcL9kQZqkcroWhHGho5vD8VNekvztrutN" +YOUR_WALLET="7QXGLRjvyFAmxdRaP9Wk18KwWTMfspF4Na2sr3o3PzxV" + +# Sync to main [DEV] +#FOLLOWED_WALLET="7QXGLRjvyFAmxdRaP9Wk18KwWTMfspF4Na2sr3o3PzxV" +#YOUR_WALLET="65nzyZXTLC81MthTo52a2gRJjqryTizWVqpK2fDKLye5" \ No newline at end of file diff --git a/crypto/sol/app.py b/crypto/sol/app.py index cde34d0..9eda412 100644 --- a/crypto/sol/app.py +++ b/crypto/sol/app.py @@ -38,6 +38,9 @@ import re from typing import List, Dict, Any, Tuple load_dotenv() +# Load secret environment variables +load_dotenv('.env.secret') + app = Flask(__name__) ENV_FILE = '.env' @@ -773,7 +776,12 @@ async def follow_move(move): if your_balance >= amount_to_swap: try: - private_key = Keypair.from_bytes(base58.b58decode(os.getenv("PK"))) + pk_b58 = os.getenv("PK") + if not pk_b58: + logging.error("Private key not found. Can not sign transactions without private key.") + return + + private_key = Keypair.from_bytes(base58.b58decode(pk_b58)) async_client = AsyncClient(SOLANA_WS_URL) jupiter = Jupiter(async_client, private_key) diff --git a/crypto/sol/requirements.in b/crypto/sol/requirements.in new file mode 100644 index 0000000..284d70d --- /dev/null +++ b/crypto/sol/requirements.in @@ -0,0 +1,12 @@ +aiohttp==3.10.9 +aiohttp==3.10.5 +base58==2.1.1 +dexscreener==1.1 +Flask==3.0.3 +jupiter_python_sdk==0.0.2.0 +python-dotenv==1.0.1 +python-telegram-bot==21.6 +Requests==2.32.3 +solana==0.34.3 +solders==0.21.0 +websockets==10.4