fix

Author: Esau

.gitignore

@@ -1,3 +1,4 @@
 target
 .DS_Store
-ivc
+ivc
+node_modules

prediction_market_contract/Nargo.toml

@@ -5,5 +5,5 @@ compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
-aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.4", directory = "noir-projects/aztec-nr/aztec" }
-uint_note = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.4", directory = "noir-projects/aztec-nr/uint-note" }
+aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.5", directory = "noir-projects/aztec-nr/aztec" }
+uint_note = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.5", directory = "noir-projects/aztec-nr/uint-note" }

prediction_market_contract/README.md

@@ -5,22 +5,22 @@ A prediction market implementation on Aztec using a **Constant Sum Market Maker
 ## Overview
 
 This contract allows users to:
-- **Vote on binary outcomes** (YES/NO) **anonymously** - no one knows WHO voted
+- **Bet on binary outcomes** (YES/NO) **anonymously** - no one knows WHO placed a bet
 - **Hold fully private balances** - collateral and share holdings are all hidden
 - **Experience dynamic pricing** that adjusts based on market sentiment
 - **Get slippage protection** to prevent adverse price movements
-- **Single-transaction voting** using partial notes pattern
+- **Single-transaction betting** using partial notes pattern
 
 ## Privacy Model
 
 ### What's Private
 
 | Data | Privacy | Notes |
 |------|---------|-------|
-| Voter identity | **PRIVATE** | Public function doesn't receive sender address |
+| Bettor identity | **PRIVATE** | Public function doesn't receive sender address |
 | Collateral balances | **PRIVATE** | Stored as private notes (UintNote) |
 | Share balances | **PRIVATE** | Stored as private notes (UintNote) |
-| Your vote (YES/NO) | **PRIVATE** | Hidden via partial notes |
+| Your bet (YES/NO) | **PRIVATE** | Hidden via partial notes |
 
 ### What's Public
 
@@ -32,7 +32,7 @@ This contract allows users to:
 
 ### Privacy Architecture
 
-The contract uses **partial notes** for private voting (like the [AMM contract](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-contracts/contracts/amm_contract)):
+The contract uses **partial notes** for private betting (like the [AMM contract](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-contracts/contracts/amm_contract)):
 
 ```
 1. buy_outcome() [PRIVATE]
@@ -55,7 +55,7 @@ Key privacy feature: The public `_process_buy()` function **does not receive the
 
 ## Usage
 
-### Voting Flow (Single Transaction)
+### Betting Flow (Single Transaction)
 
 ```typescript
 // Deposit collateral privately
@@ -94,8 +94,8 @@ const balance = await market.methods.get_collateral_balance(myAddress).simulate(
 bash -i <(curl -s https://install.aztec.network)
 aztec-up 3.0.0-devnet.4
 
-# Install npm dependencies
-npm install
+# Install dependencies
+yarn install
 ```
 
 ### Building
@@ -129,10 +129,10 @@ Tests the CSMM pricing functions:
 aztec start --sandbox
 
 # Run tests
-npm test
+yarn test
 ```
 
-Tests the full private voting flow:
+Tests the full private betting flow:
 - Contract deployment
 - Private deposit/withdraw
 - Private buy_outcome (single tx with partial notes)

prediction_market_contract/bun.lock

@@ -23,9 +23,9 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-devnet.4",
-    "@aztec/aztec.js": "3.0.0-devnet.4",
-    "@aztec/pxe": "3.0.0-devnet.4",
-    "@aztec/test-wallet": "3.0.0-devnet.4"
+    "@aztec/accounts": "3.0.0-devnet.5",
+    "@aztec/aztec.js": "3.0.0-devnet.5",
+    "@aztec/pxe": "3.0.0-devnet.5",
+    "@aztec/test-wallet": "3.0.0-devnet.5"
   }
 }

prediction_market_contract/package.json

