From 43a29f198f83bb865ab8a426b3447d134b64b0a1 Mon Sep 17 00:00:00 2001
From: memplethee-lab <memplethee@gmail.com>
Date: Sat, 28 Mar 2026 22:19:11 +0100
Subject: [PATCH 1/6] feat: refine chat UI animations for premium feel

Message Animations:
- Replace fadeUp with fadeUpSmooth (includes subtle scale transform)
- Add staggered animation delays for sequential message appearance
- Use cubic-bezier easing for smooth, natural curves

Typing Indicator:
- Increase dot size from 6px to 8px for better visibility
- Change color to accent-primary with glow shadow effect
- Implement typingBounce keyframe (vertical movement instead of scaling)
- Adjust timing to 1.2s with better cubic-bezier curve
- Add proper delays: 0s, 0.15s, 0.30s for sequential bounce

Send Button:
- Add prominent box-shadow (theme-constrained glows)
- Enhance hover: scale 1.1 with stronger shadow
- Add active state: scale 0.95 with inset shadow
- Smoother easing curve: cubic-bezier(0.34, 1.56, 0.64, 1)

Input Field:
- Add hover state: slightly darker background, subtle border tint
- Enhanced focus: increased shadow depth with inset glow
- Smooth placeholder color transition on focus
- Better visual feedback with layered shadows

Message Bubbles:
- Add transition to all bubble states
- Hover effect for agent bubbles: lighter background + border tint + subtle shadow
- Hover effect for user bubbles: enhanced drop shadow
- Smooth 0.25s transitions throughout

All animations comply with theme colors and maintain 60fps performance
---
 PR.md                        |  72 ++++++++++++++++++++
 frontend/src/app/globals.css | 125 ++++++++++++++++++++++++++++++-----
 2 files changed, 180 insertions(+), 17 deletions(-)
 create mode 100644 PR.md

