Merge pull request #504 from somotochukwu-dev/rebaseline-wasm-size-427

feat: rebaseline wasm size

Author: josephchimebuka

.wasm-size-baseline

@@ -1 +1 @@
-180000
+199953

contracts/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-soroban-sdk = { workspace = true }
+soroban-sdk = { workspace = true, features = ["alloc"] }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }

contracts/src/errors.rs

@@ -103,28 +103,24 @@ pub enum ContractError {
     IllegalPhaseTransition = 84,
     /// Oracle heartbeat failed the configured freshness or health policy.
     OracleHeartbeatUnhealthy = 85,
-    /// Early cash-out feature is disabled or not configured
-    EarlyCashoutDisabled = 79,
-    /// User does not have an active position to cash out
-    PositionNotFound = 80,
-    /// Early cash-out attempted outside the valid running phase
-    InvalidPhaseForCashout = 81,
-    /// Early cash-out is only supported for UpDown rounds
-    WrongModeForCashout = 82,
-    ProposalNotFound = 83,
-    ProposalExpired = 84,
-    GovInvalidState = 85,
-    GovUnauthorized = 86,
     /// claim_many batch size exceeds MAX_CLAIM_BATCH_SIZE (Issue #277)
     ClaimBatchTooLarge = 87,
     /// claim_many batch contains the same address more than once (Issue #277)
     DuplicateClaimAddress = 88,
-    /// Caller is denylisted, or allowlist mode is enabled and caller is not
-    /// allowlisted (Issue #274 access-control gate).
-    AccessDenied = 89,
-    /// Oracle heartbeat is not live and strict mode blocks single-feed
-    /// settlement (Issue #264 sibling check for `resolve_round`).
-    OracleHeartbeatUnhealthy = 90,
+    /// Early cash-out feature is disabled or not configured
+    EarlyCashoutDisabled = 95,
+    /// User does not have an active position to cash out
+    PositionNotFound = 96,
+    /// Early cash-out attempted outside the valid running phase
+    InvalidPhaseForCashout = 97,
+    /// Early cash-out is only supported for UpDown rounds
+    WrongModeForCashout = 98,
+    /// A proposed insurance payout split does not sum to the covered balance.
+    InsuranceInvalidSplit = 99,
+    /// The insurance backstop fund has insufficient balance to cover the claim.
+    InsuranceInsufficientFund = 100,
+    /// The supplied token amount is invalid for the requested operation.
+    InvalidAmount = 101,
     /// The dispute window for `void_round` has expired, or dispute windows
     /// are not configured (`dispute_ledgers == 0`).
     DisputeWindowExpired = 91,

contracts/src/governance.rs

@@ -309,7 +309,7 @@ pub fn execute(env: Env, executor: Address, proposal_id: u64) -> Result<(), Cont
             _extend_persistent_ttl(&env, &DataKeyCore::Oracle);
         }
         GovAction::WithdrawInsuranceFund(recipient, amount) => {
-            crate::insurance::execute_withdraw_insurance_fund(env, &recipient, *amount)?;
+            crate::insurance::execute_withdraw_insurance_fund(&env, &recipient, *amount)?;
         }
         GovAction::SetInsuranceSplitBps(bps) => {
             crate::insurance::set_insurance_split_bps(env.clone(), *bps)?;

contracts/src/queries.rs

@@ -256,7 +256,7 @@ pub fn get_user_archive_history(
 
     let total = user_rounds.len();
     if offset >= total {
-        return Vec::new(env_ref);
+        return Ok(Vec::new(env_ref));
     }
 
     let start = total.saturating_sub(offset + 1);

contracts/src/settlement.rs

@@ -14,7 +14,6 @@ use crate::common::{
 use crate::config::{
     _apply_protocol_fee_precision, _apply_protocol_fee_updown, _read_fee_model,
 };
-use crate::config::{_apply_protocol_fee_precision, _apply_protocol_fee_updown, _read_fee_model};
 use crate::errors::ContractError;
 use crate::settlement_math::{
     classify_price_direction, compute_deviation_bps, compute_updown_winner_payout,
@@ -24,9 +23,9 @@ use crate::storage::clear_round_storage;
 use crate::types::{
     ArchivedRoundSummary, BetSide, DataKeyCore, DataKeyScoped, DeviationReferenceMode,
     HbGateConfig, LeaderboardEntry, MultiFeedPayload, OracleHeartbeatRecord, OraclePayload,
-    OracleQuorumConfig, PendingWinningsUpdatedAtKey, PrecisionCommitment, PrecisionPayoutPolicy,
-    PrecisionPrediction, PriceSample, Round, RoundArchiveStatus, RoundMode, TwapSamplesKey,
-    UserOutcomeType, UserPosition, UserRoundOutcome, UserStats,
+    OracleQuorumConfig, OneSidedPolicy, PendingWinningsUpdatedAtKey, PrecisionCommitment,
+    PrecisionPayoutPolicy, PrecisionPrediction, PriceSample, Round, RoundArchiveStatus, RoundMode,
+    TwapSamplesKey, UserOutcomeType, UserPosition, UserRoundOutcome, UserStats,
 };
 use soroban_sdk::xdr::ToXdr;
 use soroban_sdk::{contracttype, symbol_short, Address, Bytes, Env, Map, Symbol, Vec};
@@ -2856,244 +2855,5 @@ pub fn _update_stats_loss(env: &Env, user: Address) -> Result<(), ContractError>
     crate::leaderboard::_update_leaderboards(env, user.clone());
     crate::leaderboard::_update_season_stats_loss(env, user)?;
     Ok(())
-}
-
-// ─── Dispute window (void / finalize) ───────────────────────────────────────
-
-fn _resolved_at_map_key() -> Symbol {
-    Symbol::new(&Env::default(), "RslvAtMap")
-}
-
-fn _settlement_map_key() -> Symbol {
-    Symbol::new(&Env::default(), "SttlMap")
-}
-
-fn _read_resolved_at(env: &Env, round_id: u64) -> Option<u32> {
-    env.storage()
-        .persistent()
-        .get::<_, Map<u64, u32>>(&_resolved_at_map_key())
-        .and_then(|m| m.get(round_id))
-}
-
-fn _remove_resolved_at(env: &Env, round_id: u64) {
-    let key = _resolved_at_map_key();
-    let mut m: Map<u64, u32> = env
-        .storage()
-        .persistent()
-        .get(&key)
-        .unwrap_or(Map::new(env));
-    m.remove(round_id);
-    if m.len() == 0 {
-        env.storage().persistent().remove(&key);
-    } else {
-        env.storage().persistent().set(&key, &m);
-        _extend_ttl_symbol(env, &key);
-    }
-}
-
-fn _read_settlement(env: &Env, round_id: u64) -> Option<RoundSettlement> {
-    env.storage()
-        .persistent()
-        .get::<_, Map<u64, RoundSettlement>>(&_settlement_map_key())
-        .and_then(|m| m.get(round_id))
-}
-
-fn _remove_settlement(env: &Env, round_id: u64) {
-    let key = _settlement_map_key();
-    let mut m: Map<u64, RoundSettlement> = env
-        .storage()
-        .persistent()
-        .get(&key)
-        .unwrap_or(Map::new(env));
-    m.remove(round_id);
-    if m.len() == 0 {
-        env.storage().persistent().remove(&key);
-    } else {
-        env.storage().persistent().set(&key, &m);
-        _extend_ttl_symbol(env, &key);
-    }
-}
-
-fn _round_from_settlement(stl: &RoundSettlement) -> Round {
-    Round {
-        round_id: stl.round_id,
-        price_start: stl.price_start,
-        start_ledger: 0,
-        start_timestamp: 0,
-        bet_end_ledger: 0,
-        end_ledger: 0,
-        pool_up: stl.pool_up,
-        pool_down: stl.pool_down,
-        mode: if stl.mode == 0 {
-            RoundMode::UpDown
-        } else {
-            RoundMode::Precision
-        },
-    }
-}
-
-pub fn void_round(env: Env, round_id: u64) -> Result<(), ContractError> {
-    _require_supported_schema(&env)?;
-    _ensure_not_paused(&env)?;
-
-    let dispute_ledgers = crate::config::get_dispute_ledgers(&env);
-    if dispute_ledgers == 0 {
-        return Err(ContractError::DisputeWindowExpired);
-    }
-
-    let resolved_at: u32 = _read_resolved_at(&env, round_id).ok_or(ContractError::DisputeWindowExpired)?;
-    if env.ledger().sequence() >= resolved_at.saturating_add(dispute_ledgers) {
-        return Err(ContractError::DisputeWindowExpired);
-    }
-
-    let participants: Vec<Address> = env
-        .storage()
-        .persistent()
-        .get(&DataKeyScoped::RoundParticipants(round_id))
-        .unwrap_or(Vec::new(&env));
-    if participants.is_empty() {
-        return Err(ContractError::NoActiveRound);
-    }
-
-    let settlement: RoundSettlement =
-        _read_settlement(&env, round_id).ok_or(ContractError::NoActiveRound)?;
-
-    for i in 0..participants.len() {
-        if let Some(user) = participants.get(i) {
-            let pos_key = DataKeyScoped::Position(round_id, user.clone());
-            if let Some(pos) = env.storage().persistent().get::<_, UserPosition>(&pos_key) {
-                _accumulate_pending(&env, user.clone(), pos.amount)?;
-                let side = match pos.side {
-                    BetSide::Up => 0,
-                    BetSide::Down => 1,
-                };
-                _persist_user_outcome(
-                    &env, round_id, 0, &user, side, 0, pos.amount, pos.amount,
-                    UserOutcomeType::Refund,
-                );
-            }
-            let pred_key = DataKeyScoped::PrecisionPosition(round_id, user.clone());
-            let commit_key = DataKeyScoped::PrecisionCommitment(round_id, user.clone());
-            if let Some(pred) = env.storage().persistent().get::<_, PrecisionPrediction>(&pred_key) {
-                _accumulate_pending(&env, user.clone(), pred.amount)?;
-                _persist_user_outcome(
-                    &env, round_id, 1, &user, 2, pred.predicted_price, pred.amount, pred.amount,
-                    UserOutcomeType::Refund,
-                );
-            } else if let Some(commit) =
-                env.storage().persistent().get::<_, PrecisionCommitment>(&commit_key)
-            {
-                _accumulate_pending(&env, user.clone(), commit.amount)?;
-                _persist_user_outcome(
-                    &env, round_id, 1, &user, 2, 0, commit.amount, commit.amount,
-                    UserOutcomeType::Refund,
-                );
-            }
-        }
-    }
-
-    for i in 0..participants.len() {
-        if let Some(user) = participants.get(i) {
-            env.storage().persistent().remove(&DataKeyScoped::Position(round_id, user.clone()));
-            env.storage().persistent().remove(&DataKeyScoped::PrecisionPosition(round_id, user.clone()));
-            env.storage().persistent().remove(&DataKeyScoped::PrecisionCommitment(round_id, user));
-        }
-    }
-    env.storage().persistent().remove(&DataKeyScoped::RoundParticipants(round_id));
-
-    let round = _round_from_settlement(&settlement);
-    _archive_round(
-        &env,
-        &round,
-        RoundArchiveStatus::Voided,
-        settlement.final_price,
-        &participants,
-        settlement.fee_amount,
-        None,
-    );
-
-    _remove_settlement(&env, round_id);
-    _remove_resolved_at(&env, round_id);
-
-    #[allow(deprecated)]
-    env.events().publish(
-        (symbol_short!("round"), symbol_short!("voided")),
-        (round_id, settlement.final_price, participants.len() as u32, settlement.fee_amount),
-    );
-    Ok(())
-}
-
-pub fn finalize_round(env: Env, round_id: u64) -> Result<(), ContractError> {
-    _require_supported_schema(&env)?;
-    _ensure_not_paused(&env)?;
-
-    let dispute_ledgers = crate::config::get_dispute_ledgers(&env);
-    if dispute_ledgers == 0 {
-        return Err(ContractError::DisputeWindowExpired);
-    }
-
-    let resolved_at: u32 = _read_resolved_at(&env, round_id).ok_or(ContractError::DisputeWindowExpired)?;
-    if env.ledger().sequence() < resolved_at.saturating_add(dispute_ledgers) {
-        return Err(ContractError::ClaimLocked);
-    }
 
-    let participants: Vec<Address> = env
-        .storage()
-        .persistent()
-        .get(&DataKeyScoped::RoundParticipants(round_id))
-        .unwrap_or(Vec::new(&env));
-    if participants.is_empty() {
-        return Err(ContractError::NoActiveRound);
-    }
-
-    let settlement: RoundSettlement =
-        _read_settlement(&env, round_id).ok_or(ContractError::NoActiveRound)?;
-
-    for i in 0..settlement.participants.len() {
-        if let Some(entry) = settlement.participants.get(i) {
-            match entry.outcome {
-                UserOutcomeType::Win => {
-                    _accumulate_pending(&env, entry.user.clone(), entry.payout)?;
-                    _update_stats_win(&env, entry.user.clone())?;
-                }
-                UserOutcomeType::Loss => {
-                    _update_stats_loss(&env, entry.user.clone())?;
-                }
-                UserOutcomeType::Refund => {
-                    _accumulate_pending(&env, entry.user.clone(), entry.payout)?;
-                }
-                _ => {}
-            }
-        }
-    }
-
-    for i in 0..participants.len() {
-        if let Some(user) = participants.get(i) {
-            env.storage().persistent().remove(&DataKeyScoped::Position(round_id, user.clone()));
-            env.storage().persistent().remove(&DataKeyScoped::PrecisionPosition(round_id, user.clone()));
-            env.storage().persistent().remove(&DataKeyScoped::PrecisionCommitment(round_id, user));
-        }
-    }
-    env.storage().persistent().remove(&DataKeyScoped::RoundParticipants(round_id));
-
-    let round = _round_from_settlement(&settlement);
-    _archive_round(
-        &env,
-        &round,
-        RoundArchiveStatus::Resolved,
-        settlement.final_price,
-        &participants,
-        settlement.fee_amount,
-        None,
-    );
-
-    _remove_settlement(&env, round_id);
-    _remove_resolved_at(&env, round_id);
-
-    #[allow(deprecated)]
-    env.events().publish(
-        (symbol_short!("round"), symbol_short!("finalized")),
-        (round_id, settlement.final_price, participants.len() as u32, settlement.fee_amount),
-    );
-    Ok(())
 }

docs/wasm-size-budget.md

@@ -4,13 +4,13 @@
 Stored in `.wasm-size-baseline` at the repo root (plain integer, bytes).
 
 ### Budget policy
-CI allows up to **+10%** growth above baseline before failing.
+CI allows up to **+5%** growth above baseline before failing.
 
 ### How CI checks it
 The `wasm-size-gate` job in `.github/workflows/ci.yml`:
 1. Builds `xelma_contract.wasm` in release mode
 2. Runs `scripts/check_wasm_size.sh` against that artifact, which compares
-   size against `.wasm-size-baseline` + 10%, prints a size report, and fails
+   size against `.wasm-size-baseline` + 5%, prints a size report, and fails
    with an actionable error if the budget is exceeded
 
 ### Checking it locally

scripts/check_wasm_size.sh

@@ -45,13 +45,13 @@ fi
 
 WASM_SIZE=$(wc -c < "$WASM_PATH")
 BASELINE=$(cat "$BASELINE_FILE")
-BUDGET=$(( BASELINE + BASELINE / 10 ))
+BUDGET=$(( BASELINE + BASELINE / 20 ))
 
 echo "WASM size report"
 echo "  File    : $WASM_PATH"
 echo "  Current : ${WASM_SIZE} bytes"
 echo "  Baseline: ${BASELINE} bytes"
-echo "  Budget  : ${BUDGET} bytes (+10%)"
+echo "  Budget  : ${BUDGET} bytes (+5%)"
 echo "  Delta   : $(( WASM_SIZE - BASELINE )) bytes"
 
 if [ "${WASM_SIZE}" -gt "${BUDGET}" ]; then