Merge pull request #232 from ryzen-xp/feat_Repeated_Validation_Logic

[Ref]:: Repeated Validation Logic remove

Author: Akshola00

.devcontainer.json

@@ -0,0 +1,20 @@
+{
+  "name": "dev",
+  "image": "mcr.microsoft.com/devcontainers/base:debian",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "StarkWare.cairo1",
+        "tamasfe.even-better-toml",
+        "rust-lang.rust-analyzer"
+      ]
+    }
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/rust:1": {
+      "version": "stable"
+    }
+  },
+  "postCreateCommand": "bash .devcontainer/install-tools.sh",
+  "remoteUser": "vscode"
+}

.devcontainer/install-tools.sh

@@ -0,0 +1,31 @@
+# @ryzen-xp
+
+set -e
+
+echo "🚀 Setting up development environment..."
+
+# Install dependencies
+apt-get update && apt-get install -y curl git build-essential
+
+# Install asdf
+git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.14.0
+echo '. "$HOME/.asdf/asdf.sh"' >> ~/.bashrc
+echo '. "$HOME/.asdf/completions/asdf.bash"' >> ~/.bashrc
+. ~/.asdf/asdf.sh
+
+# Read versions from .tool-versions
+SCARB_VERSION=$(grep "^scarb " .tool-versions | awk '{print $2}')
+FOUNDRY_VERSION=$(grep "^starknet-foundry " .tool-versions | awk '{print $2}')
+
+echo "📦 Installing Scarb $SCARB_VERSION and Starknet Foundry $FOUNDRY_VERSION..."
+
+# Add and install plugins
+asdf plugin add scarb || true
+asdf install scarb "$SCARB_VERSION"
+asdf global scarb "$SCARB_VERSION"
+
+asdf plugin add starknet-foundry || true
+asdf install starknet-foundry "$FOUNDRY_VERSION"
+asdf global starknet-foundry "$FOUNDRY_VERSION"
+
+echo "✅ Environment ready!"

README.md

@@ -104,6 +104,31 @@ scarb build
 snforge test
 ```
 
+## 🐳 DevContainer Setup (Docker)
+
+We provide a **Docker DevContainer** to simplify development and avoid local dependency issues.
+
+### Prerequisites
+- [Docker](https://docs.docker.com/get-docker/) installed and running  
+- [Visual Studio Code](https://code.visualstudio.com/) with the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
+
+### Setup
+1. Open the project in **VS Code**.  
+2. Press **CTRL + SHIFT + P** → select **“Dev Containers: Reopen in Container”**.  
+3. The container will build and install all required tools automatically.  
+
+### Verify
+Inside the container, run:
+
+```bash
+scarb build
+scarb test
+scarb fmt    
+scarb fmt --check
+```
+### Note :
+  - If During running `scarb build` throw error `killed` , Then increase your docker ram allocation and cores. and restart !
+
 # Contributing
 
 We welcome contributions! Please follow these steps:

src/predifi.cairo

@@ -288,6 +288,7 @@ pub mod Predifi {
             self.pausable.assert_not_paused();
             // Convert u8 to Pool enum with validation
             let pool_type_enum = u8_to_pool(poolType);
+            let creator_address = get_caller_address();
 
             // Validation checks using SecurityTrait
             self.assert_valid_pool_timing(poolStartTime, poolLockTime, poolEndTime);
@@ -298,8 +299,6 @@ pub mod Predifi {
             self.assert_valid_felt252(option1);
             self.assert_valid_felt252(option2);
 
-            let creator_address = get_caller_address();
-
             // Collect pool creation fee (1 STRK)
             IPredifi::collect_pool_creation_fee(ref self, creator_address);
 
@@ -488,14 +487,13 @@ pub mod Predifi {
 
             let mut pool = self.pools.read(pool_id);
             self.assert_pool_exists(@pool);
+            self.assert_pool_active(@pool);
 
             let option1: felt252 = pool.option1;
             let option2: felt252 = pool.option2;
 
             // Validation checks using SecurityTrait
             self.assert_valid_pool_option(option, option1, option2);
-            self.assert_pool_not_suspended(@pool);
-            self.assert_pool_active(@pool);
             self.assert_amount_within_limits(amount, pool.minBetAmount, pool.maxBetAmount);
 
             // Transfer betting amount from the user to the contract
@@ -569,6 +567,7 @@ pub mod Predifi {
         /// @custom:delegation Allows delegation of stake to other validators if desired
         fn stake(ref self: ContractState, pool_id: u256, amount: u256) {
             self.pausable.assert_not_paused();
+            //Input Validatioin
             self.assert_greater_than_zero(amount);
             self.assert_greater_than_zero(pool_id);
 
@@ -1355,7 +1354,6 @@ pub mod Predifi {
             let pool = self.pools.read(pool_id);
 
             // Validation checks using SecurityTrait
-            self.assert_pool_exists(@pool);
             self.assert_pool_not_suspended(@pool);
         }
 
@@ -1390,7 +1388,6 @@ pub mod Predifi {
             let caller = get_caller_address();
 
             // Validation checks using SecurityTrait
-            self.assert_pool_exists(@pool);
             self.assert_pool_not_suspended(@pool);
 
             // Check if caller is an authorized validator

tests/test_dispute.cairo

@@ -305,7 +305,7 @@ fn test_get_suspended_pools() {
 }
 
 #[test]
-#[should_panic(expected: 'Pool is suspended')]
+#[should_panic(expected: 'Pool is inactive')]
 fn test_vote_on_suspended_pool() {
     let (contract, dispute_contract, _, pool_creator, erc20_address) = deploy_predifi();