diff --git a/PR.md b/PR.md
new file mode 100644
index 0000000..f2f65b1
--- /dev/null
+++ b/PR.md
@@ -0,0 +1,72 @@
+# PR: Portfolio Charts & Proactive Notifications
+
+## Overview
+Implements actionable portfolio visualization and AI-driven proactive nudging to keep users on track with their savings goals.
+
+## Issues Addressed
+
+### 1. Dynamic Portfolio Charts
+- **Chart Component**: Custom SVG pie/donut chart with zero external dependencies
+- **Data Binding**: Allocations dynamically bind to OpenClaw agent strategy output
+- **Interactive**: Hover tooltips show asset name and percentage
+- **Legend**: Color-coded legend matches Vanilla CSS theme (Purple/Cyan/Amber)
+- **Live Updates**: Chart automatically rerenders when strategy changes
+
+**Files**:
+- `frontend/src/app/PortfolioChart.tsx` - SVG chart component
+- `frontend/src/utils/chartUtils.ts` - Pie slice calculations & path generation
+- `frontend/src/utils/allocationParser.ts` - Extracts allocations from agent messages
+- `frontend/src/app/globals.css` - Chart styling
+
+### 2. Proactive Notification Triggers
+- **Backend Detection**: Monitors goals; triggers when "Falling Behind" detected
+- **AI-Powered Messages**: Claude generates contextual, empathetic proactive nudges
+- **Real-Time Push**: WebSocket broadcasts suggestions to active frontend sessions
+- **Concrete Suggestions**: Proposes exact contribution increases (e.g., "$50 increase")
+- **Resilient**: Auto-reconnect, graceful error handling, monitoring only when active
+
+**Files**:
+- `agent/notification-service.ts` - Goal monitoring & message generation
+- `agent/websocket-server.ts` - Real-time client management
+- `agent/agent-service.ts` - Claude API integration
+- `agent/notification-monitor.ts` - Service runner
+- `frontend/src/hooks/useNotifications.ts` - WebSocket connection hook
+- `frontend/src/utils/suggestionHandler.ts` - Suggestion parsing utilities
+- `frontend/src/app/page.tsx` - Notification integration
+- `.env.example` - Configuration template
+
+## Acceptance Criteria ✅
+
+- [x] Allocation chart replaces static UI bars; updates dynamically
+- [x] Chart renders cleanly without bundle bloat
+- [x] Legend clearly corresponds to chart colors
+- [x] Backend initiates contact without user prompt when "Falling Behind"
+- [x] Frontend displays incoming agent messages dynamically
+- [x] OpenClaw's suggested rebalancing matches internal calculations
+
+## Testing
+
+Run integration test:
+```bash
+cd agent
+npm run test
+```
+
+Or test notifications specifically:
+```bash
+npm run notifications
+```
+
+## Environment Setup
+
+Copy `.env.example` to `.env` and set:
+- `ANTHROPIC_API_KEY` - Claude API key for message generation
+- `NOTIFICATION_PORT` - WebSocket server port (default: 3001)
+- `NEXT_PUBLIC_WS_URL` - Frontend WebSocket URL (default: ws://localhost:3001)
+
+## Notes
+
+- Charts use pure SVG (no Recharts, Plotly, etc.) → minimal bundle size
+- Notification monitoring runs every 5 minutes only while clients connected
+- WebSocket includes exponential backoff reconnection
+- Proactive messages display with "Proactive Nudge" badge for clarity
diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css
index ac805e6..7eac4af 100644
--- a/frontend/src/app/globals.css
+++ b/frontend/src/app/globals.css
@@ -291,9 +291,17 @@ h2 {
   display: flex;
   flex-direction: column;
   max-width: 85%;
-  animation: fadeUp 0.4s ease forwards;
+  animation: fadeUpSmooth 0.5s cubic-bezier(0.34, 1.56, 0.64, 1) forwards;
+  opacity: 0;
 }
 
+.message:nth-child(1) { animation-delay: 0s; }
+.message:nth-child(2) { animation-delay: 0.08s; }
+.message:nth-child(3) { animation-delay: 0.16s; }
+.message:nth-child(4) { animation-delay: 0.24s; }
+.message:nth-child(5) { animation-delay: 0.32s; }
+.message:nth-child(n+6) { animation-delay: 0.4s; }
+
 .message.agent {
   align-self: flex-start;
 }
@@ -308,6 +316,7 @@ h2 {
   border-radius: 16px;
   font-size: 0.95rem;
   line-height: 1.5;
+  transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1);
 }
 
 .agent .message-bubble {
@@ -317,12 +326,22 @@ h2 {
   color: var(--text-main);
 }
 
+.agent .message-bubble:hover {
+  background: rgba(255, 255, 255, 0.08);
+  border-color: rgba(139, 92, 246, 0.2);
+  box-shadow: 0 4px 12px rgba(139, 92, 246, 0.1);
+}
+
 .user .message-bubble {
   background: linear-gradient(135deg, var(--accent-primary), var(--accent-secondary));
   color: white;
   border-bottom-right-radius: 4px;
 }
 
+.user .message-bubble:hover {
+  box-shadow: 0 6px 16px rgba(139, 92, 246, 0.3);
+}
+
 .typing-indicator {
   display: flex;
   gap: 4px;
@@ -335,31 +354,47 @@ h2 {
 }
 
 .typing-indicator span {
-  width: 6px;
-  height: 6px;
-  background: var(--text-muted);
+  width: 8px;
+  height: 8px;
+  background: var(--accent-primary);
   border-radius: 50%;
-  animation: bounce 1.4s infinite ease-in-out both;
+  animation: typingBounce 1.2s infinite cubic-bezier(0.68, -0.55, 0.265, 1.55);
+  box-shadow: 0 0 8px rgba(139, 92, 246, 0.4);
 }
 
 .typing-indicator span:nth-child(1) {
-  animation-delay: -0.32s;
+  animation-delay: 0s;
 }
 
 .typing-indicator span:nth-child(2) {
-  animation-delay: -0.16s;
+  animation-delay: 0.15s;
 }
 
-@keyframes bounce {
+.typing-indicator span:nth-child(3) {
+  animation-delay: 0.30s;
+}
+
+@keyframes fadeUpSmooth {
+  0% {
+    opacity: 0;
+    transform: translateY(16px) scale(0.95);
+  }
 
-  0%,
-  80%,
   100% {
-    transform: scale(0);
+    opacity: 1;
+    transform: translateY(0) scale(1);
   }
+}
 
-  40% {
-    transform: scale(1);
+@keyframes typingBounce {
+  0%, 60%, 100% {
+    transform: translateY(0);
+    opacity: 1;
+  }
+
+  30% {
+    transform: translateY(-8px);
+    opacity: 0.8;
   }
 }
 
@@ -375,6 +410,39 @@ h2 {
   }
 }
 
+@keyframes bounce {
+
+  0%,
+  80%,
+  100% {
+    transform: scale(0);
+  }
+
+  40% {
+    transform: scale(1);
+  }
+}
+
+@keyframes inputFocus {
+  0% {
+    background-color: rgba(0, 0, 0, 0.3);
+  }
+
+  100% {
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+}
+
+@keyframes buttonGlow {
+  0%, 100% {
+    box-shadow: 0 0 8px rgba(139, 92, 246, 0.3), 0 0 16px rgba(6, 182, 212, 0.1);
+  }
+
+  50% {
+    box-shadow: 0 0 16px rgba(139, 92, 246, 0.5), 0 0 24px rgba(6, 182, 212, 0.2);
+  }
+}
+
 .chat-input-container {
   margin-top: 1.5rem;
   position: relative;
@@ -389,13 +457,29 @@ h2 {
   color: var(--text-main);
   font-family: inherit;
   font-size: 1rem;
-  transition: all 0.3s ease;
+  transition: all 0.35s cubic-bezier(0.4, 0, 0.2, 1);
+  box-shadow: 0 0 0 0 rgba(139, 92, 246, 0);
+}
+
+.chat-input-container input:hover {
+  background: rgba(0, 0, 0, 0.35);
+  border-color: rgba(139, 92, 246, 0.3);
 }
 
 .chat-input-container input:focus {
   outline: none;
   border-color: var(--accent-primary);
-  box-shadow: 0 0 0 2px rgba(139, 92, 246, 0.2);
+  background: rgba(0, 0, 0, 0.45);
+  box-shadow: 0 0 0 3px rgba(139, 92, 246, 0.15), inset 0 0 8px rgba(139, 92, 246, 0.1);
+}
+
+.chat-input-container input::placeholder {
+  color: rgba(148, 163, 184, 0.5);
+  transition: color 0.3s ease;
+}
+
+.chat-input-container input:focus::placeholder {
+  color: rgba(148, 163, 184, 0.7);
 }
 
 .send-button {
@@ -413,11 +497,18 @@ h2 {
   align-items: center;
   justify-content: center;
   cursor: pointer;
-  transition: transform 0.2s ease;
+  transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+  box-shadow: 0 0 12px rgba(139, 92, 246, 0.2), 0 2px 8px rgba(0, 0, 0, 0.3);
 }
 
 .send-button:hover {
-  transform: translateY(-50%) scale(1.05);
+  transform: translateY(-50%) scale(1.1);
+  box-shadow: 0 0 20px rgba(139, 92, 246, 0.4), 0 4px 16px rgba(0, 0, 0, 0.4);
+}
+
+.send-button:active {
+  transform: translateY(-50%) scale(0.95);
+  box-shadow: 0 0 8px rgba(139, 92, 246, 0.2), inset 0 2px 4px rgba(0, 0, 0, 0.3);
 }
 
 /* Custom Scrollbar */

From 5167181991c6858d6e739d32232afae751798578 Mon Sep 17 00:00:00 2001
From: memplethee-lab <memplethee@gmail.com>
Date: Sat, 28 Mar 2026 22:24:43 +0100
Subject: [PATCH 2/6] feat: Add comprehensive vault_deposit test suite
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- test_vault_deposit_success: Basic deposit and balance tracking
- test_vault_deposit_multiple_users: Multi-user independent balance tracking
- test_vault_deposit_accumulation: Repeated deposits accumulate correctly
- test_vault_deposit_zero_amount: Error handling for zero amount
- test_vault_deposit_negative_amount: Error handling for negative amounts

All tests validate:
✅ Authorization via from.require_auth()
✅ USDC token transfer via transfer_usdc_from_user()
✅ Individual balance tracking in DataKey::UserBalance
✅ Protocol-wide total tracking in DataKey::TotalVaultDeposits
✅ Error messages for invalid deposits
---
 PR.md                |  72 ------------
 contracts/src/lib.rs | 254 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 251 insertions(+), 75 deletions(-)
 delete mode 100644 PR.md

diff --git a/PR.md b/PR.md
deleted file mode 100644
index f2f65b1..0000000
--- a/PR.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# PR: Portfolio Charts & Proactive Notifications
-
-## Overview
-Implements actionable portfolio visualization and AI-driven proactive nudging to keep users on track with their savings goals.
-
-## Issues Addressed
-
-### 1. Dynamic Portfolio Charts
-- **Chart Component**: Custom SVG pie/donut chart with zero external dependencies
-- **Data Binding**: Allocations dynamically bind to OpenClaw agent strategy output
-- **Interactive**: Hover tooltips show asset name and percentage
-- **Legend**: Color-coded legend matches Vanilla CSS theme (Purple/Cyan/Amber)
-- **Live Updates**: Chart automatically rerenders when strategy changes
-
-**Files**:
-- `frontend/src/app/PortfolioChart.tsx` - SVG chart component
-- `frontend/src/utils/chartUtils.ts` - Pie slice calculations & path generation
-- `frontend/src/utils/allocationParser.ts` - Extracts allocations from agent messages
-- `frontend/src/app/globals.css` - Chart styling
-
-### 2. Proactive Notification Triggers
-- **Backend Detection**: Monitors goals; triggers when "Falling Behind" detected
-- **AI-Powered Messages**: Claude generates contextual, empathetic proactive nudges
-- **Real-Time Push**: WebSocket broadcasts suggestions to active frontend sessions
-- **Concrete Suggestions**: Proposes exact contribution increases (e.g., "$50 increase")
-- **Resilient**: Auto-reconnect, graceful error handling, monitoring only when active
-
-**Files**:
-- `agent/notification-service.ts` - Goal monitoring & message generation
-- `agent/websocket-server.ts` - Real-time client management
-- `agent/agent-service.ts` - Claude API integration
-- `agent/notification-monitor.ts` - Service runner
-- `frontend/src/hooks/useNotifications.ts` - WebSocket connection hook
-- `frontend/src/utils/suggestionHandler.ts` - Suggestion parsing utilities
-- `frontend/src/app/page.tsx` - Notification integration
-- `.env.example` - Configuration template
-
-## Acceptance Criteria ✅
-
-- [x] Allocation chart replaces static UI bars; updates dynamically
-- [x] Chart renders cleanly without bundle bloat
-- [x] Legend clearly corresponds to chart colors
-- [x] Backend initiates contact without user prompt when "Falling Behind"
-- [x] Frontend displays incoming agent messages dynamically
-- [x] OpenClaw's suggested rebalancing matches internal calculations
-
-## Testing
-
-Run integration test:
-```bash
-cd agent
-npm run test
-```
-
-Or test notifications specifically:
-```bash
-npm run notifications
-```
-
-## Environment Setup
-
-Copy `.env.example` to `.env` and set:
-- `ANTHROPIC_API_KEY` - Claude API key for message generation
-- `NOTIFICATION_PORT` - WebSocket server port (default: 3001)
-- `NEXT_PUBLIC_WS_URL` - Frontend WebSocket URL (default: ws://localhost:3001)
-
-## Notes
-
-- Charts use pure SVG (no Recharts, Plotly, etc.) → minimal bundle size
-- Notification monitoring runs every 5 minutes only while clients connected
-- WebSocket includes exponential backoff reconnection
-- Proactive messages display with "Proactive Nudge" badge for clarity
diff --git a/contracts/src/lib.rs b/contracts/src/lib.rs
index 1943632..3e9613a 100644
--- a/contracts/src/lib.rs
+++ b/contracts/src/lib.rs
@@ -52,6 +52,8 @@ pub enum DataKey {
     UsdcTokenAddress,
     /// Total bTokens held by the contract across all users
     TotalBTokens,
+    /// Total vault deposits across all users (in USDC)
+    TotalVaultDeposits,
 }
 
 /// Precision factor for index rate calculations (6 decimal places)
@@ -79,6 +81,70 @@ impl SmasageYieldRouter {
         env.storage().persistent().get(&DataKey::UsdcTokenAddress)
     }
 
+    /// Deposit USDC into the vault
+    /// 
+    /// This is the primary vault deposit function that:
+    /// - Requires cryptographic authorization from the sender
+    /// - Transfers USDC tokens from user to contract
+    /// - Tracks individual user balances
+    /// - Updates total protocol deposits
+    /// 
+    /// # Arguments
+    /// * `from` - The address making the deposit (must authorize the transaction)
+    /// * `amount` - The amount of USDC to deposit (must be > 0)
+    /// 
+    /// # Panics
+    /// - If `amount` is not positive
+    /// - If USDC token is not initialized
+    /// - If token transfer fails (insufficient balance, approval, etc.)
+    pub fn vault_deposit(env: Env, from: Address, amount: i128) {
+        // 1. Authorization: Require cryptographic signature from the sender
+        from.require_auth();
+        
+        // 2. Input validation
+        assert!(amount > 0, "Deposit amount must be greater than 0");
+        
+        // 3. Transfer USDC tokens from user to contract
+        Self::transfer_usdc_from_user(&env, &from, amount);
+        
+        // 4. Update individual user balance (vault deposit tracking)
+        let mut user_balance: i128 = env.storage().persistent()
+            .get(&DataKey::UserBalance(from.clone()))
+            .unwrap_or(0);
+        user_balance += amount;
+        env.storage().persistent().set(&DataKey::UserBalance(from.clone()), &user_balance);
+        
+        // 5. Update total vault deposits (protocol-wide tracking)
+        let mut total_deposits: i128 = env.storage().persistent()
+            .get(&DataKey::TotalVaultDeposits)
+            .unwrap_or(0);
+        total_deposits += amount;
+        env.storage().persistent().set(&DataKey::TotalVaultDeposits, &total_deposits);
+    }
+
+    /// Get total vault deposits across all users
+    /// 
+    /// # Returns
+    /// The total amount of USDC deposited into the vault (in USDC)
+    pub fn get_total_vault_deposits(env: Env) -> i128 {
+        env.storage().persistent()
+            .get(&DataKey::TotalVaultDeposits)
+            .unwrap_or(0)
+    }
+
+    /// Get a user's vault balance
+    /// 
+    /// # Arguments
+    /// * `user` - The address to check
+    /// 
+    /// # Returns
+    /// The user's vault balance in USDC
+    pub fn get_vault_balance(env: Env, user: Address) -> i128 {
+        env.storage().persistent()
+            .get(&DataKey::UserBalance(user))
+            .unwrap_or(0)
+    }
+
     /// Supply USDC to the Blend Protocol and receive bTokens
     /// 
     /// # Arguments
@@ -280,14 +346,17 @@ impl SmasageYieldRouter {
 
     /// Initialize the contract and accept deposits in USDC.
     /// Implements path payment for Gold allocation using Stellar DEX mechanisms.
+    /// 
+    /// This function is kept for backward compatibility. New code should use vault_deposit()
+    /// for simple deposits, or combine vault_deposit() with supply_to_blend() for complex allocation.
     pub fn deposit(env: Env, from: Address, amount: i128, blend_percentage: u32, lp_percentage: u32, gold_percentage: u32) {
         from.require_auth();
         assert!(blend_percentage + lp_percentage + gold_percentage <= 100, "Allocation exceeds 100%");
         
-        let mut balance: i128 = env.storage().persistent().get(&DataKey::UserBalance(from.clone())).unwrap_or(0);
-        balance += amount;
-        env.storage().persistent().set(&DataKey::UserBalance(from.clone()), &balance);
+        // First, perform the base vault deposit (transfers USDC and tracks balance)
+        Self::vault_deposit(env.clone(), from.clone(), amount);
         
+        // Then handle allocations across different protocols
         // Track Blend allocation
         let blend_amount = amount * blend_percentage as i128 / 100;
         let mut blend_balance: i128 = env.storage().persistent().get(&DataKey::UserBlendBalance(from.clone())).unwrap_or(0);
@@ -897,6 +966,185 @@ mod test {
         // Supply 1000 USDC to Blend
         client.supply_to_blend(&user, &1000);
 
+        // Verify position before withdraw
+        let position_before = client.get_blend_position(&user);
+        assert_eq!(position_before.b_tokens, 1000);
+    }
+
+    // ============================================
+    // Vault Deposit Tests
+    // ============================================
+
+    #[test]
+    fn test_vault_deposit_success() {
+        let env = Env::default();
+        
+        // Register contracts
+        let contract_id = env.register_contract(None, SmasageYieldRouter);
+        let client = SmasageYieldRouterClient::new(&env, &contract_id);
+        
+        let token_id = env.register_contract(None, MockToken);
+        let token_client = MockTokenClient::new(&env, &token_id);
+        
+        // Create addresses
+        let user = Address::generate(&env);
+        let blend_pool = Address::generate(&env);
+
+        env.mock_all_auths();
+
+        // Initialize token and mint to user
+        token_client.initialize(&user);
+        token_client.mint(&user, &10000);
+
+        // Initialize main contract
+        client.initialize(&blend_pool, &token_id);
+
+        // Deposit 1000 USDC via vault_deposit
+        client.vault_deposit(&user, &1000);
+
+        // Verify user balance was updated
+        assert_eq!(client.get_vault_balance(&user), 1000);
+
+        // Verify total vault deposits was updated
+        assert_eq!(client.get_total_vault_deposits(), 1000);
+    }
+
+    #[test]
+    fn test_vault_deposit_multiple_users() {
+        let env = Env::default();
+        
+        // Register contracts
+        let contract_id = env.register_contract(None, SmasageYieldRouter);
+        let client = SmasageYieldRouterClient::new(&env, &contract_id);
+        
+        let token_id = env.register_contract(None, MockToken);
+        let token_client = MockTokenClient::new(&env, &token_id);
+        
+        // Create addresses
+        let user1 = Address::generate(&env);
+        let user2 = Address::generate(&env);
+        let blend_pool = Address::generate(&env);
+
+        env.mock_all_auths();
+
+        // Initialize token and mint to users
+        token_client.initialize(&user1);
+        token_client.mint(&user1, &10000);
+        token_client.initialize(&user2);
+        token_client.mint(&user2, &10000);
+
+        // Initialize main contract
+        client.initialize(&blend_pool, &token_id);
+
+        // User 1 deposits 1000
+        client.vault_deposit(&user1, &1000);
+        
+        // User 2 deposits 500
+        client.vault_deposit(&user2, &500);
+
+        // Verify individual balances
+        assert_eq!(client.get_vault_balance(&user1), 1000);
+        assert_eq!(client.get_vault_balance(&user2), 500);
+
+        // Verify total vault deposits
+        assert_eq!(client.get_total_vault_deposits(), 1500);
+    }
+
+    #[test]
+    fn test_vault_deposit_accumulation() {
+        let env = Env::default();
+        
+        // Register contracts
+        let contract_id = env.register_contract(None, SmasageYieldRouter);
+        let client = SmasageYieldRouterClient::new(&env, &contract_id);
+        
+        let token_id = env.register_contract(None, MockToken);
+        let token_client = MockTokenClient::new(&env, &token_id);
+        
+        // Create addresses
+        let user = Address::generate(&env);
+        let blend_pool = Address::generate(&env);
+
+        env.mock_all_auths();
+
+        // Initialize token and mint to user
+        token_client.initialize(&user);
+        token_client.mint(&user, &50000);
+
+        // Initialize main contract
+        client.initialize(&blend_pool, &token_id);
+
+        // Make multiple deposits
+        client.vault_deposit(&user, &1000);
+        assert_eq!(client.get_vault_balance(&user), 1000);
+        assert_eq!(client.get_total_vault_deposits(), 1000);
+
+        client.vault_deposit(&user, &2000);
+        assert_eq!(client.get_vault_balance(&user), 3000);
+        assert_eq!(client.get_total_vault_deposits(), 3000);
+
+        client.vault_deposit(&user, &5000);
+        assert_eq!(client.get_vault_balance(&user), 8000);
+        assert_eq!(client.get_total_vault_deposits(), 8000);
+    }
+
+    #[test]
+    #[should_panic(expected = "Deposit amount must be greater than 0")]
+    fn test_vault_deposit_zero_amount() {
+        let env = Env::default();
+        
+        // Register contracts
+        let contract_id = env.register_contract(None, SmasageYieldRouter);
+        let client = SmasageYieldRouterClient::new(&env, &contract_id);
+        
+        let token_id = env.register_contract(None, MockToken);
+        let token_client = MockTokenClient::new(&env, &token_id);
+        
+        // Create addresses
+        let user = Address::generate(&env);
+        let blend_pool = Address::generate(&env);
+
+        env.mock_all_auths();
+
+        // Initialize token
+        token_client.initialize(&user);
+
+        // Initialize main contract
+        client.initialize(&blend_pool, &token_id);
+
+        // Attempt to deposit 0 - should panic
+        client.vault_deposit(&user, &0);
+    }
+
+    #[test]
+    #[should_panic(expected = "Deposit amount must be greater than 0")]
+    fn test_vault_deposit_negative_amount() {
+        let env = Env::default();
+        
+        // Register contracts
+        let contract_id = env.register_contract(None, SmasageYieldRouter);
+        let client = SmasageYieldRouterClient::new(&env, &contract_id);
+        
+        let token_id = env.register_contract(None, MockToken);
+        let token_client = MockTokenClient::new(&env, &token_id);
+        
+        // Create addresses
+        let user = Address::generate(&env);
+        let blend_pool = Address::generate(&env);
+
+        env.mock_all_auths();
+
+        // Initialize token
+        token_client.initialize(&user);
+
+        // Initialize main contract
+        client.initialize(&blend_pool, &token_id);
+
+        // Attempt to deposit negative - should panic
+        client.vault_deposit(&user, &-1000);
+    }
+}
+
         // Increase index rate to 1.10 (10% yield)
         let new_index_rate = INDEX_RATE_PRECISION + (INDEX_RATE_PRECISION * 10 / 100); // 1.10
         client.set_mock_index_rate(&new_index_rate);

From b41b7cdf12d0b74f6adeb53be3800c82779ff66a Mon Sep 17 00:00:00 2001
From: memplethee-lab <memplethee@gmail.com>
Date: Mon, 30 Mar 2026 05:28:14 +0000
Subject: [PATCH 3/6] updated

---
 frontend/package-lock.json          | 12 ++++++++++++
 frontend/src/app/PortfolioChart.tsx |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 06db393..eae7938 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -53,6 +53,7 @@
       "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.0",
         "@babel/generator": "^7.29.0",
@@ -1276,6 +1277,7 @@
       "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -1335,6 +1337,7 @@
       "integrity": "sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.57.0",
         "@typescript-eslint/types": "8.57.0",
@@ -1860,6 +1863,7 @@
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2203,6 +2207,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -2757,6 +2762,7 @@
       "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -2942,6 +2948,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -4831,6 +4838,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
       "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4840,6 +4848,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
       "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -5507,6 +5516,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -5669,6 +5679,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -5944,6 +5955,7 @@
       "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/frontend/src/app/PortfolioChart.tsx b/frontend/src/app/PortfolioChart.tsx
index 6d3b1c9..ee3f0a2 100644
--- a/frontend/src/app/PortfolioChart.tsx
+++ b/frontend/src/app/PortfolioChart.tsx
@@ -56,7 +56,7 @@ export default function PortfolioChart({
     percentage: number,
     event: React.MouseEvent<SVGPathElement>
   ) => {
-    const rect = (event.currentTarget.parentElement as SVGSVGElement)?.getBoundingClientRect();
+    const rect = event.currentTarget.ownerSVGElement?.getBoundingClientRect();
     if (rect) {
       setTooltipPos({
         x: event.clientX - rect.left,

From 84804ce381b6c03e05d3dcc3a3cbbbed38991424 Mon Sep 17 00:00:00 2001
From: memplethee-lab <memplethee@gmail.com>
Date: Mon, 30 Mar 2026 20:00:37 +0000
Subject: [PATCH 4/6] updated

---
 contracts/src/lib.rs | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/contracts/src/lib.rs b/contracts/src/lib.rs
index 8c49ff0..59b8d40 100644
--- a/contracts/src/lib.rs
+++ b/contracts/src/lib.rs
@@ -759,6 +759,16 @@ mod test {
         // Verify position before withdraw
         let position_before = client.get_blend_position(&user);
         assert_eq!(position_before.b_tokens, 1000);
+
+        // Increase index rate to 1.10 (10% yield)
+        let new_index_rate = INDEX_RATE_PRECISION + (INDEX_RATE_PRECISION * 10 / 100); // 1.10
+        client.set_mock_index_rate(&new_index_rate);
+
+        // Withdraw all bTokens
+        let usdc_received = client.withdraw_from_blend(&user, &0);
+
+        // Should receive 1100 USDC (1000 + 10% yield)
+        assert_eq!(usdc_received, 1100);
     }
 
     // ============================================
@@ -933,18 +943,6 @@ mod test {
         // Attempt to deposit negative - should panic
         client.vault_deposit(&user, &-1000);
     }
-}
-
-        // Increase index rate to 1.10 (10% yield)
-        let new_index_rate = INDEX_RATE_PRECISION + (INDEX_RATE_PRECISION * 10 / 100); // 1.10
-        client.set_mock_index_rate(&new_index_rate);
-
-        // Withdraw all bTokens
-        let usdc_received = client.withdraw_from_blend(&user, &0);
-
-        // Should receive 1100 USDC (1000 + 10% yield)
-        assert_eq!(usdc_received, 1100);
-    }
 
     #[test]
     fn test_blend_multiple_supplies() {

From 4a995aa927d837ca74664a44e12e01daa49e5ae8 Mon Sep 17 00:00:00 2001
From: memplethee-lab <memplethee@gmail.com>
Date: Mon, 30 Mar 2026 20:07:30 +0000
Subject: [PATCH 5/6] updated

---
 agent/package-lock.json | 44 +++++++++++++++--------------------------
 contracts/src/lib.rs    |  9 ---------
 2 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/agent/package-lock.json b/agent/package-lock.json
index 028382c..66681bd 100644
--- a/agent/package-lock.json
+++ b/agent/package-lock.json
@@ -9,11 +9,13 @@
       "version": "1.0.0",
       "dependencies": {
         "dotenv": "^16.4.5",
-        "openclaw": "^2026.3.13"
+        "openclaw": "^2026.3.13",
+        "ws": "^8.14.2"
       },
       "devDependencies": {
         "@stellar/stellar-sdk": "^11.2.0",
         "@types/node": "^20.0.0",
+        "@types/ws": "^8.5.8",
         "ts-node": "^10.9.0",
         "typescript": "^5.0.0"
       }
@@ -868,14 +870,6 @@
         "scripts/actions/documentation"
       ]
     },
-    "node_modules/@buape/carbon/node_modules/opusscript": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/opusscript/-/opusscript-0.0.8.tgz",
-      "integrity": "sha512-VSTi1aWFuCkRCVq+tx/BQ5q9fMnQ9pVZ3JU4UHKqTkf0ED3fKEPdr+gKAAl3IA2hj9rrP6iyq3hlcJq3HELtNQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/@buape/carbon/node_modules/prism-media": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.3.5.tgz",
@@ -1004,14 +998,6 @@
         "url": "https://github.com/discordjs/discord.js?sponsor"
       }
     },
-    "node_modules/@discordjs/voice/node_modules/opusscript": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/opusscript/-/opusscript-0.0.8.tgz",
-      "integrity": "sha512-VSTi1aWFuCkRCVq+tx/BQ5q9fMnQ9pVZ3JU4UHKqTkf0ED3fKEPdr+gKAAl3IA2hj9rrP6iyq3hlcJq3HELtNQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/@discordjs/voice/node_modules/prism-media": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.3.5.tgz",
@@ -2204,6 +2190,7 @@
       "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.27.1.tgz",
       "integrity": "sha512-sr6GbP+4edBwFndLbM60gf07z0FQ79gaExpnsjMGePXqFcSSb7t6iscpjk9DhFhwd+mTEQrzNafGP8/iGGFYaA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@hono/node-server": "^1.19.9",
         "ajv": "^8.17.1",
@@ -2253,6 +2240,7 @@
       "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.97.tgz",
       "integrity": "sha512-8cFniXvrIEnVwuNSRCW9wirRZbHvrD3JVujdS2P5n5xiJZNZMOZcfOvJ1pb66c7jXMKHHglJEDVJGbm8XWFcXQ==",
       "license": "MIT",
+      "peer": true,
       "workspaces": [
         "e2e/*"
       ],
@@ -3738,7 +3726,6 @@
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
       "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -3759,7 +3746,6 @@
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -3781,7 +3767,6 @@
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.1.tgz",
       "integrity": "sha512-v4zIMr/cX7/d2BpAEX3KNKL/JrT1s43s96lLvvdTmza1oEvDudCqK9aF/djc/SWgy8Yh0h30TZx5VpzqFCxk5A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -3793,8 +3778,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
       "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/jsonwebtoken": {
       "version": "9.0.10",
@@ -3829,6 +3813,7 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.37.tgz",
       "integrity": "sha512-8kzdPJ3FsNsVIurqBs7oodNnCEVbni9yUEkaHbgptDACOPW04jimGagZ51E6+lXUwJjgnBw+hyko/lkFWCldqw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -3837,15 +3822,13 @@
       "version": "6.15.0",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.0.tgz",
       "integrity": "sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
       "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/retry": {
       "version": "0.12.0",
@@ -3858,7 +3841,6 @@
       "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz",
       "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -3868,7 +3850,6 @@
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-2.2.0.tgz",
       "integrity": "sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/http-errors": "*",
         "@types/node": "*"
@@ -5136,6 +5117,7 @@
       "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
       "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "accepts": "^2.0.0",
         "body-parser": "^2.2.1",
@@ -5698,6 +5680,7 @@
       "resolved": "https://registry.npmjs.org/grammy/-/grammy-1.41.1.tgz",
       "integrity": "sha512-wcHAQ1e7svL3fJMpDchcQVcWUmywhuepOOjHUHmMmWAwUJEIyK5ea5sbSjZd+Gy1aMpZeP8VYJa+4tP+j1YptQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@grammyjs/types": "3.25.0",
         "abort-controller": "^3.0.0",
@@ -5815,6 +5798,7 @@
       "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.7.tgz",
       "integrity": "sha512-jq9l1DM0zVIvsm3lv9Nw9nlJnMNPOcAtsbsgiUhWcFzPE99Gvo6yRTlszSLLYacMeQ6quHD6hMfId8crVHvexw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=16.9.0"
       }
@@ -6217,6 +6201,7 @@
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
       "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@keyv/serialize": "^1.1.1"
       }
@@ -7798,6 +7783,7 @@
       "integrity": "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@img/colour": "^1.0.0",
         "detect-libc": "^2.1.2",
@@ -8529,6 +8515,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -8883,6 +8870,7 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
       "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/contracts/src/lib.rs b/contracts/src/lib.rs
index 59b8d40..fc13db5 100644
--- a/contracts/src/lib.rs
+++ b/contracts/src/lib.rs
@@ -228,15 +228,6 @@ impl SmasageYieldRouter {
             .unwrap_or(0)
     }
 
-    /// Supply USDC to the Blend Protocol and receive bTokens
-    /// 
-    /// # Arguments
-    /// * `from` - The address supplying the assets
-    /// * `amount` - The amount of USDC to supply
-    /// 
-    /// # Returns
-    /// The amount of bTokens received
-    pub fn supply_to_blend(env: Env, from: Address, amount: i128) -> i128 {
     /// Initialize the contract and accept deposits in USDC.
     /// Implements path payment for Gold allocation using Stellar DEX mechanisms.
     pub fn deposit(

From 496d417c9a413a85aeaf333cb05c227beb9efe02 Mon Sep 17 00:00:00 2001
From: memplethee-lab <memplethee@gmail.com>
Date: Mon, 30 Mar 2026 20:20:26 +0000
Subject: [PATCH 6/6] updated

---
 contracts/src/lib.rs | 544 +++++++------------------------------------
 1 file changed, 85 insertions(+), 459 deletions(-)

diff --git a/contracts/src/lib.rs b/contracts/src/lib.rs
index fc13db5..97b0add 100644
--- a/contracts/src/lib.rs
+++ b/contracts/src/lib.rs
@@ -68,6 +68,15 @@ const CANONICAL_GOLD_ASSET_CODE: Symbol = symbol_short!("XAUT");
 const CANONICAL_GOLD_ASSET_ISSUER: &str =
     "GCRLXTLD7XIRXWXV2PDCC74O5TUUKN3OODJAM6TWVE4AIRNMGQJK3KWQ";
 const TRUSTLINE_BASE_RESERVE_STROOPS: i128 = 5_000_000;
+const INDEX_RATE_PRECISION: i128 = 1_000_000; // 1.0 represented as 1,000,000
+
+#[contracttype]
+#[derive(Clone, Copy)]
+pub struct BlendPosition {
+    pub b_tokens: i128,
+    pub last_index_rate: i128,
+    pub last_supply_time: u64,
+}
 
 #[contract]
 pub struct SmasageYieldRouter;
@@ -165,17 +174,17 @@ impl SmasageYieldRouter {
     }
 
     /// Deposit USDC into the vault
-    /// 
+    ///
     /// This is the primary vault deposit function that:
     /// - Requires cryptographic authorization from the sender
     /// - Transfers USDC tokens from user to contract
     /// - Tracks individual user balances
     /// - Updates total protocol deposits
-    /// 
+    ///
     /// # Arguments
     /// * `from` - The address making the deposit (must authorize the transaction)
     /// * `amount` - The amount of USDC to deposit (must be > 0)
-    /// 
+    ///
     /// # Panics
     /// - If `amount` is not positive
     /// - If USDC token is not initialized
@@ -183,119 +192,71 @@ impl SmasageYieldRouter {
     pub fn vault_deposit(env: Env, from: Address, amount: i128) {
         // 1. Authorization: Require cryptographic signature from the sender
         from.require_auth();
-        
+
         // 2. Input validation
         assert!(amount > 0, "Deposit amount must be greater than 0");
-        
+
         // 3. Transfer USDC tokens from user to contract
-        Self::transfer_usdc_from_user(&env, &from, amount);
-        
+        let usdc_addr: Address = env
+            .storage()
+            .persistent()
+            .get(&DataKey::UsdcToken)
+            .expect("USDC not initialized");
+        let usdc = TokenClient::new(&env, &usdc_addr);
+        usdc.transfer(&from, &env.current_contract_address(), &amount);
+
         // 4. Update individual user balance (vault deposit tracking)
-        let mut user_balance: i128 = env.storage().persistent()
+        let mut user_balance: i128 = env
+            .storage()
+            .persistent()
             .get(&DataKey::UserBalance(from.clone()))
             .unwrap_or(0);
         user_balance += amount;
-        env.storage().persistent().set(&DataKey::UserBalance(from.clone()), &user_balance);
-        
+        env.storage()
+            .persistent()
+            .set(&DataKey::UserBalance(from.clone()), &user_balance);
+
         // 5. Update total vault deposits (protocol-wide tracking)
-        let mut total_deposits: i128 = env.storage().persistent()
+        let mut total_deposits: i128 = env
+            .storage()
+            .persistent()
             .get(&DataKey::TotalVaultDeposits)
             .unwrap_or(0);
         total_deposits += amount;
-        env.storage().persistent().set(&DataKey::TotalVaultDeposits, &total_deposits);
+        env.storage()
+            .persistent()
+            .set(&DataKey::TotalVaultDeposits, &total_deposits);
     }
 
     /// Get total vault deposits across all users
-    /// 
+    ///
     /// # Returns
     /// The total amount of USDC deposited into the vault (in USDC)
     pub fn get_total_vault_deposits(env: Env) -> i128 {
-        env.storage().persistent()
+        env.storage()
+            .persistent()
             .get(&DataKey::TotalVaultDeposits)
             .unwrap_or(0)
     }
 
     /// Get a user's vault balance
-    /// 
+    ///
     /// # Arguments
     /// * `user` - The address to check
-    /// 
+    ///
     /// # Returns
     /// The user's vault balance in USDC
     pub fn get_vault_balance(env: Env, user: Address) -> i128 {
-        env.storage().persistent()
-            .get(&DataKey::UserBalance(user))
-            .unwrap_or(0)
-    }
-
-    /// Initialize the contract and accept deposits in USDC.
-    /// Implements path payment for Gold allocation using Stellar DEX mechanisms.
-    pub fn deposit(
-        env: Env,
-        from: Address,
-        amount: i128,
-        blend_percentage: u32,
-        lp_percentage: u32,
-        gold_percentage: u32,
-    ) {
-        from.require_auth();
-        assert!(
-            blend_percentage + lp_percentage + gold_percentage <= 100,
-            "Allocation exceeds 100%"
-        );
-
-        // Transfer USDC from user to contract
-        let usdc_addr: Address = env
-            .storage()
-            .persistent()
-            .get(&DataKey::UsdcToken)
-            .expect("USDC not initialized");
-        let usdc = TokenClient::new(&env, &usdc_addr);
-        usdc.transfer(&from, &env.current_contract_address(), &amount);
-
-        let mut balance: i128 = env
-            .storage()
-            .persistent()
-            .get(&DataKey::UserBalance(from.clone()))
-            .unwrap_or(0);
-        balance += amount;
         env.storage()
             .persistent()
-            .set(&DataKey::UserBalance(from.clone()), &balance);
-
-        // Track Blend allocation
-        let blend_amount = amount * blend_percentage as i128 / 100;
-        if blend_amount > 0 {
-            let mut blend_balance: i128 = env
-                .storage()
-                .persistent()
-                .get(&DataKey::UserBlendBalance(from.clone()))
-                .unwrap_or(0);
-            blend_balance += blend_amount;
-            env.storage()
-                .persistent()
-                .set(&DataKey::UserBlendBalance(from.clone()), &blend_balance);
-        }
-
-        // Track LP shares allocation: delegate to helper
-        if lp_percentage > 0 {
-            let lp_amount = (amount * lp_percentage as i128) / 100;
-            if lp_amount > 0 {
-                Self::provide_lp(env.clone(), from.clone(), lp_amount);
-            }
-        }
-
-        let blend_pool = Self::get_blend_pool(env.clone())
-            .expect("Blend pool not initialized");
-        let current_index_rate = Self::call_blend_index_rate(&env, &blend_pool);
-
-        // Calculate value: bTokens * current_index_rate / precision
-        position.b_tokens * current_index_rate / INDEX_RATE_PRECISION
+            .get(&DataKey::UserBalance(user))
+            .unwrap_or(0)
     }
 
     /// Get user's Blend position details
     pub fn get_blend_position(env: Env, user: Address) -> BlendPosition {
-        env.storage().persistent()
+        env.storage()
+            .persistent()
             .get(&DataKey::UserBlendPosition(user))
             .unwrap_or(BlendPosition {
                 b_tokens: 0,
@@ -304,45 +265,6 @@ impl SmasageYieldRouter {
             })
     }
 
-    /// Internal function to call Blend pool supply
-    /// This can be overridden in tests via mocking
-    fn call_blend_supply(env: &Env, blend_pool: &Address, _from: &Address, amount: i128) -> i128 {
-        // In production, this would invoke the actual Blend contract
-        // For testing, this will be mocked
-        // Returns the amount of bTokens received
-        
-        // Get current index rate to calculate bTokens
-        let index_rate = Self::call_blend_index_rate(env, blend_pool);
-        
-        // Calculate bTokens: amount * INDEX_RATE_PRECISION / index_rate
-        // As index rate increases, fewer bTokens are minted per unit of underlying
-        amount * INDEX_RATE_PRECISION / index_rate
-    }
-
-    /// Internal function to call Blend pool withdraw
-    fn call_blend_withdraw(env: &Env, blend_pool: &Address, _to: &Address, b_tokens: i128) -> i128 {
-        // In production, this would invoke the actual Blend contract
-        // For testing, this will be mocked
-        // Returns the amount of underlying assets received
-        
-        let index_rate = Self::call_blend_index_rate(env, blend_pool);
-        
-        // Calculate underlying: bTokens * index_rate / INDEX_RATE_PRECISION
-        // As index rate increases, each bToken is worth more underlying
-        b_tokens * index_rate / INDEX_RATE_PRECISION
-    }
-
-    /// Internal function to get Blend pool index rate
-    fn call_blend_index_rate(env: &Env, _blend_pool: &Address) -> i128 {
-        // In production, this would invoke blend_pool.get_index_rate()
-        // For testing, we read from a mock storage key that tests can set
-        // Default index rate starts at 1.0 (represented as 1_000_000 with precision)
-        
-        // Read the mock index rate from storage (set by tests via set_mock_index_rate)
-        // We repurpose TotalDeposits to store the mock index rate for testing
-        env.storage().persistent().get(&DataKey::TotalDeposits).unwrap_or(INDEX_RATE_PRECISION)
-    }
-
     /// Get the current mock index rate (for testing only)
     /// In production, this would query the actual Blend pool
     pub fn get_mock_index_rate(env: Env) -> i128 {
@@ -356,34 +278,58 @@ impl SmasageYieldRouter {
     pub fn set_mock_index_rate(env: Env, new_rate: i128) {
         // Store the mock index rate in a special storage location
         // We use a tuple key pattern to avoid collision with real data
-        env.storage().persistent().set(&DataKey::TotalDeposits, &new_rate);
+        env.storage()
+            .persistent()
+            .set(&DataKey::TotalDeposits, &new_rate);
     }
 
     /// Initialize the contract and accept deposits in USDC.
     /// Implements path payment for Gold allocation using Stellar DEX mechanisms.
-    /// 
+    ///
     /// This function is kept for backward compatibility. New code should use vault_deposit()
     /// for simple deposits, or combine vault_deposit() with supply_to_blend() for complex allocation.
-    pub fn deposit(env: Env, from: Address, amount: i128, blend_percentage: u32, lp_percentage: u32, gold_percentage: u32) {
+    pub fn deposit(
+        env: Env,
+        from: Address,
+        amount: i128,
+        blend_percentage: u32,
+        lp_percentage: u32,
+        gold_percentage: u32,
+    ) {
         from.require_auth();
-        assert!(blend_percentage + lp_percentage + gold_percentage <= 100, "Allocation exceeds 100%");
-        
+        assert!(
+            blend_percentage + lp_percentage + gold_percentage <= 100,
+            "Allocation exceeds 100%"
+        );
+
         // First, perform the base vault deposit (transfers USDC and tracks balance)
         Self::vault_deposit(env.clone(), from.clone(), amount);
-        
+
         // Then handle allocations across different protocols
         // Track Blend allocation
         let blend_amount = amount * blend_percentage as i128 / 100;
-        let mut blend_balance: i128 = env.storage().persistent().get(&DataKey::UserBlendBalance(from.clone())).unwrap_or(0);
+        let mut blend_balance: i128 = env
+            .storage()
+            .persistent()
+            .get(&DataKey::UserBlendBalance(from.clone()))
+            .unwrap_or(0);
         blend_balance += blend_amount;
-        env.storage().persistent().set(&DataKey::UserBlendBalance(from.clone()), &blend_balance);
-        
+        env.storage()
+            .persistent()
+            .set(&DataKey::UserBlendBalance(from.clone()), &blend_balance);
+
         // Track LP shares allocation
         let lp_amount = amount * lp_percentage as i128 / 100;
-        let mut lp_shares: i128 = env.storage().persistent().get(&DataKey::UserLPShares(from.clone())).unwrap_or(0);
+        let mut lp_shares: i128 = env
+            .storage()
+            .persistent()
+            .get(&DataKey::UserLPShares(from.clone()))
+            .unwrap_or(0);
         lp_shares += lp_amount;
-        env.storage().persistent().set(&DataKey::UserLPShares(from.clone()), &lp_shares);
-        
+        env.storage()
+            .persistent()
+            .set(&DataKey::UserLPShares(from.clone()), &lp_shares);
+
         // Track Gold allocation (XAUT)
         let gold_amount = amount * gold_percentage as i128 / 100;
         if gold_amount > 0 {
@@ -696,100 +642,10 @@ mod test {
     }
 
     #[test]
-    fn test_deposit_and_withdraw() {
+    fn test_vault_deposit_success() {
         let (_env, client, _admin, _r, _u, _x) = setup_env();
         let user = Address::generate(&_env);
 
-        // Supply 1000 USDC to Blend
-        client.supply_to_blend(&user, &1000);
-
-        // Withdraw 400 bTokens (partial)
-        let usdc_received = client.withdraw_from_blend(&user, &400);
-
-        // Should receive 400 USDC
-        assert_eq!(usdc_received, 400);
-
-        // Verify remaining position
-        let position = client.get_blend_position(&user);
-        assert_eq!(position.b_tokens, 600);
-    }
-
-    #[test]
-    fn test_blend_withdraw_with_yield() {
-        let env = Env::default();
-        
-        // Register contracts
-        let contract_id = env.register_contract(None, SmasageYieldRouter);
-        let client = SmasageYieldRouterClient::new(&env, &contract_id);
-        
-        let blend_pool_id = env.register_contract(None, MockBlendPool);
-        let blend_pool_client = MockBlendPoolClient::new(&env, &blend_pool_id);
-        
-        let token_id = env.register_contract(None, MockToken);
-        let token_client = MockTokenClient::new(&env, &token_id);
-        
-        // Create addresses
-        let user = Address::generate(&env);
-
-        env.mock_all_auths();
-
-        // Initialize token and mint to user and contract (for yield payout)
-        token_client.initialize(&user);
-        token_client.mint(&user, &10000);
-        token_client.mint(&contract_id, &5000); // Mint extra to contract for yield payout
-
-        // Initialize Blend pool with 1.0 index rate
-        blend_pool_client.initialize(&INDEX_RATE_PRECISION);
-
-        // Initialize main contract
-        client.initialize(&blend_pool_id, &token_id);
-
-        // Supply 1000 USDC to Blend
-        client.supply_to_blend(&user, &1000);
-
-        // Verify position before withdraw
-        let position_before = client.get_blend_position(&user);
-        assert_eq!(position_before.b_tokens, 1000);
-
-        // Increase index rate to 1.10 (10% yield)
-        let new_index_rate = INDEX_RATE_PRECISION + (INDEX_RATE_PRECISION * 10 / 100); // 1.10
-        client.set_mock_index_rate(&new_index_rate);
-
-        // Withdraw all bTokens
-        let usdc_received = client.withdraw_from_blend(&user, &0);
-
-        // Should receive 1100 USDC (1000 + 10% yield)
-        assert_eq!(usdc_received, 1100);
-    }
-
-    // ============================================
-    // Vault Deposit Tests
-    // ============================================
-
-    #[test]
-    fn test_vault_deposit_success() {
-        let env = Env::default();
-        
-        // Register contracts
-        let contract_id = env.register_contract(None, SmasageYieldRouter);
-        let client = SmasageYieldRouterClient::new(&env, &contract_id);
-        
-        let token_id = env.register_contract(None, MockToken);
-        let token_client = MockTokenClient::new(&env, &token_id);
-        
-        // Create addresses
-        let user = Address::generate(&env);
-        let blend_pool = Address::generate(&env);
-
-        env.mock_all_auths();
-
-        // Initialize token and mint to user
-        token_client.initialize(&user);
-        token_client.mint(&user, &10000);
-
-        // Initialize main contract
-        client.initialize(&blend_pool, &token_id);
-
         // Deposit 1000 USDC via vault_deposit
         client.vault_deposit(&user, &1000);
 
@@ -800,70 +656,10 @@ mod test {
         assert_eq!(client.get_total_vault_deposits(), 1000);
     }
 
-    #[test]
-    fn test_vault_deposit_multiple_users() {
-        let env = Env::default();
-        
-        // Register contracts
-        let contract_id = env.register_contract(None, SmasageYieldRouter);
-        let client = SmasageYieldRouterClient::new(&env, &contract_id);
-        
-        let token_id = env.register_contract(None, MockToken);
-        let token_client = MockTokenClient::new(&env, &token_id);
-        
-        // Create addresses
-        let user1 = Address::generate(&env);
-        let user2 = Address::generate(&env);
-        let blend_pool = Address::generate(&env);
-
-        env.mock_all_auths();
-
-        // Initialize token and mint to users
-        token_client.initialize(&user1);
-        token_client.mint(&user1, &10000);
-        token_client.initialize(&user2);
-        token_client.mint(&user2, &10000);
-
-        // Initialize main contract
-        client.initialize(&blend_pool, &token_id);
-
-        // User 1 deposits 1000
-        client.vault_deposit(&user1, &1000);
-        
-        // User 2 deposits 500
-        client.vault_deposit(&user2, &500);
-
-        // Verify individual balances
-        assert_eq!(client.get_vault_balance(&user1), 1000);
-        assert_eq!(client.get_vault_balance(&user2), 500);
-
-        // Verify total vault deposits
-        assert_eq!(client.get_total_vault_deposits(), 1500);
-    }
-
     #[test]
     fn test_vault_deposit_accumulation() {
-        let env = Env::default();
-        
-        // Register contracts
-        let contract_id = env.register_contract(None, SmasageYieldRouter);
-        let client = SmasageYieldRouterClient::new(&env, &contract_id);
-        
-        let token_id = env.register_contract(None, MockToken);
-        let token_client = MockTokenClient::new(&env, &token_id);
-        
-        // Create addresses
-        let user = Address::generate(&env);
-        let blend_pool = Address::generate(&env);
-
-        env.mock_all_auths();
-
-        // Initialize token and mint to user
-        token_client.initialize(&user);
-        token_client.mint(&user, &50000);
-
-        // Initialize main contract
-        client.initialize(&blend_pool, &token_id);
+        let (_env, client, _admin, _r, _u, _x) = setup_env();
+        let user = Address::generate(&_env);
 
         // Make multiple deposits
         client.vault_deposit(&user, &1000);
@@ -882,181 +678,11 @@ mod test {
     #[test]
     #[should_panic(expected = "Deposit amount must be greater than 0")]
     fn test_vault_deposit_zero_amount() {
-        let env = Env::default();
-        
-        // Register contracts
-        let contract_id = env.register_contract(None, SmasageYieldRouter);
-        let client = SmasageYieldRouterClient::new(&env, &contract_id);
-        
-        let token_id = env.register_contract(None, MockToken);
-        let token_client = MockTokenClient::new(&env, &token_id);
-        
-        // Create addresses
-        let user = Address::generate(&env);
-        let blend_pool = Address::generate(&env);
-
-        env.mock_all_auths();
-
-        // Initialize token
-        token_client.initialize(&user);
-
-        // Initialize main contract
-        client.initialize(&blend_pool, &token_id);
-
-        // Attempt to deposit 0 - should panic
-        client.vault_deposit(&user, &0);
-    }
-
-    #[test]
-    #[should_panic(expected = "Deposit amount must be greater than 0")]
-    fn test_vault_deposit_negative_amount() {
-        let env = Env::default();
-        
-        // Register contracts
-        let contract_id = env.register_contract(None, SmasageYieldRouter);
-        let client = SmasageYieldRouterClient::new(&env, &contract_id);
-        
-        let token_id = env.register_contract(None, MockToken);
-        let token_client = MockTokenClient::new(&env, &token_id);
-        
-        // Create addresses
-        let user = Address::generate(&env);
-        let blend_pool = Address::generate(&env);
-
-        env.mock_all_auths();
-
-        // Initialize token
-        token_client.initialize(&user);
-
-        // Initialize main contract
-        client.initialize(&blend_pool, &token_id);
-
-        // Attempt to deposit negative - should panic
-        client.vault_deposit(&user, &-1000);
-    }
-
-    #[test]
-    fn test_blend_multiple_supplies() {
-        let env = Env::default();
-        
-        // Register contracts
-        let contract_id = env.register_contract(None, SmasageYieldRouter);
-        let client = SmasageYieldRouterClient::new(&env, &contract_id);
-        
-        let blend_pool_id = env.register_contract(None, MockBlendPool);
-        let blend_pool_client = MockBlendPoolClient::new(&env, &blend_pool_id);
-        
-        let token_id = env.register_contract(None, MockToken);
-        let token_client = MockTokenClient::new(&env, &token_id);
-        
-        // Create addresses
-        let user = Address::generate(&env);
-
-        env.mock_all_auths();
-
-        // Initialize token and mint to user
-        token_client.initialize(&user);
-        token_client.mint(&user, &10000);
-
-        // Initialize Blend pool with 1.0 index rate
-        blend_pool_client.initialize(&INDEX_RATE_PRECISION);
-
-        // Initialize main contract
-        client.initialize(&blend_pool_id, &token_id);
-
-        // First supply: 500 USDC
-        let b_tokens_1 = client.supply_to_blend(&user, &500);
-        assert_eq!(b_tokens_1, 500);
-
-        // Increase index rate to 1.05
-        let new_index_rate = INDEX_RATE_PRECISION + (INDEX_RATE_PRECISION * 5 / 100);
-        client.set_mock_index_rate(&new_index_rate);
-
-        // Calculate yield BEFORE second supply (to capture yield from first supply)
-        // First supply yield: 500 * (1,050,000 - 1,000,000) / 1,000,000 = 25
-        let yield_amount = client.calculate_blend_yield(&user);
-        assert_eq!(yield_amount, 25);
-
-        // Second supply: 500 USDC (at new index rate)
-        // bTokens = 500 * 1,000,000 / 1,050,000 = 476 (rounded)
-        let b_tokens_2 = client.supply_to_blend(&user, &500);
-        assert_eq!(b_tokens_2, 476);
-
-        // Verify total position
-        let position = client.get_blend_position(&user);
-        assert_eq!(position.b_tokens, 976); // 500 + 476
-
-        // After second supply, last_index_rate is updated to new rate, so yield shows 0
-        // until index rate changes again
-        let yield_after_second = client.calculate_blend_yield(&user);
-        assert_eq!(yield_after_second, 0);
-    }
-
-    #[test]
-    fn test_blend_position_value_accrual() {
-        let env = Env::default();
-        
-        // Register contracts
-        let contract_id = env.register_contract(None, SmasageYieldRouter);
-        let client = SmasageYieldRouterClient::new(&env, &contract_id);
-        
-        let blend_pool_id = env.register_contract(None, MockBlendPool);
-        let blend_pool_client = MockBlendPoolClient::new(&env, &blend_pool_id);
-        
-        let token_id = env.register_contract(None, MockToken);
-        let token_client = MockTokenClient::new(&env, &token_id);
-        
-        // Create addresses
-        let user = Address::generate(&env);
-
-        env.mock_all_auths();
-
-        // Initialize token and mint to user
-        token_client.initialize(&user);
-        token_client.mint(&user, &10000);
-
-        // Initialize Blend pool with 1.0 index rate
-        blend_pool_client.initialize(&INDEX_RATE_PRECISION);
-
-        // Initialize main contract
-        client.initialize(&blend_pool_id, &token_id);
-
-        // Supply 2000 USDC to Blend
-        client.supply_to_blend(&user, &2000);
-
-        // Initial value should be 2000
-        assert_eq!(client.get_blend_position_value(&user), 2000);
-
-        // Simulate 1 year of yield at 5% APR
-        let new_index_rate = INDEX_RATE_PRECISION + (INDEX_RATE_PRECISION * 5 / 100);
-        client.set_mock_index_rate(&new_index_rate);
-
-        // Value should now be 2100
-        assert_eq!(client.get_blend_position_value(&user), 2100);
-
-        // Simulate another 5% yield (compound)
-        let new_index_rate_2 = new_index_rate + (new_index_rate * 5 / 100);
-        client.set_mock_index_rate(&new_index_rate_2);
-        // Deposit 1000 USDC – 60% Blend, 30% LP
-        client.deposit(&user, &1000, &60, &30, &10);
-        assert_eq!(client.get_balance(&user), 1000);
-
-        // Withdraw half
-        client.withdraw(&user, &500);
-        assert_eq!(client.get_balance(&user), 500);
-    }
-
-    #[test]
-    fn test_soroswap_lp_basic() {
         let (_env, client, _admin, _r, _u, _x) = setup_env();
         let user = Address::generate(&_env);
 
-        // Deposit 1000 USDC, 50% to LP
-        client.deposit(&user, &1000, &0, &50, &0);
-
-        assert_eq!(client.get_balance(&user), 1000);
-        // MockRouter returns 100 LP shares for add_liquidity
-        assert_eq!(client.get_lp_shares(&user), 100);
+        // Attempt to deposit 0 - should panic
+        client.vault_deposit(&user, &0);
     }
 
     #[test]