Starting staking FLR

Author: simonjonsson87

src/flare_ai_defai/api/routes/chat.py

@@ -552,9 +552,16 @@ async def handle_borrow(self, message: str, user: UserInfo) -> dict[str, str]:
         if (ai_response_json.get("amount") == 0.0):
             return {"response": "Sorry, amount must be more than 0.0 \n " + json.dumps(ai_response_json)}
 
+        txs = self.kinetic_market.swapFLRtoSFLR(user, 1)
+  
+        self.blockchain.add_tx_to_queue(msg=message, txs=txs)
+        formatted_preview = (
+            "Transaction Preview: "
+            + f"Staking {Web3.from_wei(tx.get('value', 0), 'ether')} "
+            + f"FLR to sFLR\nType CONFIRM to proceed."
+        )
+        return {"response": formatted_preview}
 
-        # Return stringified JSON
-        return {"response": json.dumps(ai_response_json)}
 
 
     async def handle_supply(self, message: str, user: UserInfo) -> dict[str, str]:

src/flare_ai_defai/blockchain/kinetic_market.py

@@ -12,6 +12,7 @@
 from web3 import Web3
 from web3.contract import Contract
 from web3.types import TxParams
+from flare_ai_defai.storage.fake_storage import WalletStore
 
 from flare_ai_defai.models import UserInfo
 
@@ -106,7 +107,7 @@ class KineticMarket:
         "type": "function"
     },]
 
-    def __init__(self, web3_provider_url: str, flare_explorer: FlareExplorer, flare_provider: FlareProvider) -> None:
+    def __init__(self, web3_provider_url: str, flare_explorer: FlareExplorer, flare_provider: FlareProvider, wallet_store: WalletStore) -> None:
         """
         Args:
             web3_provider_url (str): URL of the Web3 provider endpoint
@@ -118,6 +119,7 @@ def __init__(self, web3_provider_url: str, flare_explorer: FlareExplorer, flare_
         self.web3_provider_url = web3_provider_url
         self.flare_explorer = flare_explorer
         self.flare_provider = flare_provider
+        self.wallet_store = wallet_store
 
         #self.supplySFLRwithFLR(user, 1)
 
@@ -199,7 +201,7 @@ def supplySFLRwithFLR(self,user:UserInfo, amount: float):
 
         return tx_hashes             
 
-    def swapFLRtoSFLR(self, amount: float, spender: str = None):
+    def swapFLRtoSFLR(self, user: UserInfo, amount: float):
         if not self.w3.is_connected():
             raise Exception("Not connected to Flare blockchain")
 
@@ -214,24 +216,19 @@ def swapFLRtoSFLR(self, amount: float, spender: str = None):
         self.logger.debug("Converted amount to wei", amount=amount, amount_wei=amount_wei)
 
         # Check balance
-        balance = self.w3.eth.get_balance(self.flare_provider.address)
+        balance = self.w3.eth.get_balance(self.wallet_store.get_address(user))
         if balance < amount_wei:
             raise ValueError(f"Insufficient balance: {self.w3.from_wei(balance, 'ether')} FLR, required: {amount} FLR")
 
         # Fetch current nonce
-        current_nonce = self.w3.eth.get_transaction_count(self.flare_provider.address)
+        current_nonce = self.w3.eth.get_transaction_count(self.wallet_store.get_address(user))
 
         # Create submit transaction with value
-        tx1 = self.flare_provider.create_contract_function_tx(
+        tx1 = self.flare_provider.create_contract_function_tx(user,
             contract, "submit", 0, value=amount_wei
         )
-        tx2 = self.flare_provider.create_contract_function_tx(
-            contract, "approve", 1, spender, amount_wei
-        )
-        
-        
 
-        return [tx1, tx2]
+        return [tx1]
 
 
     def borrowUSDC(self,user_order: dict):

src/flare_ai_defai/blockchain/sparkdex.py

@@ -351,8 +351,8 @@ def swap_erc20_tokens(self, token_in: str, token_out: str, amount_in: float):
         #token_in_abi = token_abi[token_in.lower()]
         #token_out_abi = token_abi[token_out.lower()]
 
-        token_in_abi = self.flare_explorer.get_contract_abi(contract_address=token_address_abi[token_in.lower()])
-        token_out_abi = self.flare_explorer.get_contract_abi(contract_address=token_address_abi[token_out.lower()])
+        #token_in_abi = self.flare_explorer.get_contract_abi(contract_address=token_address_abi[token_in.lower()])
+        #token_out_abi = self.flare_explorer.get_contract_abi(contract_address=token_address_abi[token_out.lower()])
         token_in_abi = ERC20_ABI
         token_out_abi = ERC20_ABI
 

src/flare_ai_defai/main.py

@@ -86,7 +86,7 @@ def create_app() -> FastAPI:
         flareExplorer=flare_explorer,
         attestation=Vtpm(simulate=settings.simulate_attestation),
         prompts=PromptService(),
-        kinetic_market=KineticMarket(settings.web3_provider_url, flare_explorer, flare_provider),
+        kinetic_market=KineticMarket(settings.web3_provider_url, flare_explorer, flare_provider, wallet_store),
         sparkdex=SparkDEX(settings.web3_provider_url, flare_explorer, flare_provider, wallet_store),
         wallet_store=wallet_store
     )