From edae36fb5037b95dded719b811af426cb473bd9d Mon Sep 17 00:00:00 2001
From: ImamTech <abdullahiidris130@gmail.com>
Date: Fri, 24 Apr 2026 01:07:39 +0100
Subject: [PATCH 1/2] feat: Enhance UI components and implement Soroban
 contract invocation

---
 frontend/components/WalletConnectModal.tsx | 13 +++--
 frontend/components/Web3StatusBar.tsx      | 29 ++++++-----
 frontend/context/walletContext.tsx         | 56 +++++++++++++++++-----
 3 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/frontend/components/WalletConnectModal.tsx b/frontend/components/WalletConnectModal.tsx
index d39728b..0d9cff9 100644
--- a/frontend/components/WalletConnectModal.tsx
+++ b/frontend/components/WalletConnectModal.tsx
@@ -110,9 +110,12 @@ export function WalletConnectModal({
         <Dialog.Overlay className="fixed inset-0 z-50 bg-black/60 backdrop-blur-sm animate-overlay-in" />
 
         {/* Content */}
-        <Dialog.Content className="fixed left-1/2 top-1/2 z-50 w-full max-w-md -translate-x-1/2 -translate-y-1/2 rounded-2xl border border-gray-700/80 bg-gray-900/95 backdrop-blur-xl p-0 shadow-2xl animate-modal-in focus:outline-none">
+        <Dialog.Content className="fixed left-1/2 top-1/2 z-50 w-full max-w-md -translate-x-1/2 -translate-y-1/2 rounded-2xl border border-gray-600/50 bg-gray-900/80 backdrop-blur-2xl p-0 shadow-[0_0_50px_-12px_rgba(20,184,166,0.3)] animate-modal-in focus:outline-none">
+          {/* Glowing Aura Background */}
+          <div className="absolute -inset-1 rounded-2xl bg-gradient-to-r from-teal-500/20 to-blue-600/20 blur-xl z-[-1] opacity-70 pointer-events-none"></div>
+
           {/* Header gradient bar */}
-          <div className="h-1 w-full rounded-t-2xl bg-gradient-to-r from-teal-500 via-blue-600 to-indigo-500" />
+          <div className="h-1.5 w-full rounded-t-2xl bg-gradient-to-r from-teal-400 via-blue-500 to-indigo-500 shadow-[0_2px_10px_rgba(45,212,191,0.5)]" />
 
           <div className="p-6 space-y-5">
             {/* Close button */}
@@ -290,10 +293,10 @@ export function WalletConnectModal({
                 <button
                   onClick={handleConnect}
                   disabled={isConnecting}
-                  className="w-full group relative py-3 rounded-xl font-semibold text-white overflow-hidden transition-all duration-300 hover:scale-[1.02] active:scale-[0.98] disabled:opacity-50 disabled:cursor-not-allowed"
+                  className="w-full group relative py-3.5 rounded-xl font-bold text-white overflow-hidden transition-all duration-300 hover:scale-[1.03] active:scale-[0.98] disabled:opacity-50 disabled:cursor-not-allowed shadow-[0_0_20px_rgba(20,184,166,0.15)] hover:shadow-[0_0_30px_rgba(20,184,166,0.4)]"
                 >
-                  <div className="absolute inset-0 bg-gradient-to-r from-teal-500 to-blue-700 transition-all duration-300 group-hover:from-teal-600 group-hover:to-blue-800" />
-                  <div className="absolute inset-0 opacity-0 group-hover:opacity-100 transition-opacity duration-300 bg-gradient-to-r from-teal-400/20 to-blue-600/20" />
+                  <div className="absolute inset-0 bg-gradient-to-r from-teal-500 via-blue-600 to-indigo-600 transition-all duration-300 group-hover:bg-gradient-to-l group-hover:scale-105" />
+                  <div className="absolute inset-0 opacity-0 group-hover:opacity-100 transition-opacity duration-300 bg-[radial-gradient(circle_at_center,rgba(255,255,255,0.2)_0%,transparent_100%)]" />
                   <span className="relative z-10 flex items-center justify-center gap-2">
                     {isConnecting ? (
                       <>
diff --git a/frontend/components/Web3StatusBar.tsx b/frontend/components/Web3StatusBar.tsx
index 7d69520..d547de6 100644
--- a/frontend/components/Web3StatusBar.tsx
+++ b/frontend/components/Web3StatusBar.tsx
@@ -45,28 +45,33 @@ export function Web3StatusBar() {
     `${addr.slice(0, 6)}...${addr.slice(-4)}`;
 
   return (
-    <div className="flex items-center gap-3 px-4 py-2 rounded-xl bg-gray-800/40 border border-gray-700/30 text-sm" role="status" aria-label="Wallet connection status">
-      <span className={`w-2 h-2 rounded-full ${cfg.dot}`} aria-hidden="true" />
-      <span className={`${cfg.color} font-medium`}>{cfg.label}</span>
+    <div className="group relative flex items-center gap-3 px-5 py-2.5 rounded-full bg-gray-900/60 backdrop-blur-md border border-gray-700/50 shadow-lg hover:shadow-xl hover:border-gray-600/50 transition-all duration-300 text-sm cursor-default" role="status" aria-label="Wallet connection status">
+      <div className="absolute inset-0 rounded-full bg-gradient-to-r from-teal-500/10 to-blue-500/10 opacity-0 group-hover:opacity-100 transition-opacity duration-300" />
+      
+      <span className="relative flex h-2.5 w-2.5 items-center justify-center">
+        {status === "connected" && <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-emerald-400 opacity-75"></span>}
+        <span className={`relative inline-flex h-2.5 w-2.5 rounded-full ${cfg.dot}`} aria-hidden="true" />
+      </span>
+      <span className={`relative ${cfg.color} font-semibold tracking-wide drop-shadow-sm`}>{cfg.label}</span>
       {address && (
         <>
-          <span className="text-gray-600">|</span>
-          <span className="font-mono text-gray-300 text-xs">
+          <span className="relative text-gray-600">|</span>
+          <span className="relative font-mono text-gray-300 text-xs font-medium bg-gray-800/50 px-2 py-0.5 rounded-md border border-gray-700/30 shadow-inner">
             {truncateAddress(address)}
           </span>
         </>
       )}
-      <span className="text-gray-600">|</span>
-      <span className="text-xs text-gray-500 flex items-center gap-1">
-        <span className="w-1.5 h-1.5 rounded-full bg-yellow-500" aria-hidden="true" />
+      <span className="relative text-gray-600">|</span>
+      <span className="relative text-xs text-gray-400 font-medium flex items-center gap-1.5 bg-yellow-500/10 text-yellow-200/90 px-2.5 py-0.5 rounded-md border border-yellow-500/20 transition-all hover:bg-yellow-500/20">
+        <span className="w-1.5 h-1.5 rounded-full bg-yellow-500 shadow-[0_0_8px_rgba(234,179,8,0.8)]" aria-hidden="true" />
         Testnet
       </span>
       {activeCount > 0 && (
         <>
-          <span className="text-gray-600">|</span>
-          <span className="text-xs text-blue-400 flex items-center gap-1">
-            <span className="w-1.5 h-1.5 rounded-full bg-blue-400 animate-pulse" aria-hidden="true" />
-            {activeCount} tx
+          <span className="relative text-gray-600">|</span>
+          <span className="relative text-xs flex items-center gap-1.5 bg-blue-500/10 text-blue-300 px-2.5 py-0.5 rounded-md border border-blue-500/20 shadow-[0_0_10px_rgba(59,130,246,0.15)] transition-all">
+            <span className="w-1.5 h-1.5 rounded-full bg-blue-400 animate-pulse shadow-[0_0_8px_rgba(96,165,250,0.8)]" aria-hidden="true" />
+            {activeCount} tx active
           </span>
         </>
       )}
diff --git a/frontend/context/walletContext.tsx b/frontend/context/walletContext.tsx
index ec19532..aa41f71 100644
--- a/frontend/context/walletContext.tsx
+++ b/frontend/context/walletContext.tsx
@@ -248,19 +248,51 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
 
   const invokeSorobanContract = async (contractId: string, functionName: string, args: any[] = []) => {
     if (!address) throw new Error("No wallet connected");
-    // Best-effort Soroban invocation using `soroban-client` if present. This is a helper that
-    // will build a transaction targeting the Soroban network and request Freighter to sign it.
-    // Actual invocation details (host function, footprints, etc.) depend on the contract ABI.
     try {
-      // dynamic import to avoid build-time hard dependency when not used
-      const sc = await import("soroban-client");
-      const SorobanClient = sc.default;
-      // Modern Soroban SDK usage
-      const rpc = new SorobanClient(SOROBAN_RPC);
-      // TODO: Implement full hostfunction builder for specific contract/ABI
-      // Example: await rpc.getContractData(contractId);
-      // TODO: Implement full hostfunction builder for specific contract/ABI
-      throw new Error("invokeSorobanContract: implement contract-specific invocation (ABI required)");
+      // Dynamic import to avoid build-time issues
+      const { Contract, TimeoutInfinite } = await import("stellar-sdk");
+      
+      // Use the Soroban RPC
+      const rpcServer = new Server(SOROBAN_RPC, { allowHttp: true });
+      const acct = await rpcServer.getAccount(address);
+      const contract = new Contract(contractId);
+
+      // Build the initial transaction
+      let tx = new TransactionBuilder(acct, {
+        fee: "10000",
+        networkPassphrase: NETWORK_PASSPHRASE,
+      })
+        .addOperation(contract.call(functionName, ...args))
+        .setTimeout(TimeoutInfinite)
+        .build();
+
+      // Simulate transaction to get correct footprints & fee
+      const simulatedTx = await rpcServer.simulateTransaction(tx);
+      
+      if ("error" in simulatedTx && simulatedTx.error) {
+        throw new Error(`Simulation failed: ${simulatedTx.error}`);
+      }
+
+      // Assemble transaction with simulation data
+      if (!simulatedTx.transactionData) {
+        throw new Error("Simulation failed: missing transactionData");
+      }
+
+      tx = TransactionBuilder.assembleTransaction(tx, NETWORK_PASSPHRASE, simulatedTx as any).build();
+      
+      // Sign with Freighter
+      const txXDR = tx.toXDR();
+      const signedEnvelopeXDR = await signWithFreighter(txXDR);
+      const signedTx = TransactionBuilder.fromXDR(signedEnvelopeXDR, NETWORK_PASSPHRASE);
+      
+      // Submit the transaction to Soroban
+      const sendResponse = await rpcServer.sendTransaction(signedTx);
+      
+      if (sendResponse.status === "ERROR") {
+        throw new Error(`Transaction failed: ${JSON.stringify(sendResponse.errorResult)}`);
+      }
+      
+      return sendResponse;
     } catch (err) {
       console.error("invokeSorobanContract", err);
       throw err;

From 35acd99b0b9e93e983aedc45c271d49463460626 Mon Sep 17 00:00:00 2001
From: ImamTech <abdullahiidris130@gmail.com>
Date: Fri, 24 Apr 2026 02:41:27 +0100
Subject: [PATCH 2/2] feat(contracts): integrate FEN board state and
 auto-settlement logic

---
 contracts/game_contract/src/game_state.rs | 55 -----------------------
 contracts/game_contract/src/lib.rs        | 54 ++++++++++++++--------
 contracts/game_contract/src/test.rs       |  9 ++--
 3 files changed, 41 insertions(+), 77 deletions(-)
 delete mode 100644 contracts/game_contract/src/game_state.rs

diff --git a/contracts/game_contract/src/game_state.rs b/contracts/game_contract/src/game_state.rs
deleted file mode 100644
index 30578a9..0000000
--- a/contracts/game_contract/src/game_state.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-#![no_std]
-
-use soroban_sdk::{contract, contractimpl, contracttype, Address, Env, Symbol};
-
-#[contracttype]
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct GameState {
-    pub board: String, // FEN representation of the board
-    pub current_turn: String, // "white" or "black"
-    pub status: String, // "in_progress", "checkmate", "stalemate", etc.
-}
-
-#[contracttype]
-pub enum DataKey {
-    Game(String),
-}
-
-#[contract]
-pub struct GameContract;
-
-#[contractimpl]
-impl GameContract {
-    pub fn create_game(env: Env, game_id: String, initial_board: String) {
-        let state = GameState {
-            board: initial_board,
-            current_turn: "white".into(),
-            status: "in_progress".into(),
-        };
-        
-        let key = DataKey::Game(game_id);
-        env.storage().persistent().set(&key, &state);
-    }
-
-    pub fn get_game(env: Env, game_id: String) -> Option<GameState> {
-        let key = DataKey::Game(game_id);
-        env.storage().persistent().get(&key)
-    }
-
-    pub fn make_move(env: Env, game_id: String, new_board: String, next_turn: String) {
-        let key = DataKey::Game(game_id);
-        if let Some(mut state) = env.storage().persistent().get::<GameState>(&key) {
-            state.board = new_board;
-            state.current_turn = next_turn;
-            env.storage().persistent().set(&key, &state);
-        }
-    }
-
-    pub fn finalize_game(env: Env, game_id: String, final_status: String) {
-        let key = DataKey::Game(game_id);
-        if let Some(mut state) = env.storage().persistent().get::<GameState>(&key) {
-            state.status = final_status;
-            env.storage().persistent().set(&key, &state);
-        }
-    }
-}
\ No newline at end of file
diff --git a/contracts/game_contract/src/lib.rs b/contracts/game_contract/src/lib.rs
index 7bcf9b3..b1a2e45 100644
--- a/contracts/game_contract/src/lib.rs
+++ b/contracts/game_contract/src/lib.rs
@@ -32,6 +32,7 @@ pub struct Game {
     pub created_at: u64,
     pub winner: Option<Address>,
     pub last_move_at: u64, // Ledger sequence of last move
+    pub board_fen: Bytes,
 }
 
 #[contracttype]
@@ -178,6 +179,7 @@ impl GameContract {
         env: Env,
         player1: Address,
         wager_amount: i128,
+        initial_board: Bytes,
     ) -> Result<u64, ContractError> {
         let max_stake: i128 = env.storage().instance().get(&MAX_STAKE).unwrap_or(1_000);
         if wager_amount > max_stake {
@@ -210,6 +212,7 @@ impl GameContract {
             created_at: env.ledger().sequence() as u64,
             winner: None,
             last_move_at: env.ledger().sequence() as u64,
+            board_fen: initial_board,
         };
 
         let mut games: Map<u64, Game> = env
@@ -291,6 +294,8 @@ impl GameContract {
         game_id: u64,
         player: Address,
         move_data: Vec<u32>,
+        new_board: Bytes,
+        game_status: u32,
     ) -> Result<(), ContractError> {
         let mut games: Map<u64, Game> = env
             .storage()
@@ -330,6 +335,19 @@ impl GameContract {
         game.moves.push_back(chess_move);
         game.current_turn = if game.current_turn == 1 { 2 } else { 1 };
         game.last_move_at = env.ledger().sequence() as u64;
+        game.board_fen = new_board;
+
+        // Auto settlement logic based on status flag
+        if game_status == 1 {
+            // Checkmate: submitting player wins
+            game.state = GameState::Completed;
+            game.winner = Some(player.clone());
+            Self::process_payout(&env, &game, &player)?;
+        } else if game_status == 2 {
+            // Draw
+            game.state = GameState::Drawn;
+            Self::process_draw_payout(&env, &game)?;
+        }
 
         games.set(game_id, game);
         env.storage().instance().set(&GAMES, &games);
@@ -1291,7 +1309,7 @@ mod tests {
 
         // Create & join game with wager = 5 (pool = 10)
         let wager: i128 = 5;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         // player1 forfeits → player2 wins
@@ -1350,7 +1368,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 500; // pool = 1000
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
         client.forfeit(&game_id, &player1); // player2 wins
 
@@ -1389,7 +1407,7 @@ mod tests {
         client.initialize_token(&admin, &token_address);
 
         let initial_wager: i128 = 100;
-        let game_id = client.create_game(&player1, &initial_wager);
+        let game_id = client.create_game(&player1, &initial_wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
         client.forfeit(&game_id, &player1);
 
@@ -1505,7 +1523,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         env.as_contract(&contract_id, || {
@@ -1556,7 +1574,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         let result = client.try_claim_timeout_win(&game_id, &player2);
@@ -1596,7 +1614,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         let remaining = client.get_timeout_remaining(&game_id);
@@ -1648,7 +1666,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         let reason = Bytes::from_slice(&env, b"Engine abuse");
@@ -1697,7 +1715,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         let reason = Bytes::from_slice(&env, b"Illegal move");
@@ -1749,7 +1767,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
         client.forfeit(&game_id, &player1);
 
@@ -1792,7 +1810,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         let reason = Bytes::from_slice(&env, b"Illegal move");
@@ -1843,7 +1861,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         env.as_contract(&contract_id, || {
@@ -1884,16 +1902,16 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         let first_move = Vec::from_array(&env, [12u32, 28u32]);
-        client.submit_move(&game_id, &player1, &first_move);
+        client.submit_move(&game_id, &player1, &first_move, &Bytes::new(&env), &0u32);
 
         env.ledger().set_sequence_number(2);
 
         let second_move = Vec::from_array(&env, [52u32, 36u32]);
-        client.submit_move(&game_id, &player2, &second_move);
+        client.submit_move(&game_id, &player2, &second_move, &Bytes::new(&env), &0u32);
 
         let game = client.get_game(&game_id);
         assert_eq!(game.current_turn, 1);
@@ -1942,15 +1960,15 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         let early_move = Vec::from_array(&env, [52u32, 36u32]);
-        let result = client.try_submit_move(&game_id, &player2, &early_move);
+        let result = client.try_submit_move(&game_id, &player2, &early_move, &Bytes::new(&env), &0u32);
         assert_eq!(result, Err(Ok(ContractError::NotYourTurn)));
 
         let empty_move = Vec::new(&env);
-        let result = client.try_submit_move(&game_id, &player1, &empty_move);
+        let result = client.try_submit_move(&game_id, &player1, &empty_move, &Bytes::new(&env), &0u32);
         assert_eq!(result, Err(Ok(ContractError::InvalidMove)));
     }
 
@@ -1989,7 +2007,7 @@ mod tests {
         client.set_max_stake(&1_000i128);
 
         let wager: i128 = 100;
-        let game_id = client.create_game(&player1, &wager);
+        let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
         client.join_game(&game_id, &player2);
 
         // File dispute
diff --git a/contracts/game_contract/src/test.rs b/contracts/game_contract/src/test.rs
index 2ac456c..4332790 100644
--- a/contracts/game_contract/src/test.rs
+++ b/contracts/game_contract/src/test.rs
@@ -31,6 +31,7 @@ fn seed_completed_game(
             created_at: 0,
             winner: None,
             last_move_at: 0,
+            board_fen: Bytes::new(env),
         };
         let mut games: Map<u64, Game> = Map::new(env);
         games.set(game_id, game);
@@ -190,7 +191,7 @@ fn test_create_game_exceeds_max_stake() {
     let player1 = Address::generate(&env);
     let wager = 1001; // Exceeds default 1000
 
-    let res = client.try_create_game(&player1, &wager);
+    let res = client.try_create_game(&player1, &wager, &Bytes::new(&env));
     assert!(res.is_err());
 
     // The error should be StakeLimitExceeded (15)
@@ -226,11 +227,11 @@ fn test_set_max_stake() {
     client.set_max_stake(&500);
 
     // Try to create game with 600
-    let res = client.try_create_game(&player1, &600);
+    let res = client.try_create_game(&player1, &600, &Bytes::new(&env));
     assert!(res.is_err());
 
     // Try to create game with 500
-    let game_id_res = client.try_create_game(&player1, &500);
+    let game_id_res = client.try_create_game(&player1, &500, &Bytes::new(&env));
     assert!(game_id_res.is_ok());
 }
 
@@ -263,7 +264,7 @@ fn test_payout_with_fee() {
     stellar_asset_client.mint(&player1, &wager);
     stellar_asset_client.mint(&player2, &wager);
 
-    let game_id = client.create_game(&player1, &wager);
+    let game_id = client.create_game(&player1, &wager, &Bytes::new(&env));
     client.join_game(&game_id, &player2);
 
     // Force complete the game and set winner