webhook in webui

crypto/sol/modules/storage.py

@@ -24,6 +24,7 @@ async def init_db():
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
                 user_id INTEGER,
                 address TEXT NOT NULL,
+                secret TEXT NOT NULL,
                 name TEXT,
                 FOREIGN KEY (user_id) REFERENCES users(id)
             );
@@ -39,7 +40,6 @@ async def init_db():
                 buy_currency TEXT,
                 buy_amount REAL,
                 buy_value REAL,
-                closed BOOLEAN DEFAULT 0,
                 details TEXT,
                 solana_signature TEXT UNIQUE,
                 FOREIGN KEY (wallet_id) REFERENCES wallets(id)
@@ -51,6 +51,7 @@ async def init_db():
                 currency TEXT,
                 amount REAL,
                 last_updated TEXT,
+                is_base BOOLEAN DEFAULT 0,
                 FOREIGN KEY (wallet_id) REFERENCES wallets(id)
             );
 
@@ -257,72 +258,3 @@ def store_api_key(user_id, api_key):
     # In a real application, you would store this in a database
     # For this example, we'll just print it
     print(f"Storing API key {api_key} for user {user_id}")
-
-
-
-
-
-# async def get_new_transactions(wallet_address, rpc_url):
-#     async with AsyncClient(rpc_url) as client:
-#         last_tx = await get_last_stored_transaction(wallet_address)
-        
-#         if last_tx:
-#             last_signature, last_timestamp = last_tx
-#         else:
-#             # If no transactions are stored, we'll fetch all transactions
-#             last_signature = None
-#             last_timestamp = None
-
-#         new_transactions = []
-        
-#         # Get the transaction history for the wallet
-#         tx_history = await client.get_signatures_for_address(wallet_address, before=last_signature)
-
-#         for tx in tx_history.value:
-#             # Check if the transaction is newer than the last stored one
-#             if not last_timestamp or tx.block_time > datetime.fromisoformat(last_timestamp).timestamp():
-#                 # Fetch the full transaction details
-#                 tx_details = await client.get_transaction(tx.signature, commitment=Confirmed)
-#                 new_transactions.append(tx_details)
-
-#         return new_transactions
-
-# async def process_new_transactions(wallet_id, wallet_address, rpc_url):
-#     new_transactions = await get_new_transactions(wallet_address, rpc_url)
-    
-#     for tx in new_transactions:
-#         # Process the transaction and extract relevant information
-#         # This is a placeholder - you'll need to implement the actual logic based on your requirements
-#         transaction_type = "swap"  # Determine the type based on the transaction data
-#         sell_currency = "SOL"  # Extract from transaction data
-#         sell_amount = 1.0  # Extract from transaction data
-#         sell_value = 100.0  # Extract from transaction data
-#         buy_currency = "USDC"  # Extract from transaction data
-#         buy_amount = 100.0  # Extract from transaction data
-#         buy_value = 100.0  # Extract from transaction data
-#         solana_signature = tx.transaction.signatures[0]
-        
-#         # Store the transaction in the database
-#         await store_transaction(
-#             wallet_id, transaction_type, sell_currency, sell_amount, sell_value,
-#             buy_currency, buy_amount, buy_value, solana_signature
-#         )
-        
-#         # Update holdings
-#         await update_holdings(wallet_id, sell_currency, -sell_amount)
-#         await update_holdings(wallet_id, buy_currency, buy_amount)
-    
-#     # After processing all new transactions, close completed transactions
-#     await close_completed_transactions(wallet_id)
-
-
-
-# Example usage
-if __name__ == "__main__":
-    import asyncio
-
-    async def main():
-        await init_db()
-        # Add more test functions here
-
-    asyncio.run(main())