@@ -66,21 +66,21 @@ pub fn calculate_shares_out(
     current_supply: u128,
     total_liquidity: u128,
 ) -> (u128, u128) {
-    assert(total_liquidity > 0 as u128, "ZERO_LIQUIDITY");
-    assert(collateral_amount > 0 as u128, "ZERO_COLLATERAL");
+    assert(total_liquidity > 0, "ZERO_LIQUIDITY");
+    assert(collateral_amount > 0, "ZERO_COLLATERAL");
 
     // Calculate current price as fixed-point
     // price = (current_supply * PRICE_PRECISION) / total_liquidity
     let current_price = (current_supply * PRICE_PRECISION) / total_liquidity;
 
     // Prevent division by zero (price can't be zero unless supply is zero)
-    assert(current_price > 0 as u128, "ZERO_PRICE");
+    assert(current_price > 0, "ZERO_PRICE");
 
     // Calculate shares out
     // shares = (collateral_amount * PRICE_PRECISION) / current_price
     let shares_out = (collateral_amount * PRICE_PRECISION) / current_price;
 
-    assert(shares_out > 0 as u128, "INSUFFICIENT_OUTPUT");
+    assert(shares_out > 0, "INSUFFICIENT_OUTPUT");
 
     let new_supply = current_supply + shares_out;
 
@@ -92,7 +92,7 @@ pub fn calculate_shares_out(
 /// Formula: price = supply / total_supply
 /// Returns: price as fixed-point (price * PRICE_PRECISION)
 pub fn calculate_new_price(supply: u128, total_supply: u128) -> u128 {
-    assert(total_supply > 0 as u128, "ZERO_TOTAL_SUPPLY");
+    assert(total_supply > 0, "ZERO_TOTAL_SUPPLY");
 
     // Return as fixed-point: (supply * PRICE_PRECISION) / total_supply
     (supply * PRICE_PRECISION) / total_supply
@@ -109,7 +109,7 @@ pub fn calculate_price_impact(
 ) -> (u128, u128, u128) {
     let price_before = calculate_new_price(current_supply, total_liquidity);
 
-    let (shares_out, new_supply) = calculate_shares_out(
+    let (_shares_out, new_supply) = calculate_shares_out(
         collateral_amount,
         current_supply,
         total_liquidity,
@@ -139,9 +139,9 @@ fn test_calculate_shares_out_at_50_50() {
     // At 50/50 odds: supply=500, liquidity=1000
     // Price = 500/1000 = 0.5
     // Buying 100 collateral should give 200 shares (100/0.5)
-    let collateral = 100 as u128;
-    let supply = 500 as u128;
-    let liquidity = 1000 as u128;
+    let collateral = 100;
+    let supply = 500;
+    let liquidity = 1000;
 
     let (shares_out, new_supply) = calculate_shares_out(collateral, supply, liquidity);
 
@@ -154,9 +154,9 @@ fn test_calculate_shares_out_at_different_price() {
     // At 70/30 odds: supply=700, liquidity=1000
     // Price = 700/1000 = 0.7
     // Buying 70 collateral should give 100 shares (70/0.7)
-    let collateral = 70 as u128;
-    let supply = 700 as u128;
-    let liquidity = 1000 as u128;
+    let collateral = 70;
+    let supply = 700;
+    let liquidity = 1000;
 
     let (shares_out, new_supply) = calculate_shares_out(collateral, supply, liquidity);
 
@@ -167,8 +167,8 @@ fn test_calculate_shares_out_at_different_price() {
 #[test]
 fn test_calculate_new_price_50_50() {
     // At 50/50: price should be 500000 (0.5 * PRICE_PRECISION)
-    let supply = 500 as u128;
-    let total = 1000 as u128;
+    let supply = 500;
+    let total = 1000;
 
     let price = calculate_new_price(supply, total);
 
@@ -178,8 +178,8 @@ fn test_calculate_new_price_50_50() {
 #[test]
 fn test_calculate_new_price_70_30() {
     // At 70/30: YES price should be 700000 (0.7 * PRICE_PRECISION)
-    let supply = 700 as u128;
-    let total = 1000 as u128;
+    let supply = 700;
+    let total = 1000;
 
     let price = calculate_new_price(supply, total);
 
@@ -189,9 +189,9 @@ fn test_calculate_new_price_70_30() {
 #[test]
 fn test_calculate_price_impact() {
     // Starting at 50/50, buying 100 should move price from 0.5 to ~0.636
-    let collateral = 100 as u128;
-    let supply = 500 as u128;
-    let liquidity = 1000 as u128;
+    let collateral = 100;
+    let supply = 500;
+    let liquidity = 1000;
 
     let (price_before, price_after, impact) = calculate_price_impact(collateral, supply, liquidity);
 
@@ -205,8 +205,8 @@ fn test_calculate_price_impact() {
 #[test]
 fn test_prices_sum_to_one() {
     // YES price + NO price should always equal PRICE_PRECISION (1.0)
-    let yes_supply = 600 as u128;
-    let no_supply = 400 as u128;
+    let yes_supply = 600;
+    let no_supply = 400;
     let total = yes_supply + no_supply;
 
     let yes_price = calculate_new_price(yes_supply, total);
@@ -218,9 +218,9 @@ fn test_prices_sum_to_one() {
 #[test]
 fn test_large_purchase() {
     // Test with larger numbers to ensure no overflow issues
-    let collateral = 10000 as u128;
-    let supply = 50000 as u128;
-    let liquidity = 100000 as u128;
+    let collateral = 10000;
+    let supply = 50000;
+    let liquidity = 100000;
 
     let (shares_out, new_supply) = calculate_shares_out(collateral, supply, liquidity);
 

prediction_market_contract/src/lib.nr

@@ -6,7 +6,7 @@ use dep::aztec::macros::aztec;
 /// All balances are private. Public function only sees trade amounts, not who traded.
 #[aztec]
 pub contract PredictionMarket {
-    use crate::lib::{calculate_shares_out, calculate_new_price};
+    use crate::lib::{calculate_shares_out, calculate_new_price, calculate_price_impact};
     use dep::aztec::{
         macros::{functions::{external, initializer, internal}, storage::storage},
         messages::message_delivery::MessageDelivery,
@@ -20,16 +20,12 @@ pub contract PredictionMarket {
     };
     use dep::uint_note::uint_note::{UintNote, PartialUintNote};
 
-    // Storage slots for deriving partial note locations
-    global YES_BALANCES_SLOT: Field = 6;
-    global NO_BALANCES_SLOT: Field = 7;
-
     #[storage]
     struct Storage<Context> {
         collateral_balances: Map<AztecAddress, PrivateSet<UintNote, Context>, Context>,
         yes_supply: PublicMutable<u128, Context>,
         no_supply: PublicMutable<u128, Context>,
-        liquidity_constant: PublicMutable<u128, Context>,
+        total_liquidity: PublicMutable<u128, Context>,
         admin: PublicMutable<AztecAddress, Context>,
         yes_balances: Map<AztecAddress, PrivateSet<UintNote, Context>, Context>,
         no_balances: Map<AztecAddress, PrivateSet<UintNote, Context>, Context>,
@@ -48,7 +44,7 @@ pub contract PredictionMarket {
         let half = initial_liquidity / 2;
         storage.yes_supply.write(half);
         storage.no_supply.write(half);
-        storage.liquidity_constant.write(initial_liquidity);
+        storage.total_liquidity.write(initial_liquidity);
     }
 
     /// Deposit collateral privately. Creates a private note for the sender.
@@ -115,7 +111,11 @@ pub contract PredictionMarket {
         }
 
         // Create partial note for shares
-        let base_slot = if is_yes { YES_BALANCES_SLOT } else { NO_BALANCES_SLOT };
+        // Storage slots are required for deriving partial note locations.
+        // This is because the partial note needs to be manually placed at that slot because we cannot use PrivateSet::insert().
+        // We cannot use PrivateSet::insert() because the note does not exist yet, as it is not fully created in private.
+
+        let base_slot = if is_yes { PredictionMarket::storage_layout().yes_balances.slot } else { PredictionMarket::storage_layout().no_balances.slot };
         let storage_slot: Field = derive_storage_slot_in_map(base_slot, sender);
         let partial_note = UintNote::partial(sender, storage_slot, &mut context, sender, contract_address);
 
@@ -131,7 +131,7 @@ pub contract PredictionMarket {
     fn _process_buy(is_yes: bool, collateral_amount: u128, min_shares_out: u128, partial_note: PartialUintNote) {
         let yes_supply = storage.yes_supply.read();
         let no_supply = storage.no_supply.read();
-        let liquidity = storage.liquidity_constant.read();
+        let liquidity = storage.total_liquidity.read();
 
         let (shares_out, new_supply) = calculate_shares_out(
             collateral_amount,
@@ -146,7 +146,7 @@ pub contract PredictionMarket {
         } else {
             storage.no_supply.write(new_supply);
         }
-        storage.liquidity_constant.write(liquidity + collateral_amount);
+        storage.total_liquidity.write(liquidity + collateral_amount);
 
         partial_note.complete(&mut context, context.this_address(), shares_out);
     }
@@ -159,18 +159,18 @@ pub contract PredictionMarket {
         calculate_new_price(if is_yes { yes_supply } else { no_supply }, yes_supply + no_supply)
     }
 
-    /// Get market state: (yes_supply, no_supply, liquidity_constant).
+    /// Get market state: (yes_supply, no_supply, total_liquidity).
     #[external("utility")]
     unconstrained fn get_market_state() -> (u128, u128, u128) {
-        (storage.yes_supply.read(), storage.no_supply.read(), storage.liquidity_constant.read())
+        (storage.yes_supply.read(), storage.no_supply.read(), storage.total_liquidity.read())
     }
 
     /// Quote shares out for a given collateral amount.
     #[external("utility")]
     unconstrained fn quote_buy(is_yes: bool, collateral_amount: u128) -> u128 {
         let yes_supply = storage.yes_supply.read();
         let no_supply = storage.no_supply.read();
-        let liquidity = storage.liquidity_constant.read();
+        let liquidity = storage.total_liquidity.read();
         let (shares_out, _) = calculate_shares_out(
             collateral_amount,
             if is_yes { yes_supply } else { no_supply },
@@ -179,6 +179,21 @@ pub contract PredictionMarket {
         shares_out
     }
 
+    /// Quote price impact for a purchase.
+    /// Returns: (price_before, price_after, impact_percentage)
+    /// All values use PRICE_PRECISION (1_000_000) as the decimal base.
+    #[external("utility")]
+    unconstrained fn quote_price_impact(is_yes: bool, collateral_amount: u128) -> (u128, u128, u128) {
+        let yes_supply = storage.yes_supply.read();
+        let no_supply = storage.no_supply.read();
+        let liquidity = storage.total_liquidity.read();
+        calculate_price_impact(
+            collateral_amount,
+            if is_yes { yes_supply } else { no_supply },
+            liquidity,
+        )
+    }
+
     /// Get user's private collateral balance.
     #[external("utility")]
     unconstrained fn get_collateral_balance(user: AztecAddress) -> u128 {